DataObjects/core.sql

[Pman.Core] / Pman.Dialog.Image.js

diff --git a/Pman.Dialog.Image.js b/Pman.Dialog.Image.js
index 33639bb..5aa1a8d 100644 (file)
--- a/Pman.Dialog.Image.js
+++ b/Pman.Dialog.Image.js
@@ -70,14 +70,20 @@ Pman.Dialog.Image = {
                 dlg.haveProgress = 1;
             
                 var uid = _this.form.findField('UPLOAD_IDENTIFIER').getValue();
-                Pman.request({
+                new Pman.Request({
                     url : baseURL + '/Core/UploadProgress.php',
                     params: {
                         id : uid
                     },
                     method: 'GET',
-                    success : function(data){
+                    success : function(res){
                         //console.log(data);
+                        var data = res.data;
+                        if (dlg.haveProgress == 2) {
+                            // it's been closed elsewhere..
+                            return;
+                        }
+                        
                         if (dlg.uploadComplete) {
                             Roo.MessageBox.hide();
                             return;
@@ -113,7 +119,7 @@ Pman.Dialog.Image = {
                                     _this.dialog.uploadComplete = true;
                                     _this.dialog.haveProgress = 2; 
                                     Roo.MessageBox.hide(); // force hiding
-                                    _this.dialog.el.unmask();
+                                    //_this.dialog.el.unmask();
                                      
                                     if (act.type == 'setdata') { 
                                         this.url = _this.data._url ? _this.data._url : baseURL + '/Roo/Images.php';
@@ -135,7 +141,8 @@ Pman.Dialog.Image = {
                                     
                                     if (act.type == 'submit') { // only submitted here if we are 
                                         _this.dialog.hide();
-                                        
+                                        Roo.log("Upload success");
+                                        Roo.log(act);
                                         //console.log(act);
                                         if (_this.callback) {
                                             _this.callback.call(this, act.result.data);
@@ -150,11 +157,12 @@ Pman.Dialog.Image = {
                                 actionfailed : function (_self, act)
                                 {
                                     _this.dialog.uploadComplete = true;
-                                    _this.dialog.el.unmask();
+                                   // _this.dialog.el.unmask();
                                     // error msg???
-                                    
+                                     _this.dialog.haveProgress = 2; 
                                     if (act.type == 'submit') {
-                                        //Roo.log(act);
+                                        Roo.log("Upload error");
+                                        Roo.log(act);
                                         try {
                                             Roo.MessageBox.alert("Error", act.result.errorMsg);
                                         } catch(e) {
@@ -172,6 +180,7 @@ Pman.Dialog.Image = {
                             labelWidth : 140,
                             method : 'POST',
                             style : 'margin:10px;',
+                            timeout : 300,
                             url : baseURL + '/Roo/Images.php',
                             items : [
                                 {
@@ -209,6 +218,11 @@ Pman.Dialog.Image = {
                                     xns: Roo.form,
                                     name : 'onid'
                                 },
+                                {
+                                    xtype: 'Hidden',
+                                    xns: Roo.form,
+                                    name : 'id'
+                                },
                                 {
                                     xtype: 'Hidden',
                                     xns: Roo.form,
@@ -243,7 +257,7 @@ Pman.Dialog.Image = {
                         {
                             // do some checks?
                              
-                            _this.dialog.el.mask("Sending");
+                            //_this.dialog.el.mask("Sending");
                             _this.dialog.uploadComplete = false;
                             _this.form.doAction('submit', {
                                 params: {