From a37bcdc94282503e5165fa119d603f445c43680d Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Wed, 10 Jan 2018 10:23:46 +0000
Subject: [PATCH] CCM NG: Show name of pages instance in the table of pages
 instances in the Content Center (#2748)

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5184 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 6f6683c1826657622bd969d158cc5fa3d8141376
---
 .../cms/ui/contentcenter/PagesPane.java       | 32 +++++++++++++++++--
 .../org/librecms/CmsResources.properties      |  1 +
 .../org/librecms/CmsResources_de.properties   |  1 +
 .../org/librecms/CmsResources_fr.properties   |  1 +
 pom.xml                                       |  2 +-
 5 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/contentcenter/PagesPane.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/contentcenter/PagesPane.java
index faf9496f3..9e95408df 100644
--- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/contentcenter/PagesPane.java
+++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/contentcenter/PagesPane.java
@@ -119,8 +119,9 @@ class PagesPane extends CMSContainer {
     private class PagesTable extends Table {
 
         public static final int COL_SITE = 0;
-        public static final int COL_EDIT = 1;
-        public static final int COL_DELETE = 2;
+        public static final int COL_PAGES_INSTANCE = 1;
+        public static final int COL_EDIT = 2;
+        public static final int COL_DELETE = 3;
 
         public PagesTable() {
 
@@ -134,6 +135,12 @@ class PagesPane extends CMSContainer {
                     new Label(new GlobalizedMessage(
                         "cms.ui.contentcenter.pagestable.columns.site.header",
                         CmsConstants.CMS_BUNDLE))));
+            columnModel
+                .add(new TableColumn(
+                    COL_SITE,
+                    new Label(new GlobalizedMessage(
+                        "cms.ui.contentcenter.pagestable.columns.pages_instance.header",
+                        CmsConstants.CMS_BUNDLE))));
             columnModel
                 .add(new TableColumn(
                     COL_EDIT,
@@ -174,8 +181,25 @@ class PagesPane extends CMSContainer {
                             return new Text(pages.getSite().getDomainOfSite());
                         }
                     }
-
                 });
+            
+            columnModel
+            .get(COL_PAGES_INSTANCE)
+                .setCellRenderer(new TableCellRenderer() {
+
+                @Override
+                public Component getComponent(final Table table, 
+                                              final PageState state,
+                                              final Object value, 
+                                              final boolean isSelected,
+                                              final Object key, 
+                                              final int row, 
+                                              final int column) {
+                    
+                    final Pages pages = (Pages) value;
+                    return new Text(pages.getPrimaryUrl());
+                }
+            });
 
             columnModel
                 .get(COL_EDIT)
@@ -348,6 +372,8 @@ class PagesPane extends CMSContainer {
             switch (columnIndex) {
                 case PagesTable.COL_SITE:
                     return current;
+                case PagesTable.COL_PAGES_INSTANCE:
+                    return current;
                 case PagesTable.COL_EDIT:
                     return new Label(new GlobalizedMessage(
                         "cms.ui.contentcenter.pages.edit.label",
diff --git a/ccm-cms/src/main/resources/org/librecms/CmsResources.properties b/ccm-cms/src/main/resources/org/librecms/CmsResources.properties
index f075acb77..b0e7d308a 100644
--- a/ccm-cms/src/main/resources/org/librecms/CmsResources.properties
+++ b/ccm-cms/src/main/resources/org/librecms/CmsResources.properties
@@ -505,3 +505,4 @@ cms.ui.pages.pagemodels.save=Save
 cms.ui.pages.pagemodels.cancel=Cancel
 cms.ui.cateogry.is_visible=Is visible?
 cms.ui.category.cantmoved=This category can't be moved.
+cms.ui.contentcenter.pagestable.columns.pages_instance.header=Pages Instance
diff --git a/ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties b/ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties
index 3d7cefd7a..129b0af9f 100644
--- a/ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties
+++ b/ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties
@@ -502,3 +502,4 @@ cms.ui.pages.pagemodels.save=Speichern
 cms.ui.pages.pagemodels.cancel=Abbrechen
 cms.ui.cateogry.is_visible=Sichtbar?
 cms.ui.category.cantmoved=Diese Kategorie kann nicht verschoben werden.
+cms.ui.contentcenter.pagestable.columns.pages_instance.header=Pages Instanz
diff --git a/ccm-cms/src/main/resources/org/librecms/CmsResources_fr.properties b/ccm-cms/src/main/resources/org/librecms/CmsResources_fr.properties
index 90beec265..d89bfc330 100644
--- a/ccm-cms/src/main/resources/org/librecms/CmsResources_fr.properties
+++ b/ccm-cms/src/main/resources/org/librecms/CmsResources_fr.properties
@@ -462,3 +462,4 @@ cms.ui.pages.pagemodels.cancel=Cancel
 cms.ui.cateogry.is_visible=Is visible?
 cms.ui.category.cantmoved=This category can't be moved.
 cms.ui.category.localization_none=No localization available
+cms.ui.contentcenter.pagestable.columns.pages_instance.header=Pages Instance
diff --git a/pom.xml b/pom.xml
index e014de955..57dfe9f4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -253,7 +253,7 @@
                 <plugin>
                     <groupId>de.jpdigital</groupId>
                     <artifactId>hibernate50-ddl-maven-plugin</artifactId>
-                    <version>2.0.4</version>
+                    <version>2.1.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.jacoco</groupId>