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

2011-08-30 Junichi Satoh <junichi@rworks.jp> 

* godmode/massive/massive_enable_disable_alerts.php,
	godmode/massive/massive_standby_alerts.php: Added group recursion
	feature, it allows to search agents in child groups.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4847 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
jsatoh 2011-08-30 06:55:49 +00:00
parent 18f1b06580
commit ef32b9db17
3 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2011-08-30 Junichi Satoh <junichi@rworks.jp>
* godmode/massive/massive_enable_disable_alerts.php,
godmode/massive/massive_standby_alerts.php: Added group recursion
feature, it allows to search agents in child groups.
2011-08-30 Junichi Satoh <junichi@rworks.jp>
* godmode/agentes/modificar_agente.php: Fixed group recursion does

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

@ -62,6 +62,7 @@ if (is_ajax ()) {
$id_group = (int) get_parameter ('id_group');
$id_agents = (array) get_parameter ('id_agents');
$action = (string) get_parameter ('action', '');
$recursion = get_parameter ('recursion');
$result = false;
@ -116,7 +117,9 @@ $table->style[0] = 'font-weight: bold; vertical-align:top';
$table->style[2] = 'font-weight: bold';
$table->size = array ();
$table->size[0] = '15%';
$table->size[1] = '85%';
$table->size[1] = '55%';
$table->size[2] = '15%';
$table->size[3] = '15%';
$table->data = array ();
@ -125,6 +128,8 @@ $table->data[0][0] .= html_print_input_hidden('id_alert_template_enabled', $id_a
$table->data[0][0] .= __('Group');
$table->data[0][1] = html_print_select_groups(false, "AR", true, 'id_group', $id_group, '', '', '', true);
$table->data[0][2] = __('Group recursion');
$table->data[0][3] = html_print_checkbox ("recursion", 1, $recursion, true, false);
$table->data[1][0] = __('Agents');
$table->data[1][0] .= '<span id="agent_loading" class="invisible">';
@ -177,8 +182,15 @@ ui_require_jquery_file ('pandora.controls');
$(document).ready (function () {
clear_alert_fields();
var recursion;
$("#checkbox-recursion").click(function (){
recursion = this.checked ? 1 : 0;
$("#id_group").trigger("change");
});
$("#id_group").pandoraSelectGroupAgent ({
agentSelect: "select#id_agents",
recursion: function() {return recursion},
callbackPost: function () {
clear_alert_fields();
}

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

@ -63,6 +63,7 @@ if (is_ajax ()) {
$id_group = (int) get_parameter ('id_group');
$id_agents = (array) get_parameter ('id_agents');
$action = (string) get_parameter ('action', '');
$recursion = get_parameter ('recursion');
$result = false;
@ -117,7 +118,9 @@ $table->style[0] = 'font-weight: bold; vertical-align:top';
$table->style[2] = 'font-weight: bold';
$table->size = array ();
$table->size[0] = '15%';
$table->size[1] = '85%';
$table->size[1] = '55%';
$table->size[2] = '15%';
$table->size[3] = '15%';
$table->data = array ();
@ -127,6 +130,8 @@ $table->data[0][0] .= html_print_input_hidden('id_alert_template_not_standby', $
$table->data[0][0] .= __('Group');
$table->data[0][1] = html_print_select_groups(false, "AR", true, 'id_group', $id_group,
'', '', '', true, false, true, '');
$table->data[0][2] = __('Group recursion');
$table->data[0][3] = html_print_checkbox ("recursion", 1, $recursion, true, false);
$table->data[1][0] = __('Agents');
$table->data[1][0] .= '<span id="agent_loading" class="invisible">';
@ -179,8 +184,15 @@ ui_require_jquery_file ('pandora.controls');
$(document).ready (function () {
clear_alert_fields();
var recursion;
$("#checkbox-recursion").click(function (){
recursion = this.checked ? 1 : 0;
$("#id_group").trigger("change");
});
$("#id_group").pandoraSelectGroupAgent ({
agentSelect: "select#id_agents",
recursion: function() {return recursion},
callbackPost: function () {
clear_alert_fields();
}