Seamus Lee [Fri, 3 Apr 2020 00:54:34 +0000 (11:54 +1100)]
Merge pull request #16961 from MegaphoneJon/core-1688-525
core#1688 - false positive on missing custom field check
Jon Goldberg [Thu, 2 Apr 2020 18:07:33 +0000 (14:07 -0400)]
core#1688 - false positive on missing custom field check
CiviCRM [Thu, 2 Apr 2020 05:26:58 +0000 (05:26 +0000)]
Set version to 5.25.beta1
Tim Otten [Thu, 2 Apr 2020 04:57:15 +0000 (21:57 -0700)]
Merge pull request #16753 from agh1/consolidated-php-version
dev/core#1528 - Consolidate to single constant for minimum PHP version
Tim Otten [Thu, 2 Apr 2020 04:21:07 +0000 (21:21 -0700)]
CRM_Report_DAO_ReportInstance - Update checksum
Tim Otten [Thu, 2 Apr 2020 04:14:16 +0000 (21:14 -0700)]
Merge pull request #16948 from eileenmcnaughton/email4
[REF] move buildQuickForm function to the trait
Tim Otten [Thu, 2 Apr 2020 04:11:58 +0000 (21:11 -0700)]
Merge pull request #16951 from colemanw/dirtyMoney
Revert "APIv4 - Fix contribution create"
Coleman Watts [Thu, 2 Apr 2020 01:21:10 +0000 (21:21 -0400)]
Revert "APIv4 - Fix contribution create"
This reverts commit
2f97c5641cceec44c02585c2d1d212bda1c6228e.
It should no longer be needed due to the improvement made in
243320eda23195985815ceb65ec7ee9079ae3014.
Seamus Lee [Thu, 2 Apr 2020 00:40:14 +0000 (11:40 +1100)]
Merge pull request #16950 from eileenmcnaughton/clean_money
Remove deprecated cleaning of money in the BAO layer
eileen [Wed, 1 Apr 2020 23:01:00 +0000 (12:01 +1300)]
Remove deprecated cleaning of money in the BAO layer
Any code that passed dirty money to the Contribution::create BAO will have been seeing
deprecation notices for some time. The supported method is via the api & v3 api does the cleaning
whereas v4 expects it to be pre-cleaned - perhaps it's time to remove this & leave it to the
calling code
Eileen McNaughton [Wed, 1 Apr 2020 22:57:04 +0000 (11:57 +1300)]
Merge pull request #16947 from colemanw/groupByFunctions
APIv4 - Support GROUP BY and aggregate functions
Eileen McNaughton [Wed, 1 Apr 2020 22:33:31 +0000 (11:33 +1300)]
Merge pull request #16943 from jitendrapurohit/core-1682
dev/core#1682 - Invalid currency on sending offline membership receipt.
Tim Otten [Wed, 1 Apr 2020 22:06:31 +0000 (15:06 -0700)]
Merge pull request #16919 from jaapjansma/dev-1674
dev/core#1674: fix rebuilding of container on every request
Tim Otten [Wed, 1 Apr 2020 22:03:33 +0000 (15:03 -0700)]
(REF) CRM_Api4_Services - Cleanup extra comment/try/catch
eileen [Tue, 31 Mar 2020 22:19:44 +0000 (11:19 +1300)]
[REF] move buildQuickForm function to the trait
Note that Contact had an extra assign. It seems likely the extra assign is not required but it
would not be a bad thing on the others
colemanw [Wed, 1 Apr 2020 21:51:26 +0000 (17:51 -0400)]
Merge pull request #16940 from eileenmcnaughton/email4
[REF] Move properties to Trait
Coleman Watts [Wed, 1 Apr 2020 21:26:32 +0000 (17:26 -0400)]
APIv4 - Fix contribution create
Coleman Watts [Tue, 31 Mar 2020 21:33:19 +0000 (17:33 -0400)]
APIv4 - Add SQL expression handling and aggregate functions
Adds a series of SqlExpression classes to parse and validate sql expressions used in SELECT, GROUP BY and ORDER BY clauses.
The framework can handle most sql functions, but this first commit adds support for the aggregate functions AVG, COUNT, MAX, MIN & SUM
Eileen McNaughton [Wed, 1 Apr 2020 21:33:16 +0000 (10:33 +1300)]
Merge pull request #16941 from jitendrapurohit/16845-followup
Follow up PR for #16845 - Fix form error when variable is NULL
Eileen McNaughton [Wed, 1 Apr 2020 21:24:33 +0000 (10:24 +1300)]
Merge pull request #16945 from lcdservices/dev-core-1683
fixes dev/core#1683 set profile frontend title
Coleman Watts [Mon, 30 Mar 2020 16:22:43 +0000 (12:22 -0400)]
Api4SelectQuery - add more metadata to apiFieldSpec
Coleman Watts [Sat, 21 Mar 2020 23:48:24 +0000 (19:48 -0400)]
APIv4 - Add rudimentary support for groupBy
Seamus Lee [Wed, 1 Apr 2020 21:06:01 +0000 (08:06 +1100)]
Merge pull request #16946 from civicrm/5.24
5.24
Seamus Lee [Wed, 1 Apr 2020 20:40:40 +0000 (07:40 +1100)]
Merge pull request #16944 from alifrumin/5.24-rn
[NFC] adding late changes to release notes for 5.24
Brian Shaughnessy [Wed, 1 Apr 2020 18:52:10 +0000 (14:52 -0400)]
fixes dev/core#1683 set profile frontend title
Alice Frumin [Wed, 1 Apr 2020 15:37:42 +0000 (11:37 -0400)]
late changes to release notes
Jitendra Purohit [Wed, 1 Apr 2020 11:32:30 +0000 (17:02 +0530)]
dev/core#1682 - Invalid currency on sending offline membership receipt.
Jitendra Purohit [Wed, 1 Apr 2020 10:50:08 +0000 (16:20 +0530)]
Follow up PR for #16845 - Fix form error when variable is NULL
eileen [Tue, 31 Mar 2020 22:14:44 +0000 (11:14 +1300)]
Move properties to Trait
colemanw [Wed, 1 Apr 2020 09:37:32 +0000 (05:37 -0400)]
Merge pull request #16935 from eileenmcnaughton/email_common
[REF] Start transitioning EmailCommon class to a trait
Tim Otten [Wed, 1 Apr 2020 08:00:07 +0000 (01:00 -0700)]
dev/core#1674 - Update container cache when folder is removed or created
Conceptually, you want to:
* (A) Keep the container cache when nothing has changed (regardless of whether that status-quo has an API4 subscriber folder).
* (B) Update the cache if Civi/Api4/Event/Subscriber/*.php has been newly created
* (C) Update the cache if Civi/Api4/Event/Subscriber/*.php has been newly removed
To test this out, I hacked `Civi\Core\Container::loadContainer()` to emit a debug message
to indicate if it is reusing the cache or updating. Then, I prepared two terminals for running alternate steps:
* In terminal 1, go back and forth with adding/removing folders/files like `Civi/Api4/Event/Subscriber`.
* In terminal 2, periodically run `cv ev 'echo "Hello\n";'` and note whether the cache is update.
In this way, we can see if a developer action (adding a file) leads to an automatic update in the cache.
I found that the previous commit fixed (A) and did (C), but it failed to
update per (B). This commit should handle (A), (B), and (C).
Eileen McNaughton [Wed, 1 Apr 2020 03:54:28 +0000 (16:54 +1300)]
Merge pull request #16885 from demeritcowboy/test-getrelatedcases
[NFC/TEST] Resurrect unfinished test for getRelatedCases()
Yashodha Chaku [Wed, 1 Apr 2020 03:18:37 +0000 (08:48 +0530)]
Merge pull request #16921 from pradpnayak/newHook
Add hook to alter display value or Custom field value
Eileen McNaughton [Wed, 1 Apr 2020 02:33:11 +0000 (15:33 +1300)]
Merge pull request #16938 from civicrm/5.24
5.24
Eileen McNaughton [Wed, 1 Apr 2020 02:32:53 +0000 (15:32 +1300)]
Merge pull request #16937 from seamuslee001/5.24
[REF] Fix handling of owner url parameter from Membership Dashboard
eileen [Tue, 31 Mar 2020 21:08:20 +0000 (10:08 +1300)]
[REF] Start transitioning EmailCommon class to a trait
This is a really awful class - I've added a trait & moved the calls from the various forms to that trait
so the code on EmailCommon for buildForm is now only called once. I will follow up with more the same
Seamus Lee [Wed, 1 Apr 2020 00:51:26 +0000 (11:51 +1100)]
[REF] Fix handling of owner url parameter from Membership Dashboard
Seamus Lee [Wed, 1 Apr 2020 00:45:40 +0000 (11:45 +1100)]
Merge pull request #16933 from eileenmcnaughton/member_search
dev/user-interface#14 Fix membership_status_id url handling (recent regression).
Seamus Lee [Wed, 1 Apr 2020 00:38:32 +0000 (11:38 +1100)]
Merge pull request #16930 from eileenmcnaughton/524
dev/core#1677 Fix multisite regression on domain membership types
colemanw [Tue, 31 Mar 2020 20:50:09 +0000 (16:50 -0400)]
Merge pull request #16928 from eileenmcnaughton/email
[REF] Remove fatal, fix some code comments
colemanw [Tue, 31 Mar 2020 15:43:28 +0000 (11:43 -0400)]
Merge pull request #16932 from eileenmcnaughton/mailing_name
dev/core#1656 Remove duplicate label
colemanw [Tue, 31 Mar 2020 14:12:58 +0000 (10:12 -0400)]
Merge pull request #16929 from eileenmcnaughton/email2
[REF] extract code to getEmails
colemanw [Tue, 31 Mar 2020 14:09:46 +0000 (10:09 -0400)]
Merge pull request #16927 from eileenmcnaughton/campaign
[REF] Minor simplification - do not use variable variables
Yashodha Chaku [Tue, 31 Mar 2020 10:23:14 +0000 (15:53 +0530)]
Merge pull request #16868 from twomice/contribution_detail_pledge
Add "pledge id" as column and filter in Contribution Detail report.
eileen [Tue, 31 Mar 2020 08:31:44 +0000 (21:31 +1300)]
dev/user-interface#14 Fix membership_status_id url handling (recent regression).
The right fix here is to fix the xml to the field setting it to export & adding a uniquename.
However, with our search focus moving on to the new search functionality in the pipeline & us having had
a hiatus on dealing with search code I think this more conservative change + a rc focus makes sense
at the moment
eileen [Tue, 31 Mar 2020 07:25:15 +0000 (20:25 +1300)]
Remove duplicate label
Eileen McNaughton [Tue, 31 Mar 2020 06:04:10 +0000 (19:04 +1300)]
Merge pull request #16931 from civicrm/5.24
5.24 to master
Eileen McNaughton [Tue, 31 Mar 2020 05:57:54 +0000 (18:57 +1300)]
Merge pull request #16926 from demeritcowboy/quickfix-case-addtimeline
dev/core#1675 - Temporary regression fix for case add timeline
eileen [Tue, 31 Mar 2020 05:12:33 +0000 (18:12 +1300)]
dev/core#1677 Fix multisite regression on domain membership types
Fixes a regression where membership types bleed between domains
eileen [Tue, 31 Mar 2020 04:51:01 +0000 (17:51 +1300)]
[REF] extract code to getEmails
eileen [Tue, 31 Mar 2020 03:48:38 +0000 (16:48 +1300)]
[REF] Remove fatal, fix some code comments
eileen [Tue, 31 Mar 2020 03:38:23 +0000 (16:38 +1300)]
[REF] Minor simplification - do not use variable variables
This is a minor readabilty improvement because it's awful. Much more could be done....
demeritcowboy [Mon, 30 Mar 2020 20:12:12 +0000 (16:12 -0400)]
temp workaround for dev/core#1675
Pradeep Nayak [Sun, 29 Mar 2020 19:57:39 +0000 (20:57 +0100)]
Added unit test
Pradeep Nayak [Thu, 11 Jul 2019 20:11:38 +0000 (21:11 +0100)]
Add hook to alter display value or Custom field value
Matthew Wire [Mon, 30 Mar 2020 10:41:26 +0000 (11:41 +0100)]
Merge pull request #16912 from eileenmcnaughton/conf_2
[Test] Remove skip that seems no longer required
Seamus Lee [Mon, 30 Mar 2020 06:27:19 +0000 (17:27 +1100)]
Merge pull request #16925 from pradpnayak/pseudoCon
Added pseudoconstant for acl_id
Seamus Lee [Mon, 30 Mar 2020 06:26:54 +0000 (17:26 +1100)]
Merge pull request #16924 from demeritcowboy/brackets
dev/core#1676 - E_NOTICE because of missing brackets for order of operations
Pradeep Nayak [Mon, 30 Mar 2020 03:03:30 +0000 (04:03 +0100)]
Added pseudoconstant for acl_id
colemanw [Mon, 30 Mar 2020 02:53:47 +0000 (22:53 -0400)]
Merge pull request #16907 from eileenmcnaughton/deprec
Remove deprecated function
demeritcowboy [Mon, 30 Mar 2020 01:01:21 +0000 (21:01 -0400)]
missing brackets
Eileen McNaughton [Sun, 29 Mar 2020 22:27:51 +0000 (11:27 +1300)]
Merge pull request #16670 from demeritcowboy/audit-tpl-3
dev/core#1366 - case audit printReport parameter is no longer used
Eileen McNaughton [Sun, 29 Mar 2020 21:24:53 +0000 (10:24 +1300)]
Merge pull request #16889 from colemanw/api4ref
Make api4 select query object more sane
Coleman Watts [Fri, 27 Mar 2020 01:01:28 +0000 (21:01 -0400)]
Api4SelectQuery - Refactor field handling for looser coupling and more flexibility
Getting ready to support groupBy, having and sql functions
Coleman Watts [Tue, 24 Mar 2020 17:26:21 +0000 (13:26 -0400)]
APIv4 - Standardize field sql name conversion
colemanw [Sun, 29 Mar 2020 18:54:49 +0000 (14:54 -0400)]
Merge pull request #16920 from colemanw/api4test
[NFC] APIv4 - Add test coverage for expected fields from join
Coleman Watts [Sun, 29 Mar 2020 01:52:57 +0000 (21:52 -0400)]
APIv4 - Add test coverage for expected fields from join
Jaap Jansma [Sat, 28 Mar 2020 21:55:57 +0000 (22:55 +0100)]
Update style warnings
Jaap Jansma [Sat, 28 Mar 2020 20:16:04 +0000 (21:16 +0100)]
dev-1674: fix rebuilding of container on every request
colemanw [Sat, 28 Mar 2020 13:46:29 +0000 (09:46 -0400)]
Merge pull request #16893 from seamuslee001/nfc_sort_api4_test
[NFC] Add in unit test to ensure that APIv4 Doesn't accept an invalid…
Seamus Lee [Wed, 25 Mar 2020 00:05:01 +0000 (11:05 +1100)]
[NFC] Add in unit test to ensure that APIv4 Doesn't accept an invalid sort
Seamus Lee [Fri, 27 Mar 2020 20:54:05 +0000 (07:54 +1100)]
Merge pull request #16917 from colemanw/domainId2
APIv4 - Only adjust domain_id if required
Matthew Wire [Fri, 27 Mar 2020 19:01:29 +0000 (19:01 +0000)]
Merge pull request #16902 from eileenmcnaughton/setting_ex
[REF] Extract code used to render a pseudoconstant when a table is defined.
Coleman Watts [Fri, 27 Mar 2020 16:39:40 +0000 (12:39 -0400)]
APIv4 - Only adjust domain_id if required
colemanw [Fri, 27 Mar 2020 14:11:39 +0000 (10:11 -0400)]
Merge pull request #16914 from eileenmcnaughton/act2
Remove unused code
Seamus Lee [Fri, 27 Mar 2020 08:52:55 +0000 (19:52 +1100)]
Merge pull request #16913 from eileenmcnaughton/act
[REF] Move form specific handling back to the relevant form.
eileen [Fri, 27 Mar 2020 04:11:41 +0000 (17:11 +1300)]
Remove unused code
If seems to me that 1) if this IF is true then there will be a bounce & it will not proceed annd
2 if it IS true emailAddress does not seem to be applied anywhere
eileen [Fri, 27 Mar 2020 02:59:14 +0000 (15:59 +1300)]
[REF] Move form specific handling back to the relevant form.
The shared function has handling to set ->_single if the class is CRM_Contact_Form_Task_Email -
this seems prety obviously not functionality that is shared so it should be on the CRM_Contact_Form_Task_Email
class
eileen [Thu, 26 Mar 2020 23:46:53 +0000 (12:46 +1300)]
[Test] Remove skip that seems no longer required
The removed line seems to be loosening the test for a deprecation that I didn't hit in testing today
Seamus Lee [Thu, 26 Mar 2020 23:44:55 +0000 (10:44 +1100)]
Merge pull request #16895 from eileenmcnaughton/case
Remove assigns for atypefile
colemanw [Thu, 26 Mar 2020 23:17:35 +0000 (19:17 -0400)]
Merge pull request #16910 from eileenmcnaughton/conf
Deprecate use of in OptionGroup::add() function
Eileen McNaughton [Thu, 26 Mar 2020 22:28:44 +0000 (11:28 +1300)]
Merge pull request #16909 from colemanw/api4sel
[REF] APIv4 - Preserve order when expanding select wildcards
Eileen McNaughton [Thu, 26 Mar 2020 22:09:47 +0000 (11:09 +1300)]
Merge pull request #16863 from seamuslee001/dev_core_561_daterange_deprecation
dev/core#561 Add in deprecation notice on addDateRange funtion
eileen [Thu, 26 Mar 2020 22:06:17 +0000 (11:06 +1300)]
Deprecate use of in OptionGroup::add() function
We agreed some time back not to use as part of add, create signatures
eileen [Thu, 26 Mar 2020 04:15:47 +0000 (17:15 +1300)]
Remove deprecated function
Coleman Watts [Thu, 26 Mar 2020 20:52:10 +0000 (16:52 -0400)]
APIv4 - Preserve order when expanding select wildcards
Yashodha Chaku [Thu, 26 Mar 2020 14:40:11 +0000 (20:10 +0530)]
Merge pull request #16845 from jitendrapurohit/core-1663
dev/core#1663 - Fix warning on relationship form
colemanw [Thu, 26 Mar 2020 14:31:37 +0000 (10:31 -0400)]
Merge pull request #16896 from eileenmcnaughton/act
[NFC] Use strict comparison where possible
Seamus Lee [Thu, 26 Mar 2020 07:51:20 +0000 (18:51 +1100)]
Merge pull request #16904 from colemanw/selectUtil
Improve APIv4 selectUtils to handle join paths in fieldnames.
Seamus Lee [Thu, 26 Mar 2020 07:48:27 +0000 (18:48 +1100)]
Merge pull request #16906 from eileenmcnaughton/format
[NFC] Code formatting
Seamus Lee [Thu, 26 Mar 2020 07:48:08 +0000 (18:48 +1100)]
Merge pull request #16905 from eileenmcnaughton/acti
[NFC] minor form cleanup.
eileen [Wed, 25 Mar 2020 03:49:39 +0000 (16:49 +1300)]
[NFC] Use strict comparison where possible
Also fixes a couple of comments & uses of Array::value
eileen [Thu, 26 Mar 2020 01:30:56 +0000 (14:30 +1300)]
[REF] Extract code used to render a pseudoconstant when a table is defined.
This permits us to re-use for settings
eileen [Thu, 26 Mar 2020 04:02:44 +0000 (17:02 +1300)]
[NFC] Code formatting
eileen [Thu, 26 Mar 2020 03:56:35 +0000 (16:56 +1300)]
[NFC] minor form cleanup.
Most notably fix calling a non-static method statically but also remove comment that
clearly came in by copy & paste,
Coleman Watts [Thu, 26 Mar 2020 03:48:49 +0000 (23:48 -0400)]
Improve APIv4 selectUtils to handle join paths in fieldnames.
Eileen McNaughton [Thu, 26 Mar 2020 03:41:18 +0000 (16:41 +1300)]
Merge pull request #16900 from colemanw/api4fix
APIv4 - bugfix in select query
Coleman Watts [Wed, 25 Mar 2020 23:57:48 +0000 (19:57 -0400)]
APIv4 - bugfix in select query
Tim Otten [Wed, 25 Mar 2020 20:32:40 +0000 (13:32 -0700)]
Merge pull request #16886 from demeritcowboy/xmlinclude-windows
dev/core#1643 - Make civicrm-setup (especially drupal 8) work on windows
Seamus Lee [Wed, 25 Mar 2020 20:30:22 +0000 (07:30 +1100)]
Merge pull request #16897 from eileenmcnaughton/actt2
[REF] Remove & from before variable