Commit 2a7c9c29 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Fixes #5394 skipTemplates is now public and information is stored in objectTypes

parent 269be23c
......@@ -840,8 +840,9 @@ class config
die("duplicated object type ".strtoupper($key)." in ".$this->data['OBJECTS'][strtoupper($key)]['mainTab']." and $class");
}
$tabclass = strtoupper($key)."TABS";
$value['tabGroup'] = $tabclass;
$value['mainTab'] = $class;
$value['tabGroup'] = $tabclass;
$value['mainTab'] = $class;
$value['templateActive'] = FALSE;
foreach (array('ou', 'tabClass') as $i) {
if (!isset($value[$i])) {
$value[$i] = NULL;
......@@ -981,6 +982,9 @@ class config
if (isset($this->data['OBJECTS'][$obj])) {
$this->data['OBJECTS'][$obj]['management'] = $class;
if (isset($class::$skipTemplates) && ($class::$skipTemplates == FALSE)) {
$this->data['OBJECTS'][$obj]['templateActive'] = TRUE;
}
}
}
}
......
......@@ -184,7 +184,7 @@ class simpleManagement
protected $headpageClass = "listing";
protected static $skipTemplates = TRUE;
public static $skipTemplates = TRUE;
function __construct()
{
......
......@@ -34,7 +34,7 @@ class userManagement extends simpleManagement
protected $autoFilter = FALSE;
protected $autoActions = FALSE;
protected static $skipTemplates = FALSE;
public static $skipTemplates = FALSE;
static function plInfo()
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment