Commit 164ae077 authored by Leigh B Stoller's avatar Leigh B Stoller

Do not generate project email lists for nonlocal projects.

Eventually I am going to turn this off for all projects.
parent 7c5c1af0
#!/usr/bin/perl -wT #!/usr/bin/perl -w
# #
# Copyright (c) 2000-2013 University of Utah and the Flux Group. # Copyright (c) 2000-2014 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -288,16 +288,21 @@ if ($all || defined($user) || defined($pid)) { ...@@ -288,16 +288,21 @@ if ($all || defined($user) || defined($pid)) {
if ($all) { if ($all) {
$query = "select g.pid,g.gid from groups as g ". $query = "select g.pid,g.gid from groups as g ".
"left join projects as p on p.pid=g.pid ". "left join projects as p on p.pid=g.pid ".
"where p.approved=1 "; "where p.approved=1 and p.nonlocal_id is null ".
$query .= "order by g.pid,g.gid"; "order by g.pid,g.gid";
} }
elsif ($user) { elsif ($user) {
$query = "select pid,gid from group_membership where uid='$user' "; $query = "select g.pid,g.gid from group_membership as g ".
$query .= "order by pid,gid"; "left join projects as p on p.pid=g.pid ".
"where g.uid='$user' and p.approved=1 and ".
" p.nonlocal_id is null " .
"order by g.pid,g.gid";
} }
else { else {
$query = "select pid,gid from groups where pid='$pid' "; $query = "select g.pid,g.gid from groups as g ".
$query .= "order by pid,gid"; "left join projects as p on p.pid=g.pid ".
"where p.approved=1 and p.nonlocal_id is null " .
"order by g.pid,g.gid";
} }
if (! ($query_result = DBQuery($query))) { if (! ($query_result = DBQuery($query))) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment