[Lada-commits] [PATCH 3 of 3] merged heads

[Wald Commits]

# HG changeset patch
# User Dustin Demuth <dustin at intevation.de>
# Date 1436341682 -7200
# Node ID ffcf8898a261a4c84502b8f7ff100bdf449d18bc
# Parent  95d40ca7bb7043df5e5b1a8982ba19d93b352c28
# Parent  613ad3263e59dfd00aa108fc68a0904eed781b06
merged heads

diff -r 95d40ca7bb70 -r ffcf8898a261 app/view/grid/Messwert.js
--- a/app/view/grid/Messwert.js	Wed Jul 08 09:47:30 2015 +0200
+++ b/app/view/grid/Messwert.js	Wed Jul 08 09:48:02 2015 +0200
@@ -29,6 +29,7 @@
     recordId: null,
     readOnly: true,
     allowDeselect: true,
+    messgroesseStore: null,
 
     initComponent: function() {
         this.rowEditing = Ext.create('Ext.grid.plugin.RowEditing', {
@@ -49,8 +50,8 @@
                     return true;
                 }
             }
-         });
-
+        });
+        var me = this;
         this.plugins = [this.rowEditing];
 
         this.dockedItems = [{
@@ -81,7 +82,7 @@
             },
             editor: {
                 xtype: 'combobox',
-                store: Ext.data.StoreManager.get('messgroessen'),
+                store: me.messgroesseStore,
                 displayField: 'messgroesse',
                 valueField: 'id',
                 allowBlank: false,
diff -r 95d40ca7bb70 -r ffcf8898a261 app/view/window/MessungEdit.js
--- a/app/view/window/MessungEdit.js	Wed Jul 08 09:47:30 2015 +0200
+++ b/app/view/window/MessungEdit.js	Wed Jul 08 09:48:02 2015 +0200
@@ -63,6 +63,10 @@
         this.width = 700;
         this.height = Ext.getBody().getViewSize().height - 30;
 
+        var mStore = Ext.data.StoreManager.get('messgroessen');
+        mStore.proxy.extraParams = {mmtId: this.record.get('mmtId')};
+        mStore.load();
+
         this.items = [{
             border: 0,
             autoScroll: true,
@@ -78,7 +82,8 @@
                 margin: 5,
                 items: [{
                     xtype: 'messwertgrid',
-                    recordId: this.record.get('id')
+                    recordId: this.record.get('id'),
+                    messgroesseStore: mStore
                 }]
             }, {
                 xtype: 'fset',