Index: trunk/web/addons/toga/index.php
===================================================================
--- trunk/web/addons/toga/index.php (revision 129)
+++ trunk/web/addons/toga/index.php (revision 138)
@@ -37,5 +37,5 @@
global $self, $filter, $cluster_url, $get_metric_string;
global $metrics, $reports, $m, $default_metric;
- global $default_refresh;
+ global $default_refresh, $filterorder, $view;
if( isset($default_metric) and !isset($m) )
@@ -150,11 +150,38 @@
$node_menu .= "Joblist ";
- if( count( $filter ) > 0 ) {
-
- foreach( $filter as $filtername => $filterval ) {
-
- $node_menu .= ">\n";
- $node_menu .= "$filtername- $filterval ";
+ if( count( $filter ) > 0 && $view != "search" ) {
+
+ $filter_fields = explode( ",", $filterorder );
+ $onclick_href = array();
+
+ if( count( $filter_fields ) > 1 ) {
+ //for( $i = (count( $filter_fields )-2); $i >= 0; $i-- ) {
+
+ // for( $l = intval($i+1); $l <=(count($filter_fields)-1); $l++ ) {
+ //$onclick_href[$filter_fields[$i]] = $onclick_href[$filter_fields[$i]] . "removeFilter( '" . $filter_fields[$l] . "' );";
+ // if( !isset( $onclick_href[$filter_fields[$i]] ) )
+ // $onclick_href[$filter_fields[$i]] = "removeFilters( '".$filter_fields[$l];
+ // else
+ // $onclick_href[$filter_fields[$i]] = $onclick_href[$filter_fields[$i]] . " ". $filter_fields[$l];
+
+ // }
+ // $onclick_href[$filter_fields[$i]] = $onclick_href[$filter_fields[$i]] . "' )";
+ //}
+ foreach( $filter_fields as $filtername ) {
+
+ $node_menu .= ">\n";
+ if( isset( $onclick_href[$filtername] ) )
+ $node_menu .= "$filtername: $filter[$filtername] ";
+ else
+ $node_menu .= "$filtername: $filter[$filtername] ";
+ }
+ } else {
+
+ foreach( $filter as $filtername=>$filterval ) {
+ $node_menu .= ">\n";
+ $node_menu .= "$filtername: $filterval ";
+ }
}
+
}