Repository: syncope Updated Branches: refs/heads/master 166b2f9f9 -> d7c848cee
[SYNCOPE-1022] security question special chracters correctly managed Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d7c848ce Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d7c848ce Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d7c848ce Branch: refs/heads/master Commit: d7c848cee63695dbf0f63dee6dcc53f52e838b11 Parents: 166b2f9 Author: Andrea Patricelli <andrea.patrice...@tirasa.net> Authored: Tue Mar 7 16:01:50 2017 +0100 Committer: Andrea Patricelli <andrea.patrice...@tirasa.net> Committed: Tue Mar 7 16:03:03 2017 +0100 ---------------------------------------------------------------------- .../client/enduser/resources/SecurityQuestionResource.java | 4 ++-- .../resources/META-INF/resources/app/languages/de/static.json | 2 +- .../resources/META-INF/resources/app/languages/en/static.json | 2 +- .../resources/META-INF/resources/app/languages/it/static.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/d7c848ce/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SecurityQuestionResource.java ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SecurityQuestionResource.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SecurityQuestionResource.java index d812f72..452f337 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SecurityQuestionResource.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/SecurityQuestionResource.java @@ -63,8 +63,6 @@ public class SecurityQuestionResource extends AbstractBaseResource { //if the username is defined then retrieve its security questions, otherwise retrieve all security questions if (!username.isEmpty()) { final SecurityQuestionTO securityQuestionTO = securityQuestionService.readByUser(username.toString()); - response.setContentType(MediaType.APPLICATION_JSON); - response.setTextEncoding(SyncopeConstants.DEFAULT_ENCODING); response.setWriteCallback(new AbstractResource.WriteCallback() { @Override @@ -84,6 +82,8 @@ public class SecurityQuestionResource extends AbstractBaseResource { }); } + response.setContentType(MediaType.APPLICATION_JSON); + response.setTextEncoding(SyncopeConstants.DEFAULT_ENCODING); response.setStatusCode(Response.Status.OK.getStatusCode()); } catch (Exception e) { LOG.error("Error retrieving security questions", e); http://git-wip-us.apache.org/repos/asf/syncope/blob/d7c848ce/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json b/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json index db47711..6212344 100644 --- a/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json +++ b/client/enduser/src/main/resources/META-INF/resources/app/languages/de/static.json @@ -49,7 +49,7 @@ "NEWUSER": "Neuer Benutzer", "SUCCESSFULLY_CREATED": "erfolgreich erstellt", "SUCCESSFULLY_UPDATED": "erfolgreich aktualisiert", - "PASSWORD_UPDATED": "Passwort erfolgreich aktualisisert", + "PASSWORD_UPDATED": "Passwort erfolgreich reset", "GOBACKHOME": "Hier klicken um zur Homepage zurück zu gelangen", "CONFIRM_REMOVE": "Löschen bestätigen", "own": "Besitzen" http://git-wip-us.apache.org/repos/asf/syncope/blob/d7c848ce/client/enduser/src/main/resources/META-INF/resources/app/languages/en/static.json ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/resources/META-INF/resources/app/languages/en/static.json b/client/enduser/src/main/resources/META-INF/resources/app/languages/en/static.json index fe88e0f..076bd6c 100644 --- a/client/enduser/src/main/resources/META-INF/resources/app/languages/en/static.json +++ b/client/enduser/src/main/resources/META-INF/resources/app/languages/en/static.json @@ -49,7 +49,7 @@ "NEWUSER": "New User", "SUCCESSFULLY_CREATED": "succesfully created", "SUCCESSFULLY_UPDATED": "succesfully updated", - "PASSWORD_UPDATED": ": password succesfully updated", + "PASSWORD_UPDATED": ": password succesfully reset", "GOBACKHOME": "Click on this link to go back to the home page", "CONFIRM_REMOVE": "This will remove the current value. Continue?", "own": "Own" http://git-wip-us.apache.org/repos/asf/syncope/blob/d7c848ce/client/enduser/src/main/resources/META-INF/resources/app/languages/it/static.json ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/resources/META-INF/resources/app/languages/it/static.json b/client/enduser/src/main/resources/META-INF/resources/app/languages/it/static.json index 803885f..d5c7038 100644 --- a/client/enduser/src/main/resources/META-INF/resources/app/languages/it/static.json +++ b/client/enduser/src/main/resources/META-INF/resources/app/languages/it/static.json @@ -49,7 +49,7 @@ "REALM": "Realm", "SUCCESSFULLY_CREATED": "creato con successo", "SUCCESSFULLY_UPDATED": "aggiornato con successo", - "PASSWORD_UPDATED": ": password succesfully updated", + "PASSWORD_UPDATED": ": password resettata con successo", "GOBACKHOME": "Clicca su questo link per tornare alla home page", "CONFIRM_REMOVE": "Questa azione rimuoverà il valore corrente. Continuare?", "own": "Propri"
