Browse Source

Fixed the message when resetting the config password to remind the user that they must also select the save icon to actually save the password instead of just storing it.

rkeil 8 years ago
parent
commit
68e1f1c9fe

+ 3 - 1
src/main/java/password/pwm/http/servlet/configeditor/ConfigEditorServlet.java

@@ -64,6 +64,7 @@ import password.pwm.http.PwmSession;
 import password.pwm.http.bean.ConfigManagerBean;
 import password.pwm.http.servlet.AbstractPwmServlet;
 import password.pwm.http.servlet.configmanager.ConfigManagerServlet;
+import password.pwm.i18n.Config;
 import password.pwm.i18n.Message;
 import password.pwm.i18n.PwmLocaleBundle;
 import password.pwm.ldap.LdapBrowser;
@@ -481,7 +482,8 @@ public class ConfigEditorServlet extends AbstractPwmServlet {
             configManagerBean.getStoredConfiguration().setPassword(password);
             configManagerBean.setPasswordVerified(true);
             LOGGER.debug(pwmRequest, "config password updated");
-            final RestResultBean restResultBean = RestResultBean.forSuccessMessage(pwmRequest, Message.Success_Unknown);
+            final RestResultBean restResultBean = RestResultBean.forConfirmMessage(pwmRequest, Config.Confirm_ConfigPasswordStored);
+
             pwmRequest.outputJsonResult(restResultBean);
         } catch (PwmOperationalException e) {
             final RestResultBean restResultBean = RestResultBean.fromError(e.getErrorInformation(), pwmRequest);

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

@@ -34,6 +34,7 @@ public enum Config implements PwmDisplayBundle {
     Button_CheckSettings,
     Button_ShowAdvanced,
     Button_HideAdvanced,
+    Confirm_ConfigPasswordStored,
     Confirm_LockConfig,
     Confirm_SkipGuide,
     Confirm_UploadConfig,

+ 22 - 0
src/main/java/password/pwm/ws/server/RestResultBean.java

@@ -26,6 +26,7 @@ import password.pwm.PwmApplication;
 import password.pwm.config.Configuration;
 import password.pwm.error.ErrorInformation;
 import password.pwm.http.PwmRequest;
+import password.pwm.i18n.Config;
 import password.pwm.i18n.Message;
 import password.pwm.util.java.JsonUtil;
 
@@ -164,6 +165,27 @@ public class RestResultBean implements Serializable {
         return forSuccessMessage(pwmRequest.getLocale(), pwmRequest.getConfig(), message);
     }
 
+    public static RestResultBean forConfirmMessage(
+            final Locale locale,
+            final Configuration config,
+            final Config message,
+            final String... fieldValues
+
+    ) {
+        final RestResultBean restResultBean = new RestResultBean();
+        final String msgText = Config.getLocalizedMessage(locale, message, config);
+        restResultBean.setSuccessMessage(msgText);
+        return restResultBean;
+    }
+
+    public static RestResultBean forConfirmMessage(
+            final PwmRequest pwmRequest,
+            final Config message
+    ) {
+        return forConfirmMessage(pwmRequest.getLocale(), pwmRequest.getConfig(), message);
+    }
+
+
     public String toJson() {
         return JsonUtil.serialize(this);
     }

+ 1 - 0
src/main/resources/password/pwm/i18n/Config.properties

@@ -37,6 +37,7 @@ Button_Previous=Previous
 Button_CheckSettings=Check Settings
 Button_ShowAdvanced=Show %1% Advanced Settings
 Button_HideAdvanced=Hide Advanced Settings
+Confirm_ConfigPasswordStored=The configuration password has been changed; please click the "save" icon to store the new password.
 Confirm_RemoveProfile=Are you sure you want to remove the profile <code>%1%</code>?  The setting values associated with this profile will also be removed.
 Confirm_LockConfig=Are you sure you want to restrict the configuration?  After you restrict the configuration, you must authenticate using your LDAP directory credentials before authenticating, so be sure your LDAP configuration is working properly before restricting.
 Confirm_SkipGuide=Are you sure you want to skip the configuration guide?