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

dev/core#4439 Fix price set select broken price attr regression #26870

Conversation

larssandergreen
Copy link
Contributor

Overview

Fixes regression due to #26375

Before

Price attribute for selects is broken as it is being put together per option, instead of for the whole select.

After

Price attribute for selects as before.

@civibot
Copy link

civibot bot commented Jul 18, 2023

Thank you for contributing to CiviCRM! ❤️ We will need to test and review the PR. 👷

Introduction for new contributors
  • If this is your first PR, an admin will greenlight automated testing with the command ok to test or add to whitelist.
  • A series of tests will automatically run. You can see the results at the bottom of this page (if there are any problems, it will include a link to see what went wrong).
  • A demo site will be built where anyone can try out a version of CiviCRM that includes your changes.
  • If this process needs to be repeated, an admin will issue the command test this please to rerun tests and build a new demo site.
  • Before this PR can be merged, it needs to be reviewed. Please keep in mind that reviewers are volunteers, and their response time can vary from a few hours to a few weeks depending on their availability and their knowledge of this particular part of CiviCRM.
  • A great way to speed up this process is to "trade reviews" with someone - find an open PR that you feel able to review, and leave a comment like "I'm reviewing this now, could you please review mine?" (include a link to yours). You don't have to wait for a response to get started (and you don't have to stop at one!) the more you review, the faster this process goes for everyone 😄
  • To ensure that you are credited properly in the final release notes, please add yourself to contributor-key.yml
  • For more information about contributing, see CONTRIBUTING.md.
Quick links for reviewers

@civibot civibot bot added the master label Jul 18, 2023
@civibot
Copy link

civibot bot commented Jul 18, 2023

The issue associated with the Pull Request can be viewed at https://lab.civicrm.org/dev/core/-/issues/4439

@mlutfy
Copy link
Member

mlutfy commented Jul 18, 2023

Works for me - and nice simple fix. Thank you Lars for the quick fix!

@eileenmcnaughton Should this go in the RC and/or 5.63 branch?

@mlutfy mlutfy added the merge ready PR will be merged after a few days if there are no objections label Jul 18, 2023
@mlutfy
Copy link
Member

mlutfy commented Jul 18, 2023

jenkins, test this please

@mlutfy
Copy link
Member

mlutfy commented Jul 18, 2023

test error was:

fatal: unable to access 'https://lab.civicrm.org/extensions/angularprofiles.git/': Failed to connect to lab.civicrm.org port 443 after 131153 ms: Connection timed out

@colemanw
Copy link
Member

@larssandergreen can you change the base to 5.63?

@larssandergreen larssandergreen force-pushed the Fix-price-sets-regression-for-selects branch 3 times, most recently from 58c402f to 8eeef73 Compare July 19, 2023 20:18
@larssandergreen
Copy link
Contributor Author

@colemanw Yes, I think this is now on 5.63.

@mlutfy
Copy link
Member

mlutfy commented Jul 19, 2023

@larssandergreen I think there was a hiccup with the PR. I think maybe you switched the branches here on github, and it pulled all the changes from master to 5.63.

To PR on an older branch, you have to git checkout 5.63 and then cherry-pick your commit.

@larssandergreen
Copy link
Contributor Author

@mlutfy OK, so in that case I would open a new PR and close this one?

@larssandergreen larssandergreen force-pushed the Fix-price-sets-regression-for-selects branch from 8eeef73 to 8639bda Compare July 19, 2023 21:43
@mlutfy
Copy link
Member

mlutfy commented Jul 19, 2023

@larssandergreen probably easier to open a new PR (there's probably a way, but for me this is a regular snafu).

@larssandergreen larssandergreen force-pushed the Fix-price-sets-regression-for-selects branch from 8639bda to 17ed38c Compare July 19, 2023 21:51
@larssandergreen larssandergreen changed the base branch from master to 5.63 July 19, 2023 21:51
@civibot civibot bot added 5.63 and removed master labels Jul 19, 2023
@larssandergreen
Copy link
Contributor Author

OK, got it now to update this PR, needed to change to 5.63 both locally and on the PR itself as the target branch.

@mlutfy
Copy link
Member

mlutfy commented Jul 19, 2023

yep looks good to me

@colemanw is anything else required to also get it in the RC/master?

@eileenmcnaughton
Copy link
Contributor

@mlutfy @larssandergreen - the right process is to do the patch against the rc in the first instance for any regression (unless it is master only). We then forward merge the rc & if appropriate back port the patch.

In this case the rc is 5.64 so that should have been the initial target branch.

However, @seamuslee001 has already opened a PR to ensure this is in the rc so all good.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
5.63 merge ready PR will be merged after a few days if there are no objections
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants