Mercurial > lada > lada-client
changeset 861:99c5dd8e9b0f
merged heads
| author | Dustin Demuth <dustin@intevation.de> |
|---|---|
| date | Fri, 10 Jul 2015 18:18:53 +0200 |
| parents | 03f39ddae596 (current diff) 6249b731d438 (diff) |
| children | 1830ed929367 |
| files | app/view/window/GenProbenFromMessprogramm.js |
| diffstat | 4 files changed, 19 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/app/controller/form/Messprogramm.js Fri Jul 10 18:18:00 2015 +0200 +++ b/app/controller/form/Messprogramm.js Fri Jul 10 18:18:53 2015 +0200 @@ -322,7 +322,6 @@ var desk = field.up('deskriptor'); var media = field.up('messprogrammform').down('textfield[name="mediaDesk"]'); var current = media.getValue().split(' '); - this.clearChildDesk(field.up('deskriptor'), current); if (current.length < 13) { for (var i = 0; i <= 12; i++) { if (i === 0) {
--- a/app/view/window/DeleteProbe.js Fri Jul 10 18:18:00 2015 +0200 +++ b/app/view/window/DeleteProbe.js Fri Jul 10 18:18:53 2015 +0200 @@ -55,12 +55,22 @@ }, success: function(response) { var json = Ext.JSON.decode(response.responseText); - Ext.Msg.show({ - title: i18n.getMsg('success'), - autoScroll: true, - msg: me.evalResponse(json), - buttons: Ext.Msg.OK, - }); + if (json.success && json.message === '200') { + Ext.Msg.show({ + title: i18n.getMsg('success'), + autoScroll: true, + msg: 'Probe gelöscht!', + buttons: Ext.Msg.OK + }); + } + else { + Ext.Msg.show({ + title: 'Fehler!', + msg: 'Ein Fehler ist aufgetreten, ist die Probe nicht leer?', + buttons: Ext.Msg.OK + }); + } + me.close(); }, failure: function(response) { var json = null;
--- a/app/view/window/GenProbenFromMessprogramm.js Fri Jul 10 18:18:00 2015 +0200 +++ b/app/view/window/GenProbenFromMessprogramm.js Fri Jul 10 18:18:53 2015 +0200 @@ -67,6 +67,7 @@ msg: me.evalResponse(json), buttons: Ext.Msg.OK, }); + me.close(); }, failure: function(response) { var json = null;
--- a/app/view/window/Messprogramm.js Fri Jul 10 18:18:00 2015 +0200 +++ b/app/view/window/Messprogramm.js Fri Jul 10 18:18:53 2015 +0200 @@ -31,6 +31,7 @@ initComponent: function() { var i18n = Lada.getApplication().bundle; + var me = this; if (this.record == null) { this.title = i18n.getMsg('messprogramm.window.create.title'); @@ -58,6 +59,7 @@ this.probenWindow.focus(); this.probenWindow.setActive(true); } + me.close(); } }, '->',