Eileen McNaughton [Thu, 7 Oct 2021 19:30:47 +0000 (08:30 +1300)]
Reference token metadata internally
This references the token metadata rather than the metadata retrieved from the api
call. Since the former is cached it should save a look up -
albeit not when prefetch is happening, at this stage
Eileen McNaughton [Thu, 7 Oct 2021 19:04:18 +0000 (08:04 +1300)]
Merge pull request #21765 from colemanw/arrayShapes
[NFC] Afform - Add array shape annotations to FormDataModel
Coleman Watts [Thu, 7 Oct 2021 17:22:06 +0000 (13:22 -0400)]
Afform - Add array shape annotations to FormDataModel
colemanw [Thu, 7 Oct 2021 17:19:44 +0000 (13:19 -0400)]
Merge pull request #21759 from colemanw/afformApiFixes
Afform - Fix chainSelect to work with anonymous users
colemanw [Thu, 7 Oct 2021 16:33:58 +0000 (12:33 -0400)]
Merge pull request #21705 from eileenmcnaughton/prefix
dev/core#2650 switch contact.individual_prefix tokens to contact.prefix_id:label (former still works)
colemanw [Thu, 7 Oct 2021 16:19:56 +0000 (12:19 -0400)]
Merge pull request #21745 from eileenmcnaughton/e_build
Support participant & membership tokens in send-email tasks
Yashodha Chaku [Thu, 7 Oct 2021 15:55:15 +0000 (21:25 +0530)]
Merge pull request #21758 from eileenmcnaughton/contactv4
Remove function duplicated in error
colemanw [Thu, 7 Oct 2021 14:14:37 +0000 (10:14 -0400)]
Merge pull request #21760 from eileenmcnaughton/pseudo
Remove now-obsolete getPseudoTokens
Coleman Watts [Thu, 7 Oct 2021 04:24:07 +0000 (00:24 -0400)]
Afform - Fix chainSelect to work with anonymous users
Eileen McNaughton [Thu, 7 Oct 2021 11:40:22 +0000 (00:40 +1300)]
Remove static caching in deprecated function that seems to break tests
Eileen McNaughton [Thu, 7 Oct 2021 11:38:24 +0000 (00:38 +1300)]
Merge pull request #21646 from MegaphoneJon/core-2874
fixes core#2874 - Search Builder on State/Province with Primary and IN
Eileen McNaughton [Thu, 7 Oct 2021 04:38:32 +0000 (17:38 +1300)]
Remove now-obsolete getPseudoTokens
This is now only called from legacy code. The buildContributionArray path
is still a little used :-( but is tested
from CRM_Contribute_Form_Task_PDFLetterCommonTest
and hard-coding the array now it is settled is appropriate
to that code path's life expectancy
This code is no longer used in the Tokens classes and the functions that used it
from outside of there are now 'settled into their final state & waiting to die'
so a hard-coded list will see out their lives. They are marked now as deprecated
Eileen McNaughton [Thu, 7 Oct 2021 02:06:59 +0000 (15:06 +1300)]
Clean up tests to call full postProcess for tasks
Coleman Watts [Wed, 6 Oct 2021 21:26:41 +0000 (17:26 -0400)]
Afform - Rename submitFile param from entityName to modelName
$entityName is already a private property of APIv4 and has its own getter
which conflicted with a getter for a param named $entityName.
Better to just rename it.
Eileen McNaughton [Thu, 7 Oct 2021 04:11:59 +0000 (17:11 +1300)]
Remove function duplicated in error
This function lives on & is called on the
Eileen McNaughton [Wed, 6 Oct 2021 11:01:03 +0000 (00:01 +1300)]
Add token support for participant & membership tasks
Eileen McNaughton [Wed, 6 Oct 2021 09:22:30 +0000 (22:22 +1300)]
Adjust getRows result to have schema as a key
It becomes too complex to handle in email trait otherwise
Eileen McNaughton [Wed, 6 Oct 2021 04:28:17 +0000 (17:28 +1300)]
Move crazy submit pre-processing out of buildForm
Eileen McNaughton [Wed, 6 Oct 2021 08:01:40 +0000 (21:01 +1300)]
Simplify getSubject
colemanw [Thu, 7 Oct 2021 00:38:21 +0000 (20:38 -0400)]
Merge pull request #21706 from eileenmcnaughton/token_metadata
Tokens - Hide more sophisticated tokens. Refactor to use "$this->tokenMetadata".
Seamus Lee [Wed, 6 Oct 2021 23:40:16 +0000 (10:40 +1100)]
Merge pull request #21755 from civicrm/5.42
5.42
Seamus Lee [Wed, 6 Oct 2021 23:38:10 +0000 (10:38 +1100)]
Merge pull request #21754 from agh1/5.42.0-releasenotes-final
5.42.0 release notes final updates
Andie Hunt [Wed, 6 Oct 2021 23:35:14 +0000 (19:35 -0400)]
5.42.0 release notes: added late changes
Tim Otten [Sat, 25 Sep 2021 06:14:43 +0000 (23:14 -0700)]
Add release-notes/5.41.2.md
Tim Otten [Fri, 17 Sep 2021 20:23:58 +0000 (13:23 -0700)]
Add release-notes/5.41.1.md
Eileen McNaughton [Wed, 6 Oct 2021 22:38:42 +0000 (11:38 +1300)]
Merge pull request #21753 from civicrm/5.42
Merge 5.42 to master
Tim Otten [Wed, 6 Oct 2021 22:29:50 +0000 (15:29 -0700)]
Merge pull request #21722 from colemanw/crmIconButton
Angular UI - Fix crmIcon to only add crm-button class to non-bootstrap buttons
colemanw [Wed, 6 Oct 2021 20:52:35 +0000 (16:52 -0400)]
Merge pull request #21740 from eileenmcnaughton/ev_cache
Flush metadata cache on event edit
colemanw [Wed, 6 Oct 2021 20:50:26 +0000 (16:50 -0400)]
Merge pull request #21743 from eileenmcnaughton/regress
Fix regression from enotice fixes
Eileen McNaughton [Wed, 6 Oct 2021 20:33:24 +0000 (09:33 +1300)]
Merge pull request #21747 from totten/master-preview
(dev/mail#83) message_admin - Multiple improvements to the "Preview" dialog
colemanw [Wed, 6 Oct 2021 20:17:29 +0000 (16:17 -0400)]
Merge pull request #21731 from eileenmcnaughton/linerc
Call line item pre hook after tax amount is calculated
Eileen McNaughton [Wed, 6 Oct 2021 20:14:29 +0000 (09:14 +1300)]
Merge pull request #21750 from colemanw/afformHoverFix
Afform - ensure dragging classes are removed when not sorting
Seamus Lee [Wed, 6 Oct 2021 19:58:04 +0000 (06:58 +1100)]
Merge pull request #21752 from colemanw/searchKitPermissionFix
SearchKit - Fix anonymous access to running search displays
colemanw [Wed, 6 Oct 2021 19:38:02 +0000 (15:38 -0400)]
Merge pull request #21716 from jaapjansma/issue_2885
Fix for dev/core#2885
colemanw [Wed, 6 Oct 2021 19:12:38 +0000 (15:12 -0400)]
Merge pull request #21748 from mattwire/statusmorethan25
System status checks only shows 25 messages
colemanw [Wed, 6 Oct 2021 19:03:40 +0000 (15:03 -0400)]
Merge pull request #21676 from eileenmcnaughton/mail
dev/core#2866 Ignore preferred mail format - send to both
colemanw [Wed, 6 Oct 2021 18:56:46 +0000 (14:56 -0400)]
Merge pull request #21749 from colemanw/afformChainSelect
Afform - Fix chain-select of contry and address to work on SearchKit forms
Coleman Watts [Wed, 6 Oct 2021 18:20:09 +0000 (14:20 -0400)]
SearchKit - Fix anonymous access to running search displays
This is the same fix as used by afform_civicrm_alterApiRoutePermissions()
to remove the barrier to entry for anonymous users.
Coleman Watts [Wed, 6 Oct 2021 17:42:27 +0000 (13:42 -0400)]
Afform - ensure dragging classes are removed when not sorting
Coleman Watts [Wed, 6 Oct 2021 15:49:46 +0000 (11:49 -0400)]
Afform - Fix chain-select of contry and address to work on SearchKit forms
Multiple fixes to the chainSelect mechanics
- Provides visual feedback when reloading options
- Works with defalut values from url args
- Works with multi-valued fields
- Works with searchKit joins
Jaap Jansma [Mon, 4 Oct 2021 11:21:45 +0000 (13:21 +0200)]
Fix for dev/core#2885
Added test
Added test
Matthew Wire [Wed, 6 Oct 2021 13:38:47 +0000 (14:38 +0100)]
Allow for more than 25 system status checks to be loaded
Tim Otten [Wed, 6 Oct 2021 10:13:37 +0000 (03:13 -0700)]
Merge pull request #21599 from eileenmcnaughton/format
(dev/core#2638) Civi::format() - Add helper for formatting
Tim Otten [Wed, 6 Oct 2021 07:26:58 +0000 (00:26 -0700)]
message_admin (Preview) - Fix loop-around on "<<Previous" button
Before: If you open the new "Preview" pane and press the "<<Previous"
button, it loops to invalid position `-1`.
After: Loop-around works in both directions.
Tim Otten [Wed, 6 Oct 2021 07:24:38 +0000 (00:24 -0700)]
message_admin (Preview) - Add more tooltips to "Preview" dialog
Tim Otten [Tue, 5 Oct 2021 22:40:24 +0000 (15:40 -0700)]
message_admin (Preview) - Add drill-down for example data
Eileen McNaughton [Wed, 6 Oct 2021 06:20:49 +0000 (19:20 +1300)]
Merge pull request #21744 from civicrm/5.42
5.42 to master
Eileen McNaughton [Wed, 6 Oct 2021 06:20:02 +0000 (19:20 +1300)]
Merge pull request #21730 from alifrumin/rn5.42
[NFC] 5.42 First Pass at Release Notes
Eileen McNaughton [Wed, 6 Oct 2021 06:08:51 +0000 (19:08 +1300)]
Fix regression from enotice fixes
Eileen McNaughton [Wed, 6 Oct 2021 05:46:33 +0000 (18:46 +1300)]
Merge pull request #21735 from colemanw/tplFix
Fix possibly unefined $form variables in smarty templates
Eileen McNaughton [Wed, 6 Oct 2021 05:37:22 +0000 (18:37 +1300)]
Merge pull request #21738 from agileware/ISSUE-2892
#2892 Replace event type token in action schedule changes event.event_type_id to participant.event_type_id:label. But should be event.event_type_id to event.event_type_id:label
Eileen McNaughton [Wed, 6 Oct 2021 05:17:37 +0000 (18:17 +1300)]
Merge pull request #21737 from demeritcowboy/standalone-case-email
For latest iteration of case email form, don't fail when there's no To contact
Eileen McNaughton [Wed, 6 Oct 2021 05:16:57 +0000 (18:16 +1300)]
Merge pull request #21739 from agileware/DUPLICATE-FEE-AMOUNT
Removes duplicate replace on event fee amount.
Eileen McNaughton [Wed, 6 Oct 2021 03:42:21 +0000 (16:42 +1300)]
Flush metadata cache on event edit
Justin Freeman [Wed, 6 Oct 2021 03:14:17 +0000 (14:14 +1100)]
Removes duplicate replace on event fee amount.
Justin Freeman [Wed, 6 Oct 2021 03:10:18 +0000 (14:10 +1100)]
#2892 Replace event type token in action schedule changes event.event_type_id to participant.event_type_id:label. But should be event.event_type_id to event.event_type_id:label
demeritcowboy [Wed, 6 Oct 2021 02:42:38 +0000 (22:42 -0400)]
don't fail on empty array
Eileen McNaughton [Wed, 6 Oct 2021 01:06:24 +0000 (14:06 +1300)]
Merge pull request #21736 from civicrm/5.42
5.42 to master
Eileen McNaughton [Wed, 6 Oct 2021 01:06:03 +0000 (14:06 +1300)]
Merge pull request #21734 from demeritcowboy/21729-542
dev/financial#181 - backport 21729
Eileen McNaughton [Wed, 6 Oct 2021 01:05:15 +0000 (14:05 +1300)]
Merge pull request #21688 from eileenmcnaughton/case3
Use Case form for case email action
Coleman Watts [Tue, 5 Oct 2021 23:47:29 +0000 (19:47 -0400)]
Fix possibly unefined $form variables in smarty templates
Referencing a property of the $form in smarty is almost always going to be undefined
if it hasn't been set on the form, so this fixes a bad pattern of not using empty()
to guard against e-notices.
Eileen McNaughton [Tue, 5 Oct 2021 23:19:23 +0000 (12:19 +1300)]
Merge pull request #21732 from eileenmcnaughton/notice
Enotice fix
demeritcowboy [Tue, 5 Oct 2021 22:59:55 +0000 (18:59 -0400)]
backport 21729
Tim Otten [Tue, 5 Oct 2021 21:20:15 +0000 (14:20 -0700)]
RecurringEdit - Split examples
Coleman Watts [Tue, 5 Oct 2021 20:20:37 +0000 (16:20 -0400)]
AfformAdmin - fix loading joined block contend (Email, Address, Phone, etc) in GUI editor
Eileen McNaughton [Sun, 3 Oct 2021 02:23:15 +0000 (15:23 +1300)]
Split mechanism to derive token metadata from display
Eileen McNaughton [Tue, 5 Oct 2021 19:29:57 +0000 (08:29 +1300)]
Update tests/phpunit/Civi/Core/FormatTest.php
Co-authored-by: Tim Otten <totten@civicrm.org>
Eileen McNaughton [Tue, 5 Oct 2021 19:18:16 +0000 (08:18 +1300)]
Enotice fix
Eileen McNaughton [Tue, 5 Oct 2021 19:01:28 +0000 (08:01 +1300)]
Merge pull request #21724 from colemanw/fixSeed
Fixes dev/core#2888 SearchKit download CSV broken
Eileen McNaughton [Tue, 5 Oct 2021 18:58:22 +0000 (07:58 +1300)]
Merge pull request #21725 from demeritcowboy/maxfilesize2
[NFC] Unit test fixes for the problem of quickform rules going missing
Eileen McNaughton [Tue, 5 Oct 2021 18:52:17 +0000 (07:52 +1300)]
Call line item pre hook after tax amount is set
colemanw [Tue, 5 Oct 2021 18:51:04 +0000 (14:51 -0400)]
Merge pull request #21723 from eileenmcnaughton/not
Enotice fixes
colemanw [Tue, 5 Oct 2021 18:50:33 +0000 (14:50 -0400)]
Merge pull request #21729 from MegaphoneJon/financial-181-rc
fixes financial#181 - don't crash when displaying recurring contributions whose 'template' has no line items
Eileen McNaughton [Tue, 5 Oct 2021 18:44:13 +0000 (07:44 +1300)]
Merge pull request #21726 from colemanw/searchKitButtons
SearchKit - tweak button styles for shorditch
Eileen McNaughton [Tue, 5 Oct 2021 18:43:34 +0000 (07:43 +1300)]
Merge pull request #21728 from yashodha/core_2766
(dev/core#2766) provide way to distinguish the core and custom fields…
colemanw [Tue, 5 Oct 2021 18:09:49 +0000 (14:09 -0400)]
Merge pull request #21727 from colemanw/refApi
REF - Remove non-functional code from APIv3
Alice Frumin [Tue, 28 Sep 2021 17:33:33 +0000 (13:33 -0400)]
[NFC] First Pass at 5.42 release notes
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
yashodha [Tue, 5 Oct 2021 16:21:59 +0000 (21:51 +0530)]
(dev/core#2766) provide way to distinguish the core and custom fields on Find and Merge Duplicate Contacts page
colemanw [Tue, 5 Oct 2021 15:22:26 +0000 (11:22 -0400)]
Merge pull request #21695 from eileenmcnaughton/submit
Add participant tokens to pdf task
Coleman Watts [Tue, 5 Oct 2021 14:48:26 +0000 (10:48 -0400)]
REF - Remove non-functional code from APIv3
Coleman Watts [Tue, 5 Oct 2021 14:41:00 +0000 (10:41 -0400)]
SearchKit - Consistently use one-time binding with ts()
Coleman Watts [Tue, 5 Oct 2021 14:33:12 +0000 (10:33 -0400)]
SearchKit - tweak button styles for shorditch
demeritcowboy [Mon, 4 Oct 2021 22:42:55 +0000 (18:42 -0400)]
more global fix
Coleman Watts [Tue, 5 Oct 2021 13:49:55 +0000 (09:49 -0400)]
Fixes dev/core#2888 SearchKit download CSV broken
Eileen McNaughton [Tue, 5 Oct 2021 10:15:15 +0000 (23:15 +1300)]
Fix null token render bug
Eileen McNaughton [Fri, 1 Oct 2021 21:09:21 +0000 (10:09 +1300)]
Add participant tokens to pdf letter task
Eileen McNaughton [Mon, 4 Oct 2021 20:23:26 +0000 (09:23 +1300)]
Add money format functions
Civi::format()->money();
Civi::format()->number();
Civi::format()->moneyNumber();
Civi::format()->moneyLong();
Eileen McNaughton [Fri, 1 Oct 2021 23:05:37 +0000 (12:05 +1300)]
Standardise listTokens in email & pdf
This simplifies the code to 'listtokens' across most of the pdf & email classes.
The case tokens are a bit of a hold out as ideally we would have
one function on CRM_Case_Form_Task which email & pdf would use
but we are still getting to that point - see
https://github.com/civicrm/civicrm-core/pull/21688
Eileen McNaughton [Tue, 5 Oct 2021 06:02:57 +0000 (19:02 +1300)]
Enotice fixes
Eileen McNaughton [Tue, 5 Oct 2021 01:42:17 +0000 (14:42 +1300)]
Merge pull request #21645 from colemanw/displayName
Afform - Use search display name as field prefix for url-based field defaults
colemanw [Tue, 5 Oct 2021 01:25:23 +0000 (21:25 -0400)]
Merge pull request #21713 from eileenmcnaughton/meta_lite
Towards full metadata - fully declare 'bespoke' tokens
Coleman Watts [Tue, 5 Oct 2021 01:04:01 +0000 (21:04 -0400)]
Angular UI - Fix crmIcon to only add crm-button class to non-bootstrap buttons
Eileen McNaughton [Mon, 4 Oct 2021 22:49:34 +0000 (11:49 +1300)]
Merge pull request #21720 from colemanw/fixSort
SearchKit - Sortable column fixes/improvements
Eileen McNaughton [Mon, 4 Oct 2021 22:06:02 +0000 (11:06 +1300)]
Merge pull request #21714 from demeritcowboy/email-count
Error about count() on New Email
Coleman Watts [Mon, 4 Oct 2021 18:05:26 +0000 (14:05 -0400)]
SearchKit - Sortable column fixes/improvements
Fix sortable column headers on SearchKit admin tables
Make click-sortable column headers configurable
demeritcowboy [Sun, 3 Oct 2021 22:37:45 +0000 (18:37 -0400)]
array is expected
Eileen McNaughton [Mon, 4 Oct 2021 18:23:15 +0000 (07:23 +1300)]
Merge pull request #21718 from colemanw/age_years
APIv4 - Add Contact.age_years extra field to make age calculations easy
Coleman Watts [Mon, 4 Oct 2021 16:16:09 +0000 (12:16 -0400)]
APIv4 - Add Contact.age_years extra field to make age calculations easy
Makes it simple to return or filter on a contact's age
Eileen McNaughton [Mon, 4 Oct 2021 07:07:14 +0000 (20:07 +1300)]
Merge pull request #21715 from totten/master-no-test
flexmailer - Update `[CiviMail Draft]` prefix to match BAO behavior