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

2010-07-19 Raul Mateos <raulofpandora@gmail.com> 

* operation/users/user_edit.php, godmode/users/configure_user.php: Use
	icon and name in groups. Solved link problem due to user list last commit.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3032 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
raulmateos 2010-07-19 16:20:11 +00:00
parent af1aa88949
commit b65e4c937b
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2010-07-19 Raúl Mateos <raulofpandora@gmail.com>
* operation/users/user_edit.php, godmode/users/configure_user.php: Use
icon and name in groups. Solved link problem due to user list last commit.
2010-07-19 Dario Rodriguez <dario.rodriguez@artica.es>
* godmode/groups/group_list.php: fixed bug that allow create and update
@ -12,7 +17,7 @@
* operation/agentes/estado_agente.php: added icons for order by columns and
source code for management this ordenation by Name, Os, Interval, Group and
Last Contact.
2010-07-19 Raúl Mateos <raulofpandora@gmail.com>
* operation/agentes/status_monitor.php, godmode/groups/group_list.php:

6
pandora_console/godmode/users/configure_user.php
View File

@ -293,8 +293,8 @@ $table->style = array ();
$table->style[0] = 'font-weight: bold';
$table->style[1] = 'font-weight: bold';
$table->head[0] = __('Profile name');
$table->head[1] = __('Group name');
$table->head[2] = '';
$table->head[1] = __('Group');
$table->head[2] = __('Action');
$table->align[2] = 'center';
$result = get_db_all_rows_field_filter ("tusuario_perfil", "id_usuario", $id);
@ -306,7 +306,7 @@ foreach ($result as $profile) {
$data = array ();
$data[0] = '<a href="index.php?sec=gperfiles&sec2=godmode/profiles/profile_list&id='.$profile['id_perfil'].'">'.get_profile_name ($profile['id_perfil']).'</a>';
$data[1] = '<a href="index.php?sec=gagente&sec2=godmode/groups/group_list&id_group='.$profile['id_grupo'].'">'.get_group_name ($profile['id_grupo'], True).'</a>';
$data[1] = print_group_icon($profile["id_grupo"],true).' <a href="index.php?sec=estado&sec2=operation/agentes/estado_agente&refr=60&group_id='.$profile['id_grupo'].'">'.get_group_name ($profile['id_grupo'], True).'</a>';
$data[2] = '<form method="post" onsubmit="if (!confirm (\''.__('Are you sure?').'\')) return false">';
$data[2] .= print_input_hidden ('delete_profile', 1, true);
$data[2] .= print_input_hidden ('id_user_profile', $profile['id_up'], true);

4
pandora_console/operation/users/user_edit.php
View File

@ -156,7 +156,7 @@ $table->style = array ();
$table->style[0] = 'font-weight: bold';
$table->style[1] = 'font-weight: bold';
$table->head[0] = __('Profile name');
$table->head[1] = __('Group name');
$table->head[1] = __('Group');
$table->data = array ();
@ -167,7 +167,7 @@ if ($result === false) {
foreach ($result as $profile) {
$data[0] = '<b>'.get_profile_name ($profile["id_perfil"]).'</b>';
$data[1] = '<b>'.get_group_name ($profile["id_grupo"], true).'</b>';
$data[1] = print_group_icon ($profile["id_grupo"], true).' <a href="index.php?sec=estado&sec2=operation/agentes/estado_agente&refr=60&group_id='.$profile['id_grupo'].'">'.get_group_name ($profile["id_grupo"], true).'</a>';
array_push ($table->data, $data);
}