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

2012-12-20 Sergio Martin <sergio.martin@artica.es> 

* include/functions_groups.php: Added missed translation of 
	All group name

	* operation/events/events_list.php: Added compatibility on groups
	filter in events for metaconsole.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7316 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2012-12-20 12:24:21 +00:00
parent 0dd6c74286
commit 021935d472
3 changed files with 18 additions and 3 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 @@
2012-12-20 Sergio Martin <sergio.martin@artica.es>
* include/functions_groups.php: Added missed translation of
All group name
* operation/events/events_list.php: Added compatibility on groups
filter in events for metaconsole.
2012-12-19 Ramon Novoa <rnovoa@artica.es>
* godmode/agentes/module_manager_editor_common.php,

2
pandora_console/include/functions_groups.php
View File

@ -555,7 +555,7 @@ function groups_get_name ($id_group, $returnAllGroup = false) {
if ($id_group > 0)
return (string) db_get_value ('nombre', 'tgrupo', 'id_grupo', (int) $id_group);
elseif($returnAllGroup)
return "All";
return __("All");
}
/**

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

@ -151,8 +151,15 @@ $groups = users_get_groups($config['id_user'], 'IR');
//Group selection
if ($ev_group > 0 && in_array ($ev_group, array_keys ($groups))) {
//If a group is selected and it's in the groups allowed
$sql_post = " AND id_grupo = $ev_group";
if($meta) {
// In metaconsole the group search is performed by name
$group_name = groups_get_name ($ev_group);
$sql_post = " AND group_name = '$group_name'";
}
else {
//If a group is selected and it's in the groups allowed
$sql_post = " AND id_grupo = $ev_group";
}
}
else {
if (is_user_admin ($config["id_user"])) {