Mercurial > lada > lada-client
changeset 1126:f1d234a7adc7
merged.
| author | Raimund Renkert <raimund.renkert@intevation.de> |
|---|---|
| date | Tue, 24 May 2016 10:41:07 +0200 |
| parents | f5cc079cd683 (diff) 4f68511ce7a4 (current diff) |
| children | 5941ee0c7247 9c8b5cbb929a e4952906634d |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/app/controller/Filter.js Mon May 23 17:50:47 2016 +0200 +++ b/app/controller/Filter.js Tue May 24 10:41:07 2016 +0200 @@ -111,7 +111,9 @@ contentPanel.removeAll(); //clear the panel: make space for new grids // Setup Columns - if (this.displayFields && this.displayFields[0].index === 0) { + if (this.displayFields && + this.displayFields.length > 0 && + this.displayFields[0].index === 0) { this.displayFields.reverse(); }
--- a/app/view/widget/Netzbetreiber.js Mon May 23 17:50:47 2016 +0200 +++ b/app/view/widget/Netzbetreiber.js Tue May 24 10:41:07 2016 +0200 @@ -15,6 +15,7 @@ store: 'StaNetzbetreiber', displayField: 'netzbetreiber', valueField: 'id', + editable: this.editable || false, readOnly: this.readOnly, // Enable filtering of comboboxes queryMode: 'local',