From: Alan Knowles <alan@roojs.com>
Date: Tue, 5 Mar 2013 02:12:24 +0000 (+0800)
Subject: Pman.Dialog.Image.bjs
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=c2eb8dfd8c749f6acda0ef1fe890147f327118c0

Pman.Dialog.Image.bjs
Pman.Dialog.Image.js
---

diff --git a/Pman.Dialog.Image.bjs b/Pman.Dialog.Image.bjs
index da9c650f..398d8836 100644
--- a/Pman.Dialog.Image.bjs
+++ b/Pman.Dialog.Image.bjs
@@ -38,7 +38,7 @@
                             "listeners": {
                                 "|actioncomplete": "function(_self,act)\n{\n    _this.dialog.uploadComplete = true;\n    _this.dialog.haveProgress = 2; \n    Roo.MessageBox.hide(); // force hiding\n    //_this.dialog.el.unmask();\n     \n    if (act.type == 'setdata') { \n        this.url = _this.data._url ? _this.data._url : baseURL + '/Roo/Images.php';\n        this.el.dom.action = this.url;\n        this.findField('UPLOAD_IDENTIFIER').setValue(\n            (new Date() * 1) + '' + Math.random());\n            \n        return;\n    }\n     \n   \n    if (act.type == 'load') {\n      // should this happen?  \n        _this.data = act.result.data;\n       // _this.loaded();\n        return;\n    }\n    \n    \n    if (act.type == 'submit') { // only submitted here if we are \n        _this.dialog.hide();\n        Roo.log(\"Upload success\");\n        Roo.log(act);\n        //console.log(act);\n        if (_this.callback) {\n            _this.callback.call(this, act.result.data);\n        }\n        return; \n    }\n    \n\n    \n}\n",
                                 "|rendered": "function (form)\n{\n    _this.form= form;\n}\n",
-                                "actionfailed": "function (_self, act)\n{\n    _this.dialog.uploadComplete = true;\n   // _this.dialog.el.unmask();\n    // error msg???\n     _this.dialog.haveProgress = 2; \n    if (act.type == 'submit') {\n        Roo.log(\"Upload error\");\n        Roo.log(act);\n        try {\n            Roo.MessageBox.alert(\"Error\", act.result.errorMsg);\n        } catch(e) {\n          //  Roo.log(e);\n            Roo.MessageBox.alert(\"Error\", \"Saving failed = fix errors and try again\");        \n        }\n        return;\n    }\n    \n    // what about load failing..\n    Roo.MessageBox.alert(\"Error\", \"Error loading details\"); \n}"
+                                "actionfailed": "function (_self, act)\n{\n    _this.dialog.uploadComplete = true;\n   // _this.dialog.el.unmask();\n    // error msg???\n     _this.dialog.haveProgress = 2; \n    if (act.type == 'submit') {\n        Roo.log(\"Upload error\");\n        Roo.log(act);\n        try {\n            Roo.MessageBox.alert(\"Error\", act.result.errorMsg.split(/\\n/).join('<BR/>'));\n        } catch(e) {\n          //  Roo.log(e);\n            Roo.MessageBox.alert(\"Error\", \"Saving failed = fix errors and try again\");        \n        }\n        return;\n    }\n    \n    // what about load failing..\n    Roo.MessageBox.alert(\"Error\", \"Error loading details\"); \n}"
                             },
                             "fileUpload": true,
                             "labelWidth": 140,
diff --git a/Pman.Dialog.Image.js b/Pman.Dialog.Image.js
index 7d153dc9..cb5d2b8c 100644
--- a/Pman.Dialog.Image.js
+++ b/Pman.Dialog.Image.js
@@ -167,7 +167,7 @@ Pman.Dialog.Image = {
                                         Roo.log("Upload error");
                                         Roo.log(act);
                                         try {
-                                            Roo.MessageBox.alert("Error", act.result.errorMsg);
+                                            Roo.MessageBox.alert("Error", act.result.errorMsg.split(/\n/).join('<BR/>'));
                                         } catch(e) {
                                           //  Roo.log(e);
                                             Roo.MessageBox.alert("Error", "Saving failed = fix errors and try again");