Eileen McNaughton [Wed, 10 Nov 2021 22:45:25 +0000 (11:45 +1300)]
Merge pull request #21986 from colemanw/searchKitTabs
SearchKit - tabbed display for custom vs packaged searches
Eileen McNaughton [Wed, 10 Nov 2021 22:28:30 +0000 (11:28 +1300)]
Merge pull request #22028 from eileenmcnaughton/issetinfo
Remove use of isset for info.tpl
Coleman Watts [Sun, 7 Nov 2021 16:54:54 +0000 (11:54 -0500)]
ManagedEntity - Add update mode 'unmodified' and fix cleanup mode 'unused' for APIv4
Update mode 'unmodified' will only update a record if it has not been locally edited.
This new setting works only for entities opted-in to the APIv4 ManagedEntity trait, and will
emit a warning and fall back on 'always' for others.
Cleanup mode 'unmodified' now works for APIv4 managed entities, and they are cleaned up
in reverse order to ensure references are deleted before their parents.
Eileen McNaughton [Wed, 10 Nov 2021 21:28:53 +0000 (10:28 +1300)]
Merge pull request #22027 from braders/fix-graph-empty-logic
Flip logic for determining if $section variable is set.
Eileen McNaughton [Wed, 10 Nov 2021 20:18:10 +0000 (09:18 +1300)]
Ensure action is set when loading contactFooter
Eileen McNaughton [Wed, 10 Nov 2021 19:57:46 +0000 (08:57 +1300)]
Remove use of isset for info.tpl
Seamus Lee [Wed, 10 Nov 2021 19:55:15 +0000 (06:55 +1100)]
Merge pull request #22023 from demeritcowboy/php8-userdashboard
[NFC] php8 - fix test fails for CRM_Contact_Page_View_UserDashBoardTest
Seamus Lee [Wed, 10 Nov 2021 19:52:47 +0000 (06:52 +1100)]
Merge pull request #22026 from mattwire/lockmessages
REF: Switch to debug level logging for lock debugging
Eileen McNaughton [Sat, 6 Nov 2021 00:03:30 +0000 (13:03 +1300)]
Enotice fix for footer.tpl
Ensure that contactId is always present
Bradley Taylor [Wed, 10 Nov 2021 19:23:40 +0000 (19:23 +0000)]
Flip logic for determining if $section variable is set.
Previously empty() function calls were added in order to provide PHP8 compatiability,
however, the logic commited was back-to-front.
This broke the ability to display pie and bar charts for those reports which support them.
Monish Deb [Wed, 10 Nov 2021 17:28:42 +0000 (22:58 +0530)]
Merge pull request #22017 from lcdservices/dev-core-1529
dev/core#1529 fix event repeat functionality
Matthew Wire [Wed, 10 Nov 2021 16:51:11 +0000 (16:51 +0000)]
Switch to debug level logging for lock debugging
demeritcowboy [Wed, 10 Nov 2021 16:07:32 +0000 (11:07 -0500)]
smarty warning
demeritcowboy [Wed, 10 Nov 2021 16:00:26 +0000 (11:00 -0500)]
remove useless comment
demeritcowboy [Wed, 10 Nov 2021 15:28:12 +0000 (10:28 -0500)]
assign formTpl
demeritcowboy [Wed, 10 Nov 2021 14:19:19 +0000 (09:19 -0500)]
Merge pull request #22000 from eileenmcnaughton/body
Ensure beginHookFormElements is assigned
demeritcowboy [Wed, 10 Nov 2021 14:16:18 +0000 (09:16 -0500)]
Merge pull request #22021 from totten/master-ischildpath
CRM_Utils_File::isChildPath - Fix checking of non-existent paths
Coleman Watts [Wed, 10 Nov 2021 13:47:36 +0000 (08:47 -0500)]
APIv4 - Add getRefCount utility & include afforms in SavedSearch refCounts.
Jaap Jansma [Wed, 10 Nov 2021 13:10:46 +0000 (14:10 +0100)]
Fix for dev/core#2948
Eileen McNaughton [Wed, 10 Nov 2021 05:22:09 +0000 (18:22 +1300)]
Merge pull request #22020 from seamuslee001/nfc_payment_test_fix
[NFC] Fix test issue about trying to do array offset on NULL in Payme…
Seamus Lee [Wed, 10 Nov 2021 04:32:30 +0000 (15:32 +1100)]
Merge pull request #22015 from demeritcowboy/test-histreport
[NFC] dev/report#77 - contribute/history civireport seems ok to run during reporttemplatetest
Tim Otten [Wed, 10 Nov 2021 02:31:05 +0000 (18:31 -0800)]
CRM_Utils_File::isChildPath - Fix checking of non-existent paths
Suppose you use call `isChildPath()` with these options:
* `$parent='/nonexistent'`
* `$child='/home/me/exists.txt'`
* `$checkRealPath=TRUE`
Before
=====
Reports that `/home/me/exists.txt` is a child of `/nonexistent`
After
=====
Reports that `/home/me/exists.txt` is NOT a child of `/nonexistent`
Comments
========
I added six test cases for how `isChildPath()` behaves when using
`$checkRealPath=TRUE`. The first five cases behave the same with or without
the patch. The patch fixes the last case.
Seamus Lee [Wed, 10 Nov 2021 02:46:33 +0000 (02:46 +0000)]
[NFC] Fix test issue about trying to do array offset on NULL in Payment ProcessorFormTest
demeritcowboy [Tue, 9 Nov 2021 23:35:03 +0000 (18:35 -0500)]
report seems fine now
colemanw [Wed, 10 Nov 2021 02:18:21 +0000 (21:18 -0500)]
Merge pull request #22018 from demeritcowboy/php8-formtpl
Ensure smarty variable formTpl is set
demeritcowboy [Wed, 10 Nov 2021 02:15:41 +0000 (21:15 -0500)]
Merge pull request #22001 from eileenmcnaughton/hook
Ensure hookContentPlacement is assigned
Seamus Lee [Wed, 10 Nov 2021 01:46:50 +0000 (12:46 +1100)]
Merge pull request #22016 from demeritcowboy/histreport-entryfound
dev/report#77 - Unused variable in contribute/history civireport
Coleman Watts [Wed, 10 Nov 2021 00:43:34 +0000 (19:43 -0500)]
SearchKit - Animated loading skeleton
demeritcowboy [Wed, 10 Nov 2021 00:16:47 +0000 (19:16 -0500)]
always set formTpl
Brian Shaughnessy [Wed, 10 Nov 2021 00:12:10 +0000 (19:12 -0500)]
dev/core#1529 fix event repeat functionality
demeritcowboy [Tue, 9 Nov 2021 23:41:34 +0000 (18:41 -0500)]
unused variable
Seamus Lee [Tue, 9 Nov 2021 22:33:49 +0000 (09:33 +1100)]
Merge pull request #21991 from eileenmcnaughton/isset4
Ensure that keys are set in tabValues before hitting smarty
Seamus Lee [Tue, 9 Nov 2021 22:32:55 +0000 (09:32 +1100)]
Merge pull request #22002 from eileenmcnaughton/group_org
Extract getGroupOrganizationUrl & ensure always assigned
Seamus Lee [Tue, 9 Nov 2021 22:31:39 +0000 (09:31 +1100)]
Merge pull request #22008 from artfulrobot/artfulrobot-fix-mailing-click-report-url
Fix unencoded mailing url query param in Mailing report
Eileen McNaughton [Tue, 9 Nov 2021 21:01:48 +0000 (10:01 +1300)]
Merge pull request #22011 from jmcclelland/surveyprevnext
don't overfill the prevnext cache when reserving for a survey.
demeritcowboy [Tue, 9 Nov 2021 15:22:15 +0000 (10:22 -0500)]
Merge pull request #21983 from lisandro-compucorp/email_to_organizations
Handle activity creation for emails directed to organization contacts
demeritcowboy [Tue, 9 Nov 2021 00:20:49 +0000 (19:20 -0500)]
Merge pull request #22010 from colemanw/apiExplorerFormat
APIv4 Explorer - Optionally view results in PHP format
demeritcowboy [Mon, 8 Nov 2021 23:59:14 +0000 (18:59 -0500)]
Merge pull request #22005 from seamuslee001/update_province_philippines
[REF] Add in missing province for Philippines and update names to matc…
Seamus Lee [Mon, 8 Nov 2021 01:54:07 +0000 (12:54 +1100)]
[REF] Add in missing province for Philippines and update names to match ISO
Ensure we don't overwrite any customisations already in the database
Coleman Watts [Mon, 8 Nov 2021 19:03:49 +0000 (14:03 -0500)]
APIv4 Explorer - Optionally view results in PHP format
Jamie McClelland [Mon, 8 Nov 2021 19:19:06 +0000 (14:19 -0500)]
don't overfill the prevnext cache when reserving for a survey.
Rich Lott / Artful Robot [Mon, 8 Nov 2021 14:31:14 +0000 (14:31 +0000)]
Fix unencoded mailing url query param in Mailing report
Tano Rojas [Fri, 5 Nov 2021 09:05:26 +0000 (16:05 +0700)]
Handle activity creation for emails to organization contacts
Coleman Watts [Fri, 5 Nov 2021 18:12:10 +0000 (14:12 -0400)]
SearchKit - Add default text/image to displays; support custom file fields
This breaks out image into its own column type,
and generates the url to access custom file fields.
A new 'empty_value' property allows for a placeholder text/image to display when a field is blank.
Seamus Lee [Mon, 8 Nov 2021 04:09:42 +0000 (15:09 +1100)]
Merge pull request #22003 from civicrm/5.44
5.44
Tim Otten [Mon, 8 Nov 2021 02:48:15 +0000 (18:48 -0800)]
Merge pull request #21960 from colemanw/afformBaseModule
Afform - Display the extension in which an Afform is packaged
Seamus Lee [Sun, 7 Nov 2021 23:56:18 +0000 (10:56 +1100)]
Merge pull request #21997 from colemanw/fixUpgradeErrors
dev/core#2550 Fix possible upgrade failures
Eileen McNaughton [Sun, 7 Nov 2021 22:55:14 +0000 (11:55 +1300)]
Extract getGroupOrganizationUrl & ensure always assigned
Eileen McNaughton [Sat, 6 Nov 2021 00:07:49 +0000 (13:07 +1300)]
Ensure that keys are set in tabValues before hitting smarty
Eileen McNaughton [Sun, 7 Nov 2021 22:34:14 +0000 (11:34 +1300)]
Ensure hookContentPlacement is assigned
Eileen McNaughton [Sun, 7 Nov 2021 22:27:54 +0000 (11:27 +1300)]
Merge pull request #20811 from elcapo/billing-fields
Check the billing fields returned by each payment processor
Eileen McNaughton [Sun, 7 Nov 2021 22:26:15 +0000 (11:26 +1300)]
Ensure beginHookFormElements is assigned
This ensures the variable is assigned & hence does not enotice with escape on output
colemanw [Sun, 7 Nov 2021 21:07:11 +0000 (16:07 -0500)]
Merge pull request #21995 from braders/title-attr-tidyup
Tidy up title attributes
Bradley Taylor [Sat, 6 Nov 2021 16:26:24 +0000 (16:26 +0000)]
Tidy up title attributes
Wrap text in {ts} as appropriate (for translation)
Remove poorly worded or superflous title attributes
Monish Deb [Sun, 7 Nov 2021 15:37:05 +0000 (21:07 +0530)]
Merge pull request #21998 from webmaster-cses-org-uk/patch-3
Guard against passing empty values to CRM_Core_DAO::getFieldValue()
colemanw [Sun, 7 Nov 2021 14:54:54 +0000 (09:54 -0500)]
Merge pull request #21975 from MegaphoneJon/reporting-18
Reporting #18: Fix sorting with > 10 participant roles
demeritcowboy [Sun, 7 Nov 2021 13:53:18 +0000 (08:53 -0500)]
Merge pull request #21940 from eileenmcnaughton/debug
Enotice fixes in debug.tpl that are compatible with default escaping
demeritcowboy [Sun, 7 Nov 2021 13:52:13 +0000 (08:52 -0500)]
Merge pull request #21979 from eileenmcnaughton/vars
Fix isForm to be always assigned, remove checks
Adam Wood [Sun, 7 Nov 2021 13:09:31 +0000 (13:09 +0000)]
Guard against passing empty values to CRM_Core_DAO::getFieldValue()
This change removes a potential "getFieldValue failed" error that can be thrown if an empty scalar value occurs in a multiple-contact reference custom field.
See https://lab.civicrm.org/dev/core/-/issues/2939
Replaces https://github.com/eileenmcnaughton/civicrm-core/pull/13/commits which was opened against the wrong repo.
Coleman Watts [Sun, 7 Nov 2021 00:08:41 +0000 (20:08 -0400)]
Fix weird little test failure in weird little test
Seamus Lee [Sat, 6 Nov 2021 22:22:27 +0000 (09:22 +1100)]
Merge pull request #21994 from braders/more-hardcoded-strings
Make more hardcoded strings available for translation
Coleman Watts [Sat, 6 Nov 2021 21:47:43 +0000 (17:47 -0400)]
Fix possible upgrade failures when writing to db fields which may not yet exist
Fixes dev/core#2550
Coleman Watts [Sat, 6 Nov 2021 20:33:20 +0000 (16:33 -0400)]
ManagedEntity - Add timestamp field to track user modifications
This uses hooks to update a timestamp field whenever a managed record is
manually updated by a user, allowing us to know if a record is still in its
'pristine' managed state or if it has been altered.
Coleman Watts [Fri, 5 Nov 2021 21:45:24 +0000 (17:45 -0400)]
ManagedEntities - Always delete managed record when deleting an entity
This uses hooks to ensure managed records are always cleared out when an entity is deleted.
Fixes OptionValue::delete which was previously not calling hooks.
demeritcowboy [Sat, 6 Nov 2021 18:03:31 +0000 (14:03 -0400)]
Merge pull request #21933 from eileenmcnaughton/local
Remove unused variable
Bradley Taylor [Sat, 6 Nov 2021 12:05:17 +0000 (12:05 +0000)]
Make more hardcoded strings available for translation
colemanw [Sat, 6 Nov 2021 03:44:14 +0000 (23:44 -0400)]
Merge pull request #21988 from eileenmcnaughton/isset2
Remove isset from Datasource.tpl
demeritcowboy [Fri, 5 Nov 2021 23:27:25 +0000 (19:27 -0400)]
Merge pull request #21987 from eileenmcnaughton/enotice
Enotice fixes
demeritcowboy [Fri, 5 Nov 2021 23:26:57 +0000 (19:26 -0400)]
Merge pull request #21956 from eileenmcnaughton/escape2
dev/core#1328 Add define to optionally enable escape-on-output
Eileen McNaughton [Fri, 5 Nov 2021 22:59:34 +0000 (11:59 +1300)]
Merge pull request #21990 from civicrm/5.44
5.44 to master
Eileen McNaughton [Fri, 5 Nov 2021 22:13:17 +0000 (11:13 +1300)]
Merge pull request #21985 from colemanw/searchImageFix
[Unreleased regression] SearchKit - Fix display of image fields
Eileen McNaughton [Fri, 5 Nov 2021 21:12:15 +0000 (10:12 +1300)]
Remove isset from Datasource.tpl
This comes up on the first import contact screen
Eileen McNaughton [Fri, 5 Nov 2021 20:43:19 +0000 (09:43 +1300)]
Enotice fixes
Eileen McNaughton [Mon, 1 Nov 2021 21:04:56 +0000 (10:04 +1300)]
Add define to optionally enable escape-on-output
This adjusts the smarty class such that if you have the define below
escape-on-output is enabled
This PR + fixing the use of isset in the template layer are the pre-requisites for
turning escape on output on and off. Keeping this part in an unmerged branch is
tricky as the templates need to be recompiled when you switch to a branch
which does not have this function
I envisage us starting to use this define in our dev environments fairly soon
as it's working well locally for me on
https://github.com/civicrm/civicrm-core/pull/21935
Coleman Watts [Fri, 5 Nov 2021 20:17:06 +0000 (16:17 -0400)]
AfformAdmin - Show counts in tab header
Coleman Watts [Fri, 5 Nov 2021 19:49:28 +0000 (15:49 -0400)]
SearchKit - tabbed display for custom vs packaged searches
Splits the SearchKit admin UI in to 2 tabs - one for custom (locally-defined) searches,
and one for packaged searches. Adds a "revert" button for packaged searches.
Coleman Watts [Fri, 5 Nov 2021 18:39:05 +0000 (14:39 -0400)]
SearchKit - Fix display of image fields
Mathieu Lu [Fri, 5 Nov 2021 15:36:40 +0000 (11:36 -0400)]
Merge pull request #21835 from wmortada/patch-1
Run scheduled reminder job hourly
Seamus Lee [Fri, 5 Nov 2021 07:28:39 +0000 (18:28 +1100)]
Merge pull request #21982 from civicrm/5.44
5.44
Seamus Lee [Fri, 5 Nov 2021 04:56:50 +0000 (15:56 +1100)]
Merge pull request #21980 from eileenmcnaughton/544
dev/core#2942 regression fix
Seamus Lee [Fri, 5 Nov 2021 03:17:37 +0000 (14:17 +1100)]
Merge pull request #21977 from colemanw/fixSearchKitPermissions
SearchKit - Fix permission to access default display and download spreadsheets
Eileen McNaughton [Fri, 5 Nov 2021 02:41:13 +0000 (15:41 +1300)]
dev/core#2942 regression fix
Eileen McNaughton [Fri, 5 Nov 2021 01:59:47 +0000 (14:59 +1300)]
Fix isForm to be always assigned, remove checks
Note I'm not seeing any regressions on this locally with enotice turned on - but the
worst case, if tests pass, is we get some enotices back in a scenario where we
are only impacting bleeding edge devs
Eileen McNaughton [Fri, 29 Oct 2021 20:15:29 +0000 (09:15 +1300)]
Enotice fixes in debug.tpl that are compatible with default escaping
Jon Goldberg [Thu, 4 Nov 2021 17:01:36 +0000 (13:01 -0400)]
Reporting #18: Fix sorting with > 10 participant roles
Seamus Lee [Thu, 4 Nov 2021 21:46:07 +0000 (08:46 +1100)]
Merge pull request #21912 from eileenmcnaughton/no_display
Move responsibilty for ensuring greeting parameters are set to `ensureGreetingParamsAreSet`
demeritcowboy [Thu, 4 Nov 2021 20:10:02 +0000 (16:10 -0400)]
Merge pull request #21976 from civicrm/5.44
5.44
Coleman Watts [Thu, 4 Nov 2021 19:42:31 +0000 (15:42 -0400)]
SearchKit - Fix permission to access default display and download spreadsheets
Intentionally setting these gatekeeper permissions fairly open as all of these actions
perform stricter permission checks internally.
demeritcowboy [Thu, 4 Nov 2021 17:39:07 +0000 (13:39 -0400)]
Merge pull request #21974 from christianwach/lab-core-2909-2
dev/core#2909 - Repair the option value label for nb_NO language
Christian Wach [Thu, 4 Nov 2021 15:20:13 +0000 (15:20 +0000)]
Repair the option value label for nb_NO language
Matthew Wire [Wed, 3 Nov 2021 17:43:48 +0000 (17:43 +0000)]
Fix undefined currency on event registration
CiviCRM [Thu, 4 Nov 2021 07:53:51 +0000 (07:53 +0000)]
Set version to 5.45.alpha1
CiviCRM [Thu, 4 Nov 2021 07:47:04 +0000 (07:47 +0000)]
Set version to 5.44.beta1
Seamus Lee [Thu, 4 Nov 2021 05:16:52 +0000 (16:16 +1100)]
Merge pull request #21972 from eileenmcnaughton/gettok
Remove call to getTokenDetails
Eileen McNaughton [Thu, 4 Nov 2021 03:39:13 +0000 (16:39 +1300)]
Merge pull request #21967 from colemanw/searchRunFix
SearchKit - Fix incorrect pager count when using filters
Eileen McNaughton [Thu, 4 Nov 2021 03:35:46 +0000 (16:35 +1300)]
Merge pull request #21947 from colemanw/cssRules
SearchKit - Conditional style rules for rows/cells
Eileen McNaughton [Thu, 4 Nov 2021 03:32:32 +0000 (16:32 +1300)]
Merge pull request #21957 from eileenmcnaughton/lang
Use null variables rather than isset in Core_Block
Tim Otten [Thu, 4 Nov 2021 03:26:27 +0000 (20:26 -0700)]
transitionParticipants() - Improve $contactDetails cache maintenance
This revises a very recent commit that touches `static $contactDetails` cache.
Imagine you have two calls to `transitionParticipants()` which involve different-but-overlapping sets:
* First invocation involves Alice and Bob
* Second invocation involves Bob and Carol
The first invocation loads Alice and Bob into `$contactDetails`. The second
invocation identifies Carol as missing. We need to load Carol. Here's the change:
* Before: Carol overwrites Bob in `$contactDetails`. Bob goes missing.
* After: Alice, Bob, and Carol all exist in `$contactDetails`.
Eileen McNaughton [Thu, 4 Nov 2021 02:50:57 +0000 (15:50 +1300)]
Merge pull request #21942 from mattwire/gccachedrop
GroupContactCache: Drop temp table *after* releasing lock
Eileen McNaughton [Wed, 3 Nov 2021 21:27:16 +0000 (10:27 +1300)]
Remove call to getTokenDetails
This is tested vi CRM_Event_Form_Task_BatchTest::testSubmitCancel