making filter buttons more generic

infinitas · Dec 31, 2009 · d48eb8e · d48eb8e
1 parent 1f4e4ec
commit d48eb8e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/app_helper.php b/app_helper.php
@@ -149,14 +149,21 @@ function adminTableHeadImages()
             );
         }
 
-        function adminIndexHead( $view = array(), $pagintion = array() )
+        function adminIndexHead( $view = array(), $pagintion = array(), $filterOptions = array() )
         {
             if ( empty( $view ) )
             {
                 $this->errors[] = 'I need the view.';
                 return false;
             }
 
+            $filters = '';
+            if ( !empty( $filterOptions ) )
+            {
+                App::import( 'Helper', 'FilterHelper' );
+                $filters = FilterHelper::clear( $filterOptions );
+            }
+
             $out = '<div class="adminTopBar">';
                 $out .= $this->adminPageHead( $view );
                 $out .= '<div class="main-actions">';
@@ -169,7 +176,7 @@ function adminIndexHead( $view = array(), $pagintion = array() )
                 $out .= '</div>';
             $out .= '</div>';
 
-            return $out;
+            return $out.$filters;
         }
 
         function adminOtherHead( $view = array() )

diff --git a/plugins/blog/views/posts/admin_index.ctp b/plugins/blog/views/posts/admin_index.ctp
@@ -17,9 +17,7 @@
      * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
      */
 
-    echo $this->Blog->adminIndexHead( $this, $paginator );
-
-    echo $this->Filter->clear( $filterOptions );
+    echo $this->Blog->adminIndexHead( $this, $paginator, $filterOptions );
 ?>
 <div class="table">
     <?php echo $this->Blog->adminTableHeadImages(); ?>