All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 2ecffd10 authored by Leigh B Stoller's avatar Leigh B Stoller
parent 58ebf784
#!/usr/bin/perl -wT
#
# Copyright (c) 2000-2016 University of Utah and the Flux Group.
# Copyright (c) 2000-2017 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -731,10 +731,14 @@ sub GenDefsFile($)
" left join os_info_versions as ov3 on ".
" ov3.osid=oi3.osid and ov3.vers=oi3.version ".
" where ov.def_parentosid is not NULL" .
" group by oi.osname");
" group by oi.osname,oi.pid");
while (my ($pid,$osname,$def_parentosid,$parent_osids) =
$query_result->fetchrow_array()) {
if (!defined($def_parentosid)) {
print STDERR "No def_parentosid for $pid,$osname\n";
next;
}
my $parentlist = "\"$def_parentosid\"";
if (defined($parent_osids) && $parent_osids ne '') {
$parentlist .= " \"$parent_osids\"";
......
<?php
#
# Copyright (c) 2000-2015 University of Utah and the Flux Group.
# Copyright (c) 2000-2017 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -289,7 +289,7 @@ $query_result =
" g2.uid_idx='" . $this_user->uid_idx() . "' ".
"where g.uid_idx='$target_idx' ".
($isadmin ? "" : "and g2.uid_idx is not null ") .
"group by g.pid, g.gid ".
"group by g.pid, g.gid, g.trust ".
"order by g.pid,gr.created");
if (mysql_num_rows($query_result)) {
......
......@@ -1281,12 +1281,12 @@ class User
DBQueryFatal("(select pid,max(UNIX_TIMESTAMP(s.last_activity)) ".
" as last from experiment_stats as s ".
" where s.creator_idx='$uid_idx' and pid_idx!=0 ".
" group by s.pid_idx order by last desc) ".
" group by s.pid,s.pid_idx order by last desc) ".
"union ".
"(select pid,max(UNIX_TIMESTAMP(created)) as last ".
" from apt_instances ".
" where creator_idx='$uid_idx' and pid is not null ".
" group by pid_idx order by last desc)");
" group by pid,pid_idx order by last desc)");
$ordered = array();
while ($row = mysql_fetch_array($query_result)) {
......
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