[Lada-commits] [PATCH 1 of 2] Merge branch default into openid

[Wald Commits]

# HG changeset patch
# User Andre Heinecke <andre.heinecke at intevation.de>
# Date 1426255255 -3600
# Branch openid
# Node ID ab48824713e2d1eba83b57d0d4b45bc934645d48
# Parent  7fd9350eacf9d8a900e03522272b4b60cd917777
# Parent  69e66117bd58ff7448d4474dcb8daf65b34dc0dc
Merge branch default into openid

diff -r 7fd9350eacf9 -r ab48824713e2 app/controller/Filter.js
--- a/app/controller/Filter.js	Thu Mar 12 17:39:16 2015 +0100
+++ b/app/controller/Filter.js	Fri Mar 13 15:00:55 2015 +0100
@@ -19,8 +19,7 @@
     ],
 
     stores: [
-        'ProbenList',    // List of found Proben
-        'Queries'
+        'ProbenList'    // List of found Proben
     ],
 
     init: function() {
diff -r 7fd9350eacf9 -r ab48824713e2 app/view/FilterPanel.js
--- a/app/view/FilterPanel.js	Thu Mar 12 17:39:16 2015 +0100
+++ b/app/view/FilterPanel.js	Fri Mar 13 15:00:55 2015 +0100
@@ -27,7 +27,7 @@
             xtype: 'combobox',
             name: 'filter',
             editable: false,
-            store: 'Queries',
+            store: Ext.create('Lada.store.Queries'),
             displayField: 'name',
             valueField: 'id',
             emptyText: 'Wählen Sie eine Abfrage'