Fixed Base Email template path + new test for user create #7201
+112,730
−83,541
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Description & Issue number it closes <!-- Please include a summary of the changes and the related issue. Please also include relevant motivation and context. --> Update the software version to 5.9.0 ## Screenshots (if appropriate) <!-- Before and after --> ## How to test the changes? ## Type of change - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] This change requires a documentation update # How Has This Been Tested? <!-- Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration --> # Checklist: - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules
# Description & Issue number it closes <!-- Please include a summary of the changes and the related issue. Please also include relevant motivation and context. --> Resolves #2776 ## Screenshots (if appropriate) Before:  After:  ## How to test the changes? Visual inspection. ## Type of change - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [x] Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] This change requires a documentation update # How Has This Been Tested? <!-- Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration --> Visual inspection. # Checklist: - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules
# Description & Issue number it closes <!-- Please include a summary of the changes and the related issue. Please also include relevant motivation and context. --> Added Swahili as a supported locale and downloaded terms from POEditor closes #7078
fix migration script from #7067
- Changed tabs to spaces - Deleted trailing spaces - Automatically fix code formatting in changed files - Delete some more comments
Automated changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action Co-authored-by: DawoudIO <[email protected]>
# Description & Issue number it closes addresses sql injection concern and added additional type safety
Bumps [twig/twig](https://github.com/twigphp/Twig) from 3.14.0 to 3.14.1. - [Changelog](https://github.com/twigphp/Twig/blob/v3.14.1/CHANGELOG) - [Commits](twigphp/Twig@v3.14.0...v3.14.1) --- updated-dependencies: - dependency-name: twig/twig dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [twig/twig](https://github.com/twigphp/Twig) from 3.14.0 to 3.14.1. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/twigphp/Twig/blob/v3.14.1/CHANGELOG">twig/twig's changelog</a>.</em></p> <blockquote> <h1>3.14.1 (2024-11-06)</h1> <ul> <li>[BC BREAK] Fix a security issue in the sandbox mode allowing an attacker to call attributes on Array-like objects They are now checked via the property policy</li> <li>Fix a security issue in the sandbox mode allowing an attacker to be able to call <code>toString()</code> under some circumstances on an object even if the <code>__toString()</code> method is not allowed by the security policy</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/twigphp/Twig/commit/f405356d20fb43603bcadc8b09bfb676cb04a379"><code>f405356</code></a> Prepare the 3.14.1 release</li> <li><a href="https://github.com/twigphp/Twig/commit/793e8358fbd37015f8dae4f9ca8aa0a37c951613"><code>793e835</code></a> Update CHANGELOG</li> <li><a href="https://github.com/twigphp/Twig/commit/831c148e786178e5f2fde9db67266be3bf241c21"><code>831c148</code></a> Sandbox ArrayAccess and do sandbox checks before isset() checks</li> <li><a href="https://github.com/twigphp/Twig/commit/2bb8c2460a2c519c498df9b643d5277117155a73"><code>2bb8c24</code></a> Fix sandbox handling for __toString()</li> <li>See full diff in <a href="https://github.com/twigphp/Twig/compare/v3.14.0...v3.14.1">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/ChurchCRM/CRM/network/alerts). </details>
# Description & Issue number it closes <!-- Please include a summary of the changes and the related issue. Please also include relevant motivation and context. --> - New Locale - Telugu - Download from POEditor (17% complete) - Ensure all plugins work (most are disabled for this locale) ## Screenshots (if appropriate) <!-- Before and after -->    ## How to test the changes? ## Type of change - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] This change requires a documentation update # How Has This Been Tested? <!-- Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration --> # Checklist: - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules
DawoudIO
requested review from
respencer,
grayeul,
DAcodedBEAT,
MrClever and
bigtigerku
and removed request for
a team
DAcodedBEAT
reviewed
Dec 9, 2024
| }); | ||
|
|
||
| it("Admin Change password", () => { | ||
| cy.loginAdmin("v2/user/95/changePassword"); |
There was a problem hiding this comment.
hardcoded IDs - wonder if we should make this a const and use the const here
DAcodedBEAT
requested changes
Dec 9, 2024
| it("Create System Users", () => { | ||
| cy.loginAdmin("UserList.php"); | ||
| cy.contains("Peyton Ray").should('not.exist'); | ||
| cy.visit("PersonView.php?PersonID=25"); |
There was a problem hiding this comment.
hardcoded IDs - wonder if we should make this a const and use the const here
| @@ -26,7 +26,7 @@ public function __construct(array $toAddresses) | |||
| $this->mail->addAddress($email); | |||
| } | |||
|
|
|||
| $loader = new FilesystemLoader('../templates/email'); | |||
| $loader = new FilesystemLoader(dirname(__FILE__) . '/../../templates/email'); | |||
There was a problem hiding this comment.
nit: we should use __DIR__ instead to avoid an unnecessary function call
Suggested change
| $loader = new FilesystemLoader(dirname(__FILE__) . '/../../templates/email'); | |
| $loader = new FilesystemLoader(__DIR__ . '/../../templates/email'); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description & Issue number it closes
It looks like the Create user fails when sending an email has an issue. This is to fix the path to sending emails
also added a new test to test create user
closes #7200
How to test the changes?
Create a new system user from a person page.
Type of change
How Has This Been Tested?
Checklist: