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
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
Alice Frumin [Wed, 1 Apr 2020 15:37:42 +0000 (11:37 -0400)]
late changes to release notes
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
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
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
Matthew Wire [Wed, 25 Mar 2020 20:00:35 +0000 (20:00 +0000)]
Merge pull request #16880 from yashodha/error
log error message instead of throwing exception
Eileen McNaughton [Wed, 25 Mar 2020 19:22:49 +0000 (08:22 +1300)]
Merge pull request #16898 from civicrm/5.24
5.24
Eileen McNaughton [Wed, 25 Mar 2020 19:22:17 +0000 (08:22 +1300)]
Merge pull request #16697 from eileenmcnaughton/deprecate
Add some deprecation notices, stop calling PrevNext::cleanupCache
eileen [Wed, 25 Mar 2020 04:40:59 +0000 (17:40 +1300)]
[REF] Remove & from before variable
I couldn't see how this & could do anything useful given it's an object & testing shows the form is unchanged
Seamus Lee [Wed, 25 Mar 2020 02:45:54 +0000 (13:45 +1100)]
Merge pull request #16842 from demeritcowboy/lang-install-crash
dev/translation#40 - Fix crash when change language on installer page
eileen [Wed, 25 Mar 2020 02:42:04 +0000 (15:42 +1300)]
Remove assigns for atypefile
This is old code - I traced back it's introduction to https://github.com/civicrm/civicrm-svn/commit/
fb3038000356998e43b0c9aea67f0186f7e41516
which relates to https://issues.civicrm.org/jira/browse/CRM-3829?page=com.atlassian.streams.streams-jira-plugin:activity-stream-issue-tab
At that time the template used the variable- ie https://github.com/civicrm/civicrm-svn/commit/
fb3038000356998e43b0c9aea67f0186f7e41516#diff-6fc7e9552ffce6cf4cb7680854ef7b70R4
But that is no longer the case
Seamus Lee [Wed, 25 Mar 2020 02:15:37 +0000 (13:15 +1100)]
Merge pull request #16894 from seamuslee001/core/issues/923
Fixed fatal error for Event Participants custom search if price set f…
Eileen McNaughton [Wed, 25 Mar 2020 01:16:41 +0000 (14:16 +1300)]
Merge pull request #16869 from colemanw/del
APIv3 - Use new DAO::deleteRecord method
Eileen McNaughton [Wed, 25 Mar 2020 01:12:43 +0000 (14:12 +1300)]
Merge pull request #16867 from colemanw/dashboard
APIv4 - Add Dashboard & DashboardContact entities
Seamus Lee [Wed, 25 Mar 2020 00:57:54 +0000 (11:57 +1100)]
Merge pull request #16892 from civicrm/5.24
5.24
Pradeep Nayak [Sat, 11 May 2019 09:30:36 +0000 (10:30 +0100)]
Fixed fatal error for Event Participants custom search if price set field option is disabled after a registrant has already selected it
Fix test failure and parametise queries
Seamus Lee [Tue, 24 Mar 2020 23:46:40 +0000 (10:46 +1100)]
Merge pull request #16891 from seamuslee001/5_23_4_release_notes
Add release-notes/5.23.4.md
Seamus Lee [Tue, 24 Mar 2020 23:45:56 +0000 (10:45 +1100)]
Merge pull request #16887 from totten/5.24-dbl-path
dev/joomla#26 - Fix path derivation when CMS is rooted in a subdir
Tim Otten [Tue, 24 Mar 2020 22:28:00 +0000 (15:28 -0700)]
Add release-notes/5.23.4.md
Tim Otten [Tue, 24 Mar 2020 21:46:10 +0000 (14:46 -0700)]
(NFC) Update comments in PathsTest.php
yashodha [Tue, 24 Mar 2020 11:36:41 +0000 (17:06 +0530)]
log error message instead of throwing exception
yashodha [Mon, 23 Mar 2020 11:52:46 +0000 (17:22 +0530)]
log error message instead of throwing exception
Seamus Lee [Tue, 24 Mar 2020 06:28:55 +0000 (17:28 +1100)]
Merge pull request #16872 from colemanw/arrayValue8
[REF] Replace \CRM_Utils_Array::value with ??
Seamus Lee [Tue, 24 Mar 2020 06:26:44 +0000 (17:26 +1100)]
Merge pull request #16873 from colemanw/api4ArrayValue
[REF] Civi/Api4 - Refactor out 'use CRM_Utils_Array'
Seamus Lee [Tue, 24 Mar 2020 06:25:40 +0000 (17:25 +1100)]
Merge pull request #16874 from colemanw/contactCleanup
[REF] BAO_Contact - Remove CRM_Utils_Array::value and other unnecessary code
colemanw [Tue, 24 Mar 2020 05:59:59 +0000 (01:59 -0400)]
Merge pull request #16884 from civicrm/5.24
5.24
Tim Otten [Tue, 24 Mar 2020 05:56:36 +0000 (22:56 -0700)]
dev/joomla#26 - Fix path derivation when CMS is rooted in a subdir
Overview
--------
CiviCRM is deployed inside a CMS. The CMS is usually deployed at the HTTP root (`http://example.org`),
but it is sometimes deployed in a subdirectory (`http://example.org/my-cms`).
Some asset URLs are computed using the variables `[civicrm.bower]`, `[civicrm.packages]`, and `[civicrm.vendor]`, which
are derived from the value of `[civicrm.root]`. However, if the site is deployed in a subdirectory, and if using v5.23,
then the computation of `[civicrm.bower]` (etc) can misbehave.
Before
------
When the URL for `[civicrm.bower]` (or similar) is derived, it goes through multiple filters - first, from absolute to
relative, and then later from relative back to absolute. In the process, the base is inadvertently changed.
After
-----
When the URL is derived, it is computed in absolute format - and simply kept that way.
Comments
--------
Regarding test coverage, there are two relevant unit-tests. This PR only updates one.
* `E2E\Core\PathUrlTest`: This is a more concrete smoke test which demonstrates functional problems with variables like
`[civicrm.bower]`. It should already catch problems like dev/joomla#26... but only if you run the E2E suite on a system
where the CMS was deployed to a subdirectory. `civibuild` doesn't currently include such a build-type.
* `Civi\Core\PathsTest`: This is a more abstract, headless test to examine edge-cases in `Civi\Core\Paths`. It does not
specifically check for `[civicrm.bower]` or similar variables (b/c the URL routing is ill-defined in a headless context).
However, I've updated it to compare/contrast the working and non-working ways to derive variables.
demeritcowboy [Tue, 24 Mar 2020 03:07:29 +0000 (23:07 -0400)]
make install work on windows
demeritcowboy [Tue, 24 Mar 2020 03:05:52 +0000 (23:05 -0400)]
test for getRelatedCases
Eileen McNaughton [Tue, 24 Mar 2020 03:03:20 +0000 (16:03 +1300)]
Merge pull request #16878 from colemanw/api4Sql
[REF] APIv4 - Restructure the way get query objects are constucted
Seamus Lee [Tue, 24 Mar 2020 01:55:19 +0000 (12:55 +1100)]
Merge pull request #16883 from demeritcowboy/blank-dashboard-notice
dev/core#1668 - Avoid E_NOTICE when removing last dashlet