201605 Compatibility

keensoft · Dec 29, 2017 · afae8bf · afae8bf
1 parent 46417a3
commit afae8bf
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/datalist-model-repo/pom.xml b/datalist-model-repo/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>es.keensoft</groupId>
     <artifactId>datalist-model-repo</artifactId>
-    <version>3.2.0</version>
+    <version>3.2.1</version>
     <name>datalist-model-repo Repository AMP project</name>
     <packaging>amp</packaging>
     <description>Manages the lifecycle of the site-props-repo Repository AMP (Alfresco Module Package)</description>

diff --git a/datalist-model-share/pom.xml b/datalist-model-share/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>es.keensoft</groupId>
     <artifactId>datalist-model-share</artifactId>
-    <version>3.2.0</version>
+    <version>3.2.1</version>
     <name>site-props-share AMP project</name>
     <packaging>amp</packaging>
     <description>Manages the lifecycle of the site-props-share AMP (Alfresco Module Package)</description>

diff --git a/.../site-webscripts/org/alfresco/components/form/controls/datalistSelectone-defaultValue.ftl b/.../site-webscripts/org/alfresco/components/form/controls/datalistSelectone-defaultValue.ftl
@@ -76,10 +76,12 @@ YAHOO.util.Event.onContentReady("${fieldHtmlId}", function ()
       var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?search=true&"+ (new Date().getTime());  
   <#elseif page?? && page.url.templateArgs.site??>
       var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?siteId=${page.url.templateArgs.site!""}&"+ (new Date().getTime());
-  <#elseif args?? && args.destination??>
-      var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${args.destination!""}&"+ (new Date().getTime());
+  <#elseif form?? && form.arguments.itemId??>
+      var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${form.arguments.itemId!""}&"+ (new Date().getTime());
   <#elseif page?? && page.url.args.nodeRef??>
       var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${page.url.args.nodeRef!""}&"+ (new Date().getTime());
+  <#elseif args?? && args.destination??>
+      var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${args.destination!""}&"+ (new Date().getTime());
   <#else>
       var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?"+ (new Date().getTime());
   </#if>

diff --git a/...sion/site-webscripts/org/alfresco/components/form/controls/datalistSelectone-multiple.ftl b/...sion/site-webscripts/org/alfresco/components/form/controls/datalistSelectone-multiple.ftl
@@ -291,10 +291,12 @@ function fillOptions${field.id}(selectId, value) {
       var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?search=true&"+ (new Date().getTime());  
   <#elseif page?? && page.url.templateArgs.site??>
       var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?siteId=${page.url.templateArgs.site!""}&"+ (new Date().getTime());
-  <#elseif args?? && args.destination??>
-      var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${args.destination!""}&"+ (new Date().getTime());
+  <#elseif form?? && form.arguments.itemId??>
+      var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${form.arguments.itemId!""}&"+ (new Date().getTime());
   <#elseif page?? && page.url.args.nodeRef??>
       var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${page.url.args.nodeRef!""}&"+ (new Date().getTime());
+  <#elseif args?? && args.destination??>
+      var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${args.destination!""}&"+ (new Date().getTime());
   <#else>
       var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?"+ (new Date().getTime());
   </#if>

diff --git a/...ension/site-webscripts/org/alfresco/components/form/controls/datalistSelectone-parent.ftl b/...ension/site-webscripts/org/alfresco/components/form/controls/datalistSelectone-parent.ftl
@@ -90,10 +90,12 @@ control parameters in the form config by hiding the div {field.name}-control
       var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?search=true&"+ (new Date().getTime());  
   <#elseif page?? && page.url.templateArgs.site??>
       var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?siteId=${page.url.templateArgs.site!""}&"+ (new Date().getTime());
-  <#elseif args?? && args.destination??>
-      var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${args.destination!""}&"+ (new Date().getTime());
+  <#elseif form?? && form.arguments.itemId??>
+      var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${form.arguments.itemId!""}&"+ (new Date().getTime());
   <#elseif page?? && page.url.args.nodeRef??>
       var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${page.url.args.nodeRef!""}&"+ (new Date().getTime());
+  <#elseif args?? && args.destination??>
+      var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${args.destination!""}&"+ (new Date().getTime());
   <#else>
       var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?"+ (new Date().getTime());
   </#if>

diff --git a/...web-extension/site-webscripts/org/alfresco/components/form/controls/datalistSelectone.ftl b/...web-extension/site-webscripts/org/alfresco/components/form/controls/datalistSelectone.ftl
@@ -72,10 +72,12 @@ YAHOO.util.Event.onContentReady("${fieldHtmlId}", function ()
       var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?search=true&"+ (new Date().getTime());  
   <#elseif page?? && page.url.templateArgs.site??>
       var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?siteId=${page.url.templateArgs.site!""}&"+ (new Date().getTime());
-  <#elseif args?? && args.destination??>
-      var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${args.destination!""}&"+ (new Date().getTime());
+  <#elseif form?? && form.arguments.itemId??>
+      var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${form.arguments.itemId!""}&"+ (new Date().getTime());
   <#elseif page?? && page.url.args.nodeRef??>
       var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${page.url.args.nodeRef!""}&"+ (new Date().getTime());
+  <#elseif args?? && args.destination??>
+      var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${args.destination!""}&"+ (new Date().getTime());
   <#else>
       var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?"+ (new Date().getTime());
   </#if>