Mercurial > hg > fapweb

changeset 197:41b24a132af8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 15 Nov 2013 19:16:12 +0200
parents e65b2392fc0e (current diff) ef26d16b836e (diff)
children 96ab189e5c03
files
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/attendees.inc.php	Mon Nov 11 10:37:58 2013 +0200
+++ b/attendees.inc.php	Fri Nov 15 19:16:12 2013 +0200
@@ -36,7 +36,12 @@
   $row = 0;
   foreach ($res as $item)
   {
-    $over = $maxAttendeesSoft > 0 && $index > $maxAttendeesSoft;
+    if ($maxAttendeesHard > 0)
+      $over = $index > $maxAttendeesHard;
+    else
+    if ($maxAttendeesSoft > 0)
+      $over = $index > $maxAttendeesSoft;
+
     stPrintAttendee($item, $row++, FALSE, $over ? " overbooked" : "");
     $index--;
   }