Skip to content
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.

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

fix: do not forcefully set area in template if it is already set, fixes #14968, fixes #13530 #16660

Closed
wants to merge 10,000 commits into from
Closed

fix: do not forcefully set area in template if it is already set, fixes #14968, fixes #13530 #16660

wants to merge 10,000 commits into from

Conversation

mageprince
Copy link
Contributor

Original Pull Request

#15137

Description

This reverts the addition of the enforced area in d3aef7c which caused #14968 and introduced this regression

Fixed Issues (if relevant)

  1. Can't change the applied theme in 2.2.4 #14968: Can't change the applied theme in 2.2.4
  2. "Template file 'header.html' is not found" error while trying to save Design Configuration. #13530: "Template file 'header.html' is not found" error while trying to save Design Configuration.

Manual testing scenarios

  1. comment / disable line 117 in app/code/Magento/Theme/Model/Design/Config/Validator.php
  2. change theme in store view

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)

Magento CICD and others added 30 commits June 26, 2018 19:22
 - Merge Pull Request #16365 from lfluvisotto/magento2:2.3-develop-PR-port-16215
 - Merged commits:
   1. 05c9e0e
   2. 129fbe7
   3. 18c67f0
…status-search

# Conflicts:
#	app/code/Magento/AsynchronousOperations/Api/Data/OperationSearchResultsInterface.php
#	app/code/Magento/AsynchronousOperations/Model/OperationRepository.php
…status-search

# Conflicts:
#	app/code/Magento/AsynchronousOperations/Api/Data/OperationSearchResultsInterface.php
#	app/code/Magento/AsynchronousOperations/Model/OperationRepository.php
[borg] MAGETWO-86795: Admin Create Customer functional test fails
magento-engcom-team and others added 25 commits July 5, 2018 19:55
Accepted Public Pull Requests:
 - #16459: [Forwardport] Add missing showInStore attributes (by @aschrammel)
 - #16521: [Forwardport : Changed password placeholder text in checkout page] (by @hitesh-wagento)
 - #16515: Declare module namespace before template path name (by @mageprince)
 - #16492: Remove the timezone from the date when retrieving the current month from a UTC timestamp. (by @michaelwylde)
 - #15624: [2.3] [improvement] Swatches LESS rewrite (by @Karlasa)


Fixed GitHub Issues:
 - #16378: Wrong placeholder for password field in the checkout page (reported by @mohitka) has been fixed in #16521 by @hitesh-wagento in 2.3-develop branch
   Related commits:
     1. 386438d

 - #15940: Wrong end of month at Reports for Europe/Berlin time zone if month contains 31 day (reported by @Stepa4man) has been fixed in #16492 by @michaelwylde in 2.3-develop branch
   Related commits:
     1. 2482579
Move MFTF tests from dev/tests/acceptance to app/code
…n flag should… #16573

 - Merge Pull Request #16573 from gelanivishal/magento2:2.3-develop-PR-port-16211
 - Merged commits:
   1. 5415aa1
Fixed issues:
- MC-2338 3rd party library/dependency upgrade for 2.3 pre Alpha
 - merged latest code from mainline branch
Accepted Public Pull Requests:
 - #16573: Setting deploy mode to production with --skip-compilation flag should� (by @gelanivishal)
 - #16546: Properly hyphenate "third-party" (by @ronak2ram)
 - #16537: Issue in adding the wishlist of "zero price" product (by @gelanivishal)
 - #16520: [Forwardport] fix: change "My Dashboard" to "My Account", fixes #16007 (by @DanielRuf)
 - #16504: [Forwardport] Admin controller product set save refactor (by @AnshuMishra17)
 - #16228: [Forwardport] #16079 translation possibility for moreButtonText (by @Karlasa)
 - #13501: [Improvement] Implement customer group grid on ui component (by @simpleadm)


Fixed GitHub Issues:
 - #16479: Issue in adding the wishlist of "zero price" product.  (reported by @Sathishkumar8731) has been fixed in #16537 by @gelanivishal in 2.3-develop branch
   Related commits:
     1. 4cb997a

 - #16079: Need information about translating issue (Magento Swatches Js) (reported by @mageho) has been fixed in #16228 by @Karlasa in 2.3-develop branch
   Related commits:
     1. abcded5
     2. 988ef89
[thunder] MAGETWO-92986: Write Logs for Failed Process of Generating Factories in Extensions
@magento-cicd2
Copy link
Contributor

CLA assistant check
Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
4 out of 12 committers have signed the CLA.

✅ magento-engcom-team
✅ gelanivishal
✅ anvasiliev
✅ 0m3r
❌ magento-cicd2
❌ vrann
❌ OlgaVasyltsun
❌ svitja
❌ StasKozar
❌ zakdma
❌ irenelagno
❌ tjwiebell

@magento-engcom-team
Copy link
Contributor

Hi @mageprince. 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

@mageprince
Copy link
Contributor Author

By mistake created

@mageprince mageprince closed this Jul 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.