Skip to content

erp5
erp5
Commit a18b4090 authored by Julien Muchembled's avatar Julien Muchembled
Browse files
Options

Merge erp5_type into erp5_core and erp5_xhtml_style 

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/portal_types@29277 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 311cfe7c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 2178 deletions
product/ERP5/ERP5Site.py
View file @ a18b4090
...@@ -1728,8 +1728,7 @@ class ERP5Generator(PortalGenerator): ...@@ -1728,8 +1728,7 @@ class ERP5Generator(PortalGenerator):
return return
if template_tool.getInstalledBusinessTemplate('erp5_core') is None: if template_tool.getInstalledBusinessTemplate('erp5_core') is None:
bootstrap_dir = self.getBootstrapDirectory() bootstrap_dir = self.getBootstrapDirectory()
# XXX erp5_type BT will be merged into erp5_core later. for bt in 'erp5_core', p.erp5_catalog_storage, 'erp5_xhtml_style':
for bt in 'erp5_core', 'erp5_type', p.erp5_catalog_storage, 'erp5_xhtml_style':
if not bt: if not bt:
continue continue
template = os.path.join(bootstrap_dir, bt) template = os.path.join(bootstrap_dir, bt)
......
product/ERP5/bootstrap/erp5_core/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
View file @ a18b4090
...@@ -12,6 +12,10 @@ ...@@ -12,6 +12,10 @@
<item>Domain</item> <item>Domain</item>
<item>Domain Generator</item> <item>Domain Generator</item>
</portal_type> </portal_type>
<portal_type id="Base Type">
<item>Action Information</item>
<item>Role Information</item>
</portal_type>
<portal_type id="Cache Factory"> <portal_type id="Cache Factory">
<item>Ram Cache</item> <item>Ram Cache</item>
<item>Distributed Ram Cache</item> <item>Distributed Ram Cache</item>
...@@ -39,8 +43,8 @@ ...@@ -39,8 +43,8 @@
<item>Memcached Plugin</item> <item>Memcached Plugin</item>
</portal_type> </portal_type>
<portal_type id="Preference Tool"> <portal_type id="Preference Tool">
<item>Preference</item>
<item>System Preference</item> <item>System Preference</item>
<item>Preference</item>
</portal_type> </portal_type>
<portal_type id="Simulation Movement"> <portal_type id="Simulation Movement">
<item>Applied Rule</item> <item>Applied Rule</item>
...@@ -54,4 +58,7 @@ ...@@ -54,4 +58,7 @@
<portal_type id="Trash Tool"> <portal_type id="Trash Tool">
<item>Trash Bin</item> <item>Trash Bin</item>
</portal_type> </portal_type>
<portal_type id="Types Tool">
<item>Base Type</item>
</portal_type>
</allowed_content_type_list> </allowed_content_type_list>
\ No newline at end of file
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_createModule.xml
View file @ a18b4090
...@@ -62,17 +62,16 @@ portal_types = portal.portal_types\n ...@@ -62,17 +62,16 @@ portal_types = portal.portal_types\n
object_portal_type_id = object_portal_type\n object_portal_type_id = object_portal_type\n
\n \n
# Create a new portal_type for the module\n # Create a new portal_type for the module\n
portal_types.manage_addTypeInformation( \'ERP5 Type Information\'\n portal_types.manage_addTypeInformation(\'ERP5 Type Information\',\n
, typeinfo_name = \'ERP5Type: ERP5 Folder\'\n id=module_portal_type, typeinfo_name=\'ERP5Type: Folder (ERP5 Folder)\')\n
, id = module_portal_type)\n
module_portal_type_value = portal_types[module_portal_type]\n module_portal_type_value = portal_types[module_portal_type]\n
# Set icon and allowed content types\n # Set icon and allowed content types\n
module_portal_type_value.manage_changeProperties(\n module_portal_type_value.edit(\n
content_icon=\'folder_icon.gif\',\n type_icon=\'folder_icon.gif\',\n
filter_content_types=1,\n type_filter_content_type=1,\n
allowed_content_types=(object_portal_type_id, ),\n type_allowed_content_type_list=(object_portal_type_id,),\n
group_list=(\'module\',),\n type_base_category_list=(\'business_application\',),\n
base_category_list=(\'business_application\',))\n type_group=\'module\')\n
# initialize translation domains\n # initialize translation domains\n
module_portal_type_value.changeTranslations(\n module_portal_type_value.changeTranslations(\n
properties=dict(title=\'erp5_ui\', short_title=\'erp5_ui\'))\n properties=dict(title=\'erp5_ui\', short_title=\'erp5_ui\'))\n
...@@ -80,16 +79,11 @@ module_portal_type_value.changeTranslations(\n ...@@ -80,16 +79,11 @@ module_portal_type_value.changeTranslations(\n
module_list_form_id = (\'%s_view%sList\' % (module_portal_type,\n module_list_form_id = (\'%s_view%sList\' % (module_portal_type,\n
object_portal_type)).replace(\' \', \'\')\n object_portal_type)).replace(\' \', \'\')\n
\n \n
action_list = module_portal_type_value.listActions()\n module_portal_type_value.newContent(portal_type=\'Action Information\',\n
module_portal_type_value.deleteActions(selections=range(0, len(action_list)))\n reference="view",\n
module_portal_type_value.addAction( "view"\n title="View",\n
, "View"\n action="string:${object_url}/%s" % module_list_form_id,\n
, "string:${object_url}/%s" % module_list_form_id\n action_type="object_list")\n
, ""\n
, "View"\n
, "object_list"\n
, priority=1.0\n
)\n
\n \n
# Create the skin folder if does not exist yet\n # Create the skin folder if does not exist yet\n
portal_skins_folder_name = portal_skins_folder\n portal_skins_folder_name = portal_skins_folder\n
...@@ -194,16 +188,11 @@ portal.portal_workflow.setChainForPortalTypes([object_portal_type_id],\n ...@@ -194,16 +188,11 @@ portal.portal_workflow.setChainForPortalTypes([object_portal_type_id],\n
\'edit_workflow\')\n \'edit_workflow\')\n
\n \n
# Set default actions\n # Set default actions\n
action_list = object_portal_type_value.listActions()\n object_portal_type_value.newContent(portal_type=\'Action Information\',\n
object_portal_type_value.deleteActions(selections=range(0,len(action_list)))\n reference="view",\n
object_portal_type_value.addAction( "view"\n title="View",\n
, "View"\n action="string:${object_url}/%s" % form_view_id,\n
, "string:${object_url}/%s" % form_view_id\n action_type="object_view")\n
, ""\n
, "View"\n
, "object_view"\n
, priority = 1\n
)\n
\n \n
# Finally add the module to the site\n # Finally add the module to the site\n
module_object = portal.newContent( portal_type = module_portal_type\n module_object = portal.newContent( portal_type = module_portal_type\n
...@@ -230,7 +219,6 @@ else:\n ...@@ -230,7 +219,6 @@ else:\n
)\n )\n
\n \n
\n \n
\n
request[ \'RESPONSE\' ].redirect( redirect_url )\n request[ \'RESPONSE\' ].redirect( redirect_url )\n
...@@ -290,9 +278,6 @@ request[ \'RESPONSE\' ].redirect( redirect_url )\n ...@@ -290,9 +278,6 @@ request[ \'RESPONSE\' ].redirect( redirect_url )\n
<string>module_portal_type_value</string> <string>module_portal_type_value</string>
<string>dict</string> <string>dict</string>
<string>module_list_form_id</string> <string>module_list_form_id</string>
<string>action_list</string>
<string>range</string>
<string>len</string>
<string>portal_skins_folder_name</string> <string>portal_skins_folder_name</string>
<string>portal_skins</string> <string>portal_skins</string>
<string>skin_folder</string> <string>skin_folder</string>
......
product/ERP5/bootstrap/erp5_core/bt/template_action_path_list
View file @ a18b4090
Action Information | view
Alarm Tool | alarm_report Alarm Tool | alarm_report
Alarm Tool | view Alarm Tool | view
Alarm | custom_report Alarm | custom_report
...@@ -9,6 +10,11 @@ Alarm | view ...@@ -9,6 +10,11 @@ Alarm | view
Applied Rule | view Applied Rule | view
Base Category | view Base Category | view
Base Domain | view Base Domain | view
Base Type | action_view
Base Type | role_view
Base Type | translation_view
Base Type | update_local_roles
Base Type | view
Business Template | export Business Template | export
Business Template | get_portal_type_properties Business Template | get_portal_type_properties
Business Template | guess_portal_types Business Template | guess_portal_types
...@@ -44,6 +50,7 @@ Preference | view ...@@ -44,6 +50,7 @@ Preference | view
Preference | view_template Preference | view_template
Ram Cache | statistics Ram Cache | statistics
Ram Cache | view Ram Cache | view
Role Information | view
Rule Tool | view Rule Tool | view
Simulation Movement | view Simulation Movement | view
Simulation Tool | view Simulation Tool | view
...@@ -61,10 +68,12 @@ Trash Bin | jump_bt5 ...@@ -61,10 +68,12 @@ Trash Bin | jump_bt5
Trash Bin | view Trash Bin | view
Trash Folder | view Trash Folder | view
Trash Tool | view Trash Tool | view
Types Tool | view
portal_actions | bt_tool portal_actions | bt_tool
portal_actions | category_tool portal_actions | category_tool
portal_actions | create_module portal_actions | create_module
portal_actions | make_template portal_actions | make_template
portal_actions | types_tool
portal_properties | history portal_properties | history
portal_properties | list_ui portal_properties | list_ui
portal_properties | mass_workflow portal_properties | mass_workflow
......
product/ERP5/bootstrap/erp5_core/bt/template_base_category_list
View file @ a18b4090
action_type
activity activity
aggregate aggregate
business_application business_application
......
product/ERP5/bootstrap/erp5_core/bt/template_path_list
View file @ a18b4090
...@@ -13,6 +13,7 @@ portal_caches/erp5_ui_medium ...@@ -13,6 +13,7 @@ portal_caches/erp5_ui_medium
portal_caches/erp5_ui_medium/default_ram_cache portal_caches/erp5_ui_medium/default_ram_cache
portal_caches/erp5_ui_short portal_caches/erp5_ui_short
portal_caches/erp5_ui_short/default_ram_cache portal_caches/erp5_ui_short/default_ram_cache
portal_categories/action_type/*
portal_contribution_registry/default_predicate portal_contribution_registry/default_predicate
portal_contribution_registry/drawing_extension portal_contribution_registry/drawing_extension
portal_contribution_registry/image_extension portal_contribution_registry/image_extension
......
product/ERP5/bootstrap/erp5_core/bt/template_portal_type_allowed_content_type_list
View file @ a18b4090
...@@ -3,6 +3,8 @@ Applied Rule | Simulation Movement ...@@ -3,6 +3,8 @@ Applied Rule | Simulation Movement
Base Category | Category Base Category | Category
Base Domain | Domain Base Domain | Domain
Base Domain | Domain Generator Base Domain | Domain Generator
Base Type | Action Information
Base Type | Role Information
Cache Factory | Distributed Ram Cache Cache Factory | Distributed Ram Cache
Cache Factory | Ram Cache Cache Factory | Ram Cache
Cache Tool | Cache Factory Cache Tool | Cache Factory
...@@ -18,4 +20,5 @@ Preference Tool | System Preference ...@@ -18,4 +20,5 @@ Preference Tool | System Preference
Simulation Movement | Applied Rule Simulation Movement | Applied Rule
Simulation Tool | Applied Rule Simulation Tool | Applied Rule
Template Tool | Business Template Template Tool | Business Template
Trash Tool | Trash Bin Trash Tool | Trash Bin
\ No newline at end of file Types Tool | Base Type
\ No newline at end of file
product/ERP5/bootstrap/erp5_core/bt/template_portal_type_id_list
View file @ a18b4090
Action Information
Alarm Alarm
Alarm Tool Alarm Tool
Applied Rule Applied Rule
Base Category Base Category
Base Domain Base Domain
Base Type
Cache Factory Cache Factory
Cache Tool Cache Tool
Category Category
...@@ -23,6 +25,7 @@ Predicate ...@@ -23,6 +25,7 @@ Predicate
Preference Preference
Preference Tool Preference Tool
Ram Cache Ram Cache
Role Information
Rule Tool Rule Tool
Session Tool Session Tool
Simulation Movement Simulation Movement
...@@ -32,4 +35,5 @@ System Preference ...@@ -32,4 +35,5 @@ System Preference
Template Tool Template Tool
Trash Bin Trash Bin
Trash Folder Trash Folder
Trash Tool Trash Tool
\ No newline at end of file Types Tool
\ No newline at end of file
product/ERP5/bootstrap/erp5_type/ActionTemplateItem/portal_types/Translation%20Information/view.xml deleted 100644 → 0
View file @ 311cfe7c
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_view</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_view</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>view</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Action Information</string> </value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>1.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>View</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="Expression" module="Products.CMFCore.Expression"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/TranslationInformation_view</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
product/ERP5/bootstrap/erp5_type/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml deleted 100644 → 0
View file @ 311cfe7c
<allowed_content_type_list>
<portal_type id="Base Type">
<item>Translation Information</item>
<item>Action Information</item>
<item>Role Information</item>
</portal_type>
<portal_type id="Types Tool">
<item>Base Type</item>
</portal_type>
</allowed_content_type_list>
\ No newline at end of file
product/ERP5/bootstrap/erp5_type/PortalTypeTemplateItem/portal_types/Translation%20Information.xml deleted 100644 → 0
View file @ 311cfe7c
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>acquire_local_roles</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Translation Information defines the association between properties and translation domains.</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
<value> <string>addBase</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Translation Information</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>permission</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Base Type</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
product/ERP5/bootstrap/erp5_type/SkinTemplateItem/portal_skins/erp5_type.xml deleted 100644 → 0
View file @ 311cfe7c
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="Folder" module="OFS.Folder"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_objects</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>erp5_type</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
product/ERP5/bootstrap/erp5_type/SkinTemplateItem/portal_skins/erp5_type/TranslationInformation_view.xml deleted 100644 → 0
View file @ 311cfe7c
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ERP5Form" module="Products.ERP5Form.Form"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_objects</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>action</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>This form is a placeholder. Its layout must be finished and configured according to the rules.</string> </value>
</item>
<item>
<key> <string>edit_order</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>encoding</string> </key>
<value> <string>UTF-8</string> </value>
</item>
<item>
<key> <string>enctype</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>group_list</string> </key>
<value>
<list>
<string>left</string>
<string>right</string>
<string>center</string>
<string>bottom</string>
<string>hidden</string>
</list>
</value>
</item>
<item>
<key> <string>groups</string> </key>
<value>
<dictionary>
<item>
<key> <string>bottom</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>left</string> </key>
<value>
<list>
<string>my_description</string>
<string>my_id</string>
<string>my_property_name</string>
<string>my_domain_name</string>
</list>
</value>
</item>
<item>
<key> <string>right</string> </key>
<value>
<list/>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>TranslationInformation_view</string> </value>
</item>
<item>
<key> <string>method</string> </key>
<value> <string>POST</string> </value>
</item>
<item>
<key> <string>name</string> </key>
<value> <string>TranslationInformation_view</string> </value>
</item>
<item>
<key> <string>pt</string> </key>
<value> <string>form_view</string> </value>
</item>
<item>
<key> <string>row_length</string> </key>
<value> <int>4</int> </value>
</item>
<item>
<key> <string>stored_encoding</string> </key>
<value> <string>UTF-8</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>unicode_mode</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>update_action</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
product/ERP5/bootstrap/erp5_type/bt/copyright_list deleted 100644 → 0
View file @ 311cfe7c
Copyright (c) 2009 Nexedi SA
\ No newline at end of file
product/ERP5/bootstrap/erp5_type/bt/license deleted 100644 → 0
View file @ 311cfe7c
This diff is collapsed.
product/ERP5/bootstrap/erp5_type/bt/publication_url deleted 100644 → 0
View file @ 311cfe7c
This diff is collapsed.
product/ERP5/bootstrap/erp5_type/bt/revision deleted 100644 → 0
View file @ 311cfe7c
This diff is collapsed.
product/ERP5/bootstrap/erp5_type/bt/short_title deleted 100644 → 0
View file @ 311cfe7c
This diff is collapsed.
product/ERP5/bootstrap/erp5_type/bt/template_path_list deleted 100644 → 0
View file @ 311cfe7c
This diff is collapsed.
product/ERP5/bootstrap/erp5_type/bt/title deleted 100644 → 0
View file @ 311cfe7c
This diff is collapsed.
product/ERP5Type/tests/ERP5TypeTestCase.py
View file @ a18b4090
This diff is collapsed.
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