Eileen McNaughton [Sun, 19 Sep 2021 20:29:47 +0000 (08:29 +1200)]
Enotice fixes in tpls
Eileen McNaughton [Sun, 19 Sep 2021 06:54:05 +0000 (18:54 +1200)]
Merge pull request #21495 from colemanw/fieldsForJoin
SearchKit - Exclude custom fields from ON clause selector
Eileen McNaughton [Sun, 19 Sep 2021 06:33:15 +0000 (18:33 +1200)]
Merge pull request #21535 from colemanw/concat_ws
Add CONCAT_WS fn to APIv4 and UI support in SearchKit
Coleman Watts [Sun, 19 Sep 2021 03:32:04 +0000 (23:32 -0400)]
Add CONCAT_WS fn to APIv4 and UI support in SearchKit
colemanw [Sun, 19 Sep 2021 01:50:00 +0000 (21:50 -0400)]
Merge pull request #21510 from eileenmcnaughton/domain_tokens
[REF] Extract domain tokens to their own class
Eileen McNaughton [Sun, 19 Sep 2021 01:29:04 +0000 (13:29 +1200)]
Merge pull request #21528 from colemanw/fieldTransform
SearchKit - Support multiple arguments to field transformations aka SQL functions
Coleman Watts [Sat, 18 Sep 2021 14:17:22 +0000 (10:17 -0400)]
SearchKit - Add UI for multiple function arguments
Coleman Watts [Fri, 17 Sep 2021 19:37:30 +0000 (15:37 -0400)]
APIv4 - add descriptions to sql functions
Coleman Watts [Thu, 16 Sep 2021 21:59:31 +0000 (17:59 -0400)]
SearchKit - Refactor SearchAdmin.parseExpr to handle multiple function arguments
Mathieu Lu [Sat, 18 Sep 2021 13:27:43 +0000 (09:27 -0400)]
Merge pull request #21523 from eileenmcnaughton/dep
Annotate deprecated token functions
Mathieu Lu [Sat, 18 Sep 2021 13:26:25 +0000 (09:26 -0400)]
Merge pull request #21516 from wmortada/contributors-3sd
Update contributors for Third Sector Design
Eileen McNaughton [Fri, 17 Sep 2021 06:14:20 +0000 (18:14 +1200)]
[REF] Extract domain tokens to their own class
Note that the moved function was only extracted a few days ago.
Eileen McNaughton [Sat, 18 Sep 2021 00:18:46 +0000 (12:18 +1200)]
Annotate deprecated functions
This also adds noisy deprecation to 2 functions
replaceComponentTokens - I thnk this has been out of use for a while. Only 1 reference in universe from
and extension that does not seem to be maintained (commits in 2016 from Sarah Gladstone).
replaceOrgTokens - no core calls since 5.39
Eileen McNaughton [Fri, 17 Sep 2021 23:48:52 +0000 (11:48 +1200)]
Merge pull request #21384 from mattwire/groupcontactcache
Don't clear the GroupContactCache until we're ready to insert the new version
William Mortada [Fri, 17 Sep 2021 14:49:27 +0000 (15:49 +0100)]
Add Kurund
colemanw [Fri, 17 Sep 2021 21:05:26 +0000 (17:05 -0400)]
Merge pull request #21506 from eileenmcnaughton/member_tokens
dev/core#2832 Extend Membership tokens to 'listen' and add test cover
Eileen McNaughton [Fri, 17 Sep 2021 20:51:44 +0000 (08:51 +1200)]
Merge pull request #21518 from francescbassas/patch-19
Fix syntax error on a ts() function call
Eileen McNaughton [Fri, 17 Sep 2021 19:45:02 +0000 (07:45 +1200)]
Merge pull request #21515 from civicrm/5.42
5.42 to master
francescbassas [Fri, 17 Sep 2021 17:20:35 +0000 (19:20 +0200)]
Add space
Formatting
Close ts() function
William Mortada [Fri, 17 Sep 2021 14:42:36 +0000 (15:42 +0100)]
Update company for William Mortada
demeritcowboy [Fri, 17 Sep 2021 13:14:01 +0000 (09:14 -0400)]
Merge pull request #21512 from JMAConsulting/core_2816_42
dev/core#2816: New contribution can't be saved when validation fails …
demeritcowboy [Fri, 17 Sep 2021 12:39:46 +0000 (08:39 -0400)]
Merge pull request #21489 from eileenmcnaughton/act_toke
Fix activity tokens
Monish Deb [Fri, 17 Sep 2021 10:42:54 +0000 (16:12 +0530)]
dev/core#2816: New contribution can't be saved when validation fails on first try
Eileen McNaughton [Mon, 13 Sep 2021 06:23:47 +0000 (18:23 +1200)]
dev/core#2832 Extend Membership tokens to 'listen' and add test cover
demeritcowboy [Fri, 17 Sep 2021 03:51:36 +0000 (23:51 -0400)]
Merge pull request #21479 from eileenmcnaughton/case_rep2
dev/core#2790 Move rest of pdfCommon functionality to the trait
colemanw [Thu, 16 Sep 2021 22:01:26 +0000 (18:01 -0400)]
Merge pull request #21476 from eileenmcnaughton/part
[REF] add test & static array to participant values tokens
colemanw [Thu, 16 Sep 2021 21:07:18 +0000 (17:07 -0400)]
Merge pull request #21356 from eileenmcnaughton/msg_testing
Add workflow template for 'recurring edit' workflow
Eileen McNaughton [Thu, 16 Sep 2021 20:04:00 +0000 (08:04 +1200)]
Merge pull request #21505 from civicrm/5.42
5.42 to master
Eileen McNaughton [Thu, 16 Sep 2021 20:03:30 +0000 (08:03 +1200)]
Merge pull request #21502 from colemanw/scssFix
Fixes dev/drupal#164 scss compile error
Eileen McNaughton [Thu, 16 Sep 2021 19:17:46 +0000 (07:17 +1200)]
Merge pull request #21504 from eileenmcnaughton/exit
Attempt to fix test site 500 errors on activity pdf
demeritcowboy [Thu, 16 Sep 2021 18:08:37 +0000 (14:08 -0400)]
Merge pull request #21503 from eileenmcnaughton/tpl
Tpl notice fixes
Coleman Watts [Thu, 16 Sep 2021 15:29:55 +0000 (11:29 -0400)]
Fixes dev/drupal#164 scss compile error
Eileen McNaughton [Thu, 16 Sep 2021 16:37:37 +0000 (04:37 +1200)]
Merge pull request #21501 from JKingsnorth/add-sorting-to-event-summary-report
Add sort functionality to event summary report
Eileen McNaughton [Thu, 16 Sep 2021 16:33:10 +0000 (04:33 +1200)]
Attempt to fix test site 500 errors on activity pdf
Eileen McNaughton [Thu, 16 Sep 2021 15:48:29 +0000 (03:48 +1200)]
Tpl fixes
Coleman Watts [Thu, 16 Sep 2021 14:42:45 +0000 (10:42 -0400)]
APIv4 - Reword SqlFunction param name for clarity
Yes it's a prefix, but it's really the name of the argument.
colemanw [Thu, 16 Sep 2021 12:44:37 +0000 (08:44 -0400)]
Merge pull request #21500 from eileenmcnaughton/badger
dev/core#2486 Add printLabel v4 api
Eileen McNaughton [Thu, 16 Sep 2021 10:23:47 +0000 (22:23 +1200)]
Merge pull request #21498 from eileenmcnaughton/test_flean
[NFC] [test] minor cleanup in test
Eileen McNaughton [Thu, 16 Sep 2021 10:23:23 +0000 (22:23 +1200)]
Merge pull request #21499 from seamuslee001/master
Revert "dev/core#2812 Fix issue where having a processor configured w…
John Kingsnorth [Thu, 16 Sep 2021 10:13:31 +0000 (11:13 +0100)]
Add sort functionality to event summary report
Eileen McNaughton [Thu, 16 Sep 2021 09:05:31 +0000 (21:05 +1200)]
Add printLabel v4 api
Eileen McNaughton [Thu, 16 Sep 2021 08:13:41 +0000 (20:13 +1200)]
[NFC] [test] minor cleanup in test
This switches to using restoreMembershipTypes rather than creating a membership.
restoreMembershipTypes would ideally be in tearDown to get us back to a known membership
set but there is fallout
Seamus Lee [Thu, 16 Sep 2021 08:15:53 +0000 (18:15 +1000)]
Revert "dev/core#2812 Fix issue where having a processor configured with a search output casues WSOD not allowing for access to upgrade screen"
This reverts commit
6c83ef4336884a15da996ba8dcf9ec4ee6439424.
Eileen McNaughton [Thu, 16 Sep 2021 07:51:34 +0000 (19:51 +1200)]
Merge pull request #21497 from eileenmcnaughton/ug
Remove fugly bit
Eileen McNaughton [Thu, 16 Sep 2021 06:04:59 +0000 (18:04 +1200)]
Remove fugly bit
Eileen McNaughton [Thu, 16 Sep 2021 06:00:36 +0000 (18:00 +1200)]
Merge pull request #21496 from civicrm/5.42
5.42 to master
Eileen McNaughton [Thu, 16 Sep 2021 06:00:05 +0000 (18:00 +1200)]
Merge pull request #21492 from colemanw/fixRecentItems
Fixes dev/core#2840 bug in recent items sidebar/menu
Coleman Watts [Thu, 16 Sep 2021 04:37:13 +0000 (00:37 -0400)]
SearchKit - Exclude custom fields from ON clause selector
Custom fields cannot as-yet be added to an ON clause in APIv4
because they do not belong to the tables being joined.
This removes the tripping hazard from the UI, by making custom fields
unavailable to select in an ON clause.
Coleman Watts [Thu, 16 Sep 2021 00:33:28 +0000 (20:33 -0400)]
Fixes dev/core#2840 bug in recent items sidebar/menu
Tim Otten [Thu, 16 Sep 2021 03:45:34 +0000 (20:45 -0700)]
Merge pull request #21449 from eileenmcnaughton/compat
dev/core#2814 TokenCompatSubscriber - Evaluate tokens during "civi.token.eval" phase
Tim Otten [Wed, 15 Sep 2021 10:45:25 +0000 (03:45 -0700)]
RecurringEdit - Add example. Include test assertions. Fix undeclared/missing properties.
This creates a new example of the `RecurringEdit` workflow message.
Note that the example is tagged `phpunit` and defines a list of `asserts`. These
assertions are evaluated using the default message-template.
The test was not passing because some important properties were missing from `RecurringEdit`.
Eileen McNaughton [Thu, 16 Sep 2021 00:45:06 +0000 (12:45 +1200)]
Merge pull request #21485 from colemanw/fixFilter
SearchKit - Correctly process filters passed through Afform from js
Eileen McNaughton [Thu, 16 Sep 2021 00:12:42 +0000 (12:12 +1200)]
Merge pull request #21435 from colemanw/pseudoFields
SearchKit - Add pseudo-fields for row number and current user
Eileen McNaughton [Thu, 16 Sep 2021 00:08:34 +0000 (12:08 +1200)]
Merge pull request #21491 from civicrm/5.42
5.42 to master
Eileen McNaughton [Thu, 16 Sep 2021 00:08:05 +0000 (12:08 +1200)]
Merge pull request #21347 from seamuslee001/5.42
dev/core#2812 Fix issue where having a processor configured with a se…
Eileen McNaughton [Thu, 16 Sep 2021 00:06:26 +0000 (12:06 +1200)]
Merge pull request #21488 from colemanw/fixPager
SearchKit - Fix search display pager when using default pager settings
Eileen McNaughton [Wed, 15 Sep 2021 22:03:56 +0000 (10:03 +1200)]
Fix activity tokens
I wasn't gonna touch these until the end but there
seems to be some active breakage so this does enough to get the following to
work - but leaves a full cleanup pass out of scope as it does
the reconcilliation between the trait & parent class
and any decisions about any finalised interface.
Tests cover the changes to tokens and
testActivityDateTimeMatchRepeatableSchedule covers the schedule rendering
Existing tokens still work but new-style are advertised with this
```
Subject: {activity.subject}
Date: {activity.activity_date_time}
Duration: {activity.duration}
Location: {activity.location}
Details: {activity.details}
Status ID: {activity.status_id}
(legacy) Status: {activity.status}
Status: {activity.status_id:label}
Activity Type ID: {activity.activity_type_id}
(legacy) Activity Type: {activity.activity_type}
Activity Type: {activity.activity_type_id:label}
Activity ID: {activity.activity_id}
(legacy) Activity ID: {activity.id}
(just weird) Case ID: {activity.case_id}
```
Seamus Lee [Wed, 15 Sep 2021 23:42:17 +0000 (09:42 +1000)]
Merge pull request #21487 from seamuslee001/master
[NFC] Fix Fatal error on php 8 due to mis matched function declaration
Tim Otten [Wed, 15 Sep 2021 23:07:58 +0000 (16:07 -0700)]
RecurringEdit - Typehint getters/setters. Make property name conformant.
Tim Otten [Wed, 15 Sep 2021 23:24:25 +0000 (16:24 -0700)]
(REF) Extract example "entity/Contact/Alex" from "workflow/generic/Alex"
Tim Otten [Tue, 14 Sep 2021 23:42:54 +0000 (16:42 -0700)]
Convert `contribution{,_recur}.ex.php` to `Civi/Test/ExampleData/*`
1. Use revised class format
2. Use `entity/{$ENTITY}/{$EXAMPLE}` instead of `workflow/{$WORKFLOW}/{$EXAMPLE}`
Tim Otten [Wed, 15 Sep 2021 09:02:05 +0000 (02:02 -0700)]
Civi\Test::example() - Make it a bit easier for the typical case
This changes the signature on a new helper method. This method is not widely used, and each reference is updated here.
Before: `Civi\Test::example($name)` returns the *metadata* for the example.
After: `Civi\Test::example($name)` returns the *data* for the example.
Comment: It's more convenient to stitch together examples from the data. Of
course, metadata may also be useful -- it's still available through
`Civi\Test::examples()->getFoo(...)` (with a few different `getFoo()`
methods).
Eileen McNaughton [Tue, 14 Sep 2021 21:49:01 +0000 (09:49 +1200)]
dev/core#2790 Move pdf processTemplate to the trait
Tim Otten [Wed, 15 Sep 2021 22:51:09 +0000 (15:51 -0700)]
ExampleDataLoader - Also scan "Civi/Test/ExampleData/*.ex.php"
Eileen McNaughton [Fri, 3 Sep 2021 04:39:23 +0000 (16:39 +1200)]
Use new template contract for recurring edit
Eileen McNaughton [Thu, 2 Sep 2021 04:17:10 +0000 (16:17 +1200)]
Add sample data from contribution & contribution recur
demeritcowboy [Wed, 15 Sep 2021 22:39:54 +0000 (18:39 -0400)]
Merge pull request #21478 from eileenmcnaughton/case_replace
dev/core#2790 Move pdf postProcess function to the trait
colemanw [Wed, 15 Sep 2021 22:28:42 +0000 (18:28 -0400)]
Merge pull request #21447 from eileenmcnaughton/case_email
dev/core#2817 Remove last core calls to `replaceCaseTokens`
Seamus Lee [Wed, 15 Sep 2021 22:23:41 +0000 (08:23 +1000)]
Merge pull request #21486 from totten/master-entity-mock-data
(dev/mail#83) EntityTokens - Allow using mocked data
Seamus Lee [Wed, 15 Sep 2021 21:58:18 +0000 (07:58 +1000)]
[NFC] Fix Fatal error on php 8 due to mis matched function declaration
Coleman Watts [Wed, 15 Sep 2021 22:04:24 +0000 (18:04 -0400)]
SearchKit - Fix search display pager when using default pager settings
Coleman Watts [Wed, 15 Sep 2021 22:01:48 +0000 (18:01 -0400)]
SearchKit - Only allow real fields to be sortable
Tim Otten [Wed, 15 Sep 2021 20:25:34 +0000 (13:25 -0700)]
(NFC) TokenProcessorTest - Extend `testMockData` to touch on contact entity
Tim Otten [Wed, 15 Sep 2021 09:46:46 +0000 (02:46 -0700)]
EntityTokens - Allow using mocked data
Before: EntityTokens reads `$tokenContext['contributionId']` and fetches the corresponding `civicrm_contribution`. The
data must exist in that record.
After: EntityTokens reads both `$tokenContext['contributionId']` and `$tokenContext['contribution']`. Data in
`$tokenContext['contribution']` takes precedence, rendering the content of `civicrm_contribution` mute.
Coleman Watts [Sat, 11 Sep 2021 14:56:57 +0000 (10:56 -0400)]
SearchKit - Add pseudo-fields for row number and current user
colemanw [Wed, 15 Sep 2021 17:31:15 +0000 (13:31 -0400)]
Merge pull request #21482 from colemanw/fixLinks
SearchKit - Fix links to non-aggregage join fields
Coleman Watts [Wed, 15 Sep 2021 17:17:04 +0000 (13:17 -0400)]
SearchKit - Correctly process filters passed through Afform from javascript
Coleman Watts [Wed, 15 Sep 2021 14:22:02 +0000 (10:22 -0400)]
SearchKit - Fix links to non-aggregage join fields
colemanw [Wed, 15 Sep 2021 13:15:35 +0000 (09:15 -0400)]
Merge pull request #21420 from colemanw/fixSearchKitMultiLink
SearchKit - Fix display of links in aggregated columns
colemanw [Wed, 15 Sep 2021 13:14:29 +0000 (09:14 -0400)]
Merge pull request #21481 from eileenmcnaughton/mem_std
[REF] simplify member_tokens
Eileen McNaughton [Wed, 15 Sep 2021 02:43:39 +0000 (14:43 +1200)]
Merge pull request #21480 from totten/master-edl
(dev/mail#83) ExampleDataLoader - Multiple fixes for quirky examples
Eileen McNaughton [Tue, 14 Sep 2021 21:32:42 +0000 (09:32 +1200)]
dev/core#2790 Move pdf postProcess function to the trait
Eileen McNaughton [Wed, 15 Sep 2021 00:35:57 +0000 (12:35 +1200)]
[REF] simplify member_tokens
Now we have good test cover we can switch to using the parent.
The one thorn in our side is membership.fee.
Dealing with the field, and hence opening up 'listening'
is out of scope for this pr
We can (and should) switch fee to membership_type_id.minimum_fee and add
generic support. However, we also have a formatting issue.
The field is formatted 'number only' 'just cos'.
If we map that field without figuring out formatting
it will be locked in as an anomaly.
Tim Otten [Wed, 15 Sep 2021 00:13:11 +0000 (17:13 -0700)]
CaseActivity Examples - Only report example-data if the workflow is actually valid
The `case_activity` workflow definition is weirdly/temporarily in
`tests/phpunit`. This makes it loadable for headless testing, but it's not
truly loadable in a web-env. Consequently, the examples should not be
presented as valid example data when using web-env.
Tim Otten [Wed, 15 Sep 2021 00:11:01 +0000 (17:11 -0700)]
ExampleDataLoader - Fix loading data-sets from `tests/phpunit/*` from web-env
Before: If you add example-data under `tests/phpunit/`, then it works
in headless env. In web-env, it will be scanned, but the `include $file` step will fail.
After: The `include $file` step will succeed.
Tim Otten [Tue, 14 Sep 2021 23:45:14 +0000 (16:45 -0700)]
(REF) ExampleDataLoader - Extract private method `createObj()`. Improve errors.
__Before__: Two different bits of code responsible for loading+instantiating test-data class.
Different (and somewhat opaque) error-handling behaviors.
__After__: One private helper called twice. Consistent (and clearer) error-reporting.
Seamus Lee [Tue, 14 Sep 2021 23:35:34 +0000 (09:35 +1000)]
Merge pull request #21477 from eileenmcnaughton/mem_test
dev/core#2650 upgrade membership tokens to the new format
Eileen McNaughton [Tue, 14 Sep 2021 21:12:48 +0000 (09:12 +1200)]
Merge pull request #21475 from eileenmcnaughton/case_replace
dev/core#2817 remove call to getTokenDetails
Eileen McNaughton [Tue, 14 Sep 2021 21:00:00 +0000 (09:00 +1200)]
dev/core#2650 upgrade membership tokens to the new format
Eileen McNaughton [Tue, 14 Sep 2021 20:28:18 +0000 (08:28 +1200)]
Hard code the array to what is tested
demeritcowboy [Tue, 14 Sep 2021 20:26:13 +0000 (16:26 -0400)]
Merge pull request #21474 from MegaphoneJon/core-2318
fixes core#2318: fix cancel button when sending an individual email
Eileen McNaughton [Tue, 14 Sep 2021 20:19:57 +0000 (08:19 +1200)]
Add test cover for existing participant tokens
colemanw [Tue, 14 Sep 2021 20:15:57 +0000 (16:15 -0400)]
Merge pull request #21464 from eileenmcnaughton/test_hunt
dev/core#2650 dev/core#2832 add support & testing for preferred token format
Eileen McNaughton [Tue, 14 Sep 2021 15:09:49 +0000 (03:09 +1200)]
dev/core#2817 remove call to getTokenDetails
Removes the call to getTokenDetails as discussed on
https://github.com/civicrm/civicrm-core/pull/21445
As discussed on that PR & related gitlabs I
created an extension to try to allow people to have
this functionality transitionally if they needed
(based on copying code from 5.41 over) - but
per the readme https://github.com/eileenmcnaughton/legacytokenhelper/blob/master/README.md
the issues I found (under 'known issues') were enough
to make me conclude no-one would actually
want to install the extension to restore pre-5.43
functionality
Jon Goldberg [Tue, 14 Sep 2021 18:43:32 +0000 (14:43 -0400)]
fix cancel button when sending an individual email
demeritcowboy [Tue, 14 Sep 2021 16:12:00 +0000 (12:12 -0400)]
Merge pull request #21468 from mattwire/flushcachepermit
flushCaches should respect permitCacheFlushMode
demeritcowboy [Tue, 14 Sep 2021 16:11:34 +0000 (12:11 -0400)]
Merge pull request #21445 from eileenmcnaughton/case_replace
dev/core#2817 Use token processor to resolve caseTokens for pdfs
colemanw [Tue, 14 Sep 2021 14:30:56 +0000 (10:30 -0400)]
Merge pull request #21465 from eileenmcnaughton/cont_tok
[Ref] Cleanup on SelectValues::contributeTokens
colemanw [Tue, 14 Sep 2021 14:17:17 +0000 (10:17 -0400)]
Merge pull request #21466 from eileenmcnaughton/mem
[Ref] Remove pass-by-reference
Eileen McNaughton [Sun, 12 Sep 2021 23:04:29 +0000 (11:04 +1200)]
dev/core#2817 Use token processor to resolve caseTokens for pdfs