DataObjects/core.sql

[Pman.Core] / Pman.js

diff --git a/Pman.js b/Pman.js
index 8d641e7..d4ac960 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() {
@@ -812,7 +812,21 @@ Pman = new Roo.Document(
         // previously we did not a good naming policy for module and parts
         // most things that are called module here, really are 'parts'
         // new versions should have 'part' as [ module : part ]
-        
+         if (typeof(obj.part) != 'undefined')  {
+           
+            var permname = obj.part.join('.');
+                // we now have permission...
+                // obj.moduleOwner '.' lname
+           
+           
+            if (appDisabled.indexOf(permname) > -1)  {
+                Roo.log(permname + " is Disabled for this site");
+                obj.disabled = true;
+                return;
+            }
+            
+            
+        }
         
        
         
@@ -857,28 +871,27 @@ 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
-            Roo.log("CHECKING PERM: " + permname);
-            Roo.log("Exists: " + (Pman.hasPermExists(permname) ? 1 : 0));
-            Roo.log("has: " + (Pman.hasPerm(permname,'S') ? 1 : 0));
-            Roo.log(Pman.Login.authUser);
+           
             if (Pman.hasPermExists(permname) && !Pman.hasPerm(permname,'S')) {
                 // it's a turned off permission...
                 Roo.log(permname + " is Disabled for this user");
                 obj.disabled = true;
                 return;
             }
-            if (appDisabled.indexOf(permname) > -1)  {
-                Roo.log(permname + " is Disabled for this site");
-                obj.disabled = true;
-                return;
-            }
+        
             
             
         }