Merge branch '2040-Tags-en-operaciones-masivas' into 'develop'

fixed bug on bulk delete and bulk update module operation

See merge request artica/pandorafms!1613

pandora_console/godmode/massive/massive_edit_modules.php

@@ -47,17 +47,21 @@ $update = (bool) get_parameter_post ('update');
 if ($update) {
 	$agents_ = '';
 	if ($selection_mode == 'modules') {
+
+		$agents_ = array();
+
 		$force = get_parameter('force_type', false);
 		
 		if ($agents_select == false) {
 			$agents_select = array();
-			$agents_ = array();
 		}
 		
 		foreach ($agents_select as $agent_name) {
 			$agents_[] = agents_get_agent_id($agent_name);
 		}
+
 		$modules_ = $module_name;
+
 	}
 	else if ($selection_mode == 'agents') {
 		$force = get_parameter('force_group', false);
@@ -75,6 +79,7 @@ if ($update) {
 	// If the option to select all of one group or module type is checked
 	if ($force) {
 		if ($force == 'type') {
+
 			$type_condition = '';
 			if ($module_type != 0)
 				$type_condition = "AND tam.id_tipo_modulo = $module_type";
@@ -141,12 +146,11 @@ if ($update) {
 	else {
 		// Standard procedure
 		foreach ($agents_ as $agent_) {
-			
+
 			if ($modules_ == false)
 				$modules_ = array();
 			
 			foreach ($modules_ as $module_) {
-				
 				$result = process_manage_edit ($module_, $agent_, $modules_selection_mode);
 				$count++;
 				$success += (int)$result;
@@ -331,6 +335,7 @@ $table->data['form_modules_2'][2] .= html_print_select (
 		'all' => __('Show all agents')),
 	'agents_selection_mode',
 	'common', false, '', '', true);
+
 $table->data['form_modules_2'][3] = html_print_select (array(), 'agents[]',
 	$agents_select, false, __('None'), 0, true, true, false);
 
@@ -1540,12 +1545,14 @@ function process_manage_edit ($module_name, $agents_select = null, $module_statu
 	$update_tags = get_parameter('id_tag', false);
 
 	if (array_search(0, $agents_select) !== false) {
+
 		//Apply at All agents.
 		$modules = db_get_all_rows_filter ('tagente_modulo',
 			$filter_modules,
 			array ('id_agente_modulo'));
 	}
 	else {
+
 		if ($module_name == "0") {
 			//Any module
 			$modules = db_get_all_rows_filter ('tagente_modulo',
@@ -1559,7 +1566,8 @@ function process_manage_edit ($module_name, $agents_select = null, $module_statu
 				array ('id_agente_modulo'));
 		}
 	}
-	
+
+
 	if ($modules === false)
 		return false;
 
@@ -1575,16 +1583,16 @@ function process_manage_edit ($module_name, $agents_select = null, $module_statu
 		}
 		$modules = $modules_to_delete;
 	}
-	
+
 	foreach ($modules as $module) {
 		
 		$result = modules_update_agent_module(
 			$module['id_agente_modulo'], $values, true, $update_tags);
 
-		if (is_error($result)) {
+
-			
+		if (is_error($result))
 			return false;
-		}
+
 	}
 	
 	return true;

pandora_console/include/functions_modules.php

@@ -441,7 +441,7 @@ function modules_update_agent_module ($id, $values,
 	}
 	
 	$result = @db_process_sql_update ('tagente_modulo', $values, $where);
-	
+
 	if ($result == false) {
 		if ($result_disable === ERR_GENERIC ){
 			return ERR_DB;

pandora_console/include/javascript/pandora.js

@@ -529,7 +529,7 @@ function module_changed_by_multiple_modules (event, id_module, selected) {
 			jQuery.each (data, function (i, val) {
 				s = js_html_entity_decode(val);
 				$('#agents')
-					.append ($('<option></option>').html (s).attr ("value", val));
+					.append ($('<option></option>').html (s).attr ("value", i));
 				$('#agents').fadeIn ('normal');
 			});
 			

pandora_console/operation/agentes/ver_agente.php

@@ -207,7 +207,7 @@ if (is_ajax ()) {
 		$groups = users_get_groups ($config["id_user"], "AW", false);
 		$group_id_list = ($groups ? join(",",array_keys($groups)):"0");
 		
-		$sql = 'SELECT DISTINCT(t1.alias) as name
+		$sql = 'SELECT DISTINCT(t1.nombre) as name, t1.alias
 			FROM tagente t1, tagente_modulo t2
 			WHERE t1.id_agente = t2.id_agente
 				AND t1.id_grupo IN (' . $group_id_list .')
@@ -254,10 +254,9 @@ if (is_ajax ()) {
 		if ($nameAgents == false)
 			$nameAgents = array();
 		
-		foreach ($nameAgents as $nameAgent) {
+		foreach ($nameAgents as $nameAgent)
-			$names[] = io_safe_output($nameAgent['name']);
+			$names[$nameAgent['name']] = io_safe_output($nameAgent['alias']);
-		}
+
-		
 		echo json_encode($names);
 		return;
 	}