DataObjects/Core_company.php

[Pman.Core] / Pman.js

diff --git a/Pman.js b/Pman.js
index 402fbb4..f09eeb7 100644 (file)
--- a/Pman.js
+++ b/Pman.js
@@ -850,7 +850,6 @@ Pman = new Roo.Document(
     
     xbeforebuild : function(obj)
     {
-        Roo.log(obj);
         if (typeof(obj.part) != 'undefined')  {
            
             if (!obj.part[1].length) {
@@ -860,18 +859,22 @@ Pman = new Roo.Document(
             
             Roo.log("CHECKING: "+ permname);
             
-            Roo.log(obj);
                 // we now have permission...
                 // obj.moduleOwner '.' lname
-           
+            
             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 (obj.permname && obj.permname.length && Pman.hasPermExists(obj.permname) && !Pman.hasPerm(obj.permname,'S')) {
+                // it's a turned off permission...
+                Roo.log(obj.permname + " is Disabled for this user");
+                obj.disabled = true;
+                return;
+            }
             
         }
         
@@ -952,7 +955,7 @@ Pman = new Roo.Document(
          
         
         // Roo.log("CALLING XComponent register with : " + obj.name);
-        
+        Roo.log(obj);
         // this will call xregister as it's the on.register handler..
         Roo.XComponent.register(obj.isTop ? obj : Roo.apply(obj.module, obj));