Fixed: (please cherry-pick)

- rendered should not be used on command buttons or any form tags (such as input tags) as it makes it impossible that the data is being transfered to the backing bean.

diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml
index 6800f5ee864493d534422d5c7244c6f85088ccdb..0b2e482136989dfb8ab12d0d197ebceb1757489f 100644 (file)
--- a/web/admin/user/admin_user_lock.xhtml
+++ b/web/admin/user/admin_user_lock.xhtml
@@ -68,9 +68,7 @@
                                                </div>
 
                                                <div>
-                                                       <h:inputTextarea id="userLockReason" value="#{adminUserController.userLockReason}" cols="50" rows="10" required="true" requiredMessage="#{msg.ADMIN_USER_UNLOCK_REASON_REQUIRED}" rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}" />
-
-                                                       <h:outputText value="#{msg.ERROR_CANNOT_LOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}" />
+                                                       <h:inputTextarea id="userLockReason" value="#{adminUserController.userLockReason}" cols="50" rows="10" required="true" requiredMessage="#{msg.ADMIN_USER_UNLOCK_REASON_REQUIRED}" />
                                                </div>
                                        </div>
 

diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index 5d321208759fee58c768d384890a8937f06b7029..d3c42124af0ac731d9b6d952aca6b58ed95f5431 100644 (file)
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -67,9 +67,7 @@
                                                </div>
 
                                                <div>
-                                                       <h:outputText value="#{adminUserController.userLockReason}" rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}" />
-
-                                                       <h:outputText value="#{msg.ERROR_CANNOT_UNLOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}" />
+                                                       <h:outputText value="#{adminUserController.userLockReason}" />
                                                </div>
                                        </div>