Changeset 2683

Show
Ignore:
Timestamp:
10/23/08 17:11:55 (3 months ago)
Author:
gbastien
Message:

Adapted workflow for each type
Adapted default "Add" permissions
Added some translations

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • communesplone/urban/trunk/config.py

    r2656 r2683  
    5353} 
    5454 
    55 setDefaultRoles('urban: Add GenericLicence', ('Manager','Owner')) 
    56 setDefaultRoles('urban: Add Applicant', ('Manager','Owner')) 
    57 setDefaultRoles('urban: Add Architect', ('Manager','Owner')) 
    58 setDefaultRoles('urban: Add Contact', ('Manager','Owner')) 
    59 setDefaultRoles('urban: Add Street', ('Manager','Owner')) 
    60 setDefaultRoles('urban: Add UrbanEvent', ('Manager','Owner')) 
    61 setDefaultRoles('urban: Add UrbanEventType', ('Manager','Owner')) 
    62 setDefaultRoles('urban: Add Recipient', ('Manager','Owner')) 
    63 setDefaultRoles('urban: Add DocTemplateParagraph', ('Manager','Owner')) 
    64 setDefaultRoles('urban: Add BuildLicence', ('Manager','Owner')) 
    65 setDefaultRoles('urban: Add ParcelOutLicence', ('Manager','Owner')) 
    66 setDefaultRoles('urban: Add Geometrician', ('Manager','Owner')) 
    67 setDefaultRoles('urban: Add FolderManager', ('Manager','Owner')) 
    68 setDefaultRoles('urban: Add UrbanVocabularyTerm', ('Manager','Owner')) 
    69 setDefaultRoles('urban: Add PortionOut', ('Manager','Owner')) 
    70 setDefaultRoles('urban: Add RecipientCadastre', ('Manager','Owner')) 
     55setDefaultRoles('urban: Add GenericLicence', ('Manager', )) 
     56setDefaultRoles('urban: Add Applicant', ('Manager', )) 
     57setDefaultRoles('urban: Add Architect', ('Manager', )) 
     58setDefaultRoles('urban: Add Contact', ('Manager', )) 
     59setDefaultRoles('urban: Add Street', ('Manager', )) 
     60setDefaultRoles('urban: Add UrbanEvent', ('Manager', )) 
     61setDefaultRoles('urban: Add UrbanEventType', ('Manager', )) 
     62setDefaultRoles('urban: Add Recipient', ('Manager', )) 
     63setDefaultRoles('urban: Add DocTemplateParagraph', ('Manager', )) 
     64setDefaultRoles('urban: Add BuildLicence', ('Manager', )) 
     65setDefaultRoles('urban: Add ParcelOutLicence', ('Manager', )) 
     66setDefaultRoles('urban: Add Geometrician', ('Manager', )) 
     67setDefaultRoles('urban: Add FolderManager', ('Manager', )) 
     68setDefaultRoles('urban: Add UrbanVocabularyTerm', ('Manager', )) 
     69setDefaultRoles('urban: Add PortionOut', ('Manager', )) 
     70setDefaultRoles('urban: Add RecipientCadastre', ('Manager', )) 
    7171 
    7272product_globals = globals() 

  • communesplone/urban/trunk/i18n/urban-fr.po

    r2676 r2683  
    2525#. Default: "Architect" 
    2626#: GenericLicence.py 
    27 msgid "urban_label_architect" 
    28 msgstr "Architecte" 
     27msgid "urban_label_architects" 
     28msgstr "Architectes" 
    2929 
    3030msgid "urban_label_isInSubdivision" 
    31 msgstr "se situe dans un lotissement" 
     31msgstr "Le bien se situe dans un lotissement" 
    3232 
    3333#. Default: "Box" 
    …… 
    177177#: GenericLicence.py 
    178178msgid "urban_label_reference" 
    179 msgstr "" 
     179msgstr "Référence" 
    180180 
    181181#. Default: "Section" 
    182182#: PortionsOut.py 
    183183msgid "urban_label_section" 
    184 msgstr "" 
     184msgstr "Section" 
    185185 
    186186#. Default: "Street" 
    …… 
    302302 
    303303msgid "urban_label_investigationPoint" 
    304 msgstr "point" 
     304msgstr "Point" 
    305305 
    306306msgid "urban_label_annoncedDelay" 
    …… 
    309309msgid "urban_label_solicitOpinionsTo" 
    310310msgstr "Un avis sera sollicité à" 
     311 
     312msgid "urban_label_licenceSubject" 
     313msgstr "Objet du permis" 
    311314 
    312315msgid "applicants_folder_title" 
    …… 
    401404msgstr "<p><a href='buildlicences'>Gestion des permis d'urbanisme</a></p><p><a href='parceloutlicences'>Gestion des permis de lotir</a></p>" 
    402405 
     406#title of the front-page 
     407msgid "front_page_title" 
     408msgstr "Gestion de l'Urbanisme" 
     409 
    403410#this is an HTML content for the front-page 
    404 msgid "front_page" 
    405 msgstr "<p><a>Bienvenue sur le site vous permettant d'utiliser la gestion des permis d'urbanisme</p><p>L'application intÚgre la gestion des permis d'urbanisme et de lotir :<ul><li>gestion de la demande</li><li>gestion des demandeurs, architectes, agents traitants, ...</li><li>production des documents</li><li>workflow de suivi de la demande</li><li>cartographie avec calcul du rayon de 50m, visualisation des parcelles, ...</li><li>...</li></ul></p>" 
     411msgid "front_page_descr" 
     412msgstr "Bienvenue sur le site vous permettant d'utiliser la gestion des permis d'urbanisme" 
     413 
     414#this is an HTML content for the front-page 
     415msgid "front_page_text" 
     416msgstr "<p>L'application intÚgre la gestion des permis d'urbanisme et de lotir :<ul><li>gestion de la demande</li><li>gestion des demandeurs, architectes, agents traitants, ...</li><li>production des documents</li><li>workflow de suivi de la demande</li><li>cartographie avec calcul du rayon de 50m, visualisation des parcelles, ...</li><li>...</li></ul></p>" 

  • communesplone/urban/trunk/i18n/urban-plone-fr.po

    r2676 r2683  
    1010 
    1111#content_types 
    12 msgid "Applicants" 
     12msgid "Applicant" 
    1313msgstr "Demandeur" 
    1414 
    15 msgid "Architects" 
     15msgid "Architect" 
    1616msgstr "Architecte" 
    1717 
    18 msgid "Streets" 
     18msgid "Street" 
    1919msgstr "Rue" 
    2020 
    2121msgid "UrbanEvent" 
    2222msgstr "Evénement du dossier" 
     23 
     24msgid "BuildLicence" 
     25msgstr "Permis d'urbanisme" 
     26 
     27msgid "Contact" 
     28msgstr "Contact" 
     29 
     30msgid "DocTemplateParagraph" 
     31msgstr "Paragraphe de template" 
     32 
     33msgid "FolderManager" 
     34msgstr "Gestionnaire de dossier" 
     35 
     36msgid "Geometrician" 
     37msgstr "GéomÚtre" 
     38 
     39msgid "ParcelOutLicence" 
     40msgstr "Permis de lotir" 
     41 
     42msgid "PortionOut" 
     43msgstr "Parcelle" 
     44 
     45msgid "Recipient" 
     46msgstr "Destinataire" 
     47 
     48msgid "RecipientCadastre" 
     49msgstr "Destinataire cadastre" 
     50 
     51msgid "UrbanEventType" 
     52msgstr "Type d'événement du dossier" 
     53 
     54msgid "UrbanVocabularyTerm" 
     55msgstr "Terme de vocabulaire urban" 
    2356 
    2457#status messages... 

  • communesplone/urban/trunk/profiles/default/import_steps.xml

    r2676 r2683  
    66    handler="Products.urban.setuphandlers.setupHideToolsFromNavigation" 
    77    title="Hide Custom tools from Navigation for urban" 
    8     version="2008-10-21T16:44:55.770596"> 
     8    version="2008-10-23T16:42:31.643462"> 
    99   <dependency step="urban-QI-dependencies"/> 
    1010   Hides custom tools from navigation tree for urban 
    …… 
    1515    handler="Products.urban.setuphandlers.fixTools" 
    1616    title="Fix tools for urban" 
    17     version="2008-10-21T16:44:55.770596"> 
     17    version="2008-10-23T16:42:31.643462"> 
    1818   <dependency step="urban-QI-dependencies"/> 
    1919   call initializeArchetyps for tools in urban 
    …… 
    2525    handler="Products.urban.setuphandlers.updateRoleMappings" 
    2626    title="Update Workflow role mappings for urban" 
    27     version="2008-10-21T16:44:55.770596"> 
     27    version="2008-10-23T16:42:31.643462"> 
    2828   <dependency step="urban-QI-dependencies"/> 
    2929   updates the workflow role mappings for urban 
    …… 
    3434    handler="Products.urban.setuphandlers.postInstall" 
    3535    title="manual coded post-install for urban" 
    36     version="2008-10-21T16:44:55.770596"> 
     36    version="2008-10-23T16:42:31.643462"> 
    3737   <dependency step="urban-QI-dependencies"/> 
    3838   manual coded post-install for urban 

  • communesplone/urban/trunk/profiles/default/workflows/urbanfolder_workflow/definition.xml

    r2649 r2683  
    1515  <permission-map name="Acces contents information" 
    1616                  acquired="False"> 
    17    <permission-role>Viewer</permission-role> 
     17   <permission-role>Reader</permission-role> 
    1818   <permission-role>Editor</permission-role> 
    1919   <permission-role>Manager</permission-role> 
    …… 
    2222  <permission-map name="Access contents information" 
    2323                  acquired="False"> 
    24    <permission-role>Viewer</permission-role> 
     24   <permission-role>Reader</permission-role> 
    2525   <permission-role>Editor</permission-role> 
    2626   <permission-role>Manager</permission-role> 
    …… 
    4747  <permission-map name="View" 
    4848                  acquired="False"> 
    49    <permission-role>Viewer</permission-role> 
     49   <permission-role>Reader</permission-role> 
    5050   <permission-role>Editor</permission-role> 
    5151   <permission-role>Manager</permission-role> 
    …… 
    5858  <permission-map name="Acces contents information" 
    5959                  acquired="False"> 
    60    <permission-role>Viewer</permission-role> 
     60   <permission-role>Reader</permission-role> 
    6161   <permission-role>Editor</permission-role> 
    6262   <permission-role>Manager</permission-role> 
    …… 
    6565  <permission-map name="Access contents information" 
    6666                  acquired="False"> 
    67    <permission-role>Viewer</permission-role> 
     67   <permission-role>Reader</permission-role> 
    6868   <permission-role>Editor</permission-role> 
    6969   <permission-role>Manager</permission-role> 
    …… 
    9090  <permission-map name="View" 
    9191                  acquired="False"> 
    92    <permission-role>Viewer</permission-role> 
     92   <permission-role>Reader</permission-role> 
    9393   <permission-role>Editor</permission-role> 
    9494   <permission-role>Manager</permission-role> 

  • communesplone/urban/trunk/profiles/default/workflows.xml

    r2505 r2683  
    11<?xml version="1.0"?> 
    22<object name="portal_workflow" meta_type="Plone Workflow Tool"> 
    3  <object name="activation_state_machine" meta_type="Workflow"/> 
     3 <object name="activation_workflow" meta_type="Workflow"/> 
    44 <object name="urbanfolder_workflow" meta_type="Workflow"/> 
    55 <bindings> 
    6   <type type_id="BuildLicence"> 
     6  <type type_id="GenericLicence"> 
    77   <bound-workflow workflow_id="urbanfolder_workflow" /> 
    88  </type> 
    9   <type type_id="GenericLicence"> 
    10    <bound-workflow workflow_id="urbanfolder_workflow" /> 
     9  <type type_id="UrbanEventType"> 
     10   <bound-workflow workflow_id="activation_workflow" /> 
     11  </type> 
     12  <type type_id="UrbanVocabularyTerm"> 
     13   <bound-workflow workflow_id="activation_workflow" /> 
    1114  </type> 
    1215  <type type_id="GenericLicence"> 
    …… 
    1417  </type> 
    1518  <type type_id="Applicant"> 
    16    <bound-workflow workflow_id="None" /> 
     19   <bound-workflow workflow_id="simple_publication_workflow" /> 
    1720  </type> 
    1821  <type type_id="Architect"> 
    19    <bound-workflow workflow_id="None" /> 
     22   <bound-workflow workflow_id="simple_publication_workflow" /> 
     23  </type> 
     24  <type type_id="Contact"> 
     25   <bound-workflow workflow_id="simple_publication_workflow" /> 
     26  </type> 
     27  <type type_id="UrbanTool"> 
     28   <bound-workflow workflow_id="simple_publication_workflow" /> 
     29  </type> 
     30  <type type_id="Street"> 
     31   <bound-workflow workflow_id="simple_publication_workflow" /> 
    2032  </type> 
    2133  <type type_id="UrbanEvent"> 
    22    <bound-workflow workflow_id="None" /> 
     34   <bound-workflow workflow_id="simple_publication_workflow 
     35simple_publication_workflow" /> 
    2336  </type> 
    2437  <type type_id="UrbanEventType"> 
    …… 
    2639  </type> 
    2740  <type type_id="Recipient"> 
    28    <bound-workflow workflow_id="None" /> 
     41   <bound-workflow workflow_id="simple_publication_workflow" /> 
     42  </type> 
     43  <type type_id="DocTemplateParagraph"> 
     44   <bound-workflow workflow_id="simple_publication_workflow" /> 
    2945  </type> 
    3046  <type type_id="BuildLicence"> 
    31    <bound-workflow workflow_id="urbanfolder_workflow" /> 
     47   <bound-workflow workflow_id="urbanfolder_workflow 
     48urbanFolder_workflow" /> 
     49  </type> 
     50  <type type_id="ParcelOutLicence"> 
     51   <bound-workflow workflow_id="urbanFolder_workflow" /> 
     52  </type> 
     53  <type type_id="Geometrician"> 
     54   <bound-workflow workflow_id="simple_publication_workflow" /> 
    3255  </type> 
    3356  <type type_id="FolderManager"> 
    34    <bound-workflow workflow_id="None" /> 
     57   <bound-workflow workflow_id="simple_publication_workflow" /> 
    3558  </type> 
    3659  <type type_id="UrbanVocabularyTerm"> 
    …… 
    3861  </type> 
    3962  <type type_id="PortionOut"> 
    40    <bound-workflow workflow_id="None" /> 
     63   <bound-workflow workflow_id="simple_publication_workflow" /> 
    4164  </type> 
    4265  <type type_id="RecipientCadastre"> 
    43    <bound-workflow workflow_id="None" /> 
     66   <bound-workflow workflow_id="simple_publication_workflow" /> 
    4467  </type> 
    4568 </bindings> 

  • communesplone/urban/trunk/setuphandlers.py

    r2676 r2683  
    236236    types_tool.UrbanEventType.setMethodAliases(urbaneventtype_aliases) 
    237237 
     238    #refresh catalog after all these objects have been added... 
     239    site.portal_catalog.refreshCatalog(clear=0) 
     240 
    238241    #rearrange skins so the 'urban' layer is just after 'custom'... 
    239242    ps = site.portal_skins 
    …… 
    251254 
    252255 
     256 
    253257##code-section FOOT 
    254258def addUrbanGroups(context): 
    …… 
    270274    #give the Reader role to the urban_readers and urban_editors groups on  
    271275    #portal_urban and application folders  
    272     #give the Editor role on urban application folders  
     276    #give the Editor role on urban application folders 
    273277    site = context.getSite() 
    274278    #portal_urban local roles 
    275279    site.portal_urban.manage_addLocalRoles("urban_readers", ("Reader",)) 
    276280    site.portal_urban.manage_addLocalRoles("urban_editors", ("Reader",)) 
     281 
    277282    #application folders local roles 
     283    #global application folder : "urban_readers" and "urban_editors" can read... 
    278284    if hasattr(site, "urban"): 
    279285        app_folder = getattr(site, "urban") 
    280286        app_folder.manage_addLocalRoles("urban_readers", ("Reader",)) 
    281         app_folder.manage_addLocalRoles("urban_editors", ("Editor",)) 
     287        app_folder.manage_addLocalRoles("urban_editors", ("Reader",)) 
     288 
     289    #buildlicences folder : "urban_readers" can read and "urban_editors" can edit... 
     290    if hasattr(app_folder, "buildlicences"): 
     291        b_folder = getattr(app_folder, "buildlicences") 
     292        b_folder.manage_addLocalRoles("urban_readers", ("Reader",)) 
     293        b_folder.manage_addLocalRoles("urban_editors", ("Editor",)) 
     294    #parceloutlicences application folder : "urban_readers" can read and "urban_editors" can edit... 
     295    if hasattr(app_folder, "parceloutlicences"): 
     296        p_folder = getattr(app_folder, "parceloutlicences") 
     297        p_folder.manage_addLocalRoles("urban_readers", ("Reader",)) 
     298        p_folder.manage_addLocalRoles("urban_editors", ("Editor",)) 
    282299 
    283300def addTopics(context): 
    …… 
    370387    try: 
    371388        frontpage = getattr(site, 'front-page') 
    372         frontpage.setText(service.translate("urban","front_page",context=site,default="urban")) 
     389        frontpage.setTitle(service.translate("urban","front_page_title",context=site,default="urban")) 
     390        frontpage.setDescription(service.translate("urban","front_page_descr",context=site,default="urban")) 
     391        frontpage.setText(service.translate("urban","front_page_text",context=site,default="urban")) 
    373392        frontpage.reindexObject() 
    374393    except AttributeError: 
    …… 
    408427        #set the layout to "urban_view" 
    409428        newSubFolder.setLayout('urban_view') 
     429        #manage the 'Add' permissions... 
     430        newSubFolder.manage_permission('urban: Add BuildLicence', ['Manager', 'Editor', ], acquire=0) 
    410431 
    411432    if not hasattr(newFolder, "parceloutlicences"): 
    …… 
    419440        newSubFolder.setImmediatelyAddableTypes(['ParcelOutLicence']) 
    420441        newSubFolder.setLayout('urban_view') 
     442        #manage the 'Add' permissions... 
     443        newSubFolder.manage_permission('urban: Add ParcelOutLicence', ['Manager', 'Editor', ], acquire=0) 
    421444 
    422445    if not hasattr(newFolder, "architects"): 
    …… 
    426449        newSubFolder.setLocallyAllowedTypes(['Architect']) 
    427450        newSubFolder.setImmediatelyAddableTypes(['Architect']) 
     451        #manage the 'Add' permissions... 
     452        newSubFolder.manage_permission('urban: Add Architect', ['Manager', 'Editor', ], acquire=0) 
    428453 
    429454def addTestObjects(context): 

  • communesplone/urban/trunk/skins/urban/buildlicence_edit.cpt

    r2652 r2683  
    4242    </tal:block> 
    4343  </metal:head> 
    44    
     44 
    4545  <metal:javascript_head fill-slot="javascript_head_slot"> 
    4646    <tal:block define="macro here/archetypes_custom_js/macros/javascript_head | nothing" 
    …… 
    9595 
    9696          <metal:block define-slot="widgets"> 
    97             <p><br /><p/> 
     97            <p><br /><br /><p/> 
    9898            <metal:myfield use-macro="python:here.widget('licenceSubject', mode='edit')" /> 
    9999            <metal:myfield use-macro="python:here.widget('description', mode='edit')" /> 

  • communesplone/urban/trunk/skins/urban/urban_view.pt

    r2656 r2683  
    3535        </p> 
    3636        <div class="field"> 
    37         <form tal:condition="python: not isAnon" name="quickAdd" tal:attributes="action python: context.absolute_url() + '/createObject'" action="createObject" method="post"> 
    38          <img src="#" tal:attributes="src context/portal_types/BuildLicence/getIcon" /> 
    39          <input type="hidden" name="type_name" value="BuildLicence" /> 
    40          <input type="submit" class="standalone" id="event" value="Ajouter un permis d'urbanisme" /> 
    41         </form> 
     37        <tal:addable_types define="acts context/allowedContentTypes" repeat="act acts"> 
     38         <form tal:condition="python: not isAnon" name="quickAdd" tal:attributes="action python: context.absolute_url() + '/createObject'" action="createObject" method="post"> 
     39          <img src="#" title="#" tal:define="ctype python: context.portal_types.getTypeInfo(act.id)" tal:attributes="src python: ctype.getIcon(); title ctype/description" i18n:attributes="title" /> 
     40          <input type="hidden" name="type_name" value="#" tal:attributes="value act/id" /> 
     41          <input type="submit" class="standalone" id="event" value="#" tal:attributes="value act/id" i18n:attributes="value" /> 
     42         </form> 
     43        </tal:addable_types> 
    4244        </div> 
    4345 

  • communesplone/urban/trunk/UrbanTool.py

    r2676 r2683  
    211211        response.redirect(newDocFolder.absolute_url()+'?doc_uid='+newUrbanDoc.UID()) 
    212212        #return doc 
     213 
    213214    security.declarePublic('listVocabulary') 
    214215    def listVocabulary(self, vocToReturn): 

  • communesplone/urban/trunk/version.txt

    r2676 r2683  
    1 0.1 build 243 
     10.1 build 250