-
-
Notifications
You must be signed in to change notification settings - Fork 825
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#1061 Ensure that custom data is not loaded on update subscription form when in self service mode and re-use shared function #14964
Conversation
(Standard links)
|
@seamuslee001 wanna rebase this? |
bdd50f2
to
c12c641
Compare
done @eileenmcnaughton |
@@ -52,7 +52,9 @@ | |||
{/if} | |||
</table> | |||
|
|||
{include file="CRM/common/customDataBlock.tpl"} | |||
{if !$self_service} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we call this isShowCustomData - I prefer variables that say what they mean rather than having implicit meanings
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hmm well this variable also use ised to hide other back office stuff see L48 of this file where it is used to hide the nofity, campaign and financial_type fields so i think it is appropriate name given the context
…ption form when in self service mode and re-use shared function Update to call function rather than variable as function does early return if variable aready set as per EIleen's comment
c12c641
to
e0e281f
Compare
@seamuslee001 I just tested this on master without the patch & I don't see the custom data - ie Front end |
OK I think that the custom data may have manefested as the pop up error in this gitlab https://lab.civicrm.org/dev/core/issues/1061 hence me thinking I didn't see it. This gets rid of that extra message in my testing & improves the code. Fails unrelated. Merging |
Overview
This incorporates changes in #14963 but it makes it so that custom data is not loaded when we are in self service mode. This seems consistant with the cancel subscription form and is a small step towards the end goal of splitting front end and back end forms
Before
Popup shows because sometimes custom data is not able to be accessed
After
No popup and custom data only loaded in backend form
ping @eileenmcnaughton @mattwire