From 752d1f42eb039e286a7e55efbb86537ba3a7751a Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 12 Sep 2012 14:41:29 +0800 Subject: [PATCH] Pman.Dialog.CoreCompanies.bjs Pman.Dialog.CoreCompanies.js --- Pman.Dialog.CoreCompanies.bjs | 2 +- Pman.Dialog.CoreCompanies.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Pman.Dialog.CoreCompanies.bjs b/Pman.Dialog.CoreCompanies.bjs index 8e9cbc12..271ac354 100644 --- a/Pman.Dialog.CoreCompanies.bjs +++ b/Pman.Dialog.CoreCompanies.bjs @@ -41,7 +41,7 @@ { "listeners": { "actionfailed": "function(f, act) {\n _this.dialog.el.unmask();\n // error msg???\n Pman.standardActionFailed(f,act);\n \n}", - "actioncomplete": "function(f, act) {\n _this.dialog.el.unmask();\n //console.log('load completed'); \n // error messages?????\n if(act.type == 'setdata'){\n if (data._fetch) {\n _this.dialog.el.mask(\"Loading\");\n _this.form.doAction('load', {\n url: baseURL + '/Roo/Companies.html',\n method: 'GET',\n params: {\n _id: this._id ,\n _ts : Math.random()\n } \n });\n return;\n } else {\n _this.form.setValues(data);\n }\n \n if (data.isOwner || !Pman.Login.isOwner()) {\n _this.dialog.setTitle(\"Your Company Details\");\n if (_this.form.findField('comptype')) {\n _this.form.findField('comptype').disable();\n }\n } else {\n _this.dialog.setTitle(data.id ? \"Edit Company\" : \"Add Company\");\n if (_this.form.findField('comptype')) {\n _this.form.findField('comptype').enable();\n }\n }\n }\n \n if (act.type == 'load') {\n _this.data = act.result.data;\n var meth = _this.data.isOwner || !Pman.Login.isOwner() ? 'disable' : 'enable';\n \n \n if (_this.form.findField('comptype')) {\n _this.form.findField('comptype')[meth]();\n }\n \n // _this.loaded();\n return;\n }\n \n \n if (act.type == 'submit') { // only submitted here if we are \n _this.dialog.hide();\n \n if (_this.callback) {\n _this.callback.call(this, act.result.data);\n }\n return; \n }\n // unmask?? \n}", + "actioncomplete": "function(f, act) {\n _this.dialog.el.unmask();\n //console.log('load completed'); \n // error messages?????\n if(act.type == 'setdata'){\n if (act.data._fetch) {\n _this.dialog.el.mask(\"Loading\");\n _this.form.doAction('load', {\n url: baseURL + '/Roo/Companies.html',\n method: 'GET',\n params: {\n _id: this._id ,\n _ts : Math.random()\n } \n });\n return;\n } else {\n _this.form.setValues(data);\n }\n \n if (act.data.isOwner || !Pman.Login.isOwner()) {\n _this.dialog.setTitle(\"Your Company Details\");\n if (_this.form.findField('comptype')) {\n _this.form.findField('comptype').disable();\n }\n } else {\n _this.dialog.setTitle(data.id ? \"Edit Company\" : \"Add Company\");\n if (_this.form.findField('comptype')) {\n _this.form.findField('comptype').enable();\n }\n }\n }\n \n if (act.type == 'load') {\n _this.data = act.result.data;\n var meth = _this.data.isOwner || !Pman.Login.isOwner() ? 'disable' : 'enable';\n \n \n if (_this.form.findField('comptype')) {\n _this.form.findField('comptype')[meth]();\n }\n \n // _this.loaded();\n return;\n }\n \n \n if (act.type == 'submit') { // only submitted here if we are \n _this.dialog.hide();\n \n if (_this.callback) {\n _this.callback.call(this, act.result.data);\n }\n return; \n }\n // unmask?? \n}", "rendered": "function (form)\n{\n _this.form = form;\n}" }, "fileUpload": true, diff --git a/Pman.Dialog.CoreCompanies.js b/Pman.Dialog.CoreCompanies.js index 6cd46ed1..b8bacc91 100644 --- a/Pman.Dialog.CoreCompanies.js +++ b/Pman.Dialog.CoreCompanies.js @@ -82,7 +82,7 @@ Pman.Dialog.CoreCompanies = { //console.log('load completed'); // error messages????? if(act.type == 'setdata'){ - if (data._fetch) { + if (act.data._fetch) { _this.dialog.el.mask("Loading"); _this.form.doAction('load', { url: baseURL + '/Roo/Companies.html', @@ -97,7 +97,7 @@ Pman.Dialog.CoreCompanies = { _this.form.setValues(data); } - if (data.isOwner || !Pman.Login.isOwner()) { + if (act.data.isOwner || !Pman.Login.isOwner()) { _this.dialog.setTitle("Your Company Details"); if (_this.form.findField('comptype')) { _this.form.findField('comptype').disable(); -- 2.39.2