From 92683ac9ce47ca93349d508ed686bf9601a77be3 Mon Sep 17 00:00:00 2001 From: Rob Mangiafico Date: Mon, 22 Dec 2014 11:49:58 -0500 Subject: [PATCH 1/3] Update Actions.php Changing URL_PATH to work for page edits in backend --- app/code/Magento/Cms/Ui/DataProvider/Page/Row/Actions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Cms/Ui/DataProvider/Page/Row/Actions.php b/app/code/Magento/Cms/Ui/DataProvider/Page/Row/Actions.php index 8c10225dd3e7a..85ef7f19c4cf5 100644 --- a/app/code/Magento/Cms/Ui/DataProvider/Page/Row/Actions.php +++ b/app/code/Magento/Cms/Ui/DataProvider/Page/Row/Actions.php @@ -16,7 +16,7 @@ class Actions implements RowInterface /** * Url path */ - const URL_PATH = 'adminhtml/cms_page/edit'; + const URL_PATH = 'cms/page/edit'; /** * @var UrlBuilder From 0fac107d31f7a59c8aa90872e52e17de08e4db74 Mon Sep 17 00:00:00 2001 From: Kevin Abel Date: Mon, 22 Dec 2014 13:18:16 -0600 Subject: [PATCH 2/3] Fix email template creation date not being persisted The database schema from https://github.com/magento/magento2/blob/develop/app/code/Magento/Email/sql/email_setup/install-2.0.0.php#L62-L67 uses the column `added_at` for storing the date the email template creation date. When `setCreatedAt` is used, that date is not persisted to the database, leaving the column `NULL` in the database. --- app/code/Magento/Email/Model/Resource/Template.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Email/Model/Resource/Template.php b/app/code/Magento/Email/Model/Resource/Template.php index f4cf0242b5467..6c6fe926b97cc 100644 --- a/app/code/Magento/Email/Model/Resource/Template.php +++ b/app/code/Magento/Email/Model/Resource/Template.php @@ -99,7 +99,7 @@ public function checkCodeUsage(\Magento\Email\Model\Template $template) protected function _beforeSave(AbstractModel $object) { if ($object->isObjectNew()) { - $object->setCreatedAt($this->dateTime->formatDate(true)); + $object->setAddedAt($this->dateTime->formatDate(true)); } $object->setModifiedAt($this->dateTime->formatDate(true)); $object->setTemplateType((int)$object->getTemplateType()); From 97b29e18061fba172ca38c2b7aedb4384abb4b39 Mon Sep 17 00:00:00 2001 From: Cyrill Schumacher Date: Tue, 23 Dec 2014 10:15:11 +1100 Subject: [PATCH 3/3] Feature: Magento\Backend\Block\Widget\Grid\Column\Renderer Currency and Price Renderer: use _getValue() to be able to also retrieve a calculated value instead of a fixed one via getData(). --- .../Backend/Block/Widget/Grid/Column/Renderer/Currency.php | 2 +- .../Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php index c20d77945b32f..076ff34ceda09 100644 --- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php +++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php @@ -80,7 +80,7 @@ public function __construct( */ public function render(\Magento\Framework\Object $row) { - if ($data = (string)$row->getData($this->getColumn()->getIndex())) { + if ($data = (string)$this->_getValue($row)) { $currency_code = $this->_getCurrencyCode($row); $data = floatval($data) * $this->_getRate($row); $sign = (bool)(int)$this->getColumn()->getShowNumberSign() && $data > 0 ? '+' : ''; diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php index e140c79586007..8dc712981ef87 100644 --- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php +++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php @@ -48,7 +48,7 @@ public function __construct( */ public function render(\Magento\Framework\Object $row) { - if ($data = $row->getData($this->getColumn()->getIndex())) { + if ($data = $this->_getValue($row)) { $currencyCode = $this->_getCurrencyCode($row); if (!$currencyCode) {