Changeset 12215 for main/waeup.ikoba/trunk/src/waeup/ikoba

Timestamp:

13 Dec 2014, 17:21:27 (10 years ago)

Author:

Henrik Bettermann

Message:

Add DocumentTriggerTransitionFormPage?.

Do not add document without editing document title.

Location:

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

Files:

• customers/browser.py (modified) (1 diff)
• customers/browser_templates/documentaddform.pt (modified) (1 diff)
• customers/tests/test_browser.py (modified) (3 diffs)
• documents/browser.py (modified) (4 diffs)
• documents/browser_templates/documentaddform.pt (modified) (1 diff)
• documents/viewlets.py (modified) (3 diffs)
• documents/workflow.py (modified) (1 diff)

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/browser.py

@@ -811 +811 @@
     pnav = 4
 
+    form_fields = grok.AutoFields(ICustomerDocument)
+
     @property
     def selectable_doctypes(self):

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/browser_templates/documentaddform.pt

@@ -18 +18 @@
       </tr>
     </tbody>
+    <tal:widgets content="structure provider:widgets" />
   </table>
   <div tal:condition="view/availableActions">

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

@@ -828 +828 @@
         self.browser.getControl("Add document").click()
         self.browser.getControl(name="doctype").value = ['CustomerPDFDocument']
+        self.browser.getControl(name="form.title").value = 'My PDF Document'
         self.browser.getControl("Add document").click()
         self.assertTrue('PDF Document added.' in self.browser.contents)
@@ -899 +900 @@
         self.browser.getControl("Add document").click()
         self.browser.getControl(name="doctype").value = ['CustomerSampleDocument']
+        self.browser.getControl(name="form.title").value = 'My Sample Document'
         self.browser.getControl("Add document").click()
         self.assertTrue('Sample Document added.' in self.browser.contents)
@@ -1037 +1039 @@
         self.browser.getControl("Add document").click()
         self.browser.getControl(name="doctype").value = ['CustomerPDFDocument']
+        self.browser.getControl(name="form.title").value = 'My PDF Document'
         self.browser.getControl("Add document").click()
         self.browser.open(self.documents_path + '/d102/manage')

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

@@ -24 +24 @@
 from urllib import urlencode
 from datetime import datetime
+from hurry.workflow.interfaces import (
+    IWorkflowInfo, IWorkflowState, InvalidTransitionError)
 from zope.event import notify
 from zope.i18n import translate
@@ -116 +118 @@
     pnav = 2
 
+    form_fields = grok.AutoFields(IPublicDocument)
+
     @property
     def selectable_doctypes(self):
@@ -149 +153 @@
     grok.name('index')
     grok.require('waeup.viewDocuments')
-    #grok.template('basepage')
+    grok.template('documentpage')
     pnav = 2
 
@@ -198 +202 @@
     def delLocalRoles(self, **data):
         return del_local_roles(self,2,**data)
+
+
+class DocumentTriggerTransitionFormPage(IkobaEditFormPage):
+    """ View to trigger public document transitions
+    """
+    grok.context(IPublicDocument)
+    grok.name('trigtrans')
+    grok.require('waeup.triggerTransition')
+    grok.template('trigtrans')
+    label = _('Trigger document transition')
+    pnav = 2
+
+    def update(self):
+        return super(IkobaEditFormPage, self).update()
+
+    def getTransitions(self):
+        """Return a list of dicts of allowed transition ids and titles.
+
+        Each list entry provides keys ``name`` and ``title`` for
+        internal name and (human readable) title of a single
+        transition.
+        """
+        wf_info = IWorkflowInfo(self.context)
+        allowed_transitions = [t for t in wf_info.getManualTransitions()]
+        return [dict(name='', title=_('No transition'))] +[
+            dict(name=x, title=y) for x, y in allowed_transitions]
+
+    @action(_('Save'), style='primary')
+    def save(self, **data):
+        form = self.request.form
+        if 'transition' in form and form['transition']:
+            transition_id = form['transition']
+            wf_info = IWorkflowInfo(self.context)
+            try:
+                wf_info.fireTransition(transition_id)
+            except InvalidTransitionError, error:
+                self.flash(error, type="warning")
+        return

main/waeup.ikoba/trunk/src/waeup/ikoba/documents/browser_templates/documentaddform.pt

@@ -17 +17 @@
         </td>
       </tr>
+      <tal:widgets content="structure provider:widgets" />
     </tbody>
   </table>

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

@@ -27 +27 @@
 
 from waeup.ikoba.documents.interfaces import (
-    IDocumentsContainer, IDocument)
+    IDocumentsContainer, IPublicDocument)
 from waeup.ikoba.documents.browser import (
     DocumentsContainerManageFormPage, DocumentsContainerPage,
@@ -64 +64 @@
 class DocumentViewActionButton(ManageActionButton):
     grok.order(1)
-    grok.context(IDocument)
+    grok.context(IPublicDocument)
     grok.view(DocumentManageFormPage)
     grok.require('waeup.manageDocuments')
@@ -74 +74 @@
 class DocumentManageActionButton(ManageActionButton):
     grok.order(1)
-    grok.context(IDocument)
+    grok.context(IPublicDocument)
     grok.view(DocumentDisplayFormPage)
     grok.require('waeup.manageDocuments')
     text = _('Manage')
     target = 'manage'
+
+
+class DocumentTrigTransActionButton(ManageActionButton):
+    grok.order(2)
+    grok.context(IPublicDocument)
+    grok.view(DocumentDisplayFormPage)
+    grok.require('waeup.manageDocuments')
+    icon = 'actionicon_trigtrans.png'
+    text = _(u'Transition')
+    target = 'trigtrans'
+
+

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

@@ -40 +40 @@
         msg = _('Document created'),
         destination = CREATED),
+
+    Transition(
+        transition_id = 'publish',
+        title = _('Publish document'),
+        source = CREATED,
+        condition = NullCondition,
+        msg = _('Document published'),
+        destination = PUBLISHED),
     )