Eileen McNaughton [Thu, 23 Sep 2021 00:54:43 +0000 (12:54 +1200)]
Remove old comment
Tim Otten [Thu, 23 Sep 2021 00:25:45 +0000 (17:25 -0700)]
(REF) TokenCompatSubscriber - Simplify expression that replaces unknown tokens
Additionally, this uses the regex from `TokenProcessor` instead of the regex from `CRM_Utils_Token`.
These differ in whether they capture the '|filter' expressions.
Tim Otten [Wed, 22 Sep 2021 23:52:47 +0000 (16:52 -0700)]
(REF) TokenProcessor::visitTokens() - Increase visibility. Refine comments+tests.
Eileen McNaughton [Wed, 22 Sep 2021 06:18:31 +0000 (18:18 +1200)]
dev/core#2814 fix tokenCompat to be consistent with unresolved tokens
This fixes the tokenCompat subscriber to replace unresolved tokens with a
blank string in a consistent way.
Prior to this it would crash if smarty was enabled but not all tokens
were resolved & print unresolved tokens if smarty was not enabled.
The inconsistencies appear to be due to 'separate evolution' rather than '*reasons*'
Eileen McNaughton [Wed, 22 Sep 2021 22:30:56 +0000 (10:30 +1200)]
Merge pull request #21557 from eileenmcnaughton/log
Fix bug where log hook is ignored on custom field create
colemanw [Wed, 22 Sep 2021 20:27:12 +0000 (16:27 -0400)]
Merge pull request #21531 from eileenmcnaughton/now
Add {domain.now}, supporting |crmDate
Eileen McNaughton [Wed, 22 Sep 2021 20:16:58 +0000 (08:16 +1200)]
Merge pull request #21576 from demeritcowboy/ufval
UFMatch - E_NOTICE when nonexistent uf_id
Eileen McNaughton [Tue, 21 Sep 2021 00:52:26 +0000 (12:52 +1200)]
Fix bug where log hook is ignored on custom field create
It is possible to specify that various tables should not
result in a log table via the `alterLogTables` hook.
This is useful for excluding tables of low information
value or tables like summary fields that are calculated
values. However, when altering custom fields this
hook's output was being ignored as it was going through
the specific path of
which did not have awareness of this hook.
This code path is the primary use for this function.
It's also called via createMissingLogTables - but in
that case the calculation is already done. It is not
elsewhere in git universe and the return value
is never used, so I removed it
Eileen McNaughton [Wed, 22 Sep 2021 19:31:22 +0000 (07:31 +1200)]
Merge pull request #21578 from civicrm/5.42
5.42 to master
Eileen McNaughton [Wed, 22 Sep 2021 19:30:30 +0000 (07:30 +1200)]
Merge pull request #21575 from agh1/5.42.0-releasenotes-initial
5.42.0 release notes initial run
demeritcowboy [Wed, 22 Sep 2021 16:39:32 +0000 (12:39 -0400)]
don't crash for nonexistent uf_id
Andie Hunt [Wed, 22 Sep 2021 15:45:21 +0000 (11:45 -0400)]
5.42.0 release notes: added boilerplate
Andie Hunt [Wed, 22 Sep 2021 15:44:57 +0000 (11:44 -0400)]
5.42.0 release notes: raw from script
demeritcowboy [Wed, 22 Sep 2021 13:51:02 +0000 (09:51 -0400)]
Merge pull request #21554 from eileenmcnaughton/loop
[REF] Remove illusion of looping
Tim Otten [Wed, 22 Sep 2021 06:30:22 +0000 (23:30 -0700)]
(NFC) TokenSmartyTest - Add some more examples, mixing token-filters and Smarty-filters
Tim Otten [Wed, 22 Sep 2021 05:09:49 +0000 (22:09 -0700)]
TokenProcessor - Filter args should require quotes (to match Smarty notation)
Eileen McNaughton [Wed, 22 Sep 2021 01:39:52 +0000 (13:39 +1200)]
Merge pull request #21563 from eileenmcnaughton/ev_toke
Initial test on event tokens
Eileen McNaughton [Wed, 22 Sep 2021 00:42:32 +0000 (12:42 +1200)]
Fix tokens to pass filters through
Tim Otten [Tue, 21 Sep 2021 10:22:03 +0000 (03:22 -0700)]
TokenProcessor - render() and addMessage() should use same regex to find tokens
Tim Otten [Tue, 21 Sep 2021 10:18:36 +0000 (03:18 -0700)]
TokenConsistencyTest - Fix assertion
This is a new/recent assertion. Not passing. Looks different from other/similar assertions.
Tim Otten [Tue, 21 Sep 2021 08:47:52 +0000 (01:47 -0700)]
TokenConsistencyTest - Use a valid timestamp
Tim Otten [Tue, 21 Sep 2021 08:47:08 +0000 (01:47 -0700)]
DomainTokens - {domain.now} should abide by mocked times
Eileen McNaughton [Sat, 18 Sep 2021 23:24:18 +0000 (11:24 +1200)]
Add now token
colemanw [Wed, 22 Sep 2021 00:23:43 +0000 (20:23 -0400)]
Merge pull request #21566 from eileenmcnaughton/render
Remove deprecated code lines
Eileen McNaughton [Tue, 21 Sep 2021 19:31:29 +0000 (07:31 +1200)]
Test cleanup
Fixes passing null to event create. Remove some tests duplicated by syntaxconformance
Matthew Wire [Tue, 21 Sep 2021 22:07:43 +0000 (23:07 +0100)]
Merge pull request #21555 from eileenmcnaughton/money
dev/core#2493 Add support for money laundry in `getSubmittedValue`
Matthew Wire [Tue, 21 Sep 2021 22:03:50 +0000 (23:03 +0100)]
Merge pull request #21430 from mattwire/flushcache
flushCaches should respect permitCacheFlushMode. Also flush caches which have a NULL cache_date
Eileen McNaughton [Tue, 21 Sep 2021 21:33:44 +0000 (09:33 +1200)]
Remove deprecated code lines
These have been deprecated for around 8 months
, are not used in core, and are in code where
5.43 will already require extra testing so let's remove
so we can simplify
Eileen McNaughton [Tue, 21 Sep 2021 09:06:13 +0000 (21:06 +1200)]
Initial test on event tokens
Note there is an issue to do with caching affecting the custom token but
it's out of scope on this test
demeritcowboy [Tue, 21 Sep 2021 19:34:24 +0000 (15:34 -0400)]
Merge pull request #21553 from eileenmcnaughton/email2
[Ref] Extend email trait test, process more sanely
Tim Otten [Tue, 21 Sep 2021 10:09:11 +0000 (03:09 -0700)]
Merge pull request #21494 from eileenmcnaughton/compat
dev/core#2814 TokenCompatSubscriber - evaluate contact tokens during civi.token.eval phase
Eileen McNaughton [Tue, 21 Sep 2021 09:55:34 +0000 (21:55 +1200)]
Merge pull request #21374 from ufundo/event-custom-tokens
Fix event custom field tokens in scheduled reminders
Eileen McNaughton [Tue, 21 Sep 2021 07:18:30 +0000 (19:18 +1200)]
Merge pull request #21560 from demeritcowboy/report-query-string
CiviReport - avoid error in test environments when using built-in php web server
Eileen McNaughton [Mon, 20 Sep 2021 21:00:29 +0000 (09:00 +1200)]
[Ref] Extend email trait test, process more sanely
Eileen McNaughton [Sun, 19 Sep 2021 10:44:20 +0000 (22:44 +1200)]
[REF] Extract getFromValues, add test
This extracts the code used to get the from values, moves the default setting
to the default and adds a test.
The goal is actually to add a test on the submit function
but it's proving to be challenging so this at least gets the
default setting tested.
Note that this code used to be on a static class, not a trait, and
some stuff is in weird places - in particular stuff that
should be in setDefaults and postProcess is happening on
preProcess. However, most
of the classes that override this
trait do not do much more than call the trait so that helps at
least
Eileen McNaughton [Tue, 21 Sep 2021 04:38:05 +0000 (16:38 +1200)]
Merge pull request #21561 from civicrm/5.42
5.42 to master
Eileen McNaughton [Tue, 21 Sep 2021 04:37:33 +0000 (16:37 +1200)]
Merge pull request #21559 from eileenmcnaughton/542
dev/core#2843 push new link to the end
demeritcowboy [Tue, 21 Sep 2021 04:10:50 +0000 (00:10 -0400)]
avoid error in test environments using built-in php web server
Eileen McNaughton [Sat, 18 Sep 2021 02:21:41 +0000 (14:21 +1200)]
Fix signature_html to return html
This seems to be more in line with processor expectations
Eileen McNaughton [Fri, 17 Sep 2021 22:05:32 +0000 (10:05 +1200)]
Add enough hack-handling to make this PR not change outputs
Eileen McNaughton [Thu, 16 Sep 2021 04:03:39 +0000 (16:03 +1200)]
dev/core#2814 TokenCompatSubscriber - evaluate contact tokens during civi.token.eval phase
m
Seamus Lee [Tue, 21 Sep 2021 03:28:03 +0000 (13:28 +1000)]
Merge pull request #21558 from eileenmcnaughton/no_gender
Stop testing for gender_id output that was described as 'legacy' years ago
Eileen McNaughton [Sat, 18 Sep 2021 20:58:47 +0000 (08:58 +1200)]
dev/core#2843 push new link to the end
As discussed in https://lab.civicrm.org/dev/core/-/issues/2843
this makes the UI change less for users & reduces confusion
Eileen McNaughton [Sat, 18 Sep 2021 02:21:50 +0000 (14:21 +1200)]
Stop testing for gender_id output that was described as 'legacy' years ago
This token is not 'advertised' in the widget. I think removing this
Eileen McNaughton [Tue, 21 Sep 2021 01:18:37 +0000 (13:18 +1200)]
Merge pull request #21530 from eileenmcnaughton/badger2
Convert event badges to use token processor
Eileen McNaughton [Sat, 18 Sep 2021 22:49:29 +0000 (10:49 +1200)]
Convert event badges to use token processor
This adds the token processor class for participants and
switches the one place where we currently resolve participant
tokens to use it.
In the process I upgrade the badge tokens with a syntax change and
drop a few more that are actually
a) weird / seemingly accidentally exposed and
b) not really part of the participant entity
ie event template title & default role id
With participant tokens we have been fortunate not
to let a non-standard implementation go out
so it's only the event badges which are
a bit obscure / less used / less likely to be
blindly used. I have added token replacement
but I think it will be all very edge case
Seamus Lee [Mon, 20 Sep 2021 23:11:19 +0000 (09:11 +1000)]
Merge pull request #21520 from eileenmcnaughton/badger
Participant tokens - remove / replace unsupportable from badges (conversion preparation)
Seamus Lee [Mon, 20 Sep 2021 22:46:08 +0000 (08:46 +1000)]
Merge pull request #21537 from eileenmcnaughton/ev_token2
Use the processor function to get event tokens
Seamus Lee [Mon, 20 Sep 2021 22:41:11 +0000 (08:41 +1000)]
Merge pull request #21552 from eileenmcnaughton/test_clean
Cleanup on test tear downs
Eileen McNaughton [Mon, 20 Sep 2021 21:44:27 +0000 (09:44 +1200)]
dev/core#2493 Add support for money fields to
This ensures that any money fields retrieved by are
in a machine usable format.
We've been switching to this function rather than 'passing around arrays'
but we need to ensure this function is returning clean money to
prevent regressions.
Eileen McNaughton [Mon, 20 Sep 2021 21:23:01 +0000 (09:23 +1200)]
Merge pull request #21550 from demeritcowboy/template-missed
Missed message template updates from 5.39/5.40
Eileen McNaughton [Mon, 20 Sep 2021 21:15:11 +0000 (09:15 +1200)]
[REF] Remove illusion of looping
This foreach actually only copes with 1 values. Making that clearer makes it more readable
demeritcowboy [Mon, 20 Sep 2021 20:06:40 +0000 (16:06 -0400)]
Merge pull request #21490 from eileenmcnaughton/case_email
dev/core#2554 Remove code to assign contact to the template in sendEmail
Eileen McNaughton [Mon, 20 Sep 2021 19:55:57 +0000 (07:55 +1200)]
Cleanup on test tear downs
Eileen McNaughton [Mon, 20 Sep 2021 19:44:02 +0000 (07:44 +1200)]
Merge pull request #21509 from JMAConsulting/core_2820
dev/core#2820: Deduping produces bad results after a rule change
colemanw [Mon, 20 Sep 2021 17:34:54 +0000 (13:34 -0400)]
Merge pull request #21508 from eileenmcnaughton/date
Add support for CiviCRM date formats in crmDate
colemanw [Mon, 20 Sep 2021 17:32:54 +0000 (13:32 -0400)]
Merge pull request #21493 from eileenmcnaughton/pdf
dev/core#2839 Fix addition of _preview to filename
colemanw [Mon, 20 Sep 2021 17:30:39 +0000 (13:30 -0400)]
Merge pull request #21547 from agileware/CIVIBLD-280
View Contribution page, move the Done button to the last button, currently shown in the middle
colemanw [Mon, 20 Sep 2021 17:29:39 +0000 (13:29 -0400)]
Merge pull request #21549 from artfulrobot/artfulrobot-htmlencoding-api-output
Add test and fix for API4 failing to decode strings stored as HTML
colemanw [Mon, 20 Sep 2021 17:29:21 +0000 (13:29 -0400)]
Merge pull request #21546 from agileware/CIVIBLD-279
Replace "Print Invoice" and "Print Invoice and Credit Note" buttons with label "Download Invoice" and "Download Invoice and Credit Note"
colemanw [Mon, 20 Sep 2021 16:29:52 +0000 (12:29 -0400)]
Merge pull request #21533 from colemanw/relEdit
SearchKit - Fix in-place edit of relationships and dates
demeritcowboy [Mon, 20 Sep 2021 14:41:56 +0000 (10:41 -0400)]
missed from 5.39/5.40
Rich Lott / Artful Robot [Mon, 20 Sep 2021 13:52:21 +0000 (14:52 +0100)]
APIv4 - Decode output of write operations
CiviCRM regrettably stores most strings as HTML in the database.
This fixes the output of APIv4 write operations to decode them and return non-html
Seamus Lee [Mon, 20 Sep 2021 08:42:21 +0000 (18:42 +1000)]
Merge pull request #21548 from eileenmcnaughton/cleanup
Test tearDown fixes
Eileen McNaughton [Mon, 20 Sep 2021 01:45:42 +0000 (13:45 +1200)]
Test tearDown fixes
Fixes places where parent:tearDown not called and civicrm_file &
civicrm_entity_file not truncated
Also note - increasing use of fail() rather than allowing
exceptions to bubble up in test functions in order
to not let tearDown be such a distraction & require annotation
Eileen McNaughton [Mon, 20 Sep 2021 01:30:37 +0000 (13:30 +1200)]
Merge pull request #21543 from eileenmcnaughton/notice3
Tpl notice fix
Eileen McNaughton [Mon, 20 Sep 2021 01:30:21 +0000 (13:30 +1200)]
Merge pull request #21545 from eileenmcnaughton/tpl5
tpl enotice fixes on extensions page
Justin Freeman [Mon, 20 Sep 2021 01:05:05 +0000 (11:05 +1000)]
CIVIBLD-280 View Contribution page, move the Done button to the last button, currently shown in the middle
Justin Freeman [Mon, 20 Sep 2021 00:39:23 +0000 (10:39 +1000)]
CIVIBLD-279 Replace "Print Invoice" and "Print Invoice and Credit Note" buttons with label "Download Invoice" and "Download Invoice and Credit Note"
Eileen McNaughton [Sun, 19 Sep 2021 21:15:58 +0000 (09:15 +1200)]
Tpl notice fix
Eileen McNaughton [Sun, 19 Sep 2021 23:14:37 +0000 (11:14 +1200)]
tpl enotice fixes on extensions page
Eileen McNaughton [Sun, 19 Sep 2021 23:08:10 +0000 (11:08 +1200)]
Merge pull request #21544 from eileenmcnaughton/tpl4
Tpl notice fixes
Eileen McNaughton [Sun, 19 Sep 2021 23:07:48 +0000 (11:07 +1200)]
Merge pull request #21542 from eileenmcnaughton/notice2
Tpl enotice fixes
Eileen McNaughton [Sun, 19 Sep 2021 23:07:31 +0000 (11:07 +1200)]
Merge pull request #21541 from eileenmcnaughton/notice
Enotice fixes in tpls
Eileen McNaughton [Sun, 19 Sep 2021 21:18:26 +0000 (09:18 +1200)]
Tpl notice fixes
Eileen McNaughton [Sun, 19 Sep 2021 21:14:29 +0000 (09:14 +1200)]
Tpl enotice fixes
Eileen McNaughton [Sun, 19 Sep 2021 20:29:47 +0000 (08:29 +1200)]
Enotice fixes in tpls
Seamus Lee [Sun, 19 Sep 2021 20:28:59 +0000 (06:28 +1000)]
Merge pull request #21152 from eileenmcnaughton/batch_order
dev/core#2717 Use order api for new membership create in batch
demeritcowboy [Sun, 19 Sep 2021 16:29:17 +0000 (12:29 -0400)]
Merge pull request #21526 from mattwire/viewrecur_phpnotice
Fix PHP notices in contributionrecur tpl
Matthew Wire [Sun, 19 Sep 2021 10:17:11 +0000 (11:17 +0100)]
Merge pull request #21529 from eileenmcnaughton/view
dev/core#2843 push new link to the end
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
Eileen McNaughton [Sun, 19 Sep 2021 04:14:42 +0000 (16:14 +1200)]
Use the procesor function to get event tokens
Eileen McNaughton [Sun, 19 Sep 2021 04:09:11 +0000 (16:09 +1200)]
Start adding tests on event tokens
This reconciles the 2 ways of listing event tokens. (The way
we are about to deprecate doesn't list custom fields but
can just call the other
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
Coleman Watts [Sun, 19 Sep 2021 01:37:03 +0000 (21:37 -0400)]
SearchKit - Fix in-place edit of relationships and dates
Date fields were not rendering correctly, and relationships
could not be edited due to the read-only nature of the relationshipCache table.
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
Eileen McNaughton [Thu, 16 Sep 2021 03:26:35 +0000 (15:26 +1200)]
dev/core#2839 Fix addition of _preview to filename
Note this also standardises the buttons with the other forms meaning that
the preview buttons is now available
I think this is more standardised & hence clearer ....
Eileen McNaughton [Sat, 18 Sep 2021 20:58:47 +0000 (08:58 +1200)]
dev/core#2843 push new link to the end
As discussed in https://lab.civicrm.org/dev/core/-/issues/2843
this makes the UI change less for users & reduces confusion
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
Matthew Wire [Fri, 17 Sep 2021 12:59:51 +0000 (13:59 +0100)]
Fix smart group cache clear test so group we're clearing is actually a smart group
Matthew Wire [Fri, 10 Sep 2021 09:42:05 +0000 (10:42 +0100)]
flushCaches should respect permitCacheFlushMode. Also flush caches which have a NULL cache_date
Matthew Wire [Sat, 18 Sep 2021 08:59:42 +0000 (09:59 +0100)]
Fix PHP notices in contributionrecur tpl - this also hides some fields if empty
Eileen McNaughton [Fri, 17 Sep 2021 20:39:14 +0000 (08:39 +1200)]
Remove 'bad' tokens from badge tokens
These tokens are
a) non-standard, not easily supported
b) illogical in the only current core usage context
that currently uses these tokens (event badges)
c) partially broken - currency returns nothing, note doesn't make sense
Eileen McNaughton [Fri, 17 Sep 2021 20:28:47 +0000 (08:28 +1200)]
Remove duplicate print label tokens
There are literally 2 tokens for the same option in the drop down.. remove the non-standard one