Please cherry-pick:

[jjobs-war.git] / web / admin / contact / admin_contact_export.xhtml

diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml
index 9f308c5916c8c2209f8f4ff856ef8dcb5f338639..644af7fa7f4df5aabae0445c802fdafc7b21eabe 100644 (file)
--- a/web/admin/contact/admin_contact_export.xhtml
+++ b/web/admin/contact/admin_contact_export.xhtml
@@ -18,11 +18,11 @@
        </ui:define>
 
        <ui:define name="content">
-               <h:form rendered="#{not contactController.allContacts().isEmpty()}">
+               <h:form rendered="#{not contactListController.allContacts.isEmpty()}">
                        <p:dataTable
                                id="table_export_contacts"
                                var="contact"
-                               value="#{contactController.allContacts()}"
+                               value="#{contactListController.allContacts}"
                                paginator="true"
                                rows="10"
                                emptyMessage="#{msg.ADMIN_EMPTY_LIST_CONTACT}"
@@ -163,8 +163,28 @@
                                                <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_CREATED}" />
                                        </f:facet>
 
-                                       <h:outputText id="contactCreated" value="#{contact.contactCreated}">
-                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" locale="#{localizationController.locale}" />
+                                       <h:outputText value="#{contact.contactEntryCreated}">
+                                               <f:convertDateTime
+                                                       type="both"
+                                                       timeStyle="short"
+                                                       dateStyle="short"
+                                                       locale="#{localizationController.locale}"
+                                                       />
+                                       </h:outputText>
+                               </p:column>
+
+                               <p:column>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_UPDATED}" />
+                                       </f:facet>
+
+                                       <h:outputText value="#{contact.contactEntryUpdated}">
+                                               <f:convertDateTime
+                                                       type="both"
+                                                       timeStyle="short"
+                                                       dateStyle="short"
+                                                       locale="#{localizationController.locale}"
+                                                       />
                                        </h:outputText>
                                </p:column>
                        </p:dataTable>