Grid range filter - optimize SQL query when from === to (#1637)

* Grid + Range filter - add doc, hints, optimize SQL query when from === to * Doc-block cleanup
OpenMage · Jul 13, 2021 · 061dbe0 · 061dbe0
1 parent 0fb1845
commit 061dbe0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php
@@ -303,7 +303,7 @@ public function getCollection()
      * Add column to grid
      *
      * @param   string $columnId
-     * @param   array || Varien_Object $column
+     * @param   array $column
      * @return  Mage_Adminhtml_Block_Widget_Grid
      */
     public function addColumn($columnId, $column)
@@ -313,9 +313,6 @@ public function addColumn($columnId, $column)
                 ->setData($column)
                 ->setGrid($this);
         }
-        /*elseif ($column instanceof Varien_Object) {
-            $this->_columns[$columnId] = $column;
-        }*/
         else {
             throw new Exception(Mage::helper('adminhtml')->__('Wrong column format.'));
         }
@@ -426,7 +423,7 @@ public function getColumnCount()
      * Retrieve grid column by column id
      *
      * @param   string $columnId
-     * @return  Varien_Object || false
+     * @return  Mage_Adminhtml_Block_Widget_Grid_Column|false
      */
     public function getColumn($columnId)
     {
@@ -439,13 +436,18 @@ public function getColumn($columnId)
     /**
      * Retrieve all grid columns
      *
-     * @return array
+     * @return Mage_Adminhtml_Block_Widget_Grid_Column[]
      */
     public function getColumns()
     {
         return $this->_columns;
     }
 
+    /**
+     * @param array $data
+     *
+     * @return $this
+     */
     protected function _setFilterValues($data)
     {
         foreach ($this->getColumns() as $columnId => $column) {
@@ -1286,7 +1288,7 @@ public function getAbsoluteGridUrl($params = array())
      * @param   mixed $default
      * @return  mixed
      */
-    public function getParam($paramName, $default=null)
+    public function getParam($paramName, $default = null)
     {
         $session = Mage::getSingleton('adminhtml/session');
         $sessionParamName = $this->getId().$paramName;

diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column.php
@@ -353,6 +353,9 @@ protected function _getFilterByType()
         return $filterClass;
     }
 
+    /**
+     * @return Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Abstract|false
+     */
     public function getFilter()
     {
         if (!$this->_filter) {

diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Range.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Range.php
@@ -51,11 +51,15 @@ public function getValue($index=null)
         }
         return null;
     }
-
 
     public function getCondition()
     {
         $value = $this->getValue();
+
+        if (isset($value['from']) && isset($value['to']) && $value['from'] === $value['to']) {
+            return ['eq' => $value['from']];
+        }
+
         return $value;
     }