Skip to content

Commit

Permalink
ENGCOM-2615: Declare module namespace before template path name #17172
Browse files Browse the repository at this point in the history
  • Loading branch information
Stanislav Idolov authored Aug 1, 2018
2 parents c483725 + 588358e commit efab494
Show file tree
Hide file tree
Showing 19 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion app/code/Magento/Cookie/view/frontend/web/js/notices.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ define([
});

if ($.mage.cookies.get(this.options.cookieName)) {
window.location.reload();
this.element.hide();
} else {
window.location.href = this.options.noCookiesUrl;
}
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ public function getForm()
}

/**
* Return return template name for JS
* Return template name for JS
*
* @return string
*/
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ class Banktransfer extends \Magento\OfflinePayments\Block\Form\AbstractInstructi
*
* @var string
*/
protected $_template = 'form/banktransfer.phtml';
protected $_template = 'Magento_OfflinePayments::form/banktransfer.phtml';
}
2 changes: 1 addition & 1 deletion app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ class Cashondelivery extends \Magento\OfflinePayments\Block\Form\AbstractInstruc
*
* @var string
*/
protected $_template = 'form/cashondelivery.phtml';
protected $_template = 'Magento_OfflinePayments::form/cashondelivery.phtml';
}
2 changes: 1 addition & 1 deletion app/code/Magento/Payment/Block/Info/Instructions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class Instructions extends \Magento\Payment\Block\Info
/**
* @var string
*/
protected $_template = 'info/instructions.phtml';
protected $_template = 'Magento_Payment::info/instructions.phtml';

/**
* Get instructions text from order payment
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/ProductAlert/Block/Email/Price.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Price extends \Magento\ProductAlert\Block\Email\AbstractEmail
/**
* @var string
*/
protected $_template = 'email/price.phtml';
protected $_template = 'Magento_ProductAlert::email/price.phtml';

/**
* Retrieve unsubscribe url for product
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/ProductAlert/Block/Email/Stock.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Stock extends \Magento\ProductAlert\Block\Email\AbstractEmail
/**
* @var string
*/
protected $_template = 'email/stock.phtml';
protected $_template = 'Magento_ProductAlert::email/stock.phtml';

/**
* Retrieve unsubscribe url for product
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Rss/Block/Feeds.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class Feeds extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
protected $_template = 'feeds.phtml';
protected $_template = 'Magento_Rss::feeds.phtml';

/**
* @var \Magento\Framework\App\Rss\RssManagerInterface
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Block/Order/History.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class History extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
protected $_template = 'order/history.phtml';
protected $_template = 'Magento_Sales::order/history.phtml';

/**
* @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class Grid extends \Magento\Backend\Block\Template
/**
* @var string
*/
protected $_template = 'order/packaging/grid.phtml';
protected $_template = 'Magento_Shipping::order/packaging/grid.phtml';

/**
* Core registry
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Shipping/Block/Order/Shipment.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Shipment extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
protected $_template = 'order/shipment.phtml';
protected $_template = 'Magento_Shipping::order/shipment.phtml';

/**
* Core registry
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
/**
* @var string
*/
protected $_template = 'categories.phtml';
protected $_template = 'Magento_UrlRewrite::categories.phtml';

/**
* Adminhtml data
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/UrlRewrite/Block/Selector.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Selector extends \Magento\Backend\Block\Template
/**
* @var string
*/
protected $_template = 'selector.phtml';
protected $_template = 'Magento_UrlRewrite::selector.phtml';

/**
* Set block template and get available modes
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/User/Block/Role/Tab/Edit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form implements \Magento\Backen
/**
* @var string
*/
protected $_template = 'role/edit.phtml';
protected $_template = 'Magento_User::role/edit.phtml';

/**
* Root ACL Resource
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Weee/Block/Renderer/Weee/Tax.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class Tax extends \Magento\Backend\Block\Widget implements \Magento\Framework\Da
/**
* @var string
*/
protected $_template = 'renderer/tax.phtml';
protected $_template = 'Magento_Weee::renderer/tax.phtml';

/**
* Core registry
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class Layout extends \Magento\Backend\Block\Template implements \Magento\Framewo
/**
* @var string
*/
protected $_template = 'instance/edit/layout.phtml';
protected $_template = 'Magento_Widget::instance/edit/layout.phtml';

/**
* @var \Magento\Catalog\Model\Product\Type
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Wishlist/Block/Rss/EmailLink.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class EmailLink extends Link
/**
* @var string
*/
protected $_template = 'rss/email.phtml';
protected $_template = 'Magento_Wishlist::rss/email.phtml';

/**
* @return array
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Wishlist/Block/Share/Email/Items.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Items extends \Magento\Wishlist\Block\AbstractBlock
/**
* @var string
*/
protected $_template = 'email/items.phtml';
protected $_template = 'Magento_Wishlist::email/items.phtml';

/**
* Retrieve Product View URL
Expand Down
6 changes: 3 additions & 3 deletions ...ests/integration/testsuite/Magento/Framework/View/_files/layout_directives_test/group.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@
<block class="Magento\Framework\View\Element\Text" name="block1">
<block class="Magento\Framework\View\Element\Text" name="block2" group="group1">
<arguments>
<argument xsi:type="string" name="text">blok2</argument>
<argument xsi:type="string" name="text">block2</argument>
</arguments>
</block>
<block class="Magento\Framework\View\Element\Text" name="block3" group="group1" >
<arguments>
<argument xsi:type="string" name="text">blok3</argument>
<argument xsi:type="string" name="text">block3</argument>
</arguments>
</block>
<block class="Magento\Framework\View\Element\Text" name="block4">
<arguments>
<argument xsi:type="string" name="text">blok4</argument>
<argument xsi:type="string" name="text">block4</argument>
</arguments>
</block>
</block>
Expand Down

0 comments on commit efab494

Please sign in to comment.