You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by jf...@apache.org on 2015/08/19 20:39:55 UTC

svn commit: r1696646 - /vcl/trunk/web/.ht-inc/privileges.php

Author: jfthomps
Date: Wed Aug 19 18:39:55 2015
New Revision: 1696646

URL: http://svn.apache.org/r1696646
Log:
VCL-899 - Add request ID and management node to reservation history on User Lookup page

privileges.php: modified userLookup: added request ID and management node hostname to data displayed for reservation history

Modified:
    vcl/trunk/web/.ht-inc/privileges.php

Modified: vcl/trunk/web/.ht-inc/privileges.php
URL: http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/privileges.php?rev=1696646&r1=1696645&r2=1696646&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/privileges.php (original)
+++ vcl/trunk/web/.ht-inc/privileges.php Wed Aug 19 18:39:55 2015
@@ -1502,11 +1502,14 @@ function userLookup() {
 		       .        "c.hostname, "
 		       .        "i.prettyname AS prettyimage, "
 		       .        "s.IPaddress, "
-		       .        "l.ending "
+		       .        "l.ending, "
+		       .        "l.requestid, "
+		       .        "m.hostname AS managementnode "
 		       . "FROM log l, "
 		       .      "image i, "
 		       .      "computer c, "
 		       .      "sublog s "
+		       . "LEFT JOIN managementnode m ON (s.managementnodeid = m.id) "
 		       . "WHERE l.userid = {$userdata['id']} AND "
 		       .        "s.logid = l.id AND "
 		       .        "i.id = s.imageid AND "
@@ -1555,6 +1558,18 @@ function userLookup() {
 				print "    <th align=right>Ending:</th>\n";
 				print "    <td>{$req['ending']}</td>\n";
 				print "  </tr>\n";
+				if($req['requestid'] != '') {
+					print "  <tr>\n";
+					print "    <th align=right>Request ID:</th>\n";
+					print "    <td>{$req['requestid']}</td>\n";
+					print "  </tr>\n";
+				}
+				if($req['managementnode'] != '') {
+					print "  <tr>\n";
+					print "    <th align=right>Management Node:</th>\n";
+					print "    <td>{$req['managementnode']}</td>\n";
+					print "  </tr>\n";
+				}
 			}
 			print "</table>\n";
 		}