Skip to content
Snippets Groups Projects
Commit b84a2023 authored by baldwinlouie's avatar baldwinlouie
Browse files

Issue #1912074 by baldwinlouie: Removed extra declaration of 'threshold_settings' menu item

parent 00ca70e6
No related branches found
No related tags found
No related merge requests found
......@@ -9,20 +9,6 @@
*
*/
/**
* Configuration form
*/
function cloud_metering_configure() {
return drupal_get_form('cloud_metering_instances_list');
}
/**
* Configuration Group users form
*/
function cloud_metering_user_configure() {
return drupal_get_form('cloud_metering_user_list');
}
/**
* Theme the cloud instances listing
*/
......@@ -542,7 +528,7 @@ function cloud_metering_group_budget_configure() {
$operation = filter_xss(arg(5));
if (!empty($rid) && !empty($operation)) {
return cloud_metering_user_configure();
return drupal_get_form('cloud_metering_user_list');
}
$output = drupal_set_title(t('Group Budget Settings'));
......
......@@ -36,28 +36,20 @@ function cloud_metering_menu() {
$items['admin/config/cloud_metering'] = array(
'title' => 'Cloud Metering',
'description' => 'Set Cloud Metering settings',
'page callback' => 'cloud_metering_configure',
'page callback' => 'drupal_get_form',
'page arguments' => array('cloud_metering_instances_list'),
'access arguments' => array('configure instance budget'),
'type' => MENU_NORMAL_ITEM,
);
$items['admin/config/cloud_metering/all'] = array(
'title' => 'Cloud Metering',
'description' => 'Set Cloud Metering settings',
'page callback' => 'cloud_metering_configure',
'page callback' => 'drupal_get_form',
'page arguments' => array('cloud_metering_instances_list'),
'access arguments' => array('configure instance budget'),
'weight' => -11,
'type' => MENU_DEFAULT_LOCAL_TASK,
);
$items['admin/config/cloud_metering/threshold_settings'] = array(
'title' => 'Budget Settings',
'description' => 'Set cloud instance usage thresholds',
'page callback' => 'cloud_metering_configure',
'access arguments' => array('configure instance budget'),
'type' => MENU_CALLBACK,
'weight' => -10,
);
$items['admin/config/cloud_metering/group_settings'] = array(
'title' => 'User Group Settings',
'description' => 'Set Group details and Budget',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment