Seamus Lee [Fri, 11 Dec 2020 07:40:41 +0000 (18:40 +1100)]
Merge pull request #19176 from eileenmcnaughton/533m
dev/core#2246 Fix failure to filter exports
Eileen McNaughton [Fri, 11 Dec 2020 05:13:06 +0000 (18:13 +1300)]
Merge pull request #19173 from eileenmcnaughton/533
dev/core#2244 Simplify and consistently apply checking of whether financial acls are enabled
eileen [Fri, 11 Dec 2020 05:04:25 +0000 (18:04 +1300)]
dev/core#2246 Fix failure to filter exports
This fixes regression caused by us more consistently setting componentTable.
The short version here is that the presence of a componentClause should take precedences
over the inner join intended as a blunt, and maybe unnecessary, measure to
limit the export to the entity in question
eileen [Fri, 11 Dec 2020 02:26:21 +0000 (15:26 +1300)]
dev/core#2244 Simplify and consistently apply checking of whether financial acls are enabled
Per https://lab.civicrm.org/dev/core/-/issues/2244 the move of some handling to this function
did not consistently include an early return when the setting is toggled off.
Eventually there will be no setting - just 'is this extension enabled or not' but
in the transition we need this. The new version is easier to copy and paste :-)
and uses a function in the extension. The function in the main code base is
mostly a lot of code to handle the way the setting used to be stored & it
could just check the setting too now
Seamus Lee [Thu, 10 Dec 2020 21:08:50 +0000 (08:08 +1100)]
Merge pull request #19159 from colemanw/api4DynamicJoinFix
APIv4 - Fix dynamic bridge joins (used by Search Kit)
Seamus Lee [Thu, 10 Dec 2020 20:28:10 +0000 (07:28 +1100)]
Merge pull request #19161 from seamuslee001/5.33
Add release-notes/5.32.1
Tim Otten [Sat, 5 Dec 2020 07:51:41 +0000 (23:51 -0800)]
Add release-notes/5.32.1
Coleman Watts [Thu, 10 Dec 2020 19:24:29 +0000 (14:24 -0500)]
APIv4 - Fix dynamic bridge joins
Move ON clause conditions to the first join when they reference the bridge entity itself
Ensure bridge joins work with joining the same table to itself (e.g. Contact to Contact via RelationshipCache)
Seamus Lee [Wed, 9 Dec 2020 23:10:05 +0000 (10:10 +1100)]
Merge pull request #19120 from eileenmcnaughton/fee
Handle possibility of fee_amount = ''
Eileen McNaughton [Wed, 9 Dec 2020 20:44:19 +0000 (09:44 +1300)]
Merge pull request #19150 from colemanw/searchKitJoins
Search kit joins
Coleman Watts [Wed, 9 Dec 2020 15:08:43 +0000 (10:08 -0500)]
Search kit: bump version
Coleman Watts [Wed, 9 Dec 2020 14:27:16 +0000 (09:27 -0500)]
Search kit: Improve labels & relevance of smart group field selection
Coleman Watts [Wed, 9 Dec 2020 13:15:22 +0000 (08:15 -0500)]
Search kit: Display join name as part of default label
Tim Otten [Wed, 9 Dec 2020 06:33:10 +0000 (22:33 -0800)]
Merge pull request #19125 from eileenmcnaughton/ev533
CiviEvent - Error registering participants via search task
Seamus Lee [Wed, 9 Dec 2020 00:57:43 +0000 (11:57 +1100)]
Merge pull request #19141 from seamuslee001/dev_core_2232_2
dev/core#2232 Permit hook_civicrm_container and some other prebootish…
Coleman Watts [Tue, 8 Dec 2020 23:04:14 +0000 (18:04 -0500)]
Search kit: Wider dropdowns for entity selection
Coleman Watts [Tue, 8 Dec 2020 22:52:44 +0000 (17:52 -0500)]
Search kit: Add UI support for multiple, nested joins
Seamus Lee [Tue, 8 Dec 2020 01:02:23 +0000 (12:02 +1100)]
dev/core#2232 Permit hook_civicrm_container and some other prebootish hooks to run during upgrade and clear out the asset builder cache post upgrade
Tim Otten [Tue, 8 Dec 2020 05:27:13 +0000 (21:27 -0800)]
CRM_Event_Form_Task_Register - Fix error "getFieldValue failed" (tentative)
When preparing the event-registration form, `CRM_Event_Page_Tab::preProcess()` looks up the designated contact ID and
calls `checkUserPermission()`. The error message is (effectively) reporting that the permission-check fails because
there is no contact ID.
And this is a legit thing to complain about -- if you're embedding the event-registration form as part of a
search-task, then there is no *singular* contact ID. (There is a potentially very long list of contact IDs - which is
probably stored/reported some other way.) The permission-check for this context seems like it ought to be different.
I labeled the commit (tentative) because I'm not entirely certain that I understand the contract of this
route/controller. It has multiple overlapping use-cases, and I'm not certain if I've tracked them all. However, this
patch does seem to fix the "getFieldValue failed" problem when running as a search-task.
Seamus Lee [Mon, 7 Dec 2020 23:36:40 +0000 (10:36 +1100)]
Merge pull request #19139 from seamuslee001/dev_core_2235
[NFC] dev/core#2235 Fix url link to the OrderAPI Documenation
Seamus Lee [Mon, 7 Dec 2020 19:41:43 +0000 (06:41 +1100)]
[NFC] dev/core#2235 Fix url link to the OrderAPI Documenation
Coleman Watts [Mon, 7 Dec 2020 19:19:20 +0000 (14:19 -0500)]
Search kit: Add explicit conditions on entityBridge joins
Seamus Lee [Mon, 7 Dec 2020 07:44:24 +0000 (18:44 +1100)]
Merge pull request #19134 from mglaman/patch-2
Fix mglaman mapping
Matt Glaman [Mon, 7 Dec 2020 05:08:50 +0000 (23:08 -0600)]
Fix mglaman mapping
Tim Otten [Sat, 5 Dec 2020 07:29:28 +0000 (23:29 -0800)]
Event Registration Task - Propagate different qfKey & action for AJAX URLs
When use the search-task to register event participants, the qfKey is
mismatched, and the action is VIEW. It should be ADD, and the qfKey
should be for CRM_Event_Form_Participant.
eileen [Sat, 5 Dec 2020 02:07:50 +0000 (15:07 +1300)]
Additional fix
Seamus Lee [Fri, 4 Dec 2020 20:03:26 +0000 (07:03 +1100)]
Fix Fatal Error on trying to use the Register contacts to an event Advanced Search task
Eileen McNaughton [Sat, 5 Dec 2020 05:00:49 +0000 (18:00 +1300)]
Merge pull request #19123 from totten/5.33-search-range
dev/core#2188 - Upgrader - Cleanup any invalid combinations of is_search_range
Seamus Lee [Sat, 5 Dec 2020 00:38:28 +0000 (11:38 +1100)]
Merge pull request #19119 from eileenmcnaughton/532b
dev/core#2231 fix failure to calculate next_scheduled_date
Tim Otten [Sat, 5 Dec 2020 00:35:37 +0000 (16:35 -0800)]
dev/core#2188 - Upgrader - Cleanup any invalid combinations of is_search_range=1
These invalid configurations were previously asymptomatic in 5.30 but became symptomatic in 5.31.
colemanw [Sat, 5 Dec 2020 00:35:10 +0000 (19:35 -0500)]
Merge pull request #19105 from colemanw/searchJoins
Search Kit: Support robust joins in UI
Tim Otten [Sat, 5 Dec 2020 00:34:05 +0000 (16:34 -0800)]
Set version to 5.33.beta2
eileen [Fri, 4 Dec 2020 21:17:17 +0000 (10:17 +1300)]
Handle possibility of fee_amount = ''
eileen [Fri, 4 Dec 2020 21:08:30 +0000 (10:08 +1300)]
dev/core#2231 fix failure to calculate next_scheduled_date
Seamus Lee [Fri, 4 Dec 2020 05:42:29 +0000 (16:42 +1100)]
Merge pull request #19107 from eileenmcnaughton/oauth
Unhide oauth extension
Eileen McNaughton [Fri, 4 Dec 2020 03:20:07 +0000 (16:20 +1300)]
Merge pull request #19104 from MegaphoneJon/export-fix
Unable to export contacts in Civi 5.32+
eileen [Fri, 4 Dec 2020 01:04:56 +0000 (14:04 +1300)]
Unhide oauth extension
We previously indicated in dev-digest oauth would ship in 5.32 &
be unhidden in 5.33 but we forgot to do the last bit
Coleman Watts [Fri, 4 Dec 2020 00:28:00 +0000 (19:28 -0500)]
Search Ext: Support robust joins in UI
This uses better join metadata to give explicit conditions for each join,
removing the ambiguity when more than one type of join is possible between the same 2 entities.
It also adds support for joins via EntityBridge APIs.
Eileen McNaughton [Fri, 4 Dec 2020 00:25:46 +0000 (13:25 +1300)]
Merge pull request #19101 from colemanw/searchJoins
Improve APIv4 metadata for RelationshipCache and Bridge entities in general
Jon Goldberg [Fri, 4 Dec 2020 00:16:14 +0000 (19:16 -0500)]
Potential fix for 5.32+ unable to export contacts
Coleman Watts [Thu, 3 Dec 2020 20:55:53 +0000 (15:55 -0500)]
Improve APIv4 metadata for RelationshipCache and Bridge entities in general
These are the core changes needed toward geting joins supported by Search Kit
CiviCRM [Thu, 3 Dec 2020 06:54:04 +0000 (06:54 +0000)]
Set version to 5.33.beta1
Seamus Lee [Thu, 3 Dec 2020 06:24:51 +0000 (17:24 +1100)]
Merge pull request #19093 from civicrm/5.32
5.32
Tim Otten [Thu, 3 Dec 2020 06:23:36 +0000 (22:23 -0800)]
Merge pull request #19094 from totten/5.32-bump0
(NFC) release-notes/5.32.0 - Add RC-stage updates
Tim Otten [Thu, 3 Dec 2020 06:18:38 +0000 (22:18 -0800)]
release-notes/5.32.0 - Add RC-stage updates
Tim Otten [Thu, 3 Dec 2020 05:25:48 +0000 (21:25 -0800)]
Merge pull request #19092 from seamuslee001/dev_core_2228
dev/core#2228 Fix issue where by changing location type tries to pass…
Tim Otten [Thu, 3 Dec 2020 04:54:14 +0000 (20:54 -0800)]
Merge pull request #19091 from eileenmcnaughton/form
Fix fatal error on payment edit form
Seamus Lee [Thu, 3 Dec 2020 01:56:05 +0000 (12:56 +1100)]
dev/core#2228 Fix issue where by changing location type tries to pass in number:... in the API
eileen [Thu, 3 Dec 2020 01:29:19 +0000 (14:29 +1300)]
Fix fatal error on payment edit form
Seamus Lee [Thu, 3 Dec 2020 01:25:50 +0000 (12:25 +1100)]
Merge pull request #19090 from civicrm/5.32
5.32
Seamus Lee [Wed, 2 Dec 2020 23:12:45 +0000 (10:12 +1100)]
Merge pull request #19014 from eileenmcnaughton/cancel
dev/core#927 Add test demonstrating that an extraneous activity is being created & fix
Seamus Lee [Wed, 2 Dec 2020 22:42:06 +0000 (09:42 +1100)]
Merge pull request #19088 from seamuslee001/dev_core_2227
Ensure that the is_deleted filter is added correctly if we are not se…
Seamus Lee [Wed, 2 Dec 2020 02:25:12 +0000 (13:25 +1100)]
Ensure that the is_deleted filter is added correctly if we are not searching for deleted contacts but have access to view deleted contacts
Simplify IF down as per feed back from ACD and also comment from Eileen in chat and extend unit test as well
colemanw [Wed, 2 Dec 2020 13:10:46 +0000 (08:10 -0500)]
Merge pull request #19053 from totten/master-afform-tweak
Afform - Update fields and HTML mode in web-based editors
Tim Otten [Wed, 25 Nov 2020 19:13:02 +0000 (11:13 -0800)]
afGuiEditor - Add optional preview of HTML output
Tim Otten [Wed, 25 Nov 2020 19:11:11 +0000 (11:11 -0800)]
afGuiEditor - Switch canvas panel to use tabs
(1) This makes the canvas and palette line-up more nicely.
(2) This will allow more tabs.
Tim Otten [Wed, 25 Nov 2020 10:07:34 +0000 (02:07 -0800)]
Afform.convert - Add stateless helper API to convert between layouts
Tim Otten [Wed, 25 Nov 2020 09:02:05 +0000 (01:02 -0800)]
crmMonaco - Accept pass-thru arguments to Monaco
Tim Otten [Wed, 25 Nov 2020 08:02:56 +0000 (00:02 -0800)]
Convert af-monaco to crm-monaco
Tim Otten [Wed, 25 Nov 2020 07:14:31 +0000 (23:14 -0800)]
_af_fill_field_metadata() - Provide metadata about selected fields (regardless of DB permissions)
Tim Otten [Tue, 1 Dec 2020 00:24:39 +0000 (16:24 -0800)]
afHtmlEditor - Add descriptions. Add more missing fields.
Tim Otten [Wed, 25 Nov 2020 07:13:55 +0000 (23:13 -0800)]
afHtmlEditor - Use more BS3
Tim Otten [Wed, 25 Nov 2020 05:03:14 +0000 (21:03 -0800)]
afGuiEditor - Allow editing `is_public`
Tim Otten [Wed, 25 Nov 2020 05:02:42 +0000 (21:02 -0800)]
afGuiEditor - Add help blocks. Reorder in anticipation of more fields.
Eileen McNaughton [Tue, 1 Dec 2020 18:57:35 +0000 (07:57 +1300)]
Merge pull request #19087 from civicrm/5.32
5.32
colemanw [Tue, 1 Dec 2020 14:58:46 +0000 (09:58 -0500)]
Merge pull request #19082 from compucorp/dev-core-1790-contact-card-delay
dev/core#1790: Add short delay before closing tooltip elements
Seamus Lee [Tue, 1 Dec 2020 09:44:51 +0000 (20:44 +1100)]
Merge pull request #19084 from eileenmcnaughton/prod
dev/drupal#148 Fix product form such that it is possible to unseletc …
eileen [Tue, 1 Dec 2020 03:42:42 +0000 (16:42 +1300)]
dev/drupal#148 Fix product form such that it is possible to unseletc duration unit, frequency unit
Eileen McNaughton [Tue, 1 Dec 2020 02:49:47 +0000 (15:49 +1300)]
Merge pull request #19078 from seamuslee001/emoiji_test_api3
[NFC] Add in an Emoji test for APIv3 as per Eileen's PR
Seamus Lee [Tue, 1 Dec 2020 01:13:52 +0000 (12:13 +1100)]
Merge pull request #19075 from colemanw/searchable
Improve schema metadata for Search Kit
René Olivo [Tue, 1 Dec 2020 00:20:37 +0000 (00:20 +0000)]
dev/core#1790: Add short delay before closing tooltip elements
Seamus Lee [Mon, 30 Nov 2020 23:44:53 +0000 (10:44 +1100)]
Merge pull request #19081 from civicrm/5.32
5.32
Seamus Lee [Mon, 30 Nov 2020 23:44:24 +0000 (10:44 +1100)]
Merge pull request #19077 from seamuslee001/dev_core_2213
dev/core#2213 Protect against 404s when wpBasePage is mixed case
Seamus Lee [Mon, 30 Nov 2020 23:35:52 +0000 (10:35 +1100)]
Merge pull request #19080 from seamuslee001/master
5.32
Seamus Lee [Mon, 30 Nov 2020 23:34:33 +0000 (10:34 +1100)]
Merge in 5.32
Seamus Lee [Mon, 30 Nov 2020 23:32:45 +0000 (10:32 +1100)]
Merge pull request #19076 from seamuslee001/update_cache_integration_tests
[NFC] Update Cache/integration-tests version as new version recently …
Seamus Lee [Mon, 30 Nov 2020 23:23:26 +0000 (10:23 +1100)]
[NFC] Add in an Emoji test for APIv3 as per Eileen's PR
Seamus Lee [Mon, 30 Nov 2020 23:22:39 +0000 (10:22 +1100)]
Merge pull request #18918 from eileenmcnaughton/emoji
dev/core#2165 Test for Handle emojis less fatally where not supported
Coleman Watts [Mon, 30 Nov 2020 20:10:46 +0000 (15:10 -0500)]
Annotate DAO files with COMPONENT, exclude disabled components' entities from APIv4 Entity::get
Seamus Lee [Mon, 30 Nov 2020 23:03:48 +0000 (10:03 +1100)]
Merge pull request #19044 from seamuslee001/dev_drupal_149
dev/drupal#149 Override sessionStart function for Drupal8 using appro…
Christian Wach [Fri, 27 Nov 2020 16:13:53 +0000 (16:13 +0000)]
dev/core#2213 Protect against 404s when wpBasePage is mixed case
Seamus Lee [Mon, 30 Nov 2020 21:34:05 +0000 (08:34 +1100)]
[NFC] Update Cache/integration-tests version as new version recently released that contains the patches already applied
eileen [Tue, 3 Nov 2020 22:07:37 +0000 (11:07 +1300)]
dev/core#2165 Test & fix for Handle emojis less fatally where not supported
Fix emoji handling by returning always-false when unwelcomely present
Coleman Watts [Mon, 30 Nov 2020 19:23:53 +0000 (14:23 -0500)]
Add @searchable annotation to denote which API entities should be visible in Search Kit UI
Eileen McNaughton [Mon, 30 Nov 2020 18:21:07 +0000 (07:21 +1300)]
Merge pull request #19063 from christianwach/lab-core-2213
Protect against 404s when wpBasePage is mixed case
Eileen McNaughton [Mon, 30 Nov 2020 00:20:36 +0000 (13:20 +1300)]
Merge pull request #19070 from mattwire/extensionupgrademsg
Extract function that generates upgrade link for extensions
Matthew Wire [Sun, 29 Nov 2020 20:04:03 +0000 (20:04 +0000)]
Extract function that generates upgrade link for extensions
Matthew Wire [Sun, 29 Nov 2020 15:30:37 +0000 (15:30 +0000)]
Merge pull request #18612 from mattwire/tokenprocessorsimplify
REF Simplify tokenProcessor code
Eileen McNaughton [Sat, 28 Nov 2020 22:46:48 +0000 (11:46 +1300)]
Merge pull request #19025 from sunilpawar/favourite_country
Feature to provide mostly used countries in top section of Country select list
Matthew Wire [Sat, 26 Sep 2020 17:55:38 +0000 (18:55 +0100)]
Simplify tokenProcessor code for activities
Matthew Wire [Sat, 28 Nov 2020 18:31:14 +0000 (18:31 +0000)]
Merge pull request #19065 from colemanw/campaignTabs
Minor tabs cleanup toward fixing dev/core#2215
Coleman Watts [Sat, 28 Nov 2020 00:30:32 +0000 (19:30 -0500)]
Minor tabs cleanup
1. Avoid overwriting CRM.tabSettings.active by cloning the variable rather than copying by reference
2. Initialize tabs only once on the Campaign dashboard
colemanw [Fri, 27 Nov 2020 16:30:10 +0000 (11:30 -0500)]
Merge pull request #19059 from eileenmcnaughton/2199_ufgroup_pre_post_hook
Remove use of nullArray in delete hooks
Christian Wach [Fri, 27 Nov 2020 16:13:53 +0000 (16:13 +0000)]
Protect against 404s when wpBasePage is mixed case
colemanw [Fri, 27 Nov 2020 15:45:38 +0000 (10:45 -0500)]
Merge pull request #19060 from eileenmcnaughton/ufadd
Deprecate UFGroup::add parameter ids
Sunil Pawar [Fri, 27 Nov 2020 08:08:39 +0000 (13:38 +0530)]
added test case, ts for help text in setting file, changed static variable logic
eileen [Fri, 27 Nov 2020 07:16:32 +0000 (20:16 +1300)]
Deprecate UFGroup::add parameter ids
This is only passed in from one place. This PR removes it & adds noisy deprecation
eileen [Fri, 27 Nov 2020 07:05:06 +0000 (20:05 +1300)]
Remove use of nullArray in delete hooks
Looking at #18995 I was struck by the delete hook being non-standard. In general we don't load from the DB just to pass
to the hook as the hook can do that itself. However, when I looked at other hooks
I found that they were passing out nullArray - this is a legacy method that precedes
being on a php version that supported default params when passing by reference.
It's further known to introduce intermittent hard to debug issues. This adds the new hook
and also adds standardisation to the other hooks for pre+delete.
I've left the create one for now but GroupContact is a good example of something
close to what we want to standardise on there
Seamus Lee [Wed, 25 Nov 2020 09:53:06 +0000 (20:53 +1100)]
dev/drupal#149 Override sessionStart function for Drupal8 using appropriate session functions
Use Drupal Session service and don't worry about calling migrate
Seamus Lee [Fri, 27 Nov 2020 01:37:05 +0000 (12:37 +1100)]
Merge pull request #19050 from eileenmcnaughton/pp
[REF] Remove excess handling around contact_id