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

2013-05-17 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/events/events.php, operation/events/events_list.php,
	operation/events/events.php: re-added and re-set the custom fields
	by groups enterprise.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8148 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-05-17 11:08:28 +00:00
parent b8fa2708f9
commit f3d41d39a6
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2013-05-17 Miguel de Dios <miguel.dedios@artica.es>
* godmode/events/events.php, operation/events/events_list.php,
operation/events/events.php: re-added and re-set the custom fields
by groups enterprise.
2013-05-16 Miguel de Dios <miguel.dedios@artica.es> 2013-05-16 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/module_manager_editor_common.php: disabled * godmode/agentes/module_manager_editor_common.php: disabled

14
pandora_console/godmode/events/events.php
View File

@ -39,12 +39,20 @@ $buttons['filter'] = array('active' => false,
html_print_image("images/filter_mc.png", true, array ("title" => __('Create filter'))) . '</a>'); html_print_image("images/filter_mc.png", true, array ("title" => __('Create filter'))) . '</a>');
if (check_acl ($config["id_user"], 0, "PM")) { if (check_acl ($config["id_user"], 0, "PM")) {
$buttons['responses'] = array('active' => false, $buttons['responses'] = array('active' => false,
'text' => '<a href="index.php?sec=geventos&sec2=godmode/events/events&amp;section=responses&amp;pure='.$config['pure'].'">' . 'text' => '<a href="index.php?sec=geventos&sec2=godmode/events/events&amp;section=responses&amp;pure='.$config['pure'].'">' .
html_print_image("images/event_responses.png", true, array ("title" => __('Event responses'))) . '</a>'); html_print_image("images/event_responses.png", true, array ("title" => __('Event responses'))) . '</a>');
$buttons['fields'] = array('active' => false,
'text' => '<a href="index.php?sec=geventos&sec2=godmode/events/events&amp;section=fields&amp;pure='.$config['pure'].'">' . if (! defined ('METACONSOLE')) {
$buttons['fields'] = array('active' => false,
'text' => '<a href="index.php?sec=eventos&sec2=godmode/events/events&amp;section=fields&amp;pure='.$config['pure'].'">' .
html_print_image("images/custom_columns.png", true, array ("title" => __('Custom fields'))) . '</a>'); html_print_image("images/custom_columns.png", true, array ("title" => __('Custom fields'))) . '</a>');
}
else {
$buttons['fields'] = array('active' => false,
'text' => '<a href="index.php?sec=eventos&sec2=event/custom_events&amp;section=fields&amp;pure='.$config['pure'].'">' .
html_print_image("images/custom_columns.png", true, array ("title" => __('Custom fields'))) . '</a>');
}
} }
switch ($section) { switch ($section) {

2
pandora_console/operation/events/events.php
View File

@ -320,7 +320,7 @@ if ($config["pure"] == 0 || $meta) {
} }
// If the history event is not ebabled, dont show the history tab // If the history event is not ebabled, dont show the history tab
if(!isset($config['metaconsole_events_history']) || $config['metaconsole_events_history'] != 1) { if (!isset($config['metaconsole_events_history']) || $config['metaconsole_events_history'] != 1) {
unset($onheader['history']); unset($onheader['history']);
} }

2
pandora_console/operation/events/events_list.php
View File

@ -488,7 +488,7 @@ else {
$result = events_get_events_grouped($sql_post, $offset, $pagination, $meta, $history); $result = events_get_events_grouped($sql_post, $offset, $pagination, $meta, $history);
} }
if (!empty($result)) { if (!empty($result)) {
$graph = '<fieldset class="databox tactical_set" style="width:93%;"> $graph = '<fieldset class="databox tactical_set" style="width:93%;">
<legend>' . <legend>' .
__('Events generated -by module-') . __('Events generated -by module-') .