LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

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: 6f6683c182
pull/2/head
jensp 2018-01-10 10:23:46 +00:00
parent 0b5f1f3cbf
commit a37bcdc942
5 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ccm-cms/src/main/java/com/arsdigita/cms/ui/contentcenter/PagesPane.java
View File

@ -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,9 +181,26 @@ 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)
.setCellRenderer(new TableCellRenderer() {
@ -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",

1
ccm-cms/src/main/resources/org/librecms/CmsResources.properties
View File

@ -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

1
ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties
View File

@ -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

1
ccm-cms/src/main/resources/org/librecms/CmsResources_fr.properties
View File

@ -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

2
pom.xml
View File

@ -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>