Merge pull request #8 from myekaterynenko/develop

[Github] Merge public Github commits
magento · Dec 26, 2014 · f62afbb · f62afbb
2 parents 9ec1d8f + beb5e00
commit f62afbb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 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
@@ -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
@@ -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) {

diff --git 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

diff --git 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());