diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/cse/ContentSoonExpiredPane.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/cse/ContentSoonExpiredPane.java index 125a29417..791a16fcd 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/cse/ContentSoonExpiredPane.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/cse/ContentSoonExpiredPane.java @@ -29,7 +29,7 @@ public class ContentSoonExpiredPane extends SimpleContainer { public ContentSoonExpiredPane() { super(); - add(new ContentSoonExpiredTable()); + super.add(new ContentSoonExpiredTable()); } } diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/cse/ContentSoonExpiredTable.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/cse/ContentSoonExpiredTable.java index 7d1316ed2..892d6f19f 100644 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/cse/ContentSoonExpiredTable.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/cse/ContentSoonExpiredTable.java @@ -52,11 +52,12 @@ public class ContentSoonExpiredTable extends Table { protected static final int COL_END_DATE_TIME = 4; public ContentSoonExpiredTable() { + super(); - final ContentSection section = CMS.getContext().getContentSection(); +// final ContentSection section = CMS.getContext().getContentSection(); - setModelBuilder(new ContentSoonExpiredTableModelBuilder()); + super.setModelBuilder(new ContentSoonExpiredTableModelBuilder()); final TableColumnModel columnModel = getColumnModel(); columnModel.add(new TableColumn( diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/cse/ContentSoonExpiredTableModelBuilder.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/cse/ContentSoonExpiredTableModelBuilder.java index abd71f357..197ef7509 100644 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/cse/ContentSoonExpiredTableModelBuilder.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/cse/ContentSoonExpiredTableModelBuilder.java @@ -27,7 +27,6 @@ import com.arsdigita.cms.CMS; import com.arsdigita.util.LockableImpl; import org.libreccm.cdi.utils.CdiUtil; -import org.librecms.contentsection.ContentItem; import org.librecms.contentsection.ContentSection; import java.util.List; diff --git a/ccm-cms/src/main/resources/org/librecms/CmsResources.properties b/ccm-cms/src/main/resources/org/librecms/CmsResources.properties index a32f3d829..eeb594088 100644 --- a/ccm-cms/src/main/resources/org/librecms/CmsResources.properties +++ b/ccm-cms/src/main/resources/org/librecms/CmsResources.properties @@ -528,3 +528,4 @@ cms.ui.permissions.table.privilege.headers.edit_asset= cms.ui.permissions.table.privilege.headers.use_asset=Use assets cms.ui.permissions.table.privilege.headers.view_asset=View assets cms.ui.category.no_category_systems_mapped=No category systems have been assigned to this Content Section +cms.ui.cse.none\ =No soon expired items were found. 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 4c0f4ca0d..3329e44fa 100644 --- a/ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties +++ b/ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties @@ -525,3 +525,4 @@ cms.ui.permissions.table.privilege.headers.edit_asset=Assets bearbeiten cms.ui.permissions.table.privilege.headers.use_asset=Assets verwenden cms.ui.permissions.table.privilege.headers.view_asset=Assets ansehen cms.ui.category.no_category_systems_mapped=Dieser Content Section wurden keine Kategoriensysteme zugeordnet +cms.ui.cse.none\ =Es wurden keine bald abgelaufenden Dokumente gefunden. 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 6adbaaa14..8d3fc6154 100644 --- a/ccm-cms/src/main/resources/org/librecms/CmsResources_fr.properties +++ b/ccm-cms/src/main/resources/org/librecms/CmsResources_fr.properties @@ -487,3 +487,4 @@ cms.ui.permissions.table.privilege.headers.edit_asset=Edit assets cms.ui.permissions.table.privilege.headers.use_asset=Use assets cms.ui.permissions.table.privilege.headers.view_asset=View assets cms.ui.category.no_category_systems_mapped=No category systems have been assigned to this Content Section +cms.ui.cse.none\ =No soon expired items were found.