Commit c0632cab authored by Leigh Stoller's avatar Leigh Stoller

Bug Fix: Print out URNs in addition to HRNs.

parent da3e4dee
......@@ -72,8 +72,8 @@ if (isset($showtypes["aggregates"])) {
$table = array('#id' => 'aggregate',
'#title' => "Aggregate History",
'#headings' => array("idx" => "ID",
"slice_hrn" => "Slice HRN",
"creator_hrn" => "Creator HRN",
"slice_hrn" => "Slice HRN/URN",
"creator_hrn" => "Creator HRN/URN",
"created" => "Created",
"Destroyed" => "Destroyed",
"Manifest" => "Manifest"));
......@@ -85,12 +85,24 @@ if (isset($showtypes["aggregates"])) {
$uuid = $row["uuid"];
$slice_hrn = $row["slice_hrn"];
$creator_hrn = $row["creator_hrn"];
$slice_urn = $row["slice_urn"];
$creator_urn = $row["creator_urn"];
$created = $row["created"];
$destroyed = $row["destroyed"];
# If we have urns, show those instead.
$slice_info = $slice_hrn;
if (isset($slice_urn)) {
$slice_info = "$slice_urn";
}
$creator_info = $creator_hrn;
if (isset($creator_urn)) {
$creator_info = "$creator_urn";
}
$tablerow = array("idx" => $idx,
"hrn" => $slice_hrn,
"creator" => $creator_hrn,
"hrn" => $slice_info,
"creator" => $creator_info,
"created" => $created,
"destroyed" => $destroyed);
......
<?php
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
# All rights reserved.
#
include("defs.php3");
......@@ -39,7 +39,7 @@ else {
#
PAGEHEADER("Geni Slice List");
if (! $isadmin) {
if (! ($isadmin || STUDLY())) {
USERERROR("You do not have permission to view Geni slice list!", 1);
}
......
<?php
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
# All rights reserved.
#
include("defs.php3");
......@@ -32,7 +32,7 @@ if (!isset($showtype)) {
#
PAGEHEADER("Geni Slice");
if (! $isadmin) {
if (! ($isadmin || STUDLY())) {
USERERROR("You do not have permission to view Geni slices!", 1);
}
......
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