jrivard@gmail.com 6 anos atrás
pai
commit
c18ed439e5

+ 2 - 6
server/src/main/resources/password/pwm/config/PwmSetting.xml

@@ -414,14 +414,10 @@
     </setting>
     <setting hidden="false" key="display.password.completeMessage" level="1">
         <flag>MacroSupport</flag>
-        <default>
-            <value />
-        </default>
+        <default/>
     </setting>
     <setting hidden="false" key="display.password.guideText" level="1">
-        <default>
-            <value />
-        </default>
+        <default/>
     </setting>
     <setting hidden="false" key="passwordSync.enableReplicaCheck" level="2">
         <default>

+ 1 - 0
webapp/src/main/webapp/WEB-INF/jsp/changepassword-agreement.jsp

@@ -69,6 +69,7 @@
                         <pwm:if test="<%=PwmIfTest.showIcons%>"><span class="btn-icon pwm-icon pwm-icon-sign-out"></span></pwm:if>
                         <pwm:display key="Button_Logout"/>
                     </button>
+                    <input type="hidden" name="pwmFormID" value="<pwm:FormID/>"/>
                 </form>
             </pwm:if>
             <pwm:if test="<%=PwmIfTest.forcedPageView%>" negate="true">

+ 1 - 1
webapp/src/main/webapp/public/resources/js/changepassword.js

@@ -379,7 +379,7 @@ PWM_CHANGEPW.startupChangePasswordPage=function() {
         });
     }
 
-    PWM_MAIN.addEventHandler('button-reset','click',function(){
+    PWM_MAIN.addEventHandler('button-reset','click',function(event){
         console.log('intercepted reset button');
 
         var p1Value = PWM_MAIN.getObject("password1").value;