Workflow serviceTask parameters

process/workflowServiceTaskParams_rest/process.js

+import("Contact_lib");
 import("KeywordData_lib");
 import("system.translate");
 import("KeywordRegistry_basic");
@@ -117,10 +118,20 @@ function restget (pRequest)
         {
             var templates = newSelect("DOCUMENTTEMPLATEID, NAME")
                 .from("DOCUMENTTEMPLATE")
+                .where("DOCUMENTTEMPLATE.KIND", $KeywordRegistry.documentTemplateType$mail())
                 .table();
+                
+            var contacts = newSelect(["CONTACTID", new ContactTitleRenderer(Contact.createWithColumnPreset(), ContactTitleRenderer.OPTIONS.IncludeOrganisation).asSql()])
+                .from(ContactUtils.getFullContactString())
+                .where("CONTACT.ORGANISATION_ID", "0", SqlBuilder.NOT_EQUAL())
+                    .or(newWhere("CONTACT.ORGANISATION_ID", "0")
+                        .and("CONTACT.PERSON_ID is not null"))
+                .orderBy("ORGANISATION.CUSTOMERCODE asc, ORGANISATION.NAME asc, PERSON.LASTNAME asc, PERSON.FIRSTNAME asc")
+                .table();
+                
             return [
                 new Parameter("documentTemplateId", "Document template", Types.ENUM, _mapToItemArray(templates)),
-                new Parameter("recipientContactId", "Recipient", Types.ENUM)
+                new Parameter("recipientContactId", "Recipient", Types.ENUM, _mapToItemArray(contacts))
             ];
         },
         SetAttribute_workflowService : function (pCurrentValues)
@@ -168,9 +179,9 @@ function restget (pRequest)
                 new Parameter("attributeId", "Attribute", Types.ENUM, attributes, true)
             ];
             
-            if (currentValues.attributeId && currentValues.attributeId.value)
+            if (pCurrentValues.attributeId && pCurrentValues.attributeId.value)
             {
-                var selectedAttributeId = currentValues.attributeId.value;
+                var selectedAttributeId = pCurrentValues.attributeId.value;
                 var attributeType = AttributeUtil.getAttributeType(selectedAttributeId);
                 var listValues = AttributeUtil.getPossibleListValues(selectedAttributeId, attributeType);
                 var enumValues, paramType;
@@ -202,7 +213,7 @@ function restget (pRequest)
     
     var parameters;
     if (jditoProcess in parameterConfiguration && typeof parameterConfiguration[jditoProcess] === "function")
-        parameters = parameterConfiguration[jditoProcess]();
+        parameters = parameterConfiguration[jditoProcess](currentValues);
     
     if (!parameters)
         parameters = [];