Fix #14353

svuillet · svuillet · commit 8b2186d60446 · 2024-09-17T15:03:08.000+02:00
diff --git a/mobile-war/src/main/java/org/silverpeas/mobile/client/apps/workflow/WorkflowApp.java b/mobile-war/src/main/java/org/silverpeas/mobile/client/apps/workflow/WorkflowApp.java
@@ -27,6 +27,7 @@
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.JavaScriptObject;
 import com.google.gwt.http.client.RequestException;
+import com.google.gwt.user.client.Window;
 import org.fusesource.restygwt.client.Method;
 import org.silverpeas.mobile.client.SpMobil;
 import org.silverpeas.mobile.client.apps.navigation.events.app.external.AbstractNavigationEvent;
diff --git a/mobile-war/src/main/java/org/silverpeas/mobile/client/apps/workflow/pages/WorkflowPage.java b/mobile-war/src/main/java/org/silverpeas/mobile/client/apps/workflow/pages/WorkflowPage.java
@@ -141,6 +141,7 @@ private void creationGesture() {
       ActionButton act = new ActionButton();
       act.setId(ACTION_CREATE);
       act.init(instanceId, "create", msg.create(), null);
+      act.addClass("add-workflow-demand");
       addActionShortcut(act);
       //addActionMenu(act);
     } else {
diff --git a/mobile-war/src/main/java/org/silverpeas/mobile/client/apps/workflow/pages/WorkflowPresentationPage.java b/mobile-war/src/main/java/org/silverpeas/mobile/client/apps/workflow/pages/WorkflowPresentationPage.java
@@ -28,6 +28,7 @@
 import com.google.gwt.dom.client.HeadingElement;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.Widget;
 import org.silverpeas.mobile.client.apps.workflow.pages.widgets.ActionButton;
 import org.silverpeas.mobile.client.apps.workflow.pages.widgets.Field;
diff --git a/mobile-war/src/main/java/org/silverpeas/mobile/client/apps/workflow/pages/widgets/ActionButton.java b/mobile-war/src/main/java/org/silverpeas/mobile/client/apps/workflow/pages/widgets/ActionButton.java
@@ -63,6 +63,7 @@ public void init(String instanceId, String actionCode, String actionLabel, Strin
         this.actionLabel = actionLabel;
         this.state = state;
         action.setTitle(actionLabel);
+        action.setText(actionLabel);
     }
 
     @UiHandler("action")
@@ -76,4 +77,8 @@ void executeAction(ClickEvent event){
         ActionsMenu.close(getElement());
     }
 
+    public void addClass(String className) {
+        container.getElement().addClassName(className);
+        action.setText("");
+    }
 }
diff --git a/mobile-war/src/main/java/org/silverpeas/mobile/client/apps/workflow/pages/widgets/ActionButton.ui.xml b/mobile-war/src/main/java/org/silverpeas/mobile/client/apps/workflow/pages/widgets/ActionButton.ui.xml
@@ -26,8 +26,7 @@
              xmlns:g='urn:import:com.google.gwt.user.client.ui'>
 
     <ui:with field='msg' type='org.silverpeas.mobile.client.apps.workflow.resources.WorkflowMessages'/>
-
-    <g:HTMLPanel tag="li" ui:field="container" styleName="add-workflow-demand">
+    <g:HTMLPanel tag="li" ui:field="container">
         <g:Anchor styleName="" ui:field="action"/>
     </g:HTMLPanel>
 </ui:UiBinder>
diff --git a/mobile-war/src/main/java/org/silverpeas/mobile/server/services/ServiceWorkflow.java b/mobile-war/src/main/java/org/silverpeas/mobile/server/services/ServiceWorkflow.java
@@ -39,8 +39,11 @@
 import org.silverpeas.core.contribution.content.form.Form;
 import org.silverpeas.core.contribution.content.form.RecordTemplate;
 import org.silverpeas.core.contribution.content.form.field.MultipleUserField;
+import org.silverpeas.core.contribution.content.form.record.GenericDataRecord;
 import org.silverpeas.core.util.DateUtil;
 import org.silverpeas.core.util.file.FileRepositoryManager;
+import org.silverpeas.core.workflow.api.event.TaskDoneEvent;
+import org.silverpeas.core.workflow.api.model.Action;
 import org.silverpeas.kernel.logging.SilverLogger;
 import org.silverpeas.core.web.rs.annotation.Authorized;
 import org.silverpeas.core.workflow.api.Workflow;
@@ -409,66 +412,66 @@ public WorkflowFormActionDTO getActionForm(@PathParam("instanceId") String insta
       } else {
         ProcessInstance instance =
             Workflow.getProcessInstanceManager().getProcessInstance(instanceId);
-
         form = instance.getProcessModel().getActionForm(action);
         data = instance.getFolder();
         dto.setId(instance.getInstanceId());
       }
-
-      for (Input input : form.getInputs()) {
-        WorkflowFieldDTO fdto = new WorkflowFieldDTO();
-        fdto.setId(getComponentId());
-        fdto.setDisplayerName(input.getDisplayerName());
-        fdto.setMandatory(input.isMandatory());
-        fdto.setReadOnly(input.isReadonly());
-        fdto.setName(input.getItem().getName());
-        fdto.setActionName(action);
-        fdto.setLabel(
-            input.getItem().getLabel(role, getUser().getUserPreferences().getLanguage()));
-        fdto.setValue(input.getValue());
-        if (!action.equals("create")) {
-          Field f = data.getField(input.getItem().getName());
-          if (f.getValue() != null && !f.getValue().isEmpty()) {
-            if (input.getItem().getType().equalsIgnoreCase("date")) {
-              fdto.setValue(f.getValue().replaceAll("/", "-"));
-              //TODO : user, multipleUser, group data
-            } else if (input.getItem().getType().equalsIgnoreCase("user")) {
-              UserDetail u = (UserDetail) f.getObjectValue();
-              fdto.setValueId(u.getId());
-              fdto.setValue(f.getValue());
-            } else if (input.getItem().getType().equalsIgnoreCase("multipleUser")) {
-              String[] usersId = ((MultipleUserField) f).getUserIds();
-              if (usersId.length > 0) {
-                String ids = Arrays.toString(usersId);
-                ids = ids.substring(1, ids.length() - 1);
-                fdto.setValueId(ids);
-                String value = "";
-                for (String id : usersId) {
-                  value += Administration.get().getUserDetail(id).getDisplayedName() + ",";
+      if (form != null) {
+        for (Input input : form.getInputs()) {
+          WorkflowFieldDTO fdto = new WorkflowFieldDTO();
+          fdto.setId(getComponentId());
+          fdto.setDisplayerName(input.getDisplayerName());
+          fdto.setMandatory(input.isMandatory());
+          fdto.setReadOnly(input.isReadonly());
+          fdto.setName(input.getItem().getName());
+          fdto.setActionName(action);
+          fdto.setLabel(
+                  input.getItem().getLabel(role, getUser().getUserPreferences().getLanguage()));
+          fdto.setValue(input.getValue());
+          if (!action.equals("create")) {
+            Field f = data.getField(input.getItem().getName());
+            if (f.getValue() != null && !f.getValue().isEmpty()) {
+              if (input.getItem().getType().equalsIgnoreCase("date")) {
+                fdto.setValue(f.getValue().replaceAll("/", "-"));
+                //TODO : user, multipleUser, group data
+              } else if (input.getItem().getType().equalsIgnoreCase("user")) {
+                UserDetail u = (UserDetail) f.getObjectValue();
+                fdto.setValueId(u.getId());
+                fdto.setValue(f.getValue());
+              } else if (input.getItem().getType().equalsIgnoreCase("multipleUser")) {
+                String[] usersId = ((MultipleUserField) f).getUserIds();
+                if (usersId.length > 0) {
+                  String ids = Arrays.toString(usersId);
+                  ids = ids.substring(1, ids.length() - 1);
+                  fdto.setValueId(ids);
+                  String value = "";
+                  for (String id : usersId) {
+                    value += Administration.get().getUserDetail(id).getDisplayedName() + ",";
+                  }
+                  value = value.substring(0, value.length() - 1);
+                  fdto.setValue(value);
                 }
-                value = value.substring(0, value.length() - 1);
-                fdto.setValue(value);
+              } else if (input.getItem().getType().equalsIgnoreCase("group")) {
+                GroupDetail g = (GroupDetail) f.getObjectValue();
+                fdto.setValueId(g.getId());
+                fdto.setValue(f.getValue());
+              } else if (input.getItem().getType().equalsIgnoreCase("file")) {
+                SimpleDocument doc = AttachmentServiceProvider.getAttachmentService()
+                        .searchDocumentById(new SimpleDocumentPK(f.getValue()),
+                                getUser().getUserPreferences().getLanguage());
+                fdto.setValue(doc.getTitle());
+                fdto.setValueId(doc.getId());
+              } else {
+                fdto.setValue(f.getValue());
               }
-            } else if (input.getItem().getType().equalsIgnoreCase("group")) {
-              GroupDetail g = (GroupDetail) f.getObjectValue();
-              fdto.setValueId(g.getId());
-              fdto.setValue(f.getValue());
-            } else if (input.getItem().getType().equalsIgnoreCase("file")) {
-              SimpleDocument doc = AttachmentServiceProvider.getAttachmentService()
-                  .searchDocumentById(new SimpleDocumentPK(f.getValue()),
-                      getUser().getUserPreferences().getLanguage());
-              fdto.setValue(doc.getTitle());
-              fdto.setValueId(doc.getId());
-            } else {
-              fdto.setValue(f.getValue());
             }
           }
+          fdto.setType(input.getItem().getType());
+          fdto.setValues(input.getItem().getKeyValuePairs());
+          dto.addField(fdto);
         }
-        fdto.setType(input.getItem().getType());
-        fdto.setValues(input.getItem().getKeyValuePairs());
-        dto.addField(fdto);
+        dto.setTitle(form.getTitle(role, getUser().getUserPreferences().getLanguage()));
       }
-      dto.setTitle(form.getTitle(role, getUser().getUserPreferences().getLanguage()));
     } catch (Exception e) {
       SilverLogger.getLogger(this).error(e);
       throw e;

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ public void init(String instanceId, String actionCode, String actionLabel, Strin`
`63`	`63`	`this.actionLabel = actionLabel;`
`64`	`64`	`this.state = state;`
`65`	`65`	`action.setTitle(actionLabel);`
	`66`	`+ action.setText(actionLabel);`
`66`	`67`	`}`
`67`	`68`
`68`	`69`	`@UiHandler("action")`
`@@ -76,4 +77,8 @@ void executeAction(ClickEvent event){`
`76`	`77`	`ActionsMenu.close(getElement());`
`77`	`78`	`}`
`78`	`79`
	`80`	`+ public void addClass(String className) {`
	`81`	`+ container.getElement().addClassName(className);`
	`82`	`+ action.setText("");`
	`83`	`+ }`
`79`	`84`	`}`