Commit 60527945 authored by Leigh B Stoller's avatar Leigh B Stoller

Hmm, didn't like previous revision, this is better.

parent e91ddb77
<?php
#
# Copyright (c) 2006-2017 University of Utah and the Flux Group.
# Copyright (c) 2006-2018 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -83,6 +83,7 @@ class Aggregate
function nickname() { return $this->field('nickname'); }
function abbreviation() { return $this->field('abbreviation'); }
function weburl() { return $this->field('weburl'); }
function disabled() { return $this->field('disabled'); }
function has_datasets() { return $this->field('has_datasets'); }
function reservations() { return $this->field('reservations'); }
function isfederate() { return $this->field('isfederate'); }
......
......@@ -744,7 +744,7 @@ function Do_ReservationInfo()
#
# This can be turned off temporarily, say during maintenance.
#
if (!$aggregate->reservations()) {
if ($aggregate->disabled() || !$aggregate->reservations()) {
SPITAJAX_ERROR(-1, "Reservations are disabled");
return;
}
......
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