Merge pull request #168 from magento-firedrakes/MAGETWO-45300

He, Joan(johe) · He, Joan(johe) · commit df7f428bb126 · 2015-11-12T13:59:48.000-06:00
[Firedrakes] MAGETWO-45300: Update Date grids to support "From To" filter with the same date
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column.php b/app/code/Magento/Backend/Block/Widget/Grid/Column.php
@@ -447,7 +447,7 @@ public function setFilterType($type, $className)
      */
     protected function _getFilterByType()
     {
-        $type = strtolower($this->getType());
+        $type = $this->getFilterType() ? strtolower($this->getFilterType()) : strtolower($this->getType());
         $filterClass = isset($this->_filterTypes[$type]) ? $this->_filterTypes[$type] : $this->_filterTypes['default'];
 
         return $filterClass;

Original file line number	Diff line number	Diff line change
`@@ -447,7 +447,7 @@ public function setFilterType($type, $className)`
`447`	`447`	`*/`
`448`	`448`	`protected function _getFilterByType()`
`449`	`449`	`{`
`450`		`- $type = strtolower($this->getType());`
	`450`	`+ $type = $this->getFilterType() ? strtolower($this->getFilterType()) : strtolower($this->getType());`
`451`	`451`	`$filterClass = isset($this->_filterTypes[$type]) ? $this->_filterTypes[$type] : $this->_filterTypes['default'];`
`452`	`452`
`453`	`453`	`return $filterClass;`