Commit fdb8c2a4 authored by Romain Courteaud's avatar Romain Courteaud

Revert "WIP: invitation token"

This reverts commit 74607091.
parent c7958a2b
<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
<local_roles_item>
<local_roles>
<role id='F-PRODUCTION*'>
<item>Auditor</item>
<item>Author</item>
</role>
</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>
\ No newline at end of file
......@@ -3,6 +3,7 @@
<item>Cloud Contract Line</item>
</portal_type>
<portal_type id="Invitation Token Module">
<item>Contract Invitation Token</item>
<item>Invitation Token</item>
</portal_type>
<portal_type id="Organisation">
......
<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
<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>
\ No newline at end of file
<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
......@@ -42,15 +42,9 @@
<key> <string>portal_type</string> </key>
<value> <string>Base Type</string> </value>
</item>
<item>
<key> <string>short_title</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>type_class</string> </key>
<value> <string>Ticket</string> </value>
<value> <string>XMLObject</string> </value>
</item>
<item>
<key> <string>type_interface</string> </key>
......
......@@ -77,7 +77,7 @@
</chain>
<chain>
<type>Invitation Token</type>
<workflow>edit_workflow, local_permission_slapos_interaction_workflow, validation_workflow</workflow>
<workflow>edit_workflow, validation_workflow</workflow>
</chain>
<chain>
<type>Mail Message</type>
......
......@@ -1015,15 +1015,6 @@ class TestSoftwareProduct(TestSlapOSGroupRoleSecurityMixin):
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):
def test_SupportRequestModule(self):
module = self.portal.support_request_module
......@@ -1035,30 +1026,6 @@ class TestSupportRequestModule(TestSlapOSGroupRoleSecurityMixin):
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):
ticket_portal_type = 'Support Request'
......
......@@ -35,7 +35,6 @@
<string>Support Request</string>
<string>Upgrade Decision</string>
<string>Regularisation Request</string>
<string>Invitation Token</string>
</tuple>
</value>
</item>
......
......@@ -16,7 +16,6 @@ account_module/refundable_vat
account_module/sales
accounting_module
allocation_supply_module
assignment_request_module
business_process_module
business_process_module/slapos_sale_subscription_business_process
cloud_contract_module
......
Contract Invitation Token | Cloud Contract Line
Invitation Token Module | Contract Invitation Token
Invitation Token Module | Invitation Token
Organisation | Geographical Area
Organisation | Geographical Location
\ No newline at end of file
......@@ -8,8 +8,6 @@ Acknowledgement
Allocation Supply
Allocation Supply Module
Assignment
Assignment Request
Assignment Request Module
Balance Transaction
Bank Account
Business Process
......@@ -45,7 +43,6 @@ Instance Tree
Instance Tree Module
Integration Site
Integration Tool
Invitation Token
Invitation Token Module
Letter
Mail Message
......
......@@ -21,7 +21,6 @@ Inventory Cell | -immobilisation_movement_interaction_workflow
Inventory Line | -immobilisation_movement_interaction_workflow
Inventory | -immobilisation_movement_interaction_workflow
Invitation Token | edit_workflow
Invitation Token | local_permission_slapos_interaction_workflow
Invitation Token | validation_workflow
Mail Message | local_permission_slapos_interaction_workflow
Open Sale Order | local_permission_slapos_interaction_workflow
......
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