Jon Goldberg [Mon, 4 Oct 2021 18:12:59 +0000 (14:12 -0400)]
fixes financial#181 - don't crash when displaying recurring contributions whose 'template' has no line items
Eileen McNaughton [Wed, 29 Sep 2021 11:20:39 +0000 (00:20 +1300)]
Merge pull request #21664 from jitendrapurohit/end_event-542
Fix missing value of End Adjustment column from Membership status page
jitendrapurohit [Wed, 29 Sep 2021 08:50:10 +0000 (14:20 +0530)]
fix end_event_adjust key
Seamus Lee [Sat, 25 Sep 2021 02:50:50 +0000 (12:50 +1000)]
Merge pull request #21601 from eileenmcnaughton/542
dev/core#2861 Saved search loading fix
Eileen McNaughton [Fri, 24 Sep 2021 19:35:30 +0000 (07:35 +1200)]
dev/core#2861 Saved search loading fix
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
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
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
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
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 …
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 [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
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 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 00:33:28 +0000 (20:33 -0400)]
Fixes dev/core#2840 bug in recent items sidebar/menu
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
Coleman Watts [Wed, 15 Sep 2021 22:04:24 +0000 (18:04 -0400)]
SearchKit - Fix search display pager when using default pager settings
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
Coleman Watts [Sun, 12 Sep 2021 21:22:01 +0000 (17:22 -0400)]
SearchKit - Fix deleting search displays
colemanw [Thu, 9 Sep 2021 13:07:17 +0000 (09:07 -0400)]
Merge pull request #21411 from colemanw/fixSearchKitAugmentSelectClause
SearchKit - Fix aggregated joins
Coleman Watts [Wed, 8 Sep 2021 21:16:58 +0000 (17:16 -0400)]
SearchKit - Exclude links from aggregated joins
Coleman Watts [Wed, 8 Sep 2021 18:47:40 +0000 (14:47 -0400)]
SearchKit - Partial backport of 4afe3e
Seamus Lee [Thu, 2 Sep 2021 07:31:41 +0000 (17:31 +1000)]
dev/core#2812 Fix issue where having a processor configured with a search output casues WSOD not allowing for access to upgrade screen
CiviCRM [Thu, 2 Sep 2021 03:26:10 +0000 (03:26 +0000)]
Set version to 5.42.beta1
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
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
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
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
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
Coleman Watts [Tue, 31 Aug 2021 12:57:22 +0000 (08:57 -0400)]
SearchKit - Add download CSV action
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…
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
Seamus Lee [Thu, 2 Sep 2021 00:16:26 +0000 (00:16 +0000)]
[NFC] Fix E-notice in Afform unit tests
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
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"
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
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
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
Coleman Watts [Wed, 1 Sep 2021 19:41:22 +0000 (15:41 -0400)]
SearchKit - Add links to admin table and refresh after popups
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.
Nicol [Wed, 1 Sep 2021 19:12:11 +0000 (21:12 +0200)]
J4 release tidying
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
demeritcowboy [Wed, 1 Sep 2021 15:07:13 +0000 (11:07 -0400)]
created and modified are backwards
Coleman Watts [Wed, 1 Sep 2021 14:49:25 +0000 (10:49 -0400)]
Cleanup boilerplate code in extension upgrader classes
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
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
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
Eileen McNaughton [Wed, 1 Sep 2021 07:15:59 +0000 (19:15 +1200)]
dev/core#2806 Fix accidental exposure of v4 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.
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.
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
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
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
Eileen McNaughton [Tue, 31 Aug 2021 19:14:46 +0000 (07:14 +1200)]
[REF] dev/core#2790 move preProcess static to the trait
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
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
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
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
Coleman Watts [Thu, 26 Aug 2021 12:52:48 +0000 (08:52 -0400)]
SearchKit - Add custom template column type
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
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
demeritcowboy [Tue, 31 Aug 2021 14:47:43 +0000 (10:47 -0400)]
put loop back inside the if
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
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
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
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
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
Eileen McNaughton [Sun, 29 Aug 2021 23:14:27 +0000 (11:14 +1200)]
[REF] Pre process cleanup
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
Seamus Lee [Tue, 31 Aug 2021 01:15:01 +0000 (11:15 +1000)]
Merge pull request #21325 from eileenmcnaughton/build
Remove extraneous buildQuickForm
Eileen McNaughton [Tue, 31 Aug 2021 00:39:08 +0000 (12:39 +1200)]
Merge pull request #21324 from seamuslee001/fix_php8_testing
[NFC] Fix UpdateSubscriptionTest on php8 by creating a Payment Processor
Eileen McNaughton [Mon, 30 Aug 2021 23:06:49 +0000 (11:06 +1200)]
Remove extraneous buildQuickForm
demeritcowboy [Mon, 30 Aug 2021 22:33:59 +0000 (18:33 -0400)]
Merge pull request #21297 from eileenmcnaughton/pdftrait
[REF] dev/core#2790 move buildForm to pdfTrait
Seamus Lee [Mon, 30 Aug 2021 22:28:54 +0000 (08:28 +1000)]
[NFC] Fix UpdateSubscriptionTest on php8 by creating a Payment Processor
Eileen McNaughton [Mon, 30 Aug 2021 21:52:57 +0000 (09:52 +1200)]
Merge pull request #21323 from civicrm/5.41
5.41 to master
Eileen McNaughton [Mon, 30 Aug 2021 21:52:30 +0000 (09:52 +1200)]
Merge pull request #21322 from alifrumin/rn5.41
[NFC] 5.41 Release Notes - First pass
colemanw [Mon, 30 Aug 2021 20:02:39 +0000 (16:02 -0400)]
Merge pull request #21177 from colemanw/rand
SearchKit - Allow random sorting (Fixes dev/report#75)
Eileen McNaughton [Mon, 30 Aug 2021 19:40:59 +0000 (07:40 +1200)]
Merge pull request #21321 from colemanw/basicCriteria
[REF] Fix undefined smarty vars in Advanced Search
Alice Frumin [Mon, 16 Aug 2021 15:10:13 +0000 (11:10 -0400)]
release notes 5.41 - first pass
Coleman Watts [Mon, 30 Aug 2021 15:39:02 +0000 (11:39 -0400)]
SearchKit - Move field formatting from client-side to server-side
Formattig field values server-side allows the view values to be reused in exports.
It also opens the door for more complex formatting to happen on the server, if needed.
Coleman Watts [Sat, 28 Aug 2021 19:16:34 +0000 (15:16 -0400)]
SearchKit - Break part of Run action into a base class
Coleman Watts [Mon, 30 Aug 2021 17:24:13 +0000 (13:24 -0400)]
Fix undefined smarty vars in Advanced Search
colemanw [Mon, 30 Aug 2021 17:19:24 +0000 (13:19 -0400)]
Merge pull request #21317 from michaelmcandrew/dev-core-2797
better target multivalue checkbox and multiselect import validation
Michael McAndrew [Mon, 30 Aug 2021 14:59:30 +0000 (15:59 +0100)]
better target multivalue checkbox and multiselect import validation
Coleman Watts [Mon, 30 Aug 2021 12:31:11 +0000 (08:31 -0400)]
Afform - Optimize Get by checking type before parsing html or loading custom data
Sometimes afforms are fetched by type, e.g. `cv api4 Afform.get +w type=search`
Previously this would load all html files and custom data groups before
discarding the ones not of type search.
Now it will skip irrelevant files.
colemanw [Mon, 30 Aug 2021 11:55:16 +0000 (07:55 -0400)]
Merge pull request #21120 from eileenmcnaughton/acl_setting
Move financial acl setting to the extension
colemanw [Mon, 30 Aug 2021 11:45:45 +0000 (07:45 -0400)]
Merge pull request #21315 from
deb1990/fix-searchkit-add-button-ui
Fix Searchkit "Add" columns button UI
Eileen McNaughton [Mon, 30 Aug 2021 09:40:07 +0000 (21:40 +1200)]
Merge pull request #21314 from seamuslee001/fix_php8_testing
[NFC] Fix undefined array key when running CRM unit test suite in php8
Debarshi Bhaumik [Mon, 30 Aug 2021 08:11:26 +0000 (09:11 +0100)]
Fix searchkit add button ui
Seamus Lee [Mon, 30 Aug 2021 07:30:36 +0000 (17:30 +1000)]
[NFC] Fix undefined array key when running CRM unit test suite in php8
Seamus Lee [Mon, 30 Aug 2021 05:01:13 +0000 (15:01 +1000)]
Merge pull request #21313 from seamuslee001/address_custom_data
[REF] Improve Custom data insert performance when using the copyCusto…
Eileen McNaughton [Mon, 30 Aug 2021 04:39:04 +0000 (16:39 +1200)]
Merge pull request #21312 from colemanw/entityOptions
SavedSearch - Add pseudoconstant for api_entity field
Seamus Lee [Mon, 30 Aug 2021 03:01:02 +0000 (13:01 +1000)]
Fix Address test failure by passing the hook through to copyCustomFields and fix Contribution Recur test failures by doing some cleanup
Seamus Lee [Mon, 30 Aug 2021 01:44:04 +0000 (11:44 +1000)]
Merge pull request #21241 from eileenmcnaughton/entity_batch
dev/core#2682 Entity batch declare option group for pseudoconstant
Seamus Lee [Mon, 30 Aug 2021 01:07:12 +0000 (11:07 +1000)]
[REF] Improve Custom data insert performance when using the copyCustomFields
Coleman Watts [Mon, 30 Aug 2021 00:25:39 +0000 (20:25 -0400)]
APIv4 - Add caching in Entity.get to avoid repeated file scanning