Mercurial > lada > lada-client
changeset 617:ab48824713e2 openid
Merge branch default into openid
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Fri, 13 Mar 2015 15:00:55 +0100 |
| parents | 7fd9350eacf9 (current diff) 69e66117bd58 (diff) |
| children | fb89f61ab272 |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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() {
--- 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'