2.0.0.0-dev55

* Modularity improvements: * Session configuration moved to library * FormKey logic was moved from Session * SessionIdFlags from Session was removed * Move Page logic to the Theme module and library * Created integration module UX * Created authorization service (Magento_Authz module) * Fixed bugs: * Fixed the issue that prevented a customer group's shopping cart rules from applying properly to prices. The issue occurred when a customer was manually assigned to a customer group and automatic group assignment was enabled. * Fixed the bug with schema upgrade scripts not running after installation * Fixed the error with a blank page when user tries to get access to a restricted resource via URL (add Secret Key for URL set to "No")
magento · Dec 6, 2013 · 28dcec2 · 28dcec2
1 parent 6e24c0b
commit 28dcec2
Show file tree

Hide file tree

Showing 1,943 changed files with 21,996 additions and 14,989 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+2.0.0.0-dev55
+=============
+* Modularity improvements:
+  * Session configuration moved to library
+  * FormKey logic was moved from Session
+  * SessionIdFlags from Session was removed
+  * Move Page logic to the Theme module and library
+* Created integration module UX
+* Created authorization service (Magento_Authz module)
+* Fixed bugs:
+  * Fixed the issue that prevented a customer group's shopping cart rules from applying properly to prices. The issue occurred when a customer was manually assigned to a customer group and automatic group assignment was enabled.
+  * Fixed the bug with schema upgrade scripts not running after installation
+  * Fixed the error with a blank page when user tries to get access to a restricted resource via URL (add Secret Key for URL set to "No")
+
 2.0.0.0-dev54
 =============
 * Modularity improvements:

diff --git a/app/code/Magento/AdminNotification/Block/System/Messages.php b/app/code/Magento/AdminNotification/Block/System/Messages.php
@@ -32,19 +32,17 @@ class Messages extends \Magento\Backend\Block\Template
      */
     protected $_messages;
 
-    /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
-     * @param \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages
-     * @param array $data
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages
+     * @param array $data
      */
-    public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
-        \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages,
-        array $data = array()
-    ) {
-        parent::__construct($context, $coreData, $data);
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages,
+        array $data = array()
+    ) {
+        parent::__construct($context, $data);
         $this->_messages = $messages;
     }
 

diff --git a/app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php b/app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php
@@ -42,19 +42,17 @@ class UnreadMessagePopup extends \Magento\Backend\Block\Template
      */
     protected $_messages;
 
-    /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
-     * @param \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages
-     * @param array $data
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages
+     * @param array $data
      */
-    public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
-        \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages,
-        array $data = array()
-    ) {
-        parent::__construct($context, $coreData, $data);
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages,
+        array $data = array()
+    ) {
+        parent::__construct($context, $data);
         $this->_messages = $messages;
     }
 

diff --git a/app/code/Magento/AdminNotification/Block/ToolbarEntry.php b/app/code/Magento/AdminNotification/Block/ToolbarEntry.php
@@ -42,19 +42,17 @@ class ToolbarEntry extends \Magento\Backend\Block\Template
      */
     protected $_notificationList;
 
-    /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
-     * @param \Magento\AdminNotification\Model\Resource\Inbox\Collection\Unread $notificationList
-     * @param array $data
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\AdminNotification\Model\Resource\Inbox\Collection\Unread $notificationList
+     * @param array $data
      */
-    public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
-        \Magento\AdminNotification\Model\Resource\Inbox\Collection\Unread $notificationList,
-        array $data = array()
-    ) {
-        parent::__construct($context, $coreData, $data);
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\AdminNotification\Model\Resource\Inbox\Collection\Unread $notificationList,
+        array $data = array()
+    ) {
+        parent::__construct($context, $data);
         $this->_notificationList = $notificationList;
     }
 

diff --git a/app/code/Magento/AdminNotification/Block/Window.php b/app/code/Magento/AdminNotification/Block/Window.php
@@ -60,21 +60,19 @@ class Window extends \Magento\Backend\Block\Template
      */
     protected $_latestItem;
 
-    /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
-     * @param \Magento\Backend\Model\Auth\Session $authSession
-     * @param \Magento\AdminNotification\Model\Resource\Inbox\Collection\Critical $criticalCollection
-     * @param array $data
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Backend\Model\Auth\Session $authSession
+     * @param \Magento\AdminNotification\Model\Resource\Inbox\Collection\Critical $criticalCollection
+     * @param array $data
      */
-    public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
-        \Magento\Backend\Model\Auth\Session $authSession,
-        \Magento\AdminNotification\Model\Resource\Inbox\Collection\Critical $criticalCollection,
-        array $data = array()
-    ) {
-        parent::__construct($context, $coreData, $data);
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Backend\Model\Auth\Session $authSession,
+        \Magento\AdminNotification\Model\Resource\Inbox\Collection\Critical $criticalCollection,
+        array $data = array()
+    ) {
+        parent::__construct($context, $data);
         $this->_authSession = $authSession;
         $this->_criticalCollection = $criticalCollection;
     }

diff --git a/app/code/Magento/AdminNotification/Model/Resource/System/Message/Collection.php b/app/code/Magento/AdminNotification/Model/Resource/System/Message/Collection.php
@@ -42,23 +42,25 @@ class Collection
     protected $_countBySeverity = array();
 
     /**
-     * @param \Magento\Event\ManagerInterface $eventManager
+     * @param \Magento\Core\Model\EntityFactory $entityFactory
      * @param \Magento\Logger $logger
      * @param \Magento\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
-     * @param \Magento\Core\Model\EntityFactory $entityFactory
+     * @param \Magento\Event\ManagerInterface $eventManager
      * @param \Magento\AdminNotification\Model\System\MessageList $messageList
+     * @param mixed $connection
      * @param \Magento\Core\Model\Resource\Db\AbstractDb $resource
      */
     public function __construct(
-        \Magento\Event\ManagerInterface $eventManager,
+        \Magento\Core\Model\EntityFactory $entityFactory,
         \Magento\Logger $logger,
         \Magento\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
-        \Magento\Core\Model\EntityFactory $entityFactory,
+        \Magento\Event\ManagerInterface $eventManager,
         \Magento\AdminNotification\Model\System\MessageList $messageList,
+        $connection = null,
         \Magento\Core\Model\Resource\Db\AbstractDb $resource = null
     ) {
         $this->_messageList = $messageList;
-        parent::__construct($eventManager, $logger, $fetchStrategy, $entityFactory, $resource);
+        parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $connection, $resource);
     }
 
     /**

diff --git a/app/code/Magento/AdminNotification/etc/module.xml b/app/code/Magento/AdminNotification/etc/module.xml
@@ -33,7 +33,7 @@
             <module name="Magento_Core"/>
             <module name="Magento_Adminhtml"/>
             <module name="Magento_Backend"/>
-            <module name="Magento_Page"/>
+            <module name="Magento_Theme"/>
         </depends>
     </module>
 </config>
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml b/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml
@@ -31,7 +31,7 @@
             <block class="Magento\AdminNotification\Block\Window" name="notification_window" as="notification_window" acl="Magento_AdminNotification::show_toolbar" template="notification/window.phtml"/>
         </container>
         <referenceBlock name="head">
-            <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminnotification-system-notification-js">
+            <block class="Magento\Theme\Block\Html\Head\Script" name="magento-adminnotification-system-notification-js">
                 <arguments>
                     <argument name="file" xsi:type="string">Magento_AdminNotification::system/notification.js</argument>
                 </arguments>
@@ -42,12 +42,12 @@
         <block class="Magento\AdminNotification\Block\ToolbarEntry" template="toolbar_entry.phtml" before="-"/>
     </referenceBlock>
     <referenceBlock name="head">
-        <block class="Magento\Page\Block\Html\Head\Css" name="magento-core-prototype-magento-css">
+        <block class="Magento\Theme\Block\Html\Head\Css" name="magento-core-prototype-magento-css">
             <arguments>
                 <argument name="file" xsi:type="string">Magento_Core::prototype/magento.css</argument>
             </arguments>
         </block>
-        <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminnotification-toolbar-entry-js">
+        <block class="Magento\Theme\Block\Html\Head\Script" name="magento-adminnotification-toolbar-entry-js">
             <arguments>
                 <argument name="file" xsi:type="string">Magento_AdminNotification::toolbar_entry.js</argument>
             </arguments>

diff --git a/app/code/Magento/AdminNotification/view/adminhtml/notification/window.phtml b/app/code/Magento/AdminNotification/view/adminhtml/notification/window.phtml
@@ -39,7 +39,7 @@
                 <span><?php echo $this->getSeverityText();?></span>
                 <p class="message-text"><?php echo $this->getNoticeMessageText(); ?></p>
 
-                <a href="<?php echo $this->getNoticeMessageUrl(); ?>" class="action-more"><?php echo $this->getReadDetailsText(); ?></a>
+                <a href="<?php echo $this->getNoticeMessageUrl(); ?>"><?php echo $this->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/system/messages/popup.phtml b/app/code/Magento/AdminNotification/view/adminhtml/system/messages/popup.phtml
@@ -34,10 +34,19 @@
 </div>
 <script type="text/javascript">
     jQuery(function() {
-        jQuery( "#system_messages_list" ).dialog({
+        jQuery("#system_messages_list").dialog({
             autoOpen: true,
             resizable: false,
-            width: 650
+            width: 650,
+            position: {
+                using: function(pos) {
+                    jQuery(this).css({
+                        "position": "absolute",
+                        "top": Math.ceil(jQuery(window).height()/2 - jQuery(this).height()/2),
+                        "left": pos.left
+                    });
+                }
+            }
         });
     });
 </script>
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/toolbar_entry.js b/app/code/Magento/AdminNotification/view/adminhtml/toolbar_entry.js
@@ -39,11 +39,10 @@
                 showLoader: false
             });
         };
-
+        var notificationCount = $('.notifications').attr('data-notification-count');
         // Remove notification from the list
         var removeNotificationFromList = function(notificationEntry) {
             notificationEntry.remove();
-            var notificationCount = $('.notifications').attr('data-notification-count');
             notificationCount--;
             $('.notifications').attr('data-notification-count', notificationCount);
 
@@ -54,6 +53,7 @@
                 notificationIcon.removeAttr('data-toggle');
                 notificationIcon.off('click.dropdown');
                 $('.notifications .notifications-icon .value').text('');
+                $('.notifications .notifications-icon .value').hide();
             } else {
                 $('.notifications .notifications-icon .value').text(notificationCount);
                 // Modify caption of the 'See All' link
@@ -114,5 +114,12 @@
             removeNotificationFromList(notificationEntry);
             event.stopPropagation();
         });
+
+        // Hide notifications bubble
+        if (notificationCount == 0) {
+            $('.notifications .notifications-icon .value').hide();
+        } else {
+            $('.notifications .notifications-icon .value').show();
+        }
     });
 })(window.jQuery);
diff --git a/app/code/Magento/Adminhtml/Block/Urlrewrite.php b/app/code/Magento/Adminhtml/Block/Urlrewrite.php
@@ -50,20 +50,18 @@ class Urlrewrite extends \Magento\Adminhtml\Block\Widget\Grid\Container
      */
     protected $_urlrewriteSelector;
 
-    /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
-     * @param \Magento\Adminhtml\Block\Urlrewrite\Selector $urlrewriteSelector
-     * @param array $data
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Adminhtml\Block\Urlrewrite\Selector $urlrewriteSelector
+     * @param array $data
      */
-    public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
-        \Magento\Adminhtml\Block\Urlrewrite\Selector $urlrewriteSelector,
-        array $data = array()
-    ) {
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Adminhtml\Block\Urlrewrite\Selector $urlrewriteSelector,
+        array $data = array()
+    ) {
         $this->_urlrewriteSelector = $urlrewriteSelector;
-        parent::__construct($context, $coreData, $data);
+        parent::__construct($context, $data);
     }
 
     /**

diff --git a/app/code/Magento/Adminhtml/Block/Urlrewrite/Catalog/Category/Edit.php b/app/code/Magento/Adminhtml/Block/Urlrewrite/Catalog/Category/Edit.php
@@ -45,24 +45,22 @@ class Edit
      */
     protected $_categoryFactory;
 
-    /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
-     * @param \Magento\Core\Model\Url\RewriteFactory $rewriteFactory
-     * @param \Magento\Backend\Helper\Data $adminhtmlData
-     * @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
-     * @param array $data
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Core\Model\Url\RewriteFactory $rewriteFactory
+     * @param \Magento\Backend\Helper\Data $adminhtmlData
+     * @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
+     * @param array $data
      */
-    public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Core\Helper\Data $coreData,
-        \Magento\Core\Model\Url\RewriteFactory $rewriteFactory,
-        \Magento\Backend\Helper\Data $adminhtmlData,
-        \Magento\Catalog\Model\CategoryFactory $categoryFactory,
-        array $data = array()
-    ) {
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Core\Model\Url\RewriteFactory $rewriteFactory,
+        \Magento\Backend\Helper\Data $adminhtmlData,
+        \Magento\Catalog\Model\CategoryFactory $categoryFactory,
+        array $data = array()
+    ) {
         $this->_categoryFactory = $categoryFactory;
-        parent::__construct($context, $coreData, $rewriteFactory, $adminhtmlData, $data);
+        parent::__construct($context, $rewriteFactory, $adminhtmlData, $data);
     }
 
     /**