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

Timestamp:

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

Author:

ramonb

Message:

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

File:

• branches/0.4/web/addons/job_monarch/overview.php (modified) (6 diffs)

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

@@ -88 +88 @@
                 $piefilter = 'id';
         } 
-        else if( array_key_exists( "user", $filter ) ) 
-        {
-                $piefilter = 'user';
+        else if( array_key_exists( "owner", $filter ) ) 
+        {
+                $piefilter = 'owner';
         } 
         else if( array_key_exists( "queue", $filter ) ) 
@@ -312 +312 @@
                                         }
                                 }
-                                else if( $piefilter == 'user' )
+                                else if( $piefilter == 'owner' )
                                 {
                                         if( $jobs[$myjob]['owner'] != $filter[$piefilter] )
@@ -427 +427 @@
                 {
                                 $state          = $jobattrs['status'];
-                                $user           = $jobattrs['owner'];
+                                $owner      = $jobattrs['owner'];
                                 $queue          = $jobattrs['queue'];
                                 $name           = $jobattrs['name'];
@@ -458 +458 @@
                                                 break;
 
-                                        case "user":
-                                                $sorted[$jobid] = $user;
+                                        case "owner":
+                                                $sorted[$jobid] = $owner;
                                                 break;
 
@@ -727 +727 @@
                                         $display_job = 0;
                                 }
-                                else if( $filtername == 'user' && $jobs[$jobid]['owner'] != $filtervalue )
+                                else if( $filtername == 'owner' && $jobs[$jobid]['owner'] != $filtervalue )
                                 {
                                         $display_job = 0;
@@ -756 +756 @@
                                 $tpl->assign( "fullstate", $fullstate );
                                 
-                                $tpl->assign( "user", $jobs[$jobid]['owner'] );
+                                $tpl->assign( "owner", $jobs[$jobid]['owner'] );
                                 $tpl->assign( "queue", $jobs[$jobid]['queue'] );