Merge pull request #215 from tony13tv/patch-1

UPDATE: Fluent.FilterAdmin is now taken from config
tractorcow-farm · Jun 30, 2016 · a36ac85 · a36ac85
2 parents bcf69cf + 67d03e2
commit a36ac85
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/_config/fluent.yml b/_config/fluent.yml
@@ -61,6 +61,8 @@ Fluent:
   #  www.example.co.nz:
   #    locales:
   #      - en_NZ
+  # Turn this on to enable admin filtering
+  filter_admin: false
 ---
 Name: fluenti18nconfig
 ---

diff --git a/code/extensions/FluentFilteredExtension.php b/code/extensions/FluentFilteredExtension.php
@@ -106,13 +106,14 @@ public function updateCMSFields(FieldList $fields)
     }
 
     /**
-     * Amend freshly created DataQuery objects with the current locale and frontend status
+     * Amend freshly created DataQuery objects with the "should filter admin?" option, current locale and frontend status
      *
      * @param SQLQuery
      * @param DataQuery
      */
     public function augmentDataQueryCreation(SQLQuery $query, DataQuery $dataQuery)
     {
+        $dataQuery->setQueryParam('Fluent.FilterAdmin', Fluent::config()->filter_admin);
         $dataQuery->setQueryParam('Fluent.Locale', Fluent::current_locale());
         $dataQuery->setQueryParam('Fluent.IsFrontend', Fluent::is_frontend());
     }
@@ -127,7 +128,7 @@ public function augmentSQL(SQLQuery &$query, DataQuery &$dataQuery = null)
         }
 
         // Skip filter in the CMS, unless filtering is explicitly turned on
-        $filterAdmin = $dataQuery->getQueryParam(self::FILTER_ADMIN);
+        $filterAdmin = $dataQuery->getQueryParam('Fluent.FilterAdmin');
         if (!$filterAdmin) {
             $isFrontend = $dataQuery->getQueryParam('Fluent.IsFrontend');
             if ($isFrontend === null) {