Skip to content

erp5
erp5
Commit c302dc5b authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

BusinessTemplate: Allow set individual Mixins on Portal Types 

  Allow the developer associate a Mixin on Business template level
without require to overwrite the portal type itself

  Include mixins can be done in the same way, allowed content types or
property sheets are set.
parent 52b06c27
Pipeline #19665 canceled with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 391 additions and 1 deletion
    product/ERP5/Document/BusinessTemplate.py
    View file @ c302dc5b
    ...@@ -2916,6 +2916,12 @@ class PortalTypeBaseCategoryTemplateItem(PortalTypeAllowedContentTypeTemplateIte ...@@ -2916,6 +2916,12 @@ class PortalTypeBaseCategoryTemplateItem(PortalTypeAllowedContentTypeTemplateIte
    class_property = 'base_category_list' class_property = 'base_category_list'
    business_template_class_property = '_portal_type_base_category_item' business_template_class_property = '_portal_type_base_category_item'
    class PortalTypeTypeMixinTemplateItem(PortalTypeAllowedContentTypeTemplateItem):
    name = 'Type Mixin'
    xml_tag = 'type_mixin'
    class_property = 'type_mixin'
    business_template_class_property = '_portal_type_type_mixin_item'
    class CatalogMethodTemplateItem(ObjectTemplateItem): class CatalogMethodTemplateItem(ObjectTemplateItem):
    """Template Item for catalog methods. """Template Item for catalog methods.
    ...@@ -5230,6 +5236,9 @@ Business Template is a set of definitions, such as skins, portal types and categ ...@@ -5230,6 +5236,9 @@ Business Template is a set of definitions, such as skins, portal types and categ
    self._portal_type_base_category_item = \ self._portal_type_base_category_item = \
    PortalTypeBaseCategoryTemplateItem( PortalTypeBaseCategoryTemplateItem(
    self.getTemplatePortalTypeBaseCategoryList()) self.getTemplatePortalTypeBaseCategoryList())
    self._portal_type_type_mixin_item = \
    PortalTypeTypeMixinTemplateItem(
    self.getTemplatePortalTypeTypeMixinList())
    self._path_item = \ self._path_item = \
    PathTemplateItem(self.getTemplatePathList()) PathTemplateItem(self.getTemplatePathList())
    self._preference_item = \ self._preference_item = \
    ...@@ -5699,6 +5708,14 @@ Business Template is a set of definitions, such as skins, portal types and categ ...@@ -5699,6 +5708,14 @@ Business Template is a set of definitions, such as skins, portal types and categ
    """ """
    return self._getOrderedList('template_portal_type_base_category') return self._getOrderedList('template_portal_type_base_category')
    security.declareProtected(Permissions.AccessContentsInformation, 'getTemplatePortalTypeTypeMixiniList')
    def getTemplatePortalTypeTypeMixinList(self):
    """
    We have to set this method because we want an
    ordered list
    """
    return self._getOrderedList('template_portal_type_type_mixin')
    security.declareProtected(Permissions.AccessContentsInformation, 'getTemplateActionPathList') security.declareProtected(Permissions.AccessContentsInformation, 'getTemplateActionPathList')
    def getTemplateActionPathList(self): def getTemplateActionPathList(self):
    """ """
    ...@@ -6057,6 +6074,7 @@ Business Template is a set of definitions, such as skins, portal types and categ ...@@ -6057,6 +6074,7 @@ Business Template is a set of definitions, such as skins, portal types and categ
    'PortalHiddenAllowedContentType' : '_portal_type_hidden_content_type_item', 'PortalHiddenAllowedContentType' : '_portal_type_hidden_content_type_item',
    'PortalTypePropertySheet' : '_portal_type_property_sheet_item', 'PortalTypePropertySheet' : '_portal_type_property_sheet_item',
    'PortalTypeBaseCategory' : '_portal_type_base_category_item', 'PortalTypeBaseCategory' : '_portal_type_base_category_item',
    'PortalTypeTypeMixin' : '_portal_type_type_mixin_item',
    'Category' : '_category_item', 'Category' : '_category_item',
    'Module' : '_module_item', 'Module' : '_module_item',
    'Skin' : '_skin_item', 'Skin' : '_skin_item',
    ...@@ -6149,6 +6167,7 @@ Business Template is a set of definitions, such as skins, portal types and categ ...@@ -6149,6 +6167,7 @@ Business Template is a set of definitions, such as skins, portal types and categ
    '_portal_type_property_sheet_item', '_portal_type_property_sheet_item',
    '_portal_type_roles_item', '_portal_type_roles_item',
    '_portal_type_base_category_item', '_portal_type_base_category_item',
    '_portal_type_type_mixin',
    '_local_roles_item', '_local_roles_item',
    '_portal_type_workflow_chain_item',] '_portal_type_workflow_chain_item',]
    ...@@ -6242,6 +6261,8 @@ Business Template is a set of definitions, such as skins, portal types and categ ...@@ -6242,6 +6261,8 @@ Business Template is a set of definitions, such as skins, portal types and categ
    self.getTemplatePortalTypePropertySheetList()) self.getTemplatePortalTypePropertySheetList())
    bt_base_category_list = list( bt_base_category_list = list(
    self.getTemplatePortalTypeBaseCategoryList()) self.getTemplatePortalTypeBaseCategoryList())
    bt_type_mixin_list = list(
    self.getTemplatePortalTypeTypeMixinList())
    bt_action_list = list(self.getTemplateActionPathList()) bt_action_list = list(self.getTemplateActionPathList())
    bt_portal_types_id_list = list(self.getTemplatePortalTypeIdList()) bt_portal_types_id_list = list(self.getTemplatePortalTypeIdList())
    bt_portal_type_roles_list = list(self.getTemplatePortalTypeRoleList()) bt_portal_type_roles_list = list(self.getTemplatePortalTypeRoleList())
    ...@@ -6260,6 +6281,7 @@ Business Template is a set of definitions, such as skins, portal types and categ ...@@ -6260,6 +6281,7 @@ Business Template is a set of definitions, such as skins, portal types and categ
    property_sheet_list = [] property_sheet_list = []
    base_category_list = [] base_category_list = []
    action_list = [] action_list = []
    type_mixin_list = []
    if hasattr(portal_type, 'allowed_content_types'): if hasattr(portal_type, 'allowed_content_types'):
    allowed_content_type_list = portal_type.allowed_content_types allowed_content_type_list = portal_type.allowed_content_types
    if hasattr(portal_type, 'hidden_content_type_list'): if hasattr(portal_type, 'hidden_content_type_list'):
    ...@@ -6268,6 +6290,8 @@ Business Template is a set of definitions, such as skins, portal types and categ ...@@ -6268,6 +6290,8 @@ Business Template is a set of definitions, such as skins, portal types and categ
    property_sheet_list = portal_type.property_sheet_list property_sheet_list = portal_type.property_sheet_list
    if hasattr(portal_type, 'base_category_list'): if hasattr(portal_type, 'base_category_list'):
    base_category_list = portal_type.base_category_list base_category_list = portal_type.base_category_list
    if hasattr(portal_type, 'type_mixin'):
    type_mixin_list = portal_type.type_mixin
    for action in portal_type.getActionInformationList(): for action in portal_type.getActionInformationList():
    action_list.append(action.getReference()) action_list.append(action.getReference())
    ...@@ -6291,6 +6315,11 @@ Business Template is a set of definitions, such as skins, portal types and categ ...@@ -6291,6 +6315,11 @@ Business Template is a set of definitions, such as skins, portal types and categ
    if base_cat_id not in bt_base_category_list: if base_cat_id not in bt_base_category_list:
    bt_base_category_list.append(base_cat_id) bt_base_category_list.append(base_cat_id)
    for tm_id in type_mixin_list:
    type_mixin_id = id+' | '+tm_id
    if type_mixin_id not in type_mixin_list:
    bt_type_mixin_list.append(tm_id)
    for act_id in action_list: for act_id in action_list:
    action_id = id+' | '+act_id action_id = id+' | '+act_id
    if action_id not in bt_action_list: if action_id not in bt_action_list:
    ...@@ -6308,6 +6337,7 @@ Business Template is a set of definitions, such as skins, portal types and categ ...@@ -6308,6 +6337,7 @@ Business Template is a set of definitions, such as skins, portal types and categ
    bt_base_category_list.sort() bt_base_category_list.sort()
    bt_action_list.sort() bt_action_list.sort()
    bt_wf_chain_list.sort() bt_wf_chain_list.sort()
    bt_type_mixin_list.sort()
    self.setTemplatePortalTypeWorkflowChainList(bt_wf_chain_list) self.setTemplatePortalTypeWorkflowChainList(bt_wf_chain_list)
    self.setTemplatePortalTypeRoleList(bt_portal_type_roles_list) self.setTemplatePortalTypeRoleList(bt_portal_type_roles_list)
    ...@@ -6316,7 +6346,7 @@ Business Template is a set of definitions, such as skins, portal types and categ ...@@ -6316,7 +6346,7 @@ Business Template is a set of definitions, such as skins, portal types and categ
    self.setTemplatePortalTypePropertySheetList(bt_property_sheet_list) self.setTemplatePortalTypePropertySheetList(bt_property_sheet_list)
    self.setTemplatePortalTypeBaseCategoryList(bt_base_category_list) self.setTemplatePortalTypeBaseCategoryList(bt_base_category_list)
    self.setTemplateActionPathList(bt_action_list) self.setTemplateActionPathList(bt_action_list)
    self.setTemplatePortalTypeTypeMixin(bt_type_mixin_list)
    security.declareProtected(Permissions.AccessContentsInformation, security.declareProtected(Permissions.AccessContentsInformation,
    'guessPortalTypes') 'guessPortalTypes')
    ...@@ -6397,6 +6427,7 @@ Business Template is a set of definitions, such as skins, portal types and categ ...@@ -6397,6 +6427,7 @@ Business Template is a set of definitions, such as skins, portal types and categ
    """ """
    setattr(self, 'template_portal_type_id', ()) setattr(self, 'template_portal_type_id', ())
    setattr(self, 'template_portal_type_allowed_content_type', ()) setattr(self, 'template_portal_type_allowed_content_type', ())
    setattr(self, 'template_portal_type_type_mixin', ())
    setattr(self, 'template_portal_type_hidden_content_type', ()) setattr(self, 'template_portal_type_hidden_content_type', ())
    setattr(self, 'template_portal_type_property_sheet', ()) setattr(self, 'template_portal_type_property_sheet', ())
    setattr(self, 'template_portal_type_base_category', ()) setattr(self, 'template_portal_type_base_category', ())
    ......
    product/ERP5/bin/genbt5list
    View file @ c302dc5b
    ...@@ -87,6 +87,7 @@ item_name_list = ( ...@@ -87,6 +87,7 @@ item_name_list = (
    'portal_type_hidden_content_type', 'portal_type_hidden_content_type',
    'portal_type_property_sheet', 'portal_type_property_sheet',
    'portal_type_base_category', 'portal_type_base_category',
    'portal_type_type_mixin',
    'category', 'category',
    'module', 'module',
    'portal_type_roles', 'portal_type_roles',
    ......
    product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewPortalTypes.xml
    View file @ c302dc5b
    ...@@ -76,6 +76,7 @@ ...@@ -76,6 +76,7 @@
    <string>my_template_portal_type_hidden_content_type_list</string> <string>my_template_portal_type_hidden_content_type_list</string>
    <string>my_template_portal_type_property_sheet_list</string> <string>my_template_portal_type_property_sheet_list</string>
    <string>my_template_portal_type_base_category_list</string> <string>my_template_portal_type_base_category_list</string>
    <string>my_template_portal_type_type_mixin_list</string>
    <string>my_template_action_path_list</string> <string>my_template_action_path_list</string>
    </list> </list>
    </value> </value>
    ......
    product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewPortalTypes/my_template_portal_type_type_mixin_list.xml 0 → 100644
    View file @ c302dc5b
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="LinesField" module="Products.Formulator.StandardFields"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>id</string> </key>
    <value> <string>my_template_portal_type_type_mixin_list</string> </value>
    </item>
    <item>
    <key> <string>message_values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>external_validator_failed</string> </key>
    <value> <string>The input failed the external validator.</string> </value>
    </item>
    <item>
    <key> <string>line_too_long</string> </key>
    <value> <string>A line was too long.</string> </value>
    </item>
    <item>
    <key> <string>required_not_found</string> </key>
    <value> <string>Input is required but no input given.</string> </value>
    </item>
    <item>
    <key> <string>too_long</string> </key>
    <value> <string>You entered too many characters.</string> </value>
    </item>
    <item>
    <key> <string>too_many_lines</string> </key>
    <value> <string>You entered too many lines.</string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>overrides</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>alternate_name</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>css_class</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>default</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>editable</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>enabled</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>external_validator</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>extra</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>height</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>hidden</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>max_length</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>max_linelength</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>max_lines</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>required</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>unicode</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>view_separator</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>whitespace_preserve</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>width</string> </key>
    <value> <string></string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>tales</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>alternate_name</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>css_class</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>default</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>editable</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>enabled</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>external_validator</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>extra</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>height</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>hidden</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>max_length</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>max_linelength</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>max_lines</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>required</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>unicode</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>view_separator</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>whitespace_preserve</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>width</string> </key>
    <value> <string></string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>alternate_name</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>css_class</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>default</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>editable</string> </key>
    <value> <int>1</int> </value>
    </item>
    <item>
    <key> <string>enabled</string> </key>
    <value> <int>1</int> </value>
    </item>
    <item>
    <key> <string>external_validator</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>extra</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>height</string> </key>
    <value> <int>10</int> </value>
    </item>
    <item>
    <key> <string>hidden</string> </key>
    <value> <int>0</int> </value>
    </item>
    <item>
    <key> <string>max_length</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>max_linelength</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>max_lines</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>required</string> </key>
    <value> <int>0</int> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string>Mixins</string> </value>
    </item>
    <item>
    <key> <string>unicode</string> </key>
    <value> <int>0</int> </value>
    </item>
    <item>
    <key> <string>view_separator</string> </key>
    <value> <string encoding="cdata"><![CDATA[
    <br />
    ]]></string> </value>
    </item>
    <item>
    <key> <string>whitespace_preserve</string> </key>
    <value> <int>0</int> </value>
    </item>
    <item>
    <key> <string>width</string> </key>
    <value> <int>80</int> </value>
    </item>
    </dictionary>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/BusinessTemplate/template_portal_type_type_mixin_property.xml 0 → 100644
    View file @ c302dc5b
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="Standard Property" module="erp5.portal_type"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_local_properties</string> </key>
    <value>
    <tuple>
    <dictionary>
    <item>
    <key> <string>id</string> </key>
    <value> <string>mode</string> </value>
    </item>
    <item>
    <key> <string>type</string> </key>
    <value> <string>string</string> </value>
    </item>
    </dictionary>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>categories</string> </key>
    <value>
    <tuple>
    <string>elementary_type/lines</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>template_portal_type_type_mixin_property</string> </value>
    </item>
    <item>
    <key> <string>mode</string> </key>
    <value> <string>w</string> </value>
    </item>
    <item>
    <key> <string>portal_type</string> </key>
    <value> <string>Standard Property</string> </value>
    </item>
    <item>
    <key> <string>property_default</string> </key>
    <value> <string>python: ()</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7