Changeset 11254 for main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/browser.py

Timestamp:

22 Feb 2014, 15:46:03 (11 years ago)

Author:

uli

Message:

Merge changes from uli-diazo-themed back into trunk. If this works, then a miracle happened.

Location:

main/waeup.kofa/trunk

Files:

• . (modified) (1 prop)
• src/waeup/kofa (modified) (1 prop)
• src/waeup/kofa/accesscodes/browser.py (modified) (9 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/browser.py

@@ -22 +22 @@
 from zope.component import getUtility
 from hurry.workflow.interfaces import InvalidTransitionError
-from waeup.kofa.browser.resources import datatable
 from waeup.kofa.browser.layout import KofaPage, KofaAddFormPage, NullValidator
 from waeup.kofa.browser.breadcrumbs import Breadcrumb
@@ -52 +51 @@
             return
         if not batches:
-            self.flash(_('No batch selected.'))
+            self.flash(_('No batch selected.'), type='warning')
             return
         if isinstance(batches, basestring):
@@ -102 +101 @@
     @action(_('Cancel'), validator=NullValidator)
     def cancel(self, *args, **kw):
-        self.flash(_('Batch creation cancelled.'))
+        self.flash(_('Batch creation cancelled.'), type='warning')
         self.redirect(self.url(self.context))
 
@@ -120 +119 @@
     def update(self, filenames=None, reimport=None, cancel=None):
         if cancel is not None:
-            self.flash(_('Reimport cancelled.'))
+            self.flash(_('Reimport cancelled.'), type='warning')
             self.redirect(self.url(self.context))
             return
@@ -126 +125 @@
             return
         if not filenames:
-            self.flash(_('No file chosen. Action cancelled.'))
+            self.flash(_('No file chosen. Action cancelled.'), type='warning')
             self.redirect(self.url(self.context))
             return
@@ -137 +136 @@
             except KeyError:
                 self.flash(_('This batch already exists: ${a}',
-                    mapping = {'a':filename}))
+                    mapping = {'a':filename}), type='warning')
                 continue
             self.flash(_('Successfully reimported: ${a}',
@@ -156 +155 @@
     disable_button = _('Disable ACs')
     enable_button = _('Enable ACs')
+    cancel_button = _('Cancel Search')
 
     def update(self, *args, **kw):
-        datatable.need()
         form = self.request.form
+        if 'cancel' in form:
+            self.redirect(self.url(self.context))
+            return
         self.hitlist = []
         if 'searchterm' in form and form['searchterm']:
@@ -187 +189 @@
                 except InvalidTransitionError:
                     self.flash(_('${a}: Disable transition not allowed.',
-                        mapping = {'a':entry}))
+                        mapping = {'a':entry}), type='danger')
             elif 'enable' in form:
                 try:
@@ -196 +198 @@
                     self.context.logger_info(ob_class, message)
                 except InvalidTransitionError:
-                    self.flash(_('${a}: Re-enable transition not allowed.', mapping = {'a':entry}))
+                    self.flash(_('${a}: Re-enable transition not allowed.',
+                               mapping = {'a':entry}), type='danger')
         self.hitlist = search(query=self.searchterm,
             searchtype=self.searchtype, view=self)