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
7935f865
Commit
7935f865
authored
Jun 05, 2024
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "WIP: invitation token"
This reverts commit
74607091
.
parent
a625afb2
Changes
15
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
4 additions
and
105 deletions
+4
-105
master/bt5/slapos_erp5/LocalRolesTemplateItem/assignment_request_module.xml
...erp5/LocalRolesTemplateItem/assignment_request_module.xml
+0
-12
master/bt5/slapos_erp5/LocalRolesTemplateItem/invitation_token_module.xml
...s_erp5/LocalRolesTemplateItem/invitation_token_module.xml
+0
-10
master/bt5/slapos_erp5/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
...eAllowedContentTypeTemplateItem/allowed_content_types.xml
+1
-0
master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Assignment%20Request%20Module.xml
...alTypeRolesTemplateItem/Assignment%20Request%20Module.xml
+0
-8
master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Assignment%20Request.xml
...erp5/PortalTypeRolesTemplateItem/Assignment%20Request.xml
+0
-2
master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Invitation%20Token%20Module.xml
...rtalTypeRolesTemplateItem/Invitation%20Token%20Module.xml
+0
-6
master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Invitation%20Token.xml
...s_erp5/PortalTypeRolesTemplateItem/Invitation%20Token.xml
+0
-20
master/bt5/slapos_erp5/PortalTypeTemplateItem/portal_types/Invitation%20Token.xml
...ortalTypeTemplateItem/portal_types/Invitation%20Token.xml
+1
-7
master/bt5/slapos_erp5/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
...rtalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
+1
-1
master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5GroupRoleSecurity.py
...l_components/test.erp5.testSlapOSERP5GroupRoleSecurity.py
+0
-33
master/bt5/slapos_erp5/WorkflowTemplateItem/portal_workflow/local_permission_slapos_interaction_workflow/interaction_SupportRequest_edit.xml
..._interaction_workflow/interaction_SupportRequest_edit.xml
+0
-1
master/bt5/slapos_erp5/bt/template_local_role_list
master/bt5/slapos_erp5/bt/template_local_role_list
+0
-1
master/bt5/slapos_erp5/bt/template_portal_type_allowed_content_type_list
...os_erp5/bt/template_portal_type_allowed_content_type_list
+1
-0
master/bt5/slapos_erp5/bt/template_portal_type_role_list
master/bt5/slapos_erp5/bt/template_portal_type_role_list
+0
-3
master/bt5/slapos_erp5/bt/template_portal_type_workflow_chain_list
...5/slapos_erp5/bt/template_portal_type_workflow_chain_list
+0
-1
No files found.
master/bt5/slapos_erp5/LocalRolesTemplateItem/assignment_request_module.xml
deleted
100644 → 0
View file @
a625afb2
<local_roles_item>
<local_roles>
<role
id=
'F-PRODUCTION*'
>
<item>
Auditor
</item>
</role>
</local_roles>
<local_role_group_ids>
<local_role_group_id
id=
'function'
>
<principal
id=
'F-PRODUCTION*'
>
Auditor
</principal>
</local_role_group_id>
</local_role_group_ids>
</local_roles_item>
\ No newline at end of file
master/bt5/slapos_erp5/LocalRolesTemplateItem/invitation_token_module.xml
View file @
7935f865
<local_roles_item>
<local_roles_item>
<local_roles>
<local_roles>
<role
id=
'F-PRODUCTION*'
>
<item>
Auditor
</item>
<item>
Author
</item>
</role>
</local_roles>
</local_roles>
<local_role_group_ids>
<local_role_group_id
id=
'function'
>
<principal
id=
'F-PRODUCTION*'
>
Auditor
</principal>
<principal
id=
'F-PRODUCTION*'
>
Author
</principal>
</local_role_group_id>
</local_role_group_ids>
</local_roles_item>
</local_roles_item>
\ No newline at end of file
master/bt5/slapos_erp5/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
View file @
7935f865
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
<item>
Cloud Contract Line
</item>
<item>
Cloud Contract Line
</item>
</portal_type>
</portal_type>
<portal_type
id=
"Invitation Token Module"
>
<portal_type
id=
"Invitation Token Module"
>
<item>
Contract Invitation Token
</item>
<item>
Invitation Token
</item>
<item>
Invitation Token
</item>
</portal_type>
</portal_type>
<portal_type
id=
"Organisation"
>
<portal_type
id=
"Organisation"
>
...
...
master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Assignment%20Request%20Module.xml
deleted
100644 → 0
View file @
a625afb2
<type_roles>
<role
id=
'Auditor'
>
<property
id=
'title'
>
Production
</property>
<multi_property
id=
'categories'
>
local_role_group/function
</multi_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/Assignment%20Request.xml
deleted
100644 → 0
View file @
a625afb2
<type_roles>
</type_roles>
\ No newline at end of file
master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Invitation%20Token%20Module.xml
View file @
7935f865
<type_roles>
<type_roles>
<role
id=
'Auditor; Author'
>
<property
id=
'title'
>
Production
</property>
<multi_property
id=
'categories'
>
local_role_group/function
</multi_property>
<multi_property
id=
'category'
>
function/production*
</multi_property>
<multi_property
id=
'base_category'
>
function
</multi_property>
</role>
</type_roles>
</type_roles>
\ No newline at end of file
master/bt5/slapos_erp5/PortalTypeRolesTemplateItem/Invitation%20Token.xml
deleted
100644 → 0
View file @
a625afb2
<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=
'categories'
>
local_role_group/project
</multi_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=
'categories'
>
local_role_group/project
</multi_property>
<multi_property
id=
'category'
>
function/production/manager
</multi_property>
<multi_property
id=
'base_category'
>
destination_project
</multi_property>
</role>
</type_roles>
\ No newline at end of file
master/bt5/slapos_erp5/PortalTypeTemplateItem/portal_types/Invitation%20Token.xml
View file @
7935f865
...
@@ -42,15 +42,9 @@
...
@@ -42,15 +42,9 @@
<key>
<string>
portal_type
</string>
</key>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Base Type
</string>
</value>
<value>
<string>
Base Type
</string>
</value>
</item>
</item>
<item>
<key>
<string>
short_title
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<item>
<key>
<string>
type_class
</string>
</key>
<key>
<string>
type_class
</string>
</key>
<value>
<string>
Ticke
t
</string>
</value>
<value>
<string>
XMLObjec
t
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
type_interface
</string>
</key>
<key>
<string>
type_interface
</string>
</key>
...
...
master/bt5/slapos_erp5/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
View file @
7935f865
...
@@ -77,7 +77,7 @@
...
@@ -77,7 +77,7 @@
</chain>
</chain>
<chain>
<chain>
<type>
Invitation Token
</type>
<type>
Invitation Token
</type>
<workflow>
edit_workflow,
local_permission_slapos_interaction_workflow,
validation_workflow
</workflow>
<workflow>
edit_workflow, validation_workflow
</workflow>
</chain>
</chain>
<chain>
<chain>
<type>
Mail Message
</type>
<type>
Mail Message
</type>
...
...
master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5GroupRoleSecurity.py
View file @
7935f865
...
@@ -1021,15 +1021,6 @@ class TestSoftwareProduct(TestSlapOSGroupRoleSecurityMixin):
...
@@ -1021,15 +1021,6 @@ class TestSoftwareProduct(TestSlapOSGroupRoleSecurityMixin):
self
.
assertRoles
(
product
,
'%s_F-CUSTOMER'
%
project
.
getReference
(),
[
'Auditor'
])
self
.
assertRoles
(
product
,
'%s_F-CUSTOMER'
%
project
.
getReference
(),
[
'Auditor'
])
class
TestInvitationTokenModule
(
TestSlapOSGroupRoleSecurityMixin
):
def
test_InvitationTokenModule
(
self
):
module
=
self
.
portal
.
invitation_token_module
self
.
assertSecurityGroup
(
module
,
[
'F-PRODUCTION*'
,
module
.
Base_getOwnerId
()],
False
)
self
.
assertRoles
(
module
,
'F-PRODUCTION*'
,
[
'Auditor'
,
'Author'
])
self
.
assertRoles
(
module
,
module
.
Base_getOwnerId
(),
[
'Owner'
])
class
TestSupportRequestModule
(
TestSlapOSGroupRoleSecurityMixin
):
class
TestSupportRequestModule
(
TestSlapOSGroupRoleSecurityMixin
):
def
test_SupportRequestModule
(
self
):
def
test_SupportRequestModule
(
self
):
module
=
self
.
portal
.
support_request_module
module
=
self
.
portal
.
support_request_module
...
@@ -1041,30 +1032,6 @@ class TestSupportRequestModule(TestSlapOSGroupRoleSecurityMixin):
...
@@ -1041,30 +1032,6 @@ class TestSupportRequestModule(TestSlapOSGroupRoleSecurityMixin):
self
.
assertRoles
(
module
,
module
.
Base_getOwnerId
(),
[
'Owner'
])
self
.
assertRoles
(
module
,
module
.
Base_getOwnerId
(),
[
'Owner'
])
class
TestInvitationToken
(
TestSlapOSGroupRoleSecurityMixin
):
ticket_portal_type
=
'Invitation Token'
def
test_InvitationToken_default
(
self
):
support_request
=
self
.
portal
.
getDefaultModuleValue
(
self
.
ticket_portal_type
).
newContent
(
portal_type
=
self
.
ticket_portal_type
)
self
.
assertSecurityGroup
(
support_request
,
[
self
.
user_id
],
False
)
self
.
assertRoles
(
support_request
,
self
.
user_id
,
[
'Owner'
])
def
test_InvitationToken_DestinationProject
(
self
):
project
=
self
.
addProject
()
support_request
=
self
.
portal
.
getDefaultModuleValue
(
self
.
ticket_portal_type
).
newContent
(
portal_type
=
self
.
ticket_portal_type
)
support_request
.
edit
(
destination_project_value
=
project
)
self
.
assertSecurityGroup
(
support_request
,
[
self
.
user_id
,
'%s_F-PRODAGNT'
%
project
.
getReference
(),
'%s_F-PRODMAN'
%
project
.
getReference
()],
False
)
self
.
assertRoles
(
support_request
,
self
.
user_id
,
[
'Owner'
])
self
.
assertRoles
(
support_request
,
'%s_F-PRODMAN'
%
project
.
getReference
(),
[
'Assignor'
])
self
.
assertRoles
(
support_request
,
'%s_F-PRODAGNT'
%
project
.
getReference
(),
[
'Assignee'
])
class
TestSupportRequest
(
TestSlapOSGroupRoleSecurityMixin
):
class
TestSupportRequest
(
TestSlapOSGroupRoleSecurityMixin
):
ticket_portal_type
=
'Support Request'
ticket_portal_type
=
'Support Request'
...
...
master/bt5/slapos_erp5/WorkflowTemplateItem/portal_workflow/local_permission_slapos_interaction_workflow/interaction_SupportRequest_edit.xml
View file @
7935f865
...
@@ -35,7 +35,6 @@
...
@@ -35,7 +35,6 @@
<string>
Support Request
</string>
<string>
Support Request
</string>
<string>
Upgrade Decision
</string>
<string>
Upgrade Decision
</string>
<string>
Regularisation Request
</string>
<string>
Regularisation Request
</string>
<string>
Invitation Token
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
...
master/bt5/slapos_erp5/bt/template_local_role_list
View file @
7935f865
...
@@ -16,7 +16,6 @@ account_module/refundable_vat
...
@@ -16,7 +16,6 @@ account_module/refundable_vat
account_module/sales
account_module/sales
accounting_module
accounting_module
allocation_supply_module
allocation_supply_module
assignment_request_module
business_process_module
business_process_module
business_process_module/slapos_sale_subscription_business_process
business_process_module/slapos_sale_subscription_business_process
cloud_contract_module
cloud_contract_module
...
...
master/bt5/slapos_erp5/bt/template_portal_type_allowed_content_type_list
View file @
7935f865
Contract Invitation Token | Cloud Contract Line
Contract Invitation Token | Cloud Contract Line
Invitation Token Module | Contract Invitation Token
Invitation Token Module | Invitation Token
Invitation Token Module | Invitation Token
Organisation | Geographical Area
Organisation | Geographical Area
Organisation | Geographical Location
Organisation | Geographical Location
\ No newline at end of file
master/bt5/slapos_erp5/bt/template_portal_type_role_list
View file @
7935f865
...
@@ -8,8 +8,6 @@ Acknowledgement
...
@@ -8,8 +8,6 @@ Acknowledgement
Allocation Supply
Allocation Supply
Allocation Supply Module
Allocation Supply Module
Assignment
Assignment
Assignment Request
Assignment Request Module
Balance Transaction
Balance Transaction
Bank Account
Bank Account
Business Process
Business Process
...
@@ -45,7 +43,6 @@ Instance Tree
...
@@ -45,7 +43,6 @@ Instance Tree
Instance Tree Module
Instance Tree Module
Integration Site
Integration Site
Integration Tool
Integration Tool
Invitation Token
Invitation Token Module
Invitation Token Module
Letter
Letter
Mail Message
Mail Message
...
...
master/bt5/slapos_erp5/bt/template_portal_type_workflow_chain_list
View file @
7935f865
...
@@ -21,7 +21,6 @@ Inventory Cell | -immobilisation_movement_interaction_workflow
...
@@ -21,7 +21,6 @@ Inventory Cell | -immobilisation_movement_interaction_workflow
Inventory Line | -immobilisation_movement_interaction_workflow
Inventory Line | -immobilisation_movement_interaction_workflow
Inventory | -immobilisation_movement_interaction_workflow
Inventory | -immobilisation_movement_interaction_workflow
Invitation Token | edit_workflow
Invitation Token | edit_workflow
Invitation Token | local_permission_slapos_interaction_workflow
Invitation Token | validation_workflow
Invitation Token | validation_workflow
Mail Message | local_permission_slapos_interaction_workflow
Mail Message | local_permission_slapos_interaction_workflow
Open Sale Order | local_permission_slapos_interaction_workflow
Open Sale Order | local_permission_slapos_interaction_workflow
...
...
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