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
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 [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 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
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
Tim Otten [Sun, 3 Oct 2021 23:11:33 +0000 (16:11 -0700)]
MailingPreview - We don't need the `[CiviMail Draft]` prefix for in-browser previews
Tim Otten [Sun, 3 Oct 2021 23:05:24 +0000 (16:05 -0700)]
flexmailer - Preview jobs are strictly unsaved
Eileen McNaughton [Mon, 4 Oct 2021 01:21:15 +0000 (14:21 +1300)]
Merge pull request #21712 from colemanw/workflowMarkupFixe
message_admin Style fixes
Coleman Watts [Sun, 3 Oct 2021 20:26:51 +0000 (16:26 -0400)]
message_admin Style fixes
Eileen McNaughton [Sun, 3 Oct 2021 22:27:43 +0000 (11:27 +1300)]
Merge pull request #21711 from eileenmcnaughton/ts
Add missing ts
Eileen McNaughton [Sun, 3 Oct 2021 21:11:21 +0000 (10:11 +1300)]
Towards full metadata - fully declare 'bespoke'
demeritcowboy [Sun, 3 Oct 2021 20:56:36 +0000 (16:56 -0400)]
Merge pull request #21708 from eileenmcnaughton/test_clean
Improve test readability, use schema labels for membership tokens
Eileen McNaughton [Sun, 3 Oct 2021 20:20:29 +0000 (09:20 +1300)]
Add missing ts
This list was hard-coded recently & the ts got missed
colemanw [Sun, 3 Oct 2021 19:18:14 +0000 (15:18 -0400)]
Merge pull request #21700 from totten/master-msgadm-draft
message_admin - Fix quirk when using "Create Draft"
colemanw [Sun, 3 Oct 2021 17:50:07 +0000 (13:50 -0400)]
Merge pull request #21675 from colemanw/commentCleanup
NFC - Update code comments
colemanw [Sun, 3 Oct 2021 17:48:02 +0000 (13:48 -0400)]
Merge pull request #21689 from eileenmcnaughton/not_another
Enotice tpl fix
colemanw [Sun, 3 Oct 2021 17:47:13 +0000 (13:47 -0400)]
Merge pull request #21681 from MegaphoneJon/core-2881
fixes core#2881 - APIv3 replace only replaces the first 25 records
colemanw [Sun, 3 Oct 2021 17:43:36 +0000 (13:43 -0400)]
Merge pull request #21693 from eileenmcnaughton/object
Function cleanup following move to non-static function
Coleman Watts [Mon, 27 Sep 2021 17:42:57 +0000 (13:42 -0400)]
Afform - Set default values from URL with or without field prefix
For input forms, either of these will work:
#?first_name=Bob
#?Individual1.first_name=Bob
For search forms, the display name is used as the field prefix (and range values are separated with a dash). Either of these will work:
#?total_amount=500-1000
#?MySearchDisplay.total_amount=500-1000
Note that this assumes the main search entity is Contribution. For joins, the name of the join is required e.g. #?Contribution_Contact.first_name=Bob
demeritcowboy [Sun, 3 Oct 2021 17:02:59 +0000 (13:02 -0400)]
Merge pull request #21702 from eileenmcnaughton/notice
enotice fix
Eileen McNaughton [Sun, 3 Oct 2021 01:54:15 +0000 (14:54 +1300)]
Improve test readability
Eileen McNaughton [Sat, 2 Oct 2021 07:01:54 +0000 (20:01 +1300)]
Merge pull request #21691 from colemanw/sqlExprTitles
APIv4 - Give every SQL expression a title
Eileen McNaughton [Sat, 2 Oct 2021 04:00:46 +0000 (17:00 +1300)]
enotice fix
Tim Otten [Sat, 2 Oct 2021 02:18:00 +0000 (19:18 -0700)]
crmMsgadmEditContent - Extract parameter 'msgtpl'. Fix "Create Draft" quirk.
Tim Otten [Sat, 2 Oct 2021 02:13:46 +0000 (19:13 -0700)]
(REF) crmMsgadmEditContent - Extract parameter 'disabled'
Tim Otten [Sat, 2 Oct 2021 02:09:37 +0000 (19:09 -0700)]
(REF) crmMsgadmEditContent - Extract parameter 'token-list'
Tim Otten [Sat, 2 Oct 2021 02:07:31 +0000 (19:07 -0700)]
(REF) crmMsgadmEditContent - Use ng-disabled. Be more responsive to toggling the disabled property.
Tim Otten [Sat, 2 Oct 2021 02:03:48 +0000 (19:03 -0700)]
crmMonaco - Optionally listen to `ng-disabled` attribute
Eileen McNaughton [Sat, 2 Oct 2021 02:35:08 +0000 (15:35 +1300)]
Merge pull request #21698 from totten/master-msgadm-title
message_admin - Add titles/hints to hyperlinks
colemanw [Sat, 2 Oct 2021 02:19:30 +0000 (22:19 -0400)]
Merge pull request #21666 from eileenmcnaughton/ev
dev/core#348 Participant tokens on scheduled reminders
Eileen McNaughton [Sat, 2 Oct 2021 02:19:04 +0000 (15:19 +1300)]
Merge pull request #21694 from totten/master-msgtpl-wfnull
MessageTemplate API - Fix saving of templates with workflow_name sans workflow_id
Tim Otten [Sat, 2 Oct 2021 00:07:14 +0000 (17:07 -0700)]
message_admin - Add titles/hints to hyperlinks
Tim Otten [Fri, 1 Oct 2021 21:56:26 +0000 (14:56 -0700)]
MessageTemplate API - Fix saving of templates with workflow_name sans workflow_id
Overview
--------
This fixes a bug when saving (updating) a `MessageTemplate` record that
involves a `workflow_name` and no `workflow_id`. It is an alternative to #21674.
Steps to reproduce
-------------------
Suppose you read a MessagTemplate with values:
```php
$values = ['workflow_name' => 'foo', 'workflow_id' => NULL, ...]
```
Then you save it back:
```php
civicrm_api4('MessageTemplate', 'update', [
'values' => $values
]);
```
Before
------
The `update` raises an exception.
After
-----
The `update` works.
Eileen McNaughton [Fri, 1 Oct 2021 21:13:25 +0000 (10:13 +1300)]
Function cleanup following move to non-static function
colemanw [Fri, 1 Oct 2021 17:33:01 +0000 (13:33 -0400)]
Merge pull request #21668 from eileenmcnaughton/submit
[REF] Use getSubmittedValue rather than passed values
colemanw [Fri, 1 Oct 2021 17:21:52 +0000 (13:21 -0400)]
Merge pull request #21682 from eileenmcnaughton/notice
Another enotice fix
colemanw [Fri, 1 Oct 2021 16:40:23 +0000 (12:40 -0400)]
Merge pull request #21683 from eileenmcnaughton/notice2
And another one
colemanw [Fri, 1 Oct 2021 16:39:07 +0000 (12:39 -0400)]
Merge pull request #21684 from eileenmcnaughton/notice3
Another one bites the dust
demeritcowboy [Fri, 1 Oct 2021 16:00:47 +0000 (12:00 -0400)]
Merge pull request #21686 from eileenmcnaughton/test_name
Rename test clas to reflect tested class name
demeritcowboy [Fri, 1 Oct 2021 15:57:25 +0000 (11:57 -0400)]
Merge pull request #21687 from eileenmcnaughton/case1
[REF] Extract getRedirectUrl method
Coleman Watts [Fri, 1 Oct 2021 15:20:36 +0000 (11:20 -0400)]
APIv4 - Give every SQL expression a title
Fixes a bug in Afform where it would crash trying to get the title of SQL Equations
on search display forms.
Eileen McNaughton [Fri, 1 Oct 2021 10:32:53 +0000 (23:32 +1300)]
Enotice tpl fix
Seamus Lee [Fri, 1 Oct 2021 07:23:09 +0000 (17:23 +1000)]
Merge pull request #21685 from eileenmcnaughton/email
Remove unused paramter
Eileen McNaughton [Fri, 1 Oct 2021 04:29:00 +0000 (17:29 +1300)]
[REF] Extract getRedirectUrl method
Eileen McNaughton [Fri, 1 Oct 2021 04:12:16 +0000 (17:12 +1300)]
Rename test clas to reflect tested class name
Eileen McNaughton [Fri, 1 Oct 2021 04:05:59 +0000 (17:05 +1300)]
Remove unused paramter
Eileen McNaughton [Fri, 1 Oct 2021 04:03:21 +0000 (17:03 +1300)]
Merge pull request #21671 from eileenmcnaughton/wf_name
Remove workflow_id reference
Eileen McNaughton [Fri, 1 Oct 2021 03:58:10 +0000 (16:58 +1300)]
Another one bites the dust
Eileen McNaughton [Fri, 1 Oct 2021 03:55:14 +0000 (16:55 +1300)]
And another one
Eileen McNaughton [Fri, 1 Oct 2021 03:50:45 +0000 (16:50 +1300)]
Another enotice fix
Eileen McNaughton [Fri, 1 Oct 2021 02:52:53 +0000 (15:52 +1300)]
Merge pull request #21678 from demeritcowboy/test-fileoncase
[NFC] Unit test for file-on-case
demeritcowboy [Thu, 30 Sep 2021 20:04:20 +0000 (16:04 -0400)]
test for file on case
Eileen McNaughton [Fri, 1 Oct 2021 00:15:13 +0000 (13:15 +1300)]
Merge pull request #21680 from eileenmcnaughton/gogo
Remove now-silly function
Tim Otten [Fri, 1 Oct 2021 00:02:40 +0000 (17:02 -0700)]
ang/crmMailing/Templates.js - Dropdown shouldn't show system workflow templates
These are now identified by `workflow_name` rather than `workflow_id`.
Tim Otten [Fri, 1 Oct 2021 00:01:03 +0000 (17:01 -0700)]
MessageTemplate - Fix "revert" for msgtpl's that set `workflow_name` sans `workflow_id`
Jon Goldberg [Fri, 1 Oct 2021 00:00:11 +0000 (20:00 -0400)]
fixes core#2881 - APIv3 replace only replaces the first 25 records
Eileen McNaughton [Thu, 30 Sep 2021 23:53:43 +0000 (12:53 +1300)]
Merge pull request #21679 from Detsieber/patch-2
Update SelfSvcUpdate.php
Eileen McNaughton [Thu, 30 Sep 2021 22:22:53 +0000 (11:22 +1300)]
Remove now-silly function
Eileen McNaughton [Thu, 30 Sep 2021 22:00:18 +0000 (11:00 +1300)]
Merge pull request #21677 from eileenmcnaughton/move
Return another function to the email trait
Detlev Sieber [Thu, 30 Sep 2021 21:27:39 +0000 (23:27 +0200)]
Update SelfSvcUpdate.php
Changing this text is necessary for internationalization, because otherwise we get an ambigous translation in some languages
Eileen McNaughton [Thu, 30 Sep 2021 19:54:58 +0000 (08:54 +1300)]
Return another function to the email trait
Another function that is only used from one place & is unnecessarily complicated
because of the input & output paramters
Coleman Watts [Thu, 30 Sep 2021 19:08:50 +0000 (15:08 -0400)]
NFC - Update code comments
First docblock to use the new array shapes annotation
demeritcowboy [Thu, 30 Sep 2021 12:43:48 +0000 (08:43 -0400)]
Merge pull request #21648 from eileenmcnaughton/email_task
[REF] Copy another email trait function back to the trait
Eileen McNaughton [Wed, 29 Sep 2021 23:09:06 +0000 (12:09 +1300)]
Remove workflow_id reference
demeritcowboy [Thu, 30 Sep 2021 01:15:44 +0000 (21:15 -0400)]
Merge pull request #21472 from mattwire/contributionrecurmodifieddate
ContributionRecur modified_date should update to current_timestamp on update
demeritcowboy [Thu, 30 Sep 2021 01:15:30 +0000 (21:15 -0400)]
Merge pull request #21403 from GValFr35/fix-session-reference-5.40
(dev/drupal#163) Session erroneously getting set to NULL on change
Eileen McNaughton [Thu, 30 Sep 2021 00:22:41 +0000 (13:22 +1300)]
Merge pull request #21670 from eileenmcnaughton/dist
Add message admin to dist
Eileen McNaughton [Wed, 29 Sep 2021 22:49:52 +0000 (11:49 +1300)]
Add message admin to dist
Eileen McNaughton [Wed, 29 Sep 2021 22:42:51 +0000 (11:42 +1300)]
Merge pull request #21633 from eileenmcnaughton/notices_s
Fix header e-notices
Eileen McNaughton [Wed, 29 Sep 2021 22:06:10 +0000 (11:06 +1300)]
Merge pull request #21590 from totten/master-msgtplui
dev/mail#83 - Import current revision of "Message Admin"
colemanw [Wed, 29 Sep 2021 20:55:08 +0000 (16:55 -0400)]
Merge pull request #21637 from eileenmcnaughton/cont_test
Tests - update to use postProcess
demeritcowboy [Wed, 29 Sep 2021 20:32:23 +0000 (16:32 -0400)]
Merge pull request #21455 from jaapjansma/issue_645
Fixed issue with sending from do-not-reply@domain address
Eileen McNaughton [Tue, 28 Sep 2021 18:31:03 +0000 (07:31 +1300)]
Participant tokens on scheduled reminders (wip- upgrade script needed at minimum)
colemanw [Wed, 29 Sep 2021 14:26:12 +0000 (10:26 -0400)]
Merge pull request #21661 from eileenmcnaughton/cleanup
Basic IDE cleanup on test class
Matthew Wire [Tue, 14 Sep 2021 15:22:11 +0000 (16:22 +0100)]
ContributionRecur modified_date should update to current_timestamp on update
Eileen McNaughton [Wed, 29 Sep 2021 11:51:06 +0000 (00:51 +1300)]
User getSubmittedValue rather than passed values
Eileen McNaughton [Wed, 29 Sep 2021 11:34:28 +0000 (00:34 +1300)]
Merge pull request #21613 from eileenmcnaughton/update_from
Simplify getRecurFromAddress
Eileen McNaughton [Wed, 29 Sep 2021 11:21:05 +0000 (00:21 +1300)]
Merge pull request #21665 from civicrm/5.42
5.42 to master
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
Eileen McNaughton [Wed, 29 Sep 2021 11:19:48 +0000 (00:19 +1300)]
Merge pull request #21662 from eileenmcnaughton/mem
Test fix
jitendrapurohit [Wed, 29 Sep 2021 08:50:10 +0000 (14:20 +0530)]
fix end_event_adjust key
Eileen McNaughton [Wed, 29 Sep 2021 07:55:52 +0000 (20:55 +1300)]
Test fix
Eileen McNaughton [Wed, 29 Sep 2021 07:40:42 +0000 (20:40 +1300)]
Basic IDE cleanup on test class
Eileen McNaughton [Sun, 26 Sep 2021 22:21:42 +0000 (11:21 +1300)]
Fix header e-notices
This should solve enotices across a bunch of screens
Eileen McNaughton [Sat, 25 Sep 2021 05:37:31 +0000 (17:37 +1200)]
Simplify getRecurFromAddress
This switches to use the code extracted from the other function
Eileen McNaughton [Wed, 29 Sep 2021 04:03:57 +0000 (17:03 +1300)]
Merge pull request #21652 from eileenmcnaughton/cont_render_more
Remove call to the dreaded replaceMultipleContributionTokens
Monish Deb [Wed, 29 Sep 2021 03:44:01 +0000 (09:14 +0530)]
Merge pull request #21521 from eileenmcnaughton/member_tokens
dev/core#2832 Switch membership pdf to use token processor
demeritcowboy [Wed, 29 Sep 2021 02:25:30 +0000 (22:25 -0400)]
Merge pull request #21658 from eileenmcnaughton/enotice
Enotice fix
demeritcowboy [Wed, 29 Sep 2021 02:25:09 +0000 (22:25 -0400)]
Merge pull request #21659 from eileenmcnaughton/notice2
Enotice fixes
demeritcowboy [Wed, 29 Sep 2021 02:16:16 +0000 (22:16 -0400)]
Merge pull request #21595 from agileware/CIVICRM-1563
Find Activities Search, the default search option of "With" criteria excludes Activities by default. Confuses End Users when 0 results are returned when criteria appears to be correct.
demeritcowboy [Wed, 29 Sep 2021 02:14:55 +0000 (22:14 -0400)]
Merge pull request #21562 from jitendrapurohit/notify-user
Do not send email notification to the user if `notify` is not set in the params
Eileen McNaughton [Tue, 28 Sep 2021 07:17:57 +0000 (20:17 +1300)]
Remove call to the dreaded replaceMultipleContributionTokens