DataObjects/Core_notify.php

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

diff --git a/Pman.Dialog.Image.js b/Pman.Dialog.Image.js
index f7941ba..e7065da 100644 (file)
--- a/Pman.Dialog.Image.js
+++ b/Pman.Dialog.Image.js
@@ -48,7 +48,7 @@ Pman.Dialog.Image = {
             modal : true,
             resizable : false,
             title : "Upload an Image or File",
-            uploadProgressRunning : false,
+            uploadComplete : false,
             width : 500,
             shadow : true,
             uploadProgress : function()
@@ -108,7 +108,8 @@ Pman.Dialog.Image = {
                                     _this.dialog.el.unmask();
                                      
                                     if (act.type == 'setdata') { 
-                                        this.url = _this.data._url ? _this.data._url : baseURL + '/Roo/Images.php'
+                                        this.url = _this.data._url ? _this.data._url : baseURL + '/Roo/Images.php';
+                                        this.el.dom.action = this.url;
                                         this.findField('UPLOAD_IDENTIFIER').setValue(
                                             (new Date() * 1) + '' + Math.random());
                                             
@@ -126,6 +127,7 @@ Pman.Dialog.Image = {
                                     
                                     if (act.type == 'submit') { // only submitted here if we are 
                                         _this.dialog.hide();
+                                        
                                         //console.log(act);
                                         if (_this.callback) {
                                             _this.callback.call(this, act.result.data);
@@ -144,12 +146,18 @@ Pman.Dialog.Image = {
                                     // error msg???
                                     
                                     if (act.type == 'submit') {
-                                        Ext.MessageBox.alert("Error", "Saving failed = fix errors and try again");
+                                        //Roo.log(act);
+                                        try {
+                                            Roo.MessageBox.alert("Error", act.result.errorMsg);
+                                        } catch(e) {
+                                          //  Roo.log(e);
+                                            Roo.MessageBox.alert("Error", "Saving failed = fix errors and try again");        
+                                        }
                                         return;
                                     }
                                     
                                     // what about load failing..
-                                    Ext.MessageBox.alert("Error", "Error loading details"); 
+                                    Roo.MessageBox.alert("Error", "Error loading details"); 
                                 }
                             },
                             fileUpload : true,
@@ -163,6 +171,18 @@ Pman.Dialog.Image = {
                                     xns: Roo.form,
                                     name : 'UPLOAD_IDENTIFIER'
                                 },
+                                {
+                                    xtype: 'Hidden',
+                                    xns: Roo.form,
+                                    name : 'post_max_size',
+                                    value : "32M"
+                                },
+                                {
+                                    xtype: 'Hidden',
+                                    xns: Roo.form,
+                                    name : 'upload_max_filesize',
+                                    value : "32M"
+                                },
                                 {
                                     xtype: 'TextField',
                                     xns: Roo.form,
@@ -185,18 +205,6 @@ Pman.Dialog.Image = {
                                     xtype: 'Hidden',
                                     xns: Roo.form,
                                     name : 'imgtype'
-                                },
-                                {
-                                    xtype: 'Hidden',
-                                    xns: Roo.form,
-                                    name : 'post_max_size',
-                                    value : "32M"
-                                },
-                                {
-                                    xtype: 'Hidden',
-                                    xns: Roo.form,
-                                    name : 'upload_max_filesize',
-                                    value : "32M"
                                 }
                             ]
                         }
@@ -230,10 +238,7 @@ Pman.Dialog.Image = {
                             _this.dialog.el.mask("Sending");
                             _this.dialog.uploadComplete = false;
                             _this.form.doAction('submit', {
-                                url: baseURL + '/Roo/Images.html',
-                                method: 'POST',
                                 params: {
-                                 //   _id: 0 ,
                                     ts : Math.random()
                                 } 
                             });