fixup! erp5_core: unify Predicate_edit code into Base_edit.

bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_edit.py

@@ -62,10 +62,7 @@ def editListBox(listbox_field, listbox):
   if listbox is None:
     return
 
-  if context.isPredicate():
-    predicate_listbox = set(context.getCriterionPropertyList()) == set(listbox.keys())
-  else:
-    predicate_listbox = False  # extract hidden (global) attributes from request to be used in listbox's update
+  is_predicate_listbox = set(getattr(context, 'getCriterionPropertyList', lambda: [])()) == set(listbox.keys())
 
   # extract hidden (global) attributes from request to be used in listbox's update
   global_attr = {hidden_key: getattr(request, hidden_key, None)
@@ -74,7 +71,7 @@ def editListBox(listbox_field, listbox):
                 else {}
 
   for item_url, item_value in listbox.items():
-    if predicate_listbox:
+    if is_predicate_listbox:
       item_value.update(global_attr)
       context.setCriterion(item_url, **item_value)
       continue

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.py

@@ -56,16 +56,13 @@ def editListBox(listbox_field, listbox):
   """
   if listbox is not None:
     global_property_dict = {}
-    if context.isPredicate():
-      predicate_listbox = set(context.getCriterionPropertyList()) == set(listbox.keys())
-    else:
-      predicate_listbox = False
+    is_predicate_listbox = set(getattr(context, 'getCriterionPropertyList', lambda: [])()) == set(listbox.keys())
     if listbox_field.has_value('global_attributes'):
       hidden_attribute_list = [x[0] for x in listbox_field.get_value('global_attributes')]
       for hidden_attribute in hidden_attribute_list:
         global_property_dict[hidden_attribute] = getattr(request, hidden_attribute, None)
     for item_url, listbox_item_dict in listbox.items():
-      if predicate_listbox:
+      if is_predicate_listbox:
         listbox_item_dict.update(global_property_dict)
         context.setCriterion(item_url, **listbox_item_dict)
         continue