Remove APF content types #22019

This commit is contained in:
Nicolas Demonte 2019-12-09 14:50:04 +01:00
parent f85614073d
commit 9e3ced236e
10 changed files with 37 additions and 337 deletions

View File

@ -58,11 +58,7 @@ form.widgets.treating_groups=%(treating_groups)s""" % values
values_url += '&' + 'form.widgets.recipient_groups:list=%s' % principal
folder_url = api.portal.get()['documents'].absolute_url()
if incomingmail.portal_type == 'pfwb.apfincomingmail':
outgoing_add_url = '/++add++pfwb.apfoutgoingmail?'
else:
outgoing_add_url = "/++add++dmsoutgoingmail?"
url = folder_url + outgoing_add_url + values_url.encode('utf-8')
url = folder_url + "/++add++dmsoutgoingmail?" + values_url.encode('utf-8')
self.request.response.redirect(url)

View File

@ -16,12 +16,10 @@ msgstr ""
"X-is-fallback-for: fr-fr fr-be fr-ca\n"
"X-Generator: Poedit 1.5.4\n"
#: ../profiles/default/workflows/incomingapfmail_workflow/definition.xml
#: ../profiles/default/workflows/incomingmail_workflow/definition.xml
msgid "Answer"
msgstr "Répondre"
#: ../profiles/default/workflows/incomingapfmail_workflow/definition.xml
#: ../profiles/default/workflows/incomingmail_workflow/definition.xml
msgid "Answered"
msgstr "Répondu"
@ -34,12 +32,10 @@ msgstr "Demander un avis"
msgid "Ask validation"
msgstr "Demander une validation"
#: ../profiles/default/workflows/incomingapfmail_workflow/definition.xml
#: ../profiles/default/workflows/incomingmail_workflow/definition.xml
msgid "Assigning"
msgstr "À attribuer"
#: ../profiles/default/workflows/incomingapfmail_workflow/definition.xml
#: ../profiles/default/workflows/incomingmail_workflow/definition.xml
msgid "Back to assigning"
msgstr "Retour à attribuer"
@ -48,7 +44,6 @@ msgstr "Retour à attribuer"
msgid "Back to draft"
msgstr "Retour à la rédaction"
#: ../profiles/default/workflows/incomingapfmail_workflow/definition.xml
#: ../profiles/default/workflows/incomingmail_workflow/definition.xml
msgid "Back to registering"
msgstr "Retour à indicater"
@ -84,7 +79,6 @@ msgstr "Annuler le refus"
msgid "Cancel validation"
msgstr "Annuler la validation"
#: ../profiles/default/workflows/incomingapfmail_workflow/definition.xml
#: ../profiles/default/workflows/incomingmail_workflow/definition.xml
#: ../profiles/default/workflows/pfwbgeddocument_workflow/definition.xml
msgid "Considered"
@ -135,7 +129,6 @@ msgstr "Rendre obsolète"
msgid "My Folder"
msgstr "Mon dossier"
#: ../profiles/default/workflows/incomingapfmail_workflow/definition.xml
#: ../profiles/default/workflows/incomingmail_workflow/definition.xml
#: ../profiles/default/workflows/pfwbgeddocument_workflow/definition.xml
msgid "No action"
@ -153,7 +146,6 @@ msgstr "Traiter"
msgid "Processed"
msgstr "Traité"
#: ../profiles/default/workflows/incomingapfmail_workflow/definition.xml
#: ../profiles/default/workflows/incomingmail_workflow/definition.xml
#: ../profiles/default/workflows/pfwbgeddocument_workflow/definition.xml
msgid "Processing"
@ -194,12 +186,10 @@ msgstr "Envoyer à la corbeille"
msgid "Sent"
msgstr "Envoyé"
#: ../profiles/default/workflows/incomingapfmail_workflow/definition.xml
#: ../profiles/default/workflows/incomingmail_workflow/definition.xml
msgid "To assign"
msgstr "À attribuer"
#: ../profiles/default/workflows/incomingapfmail_workflow/definition.xml
#: ../profiles/default/workflows/incomingmail_workflow/definition.xml
#: ../profiles/default/workflows/pfwbgeddocument_workflow/definition.xml
msgid "To process"

View File

@ -17,12 +17,10 @@ msgstr ""
"Preferred-Encodings: utf-8 latin1\n"
"Domain: plone\n"
#: ../profiles/default/workflows/incomingapfmail_workflow/definition.xml
#: ../profiles/default/workflows/incomingmail_workflow/definition.xml
msgid "Answer"
msgstr ""
#: ../profiles/default/workflows/incomingapfmail_workflow/definition.xml
#: ../profiles/default/workflows/incomingmail_workflow/definition.xml
msgid "Answered"
msgstr ""
@ -35,12 +33,10 @@ msgstr ""
msgid "Ask validation"
msgstr ""
#: ../profiles/default/workflows/incomingapfmail_workflow/definition.xml
#: ../profiles/default/workflows/incomingmail_workflow/definition.xml
msgid "Assigning"
msgstr ""
#: ../profiles/default/workflows/incomingapfmail_workflow/definition.xml
#: ../profiles/default/workflows/incomingmail_workflow/definition.xml
msgid "Back to assigning"
msgstr ""
@ -49,7 +45,6 @@ msgstr ""
msgid "Back to draft"
msgstr ""
#: ../profiles/default/workflows/incomingapfmail_workflow/definition.xml
#: ../profiles/default/workflows/incomingmail_workflow/definition.xml
msgid "Back to registering"
msgstr ""
@ -74,7 +69,6 @@ msgstr ""
msgid "Cancel validation"
msgstr ""
#: ../profiles/default/workflows/incomingapfmail_workflow/definition.xml
#: ../profiles/default/workflows/incomingmail_workflow/definition.xml
#: ../profiles/default/workflows/pfwbgeddocument_workflow/definition.xml
msgid "Considered"
@ -125,7 +119,6 @@ msgstr ""
msgid "My Folder"
msgstr ""
#: ../profiles/default/workflows/incomingapfmail_workflow/definition.xml
#: ../profiles/default/workflows/incomingmail_workflow/definition.xml
#: ../profiles/default/workflows/pfwbgeddocument_workflow/definition.xml
msgid "No action"
@ -143,7 +136,6 @@ msgstr ""
msgid "Processed"
msgstr ""
#: ../profiles/default/workflows/incomingapfmail_workflow/definition.xml
#: ../profiles/default/workflows/incomingmail_workflow/definition.xml
#: ../profiles/default/workflows/pfwbgeddocument_workflow/definition.xml
msgid "Processing"
@ -161,7 +153,6 @@ msgstr ""
msgid "Refuse"
msgstr ""
#: ../profiles/default/workflows/incomingapfmail_workflow/definition.xml
#: ../profiles/default/workflows/incomingmail_workflow/definition.xml
msgid "Registering"
msgstr ""
@ -184,12 +175,10 @@ msgstr ""
msgid "Sent"
msgstr ""
#: ../profiles/default/workflows/incomingapfmail_workflow/definition.xml
#: ../profiles/default/workflows/incomingmail_workflow/definition.xml
msgid "To assign"
msgstr ""
#: ../profiles/default/workflows/incomingapfmail_workflow/definition.xml
#: ../profiles/default/workflows/incomingmail_workflow/definition.xml
#: ../profiles/default/workflows/pfwbgeddocument_workflow/definition.xml
msgid "To process"

View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<metadata>
<version>6</version>
<version>7</version>
<dependencies>
<dependency>profile-collective.dms.basecontent:default</dependency>
<dependency>profile-collective.dms.batchimport:default</dependency>

View File

@ -2,7 +2,6 @@
<rolemap>
<roles>
<role name="Greffier"/>
<role name="SecretariatGeneralAPF"/>
</roles>
<permissions>
<permission name="Add portal content" acquire="True">
@ -30,7 +29,6 @@
<role name="Reviewer"/>
<role name="Site Administrator"/>
<role name="Greffier"/>
<role name="SecretariatGeneralAPF"/>
</permission>
</permissions>
</rolemap>

View File

@ -4,7 +4,6 @@
name="title">Contains workflow definitions for your portal</property>
<object name="appendix_workflow" meta_type="Workflow"/>
<object name="incomingmail_workflow" meta_type="Workflow"/>
<object name="incomingapfmail_workflow" meta_type="Workflow"/>
<object name="outgoingmail_workflow" meta_type="Workflow"/>
<object name="pfwbgeddocument_workflow" meta_type="Workflow"/>
<object name="pfwbgedfolder_workflow" meta_type="Workflow"/>
@ -53,12 +52,6 @@
<type type_id="pfwb.boarddecision">
<bound-workflow workflow_id="incomingmail_workflow"/>
</type>
<type type_id="pfwb.apfincomingmail">
<bound-workflow workflow_id="incomingapfmail_workflow"/>
</type>
<type type_id="pfwb.apfoutgoingmail">
<bound-workflow workflow_id="outgoingmail_workflow"/>
</type>
<type type_id="pfwb.medicalcertificate">
<bound-workflow workflow_id="incomingmail_workflow"/>
</type>

View File

@ -1,290 +0,0 @@
<?xml version="1.0"?>
<dc-workflow workflow_id="incomingmail_workflow"
title="Workflow for Incoming Mail"
description=""
state_variable="review_state"
initial_state="registering"
manager_bypass="True"
xmlns:i18n="http://xml.zope.org/namespaces/i18n"
i18n:domain="plone">
<permission>Access contents information</permission>
<permission>Delete objects</permission>
<permission>Modify portal content</permission>
<permission>View</permission>
<state state_id="answered" title="Answered" i18n:attributes="title">
<permission-map name="Access contents information" acquired="False">
<permission-role>Editor</permission-role>
<permission-role>Manager</permission-role>
<permission-role>Owner</permission-role>
<permission-role>Reader</permission-role>
<permission-role>Reviewer</permission-role>
<permission-role>Site Administrator</permission-role>
</permission-map>
<permission-map name="Delete objects" acquired="False">
</permission-map>
<permission-map name="Modify portal content" acquired="False">
<permission-role>Manager</permission-role>
<permission-role>Site Administrator</permission-role>
</permission-map>
<permission-map name="View" acquired="False">
<permission-role>Editor</permission-role>
<permission-role>Manager</permission-role>
<permission-role>Owner</permission-role>
<permission-role>Reader</permission-role>
<permission-role>Reviewer</permission-role>
<permission-role>Site Administrator</permission-role>
</permission-map>
</state>
<state state_id="assigning" title="Assigning" i18n:attributes="title">
<exit-transition transition_id="back_to_registering"/>
<exit-transition transition_id="directly_noaction"/>
<exit-transition transition_id="to_process"/>
<permission-map name="Access contents information" acquired="False">
<permission-role>Editor</permission-role>
<permission-role>SecretariatGeneralApf</permission-role>
<permission-role>Manager</permission-role>
<permission-role>Owner</permission-role>
<permission-role>Reader</permission-role>
<permission-role>Reviewer</permission-role>
<permission-role>Site Administrator</permission-role>
</permission-map>
<permission-map name="Delete objects" acquired="False">
</permission-map>
<permission-map name="Modify portal content" acquired="False">
<permission-role>Editor</permission-role>
<permission-role>SecretariatGeneralApf</permission-role>
<permission-role>Manager</permission-role>
<permission-role>Owner</permission-role>
<permission-role>Reviewer</permission-role>
<permission-role>Site Administrator</permission-role>
</permission-map>
<permission-map name="View" acquired="False">
<permission-role>Editor</permission-role>
<permission-role>SecretariatGeneralApf</permission-role>
<permission-role>Manager</permission-role>
<permission-role>Owner</permission-role>
<permission-role>Reader</permission-role>
<permission-role>Reviewer</permission-role>
<permission-role>Site Administrator</permission-role>
</permission-map>
</state>
<state state_id="noaction" title="No action" i18n:attributes="title">
<exit-transition transition_id="back_to_assigning"/>
<permission-map name="Access contents information" acquired="False">
<permission-role>Editor</permission-role>
<permission-role>Manager</permission-role>
<permission-role>Owner</permission-role>
<permission-role>Reader</permission-role>
<permission-role>Reviewer</permission-role>
<permission-role>Site Administrator</permission-role>
</permission-map>
<permission-map name="Delete objects" acquired="False">
</permission-map>
<permission-map name="Modify portal content" acquired="False">
<permission-role>Editor</permission-role>
<permission-role>Manager</permission-role>
<permission-role>Reviewer</permission-role>
<permission-role>Site Administrator</permission-role>
</permission-map>
<permission-map name="View" acquired="False">
<permission-role>Editor</permission-role>
<permission-role>Manager</permission-role>
<permission-role>Owner</permission-role>
<permission-role>Reader</permission-role>
<permission-role>Reviewer</permission-role>
<permission-role>Site Administrator</permission-role>
</permission-map>
</state>
<state state_id="considered" title="Considered" i18n:attributes="title">
<exit-transition transition_id="back_to_assigning"/>
<permission-map name="Access contents information" acquired="False">
<permission-role>Editor</permission-role>
<permission-role>Manager</permission-role>
<permission-role>Owner</permission-role>
<permission-role>Reader</permission-role>
<permission-role>Reviewer</permission-role>
<permission-role>Site Administrator</permission-role>
</permission-map>
<permission-map name="Delete objects" acquired="False">
</permission-map>
<permission-map name="Modify portal content" acquired="False">
<permission-role>Editor</permission-role>
<permission-role>Manager</permission-role>
<permission-role>Reviewer</permission-role>
<permission-role>Site Administrator</permission-role>
</permission-map>
<permission-map name="View" acquired="False">
<permission-role>Editor</permission-role>
<permission-role>Manager</permission-role>
<permission-role>Owner</permission-role>
<permission-role>Reader</permission-role>
<permission-role>Reviewer</permission-role>
<permission-role>Site Administrator</permission-role>
</permission-map>
</state>
<state state_id="processing" title="Processing" i18n:attributes="title">
<exit-transition transition_id="answer"/>
<exit-transition transition_id="to_noaction"/>
<exit-transition transition_id="to_considered"/>
<permission-map name="Access contents information" acquired="False">
<permission-role>Editor</permission-role>
<permission-role>Manager</permission-role>
<permission-role>Owner</permission-role>
<permission-role>Reader</permission-role>
<permission-role>Reviewer</permission-role>
<permission-role>Site Administrator</permission-role>
</permission-map>
<permission-map name="Delete objects" acquired="False">
</permission-map>
<permission-map name="Modify portal content" acquired="False">
<permission-role>Editor</permission-role>
<permission-role>Manager</permission-role>
<permission-role>Reviewer</permission-role>
<permission-role>Site Administrator</permission-role>
</permission-map>
<permission-map name="View" acquired="False">
<permission-role>Editor</permission-role>
<permission-role>Manager</permission-role>
<permission-role>Owner</permission-role>
<permission-role>Reader</permission-role>
<permission-role>Reviewer</permission-role>
<permission-role>Site Administrator</permission-role>
</permission-map>
</state>
<state state_id="registering" title="Registering" i18n:attributes="title">
<exit-transition transition_id="to_assign"/>
<permission-map name="Access contents information" acquired="False">
<permission-role>Editor</permission-role>
<permission-role>SecretariatGeneralApf</permission-role>
<permission-role>Manager</permission-role>
<permission-role>Owner</permission-role>
<permission-role>Reader</permission-role>
<permission-role>Reviewer</permission-role>
<permission-role>Site Administrator</permission-role>
</permission-map>
<permission-map name="Delete objects" acquired="False">
<permission-role>Editor</permission-role>
<permission-role>Manager</permission-role>
<permission-role>Reviewer</permission-role>
<permission-role>Site Administrator</permission-role>
<permission-role>Owner</permission-role>
</permission-map>
<permission-map name="Modify portal content" acquired="False">
<permission-role>Editor</permission-role>
<permission-role>Manager</permission-role>
<permission-role>Owner</permission-role>
<permission-role>Reviewer</permission-role>
<permission-role>Site Administrator</permission-role>
</permission-map>
<permission-map name="View" acquired="False">
<permission-role>Editor</permission-role>
<permission-role>SecretariatGeneralApf</permission-role>
<permission-role>Manager</permission-role>
<permission-role>Owner</permission-role>
<permission-role>Reader</permission-role>
<permission-role>Reviewer</permission-role>
<permission-role>Site Administrator</permission-role>
</permission-map>
</state>
<transition transition_id="answer" title="" new_state="answered" trigger="USER" before_script="" after_script="">
<action url="%(content_url)s/content_status_modify?workflow_action=answer" category="workflow" icon="" i18n:translate="">Answer</action>
<guard>
<guard-role>Editor</guard-role>
<guard-role>Manager</guard-role>
<guard-expression>here/@@can_answer</guard-expression>
</guard>
</transition>
<transition transition_id="back_to_assigning" title="" new_state="assigning" trigger="USER" before_script="" after_script="">
<action url="%(content_url)s/content_status_modify?workflow_action=back_to_assigning" category="workflow" icon="" i18n:translate="">Back to assigning</action>
<guard>
<guard-role>Reviewer</guard-role>
<guard-role>Manager</guard-role>
</guard>
</transition>
<transition transition_id="back_to_registering" title="" new_state="registering" trigger="USER" before_script="" after_script="">
<action url="%(content_url)s/content_status_modify?workflow_action=back_to_registering" category="workflow" icon="" i18n:translate="">Back to registering</action>
<guard>
<guard-expression>here/@@can_return_to_registering_or_process</guard-expression>
</guard>
</transition>
<transition transition_id="directly_noaction" title="" new_state="noaction" trigger="USER" before_script="" after_script="">
<action url="%(content_url)s/content_status_modify?workflow_action=directly_noaction" category="workflow" icon="" i18n:translate="">No action</action>
<guard>
<guard-role>Reviewer</guard-role>
<guard-role>Manager</guard-role>
</guard>
</transition>
<transition transition_id="to_assign" title="" new_state="assigning" trigger="USER" before_script="" after_script="">
<action url="%(content_url)s/content_status_modify?workflow_action=to_assign" category="workflow" icon="" i18n:translate="">To assign</action>
<guard>
<guard-role>Editor</guard-role>
<guard-role>Manager</guard-role>
<guard-role>Owner</guard-role>
<guard-role>Reviewer</guard-role>
</guard>
</transition>
<transition transition_id="to_noaction" title="" new_state="noaction" trigger="USER" before_script="" after_script="">
<action url="%(content_url)s/content_status_modify?workflow_action=to_noaction" category="workflow" icon="" i18n:translate="">No action</action>
<guard>
<guard-role>Editor</guard-role>
<guard-role>Manager</guard-role>
</guard>
</transition>
<transition transition_id="to_considered" title="" new_state="considered" trigger="USER" before_script="" after_script="">
<action url="%(content_url)s/content_status_modify?workflow_action=to_considered" category="workflow" icon="" i18n:translate="">Considered</action>
<guard>
<guard-role>Editor</guard-role>
<guard-role>Manager</guard-role>
</guard>
</transition>
<transition transition_id="to_process" title="" new_state="processing" trigger="USER" before_script="" after_script="">
<action url="%(content_url)s/@@to_process?workflow_action=to_process" category="workflow" icon="" i18n:translate="">To process</action>
<guard>
<guard-role>SecretariatGeneralApf</guard-role>
<guard-role>Manager</guard-role>
<guard-role>Reviewer</guard-role>
</guard>
</transition>
<variable variable_id="action" for_catalog="False" for_status="True" update_always="True">
<description>Previous transition</description>
<default>
<expression>transition/getId|nothing</expression>
</default>
<guard>
</guard>
</variable>
<variable variable_id="actor" for_catalog="False" for_status="True" update_always="True">
<description>The ID of the user who performed the previous transition</description>
<default>
<expression>user/getId</expression>
</default>
<guard>
</guard>
</variable>
<variable variable_id="comments" for_catalog="False" for_status="True" update_always="True">
<description>Comment about the last transition</description>
<default>
<expression>python:state_change.kwargs.get('comment', '')</expression>
</default>
<guard>
</guard>
</variable>
<variable variable_id="review_history" for_catalog="False" for_status="False" update_always="False">
<description>Provides access to workflow history</description>
<default>
<expression>state_change/getHistory</expression>
</default>
<guard>
<guard-permission>Request review</guard-permission>
<guard-permission>Review portal content</guard-permission>
</guard>
</variable>
<variable variable_id="time" for_catalog="False" for_status="True" update_always="True">
<description>When the previous transition was performed</description>
<default>
<expression>state_change/getDateTime</expression>
</default>
<guard>
</guard>
</variable>
</dc-workflow>

View File

@ -55,8 +55,6 @@ def has_incomingmail_workflow(obj):
chain = wtool.getChainFor(obj)
if 'incomingmail_workflow' in chain:
return True
if 'incomingapfmail_workflow' in chain:
return True
return False
@ -231,7 +229,7 @@ def version_note_finished(context, event):
document = context.getParentNode()
state = api.content.get_state(obj=document)
# if parent is an outgoing mail, change its state to ready_to_send
if document.portal_type in ('dmsoutgoingmail', 'pfwb.apfoutgoingmail') and state == 'writing':
if document.portal_type == 'dmsoutgoingmail' and state == 'writing':
with api.env.adopt_user('admin'):
api.content.transition(obj=document, transition='finish')
document.reindexObject(idxs=['review_state'])

View File

@ -63,4 +63,13 @@
handler=".types.refresh_documents_addable_types"
/>
<genericsetup:upgradeStep
title="Remove APF content types"
description=""
source="6"
destination="7"
profile="pfwbged.policy:default"
handler=".types.remove_apf_content_types"
/>
</configure>

View File

@ -3,14 +3,7 @@ from pfwbged.policy.setuphandlers import setup_constrains
from plone import api
def refresh_documents_addable_types(context):
context.runImportStepFromProfile('profile-pfwbged.basecontent:default',
'typeinfo')
context.runImportStepFromProfile('profile-pfwbged.folder:default',
'typeinfo')
context.runImportStepFromProfile('profile-pfwbged.policy:default',
'workflow')
def setup_constrains_on_documents_folder():
portal = api.portal.get()
types_tool = getToolByName(portal, 'portal_types')
fti = types_tool.getTypeInfo('pfwbgedfolder')
@ -21,3 +14,27 @@ def refresh_documents_addable_types(context):
if x not in ('pfwbgedfolder', 'pfwbgedlink',)
]
)
def refresh_documents_addable_types(context):
context.runImportStepFromProfile('profile-pfwbged.basecontent:default',
'typeinfo')
context.runImportStepFromProfile('profile-pfwbged.folder:default',
'typeinfo')
context.runImportStepFromProfile('profile-pfwbged.policy:default',
'workflow')
setup_constrains_on_documents_folder()
def remove_apf_content_types(context):
context.runImportStepFromProfile('profile-pfwbged.basecontent:default',
'typeinfo')
context.runImportStepFromProfile('profile-pfwbged.folder:default',
'typeinfo')
context.runImportStepFromProfile('profile-pfwbged.policy:default',
'workflow')
context.runImportStepFromProfile('profile-pfwbged.policy:default',
'rolemap')
setup_constrains_on_documents_folder()