From 927f9d885b134b7d4f45a68c42c5700b3c75cdbe Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Fri, 14 Jan 2011 11:21:12 +0100 Subject: [PATCH] Implement profile field deletion. --- .../sone/web/DeleteProfileFieldPage.java | 83 ++++++++++++++++++++++ .../net/pterodactylus/sone/web/WebInterface.java | 2 + src/main/resources/i18n/sone.en.properties | 6 ++ .../resources/templates/deleteProfileField.html | 19 +++++ 4 files changed, 110 insertions(+) create mode 100644 src/main/java/net/pterodactylus/sone/web/DeleteProfileFieldPage.java create mode 100644 src/main/resources/templates/deleteProfileField.html diff --git a/src/main/java/net/pterodactylus/sone/web/DeleteProfileFieldPage.java b/src/main/java/net/pterodactylus/sone/web/DeleteProfileFieldPage.java new file mode 100644 index 0000000..2d10b72 --- /dev/null +++ b/src/main/java/net/pterodactylus/sone/web/DeleteProfileFieldPage.java @@ -0,0 +1,83 @@ +/* + * Sone - DeleteProfileFieldPage.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 . + */ + +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 confirm the deletion of a profile field. + * + * @author David ‘Bombe’ Roden + */ +public class DeleteProfileFieldPage extends SoneTemplatePage { + + /** + * Creates a new “delete profile field” page. + * + * @param template + * The template to render + * @param webInterface + * The Sone web interface + */ + public DeleteProfileFieldPage(Template template, WebInterface webInterface) { + super("deleteProfileField.html", template, "Page.DeleteProfileField.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(); + 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); + } + if (request.getMethod() == Method.POST) { + if (request.getHttpRequest().getPartAsStringFailsafe("confirm", 4).equals("true")) { + fieldIndex = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("field", 11), -1); + if (fieldIndex > -1) { + profile.removeField(fieldIndex); + } + currentSone.setProfile(profile); + } + throw new RedirectException("editProfile.html#profile-fields"); + } + 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 6085ff8..2bf7381 100644 --- 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 deleteProfileFieldTemplate = templateFactory.createTemplate(createReader("/templates/deleteProfileField.html")); Template viewSoneTemplate = templateFactory.createTemplate(createReader("/templates/viewSone.html")); Template viewPostTemplate = templateFactory.createTemplate(createReader("/templates/viewPost.html")); Template likePostTemplate = templateFactory.createTemplate(createReader("/templates/like.html")); @@ -497,6 +498,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 DeleteProfileFieldPage(deleteProfileFieldTemplate, this))); pageToadlets.add(pageToadletFactory.createPageToadlet(new CreatePostPage(createPostTemplate, this))); pageToadlets.add(pageToadletFactory.createPageToadlet(new CreateReplyPage(createReplyTemplate, this))); pageToadlets.add(pageToadletFactory.createPageToadlet(new ViewSonePage(viewSoneTemplate, this))); diff --git a/src/main/resources/i18n/sone.en.properties b/src/main/resources/i18n/sone.en.properties index de68d65..88877b8 100644 --- a/src/main/resources/i18n/sone.en.properties +++ b/src/main/resources/i18n/sone.en.properties @@ -82,6 +82,12 @@ 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.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? +Page.DeleteProfileField.Button.Yes=Yes, delete +Page.DeleteProfileField.Button.No=No, do not delete + Page.CreatePost.Title=Create Post - Sone Page.CreatePost.Page.Title=Create Post Page.CreatePost.Label.Text=Post text: diff --git a/src/main/resources/templates/deleteProfileField.html b/src/main/resources/templates/deleteProfileField.html new file mode 100644 index 0000000..22b96c1 --- /dev/null +++ b/src/main/resources/templates/deleteProfileField.html @@ -0,0 +1,19 @@ +<%include include/head.html> + +

<%= Page.DeleteProfileField.Page.Title|l10n|html>

+ +

<%= Page.DeleteProfileField.Text|l10n|html>

+ +
+
<% fieldName|html>
+
<% fieldValue|html>
+
+ +
+ + + + +
+ +<%include include/tail.html> -- 2.7.4