projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove bucket and access type from command interface
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
web
/
EditProfilePage.java
diff --git
a/src/main/java/net/pterodactylus/sone/web/EditProfilePage.java
b/src/main/java/net/pterodactylus/sone/web/EditProfilePage.java
index
38da1d4
..
cffdeb9
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/EditProfilePage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/EditProfilePage.java
@@
-1,5
+1,5
@@
/*
/*
- * Sone - EditProfilePage.java - Copyright © 2010–201
3
David Roden
+ * Sone - EditProfilePage.java - Copyright © 2010–201
6
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
*
* 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
@@
-23,9
+23,9
@@
import static net.pterodactylus.sone.utils.NumberParsers.parseInt;
import java.util.List;
import net.pterodactylus.sone.data.Profile;
import java.util.List;
import net.pterodactylus.sone.data.Profile;
+import net.pterodactylus.sone.data.Profile.DuplicateField;
import net.pterodactylus.sone.data.Profile.Field;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.data.Profile.Field;
import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.text.TextFilter;
import net.pterodactylus.sone.web.page.FreenetRequest;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.template.TemplateContext;
import net.pterodactylus.sone.web.page.FreenetRequest;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.template.TemplateContext;
@@
-59,8
+59,7
@@
public class EditProfilePage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
ToadletContext toadletContenxt = request.getToadletContext();
Sone currentSone = getCurrentSone(toadletContenxt);
Profile profile = currentSone.getProfile();
ToadletContext toadletContenxt = request.getToadletContext();
Sone currentSone = getCurrentSone(toadletContenxt);
Profile profile = currentSone.getProfile();
@@
-99,10
+98,9
@@
public class EditProfilePage extends SoneTemplatePage {
try {
profile.addField(fieldName);
currentSone.setProfile(profile);
try {
profile.addField(fieldName);
currentSone.setProfile(profile);
- fields = profile.getFields();
webInterface.getCore().touchConfiguration();
throw new RedirectException("editProfile.html#profile-fields");
webInterface.getCore().touchConfiguration();
throw new RedirectException("editProfile.html#profile-fields");
- } catch (
IllegalArgumentException iae
1) {
+ } catch (
DuplicateField df
1) {
templateContext.set("fieldName", fieldName);
templateContext.set("duplicateFieldName", true);
}
templateContext.set("fieldName", fieldName);
templateContext.set("duplicateFieldName", true);
}