Tim Otten [Fri, 20 May 2022 00:00:17 +0000 (17:00 -0700)]
Merge pull request #23501 from eileenmcnaughton/import_json
Fix use of not-universally supported mysql field type
Eileen McNaughton [Thu, 19 May 2022 23:20:33 +0000 (11:20 +1200)]
Merge pull request #23510 from yashodha/ckeditor_issue_5
fix to get around link issues in ckeditor when opening scheduled remi…
yashodha [Thu, 19 May 2022 15:52:09 +0000 (21:22 +0530)]
fix to get around link issues in ckeditor when opening scheduled reminder in popup
colemanw [Thu, 19 May 2022 14:40:51 +0000 (10:40 -0400)]
Merge pull request #23507 from eileenmcnaughton/import_match2
[REF] Remove unreachable code
demeritcowboy [Thu, 19 May 2022 14:21:20 +0000 (10:21 -0400)]
Merge pull request #23495 from eileenmcnaughton/import_unused
[REF] [Import] Remove unused parameter
colemanw [Thu, 19 May 2022 13:35:35 +0000 (09:35 -0400)]
Merge pull request #23493 from eileenmcnaughton/import_rel
[Import] Remove silly param
Eileen McNaughton [Thu, 19 May 2022 09:30:12 +0000 (21:30 +1200)]
[REF] Remove unreachable code
Eileen McNaughton [Thu, 19 May 2022 06:42:06 +0000 (18:42 +1200)]
Fix use of not-universally supported mysql field type
Eileen McNaughton [Thu, 19 May 2022 05:29:20 +0000 (17:29 +1200)]
Merge pull request #23500 from civicrm/5.50
5.50 to master
Eileen McNaughton [Thu, 19 May 2022 05:28:44 +0000 (17:28 +1200)]
Merge pull request #23497 from totten/5.50-schedrem-bool
Restore `civicrm_action_schedule.limit_to` (5.50)
Eileen McNaughton [Thu, 19 May 2022 01:49:50 +0000 (13:49 +1200)]
[Import] Remove silly param
Eileen McNaughton [Thu, 19 May 2022 04:58:25 +0000 (16:58 +1200)]
Merge pull request #23494 from eileenmcnaughton/import_if
[Import] Remove `if (1) {` (whitespace intensive)
Eileen McNaughton [Thu, 19 May 2022 03:35:18 +0000 (15:35 +1200)]
Merge pull request #23492 from totten/master-silly-method
(REF) CRM_Upgrade_Form - Remove silly method `runQuery`
Tim Otten [Thu, 19 May 2022 02:32:46 +0000 (19:32 -0700)]
FiveFortyNine - Tweak task title
Tim Otten [Wed, 18 May 2022 23:33:37 +0000 (16:33 -0700)]
FiveFortyNine - Revise message about "limit to"
1. This fixes a problem where the message shows at the opposite-of-correct time
(ie it should display on builds that have already run 5.49.{beta,0,1}, but
it actually displayed on builds that have not run 5.49.{beta,0,1})
2. This makes the pre+post messages match.
Tim Otten [Wed, 18 May 2022 22:02:12 +0000 (15:02 -0700)]
FiveFortyNine - Don't munge soft credit 'limit-to'
I'm not sure what it even means to limit a scheduled-reminder to a "soft_credit_type".
But it's a thing - I can use the 5.48 GUI to create it. Here's how it looks in the DB (in 5.48):
+----+------------------------------------------+------------------+----------+------------------+-------------------+----------+
| id | title | recipient | limit_to | recipient_manual | recipient_listing | group_id |
+----+------------------------------------------+------------------+----------+------------------+-------------------+----------+
| 11 | Limit To - Soft Credit | soft_credit_type | 1 | NULL | in_memory_of | NULL |
+----+------------------------------------------+------------------+----------+------------------+-------------------+----------+
The `changeBooleanColumnLimitTo()` was coercing down to `limit_to=null` because it lacked `recipient_manual` and `group_id`.
Tim Otten [Wed, 18 May 2022 21:58:42 +0000 (14:58 -0700)]
FiveFortyNine - Fix guard on `changeBooleanColumnLimitTo()`
Monish Deb [Wed, 18 May 2022 11:41:09 +0000 (17:11 +0530)]
add pre+post upgrade message
Monish Deb [Wed, 18 May 2022 04:36:43 +0000 (10:06 +0530)]
FiveFortyNine - Draft message for 5.49.2
Monish Deb [Tue, 17 May 2022 07:01:23 +0000 (12:31 +0530)]
Revert civicrm_action_schedule.limit_to boolean column to be NULL
Eileen McNaughton [Thu, 19 May 2022 02:13:51 +0000 (14:13 +1200)]
[REF] [Import] Remove unused parameter
Eileen McNaughton [Thu, 19 May 2022 02:08:56 +0000 (14:08 +1200)]
[Import] Remove if (1) {
Tim Otten [Sat, 12 Dec 2015 04:01:35 +0000 (20:01 -0800)]
(REF) CRM_Upgrade_Form - Remove silly method `runQuery`
This function just wraps `CRM_Core_DAO::executeQuery`, and it's only
used once.
colemanw [Thu, 19 May 2022 00:16:33 +0000 (20:16 -0400)]
Merge pull request #23476 from eileenmcnaughton/import_dupe_more
[Import] Simplify checking contact type is valid
Eileen McNaughton [Wed, 18 May 2022 21:07:31 +0000 (09:07 +1200)]
Merge pull request #23489 from colemanw/filterCustomFields
APIv4 - Filter custom fields based on supplied values
Eileen McNaughton [Tue, 17 May 2022 23:09:33 +0000 (11:09 +1200)]
Validate subtype change
Eileen McNaughton [Tue, 17 May 2022 06:28:41 +0000 (18:28 +1200)]
[Import] Simplify checking contact type is valid
Eileen McNaughton [Tue, 17 May 2022 03:22:25 +0000 (15:22 +1200)]
[Import] Duplicate finding cleanup
Darrick Servis [Sat, 14 May 2022 22:07:35 +0000 (15:07 -0700)]
Text user supplied dedupe rule is used during import.
Eileen McNaughton [Tue, 17 May 2022 23:37:33 +0000 (11:37 +1200)]
[REF] [Import] Extraction of get related contacts function
colemanw [Wed, 18 May 2022 19:01:13 +0000 (15:01 -0400)]
Merge pull request #23484 from eileenmcnaughton/import_get_type
Cleanup gender handling in contact import + add test
Coleman Watts [Mon, 9 May 2022 00:13:07 +0000 (20:13 -0400)]
APIv4 - Filter custom fields based on supplied values
This allows targeted getfields for a particular entity or type of entity
Yashodha Chaku [Wed, 18 May 2022 14:15:28 +0000 (19:45 +0530)]
Merge pull request #23461 from eileenmcnaughton/import_woohoo
[REF] [Import] Remove now-unused code
Eileen McNaughton [Wed, 18 May 2022 02:39:49 +0000 (14:39 +1200)]
Cleanup gender handling in contact import
Monish Deb [Wed, 18 May 2022 02:47:21 +0000 (08:17 +0530)]
Merge pull request #23470 from eileenmcnaughton/import_dataform
[REF] [Import] Stop calling Parser in MapField mode (contact import)
Monish Deb [Wed, 18 May 2022 02:27:16 +0000 (07:57 +0530)]
Merge pull request #23483 from eileenmcnaughton/import_get
Painstaking unravelling of function
colemanw [Wed, 18 May 2022 00:37:02 +0000 (20:37 -0400)]
Merge pull request #23475 from eileenmcnaughton/imp_fold
[Import] Add tests for contact type & contact subtype handling
colemanw [Wed, 18 May 2022 00:28:03 +0000 (20:28 -0400)]
Merge pull request #23452 from colemanw/exportCustomFieldWithOptions
APIv4 - Export options along with custom field
Eileen McNaughton [Wed, 18 May 2022 00:13:50 +0000 (12:13 +1200)]
Fold array building in
Eileen McNaughton [Wed, 18 May 2022 00:02:50 +0000 (12:02 +1200)]
Set up related Contact Key earlier
Eileen McNaughton [Wed, 18 May 2022 00:01:40 +0000 (12:01 +1200)]
Further simplification
Eileen McNaughton [Wed, 18 May 2022 00:00:21 +0000 (12:00 +1200)]
Simply value building
Eileen McNaughton [Tue, 17 May 2022 23:53:39 +0000 (11:53 +1200)]
Simplify related contact assignment
Eileen McNaughton [Tue, 17 May 2022 23:42:38 +0000 (11:42 +1200)]
Remove always-true-if
Eileen McNaughton [Tue, 17 May 2022 19:33:14 +0000 (07:33 +1200)]
Merge pull request #23481 from alifrumin/rn5.50
[NFC] First pass at 5.50 release notes
Alice Frumin [Fri, 13 May 2022 00:29:23 +0000 (20:29 -0400)]
[NFC] first stab at 5.50 release notes
demeritcowboy [Tue, 17 May 2022 16:57:05 +0000 (12:57 -0400)]
Merge pull request #23480 from demeritcowboy/too-many-questions
Remove extra question mark from url
demeritcowboy [Tue, 17 May 2022 15:01:42 +0000 (11:01 -0400)]
remove extra question mark
demeritcowboy [Tue, 17 May 2022 14:59:19 +0000 (10:59 -0400)]
Merge pull request #23469 from mlutfy/schemaTranslation
Fix Schema System Check translation and show missing Custom Field ID
Coleman Watts [Fri, 13 May 2022 01:35:30 +0000 (21:35 -0400)]
APIv4 - Export option groups along with custom fields
Mathieu Lutfy [Mon, 16 May 2022 16:46:55 +0000 (12:46 -0400)]
Fix Schema System Check translation
Seamus Lee [Tue, 17 May 2022 07:26:33 +0000 (17:26 +1000)]
Merge pull request #23446 from colemanw/searchKitDefaultAgg
SearchKit - Pick better default for aggregate functions
Seamus Lee [Tue, 17 May 2022 07:24:25 +0000 (17:24 +1000)]
Merge pull request #23472 from colemanw/exportMaxLentgh
APIv4 - Respect max length for name with export action
Eileen McNaughton [Tue, 17 May 2022 04:20:25 +0000 (16:20 +1200)]
Figure out & test what happens with ext identifier & type, subtype combos
colemanw [Tue, 17 May 2022 02:56:45 +0000 (22:56 -0400)]
Merge pull request #23464 from eileenmcnaughton/import_on_dup
[REF] [Import] Minor simplification
Coleman Watts [Tue, 17 May 2022 02:30:33 +0000 (22:30 -0400)]
APIv4 - Respect max length for name with export action
Eileen McNaughton [Tue, 17 May 2022 01:15:40 +0000 (13:15 +1200)]
Merge pull request #23459 from darrick/dev/core#2300
dev/core#2300 Can not use Custom Fields defined on a contact_sub_type in dedupe…
Eileen McNaughton [Mon, 16 May 2022 21:51:14 +0000 (09:51 +1200)]
[REF] [Import] Stop calling Parser in MapField mode
Yashodha Chaku [Mon, 16 May 2022 18:17:21 +0000 (23:47 +0530)]
Merge pull request #23463 from eileenmcnaughton/import_proc
[REF] [Import] Remove unused variable
Eileen McNaughton [Mon, 16 May 2022 08:59:17 +0000 (20:59 +1200)]
Merge pull request #23466 from totten/master-timeout-guzzle
CRM_Utils_Check - Catch Guzzle exception, same as core exception
Yashodha Chaku [Mon, 16 May 2022 06:07:42 +0000 (11:37 +0530)]
Merge pull request #23457 from eileenmcnaughton/import_more_part
Consolidate datasource form - event import
Tim Otten [Mon, 16 May 2022 06:02:57 +0000 (23:02 -0700)]
CRM_Utils_Check - Catch Guzzle exception, same as core exception
Overview
--------
`checkExtensions()` is supposed to show status-messages which report on
any out-of-date extensions. This requires a list of available updates.
Alas, the Internet is a big and scary place, and sometimes the list is
unavailable. DNS servers, HTTP servers, timeouts, yadda yadda. If it can't
get the list of extensions, it should show a status-message about this
problem.
Before
------
Throws an exception, causing a full failure in the page-view that does
the status-check.
After
-----
Catches the exception. Reports a status-message about the failure.
Comments
--------
It appears that this was probably the behavior before (ie `checkExtension()`
already has a try/catch for this kind of problem). However, the underlying
HTTP request was changed a versions back (ie from `HttpClient` to `Guzzle`)
which means that errors can get reported in other ways.
To simulate errors, I did this:
1. Run buggy/placeholder TCP service (`nc -l 8199`)
2. Hack `CRM_Extension_Browser::__construct()` to set `$this->repoUrl` to `http://localhost:8199`
3. Run `cv api System.check`
Yashodha Chaku [Mon, 16 May 2022 05:55:22 +0000 (11:25 +0530)]
Merge pull request #23289 from eileenmcnaughton/import_summ
[REF] [Import] Activity - clean up copy & paste
demeritcowboy [Sun, 15 May 2022 13:04:37 +0000 (09:04 -0400)]
Merge pull request #23462 from eileenmcnaughton/import_ex
[Import] [Ref] Remove unused variable
demeritcowboy [Sun, 15 May 2022 13:01:36 +0000 (09:01 -0400)]
Merge pull request #23460 from darrick/dev/core#492
dev/core#492 Fix Dedupe rule creation should display labels of contact types, in c…
Eileen McNaughton [Sat, 14 May 2022 21:38:04 +0000 (09:38 +1200)]
[REF] [Import] Minor simplification
At this stage value already holds the phone_type_id, location_type_id, im_provider_id, website_type_id
if any, so we don't need to throw it away & start again.
Eileen McNaughton [Sat, 14 May 2022 21:17:00 +0000 (09:17 +1200)]
[REF] [Import] Remove unused variable
Eileen McNaughton [Sat, 14 May 2022 21:13:13 +0000 (09:13 +1200)]
[Import] [Ref] Remove unused variable
Eileen McNaughton [Sat, 14 May 2022 20:56:28 +0000 (08:56 +1200)]
[REF] [Import] Remove now-unused code
Tim Otten [Sat, 14 May 2022 09:37:11 +0000 (02:37 -0700)]
Merge pull request #23455 from eileenmcnaughton/import_validate_mum
Import validate related contacts in the same way as the main contact
Darrick Servis [Fri, 13 May 2022 23:29:03 +0000 (16:29 -0700)]
Fix Dedupe rule creation should display labels of contact types, in case they have been customised.
Darrick Servis [Fri, 13 May 2022 22:13:29 +0000 (15:13 -0700)]
Fix Can not use Custom Fields defined on a contact_sub_type in dedupe rule
Eileen McNaughton [Fri, 13 May 2022 20:41:52 +0000 (08:41 +1200)]
Consolidate datasource form - event import
demeritcowboy [Fri, 13 May 2022 16:49:49 +0000 (12:49 -0400)]
Merge pull request #23420 from mattwire/custombasepage
Allow for custom base page in AJAX requests
Matthew Wire [Tue, 10 May 2022 15:41:20 +0000 (16:41 +0100)]
Use a more unique placeholder url path for CiviCRM AJAX requests
colemanw [Fri, 13 May 2022 13:06:23 +0000 (09:06 -0400)]
Merge pull request #23444 from eileenmcnaughton/import_get
[REF] [Import] Minor code cleanup
colemanw [Fri, 13 May 2022 13:04:49 +0000 (09:04 -0400)]
Merge pull request #23453 from eileenmcnaughton/import_no_map_field
Remove sets for no-longer gotten vars
Eileen McNaughton [Fri, 13 May 2022 03:15:41 +0000 (15:15 +1200)]
[Import] Apply the same contact validation to related contacts as the main contact
Eileen McNaughton [Tue, 10 May 2022 21:53:29 +0000 (09:53 +1200)]
[Import][REf] Cleanup required field checking
Eileen McNaughton [Fri, 13 May 2022 01:52:53 +0000 (13:52 +1200)]
Remove sets for no-longer gotten vars
Seamus Lee [Thu, 12 May 2022 22:54:46 +0000 (08:54 +1000)]
Merge pull request #23450 from totten/master-karma-comps
(NFC) karma - Enable all Civi components (not just CiviCase)
Seamus Lee [Thu, 12 May 2022 22:54:12 +0000 (08:54 +1000)]
Merge pull request #23448 from totten/master-typo
(NFC) CRM_Utils_Hook - Typo
Eileen McNaughton [Thu, 12 May 2022 22:15:17 +0000 (10:15 +1200)]
Merge pull request #23442 from eileenmcnaughton/import_data
[REF] [Import] Parser cleanup
Tim Otten [Thu, 12 May 2022 20:53:46 +0000 (13:53 -0700)]
(NFC) karma - Enable all Civi components (not just CiviCase)
This is a small cleanup (suggested by @colemanw) that makes the `karma.conf.js` appear more general.
It modifies the startup process for a test-runner; as long as the test-runner still gives the
same output, it should be safe.
Before
------
`karma` loads baseline Angular modules and CiviCase Angular modules.
After
-----
`karma` loads baseline Angular modules and any/all component-based Angular modules
Comment
-------
Why was it only CiviCase? Not certain... but I *think* it's because
(historically) `crmMailing.ang.php` did extra work to build `settings`, and
this extra work was a bit too heavy. That work has moved (`settings` became
`settingsFactory`) and maybe makes this safer.
Tim Otten [Thu, 12 May 2022 20:23:52 +0000 (13:23 -0700)]
(NFC) CRM_Utils_Hook - Typo
Tim Otten [Thu, 12 May 2022 20:38:48 +0000 (13:38 -0700)]
karma - Allow execution with debug_mode=1. Hide jsonFormatter.
Before
------
If you enable `debug_mode=1` and run `karma`, it produces a large number of failures:
```
PhantomJS 2.1.1 (Mac OS 0.0.0): Executed 81 of 81 (55 FAILED) (2.686 secs / 2.387 secs)
```
After
-----
If you enable `debug_mode=1` and run `karma`, it passes:
```
PhantomJS 2.1.1 (Mac OS 0.0.0): Executed 81 of 81 SUCCESS (7.232 secs / 6.95 secs)
```
Comments
--------
The `jsonFormatter` plugin is a DX nicety; when browsing a page with `?angularDebug=1` and with `debug_mode=1`, it will load extra
files so that `<crm-ui-debug>` panels look pretty. But ordinarily, loading these files is extraneous.
Eileen McNaughton [Thu, 21 Apr 2022 22:11:41 +0000 (10:11 +1200)]
[REF] [Import] Remove last instance of passing fieldTypes through get->set
Tim Otten [Thu, 12 May 2022 19:34:35 +0000 (12:34 -0700)]
Merge pull request #23447 from agh1/5.50.0-releasenotes-initial
5.50.0 release notes initial run
Monish Deb [Thu, 12 May 2022 18:51:40 +0000 (00:21 +0530)]
Merge pull request #23332 from darrick/dupeQuery
(REF) CRM_Dedupe_BAO_DedupeRule - Support third party fields and tables in rules
Andie Hunt [Thu, 12 May 2022 18:02:14 +0000 (14:02 -0400)]
5.50.0 release notes: added boilerplate
Andie Hunt [Thu, 12 May 2022 17:58:20 +0000 (13:58 -0400)]
5.50.0 release notes: raw from script
Coleman Watts [Thu, 12 May 2022 16:19:40 +0000 (12:19 -0400)]
SearchKit - Pick better default for aggregate functions
Improves the metadata for SQL functions as well.
Eileen McNaughton [Thu, 12 May 2022 04:21:06 +0000 (16:21 +1200)]
Merge pull request #23441 from colemanw/api4TestCleanup
[TEST ONLY] APIv4 - ensure test records are cleaned up in non-transaction tests
Eileen McNaughton [Thu, 12 May 2022 03:19:13 +0000 (15:19 +1200)]
Merge pull request #23443 from civicrm/5.50
5.50
Coleman Watts [Wed, 11 May 2022 23:39:17 +0000 (19:39 -0400)]
APIv4 Unit test fixes - ensure test records are cleaned up in non-transaction tests
Use the new `createTestRecord` and `saveTestRecords` in non-transaction test classes
so the created records are automatically cleaned-up.
Eileen McNaughton [Thu, 12 May 2022 01:08:57 +0000 (13:08 +1200)]
Merge pull request #23436 from colemanw/searchKitPagerDefaults
SearchKit - Default to simple pager when creating new table display
Eileen McNaughton [Thu, 12 May 2022 01:08:00 +0000 (13:08 +1200)]
Merge pull request #23434 from colemanw/groupByFn
SearchKit - Allow functions in the GROUP BY clause
Eileen McNaughton [Thu, 12 May 2022 00:37:37 +0000 (12:37 +1200)]
Use submittedValues for usps
Eileen McNaughton [Thu, 12 May 2022 00:12:29 +0000 (12:12 +1200)]
[REF] [Import] Minor code cleanup
This chunk of code effectively constructs an array 'value' which holds the location
fields from the mapping. If the array is not empty then
use it as an array, otherwise use just the value
colemanw [Wed, 11 May 2022 23:58:50 +0000 (19:58 -0400)]
Merge pull request #23440 from totten/5.50-since-when
(NFC) mixin/mgd-php@1 - Twiddle `@since`