Skip to content

Commit 69663a1

Browse files
magento-teammagento-team
committed
2.0.0.0-dev57
* Fixed bugs: * Fixed [MAP]: "Click for price" link is broken on the category page * Fixed tax rule search on the grid * Fixed redirect on dashboard if "Search", "Reset", "Export" buttons are clicked on several pages * Fixed switching user to alternate store-view when clicking on the Category (with Add Store Code to Urls="Yes" in the config) * Fixed printing Order/Shipping/Credit Memo from backend * Fixed 404 Error on attempt to print Shipping Label * Fixed duplication of JavaScript Resources in head on frontend * Fixed inconsistency with disabled states on Configurable product page in the Plushe theme * Fixed 3D Secure Information absence on Admin Order Info page * Fixed possibility to download or revert Backup * Fixed session fixation in user registration during checkout * Fixed fatal error during login to backend * Fixed inline translations in the Adminhtml area * Fixed partial refunds/invoices in Payflow Pro * Fixed the issue with ignoring area in design emulation * Fixed order placing with virtual product using Express Checkout * Fixed the error during order placement with Recurring profile payment * Fixed wrong redirect after customer registration during multishipping checkout * Fixed inability to crate shipping labels * Fixed inability to switch language, if the default language is English * Fixed an issue with incorrect XML appearing in cache after some actions on the frontend * Fixed product export * Fixed inability to configure memcache as session save handler * GitHub requests: * [#406](#406) -- Remove cast to (int) for the varch increment_id * [#425](#425) -- Installation of dev53 fails * [#324](#324) -- ImportExport: Easier debugging * Modularity improvements: * Removed \Magento\App\Helper\HelperFactory * Removed the "helper" method from the abstract block interface * Layout page type config moved to library * Design loader moved to library * Theme label moved to library * Remaining part from Adminhtml moved to the appropriate modules. Adminhtml module has been eliminated * Core Session and Cookie models decomposed and moved to library * \Magento\Stdlib\Cookie library created * Session Manager and Session Config interfaces provided * Session save handler interface created * Session storage interface created, session does not extend \Magento\Object anymore * Session validator interface created * Session generic wrapper moved to library * Messages functionality moved from the Session model as separate component, message manager interface created * Sid resolver interface created to handle session sid from request
1 parent 86db2ed commit 69663a1

File tree

1,839 files changed

+23982
-28569
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,839 files changed

+23982
-28569
lines changed

‎.htaccess

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
## adjust memory limit
3333

3434
# php_value memory_limit 64M
35-
php_value memory_limit 256M
35+
php_value memory_limit 2048M
3636
php_value max_execution_time 18000
3737

3838
############################################
@@ -176,7 +176,6 @@
176176
order allow,deny
177177
deny from all
178178
</Files>
179-
180179
############################################
181180
## If running in cluster environment, uncomment this
182181
## http://developer.yahoo.com/performance/rules.html#etags

‎CHANGELOG.md

+48-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,50 @@
1+
2.0.0.0-dev57
2+
=============
3+
* Fixed bugs:
4+
* Fixed [MAP]: "Click for price" link is broken on the category page
5+
* Fixed tax rule search on the grid
6+
* Fixed redirect on dashboard if "Search", "Reset", "Export" buttons are clicked on several pages
7+
* Fixed switching user to alternate store-view when clicking on the Category (with Add Store Code to Urls="Yes" in the config)
8+
* Fixed printing Order/Shipping/Credit Memo from backend
9+
* Fixed 404 Error on attempt to print Shipping Label
10+
* Fixed duplication of JavaScript Resources in head on frontend
11+
* Fixed inconsistency with disabled states on Configurable product page in the Plushe theme
12+
* Fixed 3D Secure Information absence on Admin Order Info page
13+
* Fixed possibility to download or revert Backup
14+
* Fixed session fixation in user registration during checkout
15+
* Fixed fatal error during login to backend
16+
* Fixed inline translations in the Adminhtml area
17+
* Fixed partial refunds/invoices in Payflow Pro
18+
* Fixed the issue with ignoring area in design emulation
19+
* Fixed order placing with virtual product using Express Checkout
20+
* Fixed the error during order placement with Recurring profile payment
21+
* Fixed wrong redirect after customer registration during multishipping checkout
22+
* Fixed inability to crate shipping labels
23+
* Fixed inability to switch language, if the default language is English
24+
* Fixed an issue with incorrect XML appearing in cache after some actions on the frontend
25+
* Fixed product export
26+
* Fixed inability to configure memcache as session save handler
27+
* GitHub requests:
28+
* [#406](https://github.com/magento/magento2/pull/406) -- Remove cast to (int) for the varch increment_id
29+
* [#425](https://github.com/magento/magento2/issues/425) -- Installation of dev53 fails
30+
* [#324](https://github.com/magento/magento2/pull/324) -- ImportExport: Easier debugging
31+
* Modularity improvements:
32+
* Removed \Magento\App\Helper\HelperFactory
33+
* Removed the "helper" method from the abstract block interface
34+
* Layout page type config moved to library
35+
* Design loader moved to library
36+
* Theme label moved to library
37+
* Remaining part from Adminhtml moved to the appropriate modules. Adminhtml module has been eliminated
38+
* Core Session and Cookie models decomposed and moved to library
39+
* \Magento\Stdlib\Cookie library created
40+
* Session Manager and Session Config interfaces provided
41+
* Session save handler interface created
42+
* Session storage interface created, session does not extend \Magento\Object anymore
43+
* Session validator interface created
44+
* Session generic wrapper moved to library
45+
* Messages functionality moved from the Session model as separate component, message manager interface created
46+
* Sid resolver interface created to handle session sid from request
47+
148
2.0.0.0-dev56
249
=============
350
* Fixed bugs:
@@ -23,7 +70,7 @@
2370
* Ability to delete API integrations that were not created using configuration files
2471
* Removed System REST menu item and all associated UX flows:
2572
* Users, Roles, and Webhook Subscriptions sub-menu items were removed
26-
* Removed the Webhook module
73+
* Removed the Webhook module until it can be refactored to use the new Authorization service
2774

2875
2.0.0.0-dev55
2976
=============

‎app/bootstrap.php

+3-4
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
/**#@+
5555
* Shortcut constants
5656
*/
57-
define('DS', DIRECTORY_SEPARATOR);
5857
define('BP', dirname(__DIR__));
5958
/**#@-*/
6059

@@ -65,10 +64,10 @@
6564

6665
require_once __DIR__ . '/autoload.php';
6766
\Magento\Autoload\IncludePath::addIncludePath(array(
68-
BP . DS . 'app' . DS . 'code',
69-
BP . DS . 'lib',
67+
BP . '/app/code',
68+
BP . '/lib',
7069
));
71-
$classMapPath = BP . DS . 'var/classmap.ser';
70+
$classMapPath = BP . '/var/classmap.ser';
7271
if (file_exists($classMapPath)) {
7372
require_once BP . '/lib/Magento/Autoload/ClassMap.php';
7473
$classMap = new \Magento\Autoload\ClassMap(BP);

‎app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php

+20-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,25 @@
2828
class Actions
2929
extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
3030
{
31+
/**
32+
* @var \Magento\Core\Helper\Url
33+
*/
34+
protected $_urlHelper;
35+
36+
/**
37+
* @param \Magento\Backend\Block\Context $context
38+
* @param \Magento\Core\Helper\Url $urlHelper
39+
* @param array $data
40+
*/
41+
public function __construct(
42+
\Magento\Backend\Block\Context $context,
43+
\Magento\Core\Helper\Url $urlHelper,
44+
array $data = array()
45+
) {
46+
$this->_urlHelper = $urlHelper;
47+
parent::__construct($context, $data);
48+
}
49+
3150
/**
3251
* Renders grid column
3352
*
@@ -46,7 +65,7 @@ public function render(\Magento\Object $row)
4665
__('Mark as Read') .'</a> | '
4766
: '';
4867

49-
$encodedUrl = $this->helper('Magento\Core\Helper\Url')->getEncodedUrl();
68+
$encodedUrl = $this->_urlHelper->getEncodedUrl();
5069
return sprintf('%s%s<a href="%s" onClick="deleteConfirm(\'%s\', this.href); return false;">%s</a>',
5170
$readDetailsHtml,
5271
$markAsReadHtml,

‎app/code/Magento/AdminNotification/Block/System/Messages.php

+9-1
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,24 @@ class Messages extends \Magento\Backend\Block\Template
3232
*/
3333
protected $_messages;
3434

35+
/**
36+
* @var \Magento\Core\Helper\Data
37+
*/
38+
protected $_coreHelper;
39+
3540
/**
3641
* @param \Magento\Backend\Block\Template\Context $context
3742
* @param \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages
43+
* @param \Magento\Core\Helper\Data $coreHelper
3844
* @param array $data
3945
*/
4046
public function __construct(
4147
\Magento\Backend\Block\Template\Context $context,
4248
\Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages,
49+
\Magento\Core\Helper\Data $coreHelper,
4350
array $data = array()
4451
) {
52+
$this->_coreHelper = $coreHelper;
4553
parent::__construct($context, $data);
4654
$this->_messages = $messages;
4755
}
@@ -124,7 +132,7 @@ protected function _getMessagesUrl()
124132
*/
125133
public function getSystemMessageDialogJson()
126134
{
127-
return $this->helper('Magento\Core\Helper\Data')->jsonEncode(array(
135+
return $this->_coreHelper->jsonEncode(array(
128136
'systemMessageDialog' => array(
129137
'autoOpen' => false,
130138
'width' => 600,

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification.php

+17-23
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,12 @@ public function markAsReadAction()
4949
try {
5050
$this->_objectManager->create('Magento\AdminNotification\Model\NotificationService')
5151
->markAsRead($notificationId);
52-
$this->_session->addSuccess(
53-
__('The message has been marked as Read.')
54-
);
52+
$this->messageManager->addSuccess(__('The message has been marked as Read.'));
5553
} catch (\Magento\Core\Exception $e) {
56-
$this->_session->addError($e->getMessage());
54+
$this->messageManager->addError($e->getMessage());
5755
} catch (\Exception $e) {
58-
$this->_session->addException($e,
56+
$this->messageManager->addException(
57+
$e,
5958
__("We couldn't mark the notification as Read because of an error.")
6059
);
6160
}
@@ -92,7 +91,7 @@ public function massMarkAsReadAction()
9291
{
9392
$ids = $this->getRequest()->getParam('notification');
9493
if (!is_array($ids)) {
95-
$this->_session->addError(__('Please select messages.'));
94+
$this->messageManager->addError(__('Please select messages.'));
9695
} else {
9796
try {
9897
foreach ($ids as $id) {
@@ -103,13 +102,12 @@ public function massMarkAsReadAction()
103102
->save();
104103
}
105104
}
106-
$this->_getSession()->addSuccess(
107-
__('A total of %1 record(s) have been marked as Read.', count($ids))
108-
);
105+
$this->messageManager->addSuccess(__('A total of %1 record(s) have been marked as Read.', count($ids)));
109106
} catch (\Magento\Core\Exception $e) {
110-
$this->_session->addError($e->getMessage());
107+
$this->messageManager->addError($e->getMessage());
111108
} catch (\Exception $e) {
112-
$this->_session->addException($e,
109+
$this->messageManager->addException(
110+
$e,
113111
__("We couldn't mark the notification as Read because of an error.")
114112
);
115113
}
@@ -131,13 +129,14 @@ public function removeAction()
131129
try {
132130
$model->setIsRemove(1)
133131
->save();
134-
$this->_session->addSuccess(
132+
$this->messageManager->addSuccess(
135133
__('The message has been removed.')
136134
);
137135
} catch (\Magento\Core\Exception $e) {
138-
$this->_session->addError($e->getMessage());
136+
$this->messageManager->addError($e->getMessage());
139137
} catch (\Exception $e) {
140-
$this->_session->addException($e,
138+
$this->messageManager->addException(
139+
$e,
141140
__("We couldn't remove the messages because of an error.")
142141
);
143142
}
@@ -152,9 +151,7 @@ public function massRemoveAction()
152151
{
153152
$ids = $this->getRequest()->getParam('notification');
154153
if (!is_array($ids)) {
155-
$this->_session->addError(
156-
__('Please select messages.')
157-
);
154+
$this->messageManager->addError(__('Please select messages.'));
158155
} else {
159156
try {
160157
foreach ($ids as $id) {
@@ -165,14 +162,11 @@ public function massRemoveAction()
165162
->save();
166163
}
167164
}
168-
$this->_getSession()->addSuccess(
169-
__('Total of %1 record(s) have been removed.', count($ids))
170-
);
165+
$this->messageManager->addSuccess(__('Total of %1 record(s) have been removed.', count($ids)));
171166
} catch (\Magento\Core\Exception $e) {
172-
$this->_session->addError($e->getMessage());
167+
$this->messageManager->addError($e->getMessage());
173168
} catch (\Exception $e) {
174-
$this->_session->addException($e,
175-
__("We couldn't remove the messages because of an error."));
169+
$this->messageManager->addException($e, __("We couldn't remove the messages because of an error."));
176170
}
177171
}
178172
$this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));

‎app/code/Magento/AdminNotification/etc/adminhtml/menu.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@
2727
-->
2828
<config>
2929
<menu>
30-
<add id="Magento_AdminNotification::system_adminnotification" title="Notifications" module="Magento_AdminNotification" sortOrder="10" parent="Magento_Adminhtml::system_other_settings" action="adminhtml/notification" resource="Magento_AdminNotification::adminnotification"/>
30+
<add id="Magento_AdminNotification::system_adminnotification" title="Notifications" module="Magento_AdminNotification" sortOrder="10" parent="Magento_Backend::system_other_settings" action="adminhtml/notification" resource="Magento_AdminNotification::adminnotification"/>
3131
</menu>
3232
</config>

‎app/code/Magento/AdminNotification/etc/adminhtml/routes.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<config>
2727
<router id="admin">
2828
<route id="adminhtml">
29-
<module name="Magento_AdminNotification_Adminhtml" before="Magento_Adminhtml" />
29+
<module name="Magento_AdminNotification" before="Magento_Adminhtml" />
3030
</route>
3131
</router>
32-
</config>
32+
</config>

‎app/code/Magento/AdminNotification/etc/module.xml

-2
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,9 @@
2727
<module name="Magento_AdminNotification" version="2.0.0.0" active="true">
2828
<sequence>
2929
<module name="Magento_Core"/>
30-
<module name="Magento_Adminhtml"/>
3130
</sequence>
3231
<depends>
3332
<module name="Magento_Core"/>
34-
<module name="Magento_Adminhtml"/>
3533
<module name="Magento_Backend"/>
3634
<module name="Magento_Theme"/>
3735
</depends>

‎app/code/Magento/Adminhtml/Block/Widget/Button.php

-38
This file was deleted.

‎app/code/Magento/Adminhtml/Block/Widget/Container.php

-38
This file was deleted.

0 commit comments

Comments
 (0)