From: Chris <chris@roojs.com>
Date: Wed, 12 Sep 2012 06:43:44 +0000 (+0800)
Subject: Pman.Dialog.CoreCompanies.bjs
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=03919ec3f470cf11c4d07ddef735fad5faf67ebf

Pman.Dialog.CoreCompanies.bjs
Pman.Dialog.CoreCompanies.js
---

diff --git a/Pman.Dialog.CoreCompanies.bjs b/Pman.Dialog.CoreCompanies.bjs
index e6753969..12d04395 100644
--- a/Pman.Dialog.CoreCompanies.bjs
+++ b/Pman.Dialog.CoreCompanies.bjs
@@ -38,7 +38,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 (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}",
+                                "actioncomplete": "function(f, act) {\n    _this.dialog.el.unmask();\n    //console.log('load completed'); \n    // error messages?????\n    if(act.type == 'setdata'){\n        this.load({ method: 'GET', params: { '_id' : _this.data.id }});\n        return;\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 86884920..53ed815f 100644
--- a/Pman.Dialog.CoreCompanies.js
+++ b/Pman.Dialog.CoreCompanies.js
@@ -62,32 +62,8 @@ Pman.Dialog.CoreCompanies = {
                                     //console.log('load completed'); 
                                     // error messages?????
                                     if(act.type == 'setdata'){
-                                        if (act.data._fetch) {
-                                            _this.dialog.el.mask("Loading");
-                                            _this.form.doAction('load', {
-                                                url: baseURL + '/Roo/Companies.html',
-                                                method: 'GET',
-                                                params: {
-                                                    _id: this._id ,
-                                                    _ts : Math.random()
-                                                } 
-                                            });
-                                            return;
-                                        } else {
-                                            _this.form.setValues(data);
-                                        }
-                                        
-                                        if (act.data.isOwner || !Pman.Login.isOwner()) {
-                                            _this.dialog.setTitle("Your Company Details");
-                                            if (_this.form.findField('comptype')) {
-                                                _this.form.findField('comptype').disable();
-                                            }
-                                        } else {
-                                            _this.dialog.setTitle(data.id ? "Edit Company" : "Add Company");
-                                            if (_this.form.findField('comptype')) {
-                                                _this.form.findField('comptype').enable();
-                                            }
-                                        }
+                                        this.load({ method: 'GET', params: { '_id' : _this.data.id }});
+                                        return;
                                     }
                                    
                                     if (act.type == 'load') {