From e5c19825482ec9ecebb9d8792bc7136ee4e9ee5a Mon Sep 17 00:00:00 2001
From: m-lopez-f <miguel.lopez@artica.es>
Date: Wed, 18 Mar 2015 11:46:27 +0100
Subject: [PATCH] Solvented visualization of group in few views, tiquet: #1946

(cherry picked from commit 912462c71ad24f9f930832f60b81ad538204dbf5)
---
 pandora_console/include/functions_ui.php            |  2 +-
 .../operation/agentes/estado_generalagente.php      |  5 ++++-
 pandora_console/operation/users/user_edit.php       | 13 +++++++++----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index d471844845..c864c7fbcb 100644
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -513,7 +513,7 @@ function ui_print_group_icon ($id_group, $return = false, $path = "groups_small"
 	}
 	else {
 		if (empty ($icon))
-			$output .= '<span title="'. groups_get_name($id_group, true).'">&nbsp;-&nbsp</span>';
+			$output .= '<span title="'. groups_get_name($id_group, true).'">&nbsp;&nbsp;</span>';
 		else {
 			$output .= html_print_image("images/" . $path . "/" . $icon . ".png",
 				true, array("style" => $style, "class" => "bot", "alt" => groups_get_name($id_group, true), "title" => groups_get_name ($id_group, true)));
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 1ccef59cb4..b96fc13080 100644
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -81,7 +81,10 @@ else {
 	$agent_name = $agent_name;
 }
 
-$data[0] = ui_print_group_icon ($agent["id_grupo"], true);
+if (!$config["show_group_name"])
+	$data[0] = ui_print_group_icon ($agent["id_grupo"], true);
+else
+	$data[0] = "";
 $table_agent->cellstyle[count($table_agent->data)][0] =
 	'width: 16px; text-align:center; padding: 0px;';
 
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index ca2858d378..03a03fa582 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -392,10 +392,15 @@ if ($result === false) {
 
 foreach ($result as $profile) {
 	$data[0] = '<b>'.profile_get_name ($profile["id_perfil"]).'</b>';
-	$data[1] = ui_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'] . '">' .
-		'&nbsp;' . ui_print_truncate_text(groups_get_name ($profile['id_grupo'], True), GENERIC_SIZE_TEXT) .
-		'</a>';
+	if ($config["show_group_name"])
+		$data[1] = ui_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'] . '">' .
+			'&nbsp;' . '</a>';
+	else
+		$data[1] = ui_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'] . '">' .
+			'&nbsp;' . ui_print_truncate_text(groups_get_name ($profile['id_grupo'], True), GENERIC_SIZE_TEXT) .
+			'</a>';
 	
 	$tags_ids = explode(',',$profile["tags"]);
 	$tags = tags_get_tags($tags_ids);