Mercurial > lada > lada-client
changeset 1122:49189f7b4d2f
merged.
| author | Raimund Renkert <raimund.renkert@intevation.de> |
|---|---|
| date | Mon, 23 May 2016 17:07:50 +0200 |
| parents | 0b908138a740 (diff) b73f9a976c82 (current diff) |
| children | 4f68511ce7a4 a4944b52176e |
| files | |
| diffstat | 4 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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 }
--- 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');
--- 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
--- 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