瀏覽代碼

[Bug fixed for 1019200] Corrected the message to tell whose password was changed. Added the new text to the message files to be translated.

rkeil 8 年之前
父節點
當前提交
0ea3fbffda

+ 1 - 0
src/main/java/password/pwm/i18n/Message.java

@@ -37,6 +37,7 @@ import java.util.Locale;
  */
 public enum Message implements PwmDisplayBundle {
     Success_PasswordChange(null),
+    Success_ChangedHelpdeskPassword(null),
     Success_SetupResponse(null),
     Success_ClearResponse(null),
     Success_Unknown(null),

+ 7 - 3
src/main/java/password/pwm/ws/server/rest/RestSetPasswordServer.java

@@ -59,6 +59,7 @@ import java.io.Serializable;
 public class RestSetPasswordServer extends AbstractRestServer {
 
     public static final PwmLogger LOGGER = PwmLogger.forClass(RestSetPasswordServer.class);
+    private static Serializable restResultBeanData;
 
     public static class JsonInputData implements Serializable
     {
@@ -196,10 +197,13 @@ public class RestSetPasswordServer extends AbstractRestServer {
             final RestResultBean restResultBean = new RestResultBean();
             restResultBean.setError(false);
             restResultBean.setData(jsonResultData);
-            restResultBean.setSuccessMessage(Message.getLocalizedMessage(
+            final String msg = Message.getLocalizedMessage(
                     restRequestBean.getPwmSession().getSessionStateBean().getLocale(),
-                    Message.Success_PasswordChange,
-                    restRequestBean.getPwmApplication().getConfig()));
+                    Message.Success_ChangedHelpdeskPassword,
+                    restRequestBean.getPwmApplication().getConfig());
+            String[] strs = jsonResultData.username.split("=");
+            strs = strs[1].split(",");
+            restResultBean.setSuccessMessage(msg + strs[0]);
             return restResultBean.asJsonResponse();
         } catch (PwmException e) {
             LOGGER.error("error during set password REST operation: " + e.getMessage());

+ 2 - 1
src/main/resources/password/pwm/i18n/Message.properties

@@ -157,7 +157,8 @@ Success_ClearResponse=Your secret questions and answers have been successfully r
 Success_CreateGuest=The new guest account has been successfully created.  The guest user will receive a notification if the email address has been entered.  The guest account may still need activation.
 Success_CreateUser=Your new user account has been successfully created.
 Success_NewUserForm=Your account is ready to be created.  Continue when ready.
-Success_PasswordChange=Your password has been changed successfully.
+Success_PasswordChange=The password has been changed successfully.
+Success_ChangedHelpdeskPassword=The password has been changed successfully for user 
 Success_PasswordReset=Password for %1% has been set successfully.
 Success_PasswordSend=Your new password has been sent to %1%.  Please close this window and then login using your new password.
 Success_ResponsesMeetRules=Your answers meet the requirements.  Click Save Answers when ready.