tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-01-04 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* include/help/en/help_alert_macros.php
	 include/help/es/help_alert_macros.php: Added macro _email_tag_
	 to these help screens.
	* include/functions_reports.php: Added exception to templates when
	report types are displayed.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7352 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2013-01-04 09:58:13 +00:00
parent d99abb39bb
commit 032958b443
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2013-01-04 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/help/en/help_alert_macros.php
include/help/es/help_alert_macros.php: Added macro _email_tag_
to these help screens.
* include/functions_reports.php: Added exception to templates when
report types are displayed.
2013-01-03 Miguel de Dios <miguel.dedios@artica.es>
* extensions/resource_registration.php,

12
pandora_console/include/functions_reports.php
View File

@ -604,13 +604,11 @@ function reports_get_report_types ($template = false, $not_editor = false) {
}
}
$types['agent_configuration'] = array('optgroup' => __('Configuration'),
'name' => __('Agent configuration'));
$types['group_configuration'] = array('optgroup' => __('Configuration'),
'name' => __('Group configuration'));
if (!$template) {
if (!$template) {
$types['agent_configuration'] = array('optgroup' => __('Configuration'),
'name' => __('Agent configuration'));
$types['group_configuration'] = array('optgroup' => __('Configuration'),
'name' => __('Group configuration'));
$types['netflow_area'] = array('optgroup' => __('Netflow'),
'name' => __('Netflow area chart'));
$types['netflow_pie'] = array('optgroup' => __('Netflow'),

1
pandora_console/include/help/en/help_alert_macros.php
View File

@ -39,6 +39,7 @@ The following macros are available:
<li>_plugin_parameters_ : Plug-in Parameters of the module.</li>
<li>_groupcontact_ : Group contact information. Configured when the group is created.</li>
<li>_groupother_ : Other information about the group. Configured when the group is created.</li>
<li>_email_tag_ : Emails associated to the module tags.</li>
</ul>
<p>

1
pandora_console/include/help/es/help_alert_macros.php
View File

@ -40,6 +40,7 @@ Las siguientes macros están disponibles:
<li>_plugin_parameters_ : Parámetros del Plug-in del módulo.</li>
<li>_groupcontact_ : Información de contacto del grupo. Se configura al crear el grupo.</li>
<li>_groupother_ : Otra información sobre el grupo. Se configura al crear el grupo.</li>
<li>_email_tag_ : Emails asociados a los tags de módulos.</li>
</ul>
<p>