Tim Otten [Thu, 9 Apr 2020 04:20:40 +0000 (21:20 -0700)]
Mitigate flaky test failure about "CRM_Utils_Check_Component_Env->checkVersion()"
This function relies on an external data feed. If it fails to fetch the feed, then we
wind up with a PHP warning:
```
Invalid argument supplied for foreach() in CRM_Utils_Check_Component_Env->checkVersion()
(line 475 of /home/me/bknix/build/dmaster/web/sites/all/modules/civicrm/CRM/Utils/Check/Component/Env.php).
```
In certain unit-tests, this warning becomes a false-negative test-failure.
I saw these tests failing recently:
```
CRM_Contact_Page_View_UserDashBoardTest.testDashboardContentContributionsWithInvoicingEnabled
CRM_Contact_Page_View_UserDashBoardTest.testDashboardContentContributions
CRM_Core_Page_HookTest.testFormsCallBuildFormOnce
CRM_Core_Page_HookTest.testPagesCallPageRunOnce
```
Note that it is legit to have some QA signals if the web-service fials, but
that's more of a monitoring issue for the web-service. It shouldn't
manifest in random unit-tests or random page-views.
Eileen McNaughton [Thu, 9 Apr 2020 02:42:33 +0000 (14:42 +1200)]
Merge pull request #16976 from eileenmcnaughton/xfer
[REF] Extract transferParticipantRegistration function
Seamus Lee [Thu, 9 Apr 2020 01:35:07 +0000 (11:35 +1000)]
Merge pull request #16903 from eileenmcnaughton/settting_better
Allow setting metadata to use the `table` option. Update example setting `default_invoice_page`.
colemanw [Wed, 8 Apr 2020 23:29:38 +0000 (19:29 -0400)]
Merge pull request #16993 from eileenmcnaughton/emailget
Add / make fit for purpose email.getlist api call
Seamus Lee [Wed, 8 Apr 2020 23:28:03 +0000 (09:28 +1000)]
Merge pull request #17034 from mattwire/removeparamfromcompleteorder
REF Remove redundant param from completeOrder
colemanw [Wed, 8 Apr 2020 23:20:07 +0000 (19:20 -0400)]
Merge pull request #17031 from eileenmcnaughton/email4
[REF] Update Contact email form to use the trait for EmailCommon functions
Seamus Lee [Wed, 8 Apr 2020 23:16:37 +0000 (09:16 +1000)]
Merge pull request #17035 from civicrm/5.25
5.25
Eileen McNaughton [Wed, 8 Apr 2020 22:27:21 +0000 (10:27 +1200)]
Merge pull request #17015 from colemanw/having
APIv4 - Add support for HAVING clause
Eileen McNaughton [Wed, 8 Apr 2020 22:12:09 +0000 (10:12 +1200)]
Merge pull request #17033 from seamuslee001/5.25
Revert "temp workaround for dev/core#1675"
Seamus Lee [Wed, 8 Apr 2020 22:04:50 +0000 (08:04 +1000)]
Merge pull request #17029 from eileenmcnaughton/email3
[REF] Move generic instances of listTokens to trait
Matthew Wire [Wed, 8 Apr 2020 17:01:36 +0000 (18:01 +0100)]
contribution is available in objects so use that instead of passing separately - it does not need to be passed by reference
Eileen McNaughton [Wed, 8 Apr 2020 21:49:04 +0000 (09:49 +1200)]
Merge pull request #16959 from ray-wright/patch-4
Add email link in case summary
Seamus Lee [Wed, 8 Apr 2020 21:28:14 +0000 (07:28 +1000)]
Merge pull request #17021 from totten/5.25-language-labels
CRM_Core_I18n - Provide a better label for new/unknown locales
Seamus Lee [Wed, 8 Apr 2020 21:20:48 +0000 (07:20 +1000)]
Revert "temp workaround for dev/core#1675"
This reverts commit
fcd23b884537a19ff2acbc98ca20a43f292c4c42.
Eileen McNaughton [Wed, 8 Apr 2020 21:05:07 +0000 (09:05 +1200)]
Merge pull request #17020 from eileenmcnaughton/dedupe1
Start using apiv4 in test setup
eileen [Wed, 1 Apr 2020 02:14:37 +0000 (15:14 +1300)]
[REF] Update Contact email form to use the trait for EmailCommon functions
eileen [Tue, 31 Mar 2020 22:37:49 +0000 (11:37 +1300)]
Move generic instances of listTokens to trait
ray-wright [Wed, 8 Apr 2020 20:09:48 +0000 (16:09 -0400)]
add client email link to manage case header
Yashodha Chaku [Wed, 8 Apr 2020 16:25:34 +0000 (21:55 +0530)]
Merge pull request #16899 from mlutfy/mailingReportView
Mailing Report: hide the HTML preview
eileen [Wed, 8 Apr 2020 02:35:45 +0000 (14:35 +1200)]
Start using apiv4 in test setup
colemanw [Wed, 8 Apr 2020 12:09:23 +0000 (08:09 -0400)]
Merge pull request #17022 from eileenmcnaughton/test_updates
[NFC][Test] cleanup on customDataTrait for tests
colemanw [Wed, 8 Apr 2020 12:01:16 +0000 (08:01 -0400)]
Merge pull request #16954 from eileenmcnaughton/email4
[REF] Move generic preProcess function to the trait
Coleman Watts [Wed, 8 Apr 2020 00:43:12 +0000 (20:43 -0400)]
APIv4 - Add support for HAVING clause
eileen [Wed, 8 Apr 2020 04:37:43 +0000 (16:37 +1200)]
[NFC][Test] cleanup on customDataTrait for tests
eileen [Wed, 8 Apr 2020 02:26:39 +0000 (14:26 +1200)]
Enable test on merging country, it now works
Eileen McNaughton [Wed, 8 Apr 2020 04:58:21 +0000 (16:58 +1200)]
Merge pull request #17023 from civicrm/5.25
5.25 to master
Eileen McNaughton [Wed, 8 Apr 2020 04:57:48 +0000 (16:57 +1200)]
Merge pull request #17004 from pradpnayak/fixhookissue
Fixed fatal error for class not found when managed hook is invoked du…
Eileen McNaughton [Wed, 8 Apr 2020 04:45:57 +0000 (16:45 +1200)]
Merge pull request #17019 from eileenmcnaughton/dupe
[NFC] Minor code cleanups
Tim Otten [Wed, 8 Apr 2020 04:14:38 +0000 (21:14 -0700)]
CRM_Core_I18n - Provide a better label for new/unknown locales
Overview
--------
Suppose you add new/unrecognized data files in the `l10n` folder - and then
you navigate to the screen `civicrm/admin/setting/localization?reset=1`.
Before
------
The new language appears in the admin UI as a blank item.
Every page in the app displays a warning about the unrecognized locale.
After
-----
The new language appears in the admin UI with a placeholder name (based on the code).
The warnings are not displayed.
Comment
-------
We've just had an issue where a new language was added to the `l10n`
data-set, and then all automated test-suites for all versions (incl `5.25`
RC and `5.24` stable) started to throw blocker errors on unrelated PRs.
This is because the `l10n` data is generally evergreen, but each branch/tag
of `civicrm-core` has the list hard-coded in multiple spots.
This patch tries to make the symptom less painful when mixing/matching
different revisions of `civicrm-core.git` and `l10n.git`.
Eileen McNaughton [Wed, 8 Apr 2020 03:38:51 +0000 (15:38 +1200)]
Merge pull request #16837 from tunbola/case-api-case-clients
dev/core#1659: Fix Case.get API returning Case Clients As Part of Related Contacts
eileen [Wed, 8 Apr 2020 01:55:58 +0000 (13:55 +1200)]
[NFC] Minor code cleanups
Seamus Lee [Wed, 8 Apr 2020 01:53:52 +0000 (11:53 +1000)]
Merge pull request #17018 from civicrm/5.25
5.25
Seamus Lee [Wed, 8 Apr 2020 01:53:29 +0000 (11:53 +1000)]
Merge pull request #17014 from seamuslee001/nl_be_5_25
add nl_BE language
eileen [Mon, 6 Apr 2020 03:48:00 +0000 (15:48 +1200)]
Add / make fit for purpose email.getlist api call
The function CRM_Contact_Page_AJAX::getContactEmail is one of our earlier ajax attempts & this approach has been largely
replaced with entity Reference fields. In order to switch over we need to bring Email.getlist api to parity which means
1) searching on sortname first, if less than 10 results on emails include emails
2) appropriate respect for includeWildCardInName (this should already be in the generic getlist)
3) filter out on_hold, is_deceased, do_not_email
4) acl support (should already be part of the api).
The trickiest of these to support is the first - because we need to avoid using a non-performant OR
My current solution is the idea of a fallback field to search if the search results are less than the limit.
in most cases this won't require a second query but when it does it should be fairly quick.
Eileen McNaughton [Wed, 8 Apr 2020 01:43:17 +0000 (13:43 +1200)]
Merge pull request #17016 from eileenmcnaughton/dupe
[REF] Clarify variable & tighten use.
Seamus Lee [Wed, 8 Apr 2020 00:54:35 +0000 (10:54 +1000)]
Merge pull request #17013 from demeritcowboy/boo2
[REF] Use bool instead of boolean
eileen [Wed, 8 Apr 2020 00:46:36 +0000 (12:46 +1200)]
[REF] Clarify variable & tighten use.
moveContactBelongings is only called from one place which passes in all the function variables, so we don't need defaults.
The last parameter, is retrieved from self::getAffectedCustomTables which always returns an
array - so all the handling for it being NULL can be removed....
demeritcowboy [Thu, 2 Apr 2020 21:59:21 +0000 (17:59 -0400)]
add nl_BE language
colemanw [Wed, 8 Apr 2020 00:40:34 +0000 (20:40 -0400)]
Merge pull request #17012 from demeritcowboy/boo
[REF] Formatting and use bool instead of boolean
demeritcowboy [Tue, 7 Apr 2020 19:10:59 +0000 (15:10 -0400)]
formatting and bool vs boolean
demeritcowboy [Tue, 7 Apr 2020 19:16:34 +0000 (15:16 -0400)]
standard is bool instead of boolean
Pradeep Nayak [Tue, 7 Apr 2020 02:16:44 +0000 (03:16 +0100)]
Fixed fatal error for class not found when managed hook is invoked during upgrade
colemanw [Tue, 7 Apr 2020 17:05:36 +0000 (13:05 -0400)]
Merge pull request #17009 from colemanw/multi-cleanup5
[REF] CustomField code cleanup to use isSerialized method
colemanw [Tue, 7 Apr 2020 15:53:39 +0000 (11:53 -0400)]
Merge pull request #16968 from colemanw/multi-cleanup
[REF] CustomField code cleanup
Coleman Watts [Tue, 7 Apr 2020 15:27:51 +0000 (11:27 -0400)]
CustomField code cleanup to use isSerialized method
colemanw [Tue, 7 Apr 2020 01:59:14 +0000 (21:59 -0400)]
Merge pull request #17002 from eileenmcnaughton/deduped
[NFC][Test] Minor cleanup in test class
Eileen McNaughton [Tue, 7 Apr 2020 01:25:28 +0000 (13:25 +1200)]
Merge pull request #16996 from colemanw/customCleanup
[REF] Cleanup customField prepareCreate function
Seamus Lee [Tue, 7 Apr 2020 01:01:42 +0000 (11:01 +1000)]
Merge pull request #17001 from seamuslee001/dev_core_1673
dev/core#1673 Ensure that SQL statements are not duplicated in the de…
eileen [Tue, 7 Apr 2020 00:36:29 +0000 (12:36 +1200)]
[NFC][Test] Minor cleanup in test class
Most notably extracting duplicated code. General cleanup
Eileen McNaughton [Tue, 7 Apr 2020 00:03:41 +0000 (12:03 +1200)]
Merge pull request #17000 from demeritcowboy/comment-for-extension
[NFC] Add Comment to avoid someone removing field only used in CiviCase extension
Eileen McNaughton [Tue, 7 Apr 2020 00:02:50 +0000 (12:02 +1200)]
Merge pull request #16986 from colemanw/importParser
[REF] Update custom data handing in contact import
Seamus Lee [Mon, 6 Apr 2020 23:54:32 +0000 (09:54 +1000)]
Merge pull request #16997 from colemanw/textAreaAttrs
Fix setting custom field TextArea attributes
Seamus Lee [Mon, 6 Apr 2020 23:50:26 +0000 (09:50 +1000)]
dev/core#1673 Ensure that SQL statements are not duplicated in the developer tab of reports
demeritcowboy [Mon, 6 Apr 2020 22:34:18 +0000 (18:34 -0400)]
comment to avoid removing
Eileen McNaughton [Mon, 6 Apr 2020 20:19:39 +0000 (08:19 +1200)]
Merge pull request #16994 from yashodha/error
add filter and sorting for receipt date in contribution report
Eileen McNaughton [Mon, 6 Apr 2020 20:17:40 +0000 (08:17 +1200)]
Merge pull request #16995 from ivan-compucorp/CPS-130-case-details-empty
Case Details field is empty
Coleman Watts [Mon, 6 Apr 2020 15:48:52 +0000 (11:48 -0400)]
Fix setting custom field TextArea attributes
The code was potentially overwriting attributes for existing fields during update ops
Coleman Watts [Mon, 6 Apr 2020 15:36:37 +0000 (11:36 -0400)]
Cleanup customField prepareCreate function
ivan [Mon, 6 Apr 2020 14:18:29 +0000 (17:18 +0300)]
CPS-130: Fix empty Details field when creating a Case
Matthew Wire [Mon, 6 Apr 2020 09:24:30 +0000 (10:24 +0100)]
Merge pull request #16901 from eileenmcnaughton/settings
Fix bug on handling 'is_required'
yashodha [Mon, 6 Apr 2020 07:10:53 +0000 (12:40 +0530)]
add filter and soring for receipt date in contribution report
Seamus Lee [Mon, 6 Apr 2020 06:38:07 +0000 (16:38 +1000)]
Merge pull request #16953 from jitendrapurohit/core-1685
dev/core#1685 - Search builder returns DB error on Group => Empty filter
Eileen McNaughton [Mon, 6 Apr 2020 05:29:00 +0000 (17:29 +1200)]
Merge pull request #16623 from mattwire/tokenvalues
Fix values passed to tokenValues hook
colemanw [Mon, 6 Apr 2020 01:13:43 +0000 (21:13 -0400)]
Merge pull request #16989 from colemanw/seeingDouble
[REF] Cleanup custom field handling... twice
colemanw [Mon, 6 Apr 2020 01:05:34 +0000 (21:05 -0400)]
Merge pull request #16984 from colemanw/ufGroupCleanup
Cleanup custom field handling in ufGroup BAO
Seamus Lee [Mon, 6 Apr 2020 00:16:30 +0000 (10:16 +1000)]
Merge pull request #16990 from colemanw/multi-cleanup4
[REF] Cleanup CustomField BAO to use its own isSerialized function
Seamus Lee [Mon, 6 Apr 2020 00:14:22 +0000 (10:14 +1000)]
Merge pull request #16988 from civicrm/5.25
5.25
colemanw [Sun, 5 Apr 2020 23:39:13 +0000 (19:39 -0400)]
Merge pull request #16991 from pradpnayak/customFieldDefaults
Fix multiselect/checkbox custom field defaults on contribution online form
colemanw [Sun, 5 Apr 2020 23:37:29 +0000 (19:37 -0400)]
Merge pull request #16981 from colemanw/fixCustom
Fix multiselect/checkbox custom field defaults on registration profile
Pradeep Nayak [Sun, 5 Apr 2020 21:42:14 +0000 (22:42 +0100)]
Fix multiselect/checkbox custom field defaults on contribution online form
Coleman Watts [Sun, 5 Apr 2020 20:43:48 +0000 (16:43 -0400)]
Cleanup CustomField BAO to use its own isSerialized function rather than guesswork
Coleman Watts [Sun, 5 Apr 2020 20:25:37 +0000 (16:25 -0400)]
Cleanup custom field handling... twice
Seamus Lee [Sun, 5 Apr 2020 20:17:23 +0000 (06:17 +1000)]
Merge pull request #16978 from seamuslee001/5.25
Add release-notes/5.24.1
Coleman Watts [Sun, 5 Apr 2020 18:14:14 +0000 (14:14 -0400)]
Update custom data handing in contact import
Matthew Wire [Mon, 24 Feb 2020 15:30:16 +0000 (15:30 +0000)]
Fix values passed to tokenValues hook
Coleman Watts [Sun, 5 Apr 2020 14:54:44 +0000 (10:54 -0400)]
Cleanup custom field handling in ufGroup BAO
Coleman Watts [Sun, 5 Apr 2020 14:05:21 +0000 (10:05 -0400)]
Fix multiselect/checkbox custom field defaults on registration profile
The CRM_Core_BAO_UFGroup::setProfileDefaults() function expects each field to be an array,
but this function was just passing it the number 1. So it did not have enough field metadata
to correctly format each value.
colemanw [Sun, 5 Apr 2020 12:51:37 +0000 (08:51 -0400)]
Merge pull request #16980 from eileenmcnaughton/ex2
[REF] Call makeCSVTable function directly from writeRows
Coleman Watts [Fri, 3 Apr 2020 17:00:58 +0000 (13:00 -0400)]
CustomField - switch statement to use data_type instead of html_type
Coleman Watts [Fri, 3 Apr 2020 13:38:05 +0000 (09:38 -0400)]
Remove reference to obsolete field type and simplify statement
The history of this section of code is murky but from what I can tell,
this is applying special formatting to checkboxes. So instead of a double-negative conditional
"not field types that are not checkbox" let's just say "if checkbox".
Eileen McNaughton [Sun, 5 Apr 2020 05:29:41 +0000 (17:29 +1200)]
Merge pull request #16979 from eileenmcnaughton/cw
Use isSerialized function rather guessing from html_type
eileen [Mon, 25 Nov 2019 04:57:39 +0000 (17:57 +1300)]
Call makeCSVTable function directly from writeRows
Eileen McNaughton [Sun, 5 Apr 2020 03:58:48 +0000 (15:58 +1200)]
Merge pull request #16966 from demeritcowboy/add-nlbe
dev/translation#4 - Add nl_BE language
Eileen McNaughton [Sun, 5 Apr 2020 02:30:22 +0000 (14:30 +1200)]
Merge pull request #16970 from colemanw/multi-cleanup2
[REF] CustomGroup - cleanup handling of serialized fields in old function
Coleman Watts [Fri, 3 Apr 2020 14:38:28 +0000 (10:38 -0400)]
Use isSerialized function rather guessing from html_type
Tim Otten [Sun, 5 Apr 2020 00:50:45 +0000 (17:50 -0700)]
Add release-notes/5.24.1
colemanw [Sat, 4 Apr 2020 13:37:46 +0000 (09:37 -0400)]
Merge pull request #16975 from colemanw/multi-cleanup3
[REF] CustomField - Remove pointless caching and move form variable to form class
Seamus Lee [Sat, 4 Apr 2020 03:48:25 +0000 (14:48 +1100)]
Merge pull request #16973 from eileenmcnaughton/pan
Capitalise PAN truncation
Eileen McNaughton [Sat, 4 Apr 2020 01:29:28 +0000 (14:29 +1300)]
Merge pull request #16974 from civicrm/5.25
5.25
eileen [Sat, 4 Apr 2020 01:24:35 +0000 (14:24 +1300)]
[REF] Extract transferParticipantRegistration function
This is the extraction portion of https://github.com/civicrm/civicrm-core/pull/16956/
On testing that I hit an error but getting the extraction merged first should make it easierr
to review future iterations as it will reduce noise in the code.
Note I made the function non-static since it is still on the form & passed in
event ID since we have it but it's otherwise pretty much the same as the
extraction part of that PR
Coleman Watts [Fri, 3 Apr 2020 14:44:39 +0000 (10:44 -0400)]
CustomField - Remove pointless caching and move form variable to form class
Coleman Watts [Fri, 3 Apr 2020 23:57:52 +0000 (19:57 -0400)]
CustomGroup - Use isSerialized function rather than html_type
Seamus Lee [Fri, 3 Apr 2020 23:49:28 +0000 (10:49 +1100)]
Merge pull request #16971 from totten/5.25-seqcredit
dev/financial#84 - Fix upgrade failure. Thin-out activation logic for `sequentialcreditnotes`.
eileen [Fri, 3 Apr 2020 22:48:29 +0000 (11:48 +1300)]
Capitalise PAN truncation
From chat translation channel:
"Pan truncation" should be written "PAN truncation" for Truncation of the primary account number (credit card number). Now it's obvious to translate!
Seamus Lee [Fri, 3 Apr 2020 23:05:14 +0000 (10:05 +1100)]
Merge pull request #16969 from seamuslee001/master
[REF] Update XML file to match updated title in DAO File
Tim Otten [Fri, 3 Apr 2020 22:22:44 +0000 (15:22 -0700)]
dev/financial#84 - Simplify upgrader. Fix "wp-demo" upgrade scenario.
Steps to reproduce
------------------
* Create a site based on `wp-demo` with Civi 5.21
* Make a DB snapshot
* Update code to 5.24
* In the web UI, run the DB upgrade
* Note: It's important to use the web UI. The problem does not reproduce in CLI.
Before
------
The upgrader freezes on "Upgrade DB to 5.24.alpha1". The `CiviCRM.log` includes:
```
Apr 03 14:41:50 [info] Running task: Upgrade DB to 5.24.alpha1: SQL
Apr 03 14:41:55 [info] Running task: Install sequential creditnote extension
Apr 03 14:42:14 [info] $CRM_Queue_ErrorPolicy_reportError = Array
(
[is_error] => 1
[is_continue] => 0
[exception] => Error 1: Uncaught Error: Class 'CRM_Volunteer_Permission' not found in /home/me/bknix/build/wpmaster/web/wp-content/plugins/civicrm/civicrm/tools/extensions/civivolunteer/volunteer.php:497
Stack trace:
0 /home/me/bknix/build/wpmaster/web/wp-content/plugins/civicrm/civicrm/CRM/Utils/Hook.php(286): volunteer_civicrm_permission(Array)
1 /home/me/bknix/build/wpmaster/web/wp-content/plugins/civicrm/civicrm/CRM/Utils/Hook/WordPress.php(139): CRM_Utils_Hook->runHooks(Array, 'civicrm_permiss...', 1, Array, NULL, NULL, NULL, NULL, NULL)
2 /home/me/bknix/build/wpmaster/web/wp-content/plugins/civicrm/civicrm/Civi/Core/CiviEventDispatcher.php(86): CRM_Utils_Hook_WordPress->invokeViaUF(1, Array, NULL, NULL, NULL, NULL, NULL, 'civicrm_permiss...')
3 /home/me/bknix/build/wpmaster/web/wp-content/plugins/civicrm/civicrm/vendor/symfony/event-dispatcher/EventDispatcher.php(184): Civi\Core\CiviEventDispatcher::delegateToUF(Object(Civi\Core\Event\GenericHookEvent), 'hook_civicrm_p
[last_task_title] => Install sequential creditnote extension
)
```
After
-----
The upgrade completes. After installation, the `sequentialcreditnotes` extension is active.
Coleman Watts [Fri, 3 Apr 2020 21:28:34 +0000 (17:28 -0400)]
CustomGroup - cleanup handling of serialized fields in old function
Use new isSeralized method rather than looking at html_type to figure out how to handle the data
Seamus Lee [Fri, 3 Apr 2020 20:43:26 +0000 (07:43 +1100)]
[REF] Update XML file to match updated title in DAO File
colemanw [Fri, 3 Apr 2020 19:41:13 +0000 (15:41 -0400)]
Merge pull request #16965 from colemanw/isset
Code cleanup - replace overcomplicated test for null with isset
Coleman Watts [Fri, 3 Apr 2020 15:06:33 +0000 (11:06 -0400)]
Code cleanup - replace overcomplicated test for null with isset