[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/att...

[noreply at shibboleth.net]

Author: tzeller
Date: Thu Oct  2 19:10:22 2014
New Revision: 6617

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6617&view=rev
Log:
Improve consent templates. Add locale aware attribute display name function.

Added:
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/AttributeDisplayNameFunction.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-flow.xml
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/per-attribute-consent/per-attribute-consent-flow.xml
    trunk/idp-conf/src/main/resources/views/post-authn/consent/attribute-consent.vm
    trunk/idp-conf/src/main/resources/views/post-authn/consent/per-attribute-consent.vm
    trunk/idp-conf/src/main/resources/views/post-authn/consent/terms-of-use.vm

Modified: trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-flow.xml?rev=6617&r1=6616&r2=6617&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-flow.xml Thu Oct  2 19:10:22 2014
@@ -46,6 +46,7 @@
             <evaluate expression="flowRequestContext.getExternalContext().getNativeRequest()" result="requestScope.request" />
             <evaluate expression="flowRequestContext.getExternalContext().getNativeResponse()" result="requestScope.response" />
             <evaluate expression="T(net.shibboleth.utilities.java.support.codec.HTMLEncoder)" result="requestScope.encoder" />
+            <evaluate expression="new net.shibboleth.idp.consent.logic.AttributeDisplayNameFunction(flowRequestContext.getExternalContext().getLocale())" result="requestScope.attributeDisplayNameFunction" />
             <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.consent.context.ConsentContext))" result="viewScope.consentContext" />
             <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.consent.context.AttributeConsentContext))" result="viewScope.attributeConsentContext" />
         </on-render>

Modified: trunk/idp-conf/src/main/resources/flows/post-authn/consent/per-attribute-consent/per-attribute-consent-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/post-authn/consent/per-attribute-consent/per-attribute-consent-flow.xml?rev=6617&r1=6616&r2=6617&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/post-authn/consent/per-attribute-consent/per-attribute-consent-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/post-authn/consent/per-attribute-consent/per-attribute-consent-flow.xml Thu Oct  2 19:10:22 2014
@@ -46,6 +46,7 @@
             <evaluate expression="flowRequestContext.getExternalContext().getNativeRequest()" result="requestScope.request" />
             <evaluate expression="flowRequestContext.getExternalContext().getNativeResponse()" result="requestScope.response" />
             <evaluate expression="T(net.shibboleth.utilities.java.support.codec.HTMLEncoder)" result="requestScope.encoder" />
+            <evaluate expression="new net.shibboleth.idp.consent.logic.AttributeDisplayNameFunction(flowRequestContext.getExternalContext().getLocale())" result="requestScope.attributeDisplayNameFunction" />
             <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.consent.context.ConsentContext))" result="viewScope.consentContext" />
             <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.consent.context.AttributeConsentContext))" result="viewScope.attributeConsentContext" />
         </on-render>

Modified: trunk/idp-conf/src/main/resources/views/post-authn/consent/attribute-consent.vm
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/views/post-authn/consent/attribute-consent.vm?rev=6617&r1=6616&r2=6617&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/views/post-authn/consent/attribute-consent.vm (original)
+++ trunk/idp-conf/src/main/resources/views/post-authn/consent/attribute-consent.vm Thu Oct  2 19:10:22 2014
@@ -25,16 +25,10 @@
                                 #set($serializedValue = ${consentContext.getConsentChoices().get($attribute.id).getSecond()} )
                                 #set($encodedValue = $encoder.encodeForHTML($serializedValue) )
                                 <tr>
-                                    <td>$attribute.id</td>

[... 83 lines stripped ...]