From 0fd8794d83fe2f7d40ea6d4f3c55219a05fda974 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Mon, 30 Dec 2013 14:50:51 +0100
Subject: [PATCH] possibility to unfile items from classifying folders (#3875)

---
 src/pfwbged/folder/configure.zcml  |   5 +++++
 src/pfwbged/folder/folder.py       |  34 ++++++++++++++++++++++++++++-
 src/pfwbged/folder/link.py         |   2 ++
 src/pfwbged/folder/unlink_icon.png | Bin 0 -> 760 bytes
 4 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 src/pfwbged/folder/unlink_icon.png

diff --git a/src/pfwbged/folder/configure.zcml b/src/pfwbged/folder/configure.zcml
index 18f695f..c3c6b5f 100644
--- a/src/pfwbged/folder/configure.zcml
+++ b/src/pfwbged/folder/configure.zcml
@@ -30,6 +30,11 @@
       image="pfwbgedfolder_icon.png"
       />
 
+  <browser:resource
+      name="unlink_icon.png"
+      image="unlink_icon.png"
+      />
+
   <browser:page
       name="view"
       for="pfwbged.folder.IFolder"
diff --git a/src/pfwbged/folder/folder.py b/src/pfwbged/folder/folder.py
index 03050de..ab27974 100644
--- a/src/pfwbged/folder/folder.py
+++ b/src/pfwbged/folder/folder.py
@@ -3,6 +3,7 @@ from zope.interface import implements
 from five import grok
 from zope import component
 from zope import schema
+from zope.interface import Interface
 
 from zc.relation.interfaces import ICatalog
 from zope.app.intid.interfaces import IIntIds
@@ -30,6 +31,9 @@ from zope.app.intid.interfaces import IIntIds
 from z3c.relationfield import RelationValue
 from zope.lifecycleevent.interfaces import IObjectAddedEvent
 
+import z3c.table.column
+
+
 
 from pfwbged.collection.searchview import ResultsTable
 from collective.dms.thesaurus.keywordsfield import ThesaurusKeywords
@@ -108,11 +112,39 @@ grok.templatedir('templates')
 grok.context(IDexterityContainer)
 
 
+class ItemsTable(ResultsTable):
+    def setUpColumns(self):
+        columns = super(ItemsTable, self).setUpColumns()
+        # do not include the delete column, from classifying folders we only
+        # provide an icon for unlink
+        columns = [x for x in columns if x.__name__ != 'dms.delete']
+        return columns
+
+
+from collective.dms.basecontent.browser import column
+
+class UnfileColumn(column.IconColumn, column.LinkColumn):
+    grok.name('pfwbged.folder.unfile')
+    grok.adapts(Interface, Interface, ItemsTable)
+
+    header = u''
+    iconName = "++resource++unlink_icon.png"
+    linkContent = _('Unfile')
+
+    def getLinkURL(self, item):
+        for id, child in item.getObject().contentItems():
+            if not ILink.providedBy(child):
+                continue
+            if child.folder.to_object == self.context:
+                return item.getURL() + '/' + id + '/delete_confirmation'
+        return '#'
+
+
 class ClassifiedItems:
 
     @property
     def table(self):
-        table = ResultsTable(self.context, self.request)
+        table = ItemsTable(self.context, self.request)
         table.values = self.documents()
         table.update()
         return table
diff --git a/src/pfwbged/folder/link.py b/src/pfwbged/folder/link.py
index 91342b4..44bc04a 100644
--- a/src/pfwbged/folder/link.py
+++ b/src/pfwbged/folder/link.py
@@ -90,6 +90,8 @@ class DeleteColumn(column.DeleteColumn):
     grok.name('dms.delete')
     grok.adapts(Interface, Interface, LinksTable)
 
+    iconName = "++resource++unlink_icon.png"
+
 
 class LinkViewlet(BaseViewlet):
     grok.order(15)
diff --git a/src/pfwbged/folder/unlink_icon.png b/src/pfwbged/folder/unlink_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba68f72ac63fb40a0f9d4869e58afa2874c040b7
GIT binary patch
literal 760
zcmV<U0tfwxP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D00003b3#c}2nYz<
z;ZNWI000SaNLh0L01ejw01ejxLMWSf0000PbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}
zWiD@WXPfRk8UO$RXi!X4MgRZ*=5YW;NlCiCw%gy^Ff=$+SX8^ax7TC<_xJbCTL92o
z05do`S6Wp!Jv~}oST8g-RaR1BWnYSnh_$$|yS=#L<Kq7Q{#RI4+uYkOG&M&_NK{r*
zy1ll|&dT=o_PV{c^m_w0JwIDrSzTRO&tC*sT2@9&OweHl*k%RTX9nqc5b1dlet><}
z*VZpJHdIzpe13T@G&WCCPgGV?RaaA3T2@(GS6W+FWoKh+ZE0?AYj1IFadK~VcXM}m
zb$ow$gN1;Xo0gcHm7k%Vv$U|Zx3IOhvbDIfx3{sny|%l)x4pi*z`(r1!@tDFz{SVG
z%g)Hq(azD+&eYV<+1l9N-rC>a-QeKd;Nacl<l*M#<mc$-=;`R`>E`O4OzrLK?d|OC
z?(OdG?C<dI@$vBU^YQcZ^7MKH^nDBTv0n7`^!2l3_4V}j_VxDm_W1bs`T6<#*Q)#3
zuKme<{pQ5}>B|1<%t73<K>z>%GIUZ-Qvf|bKR-Y~KtMo4MrmoNsIRZDudlDKuduMO
zv9YnSv9h_?*y8E)^z`)f_4W4r{r&zVqz?lC006{EL_t&-m1AI&F)=Yv=4Ai_US&ZB
zPWkNglu%uM5T9Q!Nt}UQ*2~M=KiJB|)YQa2AyAZoO~%~R+`-$~+Q-M*J-|=`s8B63
z+Qt+LY$bsLDxP6!x%mZ!d8vu9F=7l%(#CeaArVn=$>BkMt}en1EOH)>mKHEAW<m_i
z3SM4rPU?IhYx&fjL>O45jEwY^cpwhrQ4(Ol4iqyoK_EjBCcvmuTwYpMq|FFd!l9K@
qlBLOkq=`!-UV{t87;aT=Fbx29<t5Fi!_h_n0000<MNUMnLSTZ#wt&z8

literal 0
HcmV?d00001