# HG changeset patch
# User Raimund Renkert <raimund.renkert@intevation.de>
# Date 1464016070 -7200
# Node ID 49189f7b4d2f9e6635dd07890a357b8ff4bbf717
# Parent  0b908138a74048be06ebee4a785065100ca8b1fa# Parent  b73f9a976c8277f27761b76fe346a31d3cddf89f
merged.

diff -r b73f9a976c82 -r 49189f7b4d2f app/controller/Filter.js
--- a/app/controller/Filter.js	Mon May 23 16:00:50 2016 +0200
+++ b/app/controller/Filter.js	Mon May 23 17:07:50 2016 +0200
@@ -130,6 +130,7 @@
                         plugins: [{
                             ptype: 'gridrowexpander',
                             gridType: 'Lada.view.grid.Messung',
+                            expandOnDblClick: false,
                             gridConfig: {
                                 bottomBar: false
                             }
@@ -142,6 +143,7 @@
                         plugins: [{
                             ptype: 'gridrowexpander',
                             gridType: 'Lada.view.grid.Messwert',
+                            expandOnDblClick: false,
                             gridConfig: {
                                 bottomBar: false
                             }
diff -r b73f9a976c82 -r 49189f7b4d2f app/controller/form/Messung.js
--- a/app/controller/form/Messung.js	Mon May 23 16:00:50 2016 +0200
+++ b/app/controller/form/Messung.js	Mon May 23 17:07:50 2016 +0200
@@ -54,7 +54,7 @@
                     formPanel.setMessages(json.errors, json.warnings);
                     formPanel.up('window').initData();
                     formPanel.up('window').grid.store.reload();
-                    var parentWin = button.up('window').grid.up('window');
+                    var parentWin = button.up('window').parentWindow;
                     parentWin.initData();
                     if (response.action === 'create' && json.success) {
                         var oldWin = button.up('window');
diff -r b73f9a976c82 -r 49189f7b4d2f app/controller/grid/Messung.js
--- a/app/controller/grid/Messung.js	Mon May 23 16:00:50 2016 +0200
+++ b/app/controller/grid/Messung.js	Mon May 23 17:07:50 2016 +0200
@@ -91,7 +91,7 @@
             },
             success: function(precord, response) {
                 var messungWin = Ext.create('Lada.view.window.MessungEdit', {
-                    parentWindow: grid.up('window'),
+                    parentWindow: probeWin,
                     probe: precord,
                     record: record,
                     grid: grid
diff -r b73f9a976c82 -r 49189f7b4d2f app/controller/grid/MessungList.js
--- a/app/controller/grid/MessungList.js	Mon May 23 16:00:50 2016 +0200
+++ b/app/controller/grid/MessungList.js	Mon May 23 17:07:50 2016 +0200
@@ -88,7 +88,7 @@
             },
             success: function(precord, response) {
                 var messungWin = Ext.create('Lada.view.window.MessungEdit', {
-                    parentWindow: grid.up('window'),
+                    parentWindow: probeWin,
                     probe: precord,
                     record: record,
                     grid: grid