diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/forms/form.get.js b/config/alfresco/templates/webscripts/org/alfresco/repository/forms/form.get.js index bf8d698d25..43ab2bbb3f 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/forms/form.get.js +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/forms/form.get.js @@ -86,19 +86,19 @@ function main() formModel.data.formData = {}; for (var k in formScriptObj.formData.data) { - var value = formScriptObj.formData.data[k].value; + var value = formScriptObj.formData.data[k].value; if (value instanceof java.util.Date) { - formModel.data.formData[k] = utils.toISO8601(value); + formModel.data.formData[k.replace(/:/g, "_")] = utils.toISO8601(value); } else { - formModel.data.formData[k] = value; + formModel.data.formData[k.replace(/:/g, "_")] = value; } } model.form = formModel; } -main(); +main(); diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/forms/form.post.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/forms/form.post.html.ftl index 7c877adaaf..36710f1540 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/forms/form.post.html.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/forms/form.post.html.ftl @@ -4,7 +4,7 @@

${message}

- <#if data.fields?exists> + <#if data?exists && data.fields?exists>