X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.js;h=618ddda7ff237fa3d3148cf63355dec3767847bf;hp=de60c6228683b3cd67a5141bb35d7d185e11f5bb;hb=a1a3ecba68d2fedabc8203e88b40759401d7472d;hpb=b186604f1aff46320b1249e97ac8c95f362048fb

diff --git a/Pman.js b/Pman.js
index de60c622..618ddda7 100644
--- a/Pman.js
+++ b/Pman.js
@@ -1,20 +1,18 @@
-//<script type="text/javascript">
-
+ 
 /**
  * 
  *  
- *  CHANGES
- *  - gtranslate moved to Pman.GoogleTranslate
- * 
- * 
+ *  This is the main Pman class
+ *  - it's a bit too heavy at present - needs to go on a diet....
  */
  
+// translation..
 if (typeof(_T) == 'undefined') { _T={};}
- 
+
 
 
 Roo.XComponent.on('register', function(e) {
-        if (typeof(Pman) != 'undefined') { return Pman.xregister(e); } return true;
+    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;
@@ -34,7 +32,8 @@ Roo.XComponent.on('buildcomplete',
         }
     
     
-} );
+    }
+);
 
 //Roo.debug = 1;
   
@@ -236,6 +235,11 @@ Pman = new Roo.Document(
         
        
         //console.log( "t7:" + ((new Date())-stime));
+        if (!Pman.layout.getRegion('center').tabs) {
+                Roo.log("Error could not find tabs? - not adding toolbar?");
+                return;
+        }
+        
         var se = Pman.layout.getRegion('center').tabs.stripEl;
         var tbh = se.createChild( 
                 { tag: 'td', style: 'width:100%;'  });
@@ -354,7 +358,7 @@ Pman = new Roo.Document(
                 Pman.Dialog.PersonStaff.show( 
                     { 
                         id : 0, 
-                        company_id : Pman.Login.authUser.company_id_id * 1, 
+                        company_id : Pman.Login.authUser.company_id * 1, 
                         company_id_name : Pman.Login.authUser.company_id_name
                     }, function(data) {
                         forceAdmin(data);
@@ -362,6 +366,7 @@ Pman = new Roo.Document(
                 );
                 return;
             }
+            
             Roo.state.Manager.set('Pman.Login.username', data.email),
             window.onbeforeunload = false;
             document.location = baseURL + '?ts=' + Math.random();
@@ -389,7 +394,7 @@ Pman = new Roo.Document(
         
         if (Pman.Login.authUser.id < 0) {
             // admin company has been created - create the user..
-            if (Pman.Login.authUser.company_id_id* 1 > 0) {
+            if (Pman.Login.authUser.company_id* 1 > 0) {
                 forceAdmin();
                 return;
             }
@@ -546,7 +551,7 @@ Pman = new Roo.Document(
     genericDelete : function(tab,tbl) {
         
         var r = [];
-        
+ 
             
         var s = tab.grid.getSelectionModel().getSelections();
         if (!s.length)  {
@@ -555,7 +560,7 @@ Pman = new Roo.Document(
         }
         var reader = tab.grid.reader || tab.grid.ds.reader;
         for(var i = 0; i < s.length; i++) {
-            r.push(reader.getId(s[i]));
+            r.push(reader.getId(s[i].json));
         }
     
         Roo.MessageBox.confirm("Confirm", "Are you sure you want to delete that?",
@@ -588,6 +593,7 @@ Pman = new Roo.Document(
                         
                     },
                     failure: function(act) {
+                        
                         Roo.log(act);
                         var msg = '';
                         try {
@@ -780,12 +786,6 @@ Pman = new Roo.Document(
         // global supplied by master.html
         appDisabled = typeof(appDisabled) == 'undefined' ? [] : appDisabled;
         
-        if(obj.parent && obj.parent == 'Pman.Tab.Admin'){
-            Roo.log('disable!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!');
-
-            Roo.log(obj);
-        }
-        
         
         /// design flaw
         // previously we did not a good naming policy for module and parts
@@ -799,7 +799,6 @@ Pman = new Roo.Document(
            
            
             if (appDisabled.indexOf(permname) > -1)  {
-                Roo.log(obj);
                 Roo.log(permname + " is Disabled for this site");
                 obj.disabled = true;
                 return;
@@ -817,7 +816,7 @@ Pman = new Roo.Document(
         
         
         if (obj.parent === Pman || obj.parent  == 'Pman') {
-            Roo.log("PARENT OF : " + obj.name + " replacing with fake");
+            // Roo.log("PARENT OF : " + obj.name + " replacing with fake");
             obj.parent = Pman.fakeRoot;
         }
         
@@ -864,15 +863,20 @@ Pman = new Roo.Document(
             
                 // 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;
+            }
             
         }
         
@@ -917,13 +921,13 @@ Pman = new Roo.Document(
                 return;
             }
             if (this.module.disabled) {
-                Roo.log("Module disabled, should not rendering")
+                Roo.log("Module disabled, should not rendering");
                 Roo.log(this);
                 return;
             }
-            
+             
             if (!this.parent.layout) {
-                Roo.log("Module parent does not have property layout.")
+                Roo.log("Module parent does not have property layout.");
                 Roo.log(this);
                 return;
             }
@@ -953,7 +957,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));