projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move all Kotlin files to the correct directory
[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
e5bee78
..
bbc6d6b
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/EditProfileFieldPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/EditProfileFieldPage.java
@@
-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. */