+++ /dev/null
-/*
- * DemosceneMusic - ArtistAdminPage.java - Copyright © 2012 David Roden
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.pterodactylus.demoscenemusic.page.admin;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import net.pterodactylus.demoscenemusic.core.Core;
-import net.pterodactylus.demoscenemusic.data.Artist;
-import net.pterodactylus.demoscenemusic.data.DefaultArtist;
-import net.pterodactylus.demoscenemusic.page.ServletRequest;
-import net.pterodactylus.util.database.DatabaseException;
-import net.pterodactylus.util.template.Template;
-import net.pterodactylus.util.template.TemplateContext;
-import net.pterodactylus.util.template.TemplateContextFactory;
-import net.pterodactylus.util.web.RedirectException;
-
-/**
- * Administration page for managing artists. This page actually allows you to
- * delete artists, the template, however, will allow you to edit and add
- * artists, too.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class ArtistsAdminPage extends AdminBasePage {
-
- /**
- * @param core
- * The core
- * @param templateContextFactory
- * The template context factory
- * @param template
- * The template to render
- */
- public ArtistsAdminPage(Core core, TemplateContextFactory templateContextFactory, Template template) {
- super(core, templateContextFactory, template, "admin/artists");
- }
-
- //
- // BASEPAGE METHODS
- //
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void processTemplate(TemplateContext templateContext, ServletRequest request) throws RedirectException {
- super.processTemplate(templateContext, request);
- try {
- List<Artist> allArtists = new ArrayList<Artist>(getCore().getDataManager().getAllArtists());
- Collections.sort(allArtists, DefaultArtist.NAME_COMPARATOR);
- /* TODO - pagination. */
- templateContext.set("artists", allArtists);
- } catch (DatabaseException de1) {
- throw new RuntimeException("Could not load artists from database.", de1);
- }
- }
-
-}
--- /dev/null
+/*
+ * DemosceneMusic - ListArtistsPage.java - Copyright © 2012 David Roden
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.pterodactylus.demoscenemusic.page.admin;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import net.pterodactylus.demoscenemusic.core.Core;
+import net.pterodactylus.demoscenemusic.data.Artist;
+import net.pterodactylus.demoscenemusic.data.DefaultArtist;
+import net.pterodactylus.demoscenemusic.page.ServletRequest;
+import net.pterodactylus.util.database.DatabaseException;
+import net.pterodactylus.util.template.Template;
+import net.pterodactylus.util.template.TemplateContext;
+import net.pterodactylus.util.template.TemplateContextFactory;
+import net.pterodactylus.util.web.RedirectException;
+
+/**
+ * Administration page for managing artists. This page actually allows you to
+ * delete artists, the template, however, will allow you to edit and add
+ * artists, too.
+ *
+ * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
+ */
+public class ListArtistsPage extends AdminBasePage {
+
+ /**
+ * @param core
+ * The core
+ * @param templateContextFactory
+ * The template context factory
+ * @param template
+ * The template to render
+ */
+ public ListArtistsPage(Core core, TemplateContextFactory templateContextFactory, Template template) {
+ super(core, templateContextFactory, template, "admin/artists");
+ }
+
+ //
+ // BASEPAGE METHODS
+ //
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void processTemplate(TemplateContext templateContext, ServletRequest request) throws RedirectException {
+ super.processTemplate(templateContext, request);
+ try {
+ List<Artist> allArtists = new ArrayList<Artist>(getCore().getDataManager().getAllArtists());
+ Collections.sort(allArtists, DefaultArtist.NAME_COMPARATOR);
+ /* TODO - pagination. */
+ templateContext.set("artists", allArtists);
+ } catch (DatabaseException de1) {
+ throw new RuntimeException("Could not load artists from database.", de1);
+ }
+ }
+
+}
+++ /dev/null
-<%include include/header title=="Manage Artist">
-
-<h1>Manage <% artist.name|html></h1>
-
-<%foreach artists artist>
- <%first><ul><%/first>
- <li><% artist.name|html> <a href="admin.edit-artist?id=<% artist.id|html>">edit</a></li>
- <%last></ul><%/last>
-<%/foreach>
-
-<h2>Add a New Artist</h2>
-
-<%include include/admin.add-artist>
-
-<%include include/footer>
\ No newline at end of file
--- /dev/null
+<%include include/header title=="Manage Artist">
+
+<h1>Manage <% artist.name|html></h1>
+
+<%foreach artists artist>
+ <%first><ul><%/first>
+ <li><% artist.name|html><%foreach artist.groups group><%first> / <%/first><%notfirst> ^ <%/notfirst><a href="group?id=<%group.id|html>"><%group.name|html></a><%/foreach> <a href="admin.edit-artist?id=<% artist.id|html>">edit</a></li>
+ <%last></ul><%/last>
+<%/foreach>
+
+<h2>Add a New Artist</h2>
+
+<%include include/admin.add-artist>
+
+<%include include/footer>
\ No newline at end of file
<%if currentUser.god>
admin:
(
-<a href="admin.artists">artists</a>
+<a href="admin.list-artists">artists</a>
|
<a href="admin.list-parties">parties</a>
)
<param-value>net.pterodactylus.demoscenemusic.page.admin.AddTrackDerivativePage</param-value>
</init-param>
<init-param>
- <param-name>admin.artists</param-name>
- <param-value>net.pterodactylus.demoscenemusic.page.admin.ArtistsAdminPage</param-value>
- </init-param>
- <init-param>
<param-name>admin.edit-artist</param-name>
<param-value>net.pterodactylus.demoscenemusic.page.admin.EditArtistPage</param-value>
</init-param>
<param-value>net.pterodactylus.demoscenemusic.page.admin.EditTrackPage</param-value>
</init-param>
<init-param>
+ <param-name>admin.list-artists</param-name>
+ <param-value>net.pterodactylus.demoscenemusic.page.admin.ListArtistsPage</param-value>
+ </init-param>
+ <init-param>
<param-name>admin.list-parties</param-name>
<param-value>net.pterodactylus.demoscenemusic.page.admin.ListPartiesPage</param-value>
</init-param>
projects / demoscenemusic.git / commitdiff