Changeset 3673 in products

Timestamp:

Apr 25, 2013 10:25:33 AM (11 years ago)

Author:

kroman0

Message:

Fixed too complex functions

File:

• quintagroup.plonetabs/trunk/quintagroup/plonetabs/browser/plonetabs.py (modified) (4 diffs)

quintagroup.plonetabs/trunk/quintagroup/plonetabs/browser/plonetabs.py

@@ -375 +375 @@
         return self.autogenerated_list()
 
+    def _add_sort_option(self, query):
+        """ add sort option """
+        navtree_props = getattr(self.portal_properties, 'navtree_properties')
+        sortAttribute = navtree_props.getProperty('sortAttribute', None)
+        if sortAttribute is not None:
+            query['sort_on'] = sortAttribute
+
+            sortOrder = navtree_props.getProperty('sortOrder', None)
+            if sortOrder is not None:
+                query['sort_order'] = sortOrder
+
     def getRootTabs(self):
         """See interface"""
@@ -395 +406 @@
         query['portal_type'] = utils.typesToList(context)
 
-        sortAttribute = navtree_properties.getProperty('sortAttribute', None)
-        if sortAttribute is not None:
-            query['sort_on'] = sortAttribute
-
-            sortOrder = navtree_properties.getProperty('sortOrder', None)
-            if sortOrder is not None:
-                query['sort_order'] = sortOrder
+        self._add_sort_option(query)
 
         if navtree_properties.getProperty('enable_wf_state_filtering', False):
@@ -880 +885 @@
         return action_info
 
+    def _validate_expression(self, name, data, errors):
+        """ validate expression """
+        if data[name]:
+            try:
+                Expression(data[name])
+            except Exception, e:
+                mapping = {'expr': data[name]}
+                idx = data[name].find(':')
+                if idx != -1:
+                    mapping['expr_type'] = data[name][:idx]
+                errors[name] = self._formatError(e, **mapping)
+
     def validateActionFields(self, cat_name, data, allow_dup=False):
         """Check action fields on validity"""
@@ -904 +921 @@
 
         # validate condition expression
-        if data['available_expr']:
-            try:
-                Expression(data['available_expr'])
-            except Exception, e:
-                mapping = {'expr': data['available_expr']}
-                idx = data['available_expr'].find(':')
-                if idx != -1:
-                    mapping['expr_type'] = data['available_expr'][:idx]
-                errors["available_expr"] = self._formatError(e, **mapping)
+        self._validate_expression('available_expr', data, errors)
 
         # validate action expression
-        if data['url_expr']:
-            try:
-                Expression(data['url_expr'])
-            except Exception, e:
-                mapping = {'expr': data['url_expr']}
-                idx = data['url_expr'].find(':')
-                if idx != -1:
-                    mapping['expr_type'] = data['url_expr'][:idx]
-                errors["url_expr"] = self._formatError(e, **mapping)
+        self._validate_expression('url_expr', data, errors)
 
         return errors