projects
/
demoscenemusic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e75638c
)
Fix storage of current user in the template.
author
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Sun, 29 Jul 2012 09:56:59 +0000
(11:56 +0200)
committer
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Sun, 29 Jul 2012 09:56:59 +0000
(11:56 +0200)
src/main/java/net/pterodactylus/demoscenemusic/page/ArtistPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/demoscenemusic/page/ArtistsPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/demoscenemusic/page/TrackPage.java
patch
|
blob
|
history
diff --git
a/src/main/java/net/pterodactylus/demoscenemusic/page/ArtistPage.java
b/src/main/java/net/pterodactylus/demoscenemusic/page/ArtistPage.java
index
45ef5c9
..
aacab5d
100644
(file)
--- a/
src/main/java/net/pterodactylus/demoscenemusic/page/ArtistPage.java
+++ b/
src/main/java/net/pterodactylus/demoscenemusic/page/ArtistPage.java
@@
-51,6
+51,7
@@
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"));
templateContext.set("artist", artist);
try {
Artist artist = getCore().getDataManager().getArtistById(request.getServletRequest().getParameter("id"));
templateContext.set("artist", artist);
diff --git
a/src/main/java/net/pterodactylus/demoscenemusic/page/ArtistsPage.java
b/src/main/java/net/pterodactylus/demoscenemusic/page/ArtistsPage.java
index
042a46a
..
3dfe636
100644
(file)
--- a/
src/main/java/net/pterodactylus/demoscenemusic/page/ArtistsPage.java
+++ b/
src/main/java/net/pterodactylus/demoscenemusic/page/ArtistsPage.java
@@
-49,6
+49,7
@@
public class ArtistsPage 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 {
Collection<Artist> artists = getCore().getDataManager().getAllArtists();
templateContext.set("artists", artists);
try {
Collection<Artist> artists = getCore().getDataManager().getAllArtists();
templateContext.set("artists", artists);
diff --git
a/src/main/java/net/pterodactylus/demoscenemusic/page/TrackPage.java
b/src/main/java/net/pterodactylus/demoscenemusic/page/TrackPage.java
index
9089046
..
c35c692
100644
(file)
--- a/
src/main/java/net/pterodactylus/demoscenemusic/page/TrackPage.java
+++ b/
src/main/java/net/pterodactylus/demoscenemusic/page/TrackPage.java
@@
-50,6
+50,7
@@
public class TrackPage 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 {
templateContext.set("track", getCore().getDataManager().getTrackById(request.getServletRequest().getParameter("id")));
} catch (DatabaseException de1) {
try {
templateContext.set("track", getCore().getDataManager().getTrackById(request.getServletRequest().getParameter("id")));
} catch (DatabaseException de1) {