Private GIT

Skip to content
Snippets Groups Projects
Commit aeb173af authored by Benoît Sauveton's avatar Benoît Sauveton
Browse files

Merge branch 'master' of http://git.centreon.com/centreon

parents 837bc06f b66f436b
Branches
Tags 2.99.5
No related merge requests found
Showing
with 20 additions and 14 deletions
......@@ -184,7 +184,8 @@ abstract class ListController extends Controller
/* Display variable */
$this->tpl->assign('objectName', $this->objectDisplayName);
$this->tpl->assign('objectDisplayName', $this->objectDisplayName);
$this->tpl->assign('objectName', static::$objectName);
$this->tpl->assign('datatableObject', $this->datatableObject);
$this->tpl->assign('moduleName', static::$moduleName);
$this->tpl->assign('objectAddUrl', $this->objectBaseUrl . '/add');
......
......@@ -89,7 +89,7 @@
<div class="buttonGroup btDatatable">
{if (isset($objectAddUrl) && !empty($objectAddUrl))}
<div class="configuration-actions">
<button class="btnC btnSuccess" id="modalAdd">{t}Add {$objectName}{/t}</button>
<button class="btnC btnSuccess" id="modalAdd">{t}Add {$objectDisplayName}{/t}</button>
</div>
{/if}
......
......@@ -48,7 +48,7 @@ use Centreon\Internal\Utils\String\CamelCaseTransformation;
*/
class AuthController extends FormController{
protected $objectDisplayName = 'Auth';
protected $objectDisplayName = 'Authentication';
public static $objectName = 'auth';
public static $enableDisableFieldName = 'ar_enable';
protected $datatableObject = '\CentreonAdministration\Internal\AuthDatatable';
......
......@@ -327,7 +327,8 @@ class TagController extends Controller
/* Display variable */
$this->tpl->assign('objectName', $this->objectDisplayName);
$this->tpl->assign('objectName', static::$objectName);
$this->tpl->assign('objectDisplayName', $this->objectDisplayName);
$this->tpl->assign('datatableObject', $this->datatableObject);
$this->tpl->assign('moduleName', static::$moduleName);
$this->tpl->assign('objectAddUrl', '');
......
......@@ -108,6 +108,7 @@ class BusinessActivityRealtimeController extends Controller
$this->tpl->assign('moduleName', 'CentreonBam');
$this->tpl->assign('datatableObject', $this->datatableObject);
$this->tpl->assign('objectName', 'BusinessActivity');
$this->tpl->assign('objectDisplayName', 'Business Activity');
//$this->tpl->assign('consoleType', 0); // host console
$this->tpl->assign('objectListUrl', '/centreon-bam/businessactivity/realtime/list');
/*
......
......@@ -40,7 +40,7 @@ use Centreon\Controllers\FormController;
class ContactTemplateController extends FormController
{
protected $objectDisplayName = 'Contacttemplate';
protected $objectDisplayName = 'Contact Template';
public static $objectName = 'contacttemplate';
public static $enableDisableFieldName = 'contact_activate';
protected $objectBaseUrl = '/centreon-configuration/contacttemplate';
......
......@@ -49,7 +49,7 @@ class HostTemplateController extends FormController
*
* @var string
*/
protected $objectDisplayName = 'Hosttemplate';
protected $objectDisplayName = 'Host Template';
/**
*
......
{extends file="file:[Core]baseLayout.tpl"}
{block name="title"}{$objectName}{/block}
{block name="title"}{$objectDisplayName}{/block}
{block name="content"}
......@@ -11,7 +11,7 @@
<div class="first-content"></div>
{if isset($objectAddUrl)}
{datatable module=$moduleName object=$objectName datatableObject=$datatableObject displayActionBar=$displayActionBar objectAddUrl=$objectAddUrl}
{datatable module=$moduleName object=$objectName objectDisplayName=$objectDisplayName datatableObject=$datatableObject displayActionBar=$displayActionBar objectAddUrl=$objectAddUrl}
{else}
{datatable module=$moduleName object=$objectName datatableObject=$datatableObject displayActionBar=$displayActionBar}
{/if}
......
......@@ -109,6 +109,7 @@ class DowntimesController extends Controller
$this->tpl->assign('moduleName', 'CentreonRealtime');
$this->tpl->assign('datatableObject', $this->datatableObject);
$this->tpl->assign('objectName', 'Downtimes');
$this->tpl->assign('objectDisplayName', 'Downtimes');
$this->tpl->assign('consoleType', 0); // host console
$this->tpl->assign('objectListUrl', '/centreon-realtime/downtimes/list');
......
......@@ -119,6 +119,7 @@ class HostController extends Controller
$this->tpl->assign('moduleName', 'CentreonRealtime');
$this->tpl->assign('datatableObject', $this->datatableObject);
$this->tpl->assign('objectName', 'Host');
$this->tpl->assign('objectDisplayName', 'Host');
$this->tpl->assign('objectListUrl', '/centreon-realtime/host/list');
$actions = array();
......
......@@ -114,6 +114,7 @@ class ServiceController extends Controller
/* Datatable */
$tpl->assign('moduleName', 'CentreonRealtime');
$tpl->assign('datatableObject', $this->datatableObject);
$tpl->assign('objectDisplayName', 'Service');
$tpl->assign('objectName', 'Service');
$tpl->assign('objectListUrl', '/centreon-realtime/service/list');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment