Changeset 950


Ignore:
Timestamp:
27 Nov 2006, 15:09:30 (18 years ago)
Author:
Henrik Bettermann
Message:

Delete objects permission added to workflows
new workflows added

students, accommodation and pins folder must be deleted before profile import

Location:
WAeUP_SRP/trunk
Files:
6 added
2 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • WAeUP_SRP/trunk/exportimport.py

    r949 r950  
    4343    """
    4444    importer = zapi.queryMultiAdapter((obj, context), IBody)
    45    
     45
    4646    path = '%s%s' % (parent_path, obj.getId().replace(' ', '_'))
    4747    __traceback_info__ = path
     
    8888    importWAeUPTable(site.portal_accommodation, '', context,'accommodation')
    8989    importWAeUPTable(site.portal_pins, '', context,'pins')
    90    
     90
    9191from Products.CPSCore.exportimport.catalog import CatalogToolXMLAdapter
    9292#from Products.GenericSetup.ZCatalog.exportimport import ZCatalogXMLAdapter
  • WAeUP_SRP/trunk/profiles/default/types/StudentsFolder.xml

    r941 r950  
    3838 <action title="action_edit" action_id="edit" category="object"
    3939    condition_expr="python:member and 'Manager' in member.getRoles()"
    40     url_expr="string:${object_url}/waeup_edit_form" visible="True">
     40    url_expr="string:${object_url}/waeup_edit_form" visible="False">
    4141  <permission value="Modify portal content"/>
    4242 </action>
  • WAeUP_SRP/trunk/profiles/default/workflows.xml

    r941 r950  
    77 <object name="waeup_base_wf" meta_type="CPS Workflow"/>
    88 <object name="waeup_section_wf" meta_type="CPS Workflow"/>
     9 <object name="waeup_scbf_wf" meta_type="CPS Workflow"/>
     10 <object name="waeup_students_folder_wf" meta_type="CPS Workflow"/>
     11 <object name="waeup_acco_folder_wf" meta_type="CPS Workflow"/>
    912 <object name="waeup_student_accommodation_wf" meta_type="CPS Workflow"/>
    1013 <object name="waeup_student_subobject_wf" meta_type="CPS Workflow"/>
     
    2225  </type>
    2326  <type type_id="AccoFolder">
    24    <bound-workflow workflow_id="waeup_section_wf"/>
     27   <bound-workflow workflow_id="waeup_acco_folder_wf"/>
    2528  </type>
    2629  <type type_id="AccoHall">
     
    5457   <bound-workflow workflow_id="waeup_section_wf"/>
    5558  </type>
    56   <type type_id="Jamb">
    57    <bound-workflow workflow_id="waeup_base_wf"/>
    58   </type>
    5959  <type type_id="Members Workspace">
    6060   <bound-workflow workflow_id="workspace_folder_wf"/>
     
    6464  </type>
    6565  <type type_id="ScratchCardBatchesFolder">
    66    <bound-workflow workflow_id="waeup_section_wf"/>
     66   <bound-workflow workflow_id="waeup_scbf_wf"/>
    6767  </type>
    6868  <type type_id="Section">
     
    9090   <bound-workflow workflow_id="waeup_student_subobject_wf"/>
    9191  </type>
    92   <type type_id="StudentDocuments">
    93    <bound-workflow workflow_id="waeup_base_wf"/>
    94   </type>
    95   <type type_id="StudentElegibility">
    96    <bound-workflow workflow_id="waeup_base_wf"/>
    97   </type>
    98   <type type_id="StudentEligibility">
    99    <bound-workflow workflow_id="waeup_base_wf"/>
    100   </type>
    10192  <type type_id="StudentPersonal">
    10293   <bound-workflow workflow_id="waeup_student_subobject_wf"/>
     
    115106  </type>
    116107  <type type_id="StudentsFolder">
    117    <bound-workflow workflow_id="waeup_section_wf"/>
     108   <bound-workflow workflow_id="waeup_students_folder_wf"/>
    118109  </type>
    119110  <type type_id="StudyLevel">
  • WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/definition.xml

    r939 r950  
    44              state_variable="review_state"
    55              meta_type="CPS Workflow">
     6 <permission>Delete objects</permission>
    67 <permission>Modify portal content</permission>
    78 <permission>View</permission>
     
    1011  <exit-transition transition_id="pume_fail"/>
    1112  <exit-transition transition_id="pume_pass"/>
     13  <permission-map name="Delete objects" acquired="False" />
    1214  <permission-map name="Modify portal content"
    1315                  acquired="True">
     
    2022 <state state_id="admission_rejected" title="">
    2123  <exit-transition transition_id="finally_reject"/>
     24  <permission-map name="Delete objects" acquired="False" />
    2225  <permission-map name="Modify portal content"
    2326                  acquired="True">
     
    3235  <exit-transition transition_id="enter_clearance_pin"/>
    3336  <exit-transition transition_id="raise_objection"/>
    34   <permission-map name="Modify portal content"
    35                   acquired="True">
    36    <permission-role>SectionOfficer</permission-role>
     37  <permission-map name="Delete objects" acquired="False" />
     38  <permission-map name="Modify portal content"
     39                  acquired="True">
    3740  </permission-map>
    3841  <permission-map name="View" acquired="True">
     
    4447  <exit-transition transition_id="apply_for_admission"/>
    4548  <exit-transition transition_id="create_content"/>
     49  <permission-map name="Delete objects" acquired="False" />
    4650  <permission-map name="Modify portal content"
    4751                  acquired="True">
     
    5660  <exit-transition transition_id="create_content"/>
    5761  <exit-transition transition_id="request_clearance"/>
     62  <permission-map name="Delete objects" acquired="False" />
    5863  <permission-map name="Modify portal content"
    5964                  acquired="True">
     
    7075  <exit-transition transition_id="reject_clearance"/>
    7176  <exit-transition transition_id="create_content"/>
     77  <permission-map name="Delete objects" acquired="False" />
    7278  <permission-map name="Modify portal content"
    7379                  acquired="True">
     
    8389  <exit-transition transition_id="create_content"/>
    8490  <exit-transition transition_id="reject_clearance"/>
     91  <permission-map name="Delete objects" acquired="False" />
    8592  <permission-map name="Modify portal content"
    8693                  acquired="True">
     
    95102 <state state_id="deferred" title="">
    96103  <exit-transition transition_id="admit"/>
     104  <permission-map name="Delete objects" acquired="False" />
    97105  <permission-map name="Modify portal content"
    98106                  acquired="True">
     
    104112 </state>
    105113 <state state_id="finally_rejected" title="">
     114  <permission-map name="Delete objects" acquired="False" />
    106115  <permission-map name="Modify portal content"
    107116                  acquired="True">
     
    116125 <state state_id="objection_raised" title="">
    117126  <exit-transition transition_id="enter_clearance_pin"/>
     127  <permission-map name="Delete objects" acquired="False" />
    118128  <permission-map name="Modify portal content"
    119129                  acquired="True">
     
    127137 <state state_id="pume_failed" title="">
    128138  <exit-transition transition_id="reject_admission"/>
     139  <permission-map name="Delete objects" acquired="False" />
    129140  <permission-map name="Modify portal content"
    130141                  acquired="True">
     
    139150  <exit-transition transition_id="admit"/>
    140151  <exit-transition transition_id="reject_admission"/>
     152  <permission-map name="Delete objects" acquired="False" />
    141153  <permission-map name="Modify portal content"
    142154                  acquired="True">
     
    156168  <exit-transition transition_id="pume_pass"/>
    157169  <exit-transition transition_id="reject_admission"/>
     170  <permission-map name="Delete objects" acquired="False" />
    158171  <permission-map name="Modify portal content"
    159172                  acquired="True">
     
    168181             new_state="admitted" trigger="USER"
    169182             before_script="" after_script="">
    170  
     183
    171184  <guard>
    172185   <guard-role>SectionOfficer</guard-role>
     
    179192             new_state="admission_applied" trigger="USER"
    180193             before_script="" after_script="">
    181  
     194
    182195  <guard>
    183196   <guard-role>SectionOfficer</guard-role>
     
    190203             new_state="cleared_and_validated"
    191204             trigger="USER" before_script="" after_script="">
    192  
     205
    193206  <guard>
    194207   <guard-role>SectionOfficer</guard-role>
     
    201214             new_state="student_created" trigger="USER"
    202215             before_script="" after_script="">
    203  
     216
    204217  <guard>
    205218  </guard>
     
    210223             new_state="" trigger="USER" before_script=""
    211224             after_script="">
    212  
     225
    213226  <guard>
    214227   <guard-role>SectionOfficer</guard-role>
     
    222235             new_state="deferred" trigger="USER"
    223236             before_script="" after_script="">
    224  
     237
    225238  <guard>
    226239   <guard-role>SectionOfficer</guard-role>
     
    233246             new_state="application_pin_entered"
    234247             trigger="USER" before_script="" after_script="">
    235  
     248
    236249  <guard>
    237250   <guard-role>SectionOfficer</guard-role>
     
    244257             new_state="clearance_pin_entered"
    245258             trigger="USER" before_script="" after_script="">
    246  
     259
    247260  <guard>
    248261   <guard-role>SectionOfficer</guard-role>
     
    255268             new_state="finally_rejected" trigger="USER"
    256269             before_script="" after_script="">
    257  
     270
    258271  <guard>
    259272   <guard-role>SectionOfficer</guard-role>
     
    266279             new_state="pume_failed" trigger="USER"
    267280             before_script="" after_script="">
    268  
     281
    269282  <guard>
    270283   <guard-role>SectionOfficer</guard-role>
     
    277290             new_state="pume_passed" trigger="USER"
    278291             before_script="" after_script="">
    279  
     292
    280293  <guard>
    281294   <guard-role>SectionOfficer</guard-role>
     
    288301             new_state="objection_raised" trigger="USER"
    289302             before_script="" after_script="">
    290  
     303
    291304  <guard>
    292305   <guard-role>SectionOfficer</guard-role>
     
    300313             new_state="admission_rejected" trigger="USER"
    301314             before_script="" after_script="">
    302  
     315
    303316  <guard>
    304317   <guard-role>SectionOfficer</guard-role>
     
    311324             new_state="clearance_pin_entered"
    312325             trigger="USER" before_script="" after_script="">
    313  
     326
    314327  <guard>
    315328   <guard-role>SectionOfficer</guard-role>
     
    322335             new_state="clearance_requested" trigger="USER"
    323336             before_script="" after_script="">
    324  
     337
    325338  <guard>
    326339   <guard-role>SectionOfficer</guard-role>
     
    334347  <description>Time of the last transition</description>
    335348  <default>
    336    
     349
    337350   <expression>state_change/getDateTime</expression>
    338351  </default>
Note: See TracChangeset for help on using the changeset viewer.