Changeset 3673 in products for quintagroup.plonetabs/trunk/quintagroup/plonetabs/browser/plonetabs.py
- Timestamp:
- Apr 25, 2013 10:25:33 AM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
quintagroup.plonetabs/trunk/quintagroup/plonetabs/browser/plonetabs.py
r3672 r3673 375 375 return self.autogenerated_list() 376 376 377 def _add_sort_option(self, query): 378 """ add sort option """ 379 navtree_props = getattr(self.portal_properties, 'navtree_properties') 380 sortAttribute = navtree_props.getProperty('sortAttribute', None) 381 if sortAttribute is not None: 382 query['sort_on'] = sortAttribute 383 384 sortOrder = navtree_props.getProperty('sortOrder', None) 385 if sortOrder is not None: 386 query['sort_order'] = sortOrder 387 377 388 def getRootTabs(self): 378 389 """See interface""" … … 395 406 query['portal_type'] = utils.typesToList(context) 396 407 397 sortAttribute = navtree_properties.getProperty('sortAttribute', None) 398 if sortAttribute is not None: 399 query['sort_on'] = sortAttribute 400 401 sortOrder = navtree_properties.getProperty('sortOrder', None) 402 if sortOrder is not None: 403 query['sort_order'] = sortOrder 408 self._add_sort_option(query) 404 409 405 410 if navtree_properties.getProperty('enable_wf_state_filtering', False): … … 880 885 return action_info 881 886 887 def _validate_expression(self, name, data, errors): 888 """ validate expression """ 889 if data[name]: 890 try: 891 Expression(data[name]) 892 except Exception, e: 893 mapping = {'expr': data[name]} 894 idx = data[name].find(':') 895 if idx != -1: 896 mapping['expr_type'] = data[name][:idx] 897 errors[name] = self._formatError(e, **mapping) 898 882 899 def validateActionFields(self, cat_name, data, allow_dup=False): 883 900 """Check action fields on validity""" … … 904 921 905 922 # validate condition expression 906 if data['available_expr']: 907 try: 908 Expression(data['available_expr']) 909 except Exception, e: 910 mapping = {'expr': data['available_expr']} 911 idx = data['available_expr'].find(':') 912 if idx != -1: 913 mapping['expr_type'] = data['available_expr'][:idx] 914 errors["available_expr"] = self._formatError(e, **mapping) 923 self._validate_expression('available_expr', data, errors) 915 924 916 925 # validate action expression 917 if data['url_expr']: 918 try: 919 Expression(data['url_expr']) 920 except Exception, e: 921 mapping = {'expr': data['url_expr']} 922 idx = data['url_expr'].find(':') 923 if idx != -1: 924 mapping['expr_type'] = data['url_expr'][:idx] 925 errors["url_expr"] = self._formatError(e, **mapping) 926 self._validate_expression('url_expr', data, errors) 926 927 927 928 return errors
Note: See TracChangeset
for help on using the changeset viewer.