Changeset 12214 for main/waeup.ikoba/trunk/src/waeup/ikoba/documents/browser.py

Timestamp:

13 Dec 2014, 15:46:41 (10 years ago)

Author:

Henrik Bettermann

Message:

Adjust UI components in documents and customers package.

File:

• main/waeup.ikoba/trunk/src/waeup/ikoba/documents/browser.py (modified) (7 diffs)

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

@@ -46 +46 @@
 
 from waeup.ikoba.documents.interfaces import (
-    IDocumentsContainer, IDocument)
+    IDocumentsContainer, IPublicDocument, IDocumentsUtils)
 
 grok.context(IIkobaObject) # Make IKofaObject the default context
@@ -62 +62 @@
     """A breadcrumb for the customer container.
     """
-    grok.context(IDocument)
+    grok.context(IPublicDocument)
 
     def title(self):
@@ -90 +90 @@
     label = _('Manage document section')
 
-    taboneactions = [_('Save'),_('Cancel')]
-    tabtwoactions = [_('Add document'), _('Remove selected'),_('Cancel')]
+    @action(_('Add document'), validator=NullValidator, style='primary')
+    def addSubunit(self, **data):
+        self.redirect(self.url(self.context, 'adddoc'))
+        return
 
-    @jsaction(_('Remove selected'))
+    @jsaction(_('Remove selected documents'))
     def delDocuments(self, **data):
         delSubobjects(self, redirect='manage', tab='2')
         return
 
-    @action(_('Save'), style='primary')
-    def save(self, **data):
-        return msave(self, **data)
-
     @action(_('Cancel'), validator=NullValidator)
     def cancel(self, **data):
         self.redirect(self.url(self.context))
-        return
-
-    @action(_('Add document'), validator=NullValidator)
-    def addSubunit(self, **data):
-        self.redirect(self.url(self.context, 'adddocument'))
         return
 
@@ -118 +111 @@
     grok.context(IDocumentsContainer)
     grok.require('waeup.manageDocuments')
-    grok.name('adddocument')
-    form_fields = grok.AutoFields(IDocument).omit('document_id')
+    grok.name('adddoc')
+    grok.template('documentaddform')
     label = _('Add document')
     pnav = 2
 
+    @property
+    def selectable_doctypes(self):
+        doctypes = getUtility(IDocumentsUtils).SELECTABLE_DOCTYPES_DICT
+        return sorted(doctypes.items())
+
     @action(_('Create document'), style='primary')
-    def addDocument(self, **data):
-        document = createObject(u'waeup.PublicDocument')
+    def createDocument(self, **data):
+        form = self.request.form
+        doctype = form.get('doctype', None)
+        # Here we can create various instances of PublicDocument derived
+        # classes depending on the doctype parameter given in form.
+        document = createObject('waeup.%s' % doctype)
         self.applyData(document, **data)
-        try:
-            self.context.addDocument(document)
-        except KeyError:
-            self.flash(_('The Id chosen already exists.'),
-                       type='danger')
-            return
-        self.flash(
-            _("Document ${a} added.", mapping = {'a':document.document_id}))
+        self.context.addDocument(document)
+        doctype = getUtility(IDocumentsUtils).SELECTABLE_DOCTYPES_DICT[doctype]
+        self.flash(_('${a} added.', mapping = {'a': doctype}))
         ob_class = self.__implemented__.__name__.replace('waeup.ikoba.','')
         self.context.__parent__.logger.info(
-            '%s - added: %s' % (ob_class, document.document_id))
-        self.redirect(self.url(self.context, u'manage')+'#tab2')
+            '%s - added: %s %s' % (ob_class, doctype, document.document_id))
+        self.redirect(self.url(self.context))
         return
+
+    @action(_('Cancel'), validator=NullValidator)
+    def cancel(self, **data):
+        self.redirect(self.url(self.context))
 
 
@@ -145 +146 @@
     """ Page to display document data
     """
-    grok.context(IDocument)
+    grok.context(IPublicDocument)
     grok.name('index')
     grok.require('waeup.viewDocuments')
     #grok.template('basepage')
-    form_fields = grok.AutoFields(IDocument)
     pnav = 2
+
+    @property
+    def form_fields(self):
+        return grok.AutoFields(self.context.form_fields_interface)
 
     @property
@@ -161 +165 @@
     """ View to manage document data
     """
-    grok.context(IDocument)
+    grok.context(IPublicDocument)
     grok.name('manage')
     grok.require('waeup.manageDocuments')
-    form_fields = grok.AutoFields(IDocument).omit('document_id')
     grok.template('documentmanagepage')
     pnav = 2
@@ -171 +174 @@
     tabtwoactions1 = [_('Remove selected local roles')]
     tabtwoactions2 = [_('Add local role')]
+
+    @property
+    def form_fields(self):
+        return grok.AutoFields(self.context.form_fields_interface)
 
     def label(self):