civicrm-core.git
3 years agodon't try to money_format html
demeritcowboy [Wed, 31 Mar 2021 13:36:50 +0000 (09:36 -0400)]
don't try to money_format html

3 years agoMerge pull request #19924 from eileenmcnaughton/mem_ex
Monish Deb [Wed, 31 Mar 2021 09:41:31 +0000 (15:11 +0530)]
Merge pull request #19924 from eileenmcnaughton/mem_ex

[REF] Extract getMembershipTypeValues

3 years agoMerge pull request #19956 from civicrm/5.36
Eileen McNaughton [Wed, 31 Mar 2021 09:33:04 +0000 (22:33 +1300)]
Merge pull request #19956 from civicrm/5.36

5.36

3 years agoMerge pull request #19952 from eileenmcnaughton/5.36
Monish Deb [Wed, 31 Mar 2021 05:22:55 +0000 (10:52 +0530)]
Merge pull request #19952 from eileenmcnaughton/5.36

dev/core#2498 Fix regression on saving dedupe rules

3 years agoMerge pull request #19936 from jmcclelland/only-include-completed
Seamus Lee [Wed, 31 Mar 2021 05:07:35 +0000 (16:07 +1100)]
Merge pull request #19936 from jmcclelland/only-include-completed

Only include completed contributions in the aggregate custom search

3 years agoMerge pull request #19894 from eileenmcnaughton/acl
Seamus Lee [Wed, 31 Mar 2021 05:05:20 +0000 (16:05 +1100)]
Merge pull request #19894 from eileenmcnaughton/acl

Only call getGroupACLRoles if contactID is present

3 years agoMerge pull request #19944 from civicrm/dependabot/npm_and_yarn/y18n-4.0.1
Seamus Lee [Wed, 31 Mar 2021 05:01:07 +0000 (16:01 +1100)]
Merge pull request #19944 from civicrm/dependabot/npm_and_yarn/y18n-4.0.1

Bump y18n from 4.0.0 to 4.0.1

3 years agoMerge pull request #19953 from eileenmcnaughton/jobtest
Seamus Lee [Wed, 31 Mar 2021 04:59:28 +0000 (15:59 +1100)]
Merge pull request #19953 from eileenmcnaughton/jobtest

NFC cleanup in test class

3 years agoNFC cleanup in hook class
eileen [Wed, 31 Mar 2021 02:51:50 +0000 (15:51 +1300)]
NFC cleanup in hook class

3 years agoMerge pull request #19950 from eileenmcnaughton/dead_fn
Eileen McNaughton [Wed, 31 Mar 2021 02:35:30 +0000 (15:35 +1300)]
Merge pull request #19950 from eileenmcnaughton/dead_fn

Remove unused private function

3 years agoMerge pull request #19941 from eileenmcnaughton/html_to_money
Eileen McNaughton [Wed, 31 Mar 2021 01:46:26 +0000 (14:46 +1300)]
Merge pull request #19941 from eileenmcnaughton/html_to_money

Stop passing html to crmMoney

3 years agodev/core#2498 Fix regression on saving dedupe rules
eileen [Wed, 31 Mar 2021 01:28:11 +0000 (14:28 +1300)]
dev/core#2498 Fix regression on saving dedupe rules

3 years agoRemove unused private function
eileen [Wed, 31 Mar 2021 00:35:22 +0000 (13:35 +1300)]
Remove unused private function

3 years agoMerge pull request #19940 from eileenmcnaughton/dave_shall_not_break_our_tests
Seamus Lee [Tue, 30 Mar 2021 22:45:54 +0000 (09:45 +1100)]
Merge pull request #19940 from eileenmcnaughton/dave_shall_not_break_our_tests

Fix to avoid passing non-money to money::format

3 years agoMerge pull request #19933 from eileenmcnaughton/pt
colemanw [Tue, 30 Mar 2021 20:02:40 +0000 (16:02 -0400)]
Merge pull request #19933 from eileenmcnaughton/pt

dev/core#2486 Add payment token api

3 years agoStop passing html to crmMoney
eileen [Tue, 30 Mar 2021 00:33:38 +0000 (13:33 +1300)]
Stop passing html to crmMoney

3 years agoMerge pull request #19945 from eileenmcnaughton/group_filter
colemanw [Tue, 30 Mar 2021 19:03:34 +0000 (15:03 -0400)]
Merge pull request #19945 from eileenmcnaughton/group_filter

[REF] Extract portion of GroupContact load that builds the temporary table

3 years agoAdd payment token api
eileen [Mon, 29 Mar 2021 00:54:16 +0000 (13:54 +1300)]
Add payment token api

I put up a merge request to edit in somewhere to link to
https://lab.civicrm.org/documentation/docs/user-en/-/merge_requests/472 since I couldn't
see anywhere that payment tokens were discussed

3 years ago[REF] Extract portion of GroupContact load that builds the temporary table
eileen [Tue, 30 Mar 2021 05:42:36 +0000 (18:42 +1300)]
[REF] Extract portion of GroupContact load that builds the temporary table

This is mostly a straight extraction. I chose to pass groupIDs in as an array
as I think that creates greater flexibility and I chose to pass CRM_Utils_SQL_TempTable
in rather than load it in the function because I have some ideas I'm working through
about how that might also provide more flexibilty

Those things can be changed later if we want as it IS a protected function

3 years agoBump y18n from 4.0.0 to 4.0.1
dependabot[bot] [Tue, 30 Mar 2021 04:10:40 +0000 (04:10 +0000)]
Bump y18n from 4.0.0 to 4.0.1

Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoMerge pull request #19935 from colemanw/afGuiFixes
Eileen McNaughton [Tue, 30 Mar 2021 04:10:12 +0000 (17:10 +1300)]
Merge pull request #19935 from colemanw/afGuiFixes

Afform GUI - Improve drag-n-drop and add link to edit search

3 years agoMerge pull request #19943 from civicrm/5.36
Eileen McNaughton [Tue, 30 Mar 2021 03:18:13 +0000 (16:18 +1300)]
Merge pull request #19943 from civicrm/5.36

5.36 to master

3 years agoMerge pull request #19942 from eileenmcnaughton/5.36
Eileen McNaughton [Tue, 30 Mar 2021 03:17:30 +0000 (16:17 +1300)]
Merge pull request #19942 from eileenmcnaughton/5.36

Revert "dev/core#2028 Add in a status check for checking if the wkhtm…

3 years agoRevert "dev/core#2028 Add in a status check for checking if the wkhtmltopdf package...
eileen [Tue, 30 Mar 2021 00:50:28 +0000 (13:50 +1300)]
Revert "dev/core#2028 Add in a status check for checking if the wkhtmltopdf package is installed in the expected location, Also ensure if it isn't then the pdf generation falls back on the current default which is DOMPDF"

This reverts commit 6bbe0cf6c513c49f89179aa153cabad3a2a059b7.

3 years agoFix to avoid passing non-money to money::format
eileen [Tue, 30 Mar 2021 00:25:55 +0000 (13:25 +1300)]
Fix to avoid passing non-money to money::format

3 years agoAfformGui - Improve dragging & dropping with more space & clearer borders
Coleman Watts [Mon, 29 Mar 2021 03:18:37 +0000 (23:18 -0400)]
AfformGui - Improve dragging & dropping with more space & clearer borders

This adds more space for dragging & dropping elements so it's not so difficult to put things in the right place

3 years agoMerge pull request #19931 from eileenmcnaughton/fa
Eileen McNaughton [Mon, 29 Mar 2021 19:09:20 +0000 (08:09 +1300)]
Merge pull request #19931 from eileenmcnaughton/fa

dev/core#2486 Add v4 batch api

3 years agoMerge pull request #19923 from MikeyMJCO/patch-8
Eileen McNaughton [Mon, 29 Mar 2021 18:08:18 +0000 (07:08 +1300)]
Merge pull request #19923 from MikeyMJCO/patch-8

Set the `Other Amount` input in a price set to not autocomplete

3 years agoMerge pull request #19873 from demeritcowboy/multiemail-activityids
Eileen McNaughton [Mon, 29 Mar 2021 18:06:15 +0000 (07:06 +1300)]
Merge pull request #19873 from demeritcowboy/multiemail-activityids

dev/core#2463 - Adjust returned list of activity ids when sending emails since it changes in 5.36+

3 years agoOnly include completed contributions in the aggregate custom search
Jamie McClelland [Mon, 29 Mar 2021 14:27:25 +0000 (10:27 -0400)]
Only include completed contributions in the aggregate custom search

There is little value in getting the aggregate contributions if failed
contributions are also included.

3 years agoAdd v4 batch api
eileen [Sun, 28 Mar 2021 23:42:43 +0000 (12:42 +1300)]
Add v4 batch api

3 years agoAfformGui - Add link to edit SavedSearch to searchDisplay element
Coleman Watts [Mon, 29 Mar 2021 03:17:18 +0000 (23:17 -0400)]
AfformGui - Add link to edit SavedSearch to searchDisplay element

3 years agoMerge pull request #19932 from eileenmcnaughton/ft
Eileen McNaughton [Mon, 29 Mar 2021 01:41:46 +0000 (14:41 +1300)]
Merge pull request #19932 from eileenmcnaughton/ft

dev/core#2486 Add entity financial trxn

3 years agodev/core#2486 Add entity financial trxn
eileen [Mon, 29 Mar 2021 00:11:23 +0000 (13:11 +1300)]
dev/core#2486 Add entity financial trxn

3 years agoMerge pull request #19930 from eileenmcnaughton/acl_setting
Seamus Lee [Sun, 28 Mar 2021 22:49:17 +0000 (09:49 +1100)]
Merge pull request #19930 from eileenmcnaughton/acl_setting

dev/core#2477 Add setting to allow opportunistic cache flushing for acls

3 years agoMerge pull request #19929 from demeritcowboy/fake-intl-warning
Eileen McNaughton [Sun, 28 Mar 2021 22:18:15 +0000 (11:18 +1300)]
Merge pull request #19929 from demeritcowboy/fake-intl-warning

dev/financial#171 - False INTL warning when adding a price field

3 years agodev/core#2477 Add setting to allow opportunistic cache flushing for acls
eileen [Sun, 28 Mar 2021 20:37:42 +0000 (09:37 +1300)]
dev/core#2477 Add setting to allow opportunistic cache flushing for acls

This adds the same mechanism as the group contact cache to reduce site contention.
A job api is also added which people can optionally configure.

It would be especially worth setting on sites that do not use ACLs at all

3 years agofalse INTL warning
demeritcowboy [Sun, 28 Mar 2021 19:46:55 +0000 (15:46 -0400)]
false INTL warning

3 years agoMerge pull request #19738 from jitendrapurohit/note-date
Eileen McNaughton [Sun, 28 Mar 2021 09:27:54 +0000 (22:27 +1300)]
Merge pull request #19738 from jitendrapurohit/note-date

dev/core#2243 Add created_date column to the civicrm_note table

3 years agoadd created_date to civicrm_note
Jitendra Purohit [Fri, 5 Mar 2021 09:27:35 +0000 (14:57 +0530)]
add created_date to civicrm_note

3 years agoMerge pull request #19925 from eileenmcnaughton/tear
Seamus Lee [Sat, 27 Mar 2021 23:07:40 +0000 (10:07 +1100)]
Merge pull request #19925 from eileenmcnaughton/tear

PHPUNIT 8 - add void to setup functions

3 years ago[REF] Extract getMembershipTypeValues
eileen [Fri, 26 Mar 2021 03:23:25 +0000 (16:23 +1300)]
[REF] Extract getMembershipTypeValues

3 years agoPHPUNIT 8 - add void to setup functions
eileen [Sat, 27 Mar 2021 19:22:16 +0000 (08:22 +1300)]
PHPUNIT 8 - add void to setup functions

3 years agoAdd checkstyle comma after last item in multiline array.
Mikey O'Toole [Sat, 27 Mar 2021 17:32:00 +0000 (17:32 +0000)]
Add checkstyle comma after last item in multiline array.

3 years agoSet the `Other Amount` input in a price set to not autocomplete
Mikey O'Toole [Sat, 27 Mar 2021 17:26:19 +0000 (17:26 +0000)]
Set the `Other Amount` input in a price set to not autocomplete

3 years agoadjust for multiple activities in 5.36+
demeritcowboy [Sat, 27 Mar 2021 13:33:07 +0000 (09:33 -0400)]
adjust for multiple activities in 5.36+

3 years agoMerge pull request #19863 from eileenmcnaughton/flex
Seamus Lee [Sat, 27 Mar 2021 04:40:17 +0000 (15:40 +1100)]
Merge pull request #19863 from eileenmcnaughton/flex

Update flexmailer default

3 years agoMerge pull request #19921 from eileenmcnaughton/tear
Seamus Lee [Sat, 27 Mar 2021 04:37:51 +0000 (15:37 +1100)]
Merge pull request #19921 from eileenmcnaughton/tear

[PHPunit8] cleanup on setUp functions

3 years ago[PHPunit8] cleanup on tearDown functions
eileen [Thu, 25 Mar 2021 09:58:22 +0000 (22:58 +1300)]
[PHPunit8] cleanup on tearDown functions

3 years agoFlexmailer - Switch defintion of "auto" to "flexmailer"
Tim Otten [Sat, 27 Mar 2021 02:11:54 +0000 (19:11 -0700)]
Flexmailer - Switch defintion of "auto" to "flexmailer"

3 years agoMerge pull request #19893 from eileenmcnaughton/mem_types
Eileen McNaughton [Sat, 27 Mar 2021 00:33:26 +0000 (13:33 +1300)]
Merge pull request #19893 from eileenmcnaughton/mem_types

[REF]  [Towards membership api] Simplify calculation of recurring membership parameters

3 years agoMerge pull request #19919 from eileenmcnaughton/pay2
Eileen McNaughton [Sat, 27 Mar 2021 00:32:55 +0000 (13:32 +1300)]
Merge pull request #19919 from eileenmcnaughton/pay2

Remove deprecated code

3 years agoMerge pull request #19918 from eileenmcnaughton/payment
colemanw [Sat, 27 Mar 2021 00:11:41 +0000 (20:11 -0400)]
Merge pull request #19918 from eileenmcnaughton/payment

Add FinancialTrxn apiv4

3 years agoRemove deprecated code
eileen [Fri, 26 Mar 2021 21:37:36 +0000 (10:37 +1300)]
Remove deprecated code

3 years agoMerge pull request #19806 from eileenmcnaughton/msg_compat
Tim Otten [Fri, 26 Mar 2021 21:26:34 +0000 (14:26 -0700)]
Merge pull request #19806 from eileenmcnaughton/msg_compat

Align most of the tokens in the token processor handling with the legacy handling

3 years agoAdd FinancialTrxn apiv4
eileen [Fri, 26 Mar 2021 21:07:18 +0000 (10:07 +1300)]
Add FinancialTrxn apiv4

3 years agoMerge pull request #19912 from eileenmcnaughton/batch
colemanw [Fri, 26 Mar 2021 21:04:57 +0000 (17:04 -0400)]
Merge pull request #19912 from eileenmcnaughton/batch

[REF] [Towards membership api] Duplicate emailReceipt function rather than silly sharing

3 years ago[REF] Simplify calculation of recurring membership parameters
eileen [Wed, 24 Mar 2021 22:29:47 +0000 (11:29 +1300)]
[REF] Simplify calculation of recurring membership parameters

We need frequency_unit & frequency_interval for the params we pass
to the payment process & those we use to create the recurring -
this simplifies them to be calculated in a function rather than being
passed around

For the legacyProcessRecurringContribution function to be reached
auto_renew must be true

3 years agoMerge pull request #19915 from eileenmcnaughton/mem_end
Monish Deb [Fri, 26 Mar 2021 12:32:06 +0000 (18:02 +0530)]
Merge pull request #19915 from eileenmcnaughton/mem_end

[REF] [Towards membership api] Simplify message functions

3 years agoMerge pull request #19906 from MikeyMJCO/patch-8
Eileen McNaughton [Fri, 26 Mar 2021 09:21:09 +0000 (22:21 +1300)]
Merge pull request #19906 from MikeyMJCO/patch-8

Rebuild the Drupal route cache.

3 years ago[REF] [Towards membership api] Simplify message functions
eileen [Fri, 26 Mar 2021 06:38:23 +0000 (19:38 +1300)]
[REF] [Towards membership api] Simplify message functions

The amount of code confusion to avoid loading the end_date isn't really warranted for the
performance boost....

3 years agoMerge pull request #19910 from eileenmcnaughton/mem_pay
Monish Deb [Fri, 26 Mar 2021 05:38:58 +0000 (11:08 +0530)]
Merge pull request #19910 from eileenmcnaughton/mem_pay

[REF] [Towards membership api] Cleanup access to payment_processor_id

3 years agoMerge pull request #19905 from eileenmcnaughton/tear
Eileen McNaughton [Fri, 26 Mar 2021 04:15:53 +0000 (17:15 +1300)]
Merge pull request #19905 from eileenmcnaughton/tear

[PHPunit8] cleanup on tearDown functions

3 years ago[REF] Duplicate emailReceipt function rather than silly sharing
eileen [Fri, 26 Mar 2021 03:06:27 +0000 (16:06 +1300)]
[REF] Duplicate emailReceipt function rather than silly sharing

3 years ago[PHPunit8] cleanup on tearDown functions
eileen [Thu, 25 Mar 2021 09:58:22 +0000 (22:58 +1300)]
[PHPunit8] cleanup on tearDown functions

3 years ago[REF] Cleanup access to payment_processor_id
eileen [Thu, 25 Mar 2021 23:38:08 +0000 (12:38 +1300)]
[REF] Cleanup access to payment_processor_id

3 years agoMerge pull request #19909 from eileenmcnaughton/setup
Seamus Lee [Thu, 25 Mar 2021 22:37:51 +0000 (09:37 +1100)]
Merge pull request #19909 from eileenmcnaughton/setup

[phpunit8] Add void to some setup() functions

3 years agoMerge pull request #19908 from colemanw/relationshipCacheReadonly
Eileen McNaughton [Thu, 25 Mar 2021 21:19:55 +0000 (10:19 +1300)]
Merge pull request #19908 from colemanw/relationshipCacheReadonly

Schema - Add readonly to all fields in RelationshipCache entity

3 years agoAdd void to some setup() functions
eileen [Thu, 25 Mar 2021 20:27:46 +0000 (09:27 +1300)]
Add void to some setup() functions

3 years agoRebuild the Drupal route cache.
Mikey O'Toole [Thu, 25 Mar 2021 19:32:51 +0000 (19:32 +0000)]
Rebuild the Drupal route cache.

This is linked to [issue 158](https://lab.civicrm.org/dev/drupal/-/issues/158) and [issue 37](https://lab.civicrm.org/dev/drupal/-/issues/37).

It takes an alternative approach, adding a Util hook function to rebuild the route cache which we can then invoke from multiple places.
Trigger `rebuildDrupalRouteCache()` when running `triggerRebuild()`
Fix checkstyle issues
Change function from `protected` to `public`
Update Drupal8.php
Add base for `invalidateRouteCache()`
Add invalidateRouteCache function
Add call to userFramework->invalidateRouteCache
Update Base.php
Correct `userFramework` to `userSystem`
Remove stray whitespace.
Move invalidateRouteCache call to the same place as resetNavigation.
Update Invoke.php
Switch to the `router.builder' option as invalidating the cache doesn't cut it.

3 years agoMerge pull request #19870 from totten/master-psr0
colemanw [Thu, 25 Mar 2021 16:16:10 +0000 (12:16 -0400)]
Merge pull request #19870 from totten/master-psr0

info.xml - Allow PSR-0 style class-loader declarations

3 years agoSchema - Add readonly to all fields in RelationshipCache entity
Coleman Watts [Thu, 25 Mar 2021 15:52:33 +0000 (11:52 -0400)]
Schema - Add readonly to all fields in RelationshipCache entity

This entire entity is readonly. Fields should never be presented to the user as editable.

3 years agoMerge pull request #19901 from eileenmcnaughton/tte
Seamus Lee [Thu, 25 Mar 2021 09:22:45 +0000 (20:22 +1100)]
Merge pull request #19901 from eileenmcnaughton/tte

[phpunit 8] Remove some empty tearDown functions

3 years agoMerge pull request #19898 from eileenmcnaughton/teardown2
Seamus Lee [Thu, 25 Mar 2021 09:21:09 +0000 (20:21 +1100)]
Merge pull request #19898 from eileenmcnaughton/teardown2

More phpunit8 prep

3 years agoMerge pull request #19899 from eileenmcnaughton/tear
Seamus Lee [Thu, 25 Mar 2021 09:20:48 +0000 (20:20 +1100)]
Merge pull request #19899 from eileenmcnaughton/tear

[PHPUNIT8] add void to more teardown()

3 years agoMerge pull request #19900 from eileenmcnaughton/tear2
Seamus Lee [Thu, 25 Mar 2021 09:20:30 +0000 (20:20 +1100)]
Merge pull request #19900 from eileenmcnaughton/tear2

[PHPUNIT 8 ] Add void to more teardowns

3 years agoMerge pull request #19891 from eileenmcnaughton/task1
Monish Deb [Thu, 25 Mar 2021 05:54:16 +0000 (11:24 +0530)]
Merge pull request #19891 from eileenmcnaughton/task1

[REF] Simplify setting of softcredit form options (minor)

3 years agoMerge pull request #19897 from eileenmcnaughton/teardown
Eileen McNaughton [Thu, 25 Mar 2021 04:31:08 +0000 (17:31 +1300)]
Merge pull request #19897 from eileenmcnaughton/teardown

Add :void return type to tearDown on a bunch of unit tests

3 years agoMerge pull request #19639 from eileenmcnaughton/test_test
Monish Deb [Thu, 25 Mar 2021 04:02:09 +0000 (09:32 +0530)]
Merge pull request #19639 from eileenmcnaughton/test_test

[REF] Fix ContributionPage::recurringNotify to use apiv4, simplify params

3 years agoMerge pull request #19896 from colemanw/api4GetActionsFix
Eileen McNaughton [Thu, 25 Mar 2021 02:59:12 +0000 (15:59 +1300)]
Merge pull request #19896 from colemanw/api4GetActionsFix

APIv4 - Fix GetActions function to work with entityNames that don't match className

3 years agoMerge pull request #19895 from eileenmcnaughton/falsefail
Eileen McNaughton [Thu, 25 Mar 2021 02:58:39 +0000 (15:58 +1300)]
Merge pull request #19895 from eileenmcnaughton/falsefail

Skip UFField.field_name on singleValueAlter as flakey

3 years agoRemove some empty tearDown functions
eileen [Thu, 25 Mar 2021 02:25:11 +0000 (15:25 +1300)]
Remove some empty tearDown functions

3 years ago[PHPUNIT 8 ] Add void to more teardowns
eileen [Thu, 25 Mar 2021 02:17:49 +0000 (15:17 +1300)]
[PHPUNIT 8 ] Add void to more teardowns

3 years ago[PHPUNIT8] add void to more teardown()
eileen [Thu, 25 Mar 2021 02:12:59 +0000 (15:12 +1300)]
[PHPUNIT8] add void to more teardown()

3 years agoMore phpunit8 prep
eileen [Thu, 25 Mar 2021 02:03:58 +0000 (15:03 +1300)]
More phpunit8 prep

3 years agoAdd :void return type to tearDown on a bunch of unit tests
eileen [Thu, 25 Mar 2021 01:51:27 +0000 (14:51 +1300)]
Add :void return type to tearDown on a bunch of unit tests

3 years agoAPIv4 - Fix GetActions function to work with entityNames that don't match className
Coleman Watts [Thu, 25 Mar 2021 00:13:57 +0000 (20:13 -0400)]
APIv4 - Fix GetActions function to work with entityNames that don't match className

3 years agoMerge pull request #19892 from colemanw/searchKitCreatedModified
Eileen McNaughton [Wed, 24 Mar 2021 23:54:37 +0000 (12:54 +1300)]
Merge pull request #19892 from colemanw/searchKitCreatedModified

SearchKit - Add created & modified info to SavedSearch listing

3 years agoMerge pull request #19312 from seamuslee001/dev_core_1845
Eileen McNaughton [Wed, 24 Mar 2021 23:24:11 +0000 (12:24 +1300)]
Merge pull request #19312 from seamuslee001/dev_core_1845

dev/core#1845 Change FK on civicrm_group to delete the associated gro…

3 years agoOnly call getGroupACLRoles if contactID is present
eileen [Wed, 24 Mar 2021 23:13:25 +0000 (12:13 +1300)]
Only call getGroupACLRoles if contactID is present

3 years agoMerge pull request #19885 from eileenmcnaughton/acl_role
Eileen McNaughton [Wed, 24 Mar 2021 23:07:04 +0000 (12:07 +1300)]
Merge pull request #19885 from eileenmcnaughton/acl_role

[REF] Remove redundant toArray() function

3 years agoSearchKit - Add created & modified info to SavedSearch listing
Coleman Watts [Wed, 24 Mar 2021 22:15:08 +0000 (18:15 -0400)]
SearchKit - Add created & modified info to SavedSearch listing

3 years agoSimplify setting of softcredit form options
eileen [Fri, 19 Mar 2021 21:34:42 +0000 (10:34 +1300)]
Simplify setting of softcredit form options

I checked & the empty is just an enotice fix

3 years agoRemove toArray function as it does the same as the parent
eileen [Wed, 24 Mar 2021 03:25:08 +0000 (16:25 +1300)]
Remove toArray function as it does the same as the parent

3 years agoMerge pull request #19881 from eileenmcnaughton/task1
colemanw [Wed, 24 Mar 2021 20:19:25 +0000 (16:19 -0400)]
Merge pull request #19881 from eileenmcnaughton/task1

[REF] Store the getSearchQueryResults so it can be re-accessed

3 years agoMerge pull request #19889 from colemanw/api4EntityNameCleanup
Eileen McNaughton [Wed, 24 Mar 2021 20:12:15 +0000 (09:12 +1300)]
Merge pull request #19889 from colemanw/api4EntityNameCleanup

APIv4 - Standardize generic entity name resolution

3 years agoMerge pull request #19875 from colemanw/contactSummaryCleanup
Eileen McNaughton [Wed, 24 Mar 2021 19:35:34 +0000 (08:35 +1300)]
Merge pull request #19875 from colemanw/contactSummaryCleanup

Reorganize contact summary template to support non-ajax tabs

3 years agoAPIv4 - Standardize generic entity name resolution so that classNames do not have...
Coleman Watts [Wed, 24 Mar 2021 18:22:36 +0000 (14:22 -0400)]
APIv4 - Standardize generic entity name resolution so that classNames do not have to equal entityNames

This will allow the addition of a CiviCase API which cannot have the className "Case" because that is a reserved php keyword

Also cleans up other entities that use `static::class` in place of entityName because it's not a good pattern to replicate.

3 years agoMerge pull request #19801 from eileenmcnaughton/mem_terms
colemanw [Wed, 24 Mar 2021 15:17:12 +0000 (11:17 -0400)]
Merge pull request #19801 from eileenmcnaughton/mem_terms

[REF] Simplify code calculating the number of membership terms

3 years agoMerge pull request #19884 from eileenmcnaughton/unit8less
Seamus Lee [Wed, 24 Mar 2021 05:17:54 +0000 (16:17 +1100)]
Merge pull request #19884 from eileenmcnaughton/unit8less

Updates to ExportTest