Skip to content

Commit

Permalink
ENGCOM-2305: Remove commented code & remove space #16748
Browse files Browse the repository at this point in the history
  • Loading branch information
Stanislav Idolov authored Jul 13, 2018
2 parents ca9c3f5 + b668bcb commit 5402331
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ public function getValue($index = null)
{
if ($index) {
if ($data = $this->getData('value', 'orig_' . $index)) {
// date('Y-m-d', strtotime($data));
return $data;
}
return null;
Expand Down Expand Up @@ -154,7 +153,7 @@ public function getEscapedValue($index = null)
if (is_string($value)) {
return $this->escapeHtml($value);
}

return $value;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -276,13 +276,13 @@ public function getGridIdsJson()
}
/** @var \Magento\Framework\Data\Collection $allIdsCollection */
$allIdsCollection = clone $this->getParentBlock()->getCollection();

if ($this->getMassactionIdField()) {
$massActionIdField = $this->getMassactionIdField();
} else {
$massActionIdField = $this->getParentBlock()->getMassactionIdField();
}

$gridIds = $allIdsCollection->setPageSize(0)->getColumnValues($massActionIdField);
if (!empty($gridIds)) {
return join(",", $gridIds);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -273,13 +273,13 @@ public function getGridIdsJson()

/** @var \Magento\Framework\Data\Collection $allIdsCollection */
$allIdsCollection = clone $this->getParentBlock()->getCollection();

if ($this->getMassactionIdField()) {
$massActionIdField = $this->getMassactionIdField();
} else {
$massActionIdField = $this->getParentBlock()->getMassactionIdField();
}

$gridIds = $allIdsCollection->setPageSize(0)->getColumnValues($massActionIdField);

if (!empty($gridIds)) {
Expand Down

0 comments on commit 5402331

Please sign in to comment.