Changeset 739 for branches/0.4/web/addons/job_monarch/host_view.php

Timestamp:

03/24/13 20:18:46 (11 years ago)

Author:

ramonb

Message:

• make sure range is correctly set and passed on

File:

• branches/0.4/web/addons/job_monarch/host_view.php (modified) (2 diffs)

branches/0.4/web/addons/job_monarch/host_view.php

@@ -133 +133 @@
     $cluster_url=rawurlencode($clustername);
     $tpl->assign("cluster_url", $cluster_url);
-    $tpl->assign("graphargs", "h=$hostname&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop");
+
+    $graphargs = "h=$hostname&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop";
+
+    if( $range == 'job' )
+    {
+        $graphargs .= "&period_start=$period_start&period_stop=$period_stop";
+    }
+    else
+    {
+        $tijd = time();
+        $graphargs .= "&st=$tijd";
+    }
+
+    $tpl->assign("graphargs", "$graphargs");
 
     # For the node view link.
@@ -159 +172 @@
         else
         {
-            $graphargs = "c=$cluster_url&h=$hostname&m=$name"
-               ."&z=overview-medium&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop";
+            $graphargs = "c=$cluster_url&h=$hostname&m=$name&z=overview-medium&range=$range&job_start=$job_start&job_stop=$job_stop";
+
+            if( $range == 'job' )
+            {
+                $graphargs .= "&period_start=$period_start&period_stop=$period_stop";
+            }
+            else
+            {
+                $tijd = time();
+                $graphargs .= "&st=$tijd";
+            }
             # Adding units to graph 2003 by Jason Smith <smithj4@bnl.gov>.
             if ($v[UNITS])