colemanw [Wed, 30 Jun 2021 14:45:13 +0000 (10:45 -0400)]
Merge pull request #20724 from colemanw/apiFieldPermissions
APIv4 - Silently ignore non-permissioned fields instead of throwing exceptions
demeritcowboy [Wed, 30 Jun 2021 14:25:13 +0000 (10:25 -0400)]
Merge pull request #20662 from colemanw/contactSummaryImageRegion
Add contact-summary-image region
Matthew Wire [Wed, 30 Jun 2021 13:42:15 +0000 (14:42 +0100)]
Merge pull request #20450 from jaapjansma/dev_financials_6_reports
dev/financial#6 Do not include template contributions in reports
Jaap Jansma [Wed, 30 Jun 2021 11:30:43 +0000 (13:30 +0200)]
dev/financial#6 do not include template contributions in reports
Coleman Watts [Tue, 29 Jun 2021 03:14:32 +0000 (23:14 -0400)]
APIv4 - Silently ignore non-permissioned fields instead of throwing exceptions
Previously the api would throw an exception when the user did not have permission to use a field
in the WHERE or HAVING clause.
Monish Deb [Wed, 30 Jun 2021 06:57:57 +0000 (12:27 +0530)]
Merge pull request #20715 from colemanw/fixFkJoins
APIv4 - Fix same-table joins and remove unused code
Monish Deb [Wed, 30 Jun 2021 06:07:09 +0000 (11:37 +0530)]
Merge pull request #20654 from eileenmcnaughton/part_fix
Fix bug where only one participant registration is completed
Seamus Lee [Wed, 30 Jun 2021 00:05:48 +0000 (10:05 +1000)]
Merge pull request #20726 from colemanw/fixUndefinedTplVars
Fix undefined tpl vars on custom field page
Seamus Lee [Tue, 29 Jun 2021 21:58:11 +0000 (07:58 +1000)]
Merge pull request #20716 from colemanw/emitApi4NoticesAboutDeprecatedJoinAliases
APIv4 - Emit notices about deprecated join aliases
Coleman Watts [Tue, 29 Jun 2021 21:46:09 +0000 (17:46 -0400)]
Fix undefined tpl vars on custom field page
Seamus Lee [Tue, 29 Jun 2021 20:50:57 +0000 (06:50 +1000)]
Merge pull request #20725 from colemanw/fixUndefinedRowClass
Fix often undefined variable $row.class in tpl tables
Coleman Watts [Tue, 29 Jun 2021 18:26:13 +0000 (14:26 -0400)]
Fix often undefined variable $row.class in tpl tables
Coleman Watts [Mon, 28 Jun 2021 16:37:06 +0000 (12:37 -0400)]
APIv4 - Use non-deprecated join syntax internally
Updates APIv4 calls in CiviCRM core to use e.g. `event_id.title` instead of `event.title`
Seamus Lee [Tue, 29 Jun 2021 05:48:38 +0000 (15:48 +1000)]
Merge pull request #20723 from colemanw/api4ExplorerJoins
APIv4 Explorer - Render joins using addJoin function in OOP
Eileen McNaughton [Tue, 29 Jun 2021 03:35:36 +0000 (15:35 +1200)]
Merge pull request #20707 from colemanw/getIdField
APIv4 - Don't assume the identifier field for a table is named 'id'
Matthew Wire [Mon, 28 Jun 2021 22:35:01 +0000 (23:35 +0100)]
Merge pull request #20452 from jaapjansma/dev_financials_6_contactsummary
dev/financial#6 Template contributions on the contact summary
Matthew Wire [Mon, 28 Jun 2021 22:33:18 +0000 (23:33 +0100)]
Merge pull request #20451 from jaapjansma/dev_financials_6_search
dev/financial#6 Added is template to search screen
Seamus Lee [Mon, 28 Jun 2021 21:53:44 +0000 (07:53 +1000)]
Merge pull request #20722 from demeritcowboy/sms-translate
dev/core#1711 - small translation improvement
Coleman Watts [Sun, 27 Jun 2021 04:41:00 +0000 (00:41 -0400)]
APIv4 - Emit notices about deprecated join aliases
colemanw [Mon, 28 Jun 2021 19:51:18 +0000 (15:51 -0400)]
Merge pull request #20721 from colemanw/apiExplorerBridge
APIv4 Explorer - When joining via EntityBridge, make bridge fields selectable
Coleman Watts [Mon, 28 Jun 2021 19:47:53 +0000 (15:47 -0400)]
APIv4 Explorer - Render joins using addJoin function in OOP
demeritcowboy [Mon, 28 Jun 2021 18:47:55 +0000 (14:47 -0400)]
translation improvement - dev/core#1711
Coleman Watts [Mon, 28 Jun 2021 17:52:16 +0000 (13:52 -0400)]
APIv4 Explorer - When joining via EntityBridge, make bridge fields selectable
demeritcowboy [Mon, 28 Jun 2021 13:15:51 +0000 (09:15 -0400)]
Merge pull request #20720 from mattwire/extensionsaddnewdescription
Replace extension key with description in 'Add New' tab
Matthew Wire [Mon, 28 Jun 2021 08:47:13 +0000 (09:47 +0100)]
Replace extension key with description in 'Add New' tab as already done in main list
Seamus Lee [Mon, 28 Jun 2021 02:12:33 +0000 (12:12 +1000)]
Merge pull request #20220 from johntwyman/core-1711-show-sms-segment-count
dev/core#1711 - Display SMS segment count when constructing Mass SMS
Eileen McNaughton [Mon, 28 Jun 2021 01:22:05 +0000 (13:22 +1200)]
Merge pull request #20711 from demeritcowboy/dashboard-err
Some php warnings on case dashboard
John Twyman [Wed, 5 May 2021 01:11:56 +0000 (11:11 +1000)]
dev/core-1711 Show segment count for SMS construction
Use Standard methods for downloading third party js package
Update composer.lock
Seamus Lee [Sun, 27 Jun 2021 23:02:08 +0000 (09:02 +1000)]
Merge pull request #20713 from totten/5.39-setup-url
dev/core#2663 - Setup - Consistently handle special characters per URL conventions
Eileen McNaughton [Sun, 27 Jun 2021 20:52:04 +0000 (08:52 +1200)]
Merge pull request #20714 from demeritcowboy/fix-time
Hopefully fix time rollover problem in MessageTemplateTest
Coleman Watts [Sat, 26 Jun 2021 01:19:06 +0000 (21:19 -0400)]
APIv4 - Fix same-table joins and remove unused code
This fixes implicit joins between a table and itself, e.g. the Contact.employer_id which links to the Contact table
Also removes alpha code no longer used by APIv4.
demeritcowboy [Sat, 26 Jun 2021 23:34:07 +0000 (19:34 -0400)]
Merge pull request #20697 from eileenmcnaughton/prem
Remove deprecated use of format money
colemanw [Sat, 26 Jun 2021 00:58:48 +0000 (20:58 -0400)]
Merge pull request #20712 from demeritcowboy/newcase-1
Some php warnings on new case
Tim Otten [Fri, 25 Jun 2021 22:12:14 +0000 (15:12 -0700)]
dev/core#2663 - Setup - Consistently handle special characters per URL conventions
Overview
--------
This addresses a problem with the setup UI when installing CiviCRM with certain database credentials.
Specifically, it handles special characters more correctly.
https://lab.civicrm.org/dev/core/-/issues/2663
Before
------
If the database password requires any special characters (e.g. "#" or "&"), then they cannot correctly
entered.
There are two ways you might try to enter a password (e.g. plain
`mysql://myuser:top#secret...`or URL-encoded `mysql://myuser:top%23secret...`). Neither
of these work. (The plain notation might pass the validator, but it won't be written correctly to disk.
The URL-encoded notation won't pass the validator.)
After
-----
You may use special characters, as long as the URL is properly encoded, e.g. `mysql://myuser:top%23secret...`
demeritcowboy [Fri, 25 Jun 2021 22:03:03 +0000 (18:03 -0400)]
fix time rollover
Coleman Watts [Thu, 24 Jun 2021 20:24:34 +0000 (16:24 -0400)]
APIv4 - add test for id_field
Coleman Watts [Thu, 24 Jun 2021 19:36:23 +0000 (15:36 -0400)]
APIv4 - Don't assume the identifier field for a table is named 'id'
APIv4 getInfo() now returns the name of the "id_field" for any entity.
This modifies the selectQuery so that `get` actions rely on that metadata.
demeritcowboy [Fri, 25 Jun 2021 17:12:43 +0000 (13:12 -0400)]
php errors
demeritcowboy [Fri, 25 Jun 2021 16:29:35 +0000 (12:29 -0400)]
php warnings
Seamus Lee [Fri, 25 Jun 2021 07:53:54 +0000 (17:53 +1000)]
Merge pull request #20694 from colemanw/validateCustomGroupName
Ensure custom group name does not conflict with existing field
Seamus Lee [Fri, 25 Jun 2021 04:54:24 +0000 (14:54 +1000)]
Merge pull request #20708 from colemanw/cacheApi4Info
[REF] - Improve efficiency of APIv4 GetInfo
Seamus Lee [Fri, 25 Jun 2021 04:53:05 +0000 (14:53 +1000)]
Merge pull request #20696 from eileenmcnaughton/except
Throw exception when baoName is not found
Eileen McNaughton [Fri, 25 Jun 2021 03:30:34 +0000 (15:30 +1200)]
Merge pull request #20709 from colemanw/api4CleanupBridgeJoinable
APIv4 - Remove POC code leftover from early alpha development
Eileen McNaughton [Wed, 23 Jun 2021 05:31:40 +0000 (17:31 +1200)]
Throw exception when baoName is not found
It the BAO name is not found at this point we currently get a fatal error. This makes it more
recoverable. The specific case I'm hitting at the moment relates to monolog - the
caching of the symfony container means it persists between builds and is
accessed before the extension is installed. However the entity is not
yet registered. Historically I have hit this fatal in other
scenarios but I can't recall the details.
Coleman Watts [Thu, 24 Jun 2021 20:24:58 +0000 (16:24 -0400)]
APIv4 - Refactor getInfo calls to use new utility function
Coleman Watts [Thu, 24 Jun 2021 20:09:33 +0000 (16:09 -0400)]
APIv4 - Store entity info in metadata cache
Note that this caches the info returned by the generic function in
`AbstractEntity::getInfo()` and some entities override that function.
However the overrides generally call the parent and do not perform any expensive
computations of their own, so this seems like the best spot to add caching.
Coleman Watts [Fri, 25 Jun 2021 01:38:56 +0000 (21:38 -0400)]
APIv4 - Remove POC code from early alpha
During early APIv4 development there was an idea to create a BridgeJoinable class and
connect things like activity->assignees.
It was experimentally implemented for that field one field, but never documented or tested.
Seamus Lee [Thu, 24 Jun 2021 09:29:23 +0000 (19:29 +1000)]
Merge pull request #20631 from eileenmcnaughton/custom_ref
dev/core#2656 Add test to demonstrate issue / bug
Seamus Lee [Thu, 24 Jun 2021 09:27:15 +0000 (19:27 +1000)]
Merge pull request #20673 from colemanw/contactTabsCleanup
REF - Get Contact Summary tab counts after calling hook to avoid wasting time
Seamus Lee [Thu, 24 Jun 2021 06:23:57 +0000 (16:23 +1000)]
Merge pull request #20705 from eileenmcnaughton/prim
Fix schema support for composite primary keys
Eileen McNaughton [Thu, 24 Jun 2021 04:18:51 +0000 (16:18 +1200)]
Merge pull request #20698 from colemanw/limit25ForGet
APIv4 Explorer - Only apply default limit 25 for "get" action
Eileen McNaughton [Thu, 24 Jun 2021 03:24:46 +0000 (15:24 +1200)]
Fix support for composite primary keys
Fixes what looks like an oversight
https://github.com/civicrm/civicrm-core/commit/
022785d8d5d4876aa1211b7adc0d7c31e2995fc5#diff-08ba0d294c1f2e5b9d42e4768aa3b30a10e5128809c590f155c5ac0cc9b2f69cL480-L481
An 'if' was added but the uncondition line left in
The result is that if a composite primary field IS defined
per below an entry for it is incorrectly added to the field
array with just autoincrement set.
`
<primaryKey>
<name>contact_timestamp_type</name>
<field>contact_identifier</field>
<field>recipient_action_datetime</field>
<field>event_type</field>
</primaryKey>
`
Eileen McNaughton [Wed, 23 Jun 2021 21:48:35 +0000 (09:48 +1200)]
Merge pull request #20700 from colemanw/removeApi4BoilerplateComment
[NFC] Remove boilerplate comment block from APIv4 classes
Eileen McNaughton [Wed, 23 Jun 2021 21:45:46 +0000 (09:45 +1200)]
Merge pull request #20701 from colemanw/apiEntitySince
APIv4 - Add `@since` annotation to each entity
Eileen McNaughton [Wed, 23 Jun 2021 19:54:18 +0000 (07:54 +1200)]
Merge pull request #20703 from civicrm/5.39
5.39 to master
Eileen McNaughton [Wed, 23 Jun 2021 19:53:45 +0000 (07:53 +1200)]
Merge pull request #20699 from demeritcowboy/urlfix-539
Backport of 20641 - url fix on payment edit form
Coleman Watts [Wed, 23 Jun 2021 19:05:25 +0000 (15:05 -0400)]
APIv4 - Add `@since` annotation to each entity
This will be output by `Entity:get` to show which version each entity was added
Coleman Watts [Wed, 23 Jun 2021 16:13:01 +0000 (12:13 -0400)]
Remove boilerplate code block from APIv4 classes
demeritcowboy [Wed, 23 Jun 2021 12:40:26 +0000 (08:40 -0400)]
backport 20641
Seamus Lee [Wed, 23 Jun 2021 08:15:37 +0000 (18:15 +1000)]
Merge pull request #20693 from eileenmcnaughton/trigg
Fix sorting for drop triggers
Jaap Jansma [Wed, 23 Jun 2021 08:04:21 +0000 (10:04 +0200)]
dev/financial#6 Added is template to search screen
Coleman Watts [Wed, 23 Jun 2021 06:21:07 +0000 (02:21 -0400)]
APIv4 Explorer - Only apply default limit 25 for "get" action
The API Explorer sets a default limit of 25 so you don't get an overwhelming result set
from a `get` action.
However, for other actions like `getFields` or `getActions`, there is no need for
a limit and the default is annoying.
Eileen McNaughton [Wed, 23 Jun 2021 06:00:15 +0000 (18:00 +1200)]
Remove deprecated use of format money
This is logging deprecation errors. It doesn't work quite right before or after but
I suspect no-one much cares as it hasn't been raised before now
Coleman Watts [Wed, 23 Jun 2021 05:05:54 +0000 (01:05 -0400)]
Ensure custom group name does not conflict with existing field
Eileen McNaughton [Wed, 23 Jun 2021 04:18:16 +0000 (16:18 +1200)]
Fix sorting for drop triggers
I added a ksort but it should have been an asort - the createTriggers has an array like
['civicrm_acl'] => [.....]
which suits asort but in this location the array is
[0 => 'civicrm_acl', 1 =>.....
so asort is right
Eileen McNaughton [Tue, 22 Jun 2021 19:37:47 +0000 (07:37 +1200)]
Merge pull request #20691 from demeritcowboy/statlinks
dev/core#2647 - Deprecated call to non-static CRM_Financial_Form_BatchTransaction::links()
demeritcowboy [Tue, 22 Jun 2021 16:12:02 +0000 (12:12 -0400)]
dev/core#2647 - deprecated call to non-static
Eileen McNaughton [Tue, 22 Jun 2021 08:15:31 +0000 (20:15 +1200)]
Merge pull request #20677 from colemanw/resolveFKValues
APIv4 - Allow FK dot notation in create/update/save actions
Eileen McNaughton [Tue, 22 Jun 2021 06:40:14 +0000 (18:40 +1200)]
Merge pull request #20690 from civicrm/5.39
5.39
Seamus Lee [Tue, 22 Jun 2021 04:01:43 +0000 (14:01 +1000)]
Merge pull request #20689 from agileware/CIVICRM-1784
Reinstate invoiceID param to membership renewal payment
Seamus Lee [Tue, 22 Jun 2021 02:45:05 +0000 (12:45 +1000)]
Merge pull request #20686 from demeritcowboy/newtag
dev/core#2660 - Remove old menu entry for "New Tag"
Seamus Lee [Tue, 22 Jun 2021 02:44:40 +0000 (12:44 +1000)]
Merge pull request #20688 from demeritcowboy/coincidence
Force the right path in github action script
Francis Whittle [Tue, 22 Jun 2021 00:57:07 +0000 (10:57 +1000)]
CIVICRM-1784 Reinstate invoiceID param to membership renewal payment
Fixes a compatibility regresson introduced for 5.36
demeritcowboy [Mon, 21 Jun 2021 23:46:39 +0000 (19:46 -0400)]
force the right path
demeritcowboy [Mon, 21 Jun 2021 18:54:46 +0000 (14:54 -0400)]
remove old menu entry
Tim Otten [Mon, 21 Jun 2021 22:03:15 +0000 (15:03 -0700)]
Merge pull request #20625 from seamuslee001/allow_civicrm_install_php8
[php8-compact] Allow for CiviCRM to be installed by 3rd parties using…
Eileen McNaughton [Mon, 21 Jun 2021 21:03:58 +0000 (09:03 +1200)]
Merge pull request #20626 from akosgarai/issue/2645
dev/core#2645 Proposed fix for exporting preferred_mail_format field
Eileen McNaughton [Mon, 21 Jun 2021 20:52:18 +0000 (08:52 +1200)]
Merge pull request #20620 from eileenmcnaughton/539_test
Add file_exists check on loading services xml
Eileen McNaughton [Mon, 21 Jun 2021 20:36:35 +0000 (08:36 +1200)]
Merge pull request #20684 from colemanw/tplVars
Fix undefined tpl vars
Jaap Jansma [Mon, 21 Jun 2021 14:54:19 +0000 (16:54 +0200)]
dev/financial#6 exclude template contributions from the contact summary and add a button to view them to the recurring contributions tab
Jaap Jansma [Mon, 21 Jun 2021 14:53:43 +0000 (16:53 +0200)]
dev/financial#6 exclude template contributions from the contact summary and add a button to view them to the recurring contributions tab
Jaap Jansma [Mon, 21 Jun 2021 14:52:56 +0000 (16:52 +0200)]
dev/financial#6 exclude template contributions from the contact summary and add a button to view them to the recurring contributions tab
Coleman Watts [Mon, 21 Jun 2021 14:12:02 +0000 (10:12 -0400)]
Fix undefined tpl vars
colemanw [Mon, 21 Jun 2021 13:52:08 +0000 (09:52 -0400)]
Merge pull request #20664 from eileenmcnaughton/notice
Always assign mode to smarty
Jaap Jansma [Mon, 21 Jun 2021 08:19:36 +0000 (10:19 +0200)]
dev/financial#6 Added is template to search screen
Jaap Jansma [Mon, 21 Jun 2021 08:15:36 +0000 (10:15 +0200)]
dev/financial#6 Added is template to search screen
Eileen McNaughton [Mon, 21 Jun 2021 08:11:35 +0000 (20:11 +1200)]
Merge pull request #20683 from civicrm/5.39
5.39
Seamus Lee [Mon, 21 Jun 2021 05:54:15 +0000 (15:54 +1000)]
Merge pull request #20675 from eileenmcnaughton/ev
dev/event#58 Ensure custom data is not saved to template's row
colemanw [Mon, 21 Jun 2021 05:43:42 +0000 (01:43 -0400)]
Merge pull request #20679 from eileenmcnaughton/smarty1
Extract feeBlock to it's own tpl
colemanw [Mon, 21 Jun 2021 05:42:39 +0000 (01:42 -0400)]
Merge pull request #20680 from demeritcowboy/regen-github-action
[NFC] Github action script to run regen.sh for you
Coleman Watts [Sun, 20 Jun 2021 20:16:05 +0000 (16:16 -0400)]
APIv4 - Support FK field lookups in create/update/save actions
Coleman Watts [Sun, 20 Jun 2021 20:13:25 +0000 (16:13 -0400)]
Test cleanup - use new APIv4 syntax for checkPermissions
demeritcowboy [Mon, 21 Jun 2021 00:15:13 +0000 (20:15 -0400)]
script to run regen.sh for you
demeritcowboy [Sun, 20 Jun 2021 23:23:26 +0000 (19:23 -0400)]
Merge pull request #20268 from agileware/CIVICRM-1725
User experience improvement - Remove the confusing mixed terminology used to describe Tags: "Tags (Categories)" and "Tag (Category)"
Eileen McNaughton [Sun, 20 Jun 2021 22:21:07 +0000 (10:21 +1200)]
Extract feeBlock to it's own tpl
This is a step towards moving the FeeBlock rendering to it's own form instead of the current 'overload'
approach
Justin Freeman [Sun, 20 Jun 2021 21:35:51 +0000 (07:35 +1000)]
CIVICRM-1725 User experience improvement - Remove the confusing mixed terminology used to describe Tags: "Tags (Categories)" and "Tag (Category)"
Eileen McNaughton [Sat, 19 Jun 2021 23:14:45 +0000 (11:14 +1200)]
Start to tighten open-ended 'return' in tests
Eileen McNaughton [Thu, 17 Jun 2021 03:43:18 +0000 (15:43 +1200)]
dev/core#2656 Add test to demonstrate issue / bug
Fix enotice in test
Why didn't this cause it to fail before
Seamus Lee [Sun, 20 Jun 2021 00:06:19 +0000 (10:06 +1000)]
Merge pull request #20674 from seamuslee001/regen_dao
[NFC] Regenerate ContributeProduct DAO and also fix search_kit instal…
Eileen McNaughton [Sat, 19 Jun 2021 23:14:29 +0000 (11:14 +1200)]
Add unit test for event copy