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

2014-04-21 Hirofumi Kosaka <kosaka@rworks.jp> 

* godmode/massive/massive_enable_disable_alerts.php,
	godmode/massive/massive_standby_alerts.php: Long agent/module
	name with multi-byte chars could be shown as 'null' on alert
	list at the massive alert enable/disable/standby operations
	screen (because LEFT() in SQL does not consider multi-byte
	chars, neither SUBSTR() for alternative).


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9791 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
hkosaka 2014-04-21 08:19:46 +00:00
parent 1ef5f35678
commit 7b5ef6a242
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,12 @@
2014-04-21 Hirofumi Kosaka <kosaka@rworks.jp>
* godmode/massive/massive_enable_disable_alerts.php,
godmode/massive/massive_standby_alerts.php: Long agent/module
name with multi-byte chars could be shown as 'null' on alert
list at the massive alert enable/disable/standby operations
screen (because LEFT() in SQL does not consider multi-byte
chars, neither SUBSTR() for alternative).
2014-04-19 Junichi Satoh <junichi@rworks.jp>
* godmode/agentes/agent_manager.php,

2
pandora_console/godmode/massive/massive_enable_disable_alerts.php
View File

@ -50,7 +50,7 @@ if (is_ajax ()) {
$agents_alerts = alerts_get_agents_with_alert_template ($id_alert_templates, false,
array('order' => 'tagente.nombre, talert_template_modules.disabled', 'talert_template_modules.disabled' => $disabled),
array ('LEFT(CONCAT(LEFT(tagente.nombre,40), " - ", tagente_modulo.nombre), 85) as agent_agentmodule_name',
array ('CONCAT(tagente.nombre, " - ", tagente_modulo.nombre) as agent_agentmodule_name',
'talert_template_modules.id as template_module_id'), $id_agents);
echo json_encode (index_array ($agents_alerts, 'template_module_id', 'agent_agentmodule_name'));

2
pandora_console/godmode/massive/massive_standby_alerts.php
View File

@ -50,7 +50,7 @@ if (is_ajax ()) {
$agents_alerts = alerts_get_agents_with_alert_template ($id_alert_templates, false,
array('order' => 'tagente.nombre, talert_template_modules.standby', 'talert_template_modules.standby' => $standby),
array ('LEFT(CONCAT(LEFT(tagente.nombre,40), " - ", tagente_modulo.nombre), 85) as agent_agentmodule_name',
array ('CONCAT(tagente.nombre, " - ", tagente_modulo.nombre) as agent_agentmodule_name',
'talert_template_modules.id as template_module_id'), $id_agents);
echo json_encode (index_array ($agents_alerts, 'template_module_id', 'agent_agentmodule_name'));