civicrm-core.git
4 years agomake test less time-sensitive
demeritcowboy [Tue, 21 Jul 2020 03:14:46 +0000 (23:14 -0400)]
make test less time-sensitive

4 years agoMerge pull request #17827 from eileenmcnaughton/utf_import
Seamus Lee [Mon, 20 Jul 2020 22:32:37 +0000 (08:32 +1000)]
Merge pull request #17827 from eileenmcnaughton/utf_import

dev/core#183 Use TempTable builder to generate table for import

4 years agoMerge pull request #17771 from mattwire/ufmatch_validemail
Eileen McNaughton [Mon, 20 Jul 2020 22:14:06 +0000 (10:14 +1200)]
Merge pull request #17771 from mattwire/ufmatch_validemail

Remove check for valid email in synchronizeUFMatch

4 years agoMerge pull request #17881 from eileenmcnaughton/activity
colemanw [Mon, 20 Jul 2020 21:34:00 +0000 (17:34 -0400)]
Merge pull request #17881 from eileenmcnaughton/activity

Call apiv4 from Contribution create rather than fugly addActivity function

4 years agoMerge pull request #17899 from colemanw/basicEntity
Eileen McNaughton [Mon, 20 Jul 2020 21:30:55 +0000 (09:30 +1200)]
Merge pull request #17899 from colemanw/basicEntity

APIv4 - Add BasicEntity helper class

4 years agoCall apiv4 from Contribution create rather than fugly addActivity function
eileen [Sat, 18 Jul 2020 02:02:47 +0000 (14:02 +1200)]
Call apiv4 from Contribution create rather than fugly addActivity function

I took a look at https://github.com/civicrm/civicrm-core/pull/17274 which has blocking test failures - but felt that
the shared function was adding nothing and simply using the api to create the activity made more sense. The
shared function does a lot of silly wrangling for very little shared functionality and is
hard to read. In this call only 2 params are passed in - so most of the wranglingg
doesn't apply anyway. I ensured the 2 JIRA issues referenced in the removed code have test cover (one already
had a test written by Monish & I added in the campaign check

4 years agodev/core#183 Fix import csv to use temp table builder
eileen [Tue, 14 Jul 2020 05:57:39 +0000 (17:57 +1200)]
dev/core#183 Fix import csv to use temp table builder

4 years agoUse TempTable builder to generate table for import
eileen [Tue, 14 Jul 2020 05:36:24 +0000 (17:36 +1200)]
Use TempTable builder to generate table for import

4 years agoMerge pull request #17867 from MegaphoneJon/mailing-70
colemanw [Mon, 20 Jul 2020 18:45:47 +0000 (14:45 -0400)]
Merge pull request #17867 from MegaphoneJon/mailing-70

mailing#70 Don't create users for test mail if user doesn't have permission

4 years agoAPIv4 - Add BasicEntity helper class
Coleman Watts [Mon, 20 Jul 2020 18:30:35 +0000 (14:30 -0400)]
APIv4 - Add BasicEntity helper class

4 years agoMerge pull request #17879 from colemanw/relCacheApi
colemanw [Mon, 20 Jul 2020 14:43:32 +0000 (10:43 -0400)]
Merge pull request #17879 from colemanw/relCacheApi

Add APIv4 and pseudoconstants for RelationshipCache

4 years agoMerge pull request #17580 from samuelsov/dev/core#1670
Eileen McNaughton [Mon, 20 Jul 2020 07:11:33 +0000 (19:11 +1200)]
Merge pull request #17580 from samuelsov/dev/core#1670

dev/core#1670 copy custom fields from master to shared address

4 years agoMerge pull request #17560 from eileenmcnaughton/import
Seamus Lee [Mon, 20 Jul 2020 06:59:08 +0000 (16:59 +1000)]
Merge pull request #17560 from eileenmcnaughton/import

[Ref] Unit test attempt to create reported bugs , minor cleanup

4 years agoMerge pull request #17897 from seamuslee001/setver_new
Seamus Lee [Mon, 20 Jul 2020 05:14:13 +0000 (15:14 +1000)]
Merge pull request #17897 from seamuslee001/setver_new

Update version in the test_data_second_domain file and also update th…

4 years agoMerge pull request #17898 from demeritcowboy/smartgroupmarker
Eileen McNaughton [Mon, 20 Jul 2020 03:50:42 +0000 (15:50 +1200)]
Merge pull request #17898 from demeritcowboy/smartgroupmarker

dev/core#1888 - Fix one line in PR 17888

4 years agoUpdate version in the test_data_second_domain file and also update the setVersion...
Seamus Lee [Mon, 20 Jul 2020 01:42:23 +0000 (11:42 +1000)]
Update version in the test_data_second_domain file and also update the setVersion script to update the file version as necessary

Set setting indicating system has been installed after loading in the 2nd domain

4 years agosomehow messed up a line in revert ba2ad46
demeritcowboy [Mon, 20 Jul 2020 02:44:07 +0000 (22:44 -0400)]
somehow messed up a line in revert ba2ad46

4 years ago[Ref] Unit test attempt to create reported bugs , minor refactor
eileen [Tue, 9 Jun 2020 07:50:02 +0000 (19:50 +1200)]
[Ref] Unit test attempt to create reported bugs , minor refactor

This lays the ground work to test a couple of reported bugs. Minor cleanup of code

4 years agoMerge pull request #17896 from eileenmcnaughton/pdfletter
colemanw [Mon, 20 Jul 2020 02:25:52 +0000 (22:25 -0400)]
Merge pull request #17896 from eileenmcnaughton/pdfletter

Be a little less supportive to cvs

4 years agoMerge pull request #17888 from demeritcowboy/groups-warnings
Eileen McNaughton [Mon, 20 Jul 2020 02:16:17 +0000 (14:16 +1200)]
Merge pull request #17888 from demeritcowboy/groups-warnings

dev/core#1888 and dev/core#1885 - Fatal error on advanced search and warnings and missing group display on contact form

4 years agoBe a little less supportive to cvs
eileen [Mon, 20 Jul 2020 00:48:29 +0000 (12:48 +1200)]
Be a little less supportive to cvs

4 years agoMerge pull request #17808 from colemanw/bridge
Eileen McNaughton [Mon, 20 Jul 2020 00:45:35 +0000 (12:45 +1200)]
Merge pull request #17808 from colemanw/bridge

APIv4 - Specify BridgeEntities to assist with joins

4 years agoMerge pull request #16736 from ixiam/dev_report_issue#27
Eileen McNaughton [Mon, 20 Jul 2020 00:40:14 +0000 (12:40 +1200)]
Merge pull request #16736 from ixiam/dev_report_issue#27

Contribution Summary Report: Taking the currency filtered in the "gen…

4 years agoMerge pull request #17891 from mattwire/eventcartmenu
Eileen McNaughton [Sun, 19 Jul 2020 23:08:33 +0000 (11:08 +1200)]
Merge pull request #17891 from mattwire/eventcartmenu

Event Cart ext: Move menu entries to extension

4 years agoMerge pull request #17895 from civicrm/5.28
Eileen McNaughton [Sun, 19 Jul 2020 23:08:18 +0000 (11:08 +1200)]
Merge pull request #17895 from civicrm/5.28

5.28

4 years agoMerge pull request #17892 from demeritcowboy/tests-outputreport
Eileen McNaughton [Sun, 19 Jul 2020 22:13:54 +0000 (10:13 +1200)]
Merge pull request #17892 from demeritcowboy/tests-outputreport

[Test Framework] - Tests for report downloads

4 years agoMerge pull request #17890 from christianwach/lab-core-1889-3
Seamus Lee [Sun, 19 Jul 2020 21:36:49 +0000 (07:36 +1000)]
Merge pull request #17890 from christianwach/lab-core-1889-3

Prevent session from starting during WordPress pseudo-cron procedures

4 years agoMerge pull request #17866 from colemanw/customFix
colemanw [Sun, 19 Jul 2020 19:57:52 +0000 (15:57 -0400)]
Merge pull request #17866 from colemanw/customFix

dev/core#1578 - Fix APIv4 chaining with custom fields

4 years agotests for report downloads
demeritcowboy [Sun, 19 Jul 2020 13:38:46 +0000 (09:38 -0400)]
tests for report downloads

4 years agoMove menu definitions to eventcart extension
Matthew Wire [Sun, 19 Jul 2020 10:46:04 +0000 (11:46 +0100)]
Move menu definitions to eventcart extension

4 years agoMerge pull request #17882 from eileenmcnaughton/jaap
Seamus Lee [Sun, 19 Jul 2020 04:38:12 +0000 (14:38 +1000)]
Merge pull request #17882 from eileenmcnaughton/jaap

Unit test for #17361

4 years agoMerge pull request #17885 from mattwire/eventcartext_forms
colemanw [Sat, 18 Jul 2020 21:46:36 +0000 (17:46 -0400)]
Merge pull request #17885 from mattwire/eventcartext_forms

EventCart ext: Cleanup and move form components to ext

4 years agoMerge pull request #17884 from mattwire/eventcartext_meta
Seamus Lee [Sat, 18 Jul 2020 20:48:11 +0000 (06:48 +1000)]
Merge pull request #17884 from mattwire/eventcartext_meta

EventCart ext: Fix autogenerated code, remove unused hooks, update readme

4 years agoPrevent session from starting during WordPress pseudo-cron procedures
Christian Wach [Sat, 18 Jul 2020 20:08:50 +0000 (21:08 +0100)]
Prevent session from starting during WordPress pseudo-cron procedures

4 years agoMerge pull request #17828 from eileenmcnaughton/matt
Matthew Wire [Sat, 18 Jul 2020 17:32:25 +0000 (18:32 +0100)]
Merge pull request #17828 from eileenmcnaughton/matt

Load contribution page if live payment processor is disabled but test is available

4 years agoMerge pull request #17887 from colemanw/searchDebug
colemanw [Sat, 18 Jul 2020 17:04:17 +0000 (13:04 -0400)]
Merge pull request #17887 from colemanw/searchDebug

Search debug

4 years agorevert PR 13958
demeritcowboy [Sat, 18 Jul 2020 15:17:31 +0000 (11:17 -0400)]
revert PR 13958

4 years agoSearch Ext: fix parseExpr field prefix
Coleman Watts [Sat, 18 Jul 2020 13:09:03 +0000 (09:09 -0400)]
Search Ext: fix parseExpr field prefix

4 years agoSearch Ext: Add api params to debug section
Coleman Watts [Sat, 18 Jul 2020 03:27:46 +0000 (23:27 -0400)]
Search Ext: Add api params to debug section

4 years agoCleanup and move eventcart form components to ext
Matthew Wire [Sat, 18 Jul 2020 11:42:02 +0000 (12:42 +0100)]
Cleanup and move eventcart form components to ext

4 years agoFix autogenerated code, remove unused hooks, update readme
Matthew Wire [Sat, 18 Jul 2020 11:35:48 +0000 (12:35 +0100)]
Fix autogenerated code, remove unused hooks, update readme

4 years agoMerge pull request #17361 from jaapjansma/dev-1767
Eileen McNaughton [Sat, 18 Jul 2020 09:07:01 +0000 (21:07 +1200)]
Merge pull request #17361 from jaapjansma/dev-1767

dev/core#1767 Fix phone key parsing in CRM_Dedupe_Finder

4 years agoUnit test for #17361
eileen [Sat, 18 Jul 2020 09:04:50 +0000 (21:04 +1200)]
Unit test for #17361

4 years agoMerge pull request #17880 from colemanw/headerComments
Seamus Lee [Sat, 18 Jul 2020 08:57:43 +0000 (18:57 +1000)]
Merge pull request #17880 from colemanw/headerComments

[NFC] Fix nonstandard header comments

4 years agoMerge pull request #17480 from tunbola/email-template-perms
Eileen McNaughton [Sat, 18 Jul 2020 03:03:03 +0000 (15:03 +1200)]
Merge pull request #17480 from tunbola/email-template-perms

dev/core#1751: [Create Email] Only Show Update/Save Template when User has Permission to Edit Templates

4 years agoFix nonstandard header comments
Coleman Watts [Sat, 18 Jul 2020 01:21:59 +0000 (21:21 -0400)]
Fix nonstandard header comments

4 years agoAdd APIv4 and pseudoconstants for RelationshipCache
Coleman Watts [Sat, 18 Jul 2020 00:33:42 +0000 (20:33 -0400)]
Add APIv4 and pseudoconstants for RelationshipCache

4 years agoMerge pull request #17874 from colemanw/checkPermShort
Seamus Lee [Fri, 17 Jul 2020 23:12:29 +0000 (09:12 +1000)]
Merge pull request #17874 from colemanw/checkPermShort

Use new checkPermissions shorthand in api calls

4 years agoMerge pull request #17878 from civicrm/5.28
Eileen McNaughton [Fri, 17 Jul 2020 22:40:31 +0000 (10:40 +1200)]
Merge pull request #17878 from civicrm/5.28

5.28

4 years agoMerge pull request #17846 from mattwire/optimiseclearcaches
Eileen McNaughton [Fri, 17 Jul 2020 22:17:39 +0000 (10:17 +1200)]
Merge pull request #17846 from mattwire/optimiseclearcaches

Simplify flushing group contact cache query to reduce table locking and improve performance

4 years agoMerge pull request #17806 from demeritcowboy/mail-report-csv-bom
Seamus Lee [Fri, 17 Jul 2020 21:58:17 +0000 (07:58 +1000)]
Merge pull request #17806 from demeritcowboy/mail-report-csv-bom

dev/core#1869 - Include BOM in attachment when sending CSV CiviReport via mail_report job

4 years agoMerge pull request #17875 from colemanw/customFieldVersionCheck
Seamus Lee [Fri, 17 Jul 2020 21:55:29 +0000 (07:55 +1000)]
Merge pull request #17875 from colemanw/customFieldVersionCheck

Ensure serialize field exists before adding to query

4 years agoEnsure serialize field exists before adding to query
Coleman Watts [Fri, 17 Jul 2020 16:16:35 +0000 (12:16 -0400)]
Ensure serialize field exists before adding to query

4 years agoMerge pull request #16838 from mlutfy/core1280
Mathieu Lu [Fri, 17 Jul 2020 15:54:47 +0000 (11:54 -0400)]
Merge pull request #16838 from mlutfy/core1280

dev/core#1280 Fix ContributionPage soft_credit translation

4 years agoUse new checkPermissions shorthand in api calls
Coleman Watts [Fri, 17 Jul 2020 14:16:01 +0000 (10:16 -0400)]
Use new checkPermissions shorthand in api calls

4 years agoMerge pull request #17872 from eileenmcnaughton/ids
colemanw [Fri, 17 Jul 2020 13:08:53 +0000 (09:08 -0400)]
Merge pull request #17872 from eileenmcnaughton/ids

[NFC] Comment block cleanup

4 years agodev/core#1280 Test for ContributionPage soft_credit translation
Mathieu Lutfy [Wed, 18 Mar 2020 18:11:12 +0000 (14:11 -0400)]
dev/core#1280 Test for ContributionPage soft_credit translation

4 years ago[NFC] Comment block cleanup
eileen [Fri, 17 Jul 2020 07:03:53 +0000 (19:03 +1200)]
[NFC] Comment block cleanup

4 years agoMerge pull request #17524 from mattwire/memberbaocreate
Eileen McNaughton [Fri, 17 Jul 2020 06:55:02 +0000 (18:55 +1200)]
Merge pull request #17524 from mattwire/memberbaocreate

REF Extract addToRecentItems from membership create

4 years agoMerge pull request #17526 from mattwire/frontendrequiredpaymentfrequency
Eileen McNaughton [Fri, 17 Jul 2020 06:49:34 +0000 (18:49 +1200)]
Merge pull request #17526 from mattwire/frontendrequiredpaymentfrequency

Disable frequency/interval fields if not required. Mark required if they are so they are validated before submit

4 years agoMerge pull request #16298 from mattwire/membership_disabled
Eileen McNaughton [Fri, 17 Jul 2020 06:23:04 +0000 (18:23 +1200)]
Merge pull request #16298 from mattwire/membership_disabled

dev/membership#18 Enhance parameters for Job.process_membership

4 years agoMerge pull request #17703 from mattwire/contributionpage_currency
Seamus Lee [Fri, 17 Jul 2020 05:49:15 +0000 (15:49 +1000)]
Merge pull request #17703 from mattwire/contributionpage_currency

Fix currency symbol for Total Amount on contribution page

4 years agoMerge pull request #17781 from totten/master-vortex-max
Seamus Lee [Fri, 17 Jul 2020 02:30:27 +0000 (12:30 +1000)]
Merge pull request #17781 from totten/master-vortex-max

RelationshipCache - Add a high-level index to facilitate relationship queries (more fields)

4 years agoMerge pull request #17871 from seamuslee001/deprecated_jquery
Seamus Lee [Fri, 17 Jul 2020 02:28:05 +0000 (12:28 +1000)]
Merge pull request #17871 from seamuslee001/deprecated_jquery

[REF] Fix a couple of jQuery errors that have cropped up

4 years agoMerge pull request #17831 from totten/master-no-preboot
Eileen McNaughton [Fri, 17 Jul 2020 01:22:13 +0000 (13:22 +1200)]
Merge pull request #17831 from totten/master-no-preboot

Hooks/Dispatcher - Close loopholes that occur around "preboot" hooks

4 years agoMerge pull request #17834 from colemanw/api4perm
Eileen McNaughton [Fri, 17 Jul 2020 01:05:06 +0000 (13:05 +1200)]
Merge pull request #17834 from colemanw/api4perm

APIv4 - Add shorthand for setCheckPermissions()

4 years agoMerge pull request #17870 from eileenmcnaughton/line
Eileen McNaughton [Fri, 17 Jul 2020 01:01:27 +0000 (13:01 +1200)]
Merge pull request #17870 from eileenmcnaughton/line

Use PrematureExit exception instead of weird hack in tests

4 years agoMerge pull request #16429 from ixiam/dev/core#1113
Eileen McNaughton [Fri, 17 Jul 2020 00:52:57 +0000 (12:52 +1200)]
Merge pull request #16429 from ixiam/dev/core#1113

dev/core#1113 - Decimal Separator - Invalid value "total_amount" (NaN,N) creating or editing a membership

4 years agoMerge pull request #17869 from totten/master-regen-zipcode
Seamus Lee [Fri, 17 Jul 2020 00:09:43 +0000 (10:09 +1000)]
Merge pull request #17869 from totten/master-regen-zipcode

(REF) regen.sh - Remove unusual handling of `zipcodes.mysql`

4 years agoMerge pull request #17863 from demeritcowboy/be-greener
colemanw [Thu, 16 Jul 2020 23:34:04 +0000 (19:34 -0400)]
Merge pull request #17863 from demeritcowboy/be-greener

dev/report#43 - Icon after saving a civireport instance is misleading

4 years ago[REF] Fix a couple of jQuery errors that have cropped up
Seamus Lee [Thu, 16 Jul 2020 23:22:42 +0000 (09:22 +1000)]
[REF] Fix a couple of jQuery errors that have cropped up

4 years agoMerge pull request #17823 from colemanw/upgradeSafe
Seamus Lee [Thu, 16 Jul 2020 23:20:32 +0000 (09:20 +1000)]
Merge pull request #17823 from colemanw/upgradeSafe

Remove unnecessary try/catch per #17729

4 years agoUse PrematureExit exception instead of weird hack in tests
eileen [Thu, 16 Jul 2020 23:00:46 +0000 (11:00 +1200)]
Use PrematureExit exception instead of weird hack in tests

Passing is_unit_test to a function to avoid the civiExit routine has been superceded by catching
PrematureExitExceptions

4 years agoMerge pull request #17458 from eileenmcnaughton/export
Seamus Lee [Thu, 16 Jul 2020 23:14:40 +0000 (09:14 +1000)]
Merge pull request #17458 from eileenmcnaughton/export

dev/core#1725 Only export primary address fields

4 years agoMerge pull request #17860 from eileenmcnaughton/test
Seamus Lee [Thu, 16 Jul 2020 22:44:26 +0000 (08:44 +1000)]
Merge pull request #17860 from eileenmcnaughton/test

api_v3_TaxContributionPageTest fix - remove hard coded processor id

4 years agoRegenerate sql/civicrm_generated.mysql
Tim Otten [Thu, 16 Jul 2020 07:35:00 +0000 (00:35 -0700)]
Regenerate sql/civicrm_generated.mysql

4 years agoRelationshipCache - Remove case_id
Tim Otten [Thu, 16 Jul 2020 07:34:01 +0000 (00:34 -0700)]
RelationshipCache - Remove case_id

4 years agoRename RelationshipVortex to RelationshipCache
Tim Otten [Thu, 16 Jul 2020 07:21:58 +0000 (00:21 -0700)]
Rename RelationshipVortex to RelationshipCache

4 years agoRelationshipVortex - Add to list of example fields in MergerTest::testGetCidRefs
Tim Otten [Tue, 7 Jul 2020 09:18:45 +0000 (02:18 -0700)]
RelationshipVortex - Add to list of example fields in MergerTest::testGetCidRefs

4 years agoRelationshipVortex - Create and populate table during upgrade (5.29)
Tim Otten [Wed, 1 Jul 2020 06:44:08 +0000 (23:44 -0700)]
RelationshipVortex - Create and populate table during upgrade (5.29)

4 years agoRelationshipVortex - Define MySQL trigger to keep data sync'd. Add test. Use syncInto().
Tim Otten [Wed, 1 Jul 2020 06:43:06 +0000 (23:43 -0700)]
RelationshipVortex - Define MySQL trigger to keep data sync'd. Add test. Use syncInto().

4 years agoRelationshipVortex - Add schema files (incl start_date, end_date, etal)
Tim Otten [Wed, 1 Jul 2020 04:50:44 +0000 (21:50 -0700)]
RelationshipVortex - Add schema files (incl start_date, end_date, etal)

This is the more maximal variant of the schema which includes mirrors for most fields.

4 years agoGenCode - Fix pluralization of words ending in x
Coleman Watts [Tue, 7 Jul 2020 23:54:21 +0000 (19:54 -0400)]
GenCode - Fix pluralization of words ending in x

4 years agoMerge pull request #16626 from pradpnayak/lineItemFixes
Eileen McNaughton [Thu, 16 Jul 2020 22:18:40 +0000 (10:18 +1200)]
Merge pull request #16626 from pradpnayak/lineItemFixes

Fixed DB Error: syntax error if line item refers to civicrm_case

4 years ago(REF) regen.sh - Remove unusual handling of `zipcodes.mysql`
Tim Otten [Thu, 16 Jul 2020 20:41:15 +0000 (13:41 -0700)]
(REF) regen.sh - Remove unusual handling of `zipcodes.mysql`

Overview
--------

This is a small refactoring in service of the broader goal of simplifying
the sample-data generation and incorporating it into the installer (where it
can be localized/configured and where we don't have to commit any blobs).

The current process revolves around `regen.sh` and `civicrm_generated.mysql`.

Before
------

`regen.sh` builds an example DB and dumps the content into `civicrm_generated.mysql`.

As part of this, it loads `zipcodes.mysql` into the example DB,
drops/creates a table `zipcodes`, then runs some setup work,
and then re-drops `zipcodes`.

This is only safe on an isolated database. If you're trying to run it on
a pre-existing database created by `$cms`, then you don't know if there's going
to be a conflict on `zipcodes`.

After
-----

It doesn't drop/create/drop the `zipcodes` table. It just reads from the file.

Comment
-------

The main change is fairly small.  It looks big because `zipcodes.mysql` as
to be reformatted as `zipcodes.json`.

4 years agoMerge pull request #17865 from colemanw/summary
Eileen McNaughton [Thu, 16 Jul 2020 21:59:53 +0000 (09:59 +1200)]
Merge pull request #17865 from colemanw/summary

Fix potential js error on summary screen when reloading blocks

4 years agoapi_v3_TaxContributionPageTest fix - remove hard coded processor id
eileen [Thu, 16 Jul 2020 07:12:54 +0000 (19:12 +1200)]
api_v3_TaxContributionPageTest fix - remove hard coded processor id

4 years agoMerge pull request #17864 from colemanw/searchFix
colemanw [Thu, 16 Jul 2020 21:27:19 +0000 (17:27 -0400)]
Merge pull request #17864 from colemanw/searchFix

Search Ext: fix loading options and parsing custom field names

4 years agomailing#70 Don't create users for test mail if user doesn't have permission
Jon Goldberg [Thu, 16 Jul 2020 20:26:59 +0000 (16:26 -0400)]
mailing#70 Don't create users for test mail if user doesn't have permission

4 years agodev/core#1578 - Fix APIv4 chaining with custom fields
Coleman Watts [Thu, 16 Jul 2020 19:51:49 +0000 (15:51 -0400)]
dev/core#1578 - Fix APIv4 chaining with custom fields

4 years agoFix potential js error on summary screen when reloading blocks
Coleman Watts [Thu, 16 Jul 2020 19:03:08 +0000 (15:03 -0400)]
Fix potential js error on summary screen when reloading blocks

4 years agoMerge pull request #17861 from totten/master-dao-event
Tim Otten [Thu, 16 Jul 2020 18:49:01 +0000 (11:49 -0700)]
Merge pull request #17861 from totten/master-dao-event

EventCart - Resolve BAO identity and uncommitted DAO changes

4 years agoSearch Ext: fix loading options and parsing custom field names
Coleman Watts [Thu, 16 Jul 2020 18:18:48 +0000 (14:18 -0400)]
Search Ext: fix loading options and parsing custom field names

4 years agoMerge pull request #17862 from colemanw/jobCleanup
colemanw [Thu, 16 Jul 2020 18:02:12 +0000 (14:02 -0400)]
Merge pull request #17862 from colemanw/jobCleanup

[REF] ScheduledJob cleanup, remove unused var

4 years agoScheduledJob cleanup, remove unused var
Coleman Watts [Thu, 16 Jul 2020 15:28:21 +0000 (11:28 -0400)]
ScheduledJob cleanup, remove unused var

4 years agotests for processReportMode
demeritcowboy [Thu, 16 Jul 2020 14:35:18 +0000 (10:35 -0400)]
tests for processReportMode

4 years agoicon in status message is misleading
demeritcowboy [Thu, 16 Jul 2020 14:34:52 +0000 (10:34 -0400)]
icon in status message is misleading

4 years agoMerge pull request #17855 from seamuslee001/dev_core_1090
Seamus Lee [Thu, 16 Jul 2020 11:13:43 +0000 (21:13 +1000)]
Merge pull request #17855 from seamuslee001/dev_core_1090

dev/core#1090 Update extendedSerializeData to use the Backbone namesp…

4 years agoMerge pull request #17835 from demeritcowboy/test-contact-form
Seamus Lee [Thu, 16 Jul 2020 11:13:11 +0000 (21:13 +1000)]
Merge pull request #17835 from demeritcowboy/test-contact-form

dev/core#1874 - Failing test for new Individual form

4 years agoEventCart - Resolve BAO identity and uncommitted DAO changes
Tim Otten [Thu, 16 Jul 2020 09:33:07 +0000 (02:33 -0700)]
EventCart - Resolve BAO identity and uncommitted DAO changes

Overview
--------

This fixes a recent issue in which `setup.sh` is producing local-only changes to the `Cart`
and `EventInCart` DAO files.

To reduce ambiguity, I'm rephrasing the normal "Before/After" and giving a 3-step evolution/history.

Evolution
---------

(1) Traditionally, the `Cart`/`EventInCart` entities have both BAO+DAO in main source-tree.

(2) With #17743 (685bf3d218a9dad7e90d24aec165c63df12c1f67), the BAO moved away. But then
we get some detritus in the code-tree whenever you run `setup.sh`.

(3) With this patch, we don't get the detritus anymore.

Technical Details
-----------------

When I ran `setup.sh -g`, it produced local modifications like this:

```
diff --git a/CRM/Event/Cart/DAO/Cart.php b/CRM/Event/Cart/DAO/Cart.php
index 4683add13d..3a7f721dc1 100644
--- a/CRM/Event/Cart/DAO/Cart.php
+++ b/CRM/Event/Cart/DAO/Cart.php
@@ -94,7 +94,7 @@ class CRM_Event_Cart_DAO_Cart extends CRM_Core_DAO {
           'where' => 'civicrm_event_carts.id',
           'table_name' => 'civicrm_event_carts',
           'entity' => 'Cart',
-          'bao' => 'CRM_Event_Cart_BAO_Cart',
+          'bao' => 'CRM_Event_Cart_DAO_Cart',
           'localizable' => 0,
           'add' => '4.1',
         ],
```

(Let's ignore the cyclic dependency in this design - that's a messier/pre-existing
problem.)

That metadata is inaccurate.  The `bao` should point to the BAO, sinec the BAO does exist.

It's inaccurate because the BAO exists in a different location.

This patch allows you override the file-existence check -- saying, "this entity will
use BAO's even though they're not in the file-location you might normally expect."