From: Benoît Pin Date: Tue, 15 Oct 2013 08:46:45 +0000 (+0200) Subject: Export du workflow de commandes d'impressions. X-Git-Url: https://scm.cri.ensmp.fr/git/Plinn.git/commitdiff_plain/68715f5c17b50dc585d510dd41ac2dda136d0862 Export du workflow de commandes d'impressions. --- diff --git a/profiles/photo/workflows.xml b/profiles/photo/workflows.xml index cf8ec47..0620445 100644 --- a/profiles/photo/workflows.xml +++ b/profiles/photo/workflows.xml @@ -21,6 +21,7 @@ + diff --git a/profiles/photo/workflows/default_workflow/definition.xml b/profiles/photo/workflows/default_workflow/definition.xml index a8373a3..3300f09 100644 --- a/profiles/photo/workflows/default_workflow/definition.xml +++ b/profiles/photo/workflows/default_workflow/definition.xml @@ -1,9 +1,8 @@ - + - + initial_state="private" manager_bypass="False"> Access contents information Change portal events Change portal topics @@ -132,7 +131,7 @@ before_script="" after_script=""> Reviewer can directly publish content if he have de Owner role (not necessarily ownership) Publish + category="workflow" icon="">Publish Review portal content python:user.allowed(here, ['Owner']) @@ -143,7 +142,7 @@ new_state="published" trigger="USER" before_script="" after_script=""> Publish + category="workflow" icon="">Publish Review portal content @@ -153,7 +152,7 @@ new_state="private" trigger="USER" before_script="" after_script=""> Reject + category="workflow" icon="">Reject Review portal content @@ -163,7 +162,7 @@ new_state="private" trigger="USER" before_script="" after_script=""> Retract + category="workflow" icon="">Retract Request review python:not(here.portal_membership.checkPermission('Review portal content', here)) @@ -174,7 +173,7 @@ new_state="pending" trigger="USER" before_script="" after_script=""> Submit + category="workflow" icon="">Submit Request review @@ -182,7 +181,7 @@ Reviewer tasks Pending (%(count)d) + category="global" icon="">Pending (%(count)d) here/havePendingContents diff --git a/profiles/photo/workflows/folder_workflow/definition.xml b/profiles/photo/workflows/folder_workflow/definition.xml index eff5a82..ab685f8 100644 --- a/profiles/photo/workflows/folder_workflow/definition.xml +++ b/profiles/photo/workflows/folder_workflow/definition.xml @@ -1,9 +1,8 @@ - + - + initial_state="private" manager_bypass="False"> Manage properties Modify portal content View @@ -69,7 +68,7 @@ before_script="" after_script=""> Reviewer can directly publish content if he have de Owner role (not necessarily ownership) Publish + category="workflow" icon="">Publish Review portal content python:user.allowed(here, ['Owner']) @@ -80,7 +79,7 @@ new_state="published" trigger="USER" before_script="" after_script=""> Publish + category="workflow" icon="">Publish Review portal content @@ -90,7 +89,7 @@ new_state="private" trigger="USER" before_script="" after_script=""> Reject + category="workflow" icon="">Reject Review portal content @@ -100,7 +99,7 @@ new_state="private" trigger="USER" before_script="" after_script=""> Retract + category="workflow" icon="">Retract Request review python:not(here.portal_membership.checkPermission('Review portal content', here)) @@ -111,7 +110,7 @@ new_state="pending" trigger="USER" before_script="" after_script=""> Submit + category="workflow" icon="">Submit Request review diff --git a/profiles/photo/workflows/member_workflow/definition.xml b/profiles/photo/workflows/member_workflow/definition.xml index bbde86b..a653b54 100644 --- a/profiles/photo/workflows/member_workflow/definition.xml +++ b/profiles/photo/workflows/member_workflow/definition.xml @@ -1,9 +1,9 @@ - + - + initial_state="m_initial" + manager_bypass="False"> @@ -58,7 +58,7 @@ Reviewer tasks Membres en attente (%(count)d) + category="global" icon="">Membres en attente (%(count)d) Set Member Properties diff --git a/profiles/photo/workflows/order_workflow/definition.xml b/profiles/photo/workflows/order_workflow/definition.xml index c72c600..c0e1b82 100644 --- a/profiles/photo/workflows/order_workflow/definition.xml +++ b/profiles/photo/workflows/order_workflow/definition.xml @@ -1,8 +1,8 @@ - + + initial_state="recorded" manager_bypass="False"> Authenticated @@ -37,18 +37,55 @@ + + Manager + Owner + + + Manager + + + Manager + + + Manager + + + Manager + Owner + + + Manager + Owner + + + Manager + + + Manager + + + Manager + + + Manager + Owner + - - - - + Manager @@ -73,49 +110,54 @@ + + Manager + Owner + + + Manager + + + Manager + + + Manager + + + Manager + Owner + + + Manager + Owner + + + Manager + + + Manager + + + Manager + + + Manager + Owner + - - Payment accepted by the bank - - - nothing - - - - The customer has canceled the order from payement site. - - - nothing - - - - Payment refused by the bank. - - - nothing - - - - - - nothing - - Cancel + category="workflow" icon="">Cancel Manage print orders @@ -124,7 +166,7 @@ new_state="" trigger="USER" before_script="" after_script=""> Printing list + category="workflow" icon="">Printing list Manage print orders @@ -133,7 +175,7 @@ new_state="paid" trigger="USER" before_script="" after_script=""> Manual payment + category="workflow" icon="">Manual payment Manage print orders @@ -142,7 +184,7 @@ new_state="done" trigger="USER" before_script="" after_script=""> Notify done + category="workflow" icon="">Notify done Manage print orders @@ -151,11 +193,19 @@ new_state="sent" trigger="USER" before_script="" after_script=""> Notify sent + category="workflow" icon="">Notify sent Manage print orders + + + + Owner + + The last transition diff --git a/profiles/photo/workflows/portfolio_workflow/definition.xml b/profiles/photo/workflows/portfolio_workflow/definition.xml index 81ca24e..951ad1c 100644 --- a/profiles/photo/workflows/portfolio_workflow/definition.xml +++ b/profiles/photo/workflows/portfolio_workflow/definition.xml @@ -1,9 +1,8 @@ - + - + initial_state="private" manager_bypass="False"> Add portal content Change Images and Files Delete Owned Objects @@ -126,7 +125,7 @@ before_script="" after_script=""> Reviewer can directly publish content if he have de Owner role (not necessarily ownership) Publish + category="workflow" icon="">Publish Review portal content python:user.allowed(here, ['Owner']) @@ -137,7 +136,7 @@ new_state="published" trigger="USER" before_script="" after_script=""> Publish + category="workflow" icon="">Publish Review portal content @@ -147,7 +146,7 @@ new_state="private" trigger="USER" before_script="" after_script=""> Reject + category="workflow" icon="">Reject Review portal content @@ -157,7 +156,7 @@ new_state="private" trigger="USER" before_script="" after_script=""> Retract + category="workflow" icon="">Retract Request review python:not(here.portal_membership.checkPermission('Review portal content', here)) @@ -168,7 +167,7 @@ new_state="pending" trigger="USER" before_script="" after_script=""> Submit + category="workflow" icon="">Submit Request review