[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: system/flows/intercept/expiring-password-flow....

[noreply at shibboleth.net]

Author: scantor
Date: Wed Oct 26 17:24:52 2016
New Revision: 8550

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8550&view=rev
Log:
Relocate expiring-password view template with the rest of the intercept views.

Added:
    trunk/idp-conf/src/main/resources/views/intercept/expiring-password.vm
      - copied unchanged from r8544, trunk/idp-conf/src/main/resources/views/expiring-password.vm
Modified:
    trunk/idp-conf/src/main/resources/system/flows/intercept/expiring-password-flow.xml
    trunk/idp-conf/src/main/resources/views/expiring-password.vm

Modified: trunk/idp-conf/src/main/resources/system/flows/intercept/expiring-password-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/intercept/expiring-password-flow.xml?rev=8550&r1=8549&r2=8550&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/intercept/expiring-password-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/intercept/expiring-password-flow.xml	Wed Oct 26 17:24:52 2016
@@ -27,7 +27,7 @@
             then="DisplayExpiringPasswordView" else="proceed" />
     </decision-state>
 
-    <view-state id="DisplayExpiringPasswordView" view="expiring-password">
+    <view-state id="DisplayExpiringPasswordView" view="#{flowRequestContext.activeFlow.id}">
         <on-render>
             <evaluate expression="ExpiringPasswordCookieManager.addCookie(ExpiringPasswordCookieName, T(java.lang.Long).toString(T(java.lang.System).currentTimeMillis()))" />
             <evaluate expression="environment" result="viewScope.environment" />