projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Always store the current Sone in the template.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
web
/
LoginPage.java
diff --git
a/src/main/java/net/pterodactylus/sone/web/LoginPage.java
b/src/main/java/net/pterodactylus/sone/web/LoginPage.java
index
4965bbf
..
a72fd02
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/LoginPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/LoginPage.java
@@
-51,18
+51,12
@@
public class LoginPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(Request request, Template template) {
+ protected void processTemplate(Request request, Template template) throws RedirectException {
+ super.processTemplate(request, template);
Set<Sone> localSones = webInterface.core().localSones();
template.set("sones", localSones);
Set<Sone> localSones = webInterface.core().localSones();
template.set("sones", localSones);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected String getRedirectTarget(Request request) {
if (request.getMethod() == Method.POST) {
if (request.getMethod() == Method.POST) {
- String soneId = request.getHttpRequest().getPar
am("sone-id"
);
+ String soneId = request.getHttpRequest().getPar
tAsStringFailsafe("sone-id", 100
);
Sone selectedSone = null;
for (Sone sone : webInterface.core().localSones()) {
if (sone.getId().equals(soneId)) {
Sone selectedSone = null;
for (Sone sone : webInterface.core().localSones()) {
if (sone.getId().equals(soneId)) {
@@
-72,10
+66,17
@@
public class LoginPage extends SoneTemplatePage {
}
if (selectedSone != null) {
setCurrentSone(request.getToadletContext(), selectedSone);
}
if (selectedSone != null) {
setCurrentSone(request.getToadletContext(), selectedSone);
-
return "index.html"
;
+
throw new RedirectException("index.html")
;
}
}
}
}
- return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isEnabled(ToadletContext toadletContext) {
+ return getCurrentSone(toadletContext) == null;
}
}
}
}