Changeset 710 for branches/0.4/web/addons/job_monarch/image.php

Timestamp:

03/21/13 20:45:17 (9 years ago)

Author:

ramonb

Message:

• rollback old broken change to filter names

File:

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

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

@@ -56 +56 @@
 
 //printf("clustername = %s\n", $clustername );
-if( isset($f_id) && ($f_id!='')) $filter[f_id]=$id;
-if( isset($f_state) && ($f_state!='')) $filter[f_state]=$state;
-if( isset($f_user) && ($f_user!='')) $filter[f_user]=$user;
-if( isset($f_queue) && ($f_queue!='')) $filter[f_queue]=$queue;
+if( isset($id) && ($id!='')) $filter['id']=$id;
+if( isset($state) && ($state!='')) $filter['state']=$state;
+if( isset($user) && ($user!='')) $filter['user']=$user;
+if( isset($queue) && ($queue!='')) $filter['queue']=$queue;
 
 function drawHostImage() {
@@ -115 +115 @@
                         switch( $filtername ) {
 
-                                case "f_id":
+                                case "id":
                                         $ic->setFilter( 'jobid', $filtervalue );
                                         break;
-                                case "f_user":
+                                case "user":
                                         $ic->setFilter( 'owner', $filtervalue);
                                         break;
-                                case "f_queue":
+                                case "queue":
                                         $ic->setFilter( 'queue', $filtervalue);
                                         break;
-                                case "f_state":
+                                case "state":
                                         $ic->setFilter( 'status', $filtervalue);
                                         break;