Skip to content

fix: update path to wide template file #2918

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
laurelfulford merged 1 commit into from
Feb 9, 2024
Merged

fix: update path to wide template file #2918

laurelfulford merged 1 commit into from
Feb 9, 2024

Conversation

@laurelfulford
Copy link
Contributor

@laurelfulford laurelfulford commented Feb 9, 2024 •
edited
Loading

All Submissions:

Changes proposed in this Pull Request:

This PR makes a small tweak to the changes in #2893, which make sure my-account, cart, etc. use the One Column Wide template at all times. This works great for the parent theme, but throws an error for the child themes.

How to test the changes in this Pull Request:

  1. Running trunk, switch to one of the child themes.
  2. Go to /my-account; note the blank page and/or errors.
  3. Switch to this PR.
  4. Repeat step 2 and confirm the page loads as expected.
  5. Repeat the testing steps from feat(wc): override cart, checkout, and my-account page templates #2893.
  6. Switch to the parent theme and repeat step 2, just to make sure that also works well.
  7. Lastly, switch back to a child theme, and copy the single-wide.php template to it -- also make a big change, like deleting the header. Repeat step 2 a final time and confirm that the single-wide.php template you're loading is from the child theme. This case won't happen on any sites we host, but makes sure this still works if someone opts to replace and modify the single-wide.php in their own child theme.

Other information:

  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you written new tests for your changes, as applicable?
  • Have you successfully ran tests with your changes locally?

@laurelfulford laurelfulford added the [Status] Needs Review The issue or pull request needs to be reviewed label Feb 9, 2024
@laurelfulford laurelfulford requested a review from a team as a code owner February 9, 2024 19:18
dkoo
dkoo approved these changes Feb 9, 2024
View reviewed changes
Copy link
Contributor

@dkoo dkoo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! This should probably be a hotfix, though, since it breaks some important pages on live sites using child themes, right?

@github-actions github-actions bot added [Status] Approved The pull request has been reviewed and is ready to merge and removed [Status] Needs Review The issue or pull request needs to be reviewed labels Feb 9, 2024
@laurelfulford
Copy link
Contributor Author

laurelfulford commented Feb 9, 2024

Thanks @dkoo ! I should have specified: this is something I found in the alpha release, it's not live on sites yet!

Does it make sense to merge this one directly into the alpha branch, or trunk > new alpha?

@dkoo
Copy link
Contributor

dkoo commented Feb 9, 2024

Does it make sense to merge this one directly into the alpha branch, or trunk > new alpha?

Oh, at this point because there are no other changes in trunk that aren't in alpha except this one we also want to pull into the alpha, you can merge to trunk and build a new alpha.

Screenshot 2024-02-09 at 2 30 48 PM

@laurelfulford
Copy link
Contributor Author

laurelfulford commented Feb 9, 2024

Thanks @dkoo!

@laurelfulford laurelfulford merged commit fdd6b69 into trunk Feb 9, 2024
@laurelfulford laurelfulford deleted the fix/update-wide-template-path branch February 9, 2024 21:34
matticbot pushed a commit that referenced this pull request Feb 9, 2024
@semantic-release-bot
chore(release): 3.1.0-alpha.3 [skip ci]
3e06b6e 
# [3.1.0-alpha.3](v3.1.0-alpha.2...v3.1.0-alpha.3) (2024-02-09)

### Bug Fixes

* **categories:** fix pager urls ([#2913](#2913)) ([c851bb6](c851bb6))
* update path to wide template file ([#2918](#2918)) ([fdd6b69](fdd6b69))
@matticbot
Copy link
Contributor

matticbot commented Feb 9, 2024

🎉 This PR is included in version 3.1.0-alpha.3 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@matticbot
Copy link
Contributor

matticbot commented Feb 15, 2024

🎉 This PR is included in version 3.1.0-epic-ras-acc.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

matticbot pushed a commit that referenced this pull request Feb 20, 2024
@semantic-release-bot
chore(release): 3.1.0 [skip ci]
ffc44d2 
# [3.1.0](v3.0.5...v3.1.0) (2024-02-20)

### Bug Fixes

* add frequency tab options for donations, even when tiers are disabled ([#2930](#2930)) ([cb7eb7b](cb7eb7b))
* **categories:** fix pager urls ([#2913](#2913)) ([bb7e534](bb7e534))
* **categories:** fix pager urls ([#2913](#2913)) ([c851bb6](c851bb6))
* **engagement-wizard:** handle error when retrieving subscription lists ([e85c108](e85c108))
* **ras:** only sync spend total and last payment amounts for completed orders ([#2886](#2886)) ([68aaf39](68aaf39))
* redirect to origin from magic link ([9f41947](9f41947))
* typescript errors ([dc27973](dc27973))
* TypeScript usage; add to CI ([#2884](#2884)) ([6f5e7a6](6f5e7a6))
* update newsletter scroll appearance in Sign Up modal ([#2897](#2897)) ([496723a](496723a))
* update path to wide template file ([#2918](#2918)) ([fdd6b69](fdd6b69))

### Features

* **ci:** add epic/* release workflow and rename `master` to `trunk` ([#2895](#2895)) ([ea02075](ea02075)), closes [#2897](#2897) [#2886](#2886)
* **reader-revenue:** make NYP and Stripe Gateway optional ([#2866](#2866)) ([fcfa88c](fcfa88c))
* remove new tab default on image credits ([#2880](#2880)) ([3c996b1](3c996b1))
* **wc:** override cart, checkout, and my-account page templates ([#2893](#2893)) ([68b1836](68b1836))
@matticbot
Copy link
Contributor

matticbot commented Feb 20, 2024

🎉 This PR is included in version 3.1.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

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

Reviewers

@dkoo dkoo dkoo approved these changes

Assignees

No one assigned

Labels

released on @alpha released on @epic/ras-acc released [Status] Approved The pull request has been reviewed and is ready to merge

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@laurelfulford @dkoo @matticbot