From b7cfe0126af28127cf913f997eaab325035b280e Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Thu, 25 Jul 2013 11:50:55 +0000 Subject: [PATCH] 2013-07-25 Sergio Martin * include/constants.php: Move policy constants from functions_policy to constants file * godmode/massive/massive_edit_modules.php: Change the values of link/unlink in massive modules to pending to link/unlink. Its the correct way of do it git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8576 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 9 +++++++++ .../godmode/massive/massive_edit_modules.php | 4 ++-- pandora_console/include/constants.php | 16 ++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 76c6653886..512301d685 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2013-07-25 Sergio Martin + + * include/constants.php: Move policy constants from + functions_policy to constants file + + * godmode/massive/massive_edit_modules.php: Change the + values of link/unlink in massive modules to pending to + link/unlink. Its the correct way of do it + 2013-07-25 Sergio Martin * godmode/massive/massive_operations.php diff --git a/pandora_console/godmode/massive/massive_edit_modules.php b/pandora_console/godmode/massive/massive_edit_modules.php index 39f997e771..0fbfd0e8af 100644 --- a/pandora_console/godmode/massive/massive_edit_modules.php +++ b/pandora_console/godmode/massive/massive_edit_modules.php @@ -423,8 +423,8 @@ $table->data['edit8'][3] = html_print_select (categories_get_all_categories('for if(enterprise_installed()) { $table->rowspan['edit8'][0] = $table->rowspan['edit8'][1] = 2; - $table->data['edit81'][2] = __('Policy link status') . ui_print_help_tip(__("This field only has sense in modules adopted by a policy."), true); - $table->data['edit81'][3] = html_print_select (array('1' => __('Linked'), '0' => __('Unlinked')), 'policy_linked', '','', __('No change'), '', true, false, false); + $table->data['edit81'][2] = __('Policy linking status') . ui_print_help_tip(__("This field only has sense in modules adopted by a policy.") . '

' . __("This action only set the module as pending to link/unlink. Is necessary to apply the policy that affects these modules to perform the change."), true); + $table->data['edit81'][3] = html_print_select (array(MODULE_PENDING_LINK => __('Linked'), MODULE_PENDING_UNLINK => __('Unlinked')), 'policy_linked', '','', __('No change'), '', true, false, false); } $table->data['edit10'][0] = ''.__('Critical instructions'). ''. ui_print_help_tip(__("Instructions when the status is critical"), true); diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php index c1032c9641..19557887d6 100644 --- a/pandora_console/include/constants.php +++ b/pandora_console/include/constants.php @@ -294,4 +294,20 @@ define ('REPORT_EXCEPTION_CONDITION_E', 7); define ('REPORT_EXCEPTION_CONDITION_NE', 8); define ('REPORT_EXCEPTION_CONDITION_OK', 3); define ('REPORT_EXCEPTION_CONDITION_NOT_OK', 4); + +/* POLICIES */ + +define("POLICY_UPDATED", 0); +define("POLICY_PENDING_DATABASE", 1); +define("POLICY_PENDING_ALL", 2); + +define("STATUS_IN_QUEUE_OUT", 0); +define("STATUS_IN_QUEUE_IN", 1); +define("STATUS_IN_QUEUE_APPLYING", 2); + +define("MODULE_UNLINKED", 0); +define("MODULE_LINKED", 1); +define("MODULE_PENDING_UNLINK", 10); +define("MODULE_PENDING_LINK", 11); + ?>