projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace delete sone page with Kotlin version
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
web
/
EditProfileFieldPage.java
diff --git
a/src/main/java/net/pterodactylus/sone/web/EditProfileFieldPage.java
b/src/main/java/net/pterodactylus/sone/web/EditProfileFieldPage.java
index
219bdc5
..
bbc6d6b
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/EditProfileFieldPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/EditProfileFieldPage.java
@@
-1,5
+1,5
@@
/*
/*
- * Sone - EditProfileFieldPage.java - Copyright © 2011 David Roden
+ * Sone - EditProfileFieldPage.java - Copyright © 2011
–2016
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
@@
-20,9
+20,10
@@
package net.pterodactylus.sone.web;
import net.pterodactylus.sone.data.Profile;
import net.pterodactylus.sone.data.Profile.Field;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.data.Profile;
import net.pterodactylus.sone.data.Profile.Field;
import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.web.page.
Page.Request.Method
;
+import net.pterodactylus.sone.web.page.
FreenetRequest
;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.template.TemplateContext;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.template.TemplateContext;
+import net.pterodactylus.util.web.Method;
/**
* Page that lets the user edit the name of a profile field.
/**
* Page that lets the user edit the name of a profile field.
@@
-51,8
+52,7
@@
public class EditProfileFieldPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
Sone currentSone = getCurrentSone(request.getToadletContext());
Profile profile = currentSone.getProfile();
Sone currentSone = getCurrentSone(request.getToadletContext());
Profile profile = currentSone.getProfile();
@@
-75,12
+75,15
@@
public class EditProfileFieldPage extends SoneTemplatePage {
}
String name = request.getHttpRequest().getPartAsStringFailsafe("name", 256);
Field existingField = profile.getFieldByName(name);
}
String name = request.getHttpRequest().getPartAsStringFailsafe("name", 256);
Field existingField = profile.getFieldByName(name);
- if ((existingField == null) || (existingField.equals(field))) {
- field.setName(name);
- currentSone.setProfile(profile);
+ if ((existingField != null) && (!field.equals(existingField))) {
+ templateContext.set("duplicateFieldName", true);
+ } else {
+ if (!name.equals(field.getName())) {
+ field.setName(name);
+ currentSone.setProfile(profile);
+ }
throw new RedirectException("editProfile.html#profile-fields");
}
throw new RedirectException("editProfile.html#profile-fields");
}
- templateContext.set("duplicateFieldName", true);
}
/* store current values in template. */
}
/* store current values in template. */