Changeset 12246 for main/waeup.ikoba/trunk/src/waeup/ikoba/documents

Timestamp:

15 Dec 2014, 12:49:01 (10 years ago)

Author:

Henrik Bettermann

Message:

Rename button and redirect after transition to context page.

Remove restwidget.py.

Location:

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

Files:

• browser.py (modified) (2 diffs)
• tests/test_browser.py (modified) (2 diffs)

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

@@ -298 +298 @@
             dict(name=x, title=y) for x, y in allowed_transitions]
 
-    @action(_('Save'), style='primary')
-    def save(self, **data):
+    @action(_('Apply now'), style='primary')
+    def apply(self, **data):
         form = self.request.form
         if 'transition' in form and form['transition']:
@@ -306 +306 @@
             try:
                 wf_info.fireTransition(transition_id)
+                self.flash(_("Transition '%s' executed." % transition_id))
             except InvalidTransitionError, error:
                 self.flash(error, type="warning")
-        return
+            self.redirect(self.url(self.context))
+        return

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

@@ -167 +167 @@
         self.browser.getLink("Transition").click()
         self.browser.getControl(name="transition").value = ['retract']
-        self.browser.getControl("Save").click()
+        self.browser.getControl("Apply now").click()
         self.assertEqual(document.state, 'created')
 
@@ -252 +252 @@
         self.browser.getLink("Transition").click()
         self.browser.getControl(name="transition").value = ['publish']
-        self.browser.getControl("Speichern").click()
+        self.browser.getControl("Jetzt anwenden").click()
         self.assertEqual(document.state, 'published')