Skip to content

Commit

Permalink
ENGCOM-3611: Set view models as shareable by default #18541
Browse files Browse the repository at this point in the history
 - Merge Pull Request #18541 from thomas-kl1/magento2:patch/layout-block-argument-shareable
 - Merged commits:
   1. 9a7f3e6
   2. 415288f
   3. 32f2813
  • Loading branch information
magento-engcom-team committed Apr 10, 2019
2 parents ab188bc + 32f2813 commit ff6d03c
Show file tree
Hide file tree
Showing 56 changed files with 168 additions and 68 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.notification.container.grid" as="grid">
<arguments>
<argument name="id" xsi:type="string">notificationGrid</argument>
<argument name="dataSource" xsi:type="object">Magento\AdminNotification\Model\ResourceModel\Grid\Collection</argument>
<argument name="dataSource" xsi:type="object" shared="false">Magento\AdminNotification\Model\ResourceModel\Grid\Collection</argument>
<argument name="default_dir" xsi:type="string">DESC</argument>
<argument name="default_sort" xsi:type="string">date_added</argument>
<argument name="save_parameters_in_session" xsi:type="string">1</argument>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<block class="Magento\AdvancedSearch\Block\Adminhtml\Search\Grid" name="search.edit.grid" as="grid">
<arguments>
<argument name="id" xsi:type="string">catalog_search_grid</argument>
<argument name="dataSource" xsi:type="object">Magento\AdvancedSearch\Model\ResourceModel\Search\Grid\Collection</argument>
<argument name="dataSource" xsi:type="object" shared="false">Magento\AdvancedSearch\Model\ResourceModel\Search\Grid\Collection</argument>
<argument name="default_sort" xsi:type="string">name</argument>
<argument name="default_dir" xsi:type="string">ASC</argument>
<argument name="save_parameters_in_session" xsi:type="string">1</argument>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.cache.grid" as="grid">
<arguments>
<argument name="id" xsi:type="string">cache_grid</argument>
<argument name="dataSource" xsi:type="object">Magento\Backend\Model\Cache\ResourceModel\Grid\Collection</argument>
<argument name="dataSource" xsi:type="object" shared="false">Magento\Backend\Model\Cache\ResourceModel\Grid\Collection</argument>
<argument name="pager_visibility" xsi:type="string">0</argument>
</arguments>
<block class="Magento\Backend\Block\Widget\Grid\Massaction" name="adminhtml.cache.massaction" as="grid.massaction">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.system.design.grid" as="grid">
<arguments>
<argument name="id" xsi:type="string">designGrid</argument>
<argument name="dataSource" xsi:type="object">Magento\Theme\Model\ResourceModel\Design\Collection</argument>
<argument name="dataSource" xsi:type="object" shared="false">Magento\Theme\Model\ResourceModel\Design\Collection</argument>
<argument name="use_ajax" xsi:type="string">1</argument>
<argument name="save_parameters_in_session" xsi:type="string">1</argument>
<argument name="grid_url" xsi:type="url" path="*/*/grid">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<arguments>
<argument name="id" xsi:type="string">storeGrid</argument>
<argument name="save_parameters_in_session" xsi:type="string">1</argument>
<argument name="dataSource" xsi:type="object">Magento\Store\Model\ResourceModel\Website\Grid\Collection</argument>
<argument name="dataSource" xsi:type="object" shared="false">Magento\Store\Model\ResourceModel\Website\Grid\Collection</argument>
</arguments>
<block class="Magento\Backend\Block\Widget\Grid\ColumnSet" name="adminhtml.system.store.grid.columnSet" as="grid.columnSet">
<arguments>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.system.backup.grid" as="grid">
<arguments>
<argument name="id" xsi:type="string">backupsGrid</argument>
<argument name="dataSource" xsi:type="object">Magento\Backup\Model\Fs\Collection</argument>
<argument name="dataSource" xsi:type="object" shared="false">Magento\Backup\Model\Fs\Collection</argument>
<argument name="default_sort" xsi:type="string">time</argument>
<argument name="default_dir" xsi:type="string">desc</argument>
</arguments>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.catalog.product.set.grid" as="grid">
<arguments>
<argument name="id" xsi:type="string">setGrid</argument>
<argument name="dataSource" xsi:type="object">Magento\Eav\Model\ResourceModel\Entity\Attribute\Grid\Collection</argument>
<argument name="dataSource" xsi:type="object" shared="false">Magento\Eav\Model\ResourceModel\Entity\Attribute\Grid\Collection</argument>
<argument name="default_sort" xsi:type="string">set_name</argument>
<argument name="default_dir" xsi:type="string">ASC</argument>
<argument name="save_parameters_in_session" xsi:type="string">1</argument>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<block class="Magento\Backend\Block\Widget\Grid" name="promo.catalog.grid" as="grid">
<arguments>
<argument name="id" xsi:type="string">promo_catalog_grid</argument>
<argument name="dataSource" xsi:type="object">Magento\CatalogRule\Model\ResourceModel\Grid\Collection</argument>
<argument name="dataSource" xsi:type="object" shared="false">Magento\CatalogRule\Model\ResourceModel\Grid\Collection</argument>
<argument name="default_sort" xsi:type="string">name</argument>
<argument name="default_dir" xsi:type="string">ASC</argument>
<argument name="save_parameters_in_session" xsi:type="string">1</argument>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.system.email.template.grid" as="grid">
<arguments>
<argument name="id" xsi:type="string">systemEmailTemplateGrid</argument>
<argument name="dataSource" xsi:type="object">Magento\Email\Model\ResourceModel\Template\Collection</argument>
<argument name="dataSource" xsi:type="object" shared="false">Magento\Email\Model\ResourceModel\Template\Collection</argument>
<argument name="use_ajax" xsi:type="string">1</argument>
<argument name="save_parameters_in_session" xsi:type="string">1</argument>
<argument name="grid_url" xsi:type="url" path="*/*/grid">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<block class="Magento\Backend\Block\Widget\Grid" name="catalog.product.edit.tab.super.group.popup" as="grid">
<arguments>
<argument name="id" xsi:type="string">grouped_grid_popup</argument>
<argument name="dataSource" xsi:type="object">Magento\GroupedProduct\Model\ResourceModel\Product\Type\Grouped\AssociatedProductsCollection</argument>
<argument name="dataSource" xsi:type="object" shared="false">Magento\GroupedProduct\Model\ResourceModel\Product\Type\Grouped\AssociatedProductsCollection</argument>
<argument name="use_ajax" xsi:type="string">1</argument>
<argument name="default_sort" xsi:type="string">id</argument>
<argument name="default_dir" xsi:type="string">ASC</argument>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.import.history.grid" as="grid">
<arguments>
<argument name="id" xsi:type="string">importHistoryGrid</argument>
<argument name="dataSource" xsi:type="object">Magento\ImportExport\Model\ResourceModel\History\Collection</argument>
<argument name="dataSource" xsi:type="object" shared="false">Magento\ImportExport\Model\ResourceModel\History\Collection</argument>
<argument name="default_sort" xsi:type="string">history_id</argument>
<argument name="default_dir" xsi:type="string">desc</argument>
</arguments>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<argument name="use_ajax" xsi:type="string">0</argument>
<argument name="pager_visibility" xsi:type="string">0</argument>
<argument name="id" xsi:type="string">gridIndexer</argument>
<argument name="dataSource" xsi:type="object">Magento\Indexer\Ui\DataProvider\Indexer\DataCollection</argument>
<argument name="dataSource" xsi:type="object" shared="false">Magento\Indexer\Ui\DataProvider\Indexer\DataCollection</argument>
</arguments>
<block class="Magento\Backend\Block\Widget\Grid\Massaction" name="adminhtml.indexer.grid.grid.massaction" as="grid.massaction">
<arguments>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<block class="Magento\Integration\Block\Adminhtml\Integration\Grid" name="integration.grid" as="grid">
<arguments>
<argument name="id" xsi:type="string">integrationGrid</argument>
<argument name="dataSource" xsi:type="object">Magento\Integration\Model\ResourceModel\Integration\Collection</argument>
<argument name="dataSource" xsi:type="object" shared="false">Magento\Integration\Model\ResourceModel\Integration\Collection</argument>
<argument name="use_ajax" xsi:type="string">1</argument>
<argument name="default_sort" xsi:type="string">integration_id</argument>
<argument name="default_dir" xsi:type="string">asc</argument>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.newslettrer.problem.grid" as="grid">
<arguments>
<argument name="id" xsi:type="string">problemGrid</argument>
<argument name="dataSource" xsi:type="object">Magento\Newsletter\Model\ResourceModel\Grid\Collection</argument>
<argument name="dataSource" xsi:type="object" shared="false">Magento\Newsletter\Model\ResourceModel\Grid\Collection</argument>
<argument name="message_block_visibility" xsi:type="string">true</argument>
<argument name="use_ajax" xsi:type="string">true</argument>
<argument name="save_parameters_in_session" xsi:type="string">1</argument>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.newsletter.queue.grid" as="grid">
<arguments>
<argument name="id" xsi:type="string">queueGrid</argument>
<argument name="dataSource" xsi:type="object">Magento\Newsletter\Model\ResourceModel\Queue\Grid\Collection</argument>
<argument name="dataSource" xsi:type="object" shared="false">Magento\Newsletter\Model\ResourceModel\Queue\Grid\Collection</argument>
<argument name="default_sort" xsi:type="string">start_at</argument>
<argument name="default_dir" xsi:type="string">DESC</argument>
<argument name="save_parameters_in_session" xsi:type="string">1</argument>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<block class="Magento\Newsletter\Block\Adminhtml\Subscriber\Grid" name="adminhtml.newslettrer.subscriber.grid" as="grid">
<arguments>
<argument name="id" xsi:type="string">subscriberGrid</argument>
<argument name="dataSource" xsi:type="object">Magento\Newsletter\Model\ResourceModel\Subscriber\Grid\Collection</argument>
<argument name="dataSource" xsi:type="object" shared="false">Magento\Newsletter\Model\ResourceModel\Subscriber\Grid\Collection</argument>
<argument name="default_sort" xsi:type="string">subscriber_id</argument>
<argument name="default_dir" xsi:type="string">desc</argument>
<argument name="use_ajax" xsi:type="string">1</argument>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<block class="Magento\Backend\Block\Widget\Grid" name="paypal.report.grid" as="grid">
<arguments>
<argument name="id" xsi:type="string">settlementGrid</argument>
<argument name="dataSource" xsi:type="object">Magento\Paypal\Model\ResourceModel\Report\Settlement\Row\Collection</argument>
<argument name="dataSource" xsi:type="object" shared="false">Magento\Paypal\Model\ResourceModel\Report\Settlement\Row\Collection</argument>
<argument name="default_sort" xsi:type="string">row_id</argument>
<argument name="default_dir" xsi:type="string">DESC</argument>
<argument name="save_parameters_in_session" xsi:type="string">1</argument>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<update handle="sales_order_grid_block"/>
<referenceBlock name="sales.order.grid">
<arguments>
<argument name="dataSource" xsi:type="object">
<argument name="dataSource" xsi:type="object" shared="false">
<updater>Magento\Paypal\Model\Billing\Agreement\OrdersUpdater</updater>
</argument>
<argument name="grid_url" xsi:type="url" path="*/*/ordersgrid"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<referenceBlock name="sales.order.grid">
<arguments>
<argument name="dataSource" xsi:type="object">
<argument name="dataSource" xsi:type="object" shared="false">
<updater>Magento\Paypal\Model\Billing\Agreement\OrdersUpdater</updater>
</argument>
<argument name="grid_url" xsi:type="url" path="*/*/ordersgrid"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<referenceBlock name="adminhtml.report.grid">
<arguments>
<argument name="id" xsi:type="string">gridAccounts</argument>
<argument name="dataSource" xsi:type="object">Magento\Reports\Model\ResourceModel\Accounts\Collection\Initial</argument>
<argument name="dataSource" xsi:type="object" shared="false">Magento\Reports\Model\ResourceModel\Accounts\Collection\Initial</argument>
</arguments>
</referenceBlock>
<referenceBlock name="adminhtml.report.grid.export">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<referenceBlock name="adminhtml.report.grid">
<arguments>
<argument name="id" xsi:type="string">gridOrdersCustomer</argument>
<argument name="dataSource" xsi:type="object">Magento\Reports\Model\ResourceModel\Customer\Orders\Collection\Initial</argument>
<argument name="dataSource" xsi:type="object" shared="false">Magento\Reports\Model\ResourceModel\Customer\Orders\Collection\Initial</argument>
</arguments>
</referenceBlock>
<referenceBlock name="adminhtml.report.grid.export">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<referenceBlock name="adminhtml.report.grid">
<arguments>
<argument name="id" xsi:type="string">gridTotalsCustomer</argument>
<argument name="dataSource" xsi:type="object">Magento\Reports\Model\ResourceModel\Customer\Totals\Collection\Initial</argument>
<argument name="dataSource" xsi:type="object" shared="false">Magento\Reports\Model\ResourceModel\Customer\Totals\Collection\Initial</argument>
</arguments>
</referenceBlock>
<referenceBlock name="adminhtml.report.grid.export">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<argument name="use_ajax" xsi:type="string">0</argument>
<argument name="pager_visibility" xsi:type="string">0</argument>
<argument name="id" xsi:type="string">gridReport</argument>
<argument name="dataSource" xsi:type="object">Magento\Reports\Model\ResourceModel\Report\Collection</argument>
<argument name="dataSource" xsi:type="object" shared="false">Magento\Reports\Model\ResourceModel\Report\Collection</argument>
</arguments>
<block class="Magento\Backend\Block\Widget\Grid\Export" name="adminhtml.report.grid.export" as="grid.export">
<arguments>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<arguments>
<argument name="id" xsi:type="string">gridLowstock</argument>
<argument name="use_ajax" xsi:type="string">0</argument>
<argument name="dataSource" xsi:type="object">Magento\Reports\Model\ResourceModel\Product\Lowstock\Collection</argument>
<argument name="dataSource" xsi:type="object" shared="false">Magento\Reports\Model\ResourceModel\Product\Lowstock\Collection</argument>
</arguments>
<block class="Magento\Backend\Block\Widget\Grid\Export" name="adminhtml.block.report.product.lowstock.export" as="grid.export">
<arguments>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<referenceBlock name="adminhtml.report.grid">
<arguments>
<argument name="id" xsi:type="string">gridProductsSold</argument>
<argument name="dataSource" xsi:type="object">Magento\Reports\Model\ResourceModel\Product\Sold\Collection\Initial</argument>
<argument name="dataSource" xsi:type="object" shared="false">Magento\Reports\Model\ResourceModel\Product\Sold\Collection\Initial</argument>
</arguments>
</referenceBlock>
<referenceBlock name="adminhtml.report.grid.export">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<argument name="id" xsi:type="string">customers_grid</argument>
<argument name="default_sort" xsi:type="string">review_cnt</argument>
<argument name="default_dir" xsi:type="string">desc</argument>
<argument name="dataSource" xsi:type="object">Magento\Reports\Model\ResourceModel\Review\Customer\Collection</argument>
<argument name="dataSource" xsi:type="object" shared="false">Magento\Reports\Model\ResourceModel\Review\Customer\Collection</argument>
</arguments>
<block class="Magento\Backend\Block\Widget\Grid\Export" name="adminhtml.block.report.review.customer.export" as="grid.export">
<arguments>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<argument name="id" xsi:type="string">gridProducts</argument>
<argument name="default_sort" xsi:type="string">review_cnt</argument>
<argument name="default_dir" xsi:type="string">desc</argument>
<argument name="dataSource" xsi:type="object">Magento\Reports\Model\ResourceModel\Review\Product\Collection</argument>
<argument name="dataSource" xsi:type="object" shared="false">Magento\Reports\Model\ResourceModel\Review\Product\Collection</argument>
</arguments>
<block class="Magento\Backend\Block\Widget\Grid\Export" name="adminhtml.block.report.review.product.export" as="grid.export">
<arguments>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<argument name="use_ajax" xsi:type="string">0</argument>
<argument name="sortable" xsi:type="string">0</argument>
<argument name="pager_visibility" xsi:type="string">0</argument>
<argument name="dataSource" xsi:type="object">Magento\Reports\Model\ResourceModel\Refresh\Collection</argument>
<argument name="dataSource" xsi:type="object" shared="false">Magento\Reports\Model\ResourceModel\Refresh\Collection</argument>
</arguments>
<block class="Magento\Backend\Block\Widget\Grid\Massaction" name="adminhtml.block.refresh.statistics.massactions" as="grid.massaction">
<arguments>
Expand Down
Loading

0 comments on commit ff6d03c

Please sign in to comment.