Changeset 15952

Timestamp:

02/06/12 22:23:27 (4 months ago)

Author:

Alexander Trofimov

Message:

Grid - default sorting by multiple fields

File:

• trunk/inc/classes/BxDolGrid.php (modified) (2 diffs)

trunk/inc/classes/BxDolGrid.php

@@ -434 +434 @@
 
         // add order 
-        if ($sOrderField && is_array($this->_aOptions['sorting_fields']) && in_array($sOrderField, $this->_aOptions['sorting_fields'])) // explicit order
-            $sQuery .= " ORDER BY `$sOrderField` " . (0 == strcasecmp($sOrderDir, 'desc') ? 'DESC' : 'ASC');
-        elseif ($sOrderByFilter) // order by filter
-            $sQuery .= " ORDER BY $sOrderByFilter DESC";
-        elseif (!empty($this->_aOptions['field_order'])) // order by "order" field
-            $sQuery .= " ORDER BY `" . $this->_aOptions['field_order'] . "` ASC";
+        $sQuery .= $this->_getDataSqlOrderClause ($sOrderByFilter, $sOrderField, $sOrderDir);
                 
 
@@ -445 +440 @@
         return $oDb->getAll($sQuery);
     }
+
+    protected function _getDataSqlOrderClause ($sOrderByFilter, $sOrderField, $sOrderDir) {
+
+        $sOrderClause = '';
+
+        if ($sOrderField && is_array($this->_aOptions['sorting_fields']) && in_array($sOrderField, $this->_aOptions['sorting_fields'])) { // explicit order
+
+            $sOrderClause = " ORDER BY `$sOrderField` " . (0 == strcasecmp($sOrderDir, 'desc') ? 'DESC' : 'ASC');
+
+        } elseif ($sOrderByFilter) { // order by filter
+
+            $sOrderClause = " ORDER BY $sOrderByFilter DESC";
+
+        } elseif (!empty($this->_aOptions['field_order'])) { // order by "order" field
+
+            if (false == strpos($this->_aOptions['field_order'], ',')) {
+                $sOrderClause = " ORDER BY `" . $this->_aOptions['field_order'] . "` ASC";
+            } else {
+                $a = explode(',', $this->_aOptions['field_order']);                
+                foreach ($a as $sField)
+                    $sOrderClause .= "`" . trim($sField) . "` ASC, ";
+                if ($sOrderClause)
+                    $sOrderClause = " ORDER BY " . trim($sOrderClause, ', ');
+            }
+
+        } 
+
+        return $sOrderClause;
+    }    
 
     protected function _getCellData($sKey, $aField, $aRow) {