DataObjects/Group_rights.php

diff --git a/DataObjects/Group_rights.php b/DataObjects/Group_rights.php
index 25c45c9..d17605f 100755 (executable)
--- a/DataObjects/Group_rights.php
+++ b/DataObjects/Group_rights.php
@@ -113,10 +113,15 @@ class Pman_Core_DataObjects_Group_rights extends DB_DataObject
         
         
         static $Pman_DataObjects_Group_Right = array();
-        if (!empty($Pman_DataObjects_Group_Right)) {
-            return $Pman_DataObjects_Group_Right;
+        if (!empty($Pman_DataObjects_Group_Right[$this->group_id])) {
+            return $Pman_DataObjects_Group_Right[$this->group_id];
         }
         
+        $g = DB_DataObject::factory('groups');
+        $g->get($this->group_id);
+        $has_admin = $g->type  == 2 ? false : true;
+        
+        
         $ff = HTML_FlexyFramework::get();
         //print_R($ff);
         $enabled =  array('Core') ;
@@ -126,6 +131,11 @@ class Pman_Core_DataObjects_Group_rights extends DB_DataObject
         $ret = array();
          //echo '<PRE>';print_r($enabled);
         foreach($enabled as $module) {
+            
+            if (($module == 'Admin') && !$has_admin) {
+                continue;
+            }
+            
             $fn = $pman. $module.  '/'.$module. '.perms.json';
             if (!file_exists($fn)) {
                 continue;