Index: plugins/optional/workflow-repair/i18n/messages_en.xml
===================================================================
RCS file: /cvs/produits/Ametys/AnyContent_2.9/plugins/optional/workflow-repair/i18n/messages_en.xml,v
retrieving revision 1.1
diff -u -r1.1 messages_en.xml
--- plugins/optional/workflow-repair/i18n/messages_en.xml	30 Jan 2009 10:34:15 -0000	1.1
+++ plugins/optional/workflow-repair/i18n/messages_en.xml	11 Feb 2009 15:37:59 -0000
@@ -21,6 +21,8 @@
 	<message key="PLUGINS_WORKFLOW_REPAIR_SITES">Sites</message>
 	<message key="PLUGINS_WORKFLOW_REPAIR_ALL_SITES">All</message>
 	<message key="PLUGINS_WORKFLOW_REPAIR_REMOVE_PUBLICATION">Remove publication label</message>
+	<message key="PLUGINS_WORKFLOW_REPAIR_WORKFOLW_EDITION_STEP">Set documents workflow in edited step</message>
+	<message key="PLUGINS_WORKFLOW_REPAIR_STEP_WORKFOLW_ID">ID step action</message>
 	<message key="PLUGINS_WORKFLOW_REPAIR_DIALOG_OK">OK</message>
 	<message key="PLUGINS_WORKFLOW_REPAIR_DIALOG_CANCEL">Cancel</message>
  	
@@ -35,5 +37,6 @@
 	<message key="PLUGINS_WORKFLOW_REPAIR_JCR_ERROR"> non JCR contents</message>
 	
 	<message key="PLUGINS_WORKFLOW_REPAIR_ERROR">An error occured during content's analysis.</message>
+	<message key="PLUGINS_WORKFLOW_REPAIR_ACTION_ID_MISSING">Set a valid action id.</message>
 	
 </catalogue>
\ No newline at end of file
Index: plugins/optional/workflow-repair/i18n/messages_fr.xml
===================================================================
RCS file: /cvs/produits/Ametys/AnyContent_2.9/plugins/optional/workflow-repair/i18n/messages_fr.xml,v
retrieving revision 1.1
diff -u -r1.1 messages_fr.xml
--- plugins/optional/workflow-repair/i18n/messages_fr.xml	30 Jan 2009 10:34:15 -0000	1.1
+++ plugins/optional/workflow-repair/i18n/messages_fr.xml	11 Feb 2009 15:37:59 -0000
@@ -21,6 +21,8 @@
 	<message key="PLUGINS_WORKFLOW_REPAIR_SITES">Sites</message>
 	<message key="PLUGINS_WORKFLOW_REPAIR_ALL_SITES">Tous</message>
 	<message key="PLUGINS_WORKFLOW_REPAIR_REMOVE_PUBLICATION">Retirer le label de publication</message>
+	<message key="PLUGINS_WORKFLOW_REPAIR_WORKFOLW_EDITION_STEP">Etat workflow édité</message>
+	<message key="PLUGINS_WORKFLOW_REPAIR_STEP_WORKFOLW_ID">ID de l'action</message>
 	<message key="PLUGINS_WORKFLOW_REPAIR_DIALOG_OK">OK</message>
 	<message key="PLUGINS_WORKFLOW_REPAIR_DIALOG_CANCEL">Annuler</message>
 	
@@ -36,4 +38,6 @@
 	
 	<message key="PLUGINS_WORKFLOW_REPAIR_ERROR">Une erreur inconnue est survenue</message>
 	
+	<message key="PLUGINS_WORKFLOW_REPAIR_ACTION_ID_MISSING">Veuillez saisir un id d'action valide.</message>
+	
 </catalogue>
\ No newline at end of file
Index: plugins/optional/workflow-repair/sitemap.xmap
===================================================================
RCS file: /cvs/produits/Ametys/AnyContent_2.9/plugins/optional/workflow-repair/sitemap.xmap,v
retrieving revision 1.1
diff -u -r1.1 sitemap.xmap
--- plugins/optional/workflow-repair/sitemap.xmap	30 Jan 2009 10:34:15 -0000	1.1
+++ plugins/optional/workflow-repair/sitemap.xmap	11 Feb 2009 15:37:59 -0000
@@ -37,6 +37,8 @@
 					<map:parameter name="workflowType" value="{request-param:workflowType}"/>
 					<map:parameter name="site" value="{request-param:site}"/>
 					<map:parameter name="removePublication" value="{request-param:removePublication}"/>
+					<map:parameter name="workflowEditedStep" value="{request-param:workflowEditedStep}"/>
+					<map:parameter name="actionWorkflowId" value="{request-param:actionWorkflowId}"/>
 					
 					<map:generate type="action-result">
 						<map:parameter name="foundContents" value="{foundContents}"/>
Index: plugins/optional/workflow-repair/src/org/ametys/anycontent/plugins/workflow_repair/action/RepairAction.java
===================================================================
RCS file: /cvs/produits/Ametys/AnyContent_2.9/plugins/optional/workflow-repair/src/org/ametys/anycontent/plugins/workflow_repair/action/RepairAction.java,v
retrieving revision 1.2
diff -u -r1.2 RepairAction.java
--- plugins/optional/workflow-repair/src/org/ametys/anycontent/plugins/workflow_repair/action/RepairAction.java	10 Feb 2009 13:23:25 -0000	1.2
+++ plugins/optional/workflow-repair/src/org/ametys/anycontent/plugins/workflow_repair/action/RepairAction.java	11 Feb 2009 15:37:59 -0000
@@ -10,14 +10,16 @@
 import org.apache.cocoon.acting.ServiceableAction;
 import org.apache.cocoon.environment.Redirector;
 import org.apache.cocoon.environment.SourceResolver;
-
 import org.ametys.anycontent.plugins.anycontent.repository.jcr.JCRContent;
 import org.ametys.anycontent.plugins.anycontent.repository.jcr.JCRRepository;
 import org.ametys.anycontent.plugins.web.repository.Repository;
 import org.ametys.anycontent.repository.Content;
 import org.ametys.anycontent.repository.ContentQuery;
 import org.ametys.anycontent.repository.RepositoryException;
+import org.ametys.anycontent.workflow.CheckRight;
+import org.ametys.anycontent.workflow.ContentWorkflowHelper;
 import org.ametys.anycontent.workflow.Workflow;
+import org.ametys.runtime.user.User;
 
 import com.opensymphony.workflow.InvalidActionException;
 import com.opensymphony.workflow.WorkflowException;
@@ -42,8 +44,10 @@
         String site = parameters.getParameter("site");
         String workflowType = parameters.getParameter("workflowType");
         String removePublication = parameters.getParameter("removePublication");
+        String workflowEditedStep = parameters.getParameter("workflowEditedStep");
+        String actionWorkflowId = parameters.getParameter("actionWorkflowId");
         
-        if (site == null || workflowType == null || removePublication == null)
+        if (site == null || workflowType == null || removePublication == null || workflowEditedStep == null)
         {
             throw new IllegalArgumentException();
         }
@@ -77,7 +81,7 @@
                 if (content instanceof JCRContent)
                 {
                     JCRContent jcrContent = (JCRContent) content;
-                    if (_repairContent(jcrContent, workflowType, removePublication, site))
+                    if (_repairContent(jcrContent, workflowType, removePublication, site, workflowEditedStep, actionWorkflowId))
                     {
                         badWorkflowContents++;
                     }
@@ -115,7 +119,7 @@
         return results;
     }
     
-    private boolean _repairContent (JCRContent jcrContent, String workflowType, String removePublication, String site) throws RepositoryException
+    private boolean _repairContent (JCRContent jcrContent, String workflowType, String removePublication, String site, String workflowEditedStep, String actionWorkflowId) throws RepositoryException
     {
         boolean badWorkflowContents = false;
         long wId = jcrContent.getWorkflowId();
@@ -142,6 +146,12 @@
                 _removePublicationLabel(jcrContent);
             }
             
+         // Remove publication label if necessary
+            if ("true".equals(workflowEditedStep))
+            {
+                _setStepWorkflow(jcrContent, actionWorkflowId);
+            }
+            
             getLogger().info("Workflow of content '" + jcrContent.getName() + "' in site '" + (site.equals("") ? jcrContent.getSite() : site) + "' with workflow type '" + workflowType + "' has been repaired.");
         }
         else
@@ -152,6 +162,31 @@
         return badWorkflowContents;
     }
 
+    private void _setStepWorkflow(JCRContent jcrContent, String actionWorkflowId) throws RepositoryException
+    {
+        Workflow workflow = Workflow.getInstance();
+        Map<String, Object> workflowParameters = new HashMap<String, Object>();
+
+        // Transmettre le manager
+        workflowParameters.put(Workflow.MANAGER_KEY, manager);
+        // Transmettre l'object model
+        workflowParameters.put(Workflow.OBJECT_MODEL_KEY, null);
+        // Transmettre l'uri complete du contenu
+        workflowParameters.put(Workflow.CONTEXT_URI_KEY, "");
+        // Transmettre le prefix pour la redirection
+        workflowParameters.put(Workflow.CONTEXT_URI_PREFIX_KEY, "");
+        // Transmettre le content
+        workflowParameters.put(ContentWorkflowHelper.CONTENT_KEY, jcrContent);
+        // Ne pas vérifier les droits
+        workflowParameters.put(CheckRight.CHECK_RIGHTS, "false");
+
+        // Création d'un utilisateur "Daemon"
+        User daemon = new User("daemon", "Workflow", "");
+        
+        workflow.doAction(jcrContent.getWorkflowId(), Integer.valueOf(actionWorkflowId), daemon, null, workflowParameters);
+        
+    }
+
     /**
      * Checks if the given content has 'FR' label and removes it if yes.
      * @param jcrContent
Index: plugins/optional/workflow-repair/pages/workflow-repair/dialog.xsl
===================================================================
RCS file: /cvs/produits/Ametys/AnyContent_2.9/plugins/optional/workflow-repair/pages/workflow-repair/dialog.xsl,v
retrieving revision 1.1
diff -u -r1.1 dialog.xsl
--- plugins/optional/workflow-repair/pages/workflow-repair/dialog.xsl	30 Jan 2009 10:34:15 -0000	1.1
+++ plugins/optional/workflow-repair/pages/workflow-repair/dialog.xsl	11 Feb 2009 15:37:59 -0000
@@ -57,6 +57,18 @@
 			                           	</td>
 									</tr>
 									<tr>
+			                           	<td colspan="2" style="padding-top : 5px;">
+			                           		<input type="checkbox" id="workflow_edited_step" onclick="parent.ANWRT_Plugin_Workflow_Repair.checkSetActionId();"/>
+			                           		<label for="workflow_edited_step"><i18n:text i18n:key="PLUGINS_WORKFLOW_REPAIR_WORKFOLW_EDITION_STEP" i18n:catalogue="plugin.workflow-repair"/></label>
+			                           	</td>
+									</tr>
+									<tr>
+			                           	<td colspan="2" style="padding-top : 5px;padding-left:20px;">
+			                           		<label for="action_workflow_id"><i18n:text i18n:key="PLUGINS_WORKFLOW_REPAIR_STEP_WORKFOLW_ID" i18n:catalogue="plugin.workflow-repair"/></label>	
+			                           		<input type="text" id="action_workflow_id" disabled="true"/>
+			                           	</td>
+									</tr>
+									<tr>
 			                            <td colspan="2" style="height: 30px; text-align: center; vertical-align: bottom; padding-top:5px;">
 			                                <button onclick="parent.ANWRT_Plugin_Workflow_Repair.ok(); return false;">
 			                                    <i18n:text i18n:key="PLUGINS_WORKFLOW_REPAIR_DIALOG_OK" />
Index: plugins/optional/workflow-repair/resources_dynamic/js/dialog.js
===================================================================
RCS file: /cvs/produits/Ametys/AnyContent_2.9/plugins/optional/workflow-repair/resources_dynamic/js/dialog.js,v
retrieving revision 1.1
diff -u -r1.1 dialog.js
--- plugins/optional/workflow-repair/resources_dynamic/js/dialog.js	30 Jan 2009 10:34:15 -0000	1.1
+++ plugins/optional/workflow-repair/resources_dynamic/js/dialog.js	11 Feb 2009 15:37:59 -0000
@@ -23,7 +23,7 @@
 	ANWRT_Plugin_Workflow_Repair.box = new SDialog("ANWRT_Plugin_Workflow_Repair", 
 								"<i18n:text i18n:key="PLUGINS_WORKFLOW_REPAIR_DIALOG_CAPTION"/>", 
 								getPluginResourcesUrl(ANWRT_Plugin_Workflow_Repair.plugin) + "/img/workflow_repair_16.gif", 
-								290, 140, config, ANWRT_Plugin_Workflow_Repair);
+								290, 190, config, ANWRT_Plugin_Workflow_Repair);
 	ANWRT_Plugin_Workflow_Repair.box.paint();
 	Tools.loadStyle(ANWRT_Plugin_Workflow_Repair.box.ui.iframe.contentWindow.document, context.contextPath + "/kernel/resources/css/dialog.css");
 
@@ -62,11 +62,21 @@
 	var workflowType = _document.getElementById("workflow-types").value;
 	var site = _document.getElementById("sites").value;
 	var removePublication = _document.getElementById("remove_publication").checked;
+	var workflowEditedStep = _document.getElementById("workflow_edited_step").checked;
+	var actionWorkflowId = _document.getElementById("action_workflow_id").value;
+	
+	var reg1=new RegExp("\\d","g");
+	
+	if (workflowEditedStep == true &amp;&amp; (actionWorkflowId == '' || !actionWorkflowId.match(reg1)))
+    {
+        alert("<i18n:text i18n:key="PLUGINS_WORKFLOW_REPAIR_ACTION_ID_MISSING"/>");
+        return;
+    }
 	
 	ANWRT_Plugin_Workflow_Repair.box.close();
 	
 	//Launch analysis and repair
-	var args = "workflowType=" + workflowType + "&amp;site=" + site + "&amp;removePublication=" + removePublication;
+	var args = "workflowType=" + workflowType + "&amp;site=" + site + "&amp;removePublication=" + removePublication + "&amp;workflowEditedStep=" + workflowEditedStep + "&amp;actionWorkflowId=" + actionWorkflowId;
 	var result = Tools.postFromUrl(getPluginDirectUrl(plugin) + "/workflow-repair/repair.xml", args);
 	if (result == null)
     {
@@ -103,4 +113,20 @@
 ANWRT_Plugin_Workflow_Repair.cancel = function()
 {
 	ANWRT_Plugin_Workflow_Repair.box.close();
+}
+
+ANWRT_Plugin_Workflow_Repair.checkSetActionId = function()
+{
+	var _document = ANWRT_Plugin_Workflow_Repair.box.ui.iframe.contentWindow.document;
+	var workflowEditedStep = _document.getElementById("workflow_edited_step");
+	if (workflowEditedStep.checked)
+	{
+		_document.getElementById("action_workflow_id").disabled = false;
+		workflowEditedStep.checked = true;
+	}
+	else
+	{
+		_document.getElementById("action_workflow_id").disabled = true;
+		workflowEditedStep.checked = false;
+	}
 }
\ No newline at end of file