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.
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 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
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
Coleman Watts [Wed, 8 Sep 2021 21:16:58 +0000 (17:16 -0400)]
SearchKit - Exclude links from aggregated joins
demeritcowboy [Wed, 8 Sep 2021 20:27:38 +0000 (16:27 -0400)]
subtype might legitimately be empty
demeritcowboy [Wed, 8 Sep 2021 20:09:41 +0000 (16:09 -0400)]
remove duplicate declaration
Coleman Watts [Wed, 8 Sep 2021 18:47:40 +0000 (14:47 -0400)]
SearchKit - Partial backport of 4afe3e
colemanw [Wed, 8 Sep 2021 17:43:48 +0000 (13:43 -0400)]
Merge pull request #21406 from demeritcowboy/comma
[search kit] Semicolon vs comma
demeritcowboy [Wed, 8 Sep 2021 17:08:04 +0000 (13:08 -0400)]
comma
demeritcowboy [Wed, 8 Sep 2021 14:26:09 +0000 (10:26 -0400)]
Merge pull request #21404 from colemanw/fixSearchDeleteConfirm
Fixes dev/core#2826 SearchKit - Fix delete search confirm dialog
Coleman Watts [Wed, 8 Sep 2021 14:13:43 +0000 (10:13 -0400)]
Afform - Use bootstrap table classes on admin table
Coleman Watts [Wed, 8 Sep 2021 14:10:17 +0000 (10:10 -0400)]
SearchKit - Use bootstrap table classes on admin screens
Coleman Watts [Wed, 8 Sep 2021 12:31:54 +0000 (08:31 -0400)]
SearchKit - Fix delete search confirm dialog
Fixes dev/core#2826
Eileen McNaughton [Wed, 8 Sep 2021 05:48:13 +0000 (17:48 +1200)]
Merge pull request #21397 from colemanw/tableStyles
SearchKit - Support bootstrap styles in search display tables
Eileen McNaughton [Wed, 8 Sep 2021 05:38:26 +0000 (17:38 +1200)]
Merge pull request #21381 from eileenmcnaughton/ent
dev/core#2817 Block submission of pdf with text including token format that is ambiguous with the processor
Eileen McNaughton [Wed, 8 Sep 2021 05:37:27 +0000 (17:37 +1200)]
Merge pull request #21394 from colemanw/debounceGetResults
SearchKit - Prevent race conditions in search display loading
Eileen McNaughton [Wed, 8 Sep 2021 05:35:39 +0000 (17:35 +1200)]
Merge pull request #21388 from colemanw/searchKitFilter
SearchKit - Filter search listing by creator
Eileen McNaughton [Mon, 6 Sep 2021 08:26:04 +0000 (20:26 +1200)]
Block submission with token format that is ambiguous with the processor
Seamus Lee [Wed, 8 Sep 2021 02:40:10 +0000 (12:40 +1000)]
Merge pull request #21398 from demeritcowboy/basic-email-test
[NFC] Put back email test without tokens and enhance a little
demeritcowboy [Wed, 8 Sep 2021 01:06:27 +0000 (21:06 -0400)]
add test without tokens
Coleman Watts [Tue, 7 Sep 2021 23:31:29 +0000 (19:31 -0400)]
SearchKit - Support bootstrap styles in search display tables
Seamus Lee [Wed, 8 Sep 2021 01:04:46 +0000 (11:04 +1000)]
Merge pull request #21396 from seamuslee001/fix_upgrade
Fix Upgrade step to ensure all fields are converted correctly as well
Eileen McNaughton [Wed, 8 Sep 2021 00:06:17 +0000 (12:06 +1200)]
Merge pull request #21395 from eileenmcnaughton/mgd
dev/core#2823 Make protected functions non-static
demeritcowboy [Tue, 7 Sep 2021 23:54:50 +0000 (19:54 -0400)]
Merge pull request #20995 from ixiam/dev-import-phone-extension
Import csv-Fix not importing extension in phones
Seamus Lee [Tue, 7 Sep 2021 23:16:54 +0000 (09:16 +1000)]
Fix Upgrade step to ensure all fields are converted correctly as well
Eileen McNaughton [Tue, 7 Sep 2021 21:57:11 +0000 (09:57 +1200)]
dev/core#2823 Make protected functions non-static
It's really hard to see why this class uses a mix of static & non-static functions
for internal (protected) functions. I suspect *history*. This makes
them all non-static
Coleman Watts [Mon, 6 Sep 2021 23:40:10 +0000 (19:40 -0400)]
SearchKit - Filter search listing by author, adding support for OR in filters
Coleman Watts [Tue, 7 Sep 2021 18:36:58 +0000 (14:36 -0400)]
SearchKit - Prevent race conditions in search display loading
- Increases debounce timeout from 100 to 800 ms
- Internally tracks the requests to ensure that later requests always take priority
colemanw [Tue, 7 Sep 2021 13:15:12 +0000 (09:15 -0400)]
Merge pull request #21186 from demeritcowboy/multiint
dev/core#2772 - Don't crash for custom fields of type int that are multi-select
colemanw [Tue, 7 Sep 2021 13:10:56 +0000 (09:10 -0400)]
Merge pull request #20822 from seamuslee001/use_product_api_form_hook
[REF] Update Product Create to use hooks and also switch the manage p…
Matthew Wire [Wed, 18 Aug 2021 14:50:37 +0000 (15:50 +0100)]
Indicate if email is already unsubscribed.
Matthew Wire [Tue, 7 Sep 2021 10:21:53 +0000 (11:21 +0100)]
Merge pull request #21389 from seamuslee001/relationship_cache_table_fix
[REF] Add in upgrade step to align the relationship cache table colla…
Matthew Wire [Tue, 7 Sep 2021 10:20:21 +0000 (11:20 +0100)]
Merge pull request #21380 from eileenmcnaughton/case_opts
dev/core#2817 towards deprecating legacy `replaceCaseTokens`
Eileen McNaughton [Tue, 7 Sep 2021 03:20:52 +0000 (15:20 +1200)]
Merge pull request #21386 from seamuslee001/test_sendemail
[NFC] Extend send email test to cover for contact tokens being replaced
Eileen McNaughton [Tue, 7 Sep 2021 03:20:28 +0000 (15:20 +1200)]
Merge pull request #21390 from seamuslee001/function_type_hints_upgrade
[NFC] Add in type hints to template upgrade functions
Seamus Lee [Tue, 7 Sep 2021 01:27:07 +0000 (11:27 +1000)]
[NFC] Add in type hints to template upgrade functions
Seamus Lee [Tue, 7 Sep 2021 01:23:06 +0000 (11:23 +1000)]
[REF] Add in upgrade step to align the relationship cache table collation and charset with the other tables
Seamus Lee [Tue, 7 Sep 2021 01:16:42 +0000 (11:16 +1000)]
Merge pull request #21382 from mattwire/collate
Don't specify character set for civicrm_relationship_cache table
Seamus Lee [Mon, 6 Sep 2021 23:50:01 +0000 (09:50 +1000)]
Merge pull request #21385 from eileenmcnaughton/email_fix
dev/core#2814 Fix activity:sendEmail follow up
Seamus Lee [Mon, 6 Sep 2021 23:34:48 +0000 (09:34 +1000)]
[NFC] Extend send email test to cover for contact tokens being replaced
Seamus Lee [Fri, 9 Jul 2021 22:35:45 +0000 (08:35 +1000)]
[REF] Update Product Create to use hooks and also switch the manage product/premium page to use APIv4 Product Entity
Update to use suggestion from Coleman
Set Product permissions to be the same as contribution entity
Seamus Lee [Mon, 6 Sep 2021 22:57:02 +0000 (08:57 +1000)]
Merge pull request #21354 from andyburnsco/patch-1
Change Do Not SMS privacy icon
Eileen McNaughton [Mon, 6 Sep 2021 22:52:55 +0000 (10:52 +1200)]
Merge pull request #21379 from eileenmcnaughton/tok_mem
dev/core#2814 Fix membership pdf to use renderTemplate
colemanw [Mon, 6 Sep 2021 22:44:48 +0000 (18:44 -0400)]
Merge pull request #21288 from greenpeace-cee/add-regexp-ops
dev/core#2793 - Add REGEXP/NOT REGEXP SQL operators
Eileen McNaughton [Mon, 6 Sep 2021 20:01:39 +0000 (08:01 +1200)]
dev/core#2814 Fix activity:sendEmail follow up
Mathieu Lu [Mon, 6 Sep 2021 18:29:35 +0000 (14:29 -0400)]
Merge pull request #21350 from mattwire/optoutverifyemail
Remove requirement to enter email address on Opt Out
Mathieu Lu [Mon, 6 Sep 2021 18:14:09 +0000 (14:14 -0400)]
Merge pull request #21175 from mattwire/unsubscribeverifyemail
Remove requirement to enter email address on unsubscribe
Matthew Wire [Thu, 2 Sep 2021 11:08:15 +0000 (12:08 +0100)]
Remove requirement to verify email on opt out
Matthew Wire [Wed, 18 Aug 2021 18:01:05 +0000 (19:01 +0100)]
Remove requirement to enter email address to unsubscribe
Patrick Figel [Mon, 6 Sep 2021 10:27:12 +0000 (12:27 +0200)]
dev/core#2793 - Add REGEXP/NOT REGEXP SQL operators in API4
This adds the REGEXP and NOT REGEXP operators to API4 and SearchKit.
Matthew Wire [Mon, 6 Sep 2021 09:25:34 +0000 (10:25 +0100)]
Don't specify character set for civicrm_relationship_cache table
Seamus Lee [Mon, 6 Sep 2021 09:01:32 +0000 (19:01 +1000)]
Merge pull request #21370 from eileenmcnaughton/fp
dev/core#2715 Move 2 more functions to financial processor class
Eileen McNaughton [Mon, 6 Sep 2021 07:08:12 +0000 (19:08 +1200)]
dev/core#2817 towards deprecating legacy
This adds support for the syntax
{case.status_id:label} which what we agreed as a preferred syntax
to disambiguate the demands for labels vs ids vs machine names in
various implementations.
The new (preferred) label is advertised - but the old
one still works
See https://lab.civicrm.org/dev/core/-/issues/2817 for next steps
Eileen McNaughton [Mon, 6 Sep 2021 05:10:49 +0000 (17:10 +1200)]
Merge pull request #21199 from colemanw/fkDeleteBetter
[REF] Cleanup BAO::del() functions with unnecessary FK checks (dev/core#2757)
Eileen McNaughton [Mon, 6 Sep 2021 05:04:03 +0000 (17:04 +1200)]
Merge pull request #21377 from eileenmcnaughton/act_send
dev/core#2814 Fix activity:sendSMS to use renderTemplate
Eileen McNaughton [Mon, 6 Sep 2021 05:03:48 +0000 (17:03 +1200)]
Merge pull request #21378 from eileenmcnaughton/act_test
dev/core#2814 Fix test to use renderTemplate
Eileen McNaughton [Mon, 6 Sep 2021 03:22:41 +0000 (15:22 +1200)]
Merge pull request #21376 from colemanw/searchTags
SearchKit - enable tags for Saved Searches
Eileen McNaughton [Mon, 6 Sep 2021 02:14:33 +0000 (14:14 +1200)]
dev/core#2814 Fix test to use renderTemplate
Eileen McNaughton [Mon, 6 Sep 2021 02:34:05 +0000 (14:34 +1200)]
dev/core#2814 Fix membership pdf to use renderTemplate
colemanw [Mon, 6 Sep 2021 02:24:23 +0000 (22:24 -0400)]
Merge pull request #21357 from eileenmcnaughton/recur_from
[REF] Extract code to get the from address for a recurring contribution.
colemanw [Mon, 6 Sep 2021 02:19:18 +0000 (22:19 -0400)]
Merge pull request #21366 from eileenmcnaughton/filename
[REF] dev/core#2790 Move pdf getFileName functionality to the trait
Eileen McNaughton [Mon, 6 Sep 2021 02:09:06 +0000 (14:09 +1200)]
dev/core#2814 Fix activity:sendSMS to use renderTemplate
colemanw [Mon, 6 Sep 2021 01:46:29 +0000 (21:46 -0400)]
Merge pull request #21365 from eileenmcnaughton/act_send
dev/core#2814 Fix activity:sendEmail to use renderTemplate
Coleman Watts [Sun, 5 Sep 2021 22:17:53 +0000 (18:17 -0400)]
SearchKit - Enable tagging saved searches
Coleman Watts [Sat, 4 Sep 2021 18:22:12 +0000 (14:22 -0400)]
SearchKit - Show shorter date in listing and fix functions in tokens
colemanw [Mon, 6 Sep 2021 01:33:15 +0000 (21:33 -0400)]
Merge pull request #21367 from eileenmcnaughton/export
dev/core#2814 migrate export processor to use MessageRender
colemanw [Mon, 6 Sep 2021 01:30:40 +0000 (21:30 -0400)]
Merge pull request #21364 from eileenmcnaughton/prof_edit
dev/core#2814 Fix profile edit to use messagetemplate:render
colemanw [Mon, 6 Sep 2021 01:27:46 +0000 (21:27 -0400)]
Merge pull request #21335 from eileenmcnaughton/pdft
[REF] dev/core#2790 dev/core#2814 Start migration to MessageTemplate::render
colemanw [Mon, 6 Sep 2021 01:21:53 +0000 (21:21 -0400)]
Merge pull request #21373 from eileenmcnaughton/depp
Fix test to test trait not deprecated function
Eileen McNaughton [Sun, 5 Sep 2021 22:43:02 +0000 (10:43 +1200)]
Merge pull request #21375 from mattwire/settitlelegacycustomsearch
Update use of CRM_Utils_System::setTitle() for legacycustomsearches
Eileen McNaughton [Sun, 5 Sep 2021 22:40:24 +0000 (10:40 +1200)]
Merge pull request #21368 from mattwire/settitle
Switch to CRM_Core_Form::setTitle() instead of CRM_Utils_System::setTitle() part 4
Matthew Wire [Sun, 5 Sep 2021 19:39:00 +0000 (20:39 +0100)]
Switch to CRM_Core_Form::setTitle() instead of CRM_Utils_System::setTitle() part 4
Matthew Wire [Sun, 5 Sep 2021 19:39:52 +0000 (20:39 +0100)]
Update use of CRM_Utils_System::setTitle() for legacycustomsearches
colemanw [Sun, 5 Sep 2021 01:33:09 +0000 (21:33 -0400)]
Merge pull request #21372 from eileenmcnaughton/ddep
Remove deprecated input variable
Eileen McNaughton [Sat, 4 Sep 2021 21:42:44 +0000 (09:42 +1200)]
dev/core#2715 Move 2 more functions to financial processor class
Note that we have a huge amount of test cover of these - the main risk of breakage
is missing a 'self' in the calling class - but that should cause a hard fail.
These are functions we have always felt safe changing without regards to
extension usage as they are deep within the financials and
we have been really clear that the only way to interact is to use the
api functions
Eileen McNaughton [Sun, 5 Sep 2021 00:34:09 +0000 (12:34 +1200)]
Fix test to test trait not deprecated function
Eileen McNaughton [Sun, 5 Sep 2021 00:23:32 +0000 (12:23 +1200)]
Merge pull request #21371 from eileenmcnaughton/depre
Remove unused private function
Eileen McNaughton [Fri, 3 Sep 2021 22:53:42 +0000 (10:53 +1200)]
dev/core#2814 Fix activity:sendEmail to use renderTemplate
Note that this does create a situation where more queries could occur but
1) this is only called in core from the email task - which is limited to 50 contacts so it
is low-volume
2) this is really the start of a cleanup - there are other places where
queries can be removed when we look at the total flow but I feel we need to get
some simplification happening first & hence have picked on this focus
as the first step (ie removing the calls to replaceContactTokens)
3) this seems to be called in extensions to some extent - and it should still work
- there might be more queries but I think the 'support contract' for calling an
unsupported function does not include it working in ways not required by
core code
Eileen McNaughton [Sat, 4 Sep 2021 23:00:26 +0000 (11:00 +1200)]
Remove deprecated input variable
Eileen McNaughton [Sat, 4 Sep 2021 22:14:24 +0000 (10:14 +1200)]
Remove unused function
demeritcowboy [Sat, 4 Sep 2021 21:58:07 +0000 (17:58 -0400)]
Merge pull request #21157 from mlutfy/fixMonthnames
dev/translation#71 getFullMonthNames: do not rely on the OS for translation
Eileen McNaughton [Sat, 4 Sep 2021 20:04:11 +0000 (08:04 +1200)]
Merge pull request #21369 from demeritcowboy/case-token-take-2
[NFC/Unit test] - Fix secondary issue with case token consistency test
colemanw [Sat, 4 Sep 2021 16:02:59 +0000 (12:02 -0400)]
Merge pull request #21301 from greenpeace-cee/add-where-functions
Add SqlFunction support in addWhere
Mathieu Lutfy [Mon, 16 Aug 2021 15:41:45 +0000 (11:41 -0400)]
dev/translation#71 getFullMonthNames: do not rely on the operating system locale for translation
demeritcowboy [Sat, 4 Sep 2021 14:30:16 +0000 (10:30 -0400)]
fix timing issue
Patrick Figel [Sat, 4 Sep 2021 12:51:42 +0000 (14:51 +0200)]
Add SqlFunction support in addWhere
This adds an optional $isExpression parameter in addWhere that
allows use of SqlFunctions in WHERE expressions:
Contact::get(FALSE)
->addWhere('last_name', '=', $last_name)
->addWhere('LOWER(first_name)', '=', "BINARY('ALICE')", TRUE)
->execute()->indexBy('id');
This also adds a few tests to the existing expression support for
ON and HAVING clauses as well as a new BINARY function.