Please cherry-pick:

- fixed wrong bean property name "Contact" was missing

diff --git a/web/admin/user/admin_user_activity_log.xhtml b/web/admin/user/admin_user_activity_log.xhtml
index 8af7f226241d8774204c2f670f10324d01ae5e9d..1e5002bc93ccb6a719316cd55fff83b3322704d7 100644 (file)
--- a/web/admin/user/admin_user_activity_log.xhtml
+++ b/web/admin/user/admin_user_activity_log.xhtml
@@ -57,7 +57,7 @@
                                                <h:outputText value="#{msg.ADMIN_LIST_USER_GENDER}" />
                                        </f:facet>
 
-                                       <h:outputText value="#{msg[userActivity.activityGender.messageKey]}" />
+                                       <h:outputText value="#{msg[userActivity.activityContactGender.messageKey]}" />
                                </h:column>
 
                                <h:column>
@@ -65,7 +65,7 @@
                                                <h:outputText value="#{msg.ADMIN_LIST_USER_FIRST_NAME}" />
                                        </f:facet>
 
-                                       <h:outputText value="#{userActivity.activityFirstName}" />
+                                       <h:outputText value="#{userActivity.activityContactFirstName}" />
                                </h:column>
 
                                <h:column>
@@ -73,7 +73,7 @@
                                                <h:outputText value="#{msg.ADMIN_LIST_USER_FAMILY_NAME}" />
                                        </f:facet>
 
-                                       <h:outputText value="#{userActivity.activityFamilyName}" />
+                                       <h:outputText value="#{userActivity.activityContactFamilyName}" />
                                </h:column>
 
                                <h:column>