Eileen McNaughton [Wed, 5 Jan 2022 22:04:10 +0000 (11:04 +1300)]
Cleanup test class
Eileen McNaughton [Wed, 12 Jan 2022 04:38:33 +0000 (17:38 +1300)]
Merge pull request #22479 from demeritcowboy/fulltext-quickfix-546
dev/core#3026 - 5.46 version of 22478
demeritcowboy [Wed, 12 Jan 2022 02:35:33 +0000 (21:35 -0500)]
quickfix for fulltext search drupal block
Eileen McNaughton [Tue, 11 Jan 2022 23:05:33 +0000 (12:05 +1300)]
Merge pull request #22451 from MegaphoneJon/member-count-fix
Crash when adding a relationship when CiviMember is disabled
Jon Goldberg [Mon, 10 Jan 2022 18:11:57 +0000 (13:11 -0500)]
fix accessing member/contribution count when not enabled
Seamus Lee [Mon, 10 Jan 2022 21:24:00 +0000 (08:24 +1100)]
Merge pull request #22445 from eileenmcnaughton/546
Use field value function to get html signature
Eileen McNaughton [Mon, 10 Jan 2022 02:37:23 +0000 (15:37 +1300)]
Use field value function to get html signature
The function is used for all other tokens on the contact object and will better access
the right value and return an empty string rather NULL if not set.
I hit this as an enotice writing a test - but it is possibly the cause of this issue
https://github.com/eileenmcnaughton/nz.co.fuzion.civitoken/issues/58#issuecomment-
966611004
hence targetting the rc
The tokens() function does weird things if you pass it NULL
Eileen McNaughton [Mon, 10 Jan 2022 00:25:54 +0000 (13:25 +1300)]
Merge pull request #22437 from MegaphoneJon/broken-search-urls
fixes report#93: SearchKit shows broken external URLs
demeritcowboy [Mon, 10 Jan 2022 00:02:40 +0000 (19:02 -0500)]
Merge pull request #22429 from colemanw/fixMoneyType2
Fix input type for smarty number formatting (more forgiving)
Jon Goldberg [Sun, 9 Jan 2022 22:48:33 +0000 (17:48 -0500)]
fixes report#93: SearchKit shows broken external URLs
Coleman Watts [Sat, 8 Jan 2022 22:10:02 +0000 (17:10 -0500)]
Fix input type for smarty number formatting
Some smarty templates pass NULL to crmMoney, so it needs to handle that possibilty
Seamus Lee [Sat, 8 Jan 2022 22:19:49 +0000 (09:19 +1100)]
Merge pull request #22418 from demeritcowboy/isdir-7-8-546
[NFC] isDir unit test fails on php 7 'min' matrix
demeritcowboy [Sat, 8 Jan 2022 01:41:57 +0000 (20:41 -0500)]
fails in unusual situation on php 7
CiviCRM [Fri, 7 Jan 2022 03:23:36 +0000 (03:23 +0000)]
Set version to 5.46.beta1
Eileen McNaughton [Fri, 7 Jan 2022 03:16:01 +0000 (16:16 +1300)]
Merge pull request #22393 from eileenmcnaughton/no_ref
Remove unnecessary pass-by-ref
Eileen McNaughton [Fri, 7 Jan 2022 03:11:34 +0000 (16:11 +1300)]
Merge pull request #22392 from eileenmcnaughton/protect
Privatise function
Eileen McNaughton [Fri, 7 Jan 2022 01:45:58 +0000 (14:45 +1300)]
Merge pull request #22391 from eileenmcnaughton/legacy
[REF] Remove handling for relationshipID
Eileen McNaughton [Fri, 7 Jan 2022 01:39:04 +0000 (14:39 +1300)]
Merge pull request #22394 from eileenmcnaughton/return
Ensure getDuplicateContacts always returns an array
Eileen McNaughton [Fri, 7 Jan 2022 00:08:26 +0000 (13:08 +1300)]
Ensure getDuplicateContacts always returns an array
Calling code already handles an empty array as that is what it would receive - unless the hook set it to NULL
Eileen McNaughton [Thu, 6 Jan 2022 23:58:53 +0000 (12:58 +1300)]
Remove unnecessary pass-by-ref
Eileen McNaughton [Thu, 6 Jan 2022 23:56:20 +0000 (12:56 +1300)]
Privatise function
Eileen McNaughton [Thu, 6 Jan 2022 23:38:56 +0000 (12:38 +1300)]
Merge pull request #22389 from colemanw/contactTypes
REF - Use `CRM_Contact_BAO_ContactType::basicTypes()` instead of hardcoded lists
Eileen McNaughton [Thu, 6 Jan 2022 20:52:17 +0000 (09:52 +1300)]
[REF] Remove handling for relationshipID
We can see that the only call to this function does not set params['id'] & hence it is NULL
Eileen McNaughton [Thu, 6 Jan 2022 23:13:10 +0000 (12:13 +1300)]
Merge pull request #22383 from colemanw/dedupeRuleScreenFixes
DedupeRules - Translate contact type labels, respect enabled contact types
colemanw [Thu, 6 Jan 2022 23:08:20 +0000 (18:08 -0500)]
Merge pull request #22390 from eileenmcnaughton/legacy2
[REF] Further cleanup on employer create
colemanw [Thu, 6 Jan 2022 23:05:03 +0000 (18:05 -0500)]
Merge pull request #22319 from colemanw/afformSearchFilters
Afform - UI and contextual titles for search displays
colemanw [Thu, 6 Jan 2022 23:01:39 +0000 (18:01 -0500)]
Merge pull request #22323 from eileenmcnaughton/taxterm
Smarty modifier - stop using isset to check taxTerm
Seamus Lee [Thu, 6 Jan 2022 23:01:17 +0000 (10:01 +1100)]
Merge pull request #21178 from eileenmcnaughton/perm
dev/core#2752 Allow financial_trxns to be viewed
Eileen McNaughton [Thu, 6 Jan 2022 20:49:12 +0000 (09:49 +1300)]
[REF] Simplify handing of ids
Rather than compile contactID into an array to pass it in pass as itself. It is then
clear that ids['relationship'] will always be null - so remove the check
Coleman Watts [Thu, 6 Jan 2022 17:17:29 +0000 (12:17 -0500)]
REF - Use `CRM_Contact_BAO_ContactType::basicTypes()` instead of hardcoded lists
Makes code more flexible/forgiving if new contact types are added in the future,
or if existing contact types are disabled.
colemanw [Thu, 6 Jan 2022 18:40:38 +0000 (13:40 -0500)]
Merge pull request #22388 from colemanw/unusedFunctionDel
Remove unused function
Coleman Watts [Thu, 6 Jan 2022 17:04:02 +0000 (12:04 -0500)]
Remove unused function
Eileen McNaughton [Thu, 6 Jan 2022 02:26:07 +0000 (15:26 +1300)]
Duplicate legacyCreateMultiple to contact_utils
Having a lot of trouble fixing a bug via this method so gonn break up & clean up the function in this context
(leaves on the import class & a JMA extension calling it.
colemanw [Wed, 5 Jan 2022 18:50:00 +0000 (13:50 -0500)]
Merge pull request #22369 from braders/dedupeRulesSystemCheck
Add system status check for missing dedupe rules
colemanw [Wed, 5 Jan 2022 18:49:47 +0000 (13:49 -0500)]
Merge pull request #22378 from eileenmcnaughton/notice
Ensure dashboardLinks assigned to prevent e-notice
colemanw [Wed, 5 Jan 2022 18:43:33 +0000 (13:43 -0500)]
Merge pull request #22382 from colemanw/api4ExplorerFormatArrayParams
APIv4 Explorer - Format array params using add methods instead of set
Coleman Watts [Wed, 5 Jan 2022 16:47:21 +0000 (11:47 -0500)]
DedupeRules - Translate contact type labels, respect enabled contact types
Bradley Taylor [Tue, 4 Jan 2022 12:44:36 +0000 (12:44 +0000)]
Add system status check for missing dedupe rules
Coleman Watts [Wed, 5 Jan 2022 16:06:24 +0000 (11:06 -0500)]
APIv4 Explorer - Format array params using add methods instead of set when available
Improves OOP generated code by using sugar methods `addGroupBy()` and `addRecords()`
colemanw [Wed, 5 Jan 2022 15:14:21 +0000 (10:14 -0500)]
Merge pull request #22267 from eileenmcnaughton/cont_test2
[Ref] Add getter for priceSetID and use full form flow
Eileen McNaughton [Wed, 5 Jan 2022 05:49:18 +0000 (18:49 +1300)]
Ensure dashboardLinks assigned to prevent e-notice
Rather than no assign assign an empty array. It is processed with a foreach so all good
Eileen McNaughton [Wed, 5 Jan 2022 05:39:21 +0000 (18:39 +1300)]
Merge pull request #22366 from colemanw/fixSearchKitEditableDates
SearchKit - Fix editable dates on standalone form
Eileen McNaughton [Wed, 5 Jan 2022 05:37:04 +0000 (18:37 +1300)]
Merge pull request #22367 from colemanw/searchKitViewButton
SearchKit - Contextual "View" button
Eileen McNaughton [Wed, 18 Aug 2021 21:18:05 +0000 (09:18 +1200)]
dev/core#2752 Allow financial_trxns to be viewed
Per https://lab.civicrm.org/dev/core/-/issues/2752 this allows non admins to
see payment details in search for contributions they can see.
I only added for 'get' because I didn't want to loosen 'delete'
(in particular) and this was the minimum extra to achieve
search access
Eileen McNaughton [Wed, 5 Jan 2022 05:24:18 +0000 (18:24 +1300)]
Merge pull request #22373 from demeritcowboy/memwarn
Fix E_WARNING access array offset on null when creating new contribution page
Eileen McNaughton [Wed, 5 Jan 2022 05:24:00 +0000 (18:24 +1300)]
Merge pull request #22375 from demeritcowboy/searchkit-chicken-egg
dev/report#90 - Don't crash search_kit on upgrade from 5.35
Eileen McNaughton [Wed, 5 Jan 2022 05:23:17 +0000 (18:23 +1300)]
Merge pull request #22377 from eileenmcnaughton/format
dev/core#2773 Add an ACL to demo data
Eileen McNaughton [Wed, 5 Jan 2022 05:23:00 +0000 (18:23 +1300)]
Merge pull request #22372 from eileenmcnaughton/acl4
enotice fix (with default modifiers)
Eileen McNaughton [Wed, 5 Jan 2022 02:23:31 +0000 (15:23 +1300)]
Add an ACL to demo data
This creates an acl user (jenny@example.com) who can view members of the Volunteer group.
A change will also be needed in buildkit to add her user account
Eileen McNaughton [Wed, 5 Jan 2022 03:16:58 +0000 (16:16 +1300)]
Merge pull request #22365 from colemanw/importMultiValuedCustom
Fix "Import Multi-Value Custom Data"
colemanw [Wed, 5 Jan 2022 02:32:53 +0000 (21:32 -0500)]
Merge pull request #22371 from eileenmcnaughton/acl2
Do not escape showHideBlocks by default
Seamus Lee [Wed, 5 Jan 2022 02:20:36 +0000 (13:20 +1100)]
Merge pull request #22374 from eileenmcnaughton/format
Formatting cleanup
demeritcowboy [Wed, 5 Jan 2022 02:07:05 +0000 (21:07 -0500)]
don't crash on upgrade from 5.35
demeritcowboy [Wed, 5 Jan 2022 00:54:36 +0000 (19:54 -0500)]
Merge pull request #21483 from jmcclelland/leaky-honoree-variable
Ensure we don't get previously set honoree values in receipts
Eileen McNaughton [Wed, 5 Jan 2022 00:41:39 +0000 (13:41 +1300)]
Formatting cleanup
Eileen McNaughton [Wed, 5 Jan 2022 00:35:55 +0000 (13:35 +1300)]
Merge pull request #22370 from eileenmcnaughton/acl
Fix notices on acl page
Eileen McNaughton [Wed, 5 Jan 2022 00:34:37 +0000 (13:34 +1300)]
enotice fix (with default modifiers)
demeritcowboy [Wed, 5 Jan 2022 00:33:42 +0000 (19:33 -0500)]
fix array element access on null
colemanw [Tue, 4 Jan 2022 23:05:24 +0000 (18:05 -0500)]
Merge pull request #22356 from colemanw/searchKitLinks
SearchKit - Allow aggregate columns to be links
Eileen McNaughton [Tue, 4 Jan 2022 22:49:42 +0000 (11:49 +1300)]
Do not escape showHideBlocks by default
Affects civicrm/acl?action=add&reset=1
Eileen McNaughton [Tue, 4 Jan 2022 22:41:26 +0000 (11:41 +1300)]
Fix notices on acl page
civicrm/acl?reset=1
demeritcowboy [Tue, 4 Jan 2022 22:03:35 +0000 (17:03 -0500)]
Merge pull request #21517 from mattwire/propertybagrecurinstallments
Fix PropertyBag setRecurInstallments to accept 0
Coleman Watts [Tue, 4 Jan 2022 17:17:56 +0000 (12:17 -0500)]
Regenerate sql for new "Import Custom Data" menu item
demeritcowboy [Tue, 4 Jan 2022 16:34:47 +0000 (11:34 -0500)]
Merge pull request #22309 from eileenmcnaughton/brickit
Use new money formatting util for smarty formatting
demeritcowboy [Tue, 4 Jan 2022 06:09:07 +0000 (01:09 -0500)]
Merge pull request #21916 from mattwire/recurprocessorid
dev/financial#57 Hide recur trxn_id if it matches recur processor_id
Yashodha Chaku [Tue, 4 Jan 2022 04:11:25 +0000 (09:41 +0530)]
Merge pull request #22361 from braders/phone-email-label-accessibility
Improve accessibility - associate label and fields
Coleman Watts [Tue, 4 Jan 2022 04:06:44 +0000 (23:06 -0500)]
SearchKit - Contextual "View" button
This should make it less confusing. When you click on the View button it will take you to the display you are currently editing.
When not on a display, the View button looks different so it's easier to tell where it's taking you.
Fixes dev/core#3016
Coleman Watts [Tue, 4 Jan 2022 03:19:54 +0000 (22:19 -0500)]
SearchKit - Fix editable dates on standalone form
For better or worse, the crmDatePicker widget requires a parent <form> element.
Fixes dev/core#3017
Coleman Watts [Tue, 4 Jan 2022 02:51:37 +0000 (21:51 -0500)]
Import - Fix loading and saving multiValued custom data field mapping
Coleman Watts [Mon, 3 Jan 2022 21:53:29 +0000 (16:53 -0500)]
Import - Fix multi-record custom data import PHP errors
Fixes fatal PHP error `Declaration of CRM_Custom_Import_Parser::run(...) should be compatible with CRM_Contact_Import_Parser::run(...)`
by switching to inherit the base class instead of the contact import class. This simplifies the code in general.
colemanw [Tue, 4 Jan 2022 02:35:28 +0000 (21:35 -0500)]
Merge pull request #22364 from eileenmcnaughton/defaults
Fix campaign dashboard to work with default escaping
Seamus Lee [Tue, 4 Jan 2022 01:38:45 +0000 (12:38 +1100)]
Merge pull request #22363 from eileenmcnaughton/noticey2
Fix over-escaping when default escaping is on
Seamus Lee [Tue, 4 Jan 2022 01:18:41 +0000 (12:18 +1100)]
Merge pull request #22362 from eileenmcnaughton/noticey
Fix escape-by-default
Eileen McNaughton [Mon, 3 Jan 2022 23:51:11 +0000 (12:51 +1300)]
Fix campaign dashboard to work with default escaping
Eileen McNaughton [Mon, 3 Jan 2022 22:51:48 +0000 (11:51 +1300)]
Fix over-escaping when default escaping is on
Eileen McNaughton [Mon, 3 Jan 2022 22:48:07 +0000 (11:48 +1300)]
Fix escape-by-default
Eileen McNaughton [Mon, 3 Jan 2022 22:29:04 +0000 (11:29 +1300)]
Merge pull request #22357 from yashodha/dev-3012
(dev/core#3012) Expose email on hold as filter for report
Eileen McNaughton [Mon, 3 Jan 2022 22:28:33 +0000 (11:28 +1300)]
Merge pull request #22359 from colemanw/api4ActivityCreate
APIv4 - Set 'activity_type_id' to required
Coleman Watts [Mon, 3 Jan 2022 19:58:18 +0000 (14:58 -0500)]
Cleanup multi-record custom import tpl and warn user if no multi-custom groups exist.
Coleman Watts [Mon, 3 Jan 2022 19:25:20 +0000 (14:25 -0500)]
Add menu item for "Import MultiValued Custom Data"
colemanw [Mon, 3 Jan 2022 20:00:22 +0000 (15:00 -0500)]
Merge pull request #22360 from braders/import-field-docblock-improvements
[NFC] docblock improvements to Import_Field classes
Bradley Taylor [Mon, 3 Jan 2022 17:39:03 +0000 (17:39 +0000)]
Improve accessibility - associate label and fields
Bradley Taylor [Mon, 3 Jan 2022 17:20:07 +0000 (17:20 +0000)]
docblock improvements to Import_Field classes
Coleman Watts [Tue, 28 Dec 2021 15:40:58 +0000 (10:40 -0500)]
APIv4 - Set 'activity_type_id' to required
In APIv4 GetFields, sets activity field to required because the
database default is problematic.
demeritcowboy [Mon, 3 Jan 2022 14:14:34 +0000 (09:14 -0500)]
Merge pull request #22349 from braders/chart-label-translatable
Allow chart dropdown labels to be translatable.
Bradley Taylor [Fri, 31 Dec 2021 12:19:19 +0000 (12:19 +0000)]
Allow chart dropdown labels to be translatable.
Prior to this change, the strings 'Tabular', 'Bar Chart' and 'Pie Chart' were hardcoded.
Yashodha Chaku [Mon, 3 Jan 2022 05:48:35 +0000 (11:18 +0530)]
Merge pull request #22318 from jitendrapurohit/state_name
Add state name to export fields
yashodha [Mon, 3 Jan 2022 03:31:48 +0000 (09:01 +0530)]
(dev/core#3012) expose email on hold as filter for report
Coleman Watts [Sun, 2 Jan 2022 22:02:30 +0000 (17:02 -0500)]
SearchKit - Allow aggregate columns to be links
Previously aggregate columns were excluded from being shown as links.
That's overly strict. They can't have autogenerated links, but they can
have custom links.
Eileen McNaughton [Wed, 29 Dec 2021 21:47:15 +0000 (10:47 +1300)]
Always assign taxTerm to templates
I do wonder about making this a domain token - I go back & forth a bit but as
a domain token it would be available in non-smarty contexts too & could be exported
colemanw [Sun, 2 Jan 2022 15:35:18 +0000 (10:35 -0500)]
Merge pull request #22350 from demeritcowboy/managed-entities-drupal
dev/drupal#172 - module status used incorrectly in drupal 8 to determine which modules to care about for managed entities
colemanw [Sun, 2 Jan 2022 15:33:14 +0000 (10:33 -0500)]
Merge pull request #22347 from braders/price-set-unnecessary-ids
Remove unnecessary id attribute.
Seamus Lee [Sat, 1 Jan 2022 23:52:28 +0000 (10:52 +1100)]
Merge pull request #22354 from civicrm/5.45
5.45
Tim Otten [Sat, 1 Jan 2022 23:00:23 +0000 (17:00 -0600)]
Merge pull request #22353 from seamuslee001/5.45
[REF] Fix tests that fail after 2021
demeritcowboy [Sat, 1 Jan 2022 19:25:41 +0000 (14:25 -0500)]
fix expired credit card
demeritcowboy [Sat, 1 Jan 2022 19:06:35 +0000 (14:06 -0500)]
fix tests that will fail after 2021
Tim Otten [Sat, 1 Jan 2022 21:16:01 +0000 (15:16 -0600)]
Merge pull request #22352 from demeritcowboy/stuck-in-2020
Fix tests that fail after 2021
demeritcowboy [Sat, 1 Jan 2022 19:25:41 +0000 (14:25 -0500)]
fix expired credit card
demeritcowboy [Sat, 1 Jan 2022 19:06:35 +0000 (14:06 -0500)]
fix tests that will fail after 2021
Bradley Taylor [Fri, 31 Dec 2021 10:54:39 +0000 (10:54 +0000)]
Remove unnecessary id attribute.
The min_amount ID was used for both a tr and a input element, breaking accessibility links