Continued a bit: (please cherry-pick)

[addressbook-war.git] / web / user / login_index.xhtml

diff --git a/web/user/login_index.xhtml b/web/user/login_index.xhtml
index 59fae4fee000ab884a7ea5192bcbc297b70499e6..b85c6661c0a1bd55cb200dfd14a5b318225c7e91 100644 (file)
--- a/web/user/login_index.xhtml
+++ b/web/user/login_index.xhtml
@@ -15,10 +15,14 @@
                </ui:define>
 
                <ui:define name="content">
-                       <ui:fragment rendered="#{loginController.isUserLoggedIn()}">
+                       <ui:fragment rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
                                Here goes your content.
                        </ui:fragment>
 
+                       <ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
+                               <h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
+                       </ui:fragment>
+
                        <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                                <ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
                        </ui:fragment>