Mercurial > lada > lada-client
changeset 787:442e7bd290dc
merged heads
author | Dustin Demuth <dustin@intevation.de> |
---|---|
date | Wed, 13 May 2015 10:27:15 +0200 |
parents | d2ee6858f452 (diff) bb2593ca23e8 (current diff) |
children | a4c358d08a0d |
files | app/view/form/Messprogramm.js |
diffstat | 7 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/app/controller/grid/Messmethode.js Wed May 13 10:23:57 2015 +0200 +++ b/app/controller/grid/Messmethode.js Wed May 13 10:27:15 2015 +0200 @@ -211,7 +211,7 @@ //Create an empty Messgroessen Store which will be populated with the //Messgroessen defined in the Messmethoden record. var mmtmessgroessenstore = Ext.create('Ext.data.Store', { - model: 'Lada.model.Messgroesse', + model: 'Lada.model.Messgroesse' }); // Copy every Record from Messgroessenstore to the empty Store
--- a/app/store/Probenintervall.js Wed May 13 10:23:57 2015 +0200 +++ b/app/store/Probenintervall.js Wed May 13 10:27:15 2015 +0200 @@ -64,10 +64,10 @@ }], sorters: [{ property: 'periodend', - direction: 'DESC', + direction: 'DESC' }], sortOnLoad: true, - remoteSort: false, + remoteSort: false }); function translateStore(v, record){
--- a/app/store/Umwelt.js Wed May 13 10:23:57 2015 +0200 +++ b/app/store/Umwelt.js Wed May 13 10:27:15 2015 +0200 @@ -27,5 +27,5 @@ }], sortOnLoad: true, remoteSort: false, - autoLoad: true, + autoLoad: true });
--- a/app/view/form/Messprogramm.js Wed May 13 10:23:57 2015 +0200 +++ b/app/view/form/Messprogramm.js Wed May 13 10:27:15 2015 +0200 @@ -261,7 +261,7 @@ fieldLabel: i18n.getMsg('offset'), labelWidth: 90, anchor: '100%', - name: 'intervallOffset', + name: 'intervallOffset' }] }, { xtype: 'fset', @@ -299,7 +299,7 @@ fieldLabel: i18n.getMsg('intervall'), labelWidth: 90, anchor: '100%', - values: [0, 0], + values: [0, 0] //this will be overridden // by setRecord }]
--- a/app/view/grid/Messmethoden.js Wed May 13 10:23:57 2015 +0200 +++ b/app/view/grid/Messmethoden.js Wed May 13 10:27:15 2015 +0200 @@ -62,7 +62,7 @@ text: i18n.getMsg('add'), icon: 'resources/img/list-add.png', action: 'add', - recordId: this.recordId, + recordId: this.recordId }, { text: i18n.getMsg('delete'), icon: 'resources/img/list-remove.png', @@ -100,7 +100,7 @@ '<tpl for="."><div class="x-combo-list-item x-boundlist-item" >' + '{id} - {messmethode}</div></tpl>'), displayTpl: Ext.create('Ext.XTemplate', - '<tpl for=".">{id} - {messmethode}</tpl>'), + '<tpl for=".">{id} - {messmethode}</tpl>') } }]; this.initData();
--- a/app/view/grid/Nuklide.js Wed May 13 10:23:57 2015 +0200 +++ b/app/view/grid/Nuklide.js Wed May 13 10:27:15 2015 +0200 @@ -80,7 +80,7 @@ '<tpl for="."><div class="x-combo-list-item x-boundlist-item" >' + '{messgroesse}</div></tpl>'), displayTpl: Ext.create('Ext.XTemplate', - '<tpl for=".">{messgroesse}</tpl>'), + '<tpl for=".">{messgroesse}</tpl>') } }];