Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-stable
Commits
c2d1da65
Commit
c2d1da65
authored
Dec 05, 2014
by
Leigh B Stoller
Browse files
Enable cluster picker for all Cloud users. Not APT.
parent
70e4560e
Changes
3
Hide whitespace changes
Inline
Side-by-side
www/aptui/instantiate.php
View file @
c2d1da65
...
...
@@ -399,7 +399,7 @@ function SPITFORM($formfields, $newuser, $errors)
$spitsshkeystuff
();
}
if
(
isset
(
$this_user
)
&&
(
ISADMIN
()
||
STUDLY
()))
{
if
(
isset
(
$this_user
)
&&
(
$ISCLOUD
||
ISADMIN
()
||
STUDLY
()))
{
$am_options
=
""
;
while
(
list
(
$am
,
$urn
)
=
each
(
$am_array
))
{
$selected
=
""
;
...
...
@@ -558,7 +558,7 @@ if (!$this_user) {
#
$aggregate_urn
=
""
;
if
(
$this_user
&&
(
ISADMIN
()
||
STUDLY
()))
{
if
(
$this_user
&&
(
$ISCLOUD
||
ISADMIN
()
||
STUDLY
()))
{
if
(
isset
(
$formfields
[
"where"
])
&&
$formfields
[
"where"
]
!=
""
)
{
if
(
array_key_exists
(
$formfields
[
"where"
],
$am_array
))
{
$aggregate_urn
=
$am_array
[
$formfields
[
"where"
]];
...
...
www/aptui/manage_profile.ajax
View file @
c2d1da65
...
...
@@ -286,7 +286,7 @@ function Do_GuestInstantiate()
#
function
Do_Instantiate
()
{
global
$this_user
,
$am_array
,
$DEFAULT_AGGREGATE
;
global
$this_user
,
$am_array
,
$DEFAULT_AGGREGATE
,
$ISCLOUD
;
global
$ajax_args
;
$this_idx
=
$this_user
->
uid_idx
();
...
...
@@ -312,7 +312,7 @@ function Do_Instantiate()
$args
[
"auth_token"
]
=
$token
;
$opts
=
""
;
if
((
ISADMIN
()
||
STUDLY
())
&&
isset
(
$ajax_args
[
"where"
]))
{
if
((
$ISCLOUD
||
ISADMIN
()
||
STUDLY
())
&&
isset
(
$ajax_args
[
"where"
]))
{
if
(
array_key_exists
(
$ajax_args
[
"where"
],
$am_array
))
{
$opts
=
"-a "
.
$am_array
[
$ajax_args
[
"where"
]];
}
...
...
www/aptui/manage_profile.php
View file @
c2d1da65
...
...
@@ -57,7 +57,7 @@ $optargs = OptionalPageArguments("create", PAGEARG_STRING,
function
SPITFORM
(
$formfields
,
$errors
)
{
global
$this_user
,
$projlist
,
$action
,
$profile
,
$DEFAULT_AGGREGATE
;
global
$notifyupdate
,
$notifyclone
,
$snapuuid
,
$am_array
;
global
$notifyupdate
,
$notifyclone
,
$snapuuid
,
$am_array
,
$ISCLOUD
;
$viewing
=
0
;
$candelete
=
0
;
$canmodify
=
0
;
...
...
@@ -105,7 +105,7 @@ function SPITFORM($formfields, $errors)
$amlist
=
array
();
$amdefault
=
""
;
if
(
$viewing
&&
(
ISADMIN
()
||
STUDLY
()))
{
if
(
$viewing
&&
(
$ISCLOUD
||
ISADMIN
()
||
STUDLY
()))
{
while
(
list
(
$am
)
=
each
(
$am_array
))
{
$amlist
[]
=
$am
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment