Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Romain Courteaud
slapos.core
Commits
8b101946
Commit
8b101946
authored
Feb 10, 2023
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
XXX do not install slapos_subscription_request
Everything should work without it. It will be rework later.
parent
f01b04eb
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
116 additions
and
93 deletions
+116
-93
master/bt5/slapos_configurator/TestTemplateItem/portal_components/test.erp5.testSlapOSConfigurator.py
...tem/portal_components/test.erp5.testSlapOSConfigurator.py
+115
-3
master/bt5/slapos_erp5/LocalRolesTemplateItem/subscription_condition_module.xml
.../LocalRolesTemplateItem/subscription_condition_module.xml
+0
-4
master/bt5/slapos_erp5/LocalRolesTemplateItem/subscription_request_module.xml
...p5/LocalRolesTemplateItem/subscription_request_module.xml
+0
-10
master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Subscription%20Condition%20Module.xml
...peRolesTemplateItem/Subscription%20Condition%20Module.xml
+0
-8
master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Subscription%20Condition.xml
.../PortalTypeRolesTemplateItem/Subscription%20Condition.xml
+0
-8
master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Subscription%20Request%20Module.xml
...TypeRolesTemplateItem/Subscription%20Request%20Module.xml
+0
-12
master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Subscription%20Request.xml
...p5/PortalTypeRolesTemplateItem/Subscription%20Request.xml
+0
-36
master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5SkinSelection.py
...ortal_components/test.erp5.testSlapOSERP5SkinSelection.py
+0
-2
master/bt5/slapos_erp5/bt/dependency_list
master/bt5/slapos_erp5/bt/dependency_list
+1
-2
master/bt5/slapos_erp5/bt/template_local_role_list
master/bt5/slapos_erp5/bt/template_local_role_list
+0
-2
master/bt5/slapos_erp5/bt/template_portal_type_role_list
master/bt5/slapos_erp5/bt/template_portal_type_role_list
+0
-4
master/product/SlapOS/tests/testSlapOSMixin.py
master/product/SlapOS/tests/testSlapOSMixin.py
+0
-1
master/tests/__init__.py
master/tests/__init__.py
+0
-1
No files found.
master/bt5/slapos_configurator/TestTemplateItem/portal_components/test.erp5.testSlapOSConfigurator.py
View file @
8b101946
...
...
@@ -218,8 +218,6 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin):
'software_publication_module'
,
'software_release_module'
,
'sound_module'
,
'subscription_condition_module'
,
'subscription_request_module'
,
'support_request_module'
,
'system_event_module'
,
'task_module'
,
...
...
@@ -264,7 +262,121 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin):
""" Make sure Installed business Templates are
what it is expected. """
expected_business_template_list
=
self
.
getExpectedBusinessTemplateInstalledAfterConfiguration
()
expected_business_template_list
=
[
'erp5_core'
,
'erp5_xhtml_style'
,
'erp5_property_sheets'
,
'erp5_mysql_innodb_catalog'
,
'erp5_upgrader'
,
'slapos_upgrader'
,
'erp5_full_text_mroonga_catalog'
,
'erp5_core_proxy_field_legacy'
,
'erp5_base'
,
'erp5_administration'
,
'erp5_configurator'
,
'slapos_configurator'
,
'erp5_simulation'
,
'erp5_pdm'
,
'erp5_trade'
,
'erp5_tiosafe_core'
,
'erp5_item'
,
'erp5_forge'
,
'erp5_ingestion_mysql_innodb_catalog'
,
'erp5_ingestion'
,
'erp5_crm'
,
'erp5_system_event'
,
'erp5_secure_payment'
,
'erp5_security_uid_innodb_catalog'
,
'erp5_payzen_secure_payment'
,
'erp5_wechat_secure_payment'
,
'erp5_ooo_import'
,
'erp5_odt_style'
,
'erp5_ods_style'
,
'erp5_jquery'
,
'erp5_jquery_plugin_colorpicker'
,
'erp5_jquery_plugin_elastic'
,
'erp5_jquery_plugin_jqchart'
,
'erp5_jquery_plugin_mbmenu'
,
'erp5_jquery_plugin_sheet'
,
'erp5_jquery_sheet_editor'
,
'erp5_jquery_ui'
,
'erp5_deferred_style'
,
'erp5_dhtml_style'
,
'erp5_knowledge_pad'
,
'erp5_web'
,
'erp5_rss_style'
,
'erp5_dms'
,
'erp5_content_translation'
,
'erp5_software_pdm'
,
'erp5_svg_editor'
,
'erp5_syncml'
,
'erp5_computer_immobilisation'
,
'erp5_open_trade'
,
'erp5_accounting'
,
'erp5_commerce'
,
'erp5_credential'
,
'erp5_km'
,
'erp5_web_download_theme'
,
'erp5_web_shacache'
,
'erp5_data_set'
,
'erp5_web_shadir'
,
'erp5_invoicing'
,
'erp5_simplified_invoicing'
,
'erp5_credential_oauth2'
,
'erp5_accounting_l10n_fr'
,
'erp5_accounting_l10n_ifrs'
,
'erp5_code_mirror'
,
'erp5_font'
,
'erp5_hal_json_style'
,
'erp5_immobilisation'
,
'erp5_l10n_fr'
,
'erp5_l10n_ja'
,
'erp5_l10n_zh'
,
'erp5_monaco_editor'
,
'erp5_movement_table_catalog'
,
'erp5_web_renderjs_ui'
,
'erp5_web_service'
,
'erp5_graph_editor'
,
'slapos_jio'
,
'slapos_l10n_zh'
,
'erp5_bearer_token'
,
'erp5_certificate_authority'
,
'erp5_access_token'
,
'erp5_project'
,
'erp5_oauth'
,
'erp5_oauth_facebook_login'
,
'erp5_oauth_google_login'
,
'erp5_run_my_doc'
,
'erp5_slapos_tutorial'
,
'erp5_slapos_tutorial_data'
,
'erp5_slideshow_style'
,
'erp5_authentication_policy'
,
'erp5_multimedia'
,
'erp5_corporate_identity'
,
'erp5_officejs'
,
'erp5_oauth2_resource'
,
'erp5_notebook'
,
'erp5_smart_assistant'
,
'erp5_interaction_drop'
,
'slapos_mysql_innodb_catalog'
,
'slapos_cloud'
,
'slapos_slap_tool'
,
'slapos_category'
,
'slapos_rss_style'
,
'slapos_pdm'
,
'slapos_crm'
,
'slapos_accounting'
,
'slapos_payzen'
,
'slapos_wechat'
,
'slapos_web_deploy'
,
'slapos_erp5'
,
'erp5_big_file'
,
'erp5_json_type'
,
'erp5_data_notebook'
,
'erp5_wendelin'
,
'slapos_abyss'
,
'erp5_development_wizard'
]
# If mixin contains a custom definition that introduce new business templated from
# the project scope, them include it on expected list.
...
...
master/bt5/slapos_erp5/LocalRolesTemplateItem/subscription_condition_module.xml
deleted
100644 → 0
View file @
f01b04eb
<local_roles_item>
<local_roles>
</local_roles>
</local_roles_item>
\ No newline at end of file
master/bt5/slapos_erp5/LocalRolesTemplateItem/subscription_request_module.xml
deleted
100644 → 0
View file @
f01b04eb
<local_roles_item>
<local_roles>
<role
id=
'F-CUSTOMER'
>
<item>
Auditor
</item>
</role>
<role
id=
'F-PRODUCTION*'
>
<item>
Auditor
</item>
</role>
</local_roles>
</local_roles_item>
\ No newline at end of file
master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Subscription%20Condition%20Module.xml
deleted
100644 → 0
View file @
f01b04eb
<type_roles>
<role
id=
'Auditor; Author'
>
<property
id=
'title'
>
Company group
</property>
<multi_property
id=
'categories'
>
local_role_group/group
</multi_property>
<multi_property
id=
'category'
>
group/company
</multi_property>
<multi_property
id=
'base_category'
>
group
</multi_property>
</role>
</type_roles>
\ No newline at end of file
master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Subscription%20Condition.xml
deleted
100644 → 0
View file @
f01b04eb
<type_roles>
<role
id=
'Assignor'
>
<property
id=
'title'
>
Company group
</property>
<multi_property
id=
'categories'
>
local_role_group/group
</multi_property>
<multi_property
id=
'category'
>
group/company
</multi_property>
<multi_property
id=
'base_category'
>
group
</multi_property>
</role>
</type_roles>
\ No newline at end of file
master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Subscription%20Request%20Module.xml
deleted
100644 → 0
View file @
f01b04eb
<type_roles>
<role
id=
'Auditor'
>
<property
id=
'title'
>
Member
</property>
<multi_property
id=
'category'
>
function/customer
</multi_property>
<multi_property
id=
'base_category'
>
function
</multi_property>
</role>
<role
id=
'Auditor'
>
<property
id=
'title'
>
Production
</property>
<multi_property
id=
'category'
>
function/production*
</multi_property>
<multi_property
id=
'base_category'
>
function
</multi_property>
</role>
</type_roles>
\ No newline at end of file
master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Subscription%20Request.xml
deleted
100644 → 0
View file @
f01b04eb
<type_roles>
<role
id=
'Assignee'
>
<property
id=
'title'
>
Destination Project Production Agent
</property>
<property
id=
'description'
>
XXX add local role group
</property>
<property
id=
'condition'
>
python: context.getDestinationProject('', portal_type='Project') != ""
</property>
<property
id=
'base_category_script'
>
ERP5Type_getSecurityCategoryFromContent
</property>
<multi_property
id=
'category'
>
function/production/agent
</multi_property>
<multi_property
id=
'base_category'
>
destination_project
</multi_property>
</role>
<role
id=
'Assignor'
>
<property
id=
'title'
>
Destination Project Production Manager
</property>
<property
id=
'description'
>
XXX add local role group
</property>
<property
id=
'condition'
>
python: context.getDestinationProject('', portal_type='Project') != ""
</property>
<property
id=
'base_category_script'
>
ERP5Type_getSecurityCategoryFromContent
</property>
<multi_property
id=
'category'
>
function/production/manager
</multi_property>
<multi_property
id=
'base_category'
>
destination_project
</multi_property>
</role>
<role
id=
'Assignee'
>
<property
id=
'title'
>
Source Project Production Agent
</property>
<property
id=
'description'
>
XXX add local role group
</property>
<property
id=
'condition'
>
python: context.getSourceProject('', portal_type='Project') != ""
</property>
<property
id=
'base_category_script'
>
ERP5Type_getSecurityCategoryFromContent
</property>
<multi_property
id=
'category'
>
function/production/agent
</multi_property>
<multi_property
id=
'base_category'
>
source_project
</multi_property>
<multi_property
id=
'base_category'
>
function
</multi_property>
</role>
<role
id=
'Assignor'
>
<property
id=
'title'
>
Source Project Production Manager
</property>
<property
id=
'description'
>
XXX add local role group
</property>
<property
id=
'condition'
>
python: context.getSourceProject('', portal_type='Project') != ""
</property>
<property
id=
'base_category_script'
>
ERP5Type_getSecurityCategoryFromContent
</property>
<multi_property
id=
'category'
>
function/production/manager
</multi_property>
<multi_property
id=
'base_category'
>
source_project
</multi_property>
<multi_property
id=
'base_category'
>
function
</multi_property>
</role>
</type_roles>
\ No newline at end of file
master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5SkinSelection.py
View file @
8b101946
...
...
@@ -25,7 +25,6 @@ import difflib
slapos_folder_list
=
"""slapos_abyss
slapos_base
slapos_contract
slapos_subscription_request
slapos_crm_monitoring
slapos_accounting
slapos_administration
...
...
@@ -898,7 +897,6 @@ slapos_upgrader
slapos_abyss
slapos_base
slapos_contract
slapos_subscription_request
slapos_crm_monitoring
slapos_accounting
slapos_administration
...
...
master/bt5/slapos_erp5/bt/dependency_list
View file @
8b101946
...
...
@@ -16,6 +16,5 @@ slapos_jio
slapos_panel
slapos_payzen
slapos_upgrader
slapos_subscription_request
slapos_web_deploy
slapos_abyss
\ No newline at end of file
slapos_abyss
master/bt5/slapos_erp5/bt/template_local_role_list
View file @
8b101946
...
...
@@ -91,8 +91,6 @@ service_module/zero_emission_ratio
software_installation_module
software_instance_module
software_product_module
subscription_condition_module
subscription_request_module
support_request_module
support_request_module/slapos_crm_support_request_template
system_event_module
...
...
master/bt5/slapos_erp5/bt/template_portal_type_role_list
View file @
8b101946
...
...
@@ -91,10 +91,6 @@ Software Instance
Software Instance Module
Software Product
Software Product Module
Subscription Condition
Subscription Condition Module
Subscription Request
Subscription Request Module
Support Request
Support Request Module
System Event Module
...
...
master/product/SlapOS/tests/testSlapOSMixin.py
View file @
8b101946
...
...
@@ -286,7 +286,6 @@ class testSlapOSMixin(ERP5TypeTestCase):
'slapos_cloud'
,
'slapos_l10n_zh'
,
'slapos_mysql_innodb_catalog'
,
'slapos_subscription_request'
,
'slapos_slap_tool'
,
'slapos_category'
,
'slapos_rss_style'
,
...
...
master/tests/__init__.py
View file @
8b101946
...
...
@@ -8,7 +8,6 @@ slapos_bt_list = [
'erp5_web_shadir'
,
'slapos_accounting'
,
'slapos_cache'
,
'slapos_subscription_request'
,
'slapos_cloud'
,
'slapos_erp5'
,
'slapos_pdm'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment