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

[Wald Commits]

# HG changeset patch
# User Dustin Demuth <dustin at intevation.de>
# Date 1436545133 -7200
# Node ID 99c5dd8e9b0f9ebe68ce14989a53e7f4de72bf63
# Parent  03f39ddae5965114210a39835ff800ba61f62ac9
# Parent  6249b731d4385c58abc6ee288b724d67533c2b69
merged heads

diff -r 03f39ddae596 -r 99c5dd8e9b0f app/controller/form/Messprogramm.js
--- 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) {
diff -r 03f39ddae596 -r 99c5dd8e9b0f app/view/window/DeleteProbe.js
--- 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;
diff -r 03f39ddae596 -r 99c5dd8e9b0f app/view/window/GenProbenFromMessprogramm.js
--- 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;
diff -r 03f39ddae596 -r 99c5dd8e9b0f app/view/window/Messprogramm.js
--- 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();
             }
         },
         '->',