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

Timestamp:

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

Author:

ramonb

Message:

• rollback old broken change to filter names

File:

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

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

@@ -58 +58 @@
         $myfilter_fields = explode( ",", $filterorder );
 } else {
-        if( isset($f_queue) && ($queue!='')) $filter[f_queue]=$queue;
-        if( isset($f_state) && ($state!='')) $filter[f_state]=$state;
-        if( isset($f_user) && ($user!='')) $filter[f_user]=$user;
-        if( isset($f_id) && ($id!='')) $filter[f_id]=$id;
+        if( isset($queue) && ($queue!='')) $filter['queue']=$queue;
+        if( isset($state) && ($state!='')) $filter['state']=$state;
+        if( isset($user) && ($user!='')) $filter['user']=$user;
+        if( isset($id) && ($id!='')) $filter['id']=$id;
 }
 
@@ -71 +71 @@
                 switch( $myfilter ) {
 
-                        case "f_queue":
-                                $filter[f_queue]=$queue;
+                        case "queue":
+                                $filter[queue]=$queue;
                                 break;
                         case "state":
-                                $filter[f_state]=$state;
+                                $filter[state]=$state;
                                 break;
                         case "user":
-                                $filter[f_user]=$user;
+                                $filter[user]=$user;
                                 break;
                         case "id":
-                                $filter[f_id]=$id;
+                                $filter[id]=$id;
                                 break;
                 }