Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into MAGETWO-43857-in…
Browse files Browse the repository at this point in the history 
…validate-cache

Conflicts:
	app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php
	app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php
	app/code/Magento/Config/Model/Config/Backend/Translate.php
	app/code/Magento/Contact/Test/Unit/Model/System/Config/Backend/LinksTest.php
	app/code/Magento/Rss/Model/System/Config/Backend/Links.php
	app/code/Magento/Theme/Model/Design/Backend/Theme.php
	lib/internal/Magento/Framework/App/Config/Value.php
  • Loading branch information
Joan He committed Oct 21, 2015
2 parents 4628934 + 0be91a5 commit 18bf1a3
Show file tree
Hide file tree
Showing 1,502 changed files with 21,946 additions and 16,896 deletions.
7 changes: 2 additions & 5 deletions app/code/Magento/AdminNotification/Block/System/Messages.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,8 @@ public function getSystemMessageDialogJson()
return $this->jsonHelper->jsonEncode(
[
'systemMessageDialog' => [
'autoOpen' => false,
'width' => '75%',
'modal' => true,
'minHeight' => '0',
'dialogClass' => 'ui-dialog-active ui-popup-message',
'buttons' => [],
'modalClass' => 'ui-dialog-active ui-popup-message modal-system-messages',
'ajaxUrl' => $this->_getMessagesUrl()
],
]
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/AdminNotification/Model/Feed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class Feed extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Framework\App\DeploymentConfig $deploymentConfig
* @param \Magento\Framework\App\ProductMetadataInterface $productMetadata
* @param \Magento\Framework\UrlInterface $urlBuilder
* @param \Magento\Framework\Model\ModelResource\AbstractResource $resource
* @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
* @param array $data
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
Expand All @@ -86,7 +86,7 @@ public function __construct(
\Magento\Framework\App\DeploymentConfig $deploymentConfig,
\Magento\Framework\App\ProductMetadataInterface $productMetadata,
\Magento\Framework\UrlInterface $urlBuilder,
\Magento\Framework\Model\ModelResource\AbstractResource $resource = null,
\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
array $data = []
) {
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Collection extends \Magento\AdminNotification\Model\ResourceModel\Inbox\Co
/**
* Add remove filter
*
* @return \Magento\AdminNotification\Model\ResourceModel\Grid\Collection|\Magento\Framework\Model\ModelResource\Db\Collection\AbstractCollection
* @return \Magento\AdminNotification\Model\ResourceModel\Grid\Collection|\Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
*/
protected function _initSelect()
{
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Model/ResourceModel/Inbox.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* @author Magento Core Team <[email protected]>
*/
class Inbox extends \Magento\Framework\Model\ModelResource\Db\AbstractDb
class Inbox extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
{
/**
* AdminNotification Resource initialization
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* @author Magento Core Team <[email protected]>
*/
class Collection extends \Magento\Framework\Model\ModelResource\Db\Collection\AbstractCollection
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
{
/**
* Resource collection initialization
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Critical.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/
namespace Magento\AdminNotification\Model\ResourceModel\Inbox\Collection;

class Critical extends \Magento\Framework\Model\ModelResource\Db\Collection\AbstractCollection
class Critical extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
{
/**
* Resource collection initialization
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Model/ResourceModel/System/Message.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
namespace Magento\AdminNotification\Model\ResourceModel\System;

class Message extends \Magento\Framework\Model\ModelResource\Db\AbstractDb
class Message extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
{
/**
* Flag that notifies whether Primary key of table is auto-incremeted
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/AdminNotification/Model/ResourceModel/System/Message/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
namespace Magento\AdminNotification\Model\ResourceModel\System\Message;

class Collection extends \Magento\Framework\Model\ModelResource\Db\Collection\AbstractCollection
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
{
/**
* System message list
Expand All @@ -28,7 +28,7 @@ class Collection extends \Magento\Framework\Model\ModelResource\Db\Collection\Ab
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\Notification\MessageList $messageList
* @param mixed $connection
* @param \Magento\Framework\Model\ModelResource\Db\AbstractDb $resource
* @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
*/
public function __construct(
\Magento\Framework\Data\Collection\EntityFactory $entityFactory,
Expand All @@ -37,7 +37,7 @@ public function __construct(
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\Notification\MessageList $messageList,
\Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
\Magento\Framework\Model\ModelResource\Db\AbstractDb $resource = null
\Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
) {
$this->_messageList = $messageList;
parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $connection, $resource);
Expand Down
2 changes: 1 addition & 1 deletion .../Magento/AdminNotification/Model/ResourceModel/System/Message/Collection/Synchronized.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class Synchronized extends \Magento\AdminNotification\Model\ResourceModel\System
/**
* Store new messages in database and remove outdated messages
*
* @return $this|\Magento\Framework\Model\ModelResource\Db\AbstractDb
* @return $this|\Magento\Framework\Model\ResourceModel\Db\AbstractDb
*/
public function _afterLoad()
{
Expand Down
36 changes: 12 additions & 24 deletions app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
?>
<?php /** @var $block \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup */ ?>

<div style="display:none" id="system_messages_list" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
<ul class="message-system-list">
<div style="display:none" id="system_messages_list" data-role="system_messages_list" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
<ul class="message-system-list messages">
<?php foreach ($block->getUnreadMessages() as $message): ?>
<li class="message message-warning <?php /* @escapeNotVerified */ echo $block->getItemClass($message);?>">
<?php /* @escapeNotVerified */ echo $message->getText();?>
Expand All @@ -22,29 +22,17 @@
<script>
require([
"jquery",
"jquery/ui"
"Magento_Ui/js/modal/modal"
], function($){

$(function() {
$("#system_messages_list").dialog({
autoOpen: true,
resizable: false,
width: '75%',
modal: true,
minHeight: '0',
dialogClass: 'ui-popup-message',
position: {
my: 'left+12.5% top',
at: 'center top',
of: 'body'
},
open: function() {
$(this).closest('.ui-dialog').addClass('ui-dialog-active');

var topMargin = $(this).closest('.ui-dialog').children('.ui-dialog-titlebar').outerHeight() + 10;
$(this).closest('.ui-dialog').css('margin-top', topMargin);
}
if (this.modal) {
this.modal.html($('[data-role="system_messages_list"]').html());
} else {
this.modal = $('[data-role="system_messages_list"]').modal({
modalClass: 'modal-system-messages ui-popup-message',
type: 'popup',
buttons: []
});
});
}
this.modal.modal('openModal');
});
</script>
21 changes: 16 additions & 5 deletions app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@
define([
'jquery',
'mage/template',
'jquery/ui'
'jquery/ui',
'Magento_Ui/js/modal/modal'
], function ($, mageTemplate) {
'use strict';

$.widget('mage.systemMessageDialog', $.ui.dialog, {
$.widget('mage.systemMessageDialog', $.mage.modal, {
options: {
modalClass: 'modal-system-messages',
systemMessageTemplate:
'<% _.each(data.items, function(item) { %>' +
'<li class="message message-warning <% if (item.severity == 1) { %>error<% } else { %>warning<% } %>">' +
Expand All @@ -19,8 +21,14 @@ define([
'<% }); %>'
},

open: function (severity) {
_create: function() {
this.options.title = $('#message-system-all').attr('title');
this._super();
},

openModal: function (severity) {
var superMethod = $.proxy(this._super, this);
//this.modal.options

$.ajax({
url: this.options.ajaxUrl,
Expand All @@ -47,16 +55,19 @@ define([
}, this));

return this;
},
closeModal: function () {
this._super();
}
});

$(document).ready(function () {
$('#system_messages .message-system-short .error').on('click', function () {
$('#message-system-all').systemMessageDialog('open', 1);
$('#message-system-all').systemMessageDialog('openModal', 1);
});

$('#system_messages .message-system-short .warning').on('click', function () {
$('#message-system-all').systemMessageDialog('open', 2);
$('#message-system-all').systemMessageDialog('openModal', 2);
});
});

Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Authorization/Model/ResourceModel/Permissions/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* @author Magento Core Team <[email protected]>
*/
class Collection extends \Magento\Framework\Model\ModelResource\Db\Collection\AbstractCollection
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
{
/**
* Initialize resource
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Authorization/Model/ResourceModel/Role.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
/**
* Admin role resource model
*/
class Role extends \Magento\Framework\Model\ModelResource\Db\AbstractDb
class Role extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
{
/**
* Rule table
Expand All @@ -32,13 +32,13 @@ class Role extends \Magento\Framework\Model\ModelResource\Db\AbstractDb
protected $dateTime;

/**
* @param \Magento\Framework\Model\ModelResource\Db\Context $context
* @param \Magento\Framework\Model\ResourceModel\Db\Context $context
* @param \Magento\Framework\App\CacheInterface $cache
* @param \Magento\Framework\Stdlib\DateTime $dateTime
* @param string $connectionName
*/
public function __construct(
\Magento\Framework\Model\ModelResource\Db\Context $context,
\Magento\Framework\Model\ResourceModel\Db\Context $context,
\Magento\Framework\App\CacheInterface $cache,
\Magento\Framework\Stdlib\DateTime $dateTime,
$connectionName = null
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Authorization/Model/ResourceModel/Role/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
/**
* Admin role collection
*/
class Collection extends \Magento\Framework\Model\ModelResource\Db\Collection\AbstractCollection
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
{
/**
* Initialize resource model
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Authorization/Model/ResourceModel/Rules.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/**
* Admin rule resource model
*/
class Rules extends \Magento\Framework\Model\ModelResource\Db\AbstractDb
class Rules extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
{
/**
* Root ACL resource
Expand All @@ -38,15 +38,15 @@ class Rules extends \Magento\Framework\Model\ModelResource\Db\AbstractDb
protected $_logger;

/**
* @param \Magento\Framework\Model\ModelResource\Db\Context $context
* @param \Magento\Framework\Model\ResourceModel\Db\Context $context
* @param \Magento\Framework\Acl\Builder $aclBuilder
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Acl\RootResource $rootResource
* @param \Magento\Framework\Acl\CacheInterface $aclCache
* @param string $connectionName
*/
public function __construct(
\Magento\Framework\Model\ModelResource\Db\Context $context,
\Magento\Framework\Model\ResourceModel\Db\Context $context,
\Magento\Framework\Acl\Builder $aclBuilder,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Acl\RootResource $rootResource,
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Authorization/Model/ResourceModel/Rules/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* @author Magento Core Team <[email protected]>
*/
class Collection extends \Magento\Framework\Model\ModelResource\Db\Collection\AbstractCollection
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
{
/**
* Initialize resource model
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Authorizenet/Model/Authorizenet.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ abstract class Authorizenet extends \Magento\Payment\Model\Method\Cc
* @param \Magento\Authorizenet\Model\Request\Factory $requestFactory
* @param \Magento\Authorizenet\Model\Response\Factory $responseFactory
* @param \Magento\Authorizenet\Model\TransactionService $transactionService
* @param \Magento\Framework\Model\ModelResource\AbstractResource $resource
* @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
* @param array $data
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
Expand All @@ -130,7 +130,7 @@ public function __construct(
\Magento\Authorizenet\Model\Request\Factory $requestFactory,
\Magento\Authorizenet\Model\Response\Factory $responseFactory,
TransactionService $transactionService,
\Magento\Framework\Model\ModelResource\AbstractResource $resource = null,
\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
array $data = []
) {
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Authorizenet/Model/Directpost.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet implements Tra
* @param \Magento\Quote\Model\QuoteRepository $quoteRepository
* @param OrderSender $orderSender
* @param \Magento\Sales\Api\TransactionRepositoryInterface $transactionRepository
* @param \Magento\Framework\Model\ModelResource\AbstractResource $resource
* @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
* @param array $data
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
Expand All @@ -161,7 +161,7 @@ public function __construct(
\Magento\Quote\Model\QuoteRepository $quoteRepository,
\Magento\Sales\Model\Order\Email\Sender\OrderSender $orderSender,
\Magento\Sales\Api\TransactionRepositoryInterface $transactionRepository,
\Magento\Framework\Model\ModelResource\AbstractResource $resource = null,
\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
array $data = []
) {
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Authorizenet/Model/ResourceModel/Debug.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
/**
* Resource Authorize.net debug model
*/
class Debug extends \Magento\Framework\Model\ModelResource\Db\AbstractDb
class Debug extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
{
/**
* Resource initialization
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Authorizenet/Model/ResourceModel/Debug/Collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
/**
* Resource Authorize.net debug collection model
*/
class Collection extends \Magento\Framework\Model\ModelResource\Db\Collection\AbstractCollection
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
{
/**
* Resource initialization
Expand Down
15 changes: 9 additions & 6 deletions app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/info.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
*/

// @codingStandardsIgnoreFile

/**
* @var \Magento\Authorizenet\Block\Transparent\Iframe $block
* @see \Magento\Authorizenet\Block\Transparent\Iframe
Expand All @@ -24,10 +23,12 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
src="<?php /* @noEscape */ echo $block->getViewFileUrl('blank.html'); ?>">
</iframe>
<!-- IFRAME for request to Authorize.net -->
<iframe id="directpost-iframe" allowtransparency="true" frameborder="0" name="iframeDirectPost" style="display:none;width:100%;background-color:transparent"
<iframe id="directpost-iframe" allowtransparency="true" frameborder="0" name="iframeDirectPost"
style="display:none;width:100%;background-color:transparent"
src="<?php /* @noEscape */ echo $block->getViewFileUrl('blank.html'); ?>">
</iframe>
<fieldset class="admin__fieldset payment-method" id="payment_form_<?php /* @noEscape */ echo $code; ?>" style="display:none;">
<fieldset class="admin__fieldset payment-method" id="payment_form_<?php /* @noEscape */ echo $code; ?>"
style="display:none;">
<div class="admin__field _required">
<label for="<?php /* @noEscape */ echo $code; ?>_cc_type" class="admin__field-label">
<span><?php echo $block->escapeHtml(__('Credit Card Type')); ?></span>
Expand Down Expand Up @@ -81,11 +82,11 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
<?php if ($k == $ccExpYear): ?>selected="selected"<?php endif; ?>>
<?php echo $block->escapeHtml($v); ?>
</option>
<?php endforeach ?>
<?php endforeach; ?>
</select>
</div>
</div>
<?php if ($_form->hasVerification()): ?>
<?php if ($block->hasVerification()): ?>
<div class="admin__field _required">
<label for="<?php /* @noEscape */ echo $code; ?>_cc_cid">
<span><?php echo $block->escapeHtml(__('Card Verification Number')); ?></span>
Expand Down Expand Up @@ -123,7 +124,9 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
'<?php /* @noEscape */ echo $controller; ?>',
'<?php /* @noEscape */ echo $orderUrl; ?>',
'<?php echo $block->escapeUrl($method->getCgiUrl()); ?>',
'<?php /* @noEscape */ echo $block->getUrl('*/*/save', ['_secure' => $block->getRequest()->isSecure()]) ?>');
'<?php /* @noEscape */ echo $block->getUrl('*/*/save', [
'_secure' => $block->getRequest()->isSecure()
]);?>');

<?php if (!$block->isAjaxRequest()): ?>
});
Expand Down
Loading

0 comments on commit 18bf1a3

Please sign in to comment.