Pman.Dialog.CoreCompanies.bjs

Pman.Dialog.CoreCompanies.js

diff --git a/Pman.Dialog.CoreCompanies.bjs b/Pman.Dialog.CoreCompanies.bjs
index 3570330..323ad38 100644 (file)
--- a/Pman.Dialog.CoreCompanies.bjs
+++ b/Pman.Dialog.CoreCompanies.bjs
@@ -35,7 +35,7 @@
                         {
                             "listeners": {
                                 "actionfailed": "function(f, act) {\n    _this.dialog.el.unmask();\n    // error msg???\n    Pman.standardActionFailed(f,act);\n              \n}",
-                                "actioncomplete": "function (_self, action)\n{\n\n}"
+                                "actioncomplete": "function(f, act) {\n    _this.dialog.el.unmask();\n    //console.log('load completed'); \n    // error messages?????\n    \n   \n    if (act.type == 'load') {\n        \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}"
                             },
                             "fileUpload": true,
                             "labelWidth": 150,

diff --git a/Pman.Dialog.CoreCompanies.js b/Pman.Dialog.CoreCompanies.js
index ccd320b..c92084e 100644 (file)
--- a/Pman.Dialog.CoreCompanies.js
+++ b/Pman.Dialog.CoreCompanies.js
@@ -54,9 +54,36 @@ Pman.Dialog.CoreCompanies = {
                                     Pman.standardActionFailed(f,act);
                                               
                                 },
-                                actioncomplete : function (_self, action)
-                                {
-                                
+                                actioncomplete : function(f, act) {
+                                    _this.dialog.el.unmask();
+                                    //console.log('load completed'); 
+                                    // error messages?????
+                                    
+                                   
+                                    if (act.type == 'load') {
+                                        
+                                        _this.data = act.result.data;
+                                        var meth = _this.data.isOwner || !Pman.Login.isOwner() ? 'disable' : 'enable';
+                                     
+                                            
+                                        if (_this.form.findField('comptype')) {
+                                            _this.form.findField('comptype')[meth]();
+                                        }
+                                         
+                                       // _this.loaded();
+                                        return;
+                                    }
+                                    
+                                    
+                                    if (act.type == 'submit') { // only submitted here if we are 
+                                        _this.dialog.hide();
+                                       
+                                        if (_this.callback) {
+                                            _this.callback.call(this, act.result.data);
+                                        }
+                                        return; 
+                                    }
+                                    // unmask?? 
                                 }
                             },
                             fileUpload : true,