Changeset 710 for branches

Timestamp:

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

Author:

ramonb

Message:

• rollback old broken change to filter names

Location:

branches/0.4/web/addons/job_monarch

Files:

• image.php (modified) (2 diffs)
• index.php (modified) (2 diffs)
• overview.php (modified) (2 diffs)
• templates/overview.tpl (modified) (1 diff)
• templates/search.tpl (modified) (1 diff)

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;

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;
                 }

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

@@ -57 +57 @@
         foreach( $filter as $filtername => $filtervalue ) 
         {
-                $tpl->assign( "f_".$filtername, $filtervalue );
+                $tpl->assign( $filtername, $filtervalue );
 
                 $filter_image_url       .= "&$filtername=$filtervalue";
@@ -82 +82 @@
         $tpl->gotoBlock( "_ROOT" );
 
-        $tpl->assign( "f_order", $filterorder );
+        $tpl->assign( "order", $filterorder );
 
         if( array_key_exists( "id", $filter ) ) 

branches/0.4/web/addons/job_monarch/templates/overview.tpl

@@ -162 +162 @@
 <INPUT TYPE="HIDDEN" NAME="sortorder" VALUE="{sortorder}">
 <INPUT TYPE="HIDDEN" NAME="c" VALUE="{clustername}">
-<INPUT TYPE="HIDDEN" NAME="queue" VALUE="{f_queue}">
-<INPUT TYPE="HIDDEN" NAME="state" VALUE="{f_state}">
-<INPUT TYPE="HIDDEN" NAME="user" VALUE="{f_user}">
-<INPUT TYPE="HIDDEN" NAME="id" VALUE="{f_id}">
-<INPUT TYPE="HIDDEN" NAME="filterorder" VALUE="{f_order}">
+<INPUT TYPE="HIDDEN" NAME="queue" VALUE="{queue}">
+<INPUT TYPE="HIDDEN" NAME="state" VALUE="{state}">
+<INPUT TYPE="HIDDEN" NAME="user" VALUE="{user}">
+<INPUT TYPE="HIDDEN" NAME="id" VALUE="{id}">
+<INPUT TYPE="HIDDEN" NAME="filterorder" VALUE="{order}">
 
 <TABLE WIDTH="100%" CELLPADDING="2" CELLSPACING="2" BORDER=0>

branches/0.4/web/addons/job_monarch/templates/search.tpl

@@ -200 +200 @@
 <INPUT TYPE="HIDDEN" NAME="sortby" VALUE="{sortby}">
 <INPUT TYPE="HIDDEN" NAME="sortorder" VALUE="{sortorder}">
-<INPUT TYPE="HIDDEN" NAME="filterorder" VALUE="{f_order}">
+<INPUT TYPE="HIDDEN" NAME="filterorder" VALUE="{order}">
 
 <TABLE WIDTH="100%" CELLPADDING="2" CELLSPACING="2" BORDER=0>