Changeset 12240

Timestamp:

15 Dec 2014, 07:44:01 (10 years ago)

Author:

Henrik Bettermann

Message:

Protect pdf download if document has not been published.

Add workflow transition 'retract'.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/documents

Files:

• fileviewlets.py (modified) (3 diffs)
• tests/test_browser.py (modified) (3 diffs)
• workflow.py (modified) (1 diff)

main/waeup.ikoba/trunk/src/waeup/ikoba/documents/fileviewlets.py

@@ -19 +19 @@
 import grok
 from waeup.ikoba.interfaces import MessageFactory as _
-
+from waeup.ikoba.interfaces import PUBLISHED
+from waeup.ikoba.browser.layout import UtilityView
 from waeup.ikoba.browser.fileviewlets import (
     FileDisplay, FileUpload, Image)
@@ -55 +56 @@
 
 
-class PDFScanImage(Image):
+class PDFScanImage(Image, UtilityView):
     """Scan document.
     """
@@ -64 +65 @@
     download_name = u'sample.pdf'
 
+    def render(self):
+        if self.context.state != PUBLISHED:
+            self.flash(_('The document requested has not yet been published.'),
+                type="warning")
+            self.redirect(self.url(self.context))
+            return
+        return super(PDFScanImage, self).render()
+

main/waeup.ikoba/trunk/src/waeup/ikoba/documents/tests/test_browser.py

@@ -37 +37 @@
 from waeup.ikoba.app import Company
 from waeup.ikoba.interfaces import (
-    IUserAccount, IJobManager, APPROVED, SUBMITTED,
+    IUserAccount, IJobManager, APPROVED, SUBMITTED, PUBLISHED,
     IFileStoreNameChooser, IExtFileStore, IFileStoreHandler)
 from waeup.ikoba.imagestorage import (
@@ -151 +151 @@
             'href="http://localhost/app/documents/d101/sample.pdf">PDF File</a>'
             in self.browser.contents)
-        # Browsing the link shows a real pdf
-        self.browser.open('sample.pdf')
+        # Browsing the link shows a real pdf only if the document
+        # has been published
+        self.browser.getLink("PDF File").click()
+        self.assertTrue(
+            'The document requested has not yet been published'
+            in self.browser.contents)
+        IWorkflowState(document).setState(PUBLISHED)
+        self.browser.getLink("sample.pdf").click()
         self.assertEqual(
             self.browser.headers['content-type'], 'application/pdf')
 
         # Transitions can be performed
+        self.assertEqual(document.state, 'published')
         self.browser.open(self.container_path + '/d101')
         self.browser.getLink("Transition").click()
-        self.browser.getControl(name="transition").value = ['publish']
+        self.browser.getControl(name="transition").value = ['retract']
         self.browser.getControl("Save").click()
-        self.assertEqual(document.state, 'published')
+        self.assertEqual(document.state, 'created')
 
         # Documents can be removed
@@ -189 +196 @@
             % document.document_id in logcontent)
         self.assertTrue(
-            'INFO - zope.mgr - %s - Document published' % document.document_id
+            'INFO - zope.mgr - %s - Document retracted' % document.document_id
             in logcontent)
         self.assertTrue(

main/waeup.ikoba/trunk/src/waeup/ikoba/documents/workflow.py

@@ -48 +48 @@
         msg = _('Document published'),
         destination = PUBLISHED),
+
+    Transition(
+        transition_id = 'retract',
+        title = _('Retract documet'),
+        source = PUBLISHED,
+        condition = NullCondition,
+        msg = _('Document retracted'),
+        destination = CREATED),
     )