Skip to content

S
slapos.core
Commit 4de9164c authored by Łukasz Nowak's avatar Łukasz Nowak
Browse files
Options

Split vifib_datas. 

Put web sites and web pages into vifib_data_web.
Put categories into vifib_data_category.
Put uncategorised data into vifib_data.
Drop vifib_datas.
parent 7386e9e7
Hide whitespace changes
Inline Side-by-side
Showing with 118 additions and 87 deletions
master/bt5/vifib_datas/PathTemplateItem/notification_message_module/vifib_fiber_hosting_contract.xml → master/bt5/vifib_data/PathTemplateItem/notification_message_module/vifib_fiber_hosting_contract.xml
View file @ 4de9164c
......@@ -13,8 +13,8 @@
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -22,10 +22,7 @@
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -33,10 +30,7 @@
<key> <string>_Delete_objects_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -47,7 +41,6 @@
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -58,8 +51,8 @@
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......
master/bt5/vifib_datas/PathTemplateItem/notification_message_module/vifib_fiber_request_accept.xml → master/bt5/vifib_data/PathTemplateItem/notification_message_module/vifib_fiber_request_accept.xml
View file @ 4de9164c
......@@ -13,8 +13,8 @@
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -22,10 +22,7 @@
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -33,10 +30,7 @@
<key> <string>_Delete_objects_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -47,7 +41,6 @@
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -58,8 +51,8 @@
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......
master/bt5/vifib_datas/PathTemplateItem/notification_message_module/vifib_fiber_request_confirm.xml → master/bt5/vifib_data/PathTemplateItem/notification_message_module/vifib_fiber_request_confirm.xml
View file @ 4de9164c
......@@ -13,8 +13,8 @@
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -22,10 +22,7 @@
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -33,10 +30,7 @@
<key> <string>_Delete_objects_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -47,7 +41,6 @@
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -58,8 +51,8 @@
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......
master/bt5/vifib_datas/PathTemplateItem/notification_message_module/vifib_fiber_request_refuse_isp.xml → master/bt5/vifib_data/PathTemplateItem/notification_message_module/vifib_fiber_request_refuse_isp.xml
View file @ 4de9164c
......@@ -13,8 +13,8 @@
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -22,10 +22,7 @@
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -33,10 +30,7 @@
<key> <string>_Delete_objects_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -47,7 +41,6 @@
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -58,8 +51,8 @@
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......
master/bt5/vifib_datas/PathTemplateItem/notification_message_module/vifib_fiber_request_sendnewcontrat.xml → master/bt5/vifib_data/PathTemplateItem/notification_message_module/vifib_fiber_request_sendnewcontrat.xml
View file @ 4de9164c
......@@ -13,8 +13,8 @@
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -22,10 +22,7 @@
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -33,10 +30,7 @@
<key> <string>_Delete_objects_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -47,7 +41,6 @@
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -58,8 +51,8 @@
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......
master/bt5/vifib_datas/PathTemplateItem/notification_message_module/vifib_fiber_request_start.xml → master/bt5/vifib_data/PathTemplateItem/notification_message_module/vifib_fiber_request_start.xml
View file @ 4de9164c
......@@ -13,8 +13,8 @@
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -22,10 +22,7 @@
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -33,10 +30,7 @@
<key> <string>_Delete_objects_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -47,7 +41,6 @@
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -58,8 +51,8 @@
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......
master/bt5/vifib_datas/PreferenceTemplateItem/portal_preferences/vifib_default_system_preference.xml → master/bt5/vifib_data/PreferenceTemplateItem/portal_preferences/vifib_default_system_preference.xml
View file @ 4de9164c
......@@ -24,6 +24,22 @@
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Delete_objects_Permission</string> </key>
<value>
<tuple>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
......@@ -65,6 +81,14 @@
<key> <string>portal_type</string> </key>
<value> <string>System Preference</string> </value>
</item>
<item>
<key> <string>preferred_credential_recovery_automatic_approval</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>preferred_credential_request_automatic_approval</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>preferred_hide_rows_on_no_search_criterion</string> </key>
<value> <int>1</int> </value>
......@@ -83,16 +107,24 @@
</item>
<item>
<key> <string>preferred_ooodoc_server_address</string> </key>
<value> <string>127.0.0.1</string> </value>
<value> <string>10.0.0.1</string> </value>
</item>
<item>
<key> <string>preferred_ooodoc_server_port_number</string> </key>
<value> <int>40001</int> </value>
<value> <int>23000</int> </value>
</item>
<item>
<key> <string>preferred_software_setup_resource</string> </key>
<value> <string>service_module/vifib_software_setup</string> </value>
</item>
<item>
<key> <string>preferred_subscription_assignment_category</string> </key>
<value>
<tuple>
<string>function/customer</string>
</tuple>
</value>
</item>
<item>
<key> <string>preferred_time_zone</string> </key>
<value> <string>Europe/Paris</string> </value>
......
master/bt5/vifib_data/bt/description 0 → 100644
View file @ 4de9164c
Contains uncategorised data.
\ No newline at end of file
master/bt5/vifib_data/bt/revision 0 → 100644
View file @ 4de9164c
77
\ No newline at end of file
master/bt5/vifib_data/bt/template_path_list 0 → 100644
View file @ 4de9164c
currency_module/EUR
document_module/1
notification_message_module/vifib*
service_module/vifib_instance_cleanup
service_module/vifib_instance_hosting
service_module/vifib_instance_setup
service_module/vifib_software_setup
service_module/vifib_usage_report
\ No newline at end of file
master/bt5/vifib_data/bt/title 0 → 100644
View file @ 4de9164c
vifib_data
\ No newline at end of file
master/bt5/vifib_data_category/bt/copyright_list 0 → 100644
View file @ 4de9164c
Nexedi SA
\ No newline at end of file
master/bt5/vifib_data_category/bt/dependency_list 0 → 100644
View file @ 4de9164c
vifib_core
\ No newline at end of file
master/bt5/vifib_data_category/bt/description 0 → 100644
View file @ 4de9164c
Contains categories.
\ No newline at end of file
master/bt5/vifib_data_category/bt/license 0 → 100644
View file @ 4de9164c
GPL
\ No newline at end of file
master/bt5/vifib_data_category/bt/revision 0 → 100644
View file @ 4de9164c
77
\ No newline at end of file
master/bt5/vifib_datas/bt/template_path_list → master/bt5/vifib_data_category/bt/template_path_list
View file @ 4de9164c
currency_module/EUR
document_module/1
notification_message_module/vifib*
portal_categories/activity/**
portal_categories/base_amount/**
portal_categories/business_application/**
......@@ -34,18 +31,4 @@ portal_categories/role/**
portal_categories/salary_level/**
portal_categories/site/**
portal_categories/skill/**
portal_categories/social_form/**
service_module/vifib_instance_cleanup
service_module/vifib_instance_hosting
service_module/vifib_instance_setup
service_module/vifib_software_setup
service_module/vifib_usage_report
web_page_module/vifib*
web_site_module/cash
web_site_module/cash/**
web_site_module/erpypi
web_site_module/erpypi/**
web_site_module/fiber
web_site_module/fiber/**
web_site_module/hosting
web_site_module/hosting/**
\ No newline at end of file
portal_categories/social_form/**
\ No newline at end of file
master/bt5/vifib_data_category/bt/title 0 → 100644
View file @ 4de9164c
vifib_data_category
\ No newline at end of file
master/bt5/vifib_data_category/bt/version 0 → 100644
View file @ 4de9164c
0.3
\ No newline at end of file
master/bt5/vifib_datas/PathTemplateItem/web_page_module/vifib_aboutus_en.xml → master/bt5/vifib_data_web/PathTemplateItem/web_page_module/vifib_aboutus_en.xml
View file @ 4de9164c
......@@ -10,8 +10,11 @@
<key> <string>_Access_contents_information_Permission</string> </key>
<value>
<tuple>
<string>Anonymous</string>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
......@@ -24,7 +27,6 @@
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -44,7 +46,6 @@
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -52,8 +53,11 @@
<key> <string>_View_Permission</string> </key>
<value>
<tuple>
<string>Anonymous</string>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
......
master/bt5/vifib_datas/PathTemplateItem/web_page_module/vifib_aboutus_fr.xml → master/bt5/vifib_data_web/PathTemplateItem/web_page_module/vifib_aboutus_fr.xml
View file @ 4de9164c
......@@ -10,8 +10,11 @@
<key> <string>_Access_contents_information_Permission</string> </key>
<value>
<tuple>
<string>Anonymous</string>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
......@@ -24,7 +27,6 @@
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -44,7 +46,6 @@
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -52,8 +53,11 @@
<key> <string>_View_Permission</string> </key>
<value>
<tuple>
<string>Anonymous</string>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
......
master/bt5/vifib_datas/PathTemplateItem/web_page_module/vifib_footer_en.xml → master/bt5/vifib_data_web/PathTemplateItem/web_page_module/vifib_footer_en.xml
View file @ 4de9164c
......@@ -24,6 +24,7 @@
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
</tuple>
......@@ -42,6 +43,8 @@
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
......
master/bt5/vifib_datas/PathTemplateItem/web_page_module/vifib_footer_fr.xml → master/bt5/vifib_data_web/PathTemplateItem/web_page_module/vifib_footer_fr.xml
View file @ 4de9164c
......@@ -24,6 +24,7 @@
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
</tuple>
......@@ -42,6 +43,8 @@
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
......
master/bt5/vifib_datas/PathTemplateItem/web_page_module/vifib_legalInformation_en.xml → master/bt5/vifib_data_web/PathTemplateItem/web_page_module/vifib_legalInformation_en.xml
View file @ 4de9164c
......@@ -10,8 +10,11 @@
<key> <string>_Access_contents_information_Permission</string> </key>
<value>
<tuple>
<string>Anonymous</string>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
......@@ -24,7 +27,6 @@
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -44,7 +46,6 @@
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -52,8 +53,11 @@
<key> <string>_View_Permission</string> </key>
<value>
<tuple>
<string>Anonymous</string>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
......
master/bt5/vifib_datas/PathTemplateItem/web_page_module/vifib_legalInformation_fr.xml → master/bt5/vifib_data_web/PathTemplateItem/web_page_module/vifib_legalInformation_fr.xml
View file @ 4de9164c
......@@ -10,8 +10,11 @@
<key> <string>_Access_contents_information_Permission</string> </key>
<value>
<tuple>
<string>Anonymous</string>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
......@@ -24,7 +27,6 @@
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -44,7 +46,6 @@
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -52,8 +53,11 @@
<key> <string>_View_Permission</string> </key>
<value>
<tuple>
<string>Anonymous</string>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
......
master/bt5/vifib_data_web/bt/copyright_list 0 → 100644
View file @ 4de9164c
Nexedi SA
\ No newline at end of file
master/bt5/vifib_data_web/bt/dependency_list 0 → 100644
View file @ 4de9164c
vifib_core
\ No newline at end of file
master/bt5/vifib_data_web/bt/description 0 → 100644
View file @ 4de9164c
Contains web sites and pages..
\ No newline at end of file
master/bt5/vifib_data_web/bt/license 0 → 100644
View file @ 4de9164c
GPL
\ No newline at end of file
master/bt5/vifib_data_web/bt/publication_url 0 → 100644
View file @ 4de9164c
None
\ No newline at end of file
master/bt5/vifib_data_web/bt/revision 0 → 100644
View file @ 4de9164c
77
\ No newline at end of file
master/bt5/vifib_data_web/bt/template_path_list 0 → 100644
View file @ 4de9164c
web_page_module/vifib*
web_site_module/cash
web_site_module/cash/**
web_site_module/erpypi
web_site_module/erpypi/**
web_site_module/fiber
web_site_module/fiber/**
web_site_module/hosting
web_site_module/hosting/**
\ No newline at end of file
master/bt5/vifib_data_web/bt/title 0 → 100644
View file @ 4de9164c
vifib_data_web
\ No newline at end of file
master/bt5/vifib_data_web/bt/version 0 → 100644
View file @ 4de9164c
0.3
\ No newline at end of file
master/bt5/vifib_datas/bt/comment deleted 100644 → 0
View file @ 7386e9e7
portal_categories/product_line/** does not work
\ No newline at end of file
master/bt5/vifib_datas/bt/description deleted 100644 → 0
View file @ 7386e9e7
Contains web sites.
\ No newline at end of file
master/bt5/vifib_datas/bt/revision deleted 100644 → 0
View file @ 7386e9e7
76
\ No newline at end of file
master/bt5/vifib_datas/bt/title deleted 100644 → 0
View file @ 7386e9e7
vifib_datas
\ No newline at end of file
master/product/Vifib/tests/VifibMixin.py
View file @ 4de9164c
......@@ -106,7 +106,9 @@ class testVifibMixin(ERP5TypeTestCase):
'vifib_web',
'vifib_open_trade',
'vifib_l10n_fr',
'vifib_datas',
'vifib_data',
'vifib_data_category',
'vifib_data_web',
'vifib_erp5',
]
return result
......
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