Skip to content

Commit da7ea3b

Browse files
committed
Pass activity form name and version to table download request #267
1 parent 5b35c89 commit da7ea3b

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

grails-app/assets/javascripts/forms.js

+9-2
Original file line numberDiff line numberDiff line change
@@ -1103,6 +1103,8 @@ function orEmptyArray(v) {
11031103
var parent = context.parent;
11041104
var listName = context.listName;
11051105
var modelName = context.outputModel.name;
1106+
var activityForm = context.activity && context.activity.type;
1107+
var formVersion = context.activity && context.activity.formVersion;
11061108

11071109
self.listParent = context.parent;
11081110
self.listName = listName;
@@ -1131,7 +1133,10 @@ function orEmptyArray(v) {
11311133
self.downloadTemplate = function () {
11321134
// Download a blank template if we are appending, otherwise download a template containing the existing data.
11331135
if (self.appendTableRows()) {
1134-
var url = config.excelOutputTemplateUrl + '?listName=' + listName + '&type=' + modelName;
1136+
var url = config.excelOutputTemplateUrl + '?listName=' + listName + '&activityForm='+activityForm+'&type=' + modelName;
1137+
if (formVersion) {
1138+
url+= '&formVersion=' + formVersion;
1139+
}
11351140
$.fileDownload(url)
11361141
.fail(function (error){
11371142
bootbox.alert('File download failed! ' + error);
@@ -1155,10 +1160,12 @@ function orEmptyArray(v) {
11551160
type: modelName,
11561161
editMode: editMode || false,
11571162
allowExtraRows: userAddedRows || false,
1163+
activityForm: activityForm,
1164+
formVersion: formVersion,
11581165
data: JSON.stringify(data)
11591166
};
11601167
var url = config.excelOutputTemplateUrl;
1161-
$.fileDownload(url, {
1168+
return $.fileDownload(url, {
11621169
httpMethod: 'POST',
11631170
data: params
11641171
});

0 commit comments

Comments
 (0)