Merge pull request #57 from magento-south/BUGS

[South] Sprint 29 & Bug fixes
magento · Jan 30, 2015 · 3e8e126 · 3e8e126
2 parents f52e5db + 181fbaa
commit 3e8e126
Show file tree

Hide file tree

Showing 876 changed files with 8,004 additions and 6,545 deletions.
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml
@@ -13,16 +13,16 @@
  */
 ?>
 <div data-mage-init='{"modalPopup": {}}' class="fade critical-notification">
-    <div class="popup popup-<?php echo preg_replace('#[^a-z0-9]+#', '-', strtolower($this->getSeverityText())) ?>">
+    <div class="popup popup-<?php echo preg_replace('#[^a-z0-9]+#', '-', strtolower($block->getSeverityText())) ?>">
         <div class="popup-inner">
             <header class="popup-header">
-                <h2 class="popup-title"><?php echo $this->getHeaderText(); ?></h2>
+                <h2 class="popup-title"><?php echo $block->getHeaderText(); ?></h2>
             </header>
             <div class="popup-content">
-                <span><?php echo $this->getSeverityText();?></span>
-                <p class="message-text"><?php echo $this->getNoticeMessageText(); ?></p>
+                <span><?php echo $block->getSeverityText();?></span>
+                <p class="message-text"><?php echo $block->getNoticeMessageText(); ?></p>
 
-                <a href="<?php echo $this->getNoticeMessageUrl(); ?>"><?php echo $this->getReadDetailsText(); ?></a>
+                <a href="<?php echo $block->getNoticeMessageUrl(); ?>"><?php echo $block->getReadDetailsText(); ?></a>
             </div>
             <span class="close" data-dismiss="popup" title="<?php echo __('Close popup'); ?>"><?php echo __('Close'); ?></span>
         </div>

diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml
@@ -7,9 +7,9 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php /** @var $this \Magento\AdminNotification\Block\System\Messages */ ?>
+<?php /** @var $block \Magento\AdminNotification\Block\System\Messages */ ?>
 
-<?php $lastCritical = $this->getLastCritical();?>
+<?php $lastCritical = $block->getLastCritical();?>
 <div id="system_messages" class="message-system<?php if ($lastCritical): ?> message-system-unread<?php endif; ?>">
     <div class="message-system-inner">
         <?php if ($lastCritical): ?>
@@ -21,13 +21,13 @@
         <?php endif; ?>
         <div class="message-system-short">
             System Messages:
-            <?php if ($this->getCriticalCount()): ?>
-                <span class="error"><a href="#" title="<?php echo $this->escapeHtml(__('Critical System Messages'));?>"><?php echo $this->getCriticalCount();?></a></span>
+            <?php if ($block->getCriticalCount()): ?>
+                <span class="error"><a href="#" title="<?php echo $block->escapeHtml(__('Critical System Messages'));?>"><?php echo $block->getCriticalCount();?></a></span>
             <?php endif;?>
-            <?php if ($this->getMajorCount()): ?>
-               <span class="warning"><a href="#" title="<?php echo $this->escapeHtml(__('Major System Messages'));?>"><?php echo $this->getMajorCount();?></a></span>
+            <?php if ($block->getMajorCount()): ?>
+               <span class="warning"><a href="#" title="<?php echo $block->escapeHtml(__('Major System Messages'));?>"><?php echo $block->getMajorCount();?></a></span>
             <?php endif;?>
         </div>
-        <div id="message-system-all" title="<?php echo $this->escapeHtml(__('System messages'));?>" data-mage-init='<?php echo $this->escapeHtml($this->getSystemMessageDialogJson());?>'></div>
+        <div id="message-system-all" title="<?php echo $block->escapeHtml(__('System messages'));?>" data-mage-init='<?php echo $block->escapeHtml($block->getSystemMessageDialogJson());?>'></div>
     </div>
 </div>
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
@@ -7,11 +7,11 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php /** @var $this \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup */ ?>
-<div id="system_messages_list" title="<?php echo $this->escapeHtml($this->getPopupTitle()); ?>">
+<?php /** @var $block \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup */ ?>
+<div id="system_messages_list" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
     <ul class="message-system-list">
-        <?php foreach ($this->getUnreadMessages() as $message): ?>
-            <li class="<?php echo $this->getItemClass($message);?>">
+        <?php foreach ($block->getUnreadMessages() as $message): ?>
+            <li class="<?php echo $block->getItemClass($message);?>">
                 <?php echo $message->getText();?>
             </li>
         <?php endforeach;?>

diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml
@@ -8,39 +8,39 @@
 
 ?>
 <?php /** @var $this \Magento\AdminNotification\Block\ToolbarEntry */ ?>
-<?php $notificationCount = $this->getUnreadNotificationCount(); ?>
-<div data-mage-init='{"toolbarEntry": {}}' class="notifications-summary" data-notification-count="<?php echo $this->escapeHtml($notificationCount); ?>">
+<?php $notificationCount = $block->getUnreadNotificationCount(); ?>
+<div data-mage-init='{"toolbarEntry": {}}' class="notifications-summary" data-notification-count="<?php echo $block->escapeHtml($notificationCount); ?>">
     <?php if ($notificationCount > 0) : ?>
-        <a href="<?php echo $this->getUrl('adminhtml/notification/index'); ?>" class="action notifications-action" data-mage-init='{"dropdown":{}}' title="<?php echo __('Notifications'); ?>" data-toggle="dropdown">
+        <a href="<?php echo $block->getUrl('adminhtml/notification/index'); ?>" class="action notifications-action" data-mage-init='{"dropdown":{}}' title="<?php echo __('Notifications'); ?>" data-toggle="dropdown">
             <span class="text"><?php echo __('Notifications'); ?></span>
-            <span class="counter qty"><?php echo $this->escapeHtml($notificationCount); ?></span>
+            <span class="counter qty"><?php echo $block->escapeHtml($notificationCount); ?></span>
         </a>
-        <ul class="dropdown-menu notifications-list" data-mark-as-read-url="<?php echo $this->getUrl('adminhtml/notification/ajaxMarkAsRead'); ?>">
-            <?php foreach ($this->getLatestUnreadNotifications() as $notification) : ?>
+        <ul class="dropdown-menu notifications-list" data-mark-as-read-url="<?php echo $block->getUrl('adminhtml/notification/ajaxMarkAsRead'); ?>">
+            <?php foreach ($block->getLatestUnreadNotifications() as $notification) : ?>
             <?php /** @var $notification \Magento\AdminNotification\Model\Inbox*/ ?>
             <li class="notifications-entry<?php if ($notification->getSeverity() == 1): ?> notifications-critical<?php endif; ?>"
-                data-notification-id="<?php echo $this->escapeHtml($notification->getId()); ?>"
+                data-notification-id="<?php echo $block->escapeHtml($notification->getId()); ?>"
                 data-notification-severity="<?php if ($notification->getSeverity() == 1): ?>1<?php endif; ?>">
-                <strong class="notifications-entry-title"><?php echo $this->escapeHtml($notification->getTitle()); ?></strong>
-                <span class="notifications-entry-description"><?php echo $this->escapeHtml($notification->getDescription()); ?></span>
-                <time class="notifications-entry-time"><?php echo $this->escapeHtml($this->formatNotificationDate($notification->getDateAdded())); ?></time>
+                <strong class="notifications-entry-title"><?php echo $block->escapeHtml($notification->getTitle()); ?></strong>
+                <span class="notifications-entry-description"><?php echo $block->escapeHtml($notification->getDescription()); ?></span>
+                <time class="notifications-entry-time"><?php echo $block->escapeHtml($block->formatNotificationDate($notification->getDateAdded())); ?></time>
                 <button class="action close notifications-close"><span><?php echo __('Close'); ?></span></button>
                 <div class="notifications-dialog-content" data-title="<?php echo __('Notification'); ?>" data-cancel-caption="<?php echo  __('Cancel'); ?>" data-acknowledge-caption="<?php echo __('Acknowledge'); ?>">
-                    <strong class="notifications-entry-title"><?php echo $this->escapeHtml($notification->getTitle()); ?></strong>
-                    <span class="notifications-entry-description"><?php echo $this->escapeHtml($notification->getDescription()); ?></span>
+                    <strong class="notifications-entry-title"><?php echo $block->escapeHtml($notification->getTitle()); ?></strong>
+                    <span class="notifications-entry-description"><?php echo $block->escapeHtml($notification->getDescription()); ?></span>
                     <div class="actions notifications-entry-actions">
-                        <a class="notifications-url" href="<?php echo $this->escapeUrl($notification->getUrl()); ?>" target="_blank"><?php echo __('Read Details'); ?></a>
+                        <a class="notifications-url" href="<?php echo $block->escapeUrl($notification->getUrl()); ?>" target="_blank"><?php echo __('Read Details'); ?></a>
                     </div>
-                    <time class="notifications-entry-time"><?php echo $this->escapeHtml($this->formatNotificationDate($notification->getDateAdded())); ?></time>
+                    <time class="notifications-entry-time"><?php echo $block->escapeHtml($block->formatNotificationDate($notification->getDateAdded())); ?></time>
                 </div>
             </li>
             <?php endforeach; ?>
             <li class="last">
-                <a href="<?php echo $this->getUrl('adminhtml/notification/index'); ?>" class="action more notification-more"><?php echo __('See All (%1 unread)', $notificationCount); ?></a>
+                <a href="<?php echo $block->getUrl('adminhtml/notification/index'); ?>" class="action more notification-more"><?php echo __('See All (%1 unread)', $notificationCount); ?></a>
             </li>
         </ul>
     <?php else : ?>
-        <a href="<?php echo $this->getUrl('adminhtml/notification/index'); ?>" class="action notifications-action empty" title="<?php echo __('Notifications'); ?>">
+        <a href="<?php echo $block->getUrl('adminhtml/notification/index'); ?>" class="action notifications-action empty" title="<?php echo __('Notifications'); ?>">
             <span class="text"><?php echo __('Notifications'); ?></span>
         </a>
     <?php endif; ?>

diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
@@ -260,7 +260,9 @@ public function getGridIdsJson()
             return '';
         }
 
-        $gridIds = $this->getParentBlock()->getCollection()->getAllIds();
+        /** @var \Magento\Framework\Data\Collection $allIdsCollection */
+        $allIdsCollection = clone $this->getParentBlock()->getCollection();
+        $gridIds = $allIdsCollection->clear()->setPageSize(0)->getAllIds();
 
         if (!empty($gridIds)) {
             return join(",", $gridIds);

diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php
@@ -271,7 +271,9 @@ public function getGridIdsJson()
             return '';
         }
 
-        $gridIds = $this->getParentBlock()->getCollection()->getAllIds();
+        /** @var \Magento\Framework\Data\Collection $allIdsCollection */
+        $allIdsCollection = clone $this->getParentBlock()->getCollection();
+        $gridIds = $allIdsCollection->clear()->setPageSize(0)->getAllIds();
 
         if (!empty($gridIds)) {
             return join(",", $gridIds);

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml
@@ -13,7 +13,7 @@
  */
 ?>
 <h1 class="page-heading"><?php echo __('Access denied') ?></h1>
-<?php if (!$this->hasAvailableResources()): ?>
+<?php if (!$block->hasAvailableResources()): ?>
 <p>
 <?php echo __('Please try to log out and sign in again.') ?><br/>
 <?php echo __('If you continue to receive this message, please contact the store owner.') ?>

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/formkey.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/formkey.phtml
@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 ?>
-<div><input name="form_key" type="hidden" value="<?php echo $this->getFormKey() ?>" /></div>
+<div><input name="form_key" type="hidden" value="<?php echo $block->getFormKey() ?>" /></div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml
@@ -15,12 +15,12 @@
                     <div class="logo" title="<?php echo __('Magento Admin Panel') ?>"><span><?php echo __('Magento Admin Panel') ?></span></div>
                 </header>
                 <div id="messages" data-container-for="messages">
-                    <?php echo $this->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
+                    <?php echo $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
                 </div>
                 <form method="post" action="" id="login-form" data-mage-init='{"form": {}, "validation": {}}' autocomplete="off">
                     <fieldset class="fieldset">
                         <legend class="legend"><span><?php echo __('Welcome') ?></span></legend><br/>
-                        <input name="form_key" type="hidden" value="<?php echo $this->getFormKey() ?>" />
+                        <input name="form_key" type="hidden" value="<?php echo $block->getFormKey() ?>" />
                         <div class="field field-username">
                             <label for="username" class="label"><span><?php echo __('User Name:') ?></span></label>
                             <div class="control">
@@ -35,9 +35,9 @@
                                 <input type="password" id="login" name="login[password]" class="required-entry input-text" value="" placeholder="<?php echo __('password') ?>" />
                             </div>
                         </div>
-                        <?php echo $this->getChildHtml('form.additional.info'); ?>
+                        <?php echo $block->getChildHtml('form.additional.info'); ?>
                         <div class="form-actions">
-                            <?php echo $this->getChildHtml('form.buttons'); ?>
+                            <?php echo $block->getChildHtml('form.buttons'); ?>
                         </div>
                     </fieldset>
                 </form>
@@ -46,7 +46,7 @@
     </div>
     <footer class="footer">
         <div class="footer-content">
-            <div class="footer-copyright"><?php echo $this->getChildHtml('copyright');?></div>
+            <div class="footer-copyright"><?php echo $block->getChildHtml('copyright');?></div>
         </div>
     </footer>
 </div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/login_buttons.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/login_buttons.phtml
@@ -5,7 +5,7 @@
  */
 ?>
 <div class="actions">
-    <button <?php $this->getUiId(); ?> class="action-login primary" title="<?php echo __('Log in')?>" type="submit">
+    <button <?php $block->getUiId(); ?> class="action-login primary" title="<?php echo __('Log in')?>" type="submit">
         <span><?php echo __('Log in')?></span>
     </button>
 </div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/overlay_popup.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/overlay_popup.phtml
@@ -10,28 +10,28 @@
 <div class="wrapper-popup">
     <div class="middle" id="anchor-content">
         <div id="page:main-container">
-        <?php if ($this->getChildHtml('left')): ?>
-            <div class="columns <?php echo $this->getContainerCssClass() ?>" id="page:container">
+        <?php if ($block->getChildHtml('left')): ?>
+            <div class="columns <?php echo $block->getContainerCssClass() ?>" id="page:container">
                 <div id="page:left" class="side-col">
-                    <?php echo $this->getChildHtml('left') ?>
+                    <?php echo $block->getChildHtml('left') ?>
                 </div>
                 <div class="main-col" id="content">
                     <div class="main-col-inner">
-                        <div id="messages" data-container-for="messages"><?php echo $this->getLayout()->getMessagesBlock()->getGroupedHtml() ?></div>
-                        <?php echo $this->getChildHtml('content') ?>
+                        <div id="messages" data-container-for="messages"><?php echo $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?></div>
+                        <?php echo $block->getChildHtml('content') ?>
                     </div>
                 </div>
             </div>
       <?php else: ?>
-          <div id="messages" data-container-for="messages"><?php echo $this->getLayout()->getMessagesBlock()->getGroupedHtml() ?></div>
-          <?php echo $this->getChildHtml('content') ?>
+          <div id="messages" data-container-for="messages"><?php echo $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?></div>
+          <?php echo $block->getChildHtml('content') ?>
       <?php endif; ?>
          </div>
     </div>
-    <?php if ($this->getChildHtml('footer')): ?>
+    <?php if ($block->getChildHtml('footer')): ?>
     <div class="footer">
-        <?php echo $this->getChildHtml('footer') ?>
+        <?php echo $block->getChildHtml('footer') ?>
     </div>
     <?php endif; ?>
-    <?php echo $this->getChildHtml('js') ?>
+    <?php echo $block->getChildHtml('js') ?>
 </div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml
@@ -7,52 +7,52 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php /** @var $this \Magento\Backend\Block\Page */ ?>
+<?php /** @var $block \Magento\Backend\Block\Page */ ?>
 <!doctype html>
-<html lang="<?php echo $this->getLang() ?>" class="no-js">
+<html lang="<?php echo $block->getLang() ?>" class="no-js">
 
 <head>
-    <?php echo $this->getChildHtml('head') ?>
+    <?php echo $block->getChildHtml('head') ?>
 </head>
 
-<body id="html-body"<?php echo $this->getBodyClass() ? ' class="' . $this->getBodyClass() . '"' : ''; ?> data-container="body" data-mage-init='{"loaderAjax":{},"loader":{}}'>
+<body id="html-body"<?php echo $block->getBodyClass() ? ' class="' . $block->getBodyClass() . '"' : ''; ?> data-container="body" data-mage-init='{"loaderAjax":{},"loader":{}}'>
     <div class="page-wrapper">
-        <?php echo $this->getChildHtml('notification_window'); ?>
-        <?php echo $this->getChildHtml('global_notices') ?>
+        <?php echo $block->getChildHtml('notification_window'); ?>
+        <?php echo $block->getChildHtml('global_notices') ?>
         <div class="page-header-wrapper">
-            <?php echo $this->getChildHtml('header') ?>
+            <?php echo $block->getChildHtml('header') ?>
         </div>
-        <?php echo $this->getChildHtml('menu') ?>
-        <?php echo $this->getChildHtml('notifications'); ?>
+        <?php echo $block->getChildHtml('menu') ?>
+        <?php echo $block->getChildHtml('notifications'); ?>
 
         <section class="page-content" id="anchor-content">
-            <?php echo $this->getChildHtml('main-top'); ?>
+            <?php echo $block->getChildHtml('main-top'); ?>
             <div id="messages" data-container-for="messages" class="messages">
-                <?php echo $this->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
+                <?php echo $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
             </div>
-            <?php echo $this->getChildHtml('page_main_actions'); ?>
-            <?php if ($this->getChildHtml('left')): ?>
-                <div id="page:main-container" class="<?php echo $this->getContainerCssClass() ?> col-2-left-layout">
+            <?php echo $block->getChildHtml('page_main_actions'); ?>
+            <?php if ($block->getChildHtml('left')): ?>
+                <div id="page:main-container" class="<?php echo $block->getContainerCssClass() ?> col-2-left-layout">
                     <div class="main-col" id="content">
-                        <?php echo $this->getChildHtml('content') ?>
+                        <?php echo $block->getChildHtml('content') ?>
                     </div>
 
                     <div class="side-col" id="page:left">
-                        <?php echo $this->getChildHtml('left') ?>
+                        <?php echo $block->getChildHtml('left') ?>
                     </div>
                 </div>
             <?php else: ?>
                 <div id="page:main-container" class="col-1-layout">
-                    <?php echo $this->getChildHtml('content') ?>
+                    <?php echo $block->getChildHtml('content') ?>
                 </div>
             <?php endif; ?>
         </section>
 
-        <?php echo $this->getChildHtml('js') ?>
+        <?php echo $block->getChildHtml('js') ?>
         <div class="page-footer-wrapper">
-            <?php echo $this->getChildHtml('footer') ?>
+            <?php echo $block->getChildHtml('footer') ?>
         </div>
     </div>
-    <?php echo $this->getChildHtml('before_body_end') ?>
+    <?php echo $block->getChildHtml('before_body_end') ?>
 </body>
 </html>