From d0f46755e9b4ea54158f4d699e366d3da47187b7 Mon Sep 17 00:00:00 2001 From: jensp Date: Wed, 22 Feb 2017 09:52:16 +0000 Subject: [PATCH] CCM NG/ccm-cms FolderBrower: Link deleting non-live items now show up. git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4590 8810af33-2d31-482b-a856-94f89814c4df --- .../arsdigita/cms/ui/folder/FolderBrowserController.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderBrowserController.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderBrowserController.java index b53b8a580..3eb992f54 100644 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderBrowserController.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderBrowserController.java @@ -29,6 +29,7 @@ import org.libreccm.l10n.GlobalizationHelper; import org.librecms.CmsConstants; import org.librecms.contentsection.ContentItem; import org.librecms.contentsection.ContentItemL10NManager; +import org.librecms.contentsection.ContentItemManager; import org.librecms.contentsection.ContentItemVersion; import org.librecms.contentsection.ContentType; import org.librecms.contentsection.Folder; @@ -89,6 +90,9 @@ public class FolderBrowserController { @Inject private ContentTypesManager typesManager; + + @Inject + private ContentItemManager itemManager; private Locale defaultLocale; @@ -370,6 +374,8 @@ public class FolderBrowserController { type); row.setTypeLabelBundle(typeInfo.getLabelBundle()); row.setTypeLabelKey(typeInfo.getLabelKey()); + + row.setDeletable(!itemManager.isLive(item)); row.setCreated(item.getCreationDate()); row.setLastModified(item.getLastModified());