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-devel
Commits
3c32126a
Commit
3c32126a
authored
Feb 16, 2017
by
Leigh B Stoller
Browse files
Fix some copy/paste errors, fix project removal code.
parent
e56ec37f
Changes
2
Hide whitespace changes
Inline
Side-by-side
www/aptui/groups.ajax
View file @
3c32126a
<?php
#
# Copyright (c) 2000-201
6
University of Utah and the Flux Group.
# Copyright (c) 2000-201
7
University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
...
...
@@ -381,15 +381,15 @@ function Do_EditMembership()
SPITAJAX_ERROR
(
-
1
,
"User is still heading up experiments:
$uid
"
);
return
-
1
;
}
# Check trust values.
if
(
!
array_key_exists
(
$trust
,
$newTrustMap
))
{
# Check trust values unless removing from the group/project.
if
(
$action
!=
"remove"
&&
!
array_key_exists
(
$trust
,
$newTrustMap
))
{
SPITAJAX_ERROR
(
-
1
,
"Invalid privilege:
$trust
"
);
return
-
1
;
}
}
reset
(
$users
);
foreach
(
$users
as
$uid
=>
$trust
)
{
$trust
=
$newTrustMap
[
$trust
];
$target_user
=
User
::
LookupByUid
(
$uid
);
if
(
!
$target_user
)
{
SPITAJAX_ERROR
(
-
1
,
"Unknown target user uid:
$uid
"
);
...
...
@@ -405,6 +405,7 @@ function Do_EditMembership()
$action
==
"add"
?
"-a"
:
"-r"
);
$args
=
"
$pid
:
$gid
"
;
if
(
$action
==
"add"
||
$action
==
"approve"
)
{
$trust
=
$newTrustMap
[
$trust
];
$args
.
=
":
$trust
"
;
}
$retval
=
SUEXEC
(
$this_user
->
uid
(),
$pid
,
...
...
www/aptui/js/show-project.js
View file @
3c32126a
...
...
@@ -376,8 +376,8 @@ $(function ()
});
// Enable the remove button when users are selected.
$
(
'
#members_table .
subgroup
-checkbox
'
).
change
(
function
()
{
$
(
'
#
subgroup-delete
-button
'
).
removeAttr
(
"
disabled
"
);
$
(
'
#members_table .
remove
-checkbox
'
).
change
(
function
()
{
$
(
'
#
remove-users
-button
'
).
removeAttr
(
"
disabled
"
);
});
// Handler for the remove button.
$
(
'
#confirm-remove-users
'
).
click
(
function
()
{
...
...
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