Skip to content

Commit afae8bf

Browse files
angelborroy-ksangelborroy-ks
committed
201605 Compatibility
1 parent 46417a3 commit afae8bf

File tree

6 files changed

+18
-10
lines changed

6 files changed

+18
-10
lines changed

‎datalist-model-repo/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>es.keensoft</groupId>
66
<artifactId>datalist-model-repo</artifactId>
7-
<version>3.2.0</version>
7+
<version>3.2.1</version>
88
<name>datalist-model-repo Repository AMP project</name>
99
<packaging>amp</packaging>
1010
<description>Manages the lifecycle of the site-props-repo Repository AMP (Alfresco Module Package)</description>

‎datalist-model-share/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>es.keensoft</groupId>
66
<artifactId>datalist-model-share</artifactId>
7-
<version>3.2.0</version>
7+
<version>3.2.1</version>
88
<name>site-props-share AMP project</name>
99
<packaging>amp</packaging>
1010
<description>Manages the lifecycle of the site-props-share AMP (Alfresco Module Package)</description>

‎datalist-model-share/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/components/form/controls/datalistSelectone-defaultValue.ftl‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,12 @@ YAHOO.util.Event.onContentReady("${fieldHtmlId}", function ()
7676
var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?search=true&"+ (new Date().getTime());
7777
<#elseif page?? && page.url.templateArgs.site??>
7878
var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?siteId=${page.url.templateArgs.site!""}&"+ (new Date().getTime());
79-
<#elseif args?? && args.destination??>
80-
var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${args.destination!""}&"+ (new Date().getTime());
79+
<#elseif form?? && form.arguments.itemId??>
80+
var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${form.arguments.itemId!""}&"+ (new Date().getTime());
8181
<#elseif page?? && page.url.args.nodeRef??>
8282
var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${page.url.args.nodeRef!""}&"+ (new Date().getTime());
83+
<#elseif args?? && args.destination??>
84+
var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${args.destination!""}&"+ (new Date().getTime());
8385
<#else>
8486
var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?"+ (new Date().getTime());
8587
</#if>

‎datalist-model-share/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/components/form/controls/datalistSelectone-multiple.ftl‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,10 +291,12 @@ function fillOptions${field.id}(selectId, value) {
291291
var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?search=true&"+ (new Date().getTime());
292292
<#elseif page?? && page.url.templateArgs.site??>
293293
var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?siteId=${page.url.templateArgs.site!""}&"+ (new Date().getTime());
294-
<#elseif args?? && args.destination??>
295-
var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${args.destination!""}&"+ (new Date().getTime());
294+
<#elseif form?? && form.arguments.itemId??>
295+
var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${form.arguments.itemId!""}&"+ (new Date().getTime());
296296
<#elseif page?? && page.url.args.nodeRef??>
297297
var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${page.url.args.nodeRef!""}&"+ (new Date().getTime());
298+
<#elseif args?? && args.destination??>
299+
var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${args.destination!""}&"+ (new Date().getTime());
298300
<#else>
299301
var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?"+ (new Date().getTime());
300302
</#if>

‎datalist-model-share/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/components/form/controls/datalistSelectone-parent.ftl‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,12 @@ control parameters in the form config by hiding the div {field.name}-control
9090
var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?search=true&"+ (new Date().getTime());
9191
<#elseif page?? && page.url.templateArgs.site??>
9292
var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?siteId=${page.url.templateArgs.site!""}&"+ (new Date().getTime());
93-
<#elseif args?? && args.destination??>
94-
var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${args.destination!""}&"+ (new Date().getTime());
93+
<#elseif form?? && form.arguments.itemId??>
94+
var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${form.arguments.itemId!""}&"+ (new Date().getTime());
9595
<#elseif page?? && page.url.args.nodeRef??>
9696
var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${page.url.args.nodeRef!""}&"+ (new Date().getTime());
97+
<#elseif args?? && args.destination??>
98+
var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${args.destination!""}&"+ (new Date().getTime());
9799
<#else>
98100
var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?"+ (new Date().getTime());
99101
</#if>

‎datalist-model-share/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/components/form/controls/datalistSelectone.ftl‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,12 @@ YAHOO.util.Event.onContentReady("${fieldHtmlId}", function ()
7272
var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?search=true&"+ (new Date().getTime());
7373
<#elseif page?? && page.url.templateArgs.site??>
7474
var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?siteId=${page.url.templateArgs.site!""}&"+ (new Date().getTime());
75-
<#elseif args?? && args.destination??>
76-
var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${args.destination!""}&"+ (new Date().getTime());
75+
<#elseif form?? && form.arguments.itemId??>
76+
var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${form.arguments.itemId!""}&"+ (new Date().getTime());
7777
<#elseif page?? && page.url.args.nodeRef??>
7878
var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${page.url.args.nodeRef!""}&"+ (new Date().getTime());
79+
<#elseif args?? && args.destination??>
80+
var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?nodeRef=${args.destination!""}&"+ (new Date().getTime());
7981
<#else>
8082
var linkTemplate="/keensoft/datalist/${field.control.params.itemType}?"+ (new Date().getTime());
8183
</#if>

0 commit comments

Comments
 (0)