Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cloud-3221415
Manage
Activity
Members
Labels
Plan
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Issue forks
cloud-3221415
Commits
b84a2023
Commit
b84a2023
authored
12 years ago
by
baldwinlouie
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
modules/cloud_metering/cloud_metering.inc
+1
-15
1 addition, 15 deletions
modules/cloud_metering/cloud_metering.inc
modules/cloud_metering/cloud_metering.module
+4
-12
4 additions, 12 deletions
modules/cloud_metering/cloud_metering.module
with
5 additions
and
27 deletions
modules/cloud_metering/cloud_metering.inc
+
1
−
15
View file @
b84a2023
...
...
@@ -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'
));
...
...
This diff is collapsed.
Click to expand it.
modules/cloud_metering/cloud_metering.module
+
4
−
12
View file @
b84a2023
...
...
@@ -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'
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment