Author: jfthomps
Date: Wed Apr  7 17:31:12 2010
New Revision: 931625

URL: http://svn.apache.org/viewvc?rev=931625&view=rev
Log:
VCL-148

modified viewRequests: added extra column if user's viewmode is ADMIN_DEVELOPER 
to be able to see the management node assigned to a reservation

Modified:
    incubator/vcl/trunk/web/.ht-inc/requests.php

Modified: incubator/vcl/trunk/web/.ht-inc/requests.php
URL: 
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/requests.php?rev=931625&r1=931624&r2=931625&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/requests.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/requests.php Wed Apr  7 17:31:12 2010
@@ -1918,6 +1918,8 @@ function viewRequests() {
        $normal = '';
        $imaging = '';
        $long = '';
+       if($viewmode == ADMIN_DEVELOPER)
+               $nodes = getManagementNodes();
        if($count = count($requests)) {
                $now = time();
                for($i = 0, $noedit = 0, $text = '';
@@ -2112,6 +2114,7 @@ function viewRequests() {
                        if($viewmode == ADMIN_DEVELOPER) {
                                $text .= "    <TD align=center>" . 
$requests[$i]["id"] . "</TD>\n";
                                $text .= "    <TD align=center>" . 
$requests[$i]["computerid"] . "</TD>\n";
+                               $text .= "    <TD align=center>" . 
$nodes[$requests[$i]["managementnodeid"]]['hostname'] . "</TD>\n";
                                $text .= "    <TD>" . 
$requests[$i]["IPaddress"] . "</TD>\n";
                                $text .= "    <TD align=center>" . 
$requests[$i]["currstateid"];
                                $text .= "</TD>\n";
@@ -2152,6 +2155,7 @@ function viewRequests() {
                if($viewmode == ADMIN_DEVELOPER) {
                        $text .= "    <TH>Req ID</TH>\n";
                        $text .= "    <TH>Comp ID</TH>\n";
+                       $text .= "    <TH>Management Node</TH>\n";
                        $text .= "    <TH>IP address</TH>\n";
                        $text .= "    <TH>Current State</TH>\n";
                        $text .= "    <TH>Last State</TH>\n";
@@ -2176,6 +2180,7 @@ function viewRequests() {
                if($viewmode == ADMIN_DEVELOPER) {
                        $text .= "    <TH>Req ID</TH>\n";
                        $text .= "    <TH>Comp ID</TH>\n";
+                       $text .= "    <TH>Management Node</TH>\n";
                        $text .= "    <TH>IP address</TH>\n";
                        $text .= "    <TH>Current State</TH>\n";
                        $text .= "    <TH>Last State</TH>\n";
@@ -2200,6 +2205,7 @@ function viewRequests() {
                if($viewmode == ADMIN_DEVELOPER) {
                        $text .= "    <TH>Req ID</TH>\n";
                        $text .= "    <TH>Comp ID</TH>\n";
+                       $text .= "    <TH>Management Node</TH>\n";
                        $text .= "    <TH>IP address</TH>\n";
                        $text .= "    <TH>Current State</TH>\n";
                        $text .= "    <TH>Last State</TH>\n";


Reply via email to