Changeset 15929 for trunk

Timestamp:

01/25/12 23:54:54 (4 months ago)

Author:

Alexander Trofimov

Message:

Grid - search in translatable fields

Location:

trunk

Files:

• inc/classes/BxDolGrid.php (modified) (5 diffs)
• inc/classes/BxDolGridQuery.php (modified) (1 diff)
• install/sql/v70.sql (modified) (1 diff)
• templates/base/scripts/BxBaseGrid.php (modified) (1 diff)

trunk/inc/classes/BxDolGrid.php

@@ -61 +61 @@
  * - paginate_get_start: GET variable name for 'start'.
  * - paginate_get_per_page: GET variable name for 'per_page'.
- * - filter_fields: comma separated field names, to search in.
+ * - filter_fields: comma separated list of field names to search in; if field contains language key then it is better to specify it in 'filter_fields_translatable'.
+ * - filter_fields_translatable: comma separated list of field names to search in its translations; enter field name here if field contains language key.
  * - filter_mode: search mode:
  *      - like: use SQL LIKE expression for search, if 'source_type' is not 'Sql' it doesn't matter.
@@ -308 +309 @@
         
         // apply filter
-        if ($sFilter && !empty($this->_aOptions['filter_fields'])) {
+        if ($sFilter && (!empty($this->_aOptions['filter_fields']) || !empty($this->_aOptions['filter_fields_translatable']))) {
             $aSource = array();
             foreach ($this->_aOptions['source'] as $aRow) {
-                foreach ($this->_aOptions['filter_fields'] as $sField) {
-                    if (empty($aRow[$sField]) || false === strpos($aRow[$sField], $sFilter))
-                        continue;
-                    $aSource[] = $aRow;
-                    break;
+                $bFound = false;
+                if (!empty($this->_aOptions['filter_fields'])) {
+                    foreach ($this->_aOptions['filter_fields'] as $sField) {
+                        if (empty($aRow[$sField]) || false === stripos($aRow[$sField], $sFilter))
+                            continue;
+                        $aSource[] = $aRow;
+                        $bFound = true;
+                        break;
+                    }
+                }
+                if (!$bFound && !empty($this->_aOptions['filter_fields_translatable'])) {
+                    foreach ($this->_aOptions['filter_fields_translatable'] as $sField) {
+                        if (empty($aRow[$sField]) || false === stripos(_t($aRow[$sField]), $sFilter))
+                            continue;
+                        $aSource[] = $aRow;
+                        $bFound = true;
+                        break;
+                    }
                 }
             }
@@ -353 +367 @@
         // add filter condition
         $sOrderByFilter = '';
-        if ($sFilter && !empty($this->_aOptions['filter_fields'])) {            
+        if ($sFilter && (!empty($this->_aOptions['filter_fields']) || !empty($this->_aOptions['filter_fields_translatable']))) {
 
             $sMode = $this->_aOptions['filter_mode'];
@@ -360 +374 @@
 
             $sCond = '';
-            if ('like' == $sMode) {
-                foreach ($this->_aOptions['filter_fields'] as $sField)
-                    $sCond .= $oDb->prepare("`{$sField}` LIKE ? OR ", '%' . $sFilter . '%');
+            if ('like' == $sMode) { // LIKE search
+
+                // condition for regular fields
+                if (!empty($this->_aOptions['filter_fields']))
+                    foreach ($this->_aOptions['filter_fields'] as $sField)
+                        $sCond .= $oDb->prepare("`{$sField}` LIKE ? OR ", '%' . $sFilter . '%');
+
+                // condition for translatable fields
+                if (!empty($this->_aOptions['filter_fields_translatable'])) {
+                    $sCondFields = '';
+                    foreach ($this->_aOptions['filter_fields_translatable'] as $sField)
+                        $sCondFields .= "`k`.`Key` = `{$sField}` OR "; 
+
+                    $sCondFields = rtrim($sCondFields, ' OR ');
+
+                    if ($sCondFields)
+                        $sCond .= $oDb->prepare("(SELECT 1 FROM `sys_localization_strings` AS `s` INNER JOIN `sys_localization_keys` AS `k` ON (`k`.`ID` = `s`.`IDKey`) WHERE `s`.`string` LIKE ? AND ($sCondFields) LIMIT 1) OR ", '%' . $sFilter . '%');
+                }
+
                 $sCond = rtrim($sCond, ' OR ');
-            } else {
-                foreach ($this->_aOptions['filter_fields'] as $sField)
-                    $sCond .= "`{$sField}`,"; 
-                $sCond = rtrim($sCond, ',');
-                if ($sCond) {
-                    $sCond = $oDb->prepare(" MATCH ($sCond) AGAINST (?) ", $sFilter);
-                    $sOrderByFilter = $sCond;
-                    $sCond .= ' > 1 ';
+
+            } else { // FULLTEXT search
+
+                // condition for regular fields
+                if (!empty($this->_aOptions['filter_fields'])) {
+
+                    $sCondFields = '';
+                    foreach ($this->_aOptions['filter_fields'] as $sField)
+                        $sCondFields .= "`{$sField}`,"; 
+
+                    $sCondFields = rtrim($sCondFields, ',');
+
+                    if ($sCondFields) {
+                        $sCond = $oDb->prepare(" MATCH ($sCondFields) AGAINST (?) ", $sFilter);
+                        $sOrderByFilter = $sCond;
+                        $sCond .= ' > 1 OR ';
+                    }
                 }
-            }            
+
+                // condition for translatable fields
+                if (!empty($this->_aOptions['filter_fields_translatable'])) {
+
+                    $sCondFields = '';
+                    foreach ($this->_aOptions['filter_fields_translatable'] as $sField)
+                        $sCondFields .= "`k`.`Key` = `{$sField}` OR ";
+
+                    $sCondFields = rtrim($sCondFields, ' OR ');
+
+                    if ($sCondFields)
+                        $sCond .= $oDb->prepare("(SELECT 1 FROM `sys_localization_strings` AS `s` INNER JOIN `sys_localization_keys` AS `k` ON (`k`.`ID` = `s`.`IDKey`) WHERE MATCH (`s`.`string`) AGAINST (?) AND ($sCondFields) LIMIT 1) OR ", $sFilter);
+                }
+
+                $sCond = rtrim($sCond, ' OR ');
+            }
 
             if ($sCond)
@@ -418 +472 @@
     protected function _isVisibleGrid ($a) {
         bx_import('BxDolAcl');
+        if (!isset($a['visible_for_levels']))
+            return true;
         return BxDolAcl::getInstance()->isMemberLevelInSet($a['visible_for_levels']);
     }

trunk/inc/classes/BxDolGridQuery.php

@@ -36 +36 @@
         if ($aObject['filter_fields'])
             $aObject['filter_fields'] = array_map('trim', explode(',', $aObject['filter_fields']));
+
+        if ($aObject['filter_fields_translatable'])
+            $aObject['filter_fields_translatable'] = array_map('trim', explode(',', $aObject['filter_fields_translatable']));
 
         // sorting

trunk/install/sql/v70.sql

@@ -4603 +4603 @@
   `paginate_get_per_page` varchar(255) NOT NULL,
   `filter_fields` text NOT NULL,
+  `filter_fields_translatable` text NOT NULL,
   `filter_mode` enum('like','fulltext','auto') NOT NULL DEFAULT 'auto',
   `sorting_fields` text NOT NULL,

trunk/templates/base/scripts/BxBaseGrid.php

@@ -209 +209 @@
                     ),
                     'bx_if:filter' => array (
-                        'condition' => !empty($this->_aOptions['filter_fields']),
+                        'condition' => !empty($this->_aOptions['filter_fields']) || !empty($this->_aOptions['filter_fields_translatable']),
                         'content' => array(
                             'controls' => $this->_getFilterControls(),