diff --git a/js/app/models/Download.js b/js/app/models/Download.js index d532782..b661e02 100644 --- a/js/app/models/Download.js +++ b/js/app/models/Download.js @@ -26,14 +26,14 @@ Ext.define('amdaModel.Download', { {name: 'structure', type: 'string'}, {name: 'refparamSampling', type: 'boolean', defaultValue: false}, {name: 'sampling', type: 'int', defaultValue: '600'}, - {name: 'output', type: 'string'}, + {name: 'fileprefix', type: 'string'}, {name: 'fileformat', type: 'string'}, {name: 'fileformatTT', type: 'string'}, {name: 'compression', type: 'string'}, {name: 'compressionTT', type: 'string'} ], - propertiesToCopy : 'id,name,downloadSrc,refparamSampling,sampling,list,timeformat,timeformatTT,structure,output,fileformat,fileformatTT,compression,compressionTT', + propertiesToCopy : 'id,name,downloadSrc,refparamSampling,sampling,list,timeformat,timeformatTT,structure,fileprefix,fileformat,fileformatTT,compression,compressionTT', getJsonValues : function(){ @@ -46,7 +46,7 @@ Ext.define('amdaModel.Download', { myValues.structure = this.get('structure'); myValues.refparamSampling = this.get('refparamSampling'); myValues.sampling = this.get('sampling'); - myValues.output = this.get('output'); + myValues.fileprefix = this.get('fileprefix'); myValues.timesrc = this.get('timesrc'); // if there's at least one timeTable in case of Download data diff --git a/js/app/views/DownloadUI.js b/js/app/views/DownloadUI.js index e120458..b1d2379 100644 --- a/js/app/views/DownloadUI.js +++ b/js/app/views/DownloadUI.js @@ -149,7 +149,7 @@ Ext.define('amdaUI.DownloadUI', { var structure = values.filestructure; var sampling = values.sampling ? values.sampling : 600; var refparamSampling = values.refparamsampling == 'on'; - var output = values.output ? values.output : ''; + var fileprefix = values.fileprefix ? values.fileprefix : ''; var fileformat = values.fileformat; var compression = values.compression; @@ -189,7 +189,7 @@ Ext.define('amdaUI.DownloadUI', { this.object.set('structure', structure); this.object.set('refparamSampling', refparamSampling); this.object.set('sampling', sampling); - this.object.set('output',output); + this.object.set('fileprefix',fileprefix); this.object.set('timeformat',timeformat); this.object.set('fileformat',fileformat); this.object.set('compression',compression); @@ -512,9 +512,9 @@ Ext.define('amdaUI.DownloadUI', { disabled: true }, { - xtype: 'textfield', name: 'output', - fieldLabel: 'File Name', - disabled: true, editable: true + xtype: 'textfield', name: 'fileprefix', + fieldLabel: 'File Prefix', + disabled: false, editable: true }, { fieldLabel: 'File Format', -- libgit2 0.21.2