Menu
▾
▴
[Collective-checkins] CMFMember/Extensions Install.py,1.24.2.18,1.24.2.19 MemberApprovalWorkflow.py,1.3.2.7,1.3.2.8 MemberAutoWorkflow.py,1.3.2.4,1.3.2.5
|
From: RaFromBRC <raf...@us...> - 2004-09-16 13:51:10
|
Update of /cvsroot/collective/CMFMember/Extensions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3047/Extensions Modified Files: Tag: v1_0_branch Install.py MemberApprovalWorkflow.py MemberAutoWorkflow.py Log Message: * removed unnecessary (and useless) simple_member_workflow * removed unnecessary "CMFMember: View" and "CMFMember: Register Member" permissions Index: MemberAutoWorkflow.py =================================================================== RCS file: /cvsroot/collective/CMFMember/Extensions/MemberAutoWorkflow.py,v retrieving revision 1.3.2.4 retrieving revision 1.3.2.5 diff -u -d -r1.3.2.4 -r1.3.2.5 --- MemberAutoWorkflow.py 27 Jul 2004 12:14:52 -0000 1.3.2.4 +++ MemberAutoWorkflow.py 16 Sep 2004 13:51:01 -0000 1.3.2.5 @@ -2,7 +2,7 @@ # # Generated by dumpDCWorkflow.py written by Sebastien Bigaret # Original workflow id/title: member_auto_workflow/Portal Member Workflow: Automatic Approval -# Date: 2004/07/21 13:08:32.343 GMT-7 +# Date: 2004/09/16 15:49:04.464 GMT+2 # # WARNING: this dumps does NOT contain any scripts you might have added to # the workflow, IT IS YOUR RESPONSABILITY TO MAKE BACKUPS FOR THESE SCRIPTS. @@ -36,7 +36,7 @@ wf.variables.addVariable(v) for l in ['reviewer_queue']: wf.worklists.addWorklist(l) - for p in ('CMFMember: Register member', 'CMFMember: Edit member id', 'Set own properties', 'Set own password', 'Manage users', 'CMFMember: View', 'View', 'Modify portal content', 'Mail forgotten password'): + for p in ('CMFMember: Edit member id', 'Set own properties', 'Set own password', 'Manage users', 'View', 'Modify portal content', 'Mail forgotten password'): wf.addManagedPermission(p) @@ -47,12 +47,10 @@ sdef = wf.states['disabled'] sdef.setProperties(title="""Disabled""", transitions=('enable_private', 'enable_public')) - sdef.setPermission('CMFMember: Register member', 0, ['Manager']) sdef.setPermission('CMFMember: Edit member id', 0, ['Manager']) sdef.setPermission('Set own properties', 0, ['Manager']) sdef.setPermission('Set own password', 0, ['Manager']) sdef.setPermission('Manage users', 0, ['Manager']) - sdef.setPermission('CMFMember: View', 0, ['Manager']) sdef.setPermission('View', 0, ['Manager']) sdef.setPermission('Modify portal content', 0, ['Manager']) sdef.setPermission('Mail forgotten password', 0, []) @@ -60,12 +58,10 @@ sdef = wf.states['new'] sdef.setProperties(title="""Newly created member""", transitions=('auto_register', 'migrate', 'register_wrapped_user', 'trigger')) - sdef.setPermission('CMFMember: Register member', 0, ['Anonymous', 'Manager']) sdef.setPermission('CMFMember: Edit member id', 0, ['Anonymous', 'Manager']) sdef.setPermission('Set own properties', 0, ['Anonymous', 'Manager']) sdef.setPermission('Set own password', 0, ['Anonymous', 'Manager']) sdef.setPermission('Manage users', 0, ['Manager']) - sdef.setPermission('CMFMember: View', 0, ['Anonymous', 'Manager']) sdef.setPermission('View', 0, ['Anonymous', 'Manager']) sdef.setPermission('Modify portal content', 0, ['Anonymous']) sdef.setPermission('Mail forgotten password', 0, ['Manager']) @@ -73,25 +69,21 @@ sdef = wf.states['public'] sdef.setProperties(title="""Registered user, public profile""", transitions=('make_private', 'disable')) - sdef.setPermission('CMFMember: Register member', 0, []) sdef.setPermission('CMFMember: Edit member id', 0, []) sdef.setPermission('Set own properties', 0, ['Manager', 'Owner']) sdef.setPermission('Set own password', 0, ['Manager', 'Owner']) sdef.setPermission('Manage users', 0, ['Manager']) - sdef.setPermission('CMFMember: View', 0, ['Anonymous', 'Authenticated', 'Manager', 'Member', 'Owner']) sdef.setPermission('View', 0, ['Anonymous', 'Authenticated', 'Manager', 'Member', 'Owner']) sdef.setPermission('Modify portal content', 0, ['Manager', 'Owner']) - sdef.setPermission('Mail forgotten password', 0, ['Anonymous','Manager', 'Owner']) + sdef.setPermission('Mail forgotten password', 0, ['Anonymous', 'Manager', 'Owner']) sdef = wf.states['private'] sdef.setProperties(title="""Registered user, private profile""", transitions=('make_public', 'disable')) - sdef.setPermission('CMFMember: Register member', 0, []) sdef.setPermission('CMFMember: Edit member id', 0, []) sdef.setPermission('Set own properties', 0, ['Manager', 'Owner']) sdef.setPermission('Set own password', 0, ['Manager', 'Owner']) sdef.setPermission('Manage users', 0, ['Manager']) - sdef.setPermission('CMFMember: View', 0, ['Manager', 'Owner']) sdef.setPermission('View', 0, ['Manager', 'Owner']) sdef.setPermission('Modify portal content', 0, ['Manager', 'Owner']) sdef.setPermission('Mail forgotten password', 0, ['Anonymous', 'Manager', 'Owner']) @@ -99,12 +91,10 @@ sdef = wf.states['registering'] sdef.setProperties(title="""""", transitions=('finish_register',)) - sdef.setPermission('CMFMember: Register member', 0, ['Anonymous', 'Manager']) sdef.setPermission('CMFMember: Edit member id', 0, ['Anonymous', 'Manager']) sdef.setPermission('Set own properties', 0, ['Anonymous', 'Manager']) sdef.setPermission('Set own password', 0, ['Anonymous', 'Manager']) sdef.setPermission('Manage users', 0, ['Manager']) - sdef.setPermission('CMFMember: View', 0, ['Anonymous', 'Manager']) sdef.setPermission('View', 0, ['Anonymous', 'Manager']) sdef.setPermission('Modify portal content', 0, ['Anonymous', 'Manager']) sdef.setPermission('Mail forgotten password', 0, ['Manager']) Index: MemberApprovalWorkflow.py =================================================================== RCS file: /cvsroot/collective/CMFMember/Extensions/MemberApprovalWorkflow.py,v retrieving revision 1.3.2.7 retrieving revision 1.3.2.8 diff -u -d -r1.3.2.7 -r1.3.2.8 --- MemberApprovalWorkflow.py 11 Aug 2004 19:42:43 -0000 1.3.2.7 +++ MemberApprovalWorkflow.py 16 Sep 2004 13:51:01 -0000 1.3.2.8 @@ -2,7 +2,7 @@ # # Generated by dumpDCWorkflow.py written by Sebastien Bigaret # Original workflow id/title: member_approval_workflow/Portal Member Workflow: Approval Required -# Date: 2004/08/11 12:40:46.492 GMT-7 +# Date: 2004/09/16 15:49:33.048 GMT+2 # # WARNING: this dumps does NOT contain any scripts you might have added to # the workflow, IT IS YOUR RESPONSABILITY TO MAKE BACKUPS FOR THESE SCRIPTS. @@ -10,10 +10,10 @@ # The following scripts have been detected and should be backed up: # - autoRegister (External Method) # - enable (External Method) -# - makePublic (External Method) +# - register (External Method) # - disable (External Method) # - makePrivate (External Method) -# - register (External Method) +# - makePublic (External Method) # """ Programmatically creates a workflow type @@ -28,15 +28,15 @@ "..." wf.setProperties(title='Portal Member Workflow: Approval Required') - for s in ['disabled', 'new', 'private', 'pending', 'public']: + for s in ['disabled', 'new', 'pending', 'private', 'public']: wf.states.addState(s) - for t in ['enable_public', 'register_public', 'enable_pending', 'migrate', 'register_private', 'disable', 'register_wrapped_user', 'make_private', 'trigger', 'make_public', 'make_pending', 'enable_private']: + for t in ['enable_public', 'register_public', 'enable_pending', 'migrate', 'trigger', 'register_private', 'register_wrapped_user', 'make_private', 'disable', 'make_public', 'make_pending', 'enable_private']: wf.transitions.addTransition(t) - for v in ['action', 'time', 'comments', 'actor', 'review_history']: + for v in ['action', 'review_history', 'actor', 'comments', 'time']: wf.variables.addVariable(v) for l in ['reviewer_queue']: wf.worklists.addWorklist(l) - for p in ('CMFMember: Register member', 'CMFMember: Edit member id', 'Set own properties', 'Set own password', 'Manage users', 'CMFMember: View', 'View', 'Modify portal content', 'Mail forgotten password'): + for p in ('CMFMember: Edit member id', 'Set own properties', 'Set own password', 'Manage users', 'View', 'Modify portal content', 'Mail forgotten password'): wf.addManagedPermission(p) @@ -47,12 +47,10 @@ sdef = wf.states['disabled'] sdef.setProperties(title="""Disabled""", transitions=('enable_pending', 'enable_private', 'enable_public')) - sdef.setPermission('CMFMember: Register member', 0, ['Manager']) sdef.setPermission('CMFMember: Edit member id', 0, ['Manager']) sdef.setPermission('Set own properties', 0, ['Manager']) sdef.setPermission('Set own password', 0, ['Manager']) sdef.setPermission('Manage users', 0, ['Manager']) - sdef.setPermission('CMFMember: View', 0, ['Manager']) sdef.setPermission('View', 0, ['Manager']) sdef.setPermission('Modify portal content', 0, ['Manager']) sdef.setPermission('Mail forgotten password', 0, ['Manager']) @@ -60,51 +58,43 @@ sdef = wf.states['new'] sdef.setProperties(title="""Newly created member""", transitions=('make_pending', 'migrate', 'register_wrapped_user', 'trigger')) - sdef.setPermission('CMFMember: Register member', 0, ['Anonymous', 'Manager']) sdef.setPermission('CMFMember: Edit member id', 0, ['Anonymous', 'Manager']) sdef.setPermission('Set own properties', 0, ['Anonymous', 'Manager']) sdef.setPermission('Set own password', 0, ['Anonymous', 'Manager']) sdef.setPermission('Manage users', 0, ['Manager']) - sdef.setPermission('CMFMember: View', 0, ['Anonymous', 'Manager']) sdef.setPermission('View', 0, ['Anonymous', 'Manager']) sdef.setPermission('Modify portal content', 0, ['Anonymous', 'Manager']) sdef.setPermission('Mail forgotten password', 0, ['Manager']) - sdef = wf.states['private'] - sdef.setProperties(title="""Registered user, private profile""", - transitions=('make_public', 'disable')) - sdef.setPermission('CMFMember: Register member', 0, []) - sdef.setPermission('CMFMember: Edit member id', 0, []) - sdef.setPermission('Set own properties', 0, ['Manager', 'Owner']) - sdef.setPermission('Set own password', 0, ['Manager', 'Owner']) - sdef.setPermission('Manage users', 0, ['Manager']) - sdef.setPermission('CMFMember: View', 0, ['Manager', 'Owner']) - sdef.setPermission('View', 0, ['Manager', 'Owner']) - sdef.setPermission('Modify portal content', 0, ['Manager', 'Owner']) - sdef.setPermission('Mail forgotten password', 0, ['Anonymous', 'Manager', 'Owner']) - sdef = wf.states['pending'] sdef.setProperties(title="""Awaiting registration""", transitions=('disable', 'register_private', 'register_public', 'register_wrapped_user')) - sdef.setPermission('CMFMember: Register member', 0, ['Manager']) sdef.setPermission('CMFMember: Edit member id', 0, ['Manager']) sdef.setPermission('Set own properties', 0, ['Manager']) sdef.setPermission('Set own password', 0, ['Manager']) sdef.setPermission('Manage users', 0, ['Manager']) - sdef.setPermission('CMFMember: View', 0, ['Manager']) sdef.setPermission('View', 0, ['Manager']) sdef.setPermission('Modify portal content', 0, ['Manager']) sdef.setPermission('Mail forgotten password', 0, ['Manager']) + sdef = wf.states['private'] + sdef.setProperties(title="""Registered user, private profile""", + transitions=('make_public', 'disable')) + sdef.setPermission('CMFMember: Edit member id', 0, []) + sdef.setPermission('Set own properties', 0, ['Manager', 'Owner']) + sdef.setPermission('Set own password', 0, ['Manager', 'Owner']) + sdef.setPermission('Manage users', 0, ['Manager']) + sdef.setPermission('View', 0, ['Manager', 'Owner']) + sdef.setPermission('Modify portal content', 0, ['Manager', 'Owner']) + sdef.setPermission('Mail forgotten password', 0, ['Anonymous', 'Manager', 'Owner']) + sdef = wf.states['public'] sdef.setProperties(title="""Registered user, public profile""", transitions=('make_private', 'disable')) - sdef.setPermission('CMFMember: Register member', 0, []) sdef.setPermission('CMFMember: Edit member id', 0, []) sdef.setPermission('Set own properties', 0, ['Manager', 'Owner']) sdef.setPermission('Set own password', 0, ['Manager', 'Owner']) sdef.setPermission('Manage users', 0, ['Manager']) - sdef.setPermission('CMFMember: View', 0, ['Anonymous', 'Authenticated', 'Manager', 'Member', 'Owner']) sdef.setPermission('View', 0, ['Anonymous', 'Authenticated', 'Manager', 'Member', 'Owner']) sdef.setPermission('Modify portal content', 0, ['Manager', 'Owner']) sdef.setPermission('Mail forgotten password', 0, ['Anonymous', 'Manager', 'Owner']) @@ -159,6 +149,18 @@ props={'guard_roles': 'Manager'}, ) + tdef = wf.transitions['trigger'] + tdef.setProperties(title="""Trigger automatic transitions""", + new_state_id="""""", + trigger_type=1, + script_name="""""", + after_script_name="""""", + actbox_name="""Trigger automatic transitions""", + actbox_url="""""", + actbox_category="""workflow""", + props=None, + ) + tdef = wf.transitions['register_private'] tdef.setProperties(title="""Approve member, make profile private""", new_state_id="""private""", @@ -171,18 +173,6 @@ props={'guard_expr': 'here/isValid', 'guard_permissions': 'CMFMember: Register member'}, ) - tdef = wf.transitions['disable'] - tdef.setProperties(title="""Disable member""", - new_state_id="""disabled""", - trigger_type=1, - script_name="""disable""", - after_script_name="""""", - actbox_name="""Disable member""", - actbox_url="""""", - actbox_category="""workflow""", - props={'guard_permissions': 'Manage users'}, - ) - tdef = wf.transitions['register_wrapped_user'] tdef.setProperties(title="""Automatically register a wrapped Member""", new_state_id="""public""", @@ -207,16 +197,16 @@ props={'guard_roles': 'Owner; Manager'}, ) - tdef = wf.transitions['trigger'] - tdef.setProperties(title="""Trigger automatic transitions""", - new_state_id="""""", + tdef = wf.transitions['disable'] + tdef.setProperties(title="""Disable member""", + new_state_id="""disabled""", trigger_type=1, - script_name="""""", + script_name="""disable""", after_script_name="""""", - actbox_name="""Trigger automatic transitions""", + actbox_name="""Disable member""", actbox_url="""""", actbox_category="""workflow""", - props=None, + props={'guard_permissions': 'Manage users'}, ) tdef = wf.transitions['make_public'] @@ -268,10 +258,19 @@ update_always=1, props=None) - vdef = wf.variables['time'] - vdef.setProperties(description="""Time of the last transition""", + vdef = wf.variables['review_history'] + vdef.setProperties(description="""Provides access to workflow history""", default_value="""""", - default_expr="""state_change/getDateTime""", + default_expr="""state_change/getHistory""", + for_catalog=0, + for_status=0, + update_always=0, + props={'guard_permissions': 'Request review; Review portal content'}) + + vdef = wf.variables['actor'] + vdef.setProperties(description="""The ID of the user who performed the last transition""", + default_value="""""", + default_expr="""user/getId""", for_catalog=0, for_status=1, update_always=1, @@ -286,24 +285,15 @@ update_always=1, props=None) - vdef = wf.variables['actor'] - vdef.setProperties(description="""The ID of the user who performed the last transition""", + vdef = wf.variables['time'] + vdef.setProperties(description="""Time of the last transition""", default_value="""""", - default_expr="""user/getId""", + default_expr="""state_change/getDateTime""", for_catalog=0, for_status=1, update_always=1, props=None) - vdef = wf.variables['review_history'] - vdef.setProperties(description="""Provides access to workflow history""", - default_value="""""", - default_expr="""state_change/getHistory""", - for_catalog=0, - for_status=0, - update_always=0, - props={'guard_permissions': 'Request review; Review portal content'}) - ## Worklists Initialization ldef = wf.worklists['reviewer_queue'] ldef.setProperties(description="""Reviewer tasks""", Index: Install.py =================================================================== RCS file: /cvsroot/collective/CMFMember/Extensions/Install.py,v retrieving revision 1.24.2.18 retrieving revision 1.24.2.19 diff -u -d -r1.24.2.18 -r1.24.2.19 --- Install.py 20 Jul 2004 03:45:05 -0000 1.24.2.18 +++ Install.py 16 Sep 2004 13:51:00 -0000 1.24.2.19 @@ -20,8 +20,6 @@ import Products.CMFMember as CMFMember from Products.CMFMember.Extensions.Workflow \ import setupWorkflow, workflow_transfer -from Products.CMFMember.Extensions.SimpleWorkflow \ - import setupWorkflow as setupSimpleWorkflow from Products.CMFMember.MemberCatalogTool import MemberCatalogTool @@ -191,6 +189,5 @@ wf_tool.updateRoleMappings() setupWorkflow(self, out) - setupSimpleWorkflow(self, out) return out.getvalue() |