Continued a bit: (please cherry-pick)

[pizzaservice-war.git] / web / guest / user / lost_passwd.xhtml
diff --git a/web/guest/user/lost_passwd.xhtml b/web/guest/user/lost_passwd.xhtml

index 01faefeff2ab9b312cc0bbfd86920bbbb6d20b84..267b61f02c220382490d75500c0bcfa45ba6f171 100644 (file)
--- a/web/guest/user/lost_passwd.xhtml
+++ b/web/guest/user/lost_passwd.xhtml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" ?>
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html
         lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
@@ -16,7 +15,7 @@
                 </ui:define>
  
                 <ui:define name="content">
-                       <ui:fragment rendered="#{userController.isUserNameRequired()}">
+                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required') and featureController.isFeatureEnabled('user_password_recovery')}">
                                 <div class="para" id="user_lost_password_content">
                                         <h:form id="lost_password_form">
                                                 <div class="table">
@@ -68,7 +67,7 @@
                                 </div>
                         </ui:fragment>
  
-                       <ui:fragment rendered="#{not userController.isUserNameRequired()}">
+                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_name_required') or not featureController.isFeatureEnabled('user_password_recovery')}">
                                 <h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DEACTIVATED}" />
                         </ui:fragment>
                 </ui:define>