Skip to content
GitLab
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
13fb9e6d
Commit
13fb9e6d
authored
Jul 11, 2017
by
Leigh B Stoller
Browse files
Minor bug fixes to group membership listing.
parent
5ddb9b3b
Changes
1
Hide whitespace changes
Inline
Side-by-side
www/aptui/user-dashboard.ajax
View file @
13fb9e6d
...
...
@@ -147,15 +147,14 @@ function Do_ProjectList()
$target_idx
=
$target_user
->
uid_idx
();
$target_uuid
=
$target_user
->
uuid
();
$results
=
array
();
$projlist
=
$target_user
->
Project
AccessList
(
$TB_PROJECT_READINFO
);
$projlist
=
$target_user
->
Project
MembershipList
(
);
#
# Cull out the nonlocal projects, we do not want to show those
# since they are just the holding projects.
#
while
(
list
(
$pid
)
=
each
(
$projlist
))
{
$proj
=
Project
::
Lookup
(
$pid
);
if
(
$proj
&&
!
$proj
->
IsNonLocal
())
{
foreach
(
$projlist
as
$proj
)
{
if
(
!
$proj
->
IsNonLocal
())
{
$blob
=
array
();
$blob
[
"pid"
]
=
$proj
->
pid
();
$blob
[
"description"
]
=
$proj
->
name
();
...
...
@@ -163,7 +162,7 @@ function Do_ProjectList()
$blob
[
"leader"
]
=
$leader
->
uid
();
$blob
[
"leader_name"
]
=
$leader
->
name
();
$blob
[
"leader_idx"
]
=
$leader
->
idx
();
$membership
=
$proj
->
MemberShipInfo
(
$t
his
_user
);
$membership
=
$proj
->
MemberShipInfo
(
$t
arget
_user
);
$blob
[
"trust"
]
=
$newTrustMap
[
$membership
[
"trust"
]];
#
...
...
@@ -183,12 +182,12 @@ function Do_ProjectList()
$glob
[
"leader"
]
=
$leader
->
uid
();
$glob
[
"leader_idx"
]
=
$leader
->
idx
();
$glob
[
"leader_name"
]
=
$leader
->
name
();
$membership
=
$group
->
MemberShipInfo
(
$t
his
_user
);
$membership
=
$group
->
MemberShipInfo
(
$t
arget
_user
);
$glob
[
"trust"
]
=
$newTrustMap
[
$membership
[
"trust"
]];
$blob
[
"subgroups"
][]
=
$glob
;
}
}
$results
[
$p
id
]
=
$blob
;
$results
[
$p
roj
->
pid
()
]
=
$blob
;
}
}
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment