-
-
Notifications
You must be signed in to change notification settings - Fork 168
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
CRM-20502 - Do not get custom group tree into cache if we are upgrading #444
CRM-20502 - Do not get custom group tree into cache if we are upgrading #444
Conversation
modules/views/civicrm.views.inc
Outdated
@@ -304,6 +304,9 @@ function civicrm_views_add_date_arguments(&$data, $value) { | |||
* Array with the new custom field appended | |||
*/ | |||
function civicrm_views_custom_data_cache(&$data, $entity_type, $group_id, $sub_type) { | |||
if (!CRM_Core_Config::isUpgradeMode()) { |
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.
@totten should it actually be if (CRM_Core... not the negating?
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.
I think you are right - this 'works' because it is ALWAYS returning!
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.
I commented on Mattermost - but will confirm here too that this indeed does work! :-)
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.
@KarinG are you able to test changing the if to be if (CRM_Core_Config::isUpgradeMode())
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.
@KarinG @eileenmcnaughton i have just changed it to remove the ! as i tested it and didn't seem to make a difference and i think is the actual correct thing we should be testing
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.
@seamuslee001 so if it doesn't seem to make a difference whether ! or not - then how can we get to the rest of this function if we're not upgrading?
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.
so i tested in upgrade and it made no difference i think that removing the ! will make a difference in non upgrade times
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.
Yes, I think you wound up with the correction formulation (short-circuit the request in upgrade mode).
This makes sense but, as discussed can you try to get some more people to test. |
NB I mean test on the rc with this merged - not the PR |
@eileenmcnaughton @totten @KarinG try this