Coleman Watts [Sat, 7 Aug 2021 15:42:12 +0000 (11:42 -0400)]
SearchKit - Switch results table to use a search display
This greatly simplifies the SearchKit admin code by creating a
specialized searchDisplay (copied from crmSearchDisplayTable) which
eliminates all the code for the admin screen to fetch, format and display results.
Coleman Watts [Sun, 8 Aug 2021 13:30:23 +0000 (09:30 -0400)]
SearchKit - Add optional search button to displays
This allows search displays to present a button to the user instead of running immediately
Seamus Lee [Mon, 9 Aug 2021 08:42:54 +0000 (18:42 +1000)]
Merge pull request #21062 from eileenmcnaughton/vars
Move make-sure-single-set out of shared function
Seamus Lee [Mon, 9 Aug 2021 08:40:40 +0000 (18:40 +1000)]
Merge pull request #21049 from colemanw/searchDisplaysRef
[REF] SearchKit - display code refactor + pager options
Monish Deb [Mon, 9 Aug 2021 05:38:31 +0000 (11:08 +0530)]
Merge pull request #20976 from eileenmcnaughton/mem_status
Fix Membership.create in BAO to respect passed in status_id
Eileen McNaughton [Mon, 9 Aug 2021 02:58:18 +0000 (14:58 +1200)]
Merge pull request #21060 from demeritcowboy/test-includable
dev/core#2730 - Replace fopen call in CRM_Utils_File::isIncludable with one that doesn't need error-supression to avoid problems in php8
demeritcowboy [Mon, 9 Aug 2021 01:18:53 +0000 (21:18 -0400)]
Merge pull request #21066 from eileenmcnaughton/email
[Ref] Move rule to email trait
demeritcowboy [Sun, 8 Aug 2021 22:03:06 +0000 (18:03 -0400)]
replace fopen with stream_resolve_include_path
Eileen McNaughton [Sun, 8 Aug 2021 23:25:45 +0000 (11:25 +1200)]
[Ref] Move rule to email trait
This is part of dis-establishing EmailCommon - the function is not called from elsewhere
demeritcowboy [Sun, 8 Aug 2021 21:58:20 +0000 (17:58 -0400)]
Merge pull request #21061 from eileenmcnaughton/trait
Remove unused assignment
Coleman Watts [Fri, 6 Aug 2021 21:52:16 +0000 (17:52 -0400)]
SearchKit - Refactor search displays to share more code
Coleman Watts [Fri, 6 Aug 2021 16:26:09 +0000 (12:26 -0400)]
SearchKit - Improve searchDisplay pager with additional options
Adds 'show_count' and 'expose_limit' as options to searchDisplay pagers
Coleman Watts [Thu, 5 Aug 2021 17:30:58 +0000 (13:30 -0400)]
SearchKit - Refactor sort-related functions into a trait
Coleman Watts [Thu, 5 Aug 2021 16:41:46 +0000 (12:41 -0400)]
SearchKit - Refactor task-related functions into a trait and move base trait to its own file
Eileen McNaughton [Sun, 8 Aug 2021 05:23:39 +0000 (17:23 +1200)]
Move make-sure-single-set out of shared function
3 places in the code call this - in 2 _single is declared on the class as false
& hence don't need this - ergo it is only being done for the one remaining place
so it's not shared it's just a helper for that code & we should return it
Eileen McNaughton [Sun, 8 Aug 2021 05:07:05 +0000 (17:07 +1200)]
Remove unused assignment
Seamus Lee [Sat, 7 Aug 2021 06:18:09 +0000 (16:18 +1000)]
Merge pull request #21056 from civicrm/5.41
5.41
Seamus Lee [Sat, 7 Aug 2021 05:01:25 +0000 (15:01 +1000)]
Merge pull request #21047 from eileenmcnaughton/tok_return
[Ref] cleanup alterActionSchedule
Seamus Lee [Sat, 7 Aug 2021 04:46:48 +0000 (14:46 +1000)]
Merge pull request #21001 from seamuslee001/fix_utf8mb4_test
[REF] Fix utf8mb4 test in APIv4 and re-enable the altering of databas…
Seamus Lee [Mon, 2 Aug 2021 22:34:47 +0000 (08:34 +1000)]
[REF] Fix utf8mb4 test in APIv4 and re-enable the altering of database in the v3 version of the test and fix handling for first name field
CiviCRM [Sat, 7 Aug 2021 02:17:29 +0000 (02:17 +0000)]
Set version to 5.42.alpha1
CiviCRM [Sat, 7 Aug 2021 02:12:01 +0000 (02:12 +0000)]
Set version to 5.41.beta1
Tim Otten [Sat, 7 Aug 2021 02:11:16 +0000 (19:11 -0700)]
Merge pull request #21053 from eileenmcnaughton/group_odd
dev/core#2742 fix group type on group create from form
Tim Otten [Sat, 7 Aug 2021 01:57:33 +0000 (18:57 -0700)]
Merge pull request #21051 from eileenmcnaughton/allan
dev/core#2740 fix dashboard regression on links
Eileen McNaughton [Sat, 7 Aug 2021 01:14:32 +0000 (13:14 +1200)]
Merge pull request #21050 from eileenmcnaughton/notice
Tpl notice fixes
Eileen McNaughton [Sat, 7 Aug 2021 00:37:53 +0000 (12:37 +1200)]
dev/core#2742 fix group type on group create from form
Eileen McNaughton [Fri, 6 Aug 2021 23:59:50 +0000 (11:59 +1200)]
dev/core#2740 fix dashboard regression on links
Eileen McNaughton [Fri, 6 Aug 2021 23:30:49 +0000 (11:30 +1200)]
Merge pull request #21045 from colemanw/fixSearchKitTaskPermissions
SearchKit - Fix permission to access task list
Eileen McNaughton [Fri, 6 Aug 2021 22:38:59 +0000 (10:38 +1200)]
Tpl notice fixes
These fields are both conditionally assigned to the template
Eileen McNaughton [Fri, 6 Aug 2021 16:08:18 +0000 (04:08 +1200)]
[Ref] cleanup alterActionSchedule
We can simplify this function now as basicFields is keyed by the real field name and
all pseudofields are already in basicFields.
demeritcowboy [Fri, 6 Aug 2021 17:57:37 +0000 (13:57 -0400)]
Merge pull request #21044 from mlutfy/fixContribSymbiotic
contributor-key.yml: updates for Symbiotic
Coleman Watts [Fri, 6 Aug 2021 15:08:27 +0000 (11:08 -0400)]
SearchKit - Fix permission to access task list
This regressed in
06ea32c, as a new api action was added but permissions were not declared.
Mathieu Lutfy [Fri, 6 Aug 2021 14:57:49 +0000 (10:57 -0400)]
contributor-key.yml: updates for Symbiotic
colemanw [Fri, 6 Aug 2021 14:55:47 +0000 (10:55 -0400)]
Merge pull request #21039 from eileenmcnaughton/tok_pseudo
Reconcile tokens misnamed or missing on legacy class
colemanw [Fri, 6 Aug 2021 14:51:20 +0000 (10:51 -0400)]
Merge pull request #21038 from eileenmcnaughton/tok_names
Switch to using apiv4 for metadata
demeritcowboy [Fri, 6 Aug 2021 14:28:07 +0000 (10:28 -0400)]
Merge pull request #21041 from eileenmcnaughton/notice2
Enotice fix
Eileen McNaughton [Fri, 6 Aug 2021 09:03:13 +0000 (21:03 +1200)]
Merge pull request #21040 from eileenmcnaughton/tpl
Enotice fix
Eileen McNaughton [Fri, 6 Aug 2021 07:26:02 +0000 (19:26 +1200)]
Merge pull request #20752 from samuelsov/ReportGroup
Make report subtotals work for custom fields
Eileen McNaughton [Fri, 6 Aug 2021 06:56:39 +0000 (18:56 +1200)]
Enotice fix
This one is a bit of a brain twister but I'm pretty sure the re-ordered IF has the
same result - but one less enotice
Eileen McNaughton [Fri, 6 Aug 2021 06:51:07 +0000 (18:51 +1200)]
Merge pull request #20989 from mattwire/mailtasks
Fix mailing task when there are no tasks
Eileen McNaughton [Fri, 6 Aug 2021 06:32:05 +0000 (18:32 +1200)]
Enotice fix
Eileen McNaughton [Fri, 6 Aug 2021 03:17:56 +0000 (15:17 +1200)]
Reconcile tokens misnamed on legacy class
This switches to using the same metadata based record for both classes
Eileen McNaughton [Fri, 6 Aug 2021 01:55:04 +0000 (13:55 +1200)]
Switch to using apiv4 for metadata
Eileen McNaughton [Fri, 6 Aug 2021 04:39:28 +0000 (16:39 +1200)]
Merge pull request #21036 from eileenmcnaughton/act_mon
Reconcile contribution amount tokens
Eileen McNaughton [Fri, 6 Aug 2021 00:38:49 +0000 (12:38 +1200)]
Reconcile contribution amount tokens
This adds non_deductible_amount, as identified in https://github.com/civicrm/civicrm-core/pull/21034
It also moves the metadata functions to a parent class - this class might wind up
being a temporary class as there are 3 other contenders for where this functionality
should go - the TokenTrait, the abstractProvider or the tokenRow class. The intent
is not to make that decision yet - just to provide visual clarity about
what is generic
Note - I've figured out how to switch over to v4 api for this but will do that in a separate PR
Eileen McNaughton [Fri, 6 Aug 2021 02:59:35 +0000 (14:59 +1200)]
Merge pull request #21037 from eileenmcnaughton/act_source
Fix advertised token for source
Eileen McNaughton [Fri, 6 Aug 2021 02:47:29 +0000 (14:47 +1200)]
Merge pull request #21035 from eileenmcnaughton/act_more
Update contribution_page_id token in sched reminders
Eileen McNaughton [Thu, 5 Aug 2021 23:12:43 +0000 (11:12 +1200)]
Update contribution_page_id token in sched reminders
Eileen McNaughton [Fri, 6 Aug 2021 00:51:38 +0000 (12:51 +1200)]
Fix advertised token for source
Seamus Lee [Thu, 5 Aug 2021 23:11:11 +0000 (09:11 +1000)]
Merge pull request #21000 from eileenmcnaughton/act_more
Reconcile and upgrade tokens for payment instrument, financial type
Eileen McNaughton [Mon, 2 Aug 2021 21:40:32 +0000 (09:40 +1200)]
Reconcile and upgrade tokens for payment instrument, financial type
This switches the last 2 'alias' tokens from Contribute_Tokens to the preferred format,
adds tests & upgrade and switches the advertised tokens. I tested & the token
removed from the sent letter collection still works
Next step is to analyse the remaining differences between the 2 sets of tokens.
My suspicion is that we have enough metadata that we use in search kit that we
don't need a hard-coded white list of tokens in 2 different places & can just
expose 'all the fields' that are not acl or otherwise limited
Seamus Lee [Thu, 5 Aug 2021 21:21:39 +0000 (07:21 +1000)]
Merge pull request #20999 from eileenmcnaughton/act_up
Switch contribution action schedule tokens to use advertised tokens for cancel_date & source
Seamus Lee [Thu, 5 Aug 2021 21:20:24 +0000 (07:20 +1000)]
Merge pull request #21019 from ejegg/customFieldBulkLog
Fix bulk adding custom fields with logging on
Mathieu Lu [Thu, 5 Aug 2021 13:10:59 +0000 (09:10 -0400)]
Merge pull request #21033 from kurund/patch-2
Update contributor-key.yml
Kurund Jalmi [Thu, 5 Aug 2021 13:09:32 +0000 (14:09 +0100)]
Update contributor-key.yml
Seamus Lee [Thu, 5 Aug 2021 10:09:13 +0000 (20:09 +1000)]
Merge pull request #21032 from seamuslee001/master
5.40 up merge
Seamus Lee [Thu, 5 Aug 2021 10:08:31 +0000 (20:08 +1000)]
Merge in 5.40
Tim Otten [Thu, 5 Aug 2021 10:03:40 +0000 (03:03 -0700)]
Merge pull request #21031 from totten/5.40-bump0
5.40.0 - Version bump. More release notes.
Tim Otten [Thu, 5 Aug 2021 09:15:21 +0000 (02:15 -0700)]
Set version to 5.40.0
Tim Otten [Thu, 5 Aug 2021 09:14:06 +0000 (02:14 -0700)]
Tweak release-notes/5.40.0.md
Seamus Lee [Thu, 5 Aug 2021 09:11:32 +0000 (19:11 +1000)]
Merge pull request #21028 from eileenmcnaughton/540
dev/event#62 - Expose all price fields to backend form (5.40)
Tim Otten [Thu, 5 Aug 2021 08:35:00 +0000 (01:35 -0700)]
Add release-notes/5.39.1.md
Brian Shaughnessy [Thu, 29 Jul 2021 14:56:41 +0000 (10:56 -0400)]
dev/event#62 expose all price fields to backend form
Eileen McNaughton [Thu, 5 Aug 2021 06:10:13 +0000 (18:10 +1200)]
Merge pull request #21020 from colemanw/fixWPUrlHash
[REGRESSION] Fix CRM.url to not encode hash on WP
Tim Otten [Thu, 5 Aug 2021 06:09:09 +0000 (23:09 -0700)]
Merge pull request #21014 from eileenmcnaughton/pf
dev/core#2739 - Fix contribution tasks using wrong IDs
Seamus Lee [Thu, 5 Aug 2021 04:10:22 +0000 (14:10 +1000)]
Merge pull request #21012 from eileenmcnaughton/540
dev/core#2725 Fix regression permitting circular group resolution
Seamus Lee [Thu, 5 Aug 2021 04:08:51 +0000 (14:08 +1000)]
Merge pull request #21022 from eileenmcnaughton/sched
dev/core#2735 fix for effective start & end date not updating
Coleman Watts [Thu, 5 Aug 2021 01:38:12 +0000 (21:38 -0400)]
Fix CRM.url to not encode hash on WP
Eileen McNaughton [Thu, 5 Aug 2021 02:23:14 +0000 (14:23 +1200)]
dev/core#2735 fix for effective start & end date not updating
Eileen McNaughton [Wed, 4 Aug 2021 21:39:59 +0000 (09:39 +1200)]
dev/core#2725 Fix regression permitting circular group resolution
Eileen McNaughton [Thu, 5 Aug 2021 02:07:11 +0000 (14:07 +1200)]
Merge pull request #21005 from colemanw/afformFieldDefaults
Afform - support default values for fields
Eileen McNaughton [Thu, 5 Aug 2021 02:00:29 +0000 (14:00 +1200)]
Merge pull request #21017 from totten/5.40-captcha-link
dev/core#2728 - ReCAPTCHA - Consistently present link to settings
Seamus Lee [Thu, 5 Aug 2021 01:41:11 +0000 (11:41 +1000)]
Merge pull request #21016 from eileenmcnaughton/jamie
Temporary revert of changes in 20002 which caused a regression
Elliott Eggleston [Thu, 5 Aug 2021 01:23:29 +0000 (21:23 -0400)]
Fix adding many custom fields with logging on
This code is only triggered in the 'bulk' writeRecords codepath,
not in the createField codepath which is used for creating custom
fields via the UI.
To replicate: on a wmff build, turn loggin on, check out
https://gerrit.wikimedia.org/r/c/wikimedia/fundraising/crm/+/709873
and run drush update-custom-fields
Result prior to this patch: SQL syntax error message and new field
not added to logging table
Result with this patch: no error message, new field created on log
table.
Seamus Lee [Thu, 5 Aug 2021 01:06:35 +0000 (11:06 +1000)]
Merge pull request #21015 from civicrm/5.40
5.40
Tim Otten [Thu, 5 Aug 2021 00:27:28 +0000 (17:27 -0700)]
dev/core#2728 - ReCAPTCHA - Consistently present link to settings
See also: https://lab.civicrm.org/dev/core/-/issues/2728
Before
------
"ReCAPTCHA Settings" appears in "Customize Data and Screens" in the nav-menu, and it is missing in the `civicrm/admin` dashboard.
After
-----
"ReCAPTCHA Settings" appears "System Settings" for both the nav-menu and the `civicrm/admin` dashboard.
Coleman Watts [Wed, 4 Aug 2021 02:32:38 +0000 (22:32 -0400)]
Afform - support default values for fields
This adds an "afform_default" property to the field definition.
It does not use the "default_value" property from getFields because that's more
to do with Civi's schema and often not appropriate for a form.
Fixes dev/core#2734
Eileen McNaughton [Wed, 4 Aug 2021 23:49:47 +0000 (11:49 +1200)]
Avoid test failures on revert
Eileen McNaughton [Wed, 4 Aug 2021 23:45:46 +0000 (11:45 +1200)]
Revert "Issue 53 (2)"
This reverts commit
4f4fb809a77cdfb7876d662f331d524fb2eeb1b3.
Eileen McNaughton [Wed, 4 Aug 2021 23:43:26 +0000 (11:43 +1200)]
Add related contact display test
Seamus Lee [Wed, 4 Aug 2021 23:23:01 +0000 (09:23 +1000)]
Merge pull request #21013 from seamuslee001/apiv4_utf8mb4
[NFC] Fix APIv4 Utf8mb4 test to ensure no mixed collation errors
Seamus Lee [Wed, 4 Aug 2021 22:39:22 +0000 (08:39 +1000)]
Merge pull request #20929 from eileenmcnaughton/5.40
dev/wordpress#109 fix bug when is_monetary is not checked
Patrick Figel [Wed, 4 Aug 2021 15:20:48 +0000 (17:20 +0200)]
dev/core#2739 - Fix contribution tasks using wrong IDs
This fixes an issue where contribution tasks may perform actions
on unrelated contribution IDs when they're called via contact
search forms.
Eileen McNaughton [Wed, 4 Aug 2021 21:21:50 +0000 (09:21 +1200)]
Merge pull request #21008 from jmcclelland/grant-pagination
enable paging if contact has more then 50 grants.
Seamus Lee [Wed, 4 Aug 2021 21:12:22 +0000 (07:12 +1000)]
[NFC] Fix APIv4 Utf8mb4 test to ensure no mixed collation errors
Seamus Lee [Wed, 4 Aug 2021 21:08:00 +0000 (07:08 +1000)]
Merge pull request #21011 from seamuslee001/master
5.40
Seamus Lee [Wed, 4 Aug 2021 21:05:35 +0000 (07:05 +1000)]
Merge branch '5.40'
Eileen McNaughton [Wed, 4 Aug 2021 21:03:04 +0000 (09:03 +1200)]
Merge pull request #21009 from agh1/5.40.0-releasenotes-final
5.40.0 release notes - final edits
Andie Hunt [Wed, 4 Aug 2021 17:55:00 +0000 (13:55 -0400)]
5.40.0 release notes: reorganized and final edits
Andie Hunt [Wed, 4 Aug 2021 17:39:25 +0000 (13:39 -0400)]
5.40.0 release notes: added late changes
Jamie McClelland [Wed, 4 Aug 2021 17:35:06 +0000 (13:35 -0400)]
enable paging if contact has more then 50 grants.
Andie Hunt [Wed, 4 Aug 2021 17:19:04 +0000 (13:19 -0400)]
Release notes: Contributor key no longer needs Jira handles
Andie Hunt [Wed, 4 Aug 2021 17:11:25 +0000 (13:11 -0400)]
It's Andie ;)
demeritcowboy [Wed, 4 Aug 2021 13:28:57 +0000 (09:28 -0400)]
Merge pull request #21003 from eileenmcnaughton/swapsies
Use template variable to add or remove swap button.
demeritcowboy [Wed, 4 Aug 2021 13:20:29 +0000 (09:20 -0400)]
Merge pull request #20990 from eileenmcnaughton/cs
[Ref] [Test] Move custom search tests to extension
Eileen McNaughton [Wed, 4 Aug 2021 06:12:49 +0000 (18:12 +1200)]
Merge pull request #20996 from colemanw/fixAfformContactType
Afform - Use correct contact type when loading field options
Seamus Lee [Wed, 4 Aug 2021 03:23:20 +0000 (13:23 +1000)]
Merge pull request #21004 from seamuslee001/teardownftsquery
[NFC] Do a proper tear down of fts in QueryFormatterTest
Seamus Lee [Wed, 4 Aug 2021 01:05:13 +0000 (11:05 +1000)]
[NFC] Do a proper tear down of fts in QueryFormatterTest
Seamus Lee [Wed, 4 Aug 2021 00:58:48 +0000 (10:58 +1000)]
[NFC] Do a proper tear down of fts in QueryFormatterTest
Eileen McNaughton [Tue, 3 Aug 2021 23:30:19 +0000 (11:30 +1200)]
Use template variable to add or remove swap button.
In combination with email notifications this button can be dangerous - ie an accidental click and
a donor rather than a staff member gets the email.
My thinking is to disable this via the activity assignee extension,
https://lab.civicrm.org/extensions/assignee/-/issues/2 - but it's cleaner for
an extension to intervene by setting a smarty variable than using javascript
to remove the button and I feel like it makes more sense for the form to
assign 'instruction variables' than for the decision to freeze to
also have 'hidden' effects further down