[Forwardport] Fixed set template syntax in block file #16805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merged

magento-engcom-team merged 3 commits into magento:2.3-develop from gelanivishal:2.3-develop-PR-port-15339

Jul 29, 2018

Contributor

gelanivishal commented Jul 14, 2018 •

edited by sidolov

Loading

Original Pull Request

Description

Fixed set template syntax in block file

Fixed Issues (if relevant)

Template syntax in block file #15345:Template syntax in block file

Manual testing scenarios

N/A

Contribution checklist

Pull request has a meaningful description of its purpose
All commits are accompanied by meaningful commit messages
All new or changed code is covered with unit/integration tests (if applicable)
All automated tests passed successfully (all builds on Travis CI are green)

sanganinamrata and others added 2 commits

July 14, 2018 14:06


          Fixed set template syntax in block file #2

98cc752


          Fixed coding standard error

magento-engcom-team added Component: Paypal Component: Review Component: Tax Component: UrlRewrite Component: User labels

Contributor

magento-engcom-team commented Jul 14, 2018

Hi @gelanivishal. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

@magento-engcom-team give me test instance - deploy test instance based on PR changes
@magento-engcom-team give me {$VERSION} instance - deploy vanilla Magento instance

For more details, please, review the Magento Contributor Assistant documentation

sidolov requested changes

View reviewed changes

app/code/Magento/Paypal/Block/Iframe.php Outdated

    
                              $this->setTemplate($templateFile);

                          } else {

                              $this->setTemplate('hss/iframe.phtml');

                              $this->setTemplate('Magento_Paypal::hss/iframe.phtml');

Contributor

sidolov Jul 15, 2018

Please, revert fix in places when the template specified dynamically

Contributor Author

gelanivishal Jul 16, 2018

Done.

app/code/Magento/Paypal/Block/Iframe.php Outdated

    
                  {

                      if ($this->_isAfterPaymentSave()) {

                          $this->setTemplate('hss/js.phtml');

                          $this->setTemplate('Magento_Paypal::hss/js.phtml');

Contributor

sidolov Jul 15, 2018

Please, revert fix in places when the template specified dynamically

Contributor Author

gelanivishal Jul 16, 2018

Done.

app/code/Magento/Review/Block/Form.php Outdated

    
                      }

                      $this->setTemplate('form.phtml');

                      $this->setTemplate('Magento_Review::form.phtml');

Contributor

sidolov Jul 15, 2018

Please, revert fix in places when the template specified dynamically

Contributor Author

gelanivishal Jul 16, 2018

Done.

app/code/Magento/Review/Block/Rating/Entity/Detailed.php Outdated

    
                      if ($reviewsCount == 0) {

                          #return __('Be the first to review this product');

                          $this->setTemplate('empty.phtml');

                          $this->setTemplate('Magento_Review::empty.phtml');

Contributor

sidolov Jul 15, 2018

Please, revert fix in places when the template specified dynamically

Contributor Author

gelanivishal Jul 16, 2018

Done.

app/code/Magento/Tax/Plugin/Checkout/CustomerData/Cart.php Outdated

    
                              if ($item = $this->findItemById($itemAsArray['item_id'], $items)) {

                                  $this->itemPriceRenderer->setItem($item);

                                  $this->itemPriceRenderer->setTemplate('checkout/cart/item/price/sidebar.phtml');

                                  $this->itemPriceRenderer->setTemplate('Magento_Tax::checkout/cart/item/price/sidebar.phtml');

Contributor

sidolov Jul 15, 2018

Please, revert fix in places when the template specified dynamically

Contributor Author

gelanivishal Jul 16, 2018

Done.

app/code/Magento/UrlRewrite/Block/Edit.php Outdated

    
                  protected function _prepareLayout()

                  {

                      $this->setTemplate('edit.phtml');

                      $this->setTemplate('Magento_UrlRewrite::edit.phtml');

Contributor

sidolov Jul 15, 2018

Please, revert fix in places when the template specified dynamically

Contributor Author

gelanivishal Jul 16, 2018

Done.

app/code/Magento/User/Block/Role/Tab/Users.php Outdated

    
                      /** @var \Magento\User\Model\ResourceModel\User\Collection $users */

                      $users = $this->_userCollectionFactory->create()->load();

                      $this->setTemplate('role/users.phtml')->assign('users', $users->getItems())->assign('roleId', $roleId);

                      $this->setTemplate('Magento_User::role/users.phtml')

Contributor

sidolov Jul 15, 2018

Please, revert fix in places when the template specified dynamically

Contributor Author

gelanivishal Jul 16, 2018

Done.

sidolov added the Progress: needs update label


          Reverted changes

b405dfa

ihor-sviziev requested review from sidolov and removed request for sidolov

July 17, 2018 12:05

ihor-sviziev requested changes

View reviewed changes

Contributor

ihor-sviziev left a comment •

edited

Loading

Hi,
It looks like you applied not all changes.
Take a look at 46e3c0c - forwardport should contains the same changeset

ihor-sviziev self-assigned this

Contributor Author

gelanivishal commented Jul 18, 2018

Hello @ihor-sviziev,

Please review this commit b405dfa and also check @sidolov's requested comments.

Thank you.

Contributor

ihor-sviziev commented Jul 18, 2018 •

edited

Loading

@gelanivishal sure, you reverted changes that @sidolov requested, but it's still not full list of changes.
Example: there are changes in magento newsletter, offline payments modules, but in this PR there are no such changes. Just compare 46e3c0c with your PR

Contributor Author

gelanivishal commented Jul 23, 2018 •

edited

Loading

Hello @ihor-sviziev, @sidolov,

Other files are already changes in 2.3-develop, Please check your side at once.

Thank you.

gelanivishal assigned ishakhsuvarov, sidolov and orlangur and unassigned ihor-sviziev and ishakhsuvarov

ihor-sviziev approved these changes

View reviewed changes

magento-engcom-team assigned ihor-sviziev

magento-engcom-team added this to the Release: 2.3.0 milestone

magento-engcom-team added Release Line: 2.3 and removed Component: Review Component: Tax Component: UrlRewrite labels

Contributor

magento-engcom-team commented Jul 28, 2018

Hi @ihor-sviziev, thank you for the review.
ENGCOM-2593 has been created to process this Pull Request

ihor-sviziev unassigned orlangur

magento-engcom-team added Progress: accept and removed Progress: needs update labels

sidolov mentioned this pull request

Template syntax in block file #15345

Closed

magento-engcom-team merged commit b405dfa into magento:2.3-develop

magento-engcom-team pushed a commit that referenced this pull request


          ENGCOM-2593: [Forwardport] Fixed set template syntax in block file #1…

42a6316

…6805

magento-engcom-team added the Cleanup label

Contributor

magento-engcom-team commented Jul 29, 2018

Hi @gelanivishal. Thank you for your contribution.
We will aim to release these changes as part of 2.3.0.
Please check the release notes for final confirmation.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Cleanup Component: Paypal Component: User Progress: accept Release Line: 2.3