Add possibility to edit a field name.

diff --git a/src/main/java/net/pterodactylus/sone/web/EditProfileFieldPage.java b/src/main/java/net/pterodactylus/sone/web/EditProfileFieldPage.java
new file mode 100644 (file)
index 0000000..2b72a81
--- /dev/null
+++ b/src/main/java/net/pterodactylus/sone/web/EditProfileFieldPage.java
@@ -0,0 +1,96 @@
+/*
+ * Sone - EditProfileFieldPage.java - Copyright © 2011 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.pterodactylus.sone.web;
+
+import net.pterodactylus.sone.data.Profile;
+import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.web.page.Page.Request.Method;
+import net.pterodactylus.util.number.Numbers;
+import net.pterodactylus.util.template.DataProvider;
+import net.pterodactylus.util.template.Template;
+
+/**
+ * Page that lets the user edit the name of a profile field.
+ *
+ * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
+ */
+public class EditProfileFieldPage extends SoneTemplatePage {
+
+       /**
+        * Creates a new “edit profile field” page.
+        *
+        * @param template
+        *            The template to render
+        * @param webInterface
+        *            The Sone web interface
+        */
+       public EditProfileFieldPage(Template template, WebInterface webInterface) {
+               super("editProfileField.html", template, "Page.EditProfileField.Title", webInterface, true);
+       }
+
+       //
+       // SONETEMPLATEPAGE METHODS
+       //
+
+       /**
+        * {@inheritDoc}
+        */
+       @Override
+       protected void processTemplate(Request request, DataProvider dataProvider) throws RedirectException {
+               super.processTemplate(request, dataProvider);
+               Sone currentSone = getCurrentSone(request.getToadletContext());
+               Profile profile = currentSone.getProfile();
+
+               /* get parameters from request. */
+               int fieldIndex = Numbers.safeParseInteger(request.getHttpRequest().getParam("field"), -1);
+               if (fieldIndex >= currentSone.getProfile().getFieldNames().size()) {
+                       fieldIndex = -1;
+               }
+               String fieldName = null;
+               String fieldValue = null;
+               if (fieldIndex > -1) {
+                       fieldName = profile.getFieldNames().get(fieldIndex);
+                       fieldValue = profile.getField(fieldName);
+               }
+
+               /* process the POST request. */
+               if (request.getMethod() == Method.POST) {
+                       if (request.getHttpRequest().getPartAsStringFailsafe("cancel", 4).equals("true")) {
+                               throw new RedirectException("editProfile.html#profile-fields");
+                       }
+                       fieldIndex = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("field", 11), -1);
+                       String name = request.getHttpRequest().getPartAsStringFailsafe("name", 256);
+                       if (fieldIndex == -1) {
+                               throw new RedirectException("invalid.html");
+                       }
+                       int existingFieldIndex = profile.getFieldNames().indexOf(name);
+                       if ((existingFieldIndex == -1) || (existingFieldIndex == fieldIndex)) {
+                               profile.setFieldName(fieldIndex, name);
+                               currentSone.setProfile(profile);
+                               throw new RedirectException("editProfile.html#profile-fields");
+                       }
+                       dataProvider.set("duplicateFieldName", true);
+               }
+
+               /* store current values in template. */
+               dataProvider.set("fieldIndex", fieldIndex);
+               dataProvider.set("fieldName", fieldName);
+               dataProvider.set("fieldValue", fieldValue);
+       }
+
+}

diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index 52926a7..92809b2 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -473,6 +473,7 @@ public class WebInterface implements CoreListener {
                Template createPostTemplate = templateFactory.createTemplate(createReader("/templates/createPost.html"));
                Template createReplyTemplate = templateFactory.createTemplate(createReader("/templates/createReply.html"));
                Template editProfileTemplate = templateFactory.createTemplate(createReader("/templates/editProfile.html"));
+               Template editProfileFieldTemplate = templateFactory.createTemplate(createReader("/templates/editProfileField.html"));
                Template deleteProfileFieldTemplate = templateFactory.createTemplate(createReader("/templates/deleteProfileField.html"));
                Template viewSoneTemplate = templateFactory.createTemplate(createReader("/templates/viewSone.html"));
                Template viewPostTemplate = templateFactory.createTemplate(createReader("/templates/viewPost.html"));
@@ -499,6 +500,7 @@ public class WebInterface implements CoreListener {
                pageToadlets.add(pageToadletFactory.createPageToadlet(new CreateSonePage(createSoneTemplate, this), "CreateSone"));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new KnownSonesPage(knownSonesTemplate, this), "KnownSones"));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new EditProfilePage(editProfileTemplate, this), "EditProfile"));
+               pageToadlets.add(pageToadletFactory.createPageToadlet(new EditProfileFieldPage(editProfileFieldTemplate, this)));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new DeleteProfileFieldPage(deleteProfileFieldTemplate, this)));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new CreatePostPage(createPostTemplate, this)));
                pageToadlets.add(pageToadletFactory.createPageToadlet(new CreateReplyPage(createReplyTemplate, this)));

diff --git a/src/main/resources/i18n/sone.en.properties b/src/main/resources/i18n/sone.en.properties
index b040036..a9a540a 100644 (file)
--- a/src/main/resources/i18n/sone.en.properties
+++ b/src/main/resources/i18n/sone.en.properties
@@ -82,6 +82,14 @@ Page.EditProfile.Fields.AddField.Button.AddField=Add Field
 Page.EditProfile.Button.Save=Save Profile
 Page.EditProfile.Error.DuplicateFieldName=The field name “{fieldName}” does already exist.
 
+Page.EditProfileField.Title=Edit Profile Field - Sone
+Page.EditProfileField.Page.Title=Edit Profile Field
+Page.EditProfileField.Text=Enter a new name for this profile field.
+Page.EditProfileField.Error.DuplicateFieldName=The field name you entered does already exist.
+Page.EditProfileField.Button.Save=Save new name
+Page.EditProfileField.Button.Reset=Revert to old name
+Page.EditProfileField.Button.Cancel=Do not change name
+
 Page.DeleteProfileField.Title=Delete Profile Field - Sone
 Page.DeleteProfileField.Page.Title=Delete Profile Field
 Page.DeleteProfileField.Text=Do you really want to delete this profile field?

diff --git a/src/main/resources/templates/editProfileField.html b/src/main/resources/templates/editProfileField.html
new file mode 100644 (file)
index 0000000..c3f7f70
--- /dev/null
+++ b/src/main/resources/templates/editProfileField.html
@@ -0,0 +1,24 @@
+<%include include/head.html>
+
+       <h1><%= Page.EditProfileField.Page.Title|l10n|html></h1>
+
+       <p><%= Page.EditProfileField.Text|l10n|html></p>
+
+       <%if duplicateFieldName>
+               <p><%= Page.EditProfileField.Error.DuplicateFieldName|l10n|html></p>
+       <%/if>
+
+       <form method="post">
+               <input type="hidden" name="formPassword" value="<% formPassword|html>" />
+               <input type="hidden" name="field" value="<% fieldIndex>" />
+               <div>
+                       <input type="text" name="name" value="<% fieldName|html>" />
+                       <button type="submit" name="save" value="true"><%= Page.EditProfileField.Button.Save|l10n|html></button>
+               </div>
+               <div>
+                       <button type="reset"><%= Page.EditProfileField.Button.Reset|l10n|html></button>
+                       <button type="submit" name="cancel" value="true"><%= Page.EditProfileField.Button.Cancel|l10n|html></button>
+               </div>
+       </form>
+
+<%include include/tail.html>