Please cherry-pick:

- fixed fooCreated to fooEntryCreated
- added fooEntryUpdated
- TODO: rename user<Created|Updated> to userEntry<Created|Updated>

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/web/admin/department/admin_department_list.xhtml b/web/admin/department/admin_department_list.xhtml
index f0e7e70292c4171c7fae6c43999d0f52dbbccc7e..807e1628b4280d00ee5f4e8423710a71c51777f1 100644 (file)
--- a/web/admin/department/admin_department_list.xhtml
+++ b/web/admin/department/admin_department_list.xhtml
@@ -282,10 +282,20 @@
 
                                <p:column
                                        headerText="#{msg.ENTRY_CREATED_HEADER}"
-                                       sortBy="#{department.departmentCreated}"
+                                       sortBy="#{department.departmentEntryCreated}"
                                        filterable="false"
                                        >
-                                       <h:outputText id="departmentCreated" value="#{department.departmentCreated}">
+                                       <h:outputText value="#{department.departmentEntryCreated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+                                       </h:outputText>
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{msg.ENTRY_UPDATED_HEADER}"
+                                       sortBy="#{department.departmentEntryUpdated}"
+                                       filterable="false"
+                                       >
+                                       <h:outputText value="#{department.departmentEntryUpdated}">
                                                <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>

diff --git a/web/admin/headquarter/admin_headquarter_list.xhtml b/web/admin/headquarter/admin_headquarter_list.xhtml
index c0d3d1509c12678142c5ab330cf1329d7297b469..f8f18a88436abaefd8aa9de1deae17829672d18e 100644 (file)
--- a/web/admin/headquarter/admin_headquarter_list.xhtml
+++ b/web/admin/headquarter/admin_headquarter_list.xhtml
@@ -218,10 +218,20 @@
 
                                <p:column
                                        headerText="#{msg.ENTRY_CREATED_HEADER}"
-                                       sortBy="#{headquarter.headquarterCreated}"
+                                       sortBy="#{headquarter.headquarterEntryCreated}"
                                        filterable="false"
                                        >
-                                       <h:outputText id="headquarterCreated" value="#{headquarter.headquarterCreated}">
+                                       <h:outputText value="#{headquarter.headquarterEntryCreated}">
+                                               <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
+                                       </h:outputText>
+                               </p:column>
+
+                               <p:column
+                                       headerText="#{msg.ENTRY_UPDATED_HEADER}"
+                                       sortBy="#{headquarter.headquarterEntryUpdated}"
+                                       filterable="false"
+                                       >
+                                       <h:outputText value="#{headquarter.headquarterEntryUpdated}">
                                                <f:convertDateTime type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>