# HG changeset patch
# User Raimund Renkert <raimund.renkert@intevation.de>
# Date 1464079267 -7200
# Node ID f1d234a7adc7accaaea98ae2c72fb816baffe2db
# Parent  f5cc079cd683fd28af2e95b4ee2db840efc08f5b# Parent  4f68511ce7a41b9e2274e3f0ed46ebaa88e0af64
merged.

diff -r 4f68511ce7a4 -r f1d234a7adc7 app/controller/Filter.js
--- 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();
         }
 
diff -r 4f68511ce7a4 -r f1d234a7adc7 app/view/widget/Netzbetreiber.js
--- 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',