Merge branch 'master' of http://git.roojs.com:8081/Pman.Core

[Pman.Core] / Pman.js

diff --git a/Pman.js b/Pman.js
index 6875334..41bad06 100644 (file)
--- a/Pman.js
+++ b/Pman.js
@@ -19,8 +19,8 @@ if (typeof(_T) == 'undefined') { _T={};}
  
 
 
-Roo.XComponent.on('register', function(e) { if (typeof(Pman) != 'undefined') { return Pman.xregister(e); } });
-Roo.XComponent.on('beforebuild', function(e) { if (typeof(Pman) != 'undefined') { return Pman.xbeforebuild(e); } });
+Roo.XComponent.on('register', function(e) { if (typeof(Pman) != 'undefined') { return Pman.xregister(e); } return true;  });
+Roo.XComponent.on('beforebuild', function(e) { if (typeof(Pman) != 'undefined') { return Pman.xbeforebuild(e); } return true; });
 
 Roo.XComponent.on('buildComplete',  
      function() {
@@ -417,13 +417,14 @@ Pman = new Roo.Document(
     onLoadTrackCall : function(id,cb, cls) {
         Roo.get(document.body).mask("Loading Document details");
 
-        Pman.request({
+        new Pman.Request({
             url: baseURL + '/Roo/Documents.html',  
             params: {
                 _id: id
             },  
             method: 'GET',  
-            success : function(data) {
+            success : function(res) {
+                var data = res.data;
                 Roo.get(document.body).unmask();
              
                 
@@ -560,9 +561,9 @@ Pman = new Roo.Document(
                 }
                 // what about the toolbar??
                 tab.grid.getView().mainWrap.mask("Deleting");
-                Pman.request({
+                new Pman.Request({
                     url: baseURL + '/Roo/'+tbl+'.php',
-                    method: 'GET',
+                    method: 'POST',
                     params: {
                         _delete : r.join(',')
                     },
@@ -619,10 +620,13 @@ Pman = new Roo.Document(
     },
     /**
      * Depreciated - USE new Pman.Request
-    * 
+    *  We need to replace all the uses with this, however the api is slightly different,
+    *  the success argument is res.data, not res..
      * 
      */
     request : function(c) {
+        //return new Pman.Request(c);
+         
         var r= new Roo.data.Connection({
             timeout : typeof(c.timeout) == 'undefined' ?  30000 : c.timeout
         });
@@ -665,6 +669,7 @@ Pman = new Roo.Document(
             scope: this
             
         });
+         
     },
     
     
@@ -871,11 +876,17 @@ Pman = new Roo.Document(
      * used to apply permissions.
      */
     
-    beforebuild : function(obj)
+    xbeforebuild : function(obj)
     {
         if (typeof(obj.part) != 'undefined')  {
            
+            if (!obj.part[1].length) {
+                obj.part[1] = obj.part[0];
+            }
             var permname = obj.part.join('.');
+            
+            Roo.log("CHECKING: "+ permname);
+            
                 // we now have permission...
                 // obj.moduleOwner '.' lname
            
@@ -885,11 +896,7 @@ Pman = new Roo.Document(
                 obj.disabled = true;
                 return;
             }
-            if (appDisabled.indexOf(permname) > -1)  {
-                Roo.log(permname + " is Disabled for this site");
-                obj.disabled = true;
-                return;
-            }
+        
             
             
         }