From 9710f1c433b77991f6fd0f7ad4ed375055bb57bc Mon Sep 17 00:00:00 2001
From: zarzuelo <noreply@pandorafms.org>
Date: Thu, 22 Apr 2010 17:25:28 +0000
Subject: [PATCH] 2010-04-22  Sergio Martin <sergio.martin@artica.es>

       * operation/users/user_edit.php
       godmode/users/configure_user.php: Changed the
        All group on combos from 1 to 0 and fix the
        group all on tables



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2591 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                        | 7 +++++++
 pandora_console/godmode/users/configure_user.php | 4 ++--
 pandora_console/operation/users/user_edit.php    | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 64db63fb9d..c4b609d516 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-22  Sergio Martin <sergio.martin@artica.es>
+
+       * operation/users/user_edit.php
+       godmode/users/configure_user.php: Changed the
+        All group on combos from 1 to 0 and fix the
+	group all on tables
+
 2010-04-22  Sergio Martin <sergio.martin@artica.es>
 
        * operation/incidents/incident.php: Changed the
diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index b68407acda..29b466629f 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -298,7 +298,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']).'</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[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);
@@ -314,7 +314,7 @@ $data[0] = '<form method="post">';
 $data[0] .= print_select (get_profiles (), 'assign_profile', 0, '', __('None'),
 	0, true, false, false);
 $data[1] = print_select (get_user_groups ($config['id_user'], 'UM'),
-	'assign_group', 0, '', __('None'), 0, true, false, false);
+	'assign_group', -1, '', __('None'), -1, true, false, false);
 $data[2] = print_input_image ('add', 'images/add.png', 1, '', true);
 $data[2] .= print_input_hidden ('id', $id, true);
 $data[2] .= print_input_hidden ('add_profile', 1, true);
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index 134084453c..c299c57bf8 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -162,7 +162,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"]).'</b>';
+	$data[1] = '<b>'.get_group_name ($profile["id_grupo"], true).'</b>';
 	array_push ($table->data, $data);
 }