Sunil Pawar [Tue, 14 Sep 2021 09:22:15 +0000 (14:52 +0530)]
dev/core#2833 Fix Contact Type change on Backend Membership Credit Card Signup and Renewal
Eileen McNaughton [Tue, 14 Sep 2021 03:08:33 +0000 (15:08 +1200)]
Merge pull request #21463 from eileenmcnaughton/mem
[Ref] Remove unnecessary pass-by-reference
Seamus Lee [Tue, 14 Sep 2021 02:40:35 +0000 (12:40 +1000)]
Merge pull request #21458 from eileenmcnaughton/badge_of_honor
dev/core#2834 Preliminary test on badge
Eileen McNaughton [Tue, 14 Sep 2021 01:39:15 +0000 (13:39 +1200)]
Merge pull request #21042 from eileenmcnaughton/uf
[REF] Use OO when determining what to suggest for settings.php prefixes for drupal/backdrop views, instead of scattered "if cms =="
Eileen McNaughton [Tue, 14 Sep 2021 01:26:12 +0000 (13:26 +1200)]
[Ref] Remove unnecessary pass-by-reference
Eileen McNaughton [Tue, 14 Sep 2021 01:19:11 +0000 (13:19 +1200)]
Merge pull request #21459 from eileenmcnaughton/mem
[Ref] Remove no-longer-used variables
Eileen McNaughton [Tue, 14 Sep 2021 00:38:00 +0000 (12:38 +1200)]
Merge pull request #21461 from eileenmcnaughton/render_array
Ensure TokenSmary::render returns an array
Eileen McNaughton [Mon, 13 Sep 2021 21:19:08 +0000 (09:19 +1200)]
[NFC] Cleanup on test class
Eileen McNaughton [Mon, 13 Sep 2021 23:13:35 +0000 (11:13 +1200)]
Merge pull request #21436 from colemanw/afformWarning
Afform - gracefully handle missing html files
Eileen McNaughton [Mon, 13 Sep 2021 19:53:47 +0000 (07:53 +1200)]
[Ref] Remove no-longer-used variables
Eileen McNaughton [Mon, 13 Sep 2021 23:01:06 +0000 (11:01 +1200)]
Ensure TokenSmary::render returns an array
If there are no messages it should return an empty array
Eileen McNaughton [Fri, 6 Aug 2021 07:51:05 +0000 (19:51 +1200)]
Views db cleanup (alternative)
I took a look at https://github.com/civicrm/civicrm-core/pull/20682 and it seemed clear that
in it's current state it would fix one CMS (d9) & break another (d7). This is
an alternate that will hopefully be non-breaky
Eileen McNaughton [Mon, 13 Sep 2021 11:11:22 +0000 (23:11 +1200)]
dev/core#2834 Preliminary test on badge
Seamus Lee [Mon, 13 Sep 2021 21:46:08 +0000 (07:46 +1000)]
Merge pull request #21452 from eileenmcnaughton/mem_test
dev/core#2832 Improvements to test on membership letter task
Eileen McNaughton [Mon, 13 Sep 2021 21:33:34 +0000 (09:33 +1200)]
Merge pull request #21460 from civicrm/5.42
5.42 to master
Eileen McNaughton [Mon, 13 Sep 2021 21:32:51 +0000 (09:32 +1200)]
Merge pull request #21444 from colemanw/fixSearchDisplayDelete
SearchKit - Fix deleting search displays
Eileen McNaughton [Mon, 13 Sep 2021 21:03:41 +0000 (09:03 +1200)]
Merge pull request #21456 from demeritcowboy/activity-export542
dev/core#2835 - Activity export broken in 5.41
demeritcowboy [Mon, 13 Sep 2021 17:31:56 +0000 (13:31 -0400)]
activity export fail
colemanw [Mon, 13 Sep 2021 15:26:46 +0000 (11:26 -0400)]
Merge pull request #21438 from colemanw/fixApi4GetDefaults
APIv4 - Default select clause to exclude "Extra" fields
demeritcowboy [Mon, 13 Sep 2021 15:09:14 +0000 (11:09 -0400)]
Merge pull request #21448 from eileenmcnaughton/old_param
[REF] Remove unused parameter
demeritcowboy [Mon, 13 Sep 2021 14:45:23 +0000 (10:45 -0400)]
Merge pull request #21451 from eileenmcnaughton/mem
[REF] Remove unused variable
colemanw [Mon, 13 Sep 2021 13:51:13 +0000 (09:51 -0400)]
Merge pull request #21450 from eileenmcnaughton/compat_less
[REF] Extract code to load the contact in tokenCompat
Coleman Watts [Sat, 11 Sep 2021 19:16:18 +0000 (15:16 -0400)]
APIv4 - Default select clause to exclude "Extra" fields
Recently a "type" property was added to getFieldSpec to allow "Extra"
calculated fields to be declared. This updates api Get to *not*
select those fields by default, as their calculation can be expensive.
Mathieu Lu [Mon, 13 Sep 2021 13:04:37 +0000 (09:04 -0400)]
Merge pull request #21439 from mlutfy/authxReadme
Authx: README: add note about CMS permissions
Seamus Lee [Mon, 13 Sep 2021 08:18:23 +0000 (18:18 +1000)]
Merge pull request #21453 from eileenmcnaughton/member_tokens
dev/core#2832 Add test for legacy membership tokens, add support for preferred tokens
Eileen McNaughton [Mon, 13 Sep 2021 04:13:01 +0000 (16:13 +1200)]
Enhance pdf letter test for mememberships
Eileen McNaughton [Mon, 13 Sep 2021 05:34:34 +0000 (17:34 +1200)]
dev/core#2832 Add test for legacy membership tokens, add support for preferred tokens
There is only one place that calls this code. With cover of the legacy tokens
I can ensure it is the same as the processor tokens. I've fixed it
to support the preferred unambiguous tokens because that means that
we don't have to deal with reports of them not working while calls
to it are phased out of extensions. Working through that
also allowed me to remove some code now
Eileen McNaughton [Mon, 13 Sep 2021 03:17:09 +0000 (15:17 +1200)]
dev/core#2832 rename pdf letter test
Eileen McNaughton [Mon, 13 Sep 2021 02:59:16 +0000 (14:59 +1200)]
[REF] Remove unused variable
This parameter is no longer used
Eileen McNaughton [Mon, 13 Sep 2021 02:06:59 +0000 (14:06 +1200)]
[REF] Extract code to load the contact in tokenCompat
colemanw [Mon, 13 Sep 2021 00:38:14 +0000 (20:38 -0400)]
Merge pull request #21401 from eileenmcnaughton/mgd2
dev/core#2823 Restructure determination of required actions.
Eileen McNaughton [Sun, 12 Sep 2021 23:46:07 +0000 (11:46 +1200)]
[REF] Remove unused parameter
There are no longer any cases in git universe that pass this parameter
Seamus Lee [Sun, 12 Sep 2021 23:42:00 +0000 (09:42 +1000)]
Merge pull request #20807 from davidjosephhayes/wordpress-profile-signon-2
Wordpress Profile User Creation Sign On (v2)
Eileen McNaughton [Sun, 12 Sep 2021 22:28:10 +0000 (10:28 +1200)]
Move loadDeclartions to reconcile
I'm getting a loop
Eileen McNaughton [Sun, 12 Sep 2021 20:48:26 +0000 (08:48 +1200)]
Make managed entities functions protected
The only affected universe place I found was
https://github.com/veda-consulting-company/uk.co.vedaconsulting.gdpr/pull/294
Since putting the 'information gathering & storing' function on
the constructor is tricky due to the singleton
caching this means we are always working with a consistent entry point
Eileen McNaughton [Wed, 8 Sep 2021 05:08:34 +0000 (17:08 +1200)]
dev/core#2823 Restructure determination of required actions.
The expected actions are now calculated at the start of reconcile.
and retrievable by function.
The code that calls the action-actions
is still pretty cludgey - but the intent is that
we would stop passing the dao object into those
action-action functions in the near future.
This PR punts any decisions about how outputs might look
(eg. making the array retrievable from outside of the function.
Note that there is pretty comprehensive
test cover in CRM_Core_ManagedEntitiesTest
colemanw [Sun, 12 Sep 2021 21:40:20 +0000 (17:40 -0400)]
Merge pull request #21429 from eileenmcnaughton/tok_hook2
Consolidate building of contact token list
colemanw [Sun, 12 Sep 2021 21:38:27 +0000 (17:38 -0400)]
Merge pull request #21383 from eileenmcnaughton/case_tokens
dev/core#2817 Add CaseToken processor
Eileen McNaughton [Sun, 12 Sep 2021 21:25:21 +0000 (09:25 +1200)]
Merge pull request #21441 from demeritcowboy/dashboard-fail2
dev/core#2829 - "Trying to access array offset on value of type null" on dashboard
Coleman Watts [Sun, 12 Sep 2021 21:22:01 +0000 (17:22 -0400)]
SearchKit - Fix deleting search displays
Eileen McNaughton [Sun, 12 Sep 2021 21:17:29 +0000 (09:17 +1200)]
Merge pull request #21443 from demeritcowboy/test-fix-2
Alternate to https://github.com/civicrm/civicrm-core/pull/21442
colemanw [Sun, 12 Sep 2021 20:05:50 +0000 (16:05 -0400)]
Merge pull request #21428 from totten/master-tp-filter
TokenProcessor - Allow basic filter/modifier expressions
colemanw [Sun, 12 Sep 2021 20:00:15 +0000 (16:00 -0400)]
Merge pull request #21440 from eileenmcnaughton/mgd_test
dev/core#2823 fix test to be more like real function usage
demeritcowboy [Sun, 12 Sep 2021 13:45:11 +0000 (09:45 -0400)]
contact with email might not exist
demeritcowboy [Sun, 12 Sep 2021 12:02:19 +0000 (08:02 -0400)]
dashboard has no bridge
Eileen McNaughton [Sun, 12 Sep 2021 05:42:24 +0000 (17:42 +1200)]
dev/core#2823 fix test to be more like real function usage
Eileen McNaughton [Sat, 11 Sep 2021 23:46:42 +0000 (11:46 +1200)]
Merge pull request #21437 from demeritcowboy/dashboard-fail
dev/core#2829 - unit test for nonempty dashboard
Mathieu Lutfy [Sat, 11 Sep 2021 21:47:48 +0000 (17:47 -0400)]
Authx: README: add note about CMS permissions
demeritcowboy [Sat, 11 Sep 2021 18:51:39 +0000 (14:51 -0400)]
test for nonempty dashboard
Coleman Watts [Sat, 11 Sep 2021 16:12:12 +0000 (12:12 -0400)]
Afform - gracefully handle missing html files
colemanw [Sat, 11 Sep 2021 15:14:54 +0000 (11:14 -0400)]
Merge pull request #21399 from eileenmcnaughton/mgd
dev/core#2823 Extract code to load the declarations and call from the constructor
colemanw [Sat, 11 Sep 2021 15:10:48 +0000 (11:10 -0400)]
Merge pull request #21400 from eileenmcnaughton/val
dev/core#2823 Move validation into validation function
Eileen McNaughton [Sat, 11 Sep 2021 03:06:05 +0000 (15:06 +1200)]
Merge pull request #21434 from demeritcowboy/upgrade-text
dev/core#2828 - Make up for message template text version update from 5.20 that never happened
Eileen McNaughton [Sat, 11 Sep 2021 00:46:39 +0000 (12:46 +1200)]
Merge pull request #21211 from colemanw/onDeletePrimary
[REF] Move Email, Address, etc. is_primary handling on delete to a hook (dev/core#2757)
demeritcowboy [Sat, 11 Sep 2021 00:15:41 +0000 (20:15 -0400)]
better late than never
Eileen McNaughton [Fri, 10 Sep 2021 23:13:42 +0000 (11:13 +1200)]
Merge pull request #21424 from colemanw/apiJoinBridgeCustomFields
SearchKit - Support custom fields in bridge join entities
Eileen McNaughton [Fri, 10 Sep 2021 21:57:39 +0000 (09:57 +1200)]
Merge pull request #21431 from colemanw/searchTableAlign
SearchKit - Fix alignment in table headers
Eileen McNaughton [Fri, 10 Sep 2021 21:02:19 +0000 (09:02 +1200)]
Merge pull request #21198 from colemanw/fkConstraint
[REF] Mapping - Check FK on delete with SQL instead of PHP (dev/core#2757)
Coleman Watts [Fri, 10 Sep 2021 14:28:19 +0000 (10:28 -0400)]
SearchKit - Fix alignment in table headers
Coleman Watts [Fri, 20 Aug 2021 17:24:48 +0000 (13:24 -0400)]
Mapping - Check FK on delete with SQL instead of with PHP
Coleman Watts [Sun, 22 Aug 2021 00:00:32 +0000 (20:00 -0400)]
Move Email, Address, etc. is_primary handling on delete to a hook
Previously this was all done in a delegated function.
This moves that logic to a hook listener.
Seamus Lee [Fri, 10 Sep 2021 07:55:54 +0000 (17:55 +1000)]
Merge pull request #21426 from eileenmcnaughton/api4
Replace expensive query with cheaper one
Tim Otten [Thu, 9 Sep 2021 23:26:08 +0000 (16:26 -0700)]
TokenProcessor - Allow basic filter/modifier expressions
Before
------
`Hello {foo.bar}`
After
-----
`Hello {foo.bar|upper}` and `Hello {foo.bar|lower}`
Technical Details
-----------------
This only supports tokens that supply values through `civi.token.eval`. At the time of
this commit, most `{contact.*}` tokens still use `TokenCompatSubscriber::onRender()` to
hack-in their values and won't work until they switch over.
The regex which recognizes the filter is pretty tight (`\w+`). This can be relaxed
somewhat by a subsequent change, but I'd say such a change has a burden to demonstrate
safety/interoparbility when running in Token-Smarty format. (e.g. demonstrate that
matching of open/close symbols works correctly).
Eileen McNaughton [Thu, 9 Sep 2021 22:43:37 +0000 (10:43 +1200)]
Replace expensive query with cheaper one
Rather than retrieve everything with a legacy function, just get what we want....
Note I commented on how silly I think it is but no change to outcome
Eileen McNaughton [Fri, 10 Sep 2021 02:28:00 +0000 (14:28 +1200)]
Consolidate building of contact token list
Eileen McNaughton [Fri, 10 Sep 2021 01:34:46 +0000 (13:34 +1200)]
Extend test cover on token fields
Extends test cover to check advertised tokens for contacts and to check
those advertised in hooks are included
Eileen McNaughton [Fri, 10 Sep 2021 04:03:02 +0000 (16:03 +1200)]
Add upgrade message
Eileen McNaughton [Mon, 6 Sep 2021 09:29:50 +0000 (21:29 +1200)]
dev/core#2817 Add CaseToken processor
Note this isn't quite passing yet - it highlights that the pre-existing case tokens do
different stuff with date fields. Thinking
Eileen McNaughton [Fri, 10 Sep 2021 03:59:42 +0000 (15:59 +1200)]
Fix booleans to use :label format
Eileen McNaughton [Tue, 31 Aug 2021 04:21:37 +0000 (16:21 +1200)]
Add token processor for Contribution Recur
This adds the token processor using our preferred outputs + 100% test cover.
Seamus Lee [Fri, 10 Sep 2021 00:37:02 +0000 (10:37 +1000)]
Merge pull request #21416 from eileenmcnaughton/dom_toke
[REF] Extract function to getDomainTokens
Eileen McNaughton [Fri, 10 Sep 2021 00:30:02 +0000 (12:30 +1200)]
Merge pull request #21408 from colemanw/bumpMinUpgradeVer
Bump minimum upgradable version to 4.5.9
Eileen McNaughton [Fri, 10 Sep 2021 00:29:45 +0000 (12:29 +1200)]
Merge pull request #21425 from eileenmcnaughton/error
Remove error handling for core error being returned
Seamus Lee [Thu, 9 Sep 2021 23:13:07 +0000 (09:13 +1000)]
Merge pull request #21414 from eileenmcnaughton/greet
dev/core#2814 Remove redundant call to `replaceContactTokens`
Seamus Lee [Thu, 9 Sep 2021 23:12:47 +0000 (09:12 +1000)]
Merge pull request #21422 from demeritcowboy/smarty-find-activities
Smarty notices on Find Activities results page
Tim Otten [Thu, 9 Sep 2021 22:38:35 +0000 (15:38 -0700)]
(REF) TokenProcessor - Use preg_replace_callback() instead of strtr()
This will allow more complicated token expressions.
Tim Otten [Thu, 9 Sep 2021 22:37:26 +0000 (15:37 -0700)]
(NFC) TokenProcessor - Docblock
Eileen McNaughton [Thu, 9 Sep 2021 22:23:05 +0000 (10:23 +1200)]
Remove error handling for core error being returned
This would be throwing an exception - also it isn't an error situation
Coleman Watts [Thu, 9 Sep 2021 21:50:57 +0000 (17:50 -0400)]
SearchKit - Support custom fields in bridge join entities
This fixes bridge joins in APIv4 to allow selecting custom fields that belong to the bridge entity
as if they were part of the joined entity. This was already working for core fields.
demeritcowboy [Thu, 9 Sep 2021 15:31:24 +0000 (11:31 -0400)]
smarty notices
Eileen McNaughton [Thu, 9 Sep 2021 02:01:42 +0000 (14:01 +1200)]
Remove redundant call
Tim Otten [Thu, 9 Sep 2021 21:15:01 +0000 (14:15 -0700)]
Merge pull request #21418 from eileenmcnaughton/toke2
[REF] Remove cruft
Eileen McNaughton [Thu, 9 Sep 2021 20:52:03 +0000 (08:52 +1200)]
Merge pull request #21421 from demeritcowboy/tag-table
Smarty notice on Find Activities / Find Cases
demeritcowboy [Thu, 9 Sep 2021 14:57:40 +0000 (10:57 -0400)]
smarty notice
demeritcowboy [Thu, 9 Sep 2021 14:37:56 +0000 (10:37 -0400)]
Merge pull request #21417 from eileenmcnaughton/cont_mode
Follow up on removing contributeMode from templates
colemanw [Thu, 9 Sep 2021 13:08:31 +0000 (09:08 -0400)]
Merge pull request #21419 from civicrm/5.42
Merge 5.42 to master
colemanw [Thu, 9 Sep 2021 13:07:17 +0000 (09:07 -0400)]
Merge pull request #21411 from colemanw/fixSearchKitAugmentSelectClause
SearchKit - Fix aggregated joins
Eileen McNaughton [Thu, 9 Sep 2021 06:38:58 +0000 (18:38 +1200)]
[REF] Extract function to getDomainTokens
This caches the whole token set by domain+locale+html rather than just part.
I am thinking about where this should do - on the BAO_Domain class?
Or on a token processor class (eventually it would only be
called from a token processor class)
Test cover in 'BAO_MessageTemplateTest.testDomainTokens'
Eileen McNaughton [Thu, 9 Sep 2021 07:18:16 +0000 (19:18 +1200)]
[REF] Remove cruft
As the comment says - it's weird. Also I found the related code has been removed
Eileen McNaughton [Thu, 9 Sep 2021 07:04:39 +0000 (19:04 +1200)]
Follow up on removing contributeMode from templates
Per https://github.com/civicrm/civicrm-core/pull/21059
its a really long time since this was in the stock templates
Eileen McNaughton [Thu, 9 Sep 2021 06:58:22 +0000 (18:58 +1200)]
Merge pull request #21059 from eileenmcnaughton/contribuion_mode
dev/core#2748 Remove unused token assigns
Eileen McNaughton [Wed, 8 Sep 2021 02:10:28 +0000 (14:10 +1200)]
dev/core#2823 Extract code to load the declarations and call from the constructor
The declarations are only used in object context so it makes sense to load
them in the constructor. In addition they are ALWAYS loaded except in test usage
(it does seem a bit silly having the option to pass them in only for tests
but we can ignore that for now - I commented it)
Eileen McNaughton [Wed, 8 Sep 2021 02:32:43 +0000 (14:32 +1200)]
dev/core#2823 Move validation into validation function
As the code comments suggest the handling of a module being unrecognised sould
be handled in the validate not the enable function
colemanw [Thu, 9 Sep 2021 05:31:35 +0000 (01:31 -0400)]
Merge pull request #21412 from eileenmcnaughton/protected
dev/core#2823 update function visibility to protected
demeritcowboy [Thu, 9 Sep 2021 00:39:39 +0000 (20:39 -0400)]
Merge pull request #21174 from mattwire/unsubscribemessaging
Mailing Unsubscribe Form: Show if email is already unsubscribed
Eileen McNaughton [Sat, 7 Aug 2021 07:18:30 +0000 (19:18 +1200)]
dev/core#2748 Remove unused token assigns
Eileen McNaughton [Wed, 8 Sep 2021 23:36:31 +0000 (11:36 +1200)]
dev/core#2823 update function visibility to protected
This makes some internal functions 'protected'. I did a universer search for them.
Making them protected means that when I look to clean them up it is
clear that we only need to worry about how the class
interacts with them
Eileen McNaughton [Wed, 8 Sep 2021 22:25:50 +0000 (10:25 +1200)]
Merge pull request #21410 from demeritcowboy/smarty-individual
Smarty warning about missing contact subtype on New Individual
Eileen McNaughton [Wed, 8 Sep 2021 22:00:41 +0000 (10:00 +1200)]
Merge pull request #21409 from demeritcowboy/double-root
Remove duplicate global declaration in civicrm.settings.php template
Eileen McNaughton [Wed, 8 Sep 2021 21:36:51 +0000 (09:36 +1200)]
Merge pull request #21405 from colemanw/tableStyle
SearchKit & Afform - Use Bootstrap table styles on admin screens