Changeset 12413

Timestamp:

7 Jan 2015, 09:20:45 (10 years ago)

Author:

Henrik Bettermann

Message:

Modify redirect after adding documents.

Ensure that keys don't exist when adding documents.

Location:

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

Files:

• documents/browser.py (modified) (2 diffs)
• documents/tests/test_browser.py (modified) (3 diffs)
• products/browser.py (modified) (3 diffs)
• products/browser_templates/containermanagepage.pt (modified) (1 diff)

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

@@ -135 +135 @@
         document = createObject('waeup.%s' % doctype)
         self.applyData(document, **data)
-        self.context.addDocument(document)
+        try:
+            self.context.addDocument(document)
+        except KeyError:
+            self.flash(_('The id chosen already exists.'),
+                       type='danger')
+            return
         doctype = getUtility(IDocumentsUtils).SELECTABLE_DOCTYPES_DICT[doctype]
         self.flash(_('${a} added.', mapping = {'a': doctype}))
@@ -141 +146 @@
         self.context.__parent__.logger.info(
             '%s - added: %s %s' % (ob_class, doctype, document.document_id))
-        self.redirect(self.url(self.context, u'manage'))
+        self.redirect(self.url(self.context) +
+            '/%s/manage' % document.document_id)
         return
 

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

@@ -117 +117 @@
 
         # Document can be edited
-        self.browser.getLink("DOC1").click()
-        self.browser.getLink("Manage").click()
         self.browser.getControl(name="form.title").value = 'My first doc'
         self.browser.getControl("Save").click()
@@ -221 +219 @@
 
         # Document can be edited
-        self.browser.getLink("DOC2").click()
-        self.browser.getLink("Manage").click()
         self.browser.getControl(name="form.title").value = 'My second doc'
         self.browser.getControl(name="form.html_multilingual").value = """
@@ -310 +306 @@
 
         # Document can be edited
-        self.browser.getLink("DOC3").click()
-        self.browser.getLink("Manage").click()
         self.browser.getControl(name="form.rest_multilingual").value = """
 ----------

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

@@ -94 +94 @@
     tabtwoactions = [_('Add product'), _('Remove selected'),_('Cancel')]
 
+    @action(_('Add product'), style='primary', validator=NullValidator)
+    def addSubunit(self, **data):
+        self.redirect(self.url(self.context, 'addproduct'))
+        return
+
     @jsaction(_('Remove selected'))
     def delProducts(self, **data):
@@ -106 +111 @@
     def cancel(self, **data):
         self.redirect(self.url(self.context))
-        return
-
-    @action(_('Add product'), validator=NullValidator)
-    def addSubunit(self, **data):
-        self.redirect(self.url(self.context, 'addproduct'))
         return
 
@@ -131 +131 @@
             self.context.addProduct(product)
         except KeyError:
-            self.flash(_('The Id chosen already exists.'),
+            self.flash(_('The id chosen already exists.'),
                        type='danger')
             return

main/waeup.ikoba/trunk/src/waeup/ikoba/products/browser_templates/containermanagepage.pt

@@ -20 +20 @@
         </tbody>
       </table>
+      <br /><p i18n:translate="">Setting parameters no yet configured.</p>
       <div tal:condition="view/availableActions">
         <span tal:repeat="action view/actions" tal:omit-tag="">