Seamus Lee [Thu, 8 Oct 2020 00:23:25 +0000 (11:23 +1100)]
Merge pull request #18704 from mlutfy/partListingOutput
ParticipantListing Report: only display the View link for web, unhardcode others
Eileen McNaughton [Wed, 7 Oct 2020 23:46:52 +0000 (12:46 +1300)]
Merge pull request #18699 from eileenmcnaughton/leak5
dev/core#2073 Fix use of legacy leaky method in tested code
Eileen McNaughton [Wed, 7 Oct 2020 23:46:06 +0000 (12:46 +1300)]
Merge pull request #18493 from mlutfy/campaignReportDefaults
Fix default report permissions when creating reports from CiviCampaign
Eileen McNaughton [Wed, 7 Oct 2020 23:11:03 +0000 (12:11 +1300)]
Merge pull request #18706 from civicrm/5.30
5.30
Eileen McNaughton [Wed, 7 Oct 2020 23:10:47 +0000 (12:10 +1300)]
Merge pull request #18680 from eileenmcnaughton/x
dev/financial#151 Paypal express validation fix on event
Seamus Lee [Wed, 7 Oct 2020 23:06:32 +0000 (10:06 +1100)]
Merge pull request #18705 from agh1/5.30.0-releasenotes-final
5.30.0 release notes: updated with late changes
Seamus Lee [Wed, 7 Oct 2020 22:34:16 +0000 (09:34 +1100)]
Merge pull request #18700 from eileenmcnaughton/leak6
dev/core#2073 Fix use of legacy leaky method in tested code
Seamus Lee [Wed, 7 Oct 2020 22:21:32 +0000 (09:21 +1100)]
Merge pull request #18698 from seamuslee001/test_dev_core_2053
[NFC] dev/core#2053 Extend nextedGroup test to show that it will retu…
Andrew Hunt [Wed, 7 Oct 2020 22:10:04 +0000 (18:10 -0400)]
5.30.0 release notes: updated with late changes
eileen [Wed, 7 Oct 2020 20:14:44 +0000 (09:14 +1300)]
dev/core#2073 Fix use of legacy leaky method in tested code
This is too low volume to really leak but it uses the leaky legacy method and
has test cover in
CRM_Contact_Import_Form_MapFieldTest.testSubmit with data set basic_data
CRM_Contact_Import_Form_MapFieldTest.testSubmit with data set save_mapping
Mathieu Lutfy [Wed, 7 Oct 2020 21:33:09 +0000 (17:33 -0400)]
ParticipantListing Report: only display the View link for web, unhardcode others
colemanw [Wed, 7 Oct 2020 21:26:56 +0000 (17:26 -0400)]
Merge pull request #18654 from eileenmcnaughton/token1
dev/core#2079 [REF] Fix some more calls to getTokens to make it clear only the first return value is used
colemanw [Wed, 7 Oct 2020 21:26:04 +0000 (17:26 -0400)]
Merge pull request #18653 from eileenmcnaughton/token
dev/core#2079 [Ref] Clarify calls to CRM_Utils_Token::getTokenDetails
eileen [Tue, 6 Oct 2020 21:35:31 +0000 (10:35 +1300)]
dev/financial#151 Paypal express validation fix on event
extension of https://github.com/civicrm/civicrm-core/pull/18459
eileen [Wed, 7 Oct 2020 20:22:22 +0000 (09:22 +1300)]
dev/core#2073 Fix use of legacy leaky method in tested code
Overview
----------------------------------------
Fix use of legacy leaky method in tested code
Before
----------------------------------------
dao->query()
After
----------------------------------------
CRM_Core_DAO::executeQuery()
Technical Details
----------------------------------------
This is too low volume to really leak but it uses the leaky legacy method and
has test cover in
CRM_Contact_Page_View_UserDashboard_GroupContactTest.testBrowseDisplaysCorrectListOfAddedGroups
CRM_Contact_Page_View_UserDashboard_GroupContactTest.testBrowseDisplaysCorrectListOfAVailableGroups
CRM_Contact_Page_View_UserDashBoardTest.testDashboardContentEmptyContact
CRM_Contact_Page_View_UserDashBoardTest.testDashboardContentContributionsWithInvoicingEnabled
CRM_Contact_Page_View_UserDashBoardTest.testDashboardContentContributions
----------------------------------------
Seamus Lee [Wed, 7 Oct 2020 19:58:03 +0000 (06:58 +1100)]
[NFC] dev/core#2053 Extend nextedGroup test to show that it will return child groups that are Mailing groups even when the parent isn't a mailing group
colemanw [Wed, 7 Oct 2020 19:15:53 +0000 (15:15 -0400)]
Merge pull request #18667 from eileenmcnaughton/uf
dev/core#2087 Remove extraneous CRM_Core_BAO_UFMatch::updateUFName call
Eileen McNaughton [Wed, 7 Oct 2020 19:15:15 +0000 (08:15 +1300)]
Merge pull request #18696 from colemanw/btnNoConflict
Greenwich - fix conflict btw bootstrap & jQuery UI button
colemanw [Wed, 7 Oct 2020 19:09:21 +0000 (15:09 -0400)]
Merge pull request #18556 from eileenmcnaughton/pcp
dev/core#2056 Only retrieve pcp & soft_credit info when needed
Eileen McNaughton [Wed, 7 Oct 2020 18:59:18 +0000 (07:59 +1300)]
Merge pull request #18695 from colemanw/ids
Exclude api4 from IDS check
colemanw [Wed, 7 Oct 2020 16:23:42 +0000 (12:23 -0400)]
Merge pull request #18500 from eileenmcnaughton/loc
dev/core#2047 [Ref] Remove obsolete check
colemanw [Wed, 7 Oct 2020 16:19:42 +0000 (12:19 -0400)]
Merge pull request #18650 from eileenmcnaughton/perms
Fix complexity on cache key
colemanw [Wed, 7 Oct 2020 13:47:34 +0000 (09:47 -0400)]
Merge pull request #18663 from eileenmcnaughton/blockdel3
dev/core#2039 Remove extraneous location queries from contact.create->Location::block path
colemanw [Wed, 7 Oct 2020 13:45:14 +0000 (09:45 -0400)]
Merge pull request #18662 from eileenmcnaughton/blockdel2
dev/core#2017 Deprecate an unused function
colemanw [Wed, 7 Oct 2020 13:42:28 +0000 (09:42 -0400)]
Merge pull request #18693 from eileenmcnaughton/leak4
dev/core#2073 Fix memory leak in well tested code
colemanw [Wed, 7 Oct 2020 13:40:29 +0000 (09:40 -0400)]
Merge pull request #18683 from colemanw/searchClause
Search ext & APIv4 Explorer: Refactor clause from directive to component
Coleman Watts [Wed, 7 Oct 2020 13:33:18 +0000 (09:33 -0400)]
Greenwich - fix conflict btw bootstrap & jQuery UI button
This calls noConflict on the Bootstrap3 $.fn.button() method, essentially getting rid of it,
as it is not used by CiviCRM, whereas the jQuery UI $.fn.button() is used.
If we needed the boostrap button function, we could rename it with something like:
`$.fn.btn = $.fn.button.noConflict();`
Coleman Watts [Wed, 7 Oct 2020 12:54:00 +0000 (08:54 -0400)]
Exclude api4 from IDS check
Coleman Watts [Wed, 7 Oct 2020 00:56:49 +0000 (20:56 -0400)]
Search ext & APIv4 Explorer: Refactor clause from directive to component
Improves compatibility with Angular 1.8; uses the more modern component system
with less coupling and cleaner interfaces.
colemanw [Wed, 7 Oct 2020 11:26:37 +0000 (07:26 -0400)]
Merge pull request #18140 from mattwire/removetimeoutpermlocation
Remove ajax timeout from contribution page on behalf of
Matthew Wire [Wed, 7 Oct 2020 10:40:00 +0000 (11:40 +0100)]
Merge pull request #18682 from eileenmcnaughton/add4
dev/core#2046 Fix api to call Address.create now it is standardised
Matthew Wire [Wed, 7 Oct 2020 09:22:53 +0000 (10:22 +0100)]
Merge pull request #18690 from seamuslee001/dev_translation_54
dev/translation#54 Ensure that Component titles are translated in lin…
Seamus Lee [Wed, 7 Oct 2020 08:22:59 +0000 (19:22 +1100)]
Merge pull request #18692 from eileenmcnaughton/leak1
dev/core#2073 Remove memory leak in heavily tested (merge) code
Seamus Lee [Wed, 7 Oct 2020 07:45:05 +0000 (18:45 +1100)]
Merge pull request #18694 from seamuslee001/master
5.30
Seamus Lee [Wed, 7 Oct 2020 07:42:43 +0000 (18:42 +1100)]
Merge in 5.30
Eileen McNaughton [Wed, 7 Oct 2020 07:40:11 +0000 (20:40 +1300)]
Merge pull request #18689 from seamuslee001/nfc_dao_update
[NFC] Update Checksum on CustomField DAO
eileen [Wed, 7 Oct 2020 06:44:18 +0000 (19:44 +1300)]
dev/core#2073 Fix memory leak in well tested code
Example test
api_v3_ContactTest::testSortLimitChainedRelationshipGetCRM15983
Seamus Lee [Wed, 7 Oct 2020 05:52:51 +0000 (16:52 +1100)]
Merge pull request #18685 from seamuslee001/ab_test_fix
[REF] Fix error when creating new AB test mailing because domain_id i…
Seamus Lee [Wed, 7 Oct 2020 05:47:03 +0000 (16:47 +1100)]
dev/translation#54 Ensure that Component titles are translated in link text
Seamus Lee [Wed, 7 Oct 2020 05:42:25 +0000 (16:42 +1100)]
[NFC] Update Checksum on CustomField DAO
eileen [Wed, 7 Oct 2020 05:35:49 +0000 (18:35 +1300)]
dev/core#2073 Remove memory leak in heavily tested (merge) code
There are dozens of tests that pass through these lines - I used api_v3_JobTest:testBatchMerge to step through it
- note the dao->affectedRows uses a query to determine that - so it is no more or less accurate than before
Seamus Lee [Wed, 7 Oct 2020 04:24:53 +0000 (15:24 +1100)]
Merge pull request #18623 from eileenmcnaughton/rene
dev/core#1790 - Contact Card - Email Links
Seamus Lee [Wed, 7 Oct 2020 04:17:51 +0000 (15:17 +1100)]
[REF] Fix error when creating new AB test mailing because domain_id is a required field
Seamus Lee [Wed, 7 Oct 2020 03:54:55 +0000 (14:54 +1100)]
Merge pull request #18684 from eileenmcnaughton/block
dev/core#2039 Call del directly - rather than now-deprecated blockDelete
Eileen McNaughton [Wed, 7 Oct 2020 02:49:42 +0000 (15:49 +1300)]
Merge pull request #18672 from colemanw/searchKit
Search ext: rename to Search Kit, mark as beta
eileen [Wed, 7 Oct 2020 00:45:23 +0000 (13:45 +1300)]
dev/core#2046 Fix api to call Address.create now it is standardised
Switches api from calling Address.add to Address.create as part of BAO standardisation on create.
This has no material impact - just standardisation
eileen [Wed, 7 Oct 2020 01:05:46 +0000 (14:05 +1300)]
dev/core#2039 Call del directly - rather than now-deprecated blockDelete
blockDelete is now just wrapper for del so this is really NFC
eileen [Fri, 2 Oct 2020 01:49:50 +0000 (14:49 +1300)]
dev/core#2046 Remove extraneous primary handling
This builds on https://github.com/civicrm/civicrm-core/pull/18661 and removes extra primary handling
We can feel confident this is not needed as we have done a handful of rounds of tidy up & added tests
to ensure that for all 4 entities (email, phone, im & openid) potentially created through this
function both the create and the delete functions take action to ensure that the contact
is left with exactly one primary address at the end of this process
eileen [Tue, 6 Oct 2020 23:56:35 +0000 (12:56 +1300)]
dev/core#2039 Remove extraneous location queries from contact.create->Location::block path
Overview
----------------------------------------
Removes 10 queries from each contact create that are otherwise dealt with elsewhere
Updated version of https://github.com/civicrm/civicrm-core/pull/18477
Before
----------------------------------------
After creating location blocks 2 queries are done for each of the 5 entities to ensure is_primary fields have not been messed up (ie contact has 1 or more phones but none are marked primary or contact has more than one primary phone).
After
----------------------------------------
Queries are removed as location entities are already created correctly
Technical Details
----------------------------------------
This PR is part of a series of PRs to make this possible - best documented at https://lab.civicrm.org/dev/core/-/issues/2039#note_47758
Comments
----------------------------------------
https://lab.civicrm.org/dev/core/-/issues/2039
Seamus Lee [Tue, 6 Oct 2020 22:24:26 +0000 (09:24 +1100)]
Merge pull request #18679 from seamuslee001/vardump_d9_compatability
[REF] Fix compatability with Drupal 9 installing of var_dumper
Seamus Lee [Tue, 6 Oct 2020 22:09:15 +0000 (09:09 +1100)]
Merge pull request #18658 from eileenmcnaughton/address
dev/core#2046 Migrate BAO_Address::create towards standardisation
Seamus Lee [Tue, 6 Oct 2020 22:08:34 +0000 (09:08 +1100)]
Merge pull request #18661 from eileenmcnaughton/blockdel
dev/core#2046 Fix blockDelete to delete while ensuring is_primary is valid
Seamus Lee [Tue, 6 Oct 2020 21:59:34 +0000 (08:59 +1100)]
Merge pull request #18664 from eileenmcnaughton/list
dev/core#2079 [REF] clean up call to apiQuery
Eileen McNaughton [Tue, 6 Oct 2020 21:11:33 +0000 (10:11 +1300)]
Merge pull request #18677 from pradpnayak/float
change civicrm_price_set.min_amount to float
Seamus Lee [Tue, 6 Oct 2020 20:39:38 +0000 (07:39 +1100)]
[REF] Fix compatability with Drupal 9 installing of var_dumper
Seamus Lee [Tue, 6 Oct 2020 20:36:25 +0000 (07:36 +1100)]
Merge pull request #18678 from demeritcowboy/class-typos
dev/core#2093 - Fix red error box on new individual form and ltrim typos and doubling-up of class attribute
demeritcowboy [Tue, 6 Oct 2020 14:34:48 +0000 (10:34 -0400)]
ltrim typos
Pradeep Nayak [Tue, 6 Oct 2020 10:48:01 +0000 (11:48 +0100)]
change civicrm_price_set.min_amount to float
Seamus Lee [Tue, 6 Oct 2020 06:16:32 +0000 (17:16 +1100)]
Merge pull request #18665 from eileenmcnaughton/list2
dev/core#2079 [REF] clean up call to apiQuery
Seamus Lee [Tue, 6 Oct 2020 06:14:05 +0000 (17:14 +1100)]
Merge pull request #18657 from eileenmcnaughton/token_2
dev/core#2079 do not return never-used, query-wasting variable
eileen [Tue, 6 Oct 2020 04:52:19 +0000 (17:52 +1300)]
Remove caching that messes with tests without any time saving
eileen [Mon, 5 Oct 2020 23:11:38 +0000 (12:11 +1300)]
Add supporting test
Eileen McNaughton [Tue, 6 Oct 2020 04:47:33 +0000 (17:47 +1300)]
Merge pull request #18676 from seamuslee001/ref_remove_xml_util
[REF] Remove XML_Util dependancy within ewaysingle extension
Seamus Lee [Tue, 6 Oct 2020 01:23:50 +0000 (12:23 +1100)]
[REF] Remove XML_Util dependancy within ewaysingle extension
Seamus Lee [Tue, 6 Oct 2020 01:27:44 +0000 (12:27 +1100)]
Merge pull request #18673 from totten/master-gitignore
When exporting for composer-style deployment, exclude the `.gitignore` file
eileen [Fri, 2 Oct 2020 20:13:04 +0000 (09:13 +1300)]
dev/core#2079 [REF] clean up call to apiQuery
This fixes a few things
1) fixes apiQuery to be called statically as it is a static function
2) casts results directly to detail
3) removes unnused variable
eileen [Fri, 2 Oct 2020 22:06:11 +0000 (11:06 +1300)]
dev/core#2087 Remove extraneous CRM_Core_BAO_UFMatch::updateUFName call
This is called from Email.create already (which is how this creates emails) - to be cautious an extra
change ensures that if the primary email is deleled & another is promoted it is called
Seamus Lee [Tue, 6 Oct 2020 01:10:37 +0000 (12:10 +1100)]
Merge pull request #18675 from eileenmcnaughton/uf2
dev/core#2087 move uf_match check above the primary check
Eileen McNaughton [Tue, 6 Oct 2020 00:47:12 +0000 (13:47 +1300)]
Merge pull request #18674 from seamuslee001/form_buttons_key
[REF] Fix adding in the accessKey based on the button array
eileen [Fri, 2 Oct 2020 22:07:37 +0000 (11:07 +1300)]
dev/core#2087 move uf_match check above the primary check
the uf_match check will result in an early return more often than the other
Seamus Lee [Mon, 5 Oct 2020 22:50:57 +0000 (09:50 +1100)]
[REF] Fix adding in the accessKey based on the button array
Seamus Lee [Mon, 5 Oct 2020 22:50:08 +0000 (09:50 +1100)]
Merge pull request #18143 from mattwire/membertabbuttons
Move membership tab add/submit membership buttons to PHP layer
Seamus Lee [Mon, 5 Oct 2020 22:34:02 +0000 (09:34 +1100)]
Merge pull request #18611 from mattwire/activitytokensmodifieddate
Add modified_date to list of activity tokens
Seamus Lee [Mon, 5 Oct 2020 22:27:24 +0000 (09:27 +1100)]
Merge pull request #18610 from demeritcowboy/error-recursion-recursion
dev/drupal#119 - Avoid crash from recursion on unhandled exceptions
Tim Otten [Mon, 5 Oct 2020 20:40:46 +0000 (13:40 -0700)]
gitattributes - When exporting for composer-style tarball, exclude gitignore
Eileen McNaughton [Mon, 5 Oct 2020 20:12:58 +0000 (09:12 +1300)]
Merge pull request #18649 from seamuslee001/error_class_remove
Ensure that the crm-error class on the field is also remove when field is changed
Coleman Watts [Mon, 5 Oct 2020 12:45:16 +0000 (08:45 -0400)]
Search ext: rename to Search Kit, mark as beta
Yashodha Chaku [Mon, 5 Oct 2020 11:27:18 +0000 (16:57 +0530)]
Merge pull request #18671 from MegaphoneJon/fix-perm-labels
fix labels on new admin permissions
colemanw [Sun, 4 Oct 2020 23:03:28 +0000 (19:03 -0400)]
Merge pull request #17675 from agh1/aria-form-fixes
Select field fixes for screen reader
Jon Goldberg [Sun, 4 Oct 2020 22:37:13 +0000 (18:37 -0400)]
fix labels on new admin permissions
demeritcowboy [Sat, 26 Sep 2020 14:25:12 +0000 (10:25 -0400)]
avoid crash from recursion on exceptions
Seamus Lee [Thu, 1 Oct 2020 01:41:10 +0000 (11:41 +1000)]
[REF] Ensure that the crm-error class on the field is also remove when field is changed
Only handle crm-error class
Seamus Lee [Sun, 4 Oct 2020 04:55:37 +0000 (15:55 +1100)]
Merge pull request #18644 from colemanw/savedSearch
Search ext: support complex joins & HAVING clause in api4 smart groups
Seamus Lee [Sun, 4 Oct 2020 04:22:10 +0000 (15:22 +1100)]
Merge pull request #18670 from totten/master-compup
composer.json - Update compile-lib and compile-plugin
Coleman Watts [Sat, 3 Oct 2020 00:45:47 +0000 (20:45 -0400)]
Updates for Angular 1.8 - fix premature access to component properties
Angular 1.8 doesn't seem to like it when you try to access component properties
before the init function.
colemanw [Sun, 4 Oct 2020 01:55:00 +0000 (21:55 -0400)]
Merge pull request #18647 from seamuslee001/widget_button_classes
[REF] Add in css classes to make the save and preview button on the C…
Tim Otten [Sun, 4 Oct 2020 01:00:41 +0000 (18:00 -0700)]
composer.lock - Update composer-compile-lib and composer-compile-plugin
Tim Otten [Sun, 4 Oct 2020 01:00:20 +0000 (18:00 -0700)]
composer.json - Update composer-compile-lib
Eileen McNaughton [Sat, 3 Oct 2020 23:02:54 +0000 (12:02 +1300)]
Merge pull request #18669 from demeritcowboy/blank-target-contact
dev/core#2090 - Undefined index on contact's activity tab when there's an activity that has no With Contact
Andrew Hunt [Mon, 14 Sep 2020 18:39:45 +0000 (14:39 -0400)]
StateProvince DAO title should be State/Province
Andrew Hunt [Mon, 14 Sep 2020 18:38:27 +0000 (14:38 -0400)]
Select placeholders should always say what kind of thing they select
Andrew Hunt [Sat, 20 Jun 2020 18:00:33 +0000 (14:00 -0400)]
Cleanup with ??
Andrew Hunt [Sat, 20 Jun 2020 17:14:42 +0000 (13:14 -0400)]
Attributes for a form element should always be an array
demeritcowboy [Sat, 3 Oct 2020 16:46:15 +0000 (12:46 -0400)]
handle missing array member
eileen [Fri, 2 Oct 2020 20:59:47 +0000 (09:59 +1300)]
dev/core#2079 [REF] clean up call to apiQuery
This fixes
1) fixes apiQuery to be called statically as it is a static function
2) casts results directly to detail
This is the copy & paste source of https://github.com/civicrm/civicrm-core/pull/18664 I guess....
Coleman Watts [Sat, 3 Oct 2020 00:44:43 +0000 (20:44 -0400)]
Search ext: Fix column appearing in the aggregate list when it is used in GROUP_BY
The bug was that it wasn't recognizing the column name after a function was added to it.
Coleman Watts [Wed, 30 Sep 2020 18:56:59 +0000 (14:56 -0400)]
Search ext: Extend api4 smart groups to work with HAVING
eileen [Fri, 2 Oct 2020 03:22:42 +0000 (16:22 +1300)]
Add unit test to cover pcp submission
eileen [Tue, 22 Sep 2020 03:23:53 +0000 (15:23 +1200)]
dev/core#2056 Only retrieve pcp & soft_credit info when needed
Currently we do 2 queries per contribution create to retrieve pcp & soft credit info. However, the
results of the queries are only used if pcp or soft credit keys exist in the params array
Eileen McNaughton [Fri, 2 Oct 2020 22:01:17 +0000 (11:01 +1300)]
Merge pull request #18666 from civicrm/5.30
5.30 to master