# HG changeset patch # User Dustin Demuth # Date 1453370060 -3600 # Node ID 6afdbc8ee920310e705243c31dba059a59278e61 # Parent 04ac7bb4494f9ae5f8212d559c02b65d6f6ae5fd Tidied up code, fixed buttons in Messprogrammkategoriegrid by renaming the alias of the grid diff -r 04ac7bb4494f -r 6afdbc8ee920 app.js --- a/app.js Wed Jan 20 17:38:10 2016 +0100 +++ b/app.js Thu Jan 21 10:54:20 2016 +0100 @@ -202,23 +202,26 @@ controllers: [ 'Lada.controller.Filter', 'Lada.controller.ModeSwitcher', - 'Lada.controller.grid.ProbeList', - 'Lada.controller.grid.MessprogrammeList', - 'Lada.controller.grid.Datensatzerzeuger', - 'Lada.controller.grid.Probenehmer', + 'Lada.controller.Map', 'Lada.controller.form.Probe', 'Lada.controller.form.Messung', 'Lada.controller.form.Ort', - 'Lada.controller.grid.Ort', + 'Lada.controller.form.Location', + 'Lada.controller.form.Messprogramm', + 'Lada.controller.grid.Ortszuordnung', 'Lada.controller.grid.Probenzusatzwert', 'Lada.controller.grid.PKommentar', + 'Lada.controller.grid.Messmethode', 'Lada.controller.grid.MKommentar', 'Lada.controller.grid.Messung', 'Lada.controller.grid.Messwert', 'Lada.controller.grid.Status', - 'Lada.controller.Map', - 'Lada.controller.form.Location', - 'Lada.controller.form.Messprogramm', - 'Lada.controller.grid.Messmethode' + //FilterResult + 'Lada.controller.grid.MessprogrammeList', + 'Lada.controller.grid.ProbeList', + //Stammdaten + 'Lada.controller.grid.Datensatzerzeuger', + 'Lada.controller.grid.Probenehmer', + 'Lada.controller.grid.MessprogrammKategorie' ] }); diff -r 04ac7bb4494f -r 6afdbc8ee920 app/view/grid/DatensatzErzeuger.js --- a/app/view/grid/DatensatzErzeuger.js Wed Jan 20 17:38:10 2016 +0100 +++ b/app/view/grid/DatensatzErzeuger.js Thu Jan 21 10:54:20 2016 +0100 @@ -122,16 +122,6 @@ header: i18n.getMsg('letzteAenderung'), dataIndex: 'letzteAenderung' }]; - this.listeners = { - select: { - fn: this.activateRemoveButton, - scope: this - }, - deselect: { - fn: this.deactivateRemoveButton, - scope: this - } - }; this.callParent(arguments); }, diff -r 04ac7bb4494f -r 6afdbc8ee920 app/view/grid/MessprogrammKategorie.js --- a/app/view/grid/MessprogrammKategorie.js Wed Jan 20 17:38:10 2016 +0100 +++ b/app/view/grid/MessprogrammKategorie.js Thu Jan 21 10:54:20 2016 +0100 @@ -11,7 +11,7 @@ */ Ext.define('Lada.view.grid.MessprogrammKategorie', { extend: 'Ext.grid.Panel', - alias: 'widget.mkgrid', + alias: 'widget.messprogrammkategoriegrid', // minHeight and deferEmptyText are needed to be able to show the // emptyText message. @@ -99,16 +99,6 @@ header: i18n.getMsg('letzteAenderung'), dataIndex: 'letzteAenderung' }]; - this.listeners = { - select: { - fn: this.activateRemoveButton, - scope: this - }, - deselect: { - fn: this.deactivateRemoveButton, - scope: this - } - }; this.callParent(arguments); }, @@ -120,6 +110,7 @@ this.removeDocked(Ext.getCmp('ptbar'), true); this.reconfigure(store); + this.down('button[action=add]').enable(); this.addDocked([{ xtype: 'pagingtoolbar', id: 'ptbar', diff -r 04ac7bb4494f -r 6afdbc8ee920 app/view/grid/Orte.js --- a/app/view/grid/Orte.js Wed Jan 20 17:38:10 2016 +0100 +++ b/app/view/grid/Orte.js Thu Jan 21 10:54:20 2016 +0100 @@ -134,26 +134,6 @@ header: i18n.getMsg('orte.letzteAenderung'), dataIndex: 'letzteAenderung' }]; - this.listeners = { - select: { - fn: this.activateRemoveButton, - scope: this - }, - deselect: { - fn: this.deactivateRemoveButton, - scope: this - } - }; - this.listeners = { - select: { - fn: this.activateRemoveButton, - scope: this - }, - deselect: { - fn: this.deactivateRemoveButton, - scope: this - } - }; this.callParent(arguments); }, diff -r 04ac7bb4494f -r 6afdbc8ee920 app/view/grid/Probenehmer.js --- a/app/view/grid/Probenehmer.js Wed Jan 20 17:38:10 2016 +0100 +++ b/app/view/grid/Probenehmer.js Thu Jan 21 10:54:20 2016 +0100 @@ -151,16 +151,6 @@ header: i18n.getMsg('letzteAenderung'), dataIndex: 'letzteAenderung' }]; - this.listeners = { - select: { - fn: this.activateRemoveButton, - scope: this - }, - deselect: { - fn: this.deactivateRemoveButton, - scope: this - } - }; this.callParent(arguments); },