Eileen McNaughton [Sun, 2 Apr 2023 03:19:23 +0000 (15:19 +1200)]
Move entity_id before status_message
Eileen McNaughton [Sun, 2 Apr 2023 02:48:29 +0000 (14:48 +1200)]
Removed edit-in-place options from Import views on imported rows.
It's confusing to the user to be able to edit the records when they
are already imported. This is not a real security thing - more
of a UI thing - but Coleman recommends implementing through
checkAccess. I did leave open the back door of being able to edit it
if the status is now present as there isn't a real reason they shouldn't -
just that it is confusing to present edit-in-place, except when they could
edit & re-try the import
Eileen McNaughton [Sun, 2 Apr 2023 03:12:08 +0000 (15:12 +1200)]
Merge pull request #25969 from colemanw/entityValues
SearchKit - Pass entire record into `checkAccess`
Eileen McNaughton [Sun, 2 Apr 2023 02:43:28 +0000 (14:43 +1200)]
Merge pull request #25972 from colemanw/batchUpdate
BAO - deprecate create for writeRecord: Batch
Coleman Watts [Sat, 1 Apr 2023 23:31:53 +0000 (19:31 -0400)]
BAO - deprecate create for writeRecord: Batch
Coleman Watts [Sat, 1 Apr 2023 15:15:22 +0000 (11:15 -0400)]
SearchKit - Pass entire record into `checkAccess`
For efficiency it's best to pass all available data into the `checkAccess` action to avoid unnecessary
db lookups. This ensures the full record is passed in when checking access before enabling in-place edit.
Seamus Lee [Fri, 31 Mar 2023 23:28:30 +0000 (10:28 +1100)]
Merge pull request #25956 from totten/master-tap
(dev/core#4188) PHPUnit - Port TAP printer to v9.x
Matthew Wire [Fri, 31 Mar 2023 10:26:56 +0000 (11:26 +0100)]
Merge pull request #25965 from eileenmcnaughton/dep_tax
Remove noisily deprecated code
Eileen McNaughton [Fri, 31 Mar 2023 01:46:52 +0000 (14:46 +1300)]
Merge pull request #25966 from civicrm/5.60
5.60 to master
Eileen McNaughton [Fri, 31 Mar 2023 01:39:08 +0000 (14:39 +1300)]
Merge pull request #25963 from seamuslee001/dev_core_4029
dev/core#4029 Ensure that Pan Truncation and card type id is recorded…
Eileen McNaughton [Fri, 31 Mar 2023 01:36:24 +0000 (14:36 +1300)]
Merge pull request #25964 from eileenmcnaughton/mem_regress
Fix master-only regression on loading membership changes
Eileen McNaughton [Fri, 31 Mar 2023 01:11:36 +0000 (14:11 +1300)]
Remove noisily deprecated code
Eileen McNaughton [Fri, 31 Mar 2023 00:50:36 +0000 (13:50 +1300)]
Fix master-only regression on loading membership changes
A recent commit caused _mid to be set to FALSE to denote
it had been looked up & was empty (as opposed to not yet checked)
but these places are using isset.
The change fixes them all to call the function.
Seamus Lee [Thu, 30 Mar 2023 23:22:21 +0000 (10:22 +1100)]
Merge pull request #25962 from eileenmcnaughton/import_url
Upgrade fix for url change
Seamus Lee [Thu, 30 Mar 2023 22:07:23 +0000 (09:07 +1100)]
dev/core#4029 Ensure that Pan Truncation and card type id is recorded when processing front end contributions
Eileen McNaughton [Thu, 30 Mar 2023 20:45:40 +0000 (09:45 +1300)]
Upgrade fix for url change
Tim Otten [Thu, 30 Mar 2023 20:26:18 +0000 (13:26 -0700)]
Merge pull request #25952 from seamuslee001/dev_core_3133
dev/core#3133 - Extend Authx functionality to support validation of e…
demeritcowboy [Thu, 30 Mar 2023 18:31:13 +0000 (14:31 -0400)]
Merge pull request #25958 from colemanw/javascript
CustomFields - drop unused 'javascript' column
Mathieu Lu [Thu, 30 Mar 2023 14:32:54 +0000 (10:32 -0400)]
Merge pull request #25953 from demeritcowboy/too-loggy
Duplicate logging not needed for PEAR_Errors anymore
colemanw [Thu, 30 Mar 2023 12:26:51 +0000 (08:26 -0400)]
Merge pull request #25955 from colemanw/groupEdit
Manage groups - add dedicated url for edit/delete group
colemanw [Thu, 30 Mar 2023 12:03:53 +0000 (08:03 -0400)]
Merge pull request #25944 from colemanw/writeRecordRef
[REF] Refactor location-related BAOs to use `writeRecord`
colemanw [Thu, 30 Mar 2023 10:53:35 +0000 (06:53 -0400)]
Merge pull request #25959 from eileenmcnaughton/import_links
Flush cache that holds schema links information when saving UserJob
Coleman Watts [Thu, 30 Mar 2023 00:45:53 +0000 (20:45 -0400)]
Manage groups - add dedicated url for edit/delete group
Tim Otten [Thu, 30 Mar 2023 04:47:34 +0000 (21:47 -0700)]
Merge pull request #25957 from eileenmcnaughton/import_template
Import templates Set created_id, expires_date appropriately
Eileen McNaughton [Thu, 30 Mar 2023 04:12:13 +0000 (17:12 +1300)]
Flush cache that holds schema links information when saving UserJob
Coleman Watts [Thu, 30 Mar 2023 03:08:49 +0000 (23:08 -0400)]
CustomFields - drop unused 'javascript' column
Eileen McNaughton [Thu, 30 Mar 2023 03:06:13 +0000 (16:06 +1300)]
Import templates Set created_id, expires_date appropriately
This tweaks just-merged userJob functionality.
When creating an import job it is not correct to use
the created_id or expires_date from the template - but
these should be set appropriately, rather than left blank
Tim Otten [Thu, 30 Mar 2023 01:36:34 +0000 (18:36 -0700)]
tools/scripts/phpunit - Enable tap for phpunit9
Tim Otten [Thu, 30 Mar 2023 01:30:29 +0000 (18:30 -0700)]
Testing - Port TAP printer to PHPUnit 9
Tim Otten [Thu, 30 Mar 2023 01:17:55 +0000 (18:17 -0700)]
(REF) Testing - Extract class-file "TAP7"
Coleman Watts [Tue, 28 Mar 2023 14:25:01 +0000 (10:25 -0400)]
BAO - Refactor Address add/create to use writeRecord
Coleman Watts [Tue, 28 Mar 2023 13:13:33 +0000 (09:13 -0400)]
BAO - Deprecate email/im/phone/website/openId create/add functions in favor of writeRecord
Eileen McNaughton [Wed, 29 Mar 2023 21:57:45 +0000 (10:57 +1300)]
Merge pull request #25954 from demeritcowboy/case-dashboard-recent
dev/core#3804 - Fix recently performed activities on case dashboard when no upcoming exist
demeritcowboy [Wed, 29 Mar 2023 21:11:46 +0000 (17:11 -0400)]
fix recently performed activities on case dashboard
demeritcowboy [Wed, 29 Mar 2023 20:15:01 +0000 (16:15 -0400)]
Merge pull request #25917 from eileenmcnaughton/smarty_pcp
Check presence of field, rather than extra smarty variable for whether to display the field
Eileen McNaughton [Sat, 25 Mar 2023 01:08:00 +0000 (14:08 +1300)]
Check presence of field, rather than extra smarty variable for whether to display the field
demeritcowboy [Wed, 29 Mar 2023 19:19:34 +0000 (15:19 -0400)]
Merge pull request #25906 from herbdool/issue-4200
dev/core#4200 use org ID rather than assume it
demeritcowboy [Wed, 29 Mar 2023 15:35:58 +0000 (11:35 -0400)]
logging not needed here anymore - still gets logged later if not caught
Yashodha Chaku [Wed, 29 Mar 2023 09:20:07 +0000 (14:50 +0530)]
Merge pull request #25726 from ixiam/devCrmMoneyLocale
add locale param to smarty crmMoney()
Tim Otten [Wed, 29 Mar 2023 05:35:10 +0000 (22:35 -0700)]
authx - Simplify service declaration
Anthony [Thu, 24 Mar 2022 04:29:44 +0000 (12:29 +0800)]
dev/core#3133 - Extend Authx functionality to support validation of externally generated JWTs
Migrate legacy rest to appropriate place
Remove legacy auth as not needed due to it self registering now
Eileen McNaughton [Wed, 29 Mar 2023 01:21:32 +0000 (14:21 +1300)]
Merge pull request #25951 from civicrm/5.60
5.60 to master
Eileen McNaughton [Wed, 29 Mar 2023 01:21:03 +0000 (14:21 +1300)]
Merge pull request #25950 from demeritcowboy/upgrade-fk
Make 5.60 upgrade rerunnable
demeritcowboy [Wed, 29 Mar 2023 00:27:54 +0000 (20:27 -0400)]
make upgrade rerunnable
Eileen McNaughton [Wed, 29 Mar 2023 00:26:05 +0000 (13:26 +1300)]
Merge pull request #25946 from totten/master-phpunit9
(dev/core#4188) phpunit.xml.dist - Make file compatible with phpunit8 + phpunit9
Seamus Lee [Wed, 29 Mar 2023 00:23:17 +0000 (11:23 +1100)]
Merge pull request #25949 from totten/master-phpunit9-crm
(dev/core#4188) Update CRM tests for phpunit9 compatibility
Seamus Lee [Wed, 29 Mar 2023 00:23:01 +0000 (11:23 +1100)]
Merge pull request #25948 from totten/master-phpunit9-api3
(dev/core#4188) Update APIv3 tests for phpunit9 compatibility
Seamus Lee [Wed, 29 Mar 2023 00:20:53 +0000 (11:20 +1100)]
Merge pull request #25947 from totten/master-phpunit9-api4
(dev/core#4188) Update APIv4 tests for phpunit9 compatibility
Tim Otten [Tue, 28 Mar 2023 23:47:30 +0000 (16:47 -0700)]
(dev/core#4188) Update CRM tests for phpunit9 compatibility
Tim Otten [Tue, 28 Mar 2023 23:42:21 +0000 (16:42 -0700)]
(dev/core#4188) Update APIv3 tests for phpunit9 compatibility
These tests failed on `phpunit9` because upstream swapped out around the semantics of `assertContains()`.
The specific issue is whether an array like `["1","2","3"]` contains the value `2`.
* `assertContains()` in phpunit8 says yes.
* `assertContains()` in phpunit9 says no.
* `assertContainsEquals()` in both phpunit8+phpunit9 says yes.
Tim Otten [Tue, 28 Mar 2023 23:02:01 +0000 (16:02 -0700)]
(dev/core#4188) Update APIv4 tests for phpunit9 compatibility
These tests failed on `phpunit9` because upstream swapped out around the semantics of `assertContains()`.
The specific issue is whether an array like `["1","2","3"]` contains the value `2`.
* `assertContains()` in phpunit8 says yes.
* `assertContains()` in phpunit9 says no.
* `assertContainsEquals()` in both phpunit8+phpunit9 says yes.
Tim Otten [Tue, 28 Mar 2023 22:28:26 +0000 (15:28 -0700)]
phpunit.xml.dist - Make file compatible with phpunit8 + phpunit9
Eileen McNaughton [Tue, 28 Mar 2023 20:28:33 +0000 (09:28 +1300)]
Merge pull request #25873 from colemanw/ppUpdate
PaymentProcessor - Enter title instead of name on form, call hooks
Eileen McNaughton [Tue, 28 Mar 2023 04:01:56 +0000 (17:01 +1300)]
PHP 8.2 - declare property _fields
Really we want to merge this into entityFields but it wasn't as easy as I hoped
Eileen McNaughton [Tue, 28 Mar 2023 03:59:38 +0000 (16:59 +1300)]
Fix incorrect redirect when saving with bad config
Since the config is checked after saving we want to go to the
edit form, not the new form
Eileen McNaughton [Fri, 24 Mar 2023 02:28:47 +0000 (15:28 +1300)]
Fix form to stop messing name field for test processor
Eileen McNaughton [Tue, 28 Mar 2023 01:20:05 +0000 (14:20 +1300)]
Consolidate loading parameters from PaymentProcessorType
Eileen McNaughton [Tue, 28 Mar 2023 01:29:09 +0000 (14:29 +1300)]
Present frontend_title for Payment processor
Coleman Watts [Sun, 19 Mar 2023 23:55:54 +0000 (19:55 -0400)]
PaymentProecssor - Add frontend_title & make title required
Clarifies the role of 'title' as "for admins" and adds a new "frontend_title" for end-users.
Updates the PaymentProcessor form/dao to use hooks instead of an overloaded "create" function,
and only allows the title and frontend_title instead of the name to be entered on the form.
The name will be autogenerated from the title in the DAO::writeRecord function.
The frontend_title is required in the database but will be filled from `title` if not supplied during `create`
Updates tests, sql and sample data with required field
colemanw [Tue, 28 Mar 2023 15:10:31 +0000 (11:10 -0400)]
Merge pull request #25927 from colemanw/entityRefFix
SearchKit - Fix handling of new Custom EntityReference fields
colemanw [Tue, 28 Mar 2023 12:36:54 +0000 (08:36 -0400)]
Merge pull request #25937 from colemanw/emailWriteRecord
Refactor CRM_Core_BAO_Email to use DAO::writeRecord
Yashodha Chaku [Tue, 28 Mar 2023 12:32:02 +0000 (18:02 +0530)]
Merge pull request #25933 from mlutfy/logReminders
Log sending of Scheduled Reminders
Seamus Lee [Tue, 28 Mar 2023 07:31:22 +0000 (18:31 +1100)]
Merge pull request #25941 from eileenmcnaughton/nfc_null
[NFC] Remove extraneous NULL
Tim Otten [Tue, 28 Mar 2023 07:06:23 +0000 (00:06 -0700)]
Merge pull request #25943 from totten/master-mfw
Merge forward 5.60-rc=>master
Tim Otten [Tue, 28 Mar 2023 06:54:07 +0000 (23:54 -0700)]
Merge remote-tracking branch 'origin/5.60' into master-mfw
Tim Otten [Tue, 28 Mar 2023 06:52:09 +0000 (23:52 -0700)]
Merge pull request #25942 from totten/5.60-cache-test
Simplify steps of loading SimpleCacheTest from cache/integration-tests
Eileen McNaughton [Tue, 28 Mar 2023 06:18:39 +0000 (19:18 +1300)]
Merge pull request #25940 from eileenmcnaughton/upgrade_bug
Fix bug in just-merged upgrade code
Eileen McNaughton [Tue, 28 Mar 2023 05:53:53 +0000 (18:53 +1300)]
[NFC] Remove extraneous NULL
It confuses code analysers & Coleman says it's silly
Tim Otten [Tue, 28 Mar 2023 05:53:30 +0000 (22:53 -0700)]
(NFC) SimpleCacheTest - Adapt license
The copied declaration references a file that doesn't exist. Just inline it.
demeritcowboy [Sun, 12 Mar 2023 20:48:48 +0000 (16:48 -0400)]
remove dependence on cache/integration-tests
Eileen McNaughton [Tue, 28 Mar 2023 05:42:32 +0000 (18:42 +1300)]
Fix bug in just-merged upgrade code
Tim Otten [Tue, 28 Mar 2023 05:38:14 +0000 (22:38 -0700)]
Undeclare cache/integration-tests
Coleman Watts [Mon, 27 Mar 2023 21:41:58 +0000 (17:41 -0400)]
Refactor CRM_Core_BAO_Email to use DAO::writeRecord
colemanw [Mon, 27 Mar 2023 23:09:49 +0000 (19:09 -0400)]
Merge pull request #25808 from eileenmcnaughton/import_template
dev/core#4130 add template support for imports
Eileen McNaughton [Mon, 27 Mar 2023 21:43:03 +0000 (10:43 +1300)]
Merge pull request #25936 from civicrm/5.60
5.60 to master
Eileen McNaughton [Mon, 27 Mar 2023 21:00:45 +0000 (10:00 +1300)]
Merge pull request #25932 from ufundo/api-event-create-from-template
Fix for creating new events from template with api
colemanw [Mon, 27 Mar 2023 20:22:37 +0000 (16:22 -0400)]
Merge pull request #25879 from eileenmcnaughton/import_hooks
dev/core#3514 Define hook to alter data once it has been mapped but before work is done on it.
colemanw [Mon, 27 Mar 2023 20:21:38 +0000 (16:21 -0400)]
Merge pull request #25886 from eileenmcnaughton/import_contribution_api4
Update Contribution Import to use apiv4 field names, prior to adding hooks
Eileen McNaughton [Mon, 27 Mar 2023 20:08:02 +0000 (09:08 +1300)]
Cast metadata to string, as it would hit deprecation notice on null
Eileen McNaughton [Thu, 16 Mar 2023 04:48:46 +0000 (17:48 +1300)]
Add url to UserJob data & declare import Type on MapField screens
The DataSource screen currently declares the type so this makes it available on MapField
Minor tidy up/ standardisation on Contact defaultValues
This also allows the parent to override the values, e.g if loaded from a template
Fix BAO to support Template UserJobs
- do not save non-template fields
- delete templates on Mapping deletes
Add support for UserJob templates at the form level
Fix for strict typing
benjamin [Mon, 27 Mar 2023 13:52:52 +0000 (13:52 +0000)]
fix creating new event from template
benjamin [Mon, 27 Mar 2023 14:16:25 +0000 (15:16 +0100)]
make test for creating event from template a bit more difficult
Eileen McNaughton [Mon, 27 Mar 2023 19:48:33 +0000 (08:48 +1300)]
Merge pull request #25934 from colemanw/usageGen
Regenerate DAOs with usage from #25874
Coleman Watts [Mon, 27 Mar 2023 18:46:23 +0000 (14:46 -0400)]
Regenerate DAOs with usage from #25874
Mathieu Lutfy [Mon, 27 Mar 2023 16:08:57 +0000 (12:08 -0400)]
Log sending of Scheduled Reminders
They are a pain to debug when they fail because of errors with smarty or tokens
Matthew Wire [Mon, 27 Mar 2023 15:38:03 +0000 (16:38 +0100)]
Merge pull request #25408 from artfulrobot/artfulrobot-speedup-searchkit
Speed up SearchKit results loading by 800ms
Matthew Wire [Mon, 27 Mar 2023 11:14:04 +0000 (12:14 +0100)]
Merge pull request #25754 from eileenmcnaughton/quick_config
Extract `isMembershipPriceSet` (`useForMember`)
Matthew Wire [Mon, 27 Mar 2023 11:10:20 +0000 (12:10 +0100)]
Merge pull request #25929 from eileenmcnaughton/mem_test_nfc
Add unit test cover for test offline mail receipt
Matthew Wire [Mon, 27 Mar 2023 11:08:12 +0000 (12:08 +0100)]
Merge pull request #25912 from eileenmcnaughton/560
dev/core#4197 Ensure parameters are correct type
Matthew Wire [Mon, 27 Mar 2023 11:07:44 +0000 (12:07 +0100)]
Merge pull request #25907 from eileenmcnaughton/url
Fix import contribution url
Matthew Wire [Mon, 27 Mar 2023 11:06:44 +0000 (12:06 +0100)]
Merge pull request #25833 from eileenmcnaughton/mid
[php8.2] Create getter for `renewalMembershipID`, remove if
Matthew Wire [Mon, 27 Mar 2023 11:05:28 +0000 (12:05 +0100)]
Merge pull request #25454 from eileenmcnaughton/grant_notice
CiviReport - Remove duplicate external identifier key in contact fields array, reduce notices
Eileen McNaughton [Mon, 27 Mar 2023 04:45:40 +0000 (17:45 +1300)]
Add unit test cover for test offline mail receipt
Seamus Lee [Mon, 27 Mar 2023 04:02:54 +0000 (15:02 +1100)]
Merge pull request #25928 from eileenmcnaughton/mem_test_nfc
[NFC] Test cleanup, prefer full form test flow
Eileen McNaughton [Mon, 27 Mar 2023 02:36:37 +0000 (15:36 +1300)]
[NFC] Test cleanup, prefer full form test flow
Coleman Watts [Sun, 26 Mar 2023 23:35:29 +0000 (19:35 -0400)]
APIv4 - Prevent errors during upgrade when loading custom field metadata
Seamus Lee [Sun, 26 Mar 2023 22:05:13 +0000 (09:05 +1100)]
Merge pull request #25924 from eileenmcnaughton/mem_test
Fix intermittant test fail
Coleman Watts [Sun, 26 Mar 2023 20:46:08 +0000 (16:46 -0400)]
SearchKit - Fix handing of new EntityReference custom fields
Fixes the metadata for the new EntityReference custom fields to correctly display.
Removes redundant function SpecFormatter::customFieldHasOptions which was completely
identical to CRM_Core_BAO_CustomField::hasOptions except for one line which was incorrect.
Jon Goldberg [Fri, 24 Mar 2023 20:22:38 +0000 (16:22 -0400)]
EntityRef fields don't get returned and can't be joined in API4
colemanw [Sun, 26 Mar 2023 15:11:34 +0000 (11:11 -0400)]
Merge pull request #25926 from braders/entity-form-trait-properties
[REF][PHP8.2] Declare properties directly on CRM_Core_Form_EntityFormTrait