Changeset 711 for branches/0.4/web/addons/job_monarch/search.php

Timestamp:

03/21/13 20:56:28 (10 years ago)

Author:

ramonb

Message:

• renamed user -> owner: to prevent conflict with Ganglia's authenticated user

File:

• branches/0.4/web/addons/job_monarch/search.php (modified) (8 diffs)

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

@@ -26 +26 @@
 
 function validateFormInput() {
-        global $clustername, $tpl, $id, $user, $name, $start_from_time, $start_to_time, $queue;
+        global $clustername, $tpl, $id, $owner, $name, $start_from_time, $start_to_time, $queue;
         global $end_from_time, $end_to_time, $period_start, $period_stop;
 
@@ -35 +35 @@
         $none_set = 0;
 
-        if( $id == '' and $user == '' and $name == '' and $start_from_time == '' and $start_to_time == '' and $queue == '' and $end_from_time == '' and $end_to_time == '') {
+        if( $id == '' and $owner== '' and $name == '' and $start_from_time == '' and $start_to_time == '' and $queue == '' and $end_from_time == '' and $end_to_time == '') {
                 $error = 1;
                 $show_msg = 1;
@@ -168 +168 @@
 
                         $state = $jobattrs[status];
-                        $user = $jobattrs[owner];
+                        $owner = $jobattrs[owner];
                         $queue = $jobattrs[queue];
                         $name = $jobattrs[name];
@@ -194 +194 @@
                                         break;
 
-                                case "user":
-                                        $sorted[$jobid] = $user;
+                                case "owner":
+                                        $sorted[$jobid] = $owner;
                                         break;
 
@@ -252 +252 @@
 
 function makeSearchPage() {
-        global $clustername, $tpl, $id, $user, $name, $start_from_time, $start_to_time, $queue;
+        global $clustername, $tpl, $id, $owner, $name, $start_from_time, $start_to_time, $queue;
         global $end_from_time, $end_to_time, $filter, $default_showhosts, $m, $hosts_up, $hc;
         global $period_start, $period_stop, $sortby, $sortorder, $COLUMN_REQUESTED_MEMORY;
@@ -269 +269 @@
         $tpl->assign( "cluster", $clustername );
         $tpl->assign( "id_value", $id );
-        $tpl->assign( "user_value", $user );
+        $tpl->assign( "owner_value", $owner);
         $tpl->assign( "queue_value", $queue );
         $tpl->assign( "name_value", $name );
@@ -287 +287 @@
                 if( $end_from_time ) $end_from_time = datetimeToEpoch( $end_from_time );
                 if( $end_to_time ) $end_to_time = datetimeToEpoch( $end_to_time );
-                $search_ids = $tdb->searchDbase( $id, $queue, $user, $name, $start_from_time, $start_to_time, $end_from_time, $end_to_time );
+                $search_ids = $tdb->searchDbase( $id, $queue, $owner, $name, $start_from_time, $start_to_time, $end_from_time, $end_to_time );
 
                 if( ($tdb->resultcount) > (int) $SEARCH_RESULT_LIMIT ) {
@@ -334 +334 @@
                         $tpl->assign( "id", $job[id] );
                         $tpl->assign( "state", $job[status] );
-                        $tpl->assign( "user", $job[owner] );
+                        $tpl->assign( "owner", $job[owner] );
                         $tpl->assign( "queue", $job[queue] );
                         $tpl->assign( "name", $job[name] );