projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
If no current Sone exists, return an error.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
web
/
ajax
/
DeleteProfileFieldAjaxPage.java
diff --git
a/src/main/java/net/pterodactylus/sone/web/ajax/DeleteProfileFieldAjaxPage.java
b/src/main/java/net/pterodactylus/sone/web/ajax/DeleteProfileFieldAjaxPage.java
index
383d2d4
..
b787e8c
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/ajax/DeleteProfileFieldAjaxPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/ajax/DeleteProfileFieldAjaxPage.java
@@
-1,5
+1,5
@@
/*
/*
- * Sone - DeleteProfileFieldAjaxPage.java - Copyright © 2011 David Roden
+ * Sone - DeleteProfileFieldAjaxPage.java - Copyright © 2011
–2013
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
@@
-17,11
+17,17
@@
package net.pterodactylus.sone.web.ajax;
package net.pterodactylus.sone.web.ajax;
+import static com.fasterxml.jackson.databind.node.JsonNodeFactory.instance;
+
import net.pterodactylus.sone.data.Profile;
import net.pterodactylus.sone.data.Profile.Field;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.web.WebInterface;
import net.pterodactylus.sone.data.Profile;
import net.pterodactylus.sone.data.Profile.Field;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.web.WebInterface;
-import net.pterodactylus.util.json.JsonObject;
+import net.pterodactylus.sone.web.page.FreenetRequest;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.node.TextNode;
+import com.google.common.base.Optional;
/**
* AJAX page that lets the user delete a profile field.
/**
* AJAX page that lets the user delete a profile field.
@@
-40,22
+46,19
@@
public class DeleteProfileFieldAjaxPage extends JsonPage {
super("deleteProfileField.ajax", webInterface);
}
super("deleteProfileField.ajax", webInterface);
}
- /**
- * {@inheritDoc}
- */
@Override
@Override
- protected Json
Object createJsonObject(
Request request) {
+ protected Json
ReturnObject createJsonObject(Freenet
Request request) {
String fieldId = request.getHttpRequest().getParam("field");
Sone currentSone = getCurrentSone(request.getToadletContext());
Profile profile = currentSone.getProfile();
String fieldId = request.getHttpRequest().getParam("field");
Sone currentSone = getCurrentSone(request.getToadletContext());
Profile profile = currentSone.getProfile();
-
Field
field = profile.getFieldById(fieldId);
- if (
field == null
) {
+
Optional<Field>
field = profile.getFieldById(fieldId);
+ if (
!field.isPresent()
) {
return createErrorJsonObject("invalid-field-id");
}
return createErrorJsonObject("invalid-field-id");
}
- profile.removeField(field);
+ profile.removeField(field
.get()
);
currentSone.setProfile(profile);
currentSone.setProfile(profile);
- webInterface.getCore().
saveSone(currentSone
);
- return createSuccessJsonObject().put("field", new
JsonObject().put("id", field.getId(
)));
+ webInterface.getCore().
touchConfiguration(
);
+ return createSuccessJsonObject().put("field", new
ObjectNode(instance).put("id", new TextNode(field.get().getId()
)));
}
}
}
}