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

Move financial acl check on Main contribution page to the financial acl extension #27797

Merged
merged 1 commit into from
Oct 13, 2023

Conversation

eileenmcnaughton
Copy link
Contributor

Overview

Move financial acl check on Main contribution page to the financial acl extension

Note that after our snaffu with memberships I tested with the setting enabled & disabled

Before

Code is in core

After

Code is in the extension

Technical Details

Comments

@civibot
Copy link

civibot bot commented Oct 12, 2023

🤖 Thank you for contributing to CiviCRM! ❤️ We will need to test and review this 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...

➡️ Online demo of this PR 🔗

@colemanw
Copy link
Member

Good to see stuff getting moved out of core!

}

/**
* Get a value from the participant being acted on.
Copy link
Contributor

Choose a reason for hiding this comment

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

@eileenmcnaughton this doc block comment seems wrong to me

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@seamuslee001 surely you are not accusing me of copy & paste!

use EntityLookupTrait;

/**
* Get the value for a field relating to the event.
Copy link
Contributor

Choose a reason for hiding this comment

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

again @eileenmcnaughton this doc block seems to be incorrect for this trait as well

if (!financialacls_is_acl_limiting_enabled()) {
return;
}
if (str_starts_with($formName, 'CRM_Contribute_Form_Contribution')) {
Copy link
Contributor

Choose a reason for hiding this comment

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

hmm so this would also cover the Backoffice form as well as frontend forms?

Copy link
Contributor

Choose a reason for hiding this comment

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

maybe add an _ here at the end to make sure we just capture front end forms?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@seamuslee001 I've added the _ per your original suggestion

I think there is a pre-existing but in the backoffice form & it will require unravelling those actions to fix so I scaled this back to the form I'm working on.

@seamuslee001
Copy link
Contributor

Just taking merge on pass off until the issue around whether this is applying to backoffice forms is resolved

@eileenmcnaughton
Copy link
Contributor Author

thanks @seamuslee001 am now extending to back office propertly

@seamuslee001
Copy link
Contributor

@eileenmcnaughton can you rebase this now please

Note that after our snaffu with memberships I tested with the setting enabled & disabled
@eileenmcnaughton
Copy link
Contributor Author

thanks @seamuslee001 - done

@seamuslee001 seamuslee001 merged commit 7eed280 into civicrm:master Oct 13, 2023
@seamuslee001 seamuslee001 deleted the acl branch October 13, 2023 23:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants