Index: /trunk/web/addons/toga/index.php
===================================================================
--- /trunk/web/addons/toga/index.php (revision 152)
+++ /trunk/web/addons/toga/index.php (revision 153)
@@ -154,36 +154,31 @@
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] ";
+ $my_ct = 1;
+ $filter_nr = count( $filter );
+
+ foreach( $filter as $filtername=>$filterval ) {
+
+ $node_menu .= ">\n";
+
+ $href = "$n_filterval ) {
+
+ if( $temp_ct < $my_ct )
+ $href .= "&". $n_filtername . "=" . $n_filterval;
+
+ $temp_ct++;
}
- } else {
-
- foreach( $filter as $filtername=>$filterval ) {
- $node_menu .= ">\n";
+ $href .= "\">";
+
+ if( $my_ct < $filter_nr )
+ $node_menu .= "$href$filtername: $filterval ";
+ else
$node_menu .= "$filtername: $filterval ";
- }
+
+ $my_ct++;
}
-
}