projects
/
demoscenemusic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix storage of current user in the template.
[demoscenemusic.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
demoscenemusic
/
page
/
ArtistPage.java
diff --git
a/src/main/java/net/pterodactylus/demoscenemusic/page/ArtistPage.java
b/src/main/java/net/pterodactylus/demoscenemusic/page/ArtistPage.java
index
e92726f
..
aacab5d
100644
(file)
--- a/
src/main/java/net/pterodactylus/demoscenemusic/page/ArtistPage.java
+++ b/
src/main/java/net/pterodactylus/demoscenemusic/page/ArtistPage.java
@@
-17,11
+17,8
@@
package net.pterodactylus.demoscenemusic.page;
package net.pterodactylus.demoscenemusic.page;
-import java.util.Collection;
-
import net.pterodactylus.demoscenemusic.core.Core;
import net.pterodactylus.demoscenemusic.data.Artist;
import net.pterodactylus.demoscenemusic.core.Core;
import net.pterodactylus.demoscenemusic.data.Artist;
-import net.pterodactylus.demoscenemusic.data.Track;
import net.pterodactylus.util.database.DatabaseException;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.template.TemplateContext;
import net.pterodactylus.util.database.DatabaseException;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.template.TemplateContext;
@@
-54,13
+51,10
@@
public class ArtistPage extends BasePage {
*/
@Override
protected void processTemplate(TemplateContext templateContext, ServletRequest request) throws RedirectException {
*/
@Override
protected void processTemplate(TemplateContext templateContext, ServletRequest request) throws RedirectException {
+ super.processTemplate(templateContext, request);
try {
Artist artist = getCore().getDataManager().getArtistById(request.getServletRequest().getParameter("id"));
try {
Artist artist = getCore().getDataManager().getArtistById(request.getServletRequest().getParameter("id"));
- if (artist != null) {
- Collection<Track> tracks = getCore().getDataManager().getTracksByArtist(artist.id());
- templateContext.set("artist", artist);
- templateContext.set("tracks", tracks);
- }
+ templateContext.set("artist", artist);
} catch (DatabaseException de1) {
/* TODO */
}
} catch (DatabaseException de1) {
/* TODO */
}