civicrm-core.git
3 years agoMerge pull request #21366 from eileenmcnaughton/filename
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

3 years agoMerge pull request #21365 from eileenmcnaughton/act_send
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

3 years agoMerge pull request #21367 from eileenmcnaughton/export
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

3 years agoMerge pull request #21364 from eileenmcnaughton/prof_edit
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

3 years agoMerge pull request #21335 from eileenmcnaughton/pdft
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

3 years agoMerge pull request #21373 from eileenmcnaughton/depp
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

3 years agoMerge pull request #21375 from mattwire/settitlelegacycustomsearch
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

3 years agoMerge pull request #21368 from mattwire/settitle
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

3 years agoSwitch 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

3 years agoUpdate use of CRM_Utils_System::setTitle() for legacycustomsearches
Matthew Wire [Sun, 5 Sep 2021 19:39:52 +0000 (20:39 +0100)]
Update use of CRM_Utils_System::setTitle() for legacycustomsearches

3 years agoMerge pull request #21372 from eileenmcnaughton/ddep
colemanw [Sun, 5 Sep 2021 01:33:09 +0000 (21:33 -0400)]
Merge pull request #21372 from eileenmcnaughton/ddep

Remove deprecated input variable

3 years agoFix test to test trait not deprecated function
Eileen McNaughton [Sun, 5 Sep 2021 00:34:09 +0000 (12:34 +1200)]
Fix test to test trait not deprecated function

3 years agoMerge pull request #21371 from eileenmcnaughton/depre
Eileen McNaughton [Sun, 5 Sep 2021 00:23:32 +0000 (12:23 +1200)]
Merge pull request #21371 from eileenmcnaughton/depre

Remove unused private function

3 years agodev/core#2814 Fix activity:sendEmail to use renderTemplate
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

3 years agoRemove deprecated input variable
Eileen McNaughton [Sat, 4 Sep 2021 23:00:26 +0000 (11:00 +1200)]
Remove deprecated input variable

3 years agoRemove unused function
Eileen McNaughton [Sat, 4 Sep 2021 22:14:24 +0000 (10:14 +1200)]
Remove unused function

3 years agoMerge pull request #21157 from mlutfy/fixMonthnames
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

3 years agoMerge pull request #21369 from demeritcowboy/case-token-take-2
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

3 years agoMerge pull request #21301 from greenpeace-cee/add-where-functions
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

3 years agodev/translation#71 getFullMonthNames: do not rely on the operating system locale...
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

3 years agofix timing issue
demeritcowboy [Sat, 4 Sep 2021 14:30:16 +0000 (10:30 -0400)]
fix timing issue

3 years agoAdd SqlFunction support in addWhere
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.

3 years agoMerge pull request #21363 from colemanw/searchDownloadTest
demeritcowboy [Sat, 4 Sep 2021 11:07:54 +0000 (07:07 -0400)]
Merge pull request #21363 from colemanw/searchDownloadTest

SearchKit - Add 'array' option to download API and add test

3 years agodev/core#2814 migrate export processor to use MessageRender
Eileen McNaughton [Sat, 4 Sep 2021 00:32:21 +0000 (12:32 +1200)]
dev/core#2814 migrate export processor to use MessageRender

Note that test cover is in
I used  to step through it
as that specifically covers this change

3 years agoMerge pull request #20985 from eileenmcnaughton/fprocessor
demeritcowboy [Fri, 3 Sep 2021 23:58:40 +0000 (19:58 -0400)]
Merge pull request #20985 from eileenmcnaughton/fprocessor

dev/core#2715 [REF] Move another 2 functions to the financial processor class

3 years ago[REF] dev/core#2790 Move getFileName functionality to the trait
Eileen McNaughton [Fri, 3 Sep 2021 23:20:41 +0000 (11:20 +1200)]
[REF] dev/core#2790 Move getFileName functionality to the trait

This moves the recently added functionality to standardise the file name to PDFTrait

For code not using the trait (naughty extensions that are using core code in unsupported ways)
the functionality will be the same as prior versions.

(note extensions should just copy & paste the code they want from core into their extensions
rather than call core functions - it's not 'DRY' if it's not supported).

3 years agodev/core#2814 Fix profile edit to use messagetemplate:render
Eileen McNaughton [Fri, 3 Sep 2021 20:54:24 +0000 (08:54 +1200)]
dev/core#2814 Fix profile edit to use messagetemplate:render

If the api were merged I would have used that - but this adds the test & when can test converting
to the api when it is merged. It gets the hard lifting of this conversion out of the way

3 years agoMerge pull request #21361 from eileenmcnaughton/deprecated_gone
colemanw [Fri, 3 Sep 2021 17:08:38 +0000 (13:08 -0400)]
Merge pull request #21361 from eileenmcnaughton/deprecated_gone

Remove deprecated function

3 years agoSearchKit - Add 'array' option to download API and add test
Coleman Watts [Fri, 3 Sep 2021 14:43:13 +0000 (10:43 -0400)]
SearchKit - Add 'array' option to download API and add test

3 years agoMerge pull request #21359 from eileenmcnaughton/pdf_move_cleanup
colemanw [Fri, 3 Sep 2021 13:31:18 +0000 (09:31 -0400)]
Merge pull request #21359 from eileenmcnaughton/pdf_move_cleanup

[REF] dev/core#2790 Follow on on code move, make not static

3 years agoMerge pull request #21355 from eileenmcnaughton/surver
colemanw [Fri, 3 Sep 2021 12:56:12 +0000 (08:56 -0400)]
Merge pull request #21355 from eileenmcnaughton/surver

dev/core#2486 Add survey v4 api

3 years ago[REF] Follow on on code move, make not static
Eileen McNaughton [Fri, 3 Sep 2021 06:37:34 +0000 (18:37 +1200)]
[REF] Follow on on code move, make not static

3 years agoMerge pull request #21360 from eileenmcnaughton/case_pdf
Seamus Lee [Fri, 3 Sep 2021 09:53:13 +0000 (19:53 +1000)]
Merge pull request #21360 from eileenmcnaughton/case_pdf

Remove testing hack

3 years agoMerge pull request #21358 from eileenmcnaughton/deprecated
Seamus Lee [Fri, 3 Sep 2021 09:52:26 +0000 (19:52 +1000)]
Merge pull request #21358 from eileenmcnaughton/deprecated

Remove deprecated function

3 years agoMerge pull request #21362 from eileenmcnaughton/prof_edit
Seamus Lee [Fri, 3 Sep 2021 09:52:14 +0000 (19:52 +1000)]
Merge pull request #21362 from eileenmcnaughton/prof_edit

[REF] Fix form to call this->setTitle()

3 years ago[REF] Fix form to call this->setTitle()
Eileen McNaughton [Fri, 3 Sep 2021 07:18:49 +0000 (19:18 +1200)]
[REF] Fix form to call this->setTitle()

3 years agoRemove deprecated function
Eileen McNaughton [Fri, 3 Sep 2021 07:11:03 +0000 (19:11 +1200)]
Remove deprecated function

It was deprecated in 5.35 (and never supported to be called from outside
of core)

3 years agoRemove testing hack
Eileen McNaughton [Fri, 3 Sep 2021 06:47:19 +0000 (18:47 +1200)]
Remove testing hack

3 years agodev/core#2486 Add survey v4 api
Eileen McNaughton [Thu, 2 Sep 2021 23:34:45 +0000 (11:34 +1200)]
dev/core#2486 Add survey v4 api

3 years agoRemove deprecated function
Eileen McNaughton [Fri, 3 Sep 2021 05:30:08 +0000 (17:30 +1200)]
Remove deprecated function

3 years agodev/core#2715 [REF] Move another 2 functions to the financial processor class
Eileen McNaughton [Fri, 16 Jul 2021 06:27:05 +0000 (18:27 +1200)]
dev/core#2715 [REF] Move another 2 functions to the financial processor class

The process involves
- checking the selfs
- temporarily making public
- making private again once the calling function is also moved

3 years agoMerge pull request #21318 from michaelmcandrew/dev-core-2798
Eileen McNaughton [Fri, 3 Sep 2021 00:15:11 +0000 (12:15 +1200)]
Merge pull request #21318 from michaelmcandrew/dev-core-2798

activity import: prepend custom group title to custom fields

3 years agoMerge pull request #21210 from colemanw/deprecateDel
Eileen McNaughton [Thu, 2 Sep 2021 23:47:22 +0000 (11:47 +1200)]
Merge pull request #21210 from colemanw/deprecateDel

[REF] Deprecate 2 del() functions in favor of generics and hooks (dev/core#2757)

3 years agoMerge pull request #21352 from mattwire/settitle3
Seamus Lee [Thu, 2 Sep 2021 22:37:34 +0000 (08:37 +1000)]
Merge pull request #21352 from mattwire/settitle3

Switch to CRM_Core_Form::setTitle() instead of CRM_Utils_System::setTitle() part 3

3 years agoSwitch to CRM_Core_Form::setTitle() instead of CRM_Utils_System::setTitle() part 3
Matthew Wire [Fri, 20 Aug 2021 12:12:52 +0000 (13:12 +0100)]
Switch to CRM_Core_Form::setTitle() instead of CRM_Utils_System::setTitle() part 3

3 years agoMerge pull request #21202 from mattwire/settitle2
colemanw [Thu, 2 Sep 2021 14:19:53 +0000 (10:19 -0400)]
Merge pull request #21202 from mattwire/settitle2

Switch to CRM_Core_Form::setTitle() instead of CRM_Utils_System::setTitle() part 2

3 years agoMerge pull request #21349 from mattwire/ckeditor4
colemanw [Thu, 2 Sep 2021 14:01:33 +0000 (10:01 -0400)]
Merge pull request #21349 from mattwire/ckeditor4

NFC Clarify description for ckeditor4 plugin

3 years agoMerge pull request #20856 from eileenmcnaughton/paypal
Matthew Wire [Thu, 2 Sep 2021 11:25:27 +0000 (12:25 +0100)]
Merge pull request #20856 from eileenmcnaughton/paypal

dev/core#2716 [REF] Stop 'distributing' the main flow

3 years agoMerge pull request #21311 from eileenmcnaughton/poof
Matthew Wire [Thu, 2 Sep 2021 11:23:09 +0000 (12:23 +0100)]
Merge pull request #21311 from eileenmcnaughton/poof

[REF] Do not set input['line_item'] pointlessly

3 years agoSwitch to CRM_Core_Form::setTitle() instead of CRM_Utils_System::setTitle() part 2
Matthew Wire [Fri, 20 Aug 2021 12:11:54 +0000 (13:11 +0100)]
Switch to CRM_Core_Form::setTitle() instead of CRM_Utils_System::setTitle() part 2

3 years agoClarify description for ckeditor4 plugin
Matthew Wire [Thu, 2 Sep 2021 10:44:40 +0000 (11:44 +0100)]
Clarify description for ckeditor4 plugin

3 years agoMerge pull request #21135 from seamuslee001/dev_core_1618
Eileen McNaughton [Thu, 2 Sep 2021 06:07:15 +0000 (18:07 +1200)]
Merge pull request #21135 from seamuslee001/dev_core_1618

dev/core#1618 Trigger a reconciliation of logging tables after Extens…

3 years agoSet version to 5.43.alpha1
CiviCRM [Thu, 2 Sep 2021 03:32:26 +0000 (03:32 +0000)]
Set version to 5.43.alpha1

3 years agoSet version to 5.42.beta1
CiviCRM [Thu, 2 Sep 2021 03:26:10 +0000 (03:26 +0000)]
Set version to 5.42.beta1

3 years agoMerge pull request #21328 from colemanw/downloadCSV
Eileen McNaughton [Thu, 2 Sep 2021 03:20:38 +0000 (15:20 +1200)]
Merge pull request #21328 from colemanw/downloadCSV

SearchKit - Add download CSV action

3 years agoMerge pull request #21336 from totten/master-smarty-alias
Eileen McNaughton [Thu, 2 Sep 2021 02:41:10 +0000 (14:41 +1200)]
Merge pull request #21336 from totten/master-smarty-alias

TokenProcessor - Allow defining Smarty variables which are populated via token

3 years agoMerge pull request #21279 from eileenmcnaughton/upsub
Seamus Lee [Thu, 2 Sep 2021 02:31:26 +0000 (12:31 +1000)]
Merge pull request #21279 from eileenmcnaughton/upsub

[Ref] Deprecate Core_Error handling

3 years agoMerge pull request #21287 from colemanw/afformButton
Seamus Lee [Thu, 2 Sep 2021 02:25:45 +0000 (12:25 +1000)]
Merge pull request #21287 from colemanw/afformButton

Afform - Fix button appearance and block form during submission

3 years agoMerge pull request #21345 from seamuslee001/fix_afform_test
Seamus Lee [Thu, 2 Sep 2021 02:20:39 +0000 (12:20 +1000)]
Merge pull request #21345 from seamuslee001/fix_afform_test

[NFC] Fix E-notice in Afform unit tests

3 years agoSearchKit - Add download CSV action
Coleman Watts [Tue, 31 Aug 2021 12:57:22 +0000 (08:57 -0400)]
SearchKit - Add download CSV action

3 years agoMerge pull request #21344 from seamuslee001/fix_page_hook_test
Seamus Lee [Thu, 2 Sep 2021 01:17:26 +0000 (11:17 +1000)]
Merge pull request #21344 from seamuslee001/fix_page_hook_test

[REF] Fix Page Hook test on php8 by putting in guard into customDataB…

3 years agoMerge pull request #21343 from colemanw/searchKitLinks
Eileen McNaughton [Thu, 2 Sep 2021 01:13:20 +0000 (13:13 +1200)]
Merge pull request #21343 from colemanw/searchKitLinks

SearchKit - Add links to admin table and refresh after popups

3 years ago[NFC] Fix E-notice in Afform unit tests
Seamus Lee [Thu, 2 Sep 2021 00:16:26 +0000 (00:16 +0000)]
[NFC] Fix E-notice in Afform unit tests

3 years agoMerge pull request #21342 from vingle/vingle-patch-1
Seamus Lee [Thu, 2 Sep 2021 00:03:29 +0000 (10:03 +1000)]
Merge pull request #21342 from vingle/vingle-patch-1

Tidies Joomla 4 integration (menu, padding) after final release

3 years agoMerge pull request #21285 from mattwire/contributionviewlineitems
Eileen McNaughton [Thu, 2 Sep 2021 00:02:22 +0000 (12:02 +1200)]
Merge pull request #21285 from mattwire/contributionviewlineitems

Simplify ContributionView form. Always display "lineitems"

3 years ago[REF] Fix Page Hook test on php8 by putting in guard into customDataBlock around...
Seamus Lee [Wed, 1 Sep 2021 23:28:42 +0000 (23:28 +0000)]
[REF] Fix Page Hook test on php8 by putting in guard into customDataBlock around the SubType variable

3 years agoMerge pull request #21340 from colemanw/upgradeFunctions
Tim Otten [Wed, 1 Sep 2021 23:21:59 +0000 (16:21 -0700)]
Merge pull request #21340 from colemanw/upgradeFunctions

[NFC] Cleanup boilerplate code in extension upgrader classes

3 years agoMerge pull request #21337 from eileenmcnaughton/tokens
Seamus Lee [Wed, 1 Sep 2021 22:01:09 +0000 (08:01 +1000)]
Merge pull request #21337 from eileenmcnaughton/tokens

dev/core#2806 Fix accidental exposure of v4 tokens

3 years agoSearchKit - Add links to admin table and refresh after popups
Coleman Watts [Wed, 1 Sep 2021 19:41:22 +0000 (15:41 -0400)]
SearchKit - Add links to admin table and refresh after popups

3 years agoJ4 menu fixes
Nicol [Wed, 1 Sep 2021 19:15:13 +0000 (21:15 +0200)]
J4 menu fixes

Adjustments in response to changed Joomla 4 admin menu height; removal of smallest screen behaviour as no longer needed.

3 years agoJ4 release tidying
Nicol [Wed, 1 Sep 2021 19:12:11 +0000 (21:12 +0200)]
J4 release tidying

3 years agoMerge pull request #21341 from demeritcowboy/token-time
demeritcowboy [Wed, 1 Sep 2021 17:54:14 +0000 (13:54 -0400)]
Merge pull request #21341 from demeritcowboy/token-time

[NFC/Unit test] Update flaky test CRM_Utils_TokenConsistencyTest::testCaseTokenConsistency

3 years agocreated and modified are backwards
demeritcowboy [Wed, 1 Sep 2021 15:07:13 +0000 (11:07 -0400)]
created and modified are backwards

3 years agoCleanup boilerplate code in extension upgrader classes
Coleman Watts [Wed, 1 Sep 2021 14:49:25 +0000 (10:49 -0400)]
Cleanup boilerplate code in extension upgrader classes

3 years agoMerge pull request #21334 from eileenmcnaughton/pdf_tokens
demeritcowboy [Wed, 1 Sep 2021 13:25:41 +0000 (09:25 -0400)]
Merge pull request #21334 from eileenmcnaughton/pdf_tokens

[REF] dev/core#2790 deprecate preProcessSingle

3 years agoMerge pull request #21316 from colemanw/afformGet
Seamus Lee [Wed, 1 Sep 2021 09:15:07 +0000 (19:15 +1000)]
Merge pull request #21316 from colemanw/afformGet

Afform - Optimize Get by checking type

3 years agoMerge pull request #21286 from vingle/patch-13
Seamus Lee [Wed, 1 Sep 2021 09:10:38 +0000 (19:10 +1000)]
Merge pull request #21286 from vingle/patch-13

Fixes unusable modals in Joomla 4

3 years agodev/core#2806 Fix accidental exposure of v4 tokens
Eileen McNaughton [Wed, 1 Sep 2021 07:15:59 +0000 (19:15 +1200)]
dev/core#2806 Fix accidental exposure of v4 tokens

3 years agoTokenProcessor - Allow defining Smarty variables which are opulated from tokens
Tim Otten [Wed, 1 Sep 2021 04:21:41 +0000 (21:21 -0700)]
TokenProcessor - Allow defining Smarty variables which are opulated from tokens

Overview
--------

This allow more interoperability between Smarty expressions and tokens.  For
example, suppose one had a contribution-related message that could use the
Smarty variable `$theInvoiceId` and/or the token `{contribution.invoice_id}`.
This revision allows the Smarty variable to function as an alias for the token.

Before
------

The caller would need to precompute Smarty values, eg

```php
$theInvoiceId = civicrm_api4('Contribution', 'get', [
  'select' => 'invoice_id',
  'where' => [['id', '=', $contributionId]]
]);
$p = new TokenProcessor($this->dispatcher, [
  'controller' => __CLASS__,
  'schema' => ['contributionId'],
  'smarty' => TRUE,
]);
$p->addMessage('example', 'Invoice #{$theInvoiceId}!', 'text/plain');
$p->addRow(['contributionId' => 123]);
```

After
-----

The caller can declare a Smarty=>Token alias and leverage token data-loader.

```php
$p = new TokenProcessor($this->dispatcher, [
  'controller' => __CLASS__,
  'schema' => ['contributionId'],
  'smarty' => TRUE,
  'smartyTokenAlias' => [
    'theInvoiceId' => 'contribution.invoice_id',
  ],
]);
$p->addMessage('example', 'Invoice #{$theInvoiceId}!', 'text/plain');
$p->addRow(['contributionId' => 123]);
```

Comments
--------

The target token must be populated via `civi.token.eval` (e.g `$e->token('foo', 'bar', 'value')`).
This would work with `CRM_*_Tokens`.  But if the token is evaluted by other means (eg
`CRM_Utils_Token::replaceGreetingTokens()`), then it won't currently be resolved.

3 years ago[REF] dev/core#2790 deprecate preProcessSingle
Eileen McNaughton [Wed, 1 Sep 2021 03:29:48 +0000 (15:29 +1200)]
[REF] dev/core#2790 deprecate preProcessSingle

This is only called from here & is short & can just be part of the main function.

3 years ago[REF] dev/core#2790 Start migration to MessageTemplate::render
Eileen McNaughton [Wed, 1 Sep 2021 04:01:37 +0000 (16:01 +1200)]
[REF] dev/core#2790 Start migration to MessageTemplate::render

3 years agoMerge pull request #21270 from colemanw/searchKitListing
colemanw [Wed, 1 Sep 2021 00:12:10 +0000 (20:12 -0400)]
Merge pull request #21270 from colemanw/searchKitListing

SearchKit - Use a search display to display searches

3 years agoMerge pull request #21333 from colemanw/searchKitTableBug
colemanw [Wed, 1 Sep 2021 00:11:37 +0000 (20:11 -0400)]
Merge pull request #21333 from colemanw/searchKitTableBug

SearchKit - Fix pager count and add 'None Found' text in empty tables

3 years agoMerge pull request #21331 from eileenmcnaughton/pdf
demeritcowboy [Tue, 31 Aug 2021 23:54:21 +0000 (19:54 -0400)]
Merge pull request #21331 from eileenmcnaughton/pdf

[REF] dev/core#2790 move preProcess static to the trait

3 years ago[REF] dev/core#2790 move preProcess static to the trait
Eileen McNaughton [Tue, 31 Aug 2021 19:14:46 +0000 (07:14 +1200)]
[REF] dev/core#2790 move preProcess static to the trait

3 years agoMerge pull request #21305 from eileenmcnaughton/mem_pdf
demeritcowboy [Tue, 31 Aug 2021 22:01:09 +0000 (18:01 -0400)]
Merge pull request #21305 from eileenmcnaughton/mem_pdf

[REF] dev/core#2790 Deprecate CRM/Member/Form/Task/PDFLetterCommon

3 years agoSearchKit - Fix pager count and add 'None Found' text in empty tables
Coleman Watts [Tue, 31 Aug 2021 21:29:53 +0000 (17:29 -0400)]
SearchKit - Fix pager count and add 'None Found' text in empty tables

3 years agoSearchKit - Use a searchDisplay instead of ad-hoc table to display main list of saved...
Coleman Watts [Thu, 26 Aug 2021 15:29:12 +0000 (11:29 -0400)]
SearchKit - Use a searchDisplay instead of ad-hoc table to display main list of saved searches

3 years agoSearchKit - only show sortable help text for sortable columns in table display
Coleman Watts [Thu, 26 Aug 2021 14:02:51 +0000 (10:02 -0400)]
SearchKit - only show sortable help text for sortable columns in table display

3 years agoSearchKit - Add custom template column type
Coleman Watts [Thu, 26 Aug 2021 12:52:48 +0000 (08:52 -0400)]
SearchKit - Add custom template column type

3 years agoMerge pull request #21332 from civicrm/5.41
Eileen McNaughton [Tue, 31 Aug 2021 19:21:31 +0000 (07:21 +1200)]
Merge pull request #21332 from civicrm/5.41

5.41 to master

3 years agoMerge pull request #21330 from demeritcowboy/contrib-token-warning
Eileen McNaughton [Tue, 31 Aug 2021 19:00:46 +0000 (07:00 +1200)]
Merge pull request #21330 from demeritcowboy/contrib-token-warning

dev/core#2807 - Contribution thank-you letters give Undefined index: contribution when you don't use any contribution tokens

3 years agoput loop back inside the if
demeritcowboy [Tue, 31 Aug 2021 14:47:43 +0000 (10:47 -0400)]
put loop back inside the if

3 years agoMerge pull request #21310 from eileenmcnaughton/prepro
demeritcowboy [Tue, 31 Aug 2021 13:03:09 +0000 (09:03 -0400)]
Merge pull request #21310 from eileenmcnaughton/prepro

[REF] dev/core#2790 Pre process cleanup on pdf tasks

3 years agoMerge pull request #21276 from eileenmcnaughton/pdf
demeritcowboy [Tue, 31 Aug 2021 13:02:55 +0000 (09:02 -0400)]
Merge pull request #21276 from eileenmcnaughton/pdf

[REF] dev/core#2790 towards pdf task trait

3 years agoMerge pull request #21254 from colemanw/afformLocationType
Seamus Lee [Tue, 31 Aug 2021 08:26:52 +0000 (18:26 +1000)]
Merge pull request #21254 from colemanw/afformLocationType

Afform - selectable location type for address, email, etc

3 years agoMerge pull request #21320 from colemanw/searchKitRun
Eileen McNaughton [Tue, 31 Aug 2021 05:26:14 +0000 (17:26 +1200)]
Merge pull request #21320 from colemanw/searchKitRun

 dev/core#2732 SearchKit - Move field formatting from client-side to server-side

3 years agoMerge pull request #21256 from demeritcowboy/support-link
Eileen McNaughton [Tue, 31 Aug 2021 04:47:58 +0000 (16:47 +1200)]
Merge pull request #21256 from demeritcowboy/support-link

Fix support link just added in oauth-client extension info.xml

3 years ago[REF] Pre process cleanup
Eileen McNaughton [Sun, 29 Aug 2021 23:14:27 +0000 (11:14 +1200)]
[REF] Pre process cleanup

3 years ago[REF] dev/core#2790 towards pdf task trait
Eileen McNaughton [Fri, 27 Aug 2021 02:29:55 +0000 (14:29 +1200)]
[REF] dev/core#2790 towards pdf task trait

Deprecate CRM_Activity_Form_Task_PDFLetterCommon

This gets us to having 2 classes rather than 3 that manage the activityPDF task
functionality.

CRM_Activity_Form_Task_PDFLetterCommon doesn't really add anything from a structure POV
but it does make it more confusing. There are also functions on the parent
that are only used by this class - which makes switching to a trait
harder. This untangles that part.

Note that once we have the trait (& some more token cleanup done) we will be well placed
to re-share some of these functions again