civicrm-core.git
5 years agoMore export Structure arrays to processor
eileen [Wed, 10 Jul 2019 14:04:41 +0000 (02:04 +1200)]
More export Structure arrays to processor

5 years agoMerge pull request #14810 from eileenmcnaughton/fix_up
Eileen McNaughton [Fri, 12 Jul 2019 04:09:14 +0000 (16:09 +1200)]
Merge pull request #14810 from eileenmcnaughton/fix_up

Fix upgrade for membership second reminder

5 years agoMerge pull request #14808 from eileenmcnaughton/export_sql
Eileen McNaughton [Fri, 12 Jul 2019 04:08:47 +0000 (16:08 +1200)]
Merge pull request #14808 from eileenmcnaughton/export_sql

[REF] [Export] Further  cleanup - construct  sql more concisely

5 years agoMerge pull request #14809 from eileenmcnaughton/ex_merge
Eileen McNaughton [Fri, 12 Jul 2019 03:29:48 +0000 (15:29 +1200)]
Merge pull request #14809 from eileenmcnaughton/ex_merge

[REF] [Export] move mergeSameAddress to processor class

5 years agoMake return for query more like sql
eileen [Wed, 10 Jul 2019 13:21:41 +0000 (01:21 +1200)]
Make return for query more like sql

5 years agoMerge pull request #14793 from eileenmcnaughton/update_test
Eileen McNaughton [Fri, 12 Jul 2019 03:00:56 +0000 (15:00 +1200)]
Merge pull request #14793 from eileenmcnaughton/update_test

[TEST][EXPORT] Improve unit test on export.

5 years agoFix upgrade for membership second reminder
eileen [Fri, 12 Jul 2019 02:26:41 +0000 (14:26 +1200)]
Fix upgrade for membership second reminder

Updates the upgrade from https://github.com/civicrm/civicrm-core/pull/1348 to apply to the merged civi version

5 years ago[REF] [Export] move mergeSameAddress to processor class
eileen [Fri, 12 Jul 2019 02:03:13 +0000 (14:03 +1200)]
[REF] [Export] move mergeSameAddress to processor class

5 years agoMove more of the query construction into runQuery
eileen [Wed, 10 Jul 2019 13:16:29 +0000 (01:16 +1200)]
Move more of the query construction into runQuery

5 years agoMerge pull request #14807 from civicrm/5.16
Eileen McNaughton [Fri, 12 Jul 2019 01:49:12 +0000 (13:49 +1200)]
Merge pull request #14807 from civicrm/5.16

5.16 to master

5 years agoMerge pull request #14764 from elisseck/dev/report/15
Eileen McNaughton [Fri, 12 Jul 2019 01:48:44 +0000 (13:48 +1200)]
Merge pull request #14764 from elisseck/dev/report/15

dev/report/15 Add fix and tests for contact subtype report filter

5 years ago[Test][REF] Improve membership export test
eileen [Fri, 12 Jul 2019 00:43:45 +0000 (12:43 +1200)]
[Test][REF] Improve membership export test

5 years agoMerge pull request #14806 from eileenmcnaughton/ex
colemanw [Fri, 12 Jul 2019 01:31:39 +0000 (21:31 -0400)]
Merge pull request #14806 from eileenmcnaughton/ex

[REF] [Export] further code cleanup

5 years agoMerge pull request #14728 from eileenmcnaughton/last_icing
colemanw [Fri, 12 Jul 2019 01:31:15 +0000 (21:31 -0400)]
Merge pull request #14728 from eileenmcnaughton/last_icing

[REF] final cleanup - call bulkCreate from migrate_utils

5 years ago[TEST][EXPORT] Improve unit test on export (inc add mergeSameAddress test)"
eileen [Thu, 11 Jul 2019 10:10:34 +0000 (22:10 +1200)]
[TEST][EXPORT] Improve unit test on export (inc add mergeSameAddress test)"

This updates the methodology used to test the membership export. I also made it check a bunch more fields
while I was at it

5 years agoDon't pass around paymentTableId
eileen [Wed, 10 Jul 2019 13:02:32 +0000 (01:02 +1200)]
Don't pass around paymentTableId

5 years agoMove code wrangling to the start
eileen [Wed, 10 Jul 2019 12:50:37 +0000 (00:50 +1200)]
Move code wrangling to the start

5 years agoMerge pull request #14800 from colemanw/mapperKeys
Eileen McNaughton [Fri, 12 Jul 2019 00:36:45 +0000 (12:36 +1200)]
Merge pull request #14800 from colemanw/mapperKeys

[REF] [EXPORT] Alter CRM_Export_BAO_Export::exportComponents

5 years agoMerge pull request #13487 from giant-rabbit/17880-after-first-reminder-for-membership-fix
Eileen McNaughton [Thu, 11 Jul 2019 23:44:38 +0000 (11:44 +1200)]
Merge pull request #13487 from giant-rabbit/17880-after-first-reminder-for-membership-fix

(dev/core#285) Fixed second membership reminder

5 years agoadd tests for contact subtype null and not null report filters
Eli Lisseck [Thu, 11 Jul 2019 23:41:33 +0000 (16:41 -0700)]
add tests for contact subtype null and not null report filters

5 years agoapply reporting#15 fix against master
Jon Goldberg [Mon, 8 Jul 2019 21:51:48 +0000 (17:51 -0400)]
apply reporting#15 fix against master

5 years agoMerge pull request #14803 from eileenmcnaughton/ex5
colemanw [Thu, 11 Jul 2019 23:39:30 +0000 (19:39 -0400)]
Merge pull request #14803 from eileenmcnaughton/ex5

[REF] [Export] move build master copy array to ExportProcessor

5 years agoAlter CRM_Export_BAO_Export::exportComponents to accept standard MappingField format
Coleman Watts [Thu, 11 Jul 2019 21:24:51 +0000 (17:24 -0400)]
Alter CRM_Export_BAO_Export::exportComponents to accept standard MappingField format

5 years agoMerge pull request #14804 from eileenmcnaughton/eee
colemanw [Thu, 11 Jul 2019 23:31:50 +0000 (19:31 -0400)]
Merge pull request #14804 from eileenmcnaughton/eee

[REF] [Export] Remove code that seems unused

5 years agoMerge pull request #14802 from eileenmcnaughton/ex4
colemanw [Thu, 11 Jul 2019 23:30:11 +0000 (19:30 -0400)]
Merge pull request #14802 from eileenmcnaughton/ex4

[REF] [Export] Move setting of household properties to processor

5 years agoMerge pull request #14805 from civicrm/5.16
Eileen McNaughton [Thu, 11 Jul 2019 23:09:55 +0000 (11:09 +1200)]
Merge pull request #14805 from civicrm/5.16

5.16 to master

5 years agoMerge pull request #14789 from seamuslee001/fast_array_caches
Eileen McNaughton [Thu, 11 Jul 2019 23:09:27 +0000 (11:09 +1200)]
Merge pull request #14789 from seamuslee001/fast_array_caches

Ensure recently converted groups cache matches previous behabiour my …

5 years ago[REF] [Export] Remove code that seems unused
eileen [Wed, 10 Jul 2019 12:48:58 +0000 (00:48 +1200)]
[REF] [Export] Remove code that seems unused

I can't find any evidence of this code being re-refenced. We DO reference a similar one for merge_same_address

5 years agoMerge pull request #14801 from eileenmcnaughton/ee
Eileen McNaughton [Thu, 11 Jul 2019 22:26:19 +0000 (10:26 +1200)]
Merge pull request #14801 from eileenmcnaughton/ee

[REF] [Export] Minor code relocation

5 years ago[REF] [Export] move build master copy array to ExportProcessor
eileen [Thu, 11 Jul 2019 22:06:04 +0000 (10:06 +1200)]
[REF] [Export] move build master copy array to ExportProcessor

5 years agoMerge pull request #14799 from eileenmcnaughton/move_ex
Eileen McNaughton [Thu, 11 Jul 2019 21:56:07 +0000 (09:56 +1200)]
Merge pull request #14799 from eileenmcnaughton/move_ex

[REF] [Export] Move replace merge tokens to processor class

5 years agoMove setting of household properties to processor
eileen [Wed, 10 Jul 2019 13:04:42 +0000 (01:04 +1200)]
Move setting of household properties to processor

5 years agoMinor code relocation
eileen [Wed, 10 Jul 2019 12:46:36 +0000 (00:46 +1200)]
Minor code relocation

n

5 years agoMerge pull request #14795 from eileenmcnaughton/ex
Seamus Lee [Thu, 11 Jul 2019 21:22:30 +0000 (17:22 -0400)]
Merge pull request #14795 from eileenmcnaughton/ex

[REF] [EXPORT] Stop passing return Properties

5 years agoMove replace merge tokens to processor class
eileen [Thu, 11 Jul 2019 21:02:43 +0000 (09:02 +1200)]
Move replace merge tokens to processor class

5 years agoStop passing return Properties
eileen [Wed, 10 Jul 2019 12:30:03 +0000 (00:30 +1200)]
Stop passing return Properties

5 years agoMerge pull request #14797 from eileenmcnaughton/ex_address
colemanw [Thu, 11 Jul 2019 20:16:23 +0000 (16:16 -0400)]
Merge pull request #14797 from eileenmcnaughton/ex_address

[REF] [Export] Move function that parses tokens to address processor

5 years ago[REF] final cleanup - call bulkCreate from migrate_utils
eileen [Thu, 4 Jul 2019 01:07:55 +0000 (13:07 +1200)]
[REF] final cleanup - call bulkCreate from migrate_utils

This has a test CRM_Utils_Migrate_ImportExportTest although I had trouble running it without switching to
some hard-coding (at least in isolation). This switches the existing bulk create action over to use bulkCreate

5 years agoMerge pull request #14796 from eileenmcnaughton/ex2
colemanw [Thu, 11 Jul 2019 20:13:15 +0000 (16:13 -0400)]
Merge pull request #14796 from eileenmcnaughton/ex2

[REF] [EXPORT] Minor consolidation of weird mergeSameAddreess nightmare code

5 years agoMerge pull request #14694 from eileenmcnaughton/cust_field_bulk
colemanw [Thu, 11 Jul 2019 20:07:35 +0000 (16:07 -0400)]
Merge pull request #14694 from eileenmcnaughton/cust_field_bulk

dev/core#1093 add a bulkCreate action for many customFields in one go

5 years ago[REF] [Export] Move function that parses tokens to address processor
eileen [Thu, 11 Jul 2019 18:41:13 +0000 (06:41 +1200)]
[REF] [Export] Move function that parses tokens to address processor

5 years agoMinor consolidation of weird mergeSameAddreess nightmare code
eileen [Wed, 10 Jul 2019 12:44:02 +0000 (00:44 +1200)]
Minor consolidation of weird mergeSameAddreess nightmare code

5 years agoMerge pull request #14794 from colemanw/select2map
Eileen McNaughton [Thu, 11 Jul 2019 17:56:44 +0000 (05:56 +1200)]
Merge pull request #14794 from colemanw/select2map

Use select2 to display field mappings

5 years agoMerge pull request #14790 from eileenmcnaughton/post
colemanw [Thu, 11 Jul 2019 14:34:43 +0000 (10:34 -0400)]
Merge pull request #14790 from eileenmcnaughton/post

[REF] [EXPORT] cleanup setting of additional postal fields

5 years agoMerge pull request #14792 from eileenmcnaughton/ex_x
colemanw [Thu, 11 Jul 2019 14:31:03 +0000 (10:31 -0400)]
Merge pull request #14792 from eileenmcnaughton/ex_x

[REF] [EXPORT] [TLA] Update handling of input fields so that the mapping format is accepted.

5 years agoUse select2 to display field mappings
Coleman Watts [Thu, 11 Jul 2019 14:07:13 +0000 (10:07 -0400)]
Use select2 to display field mappings

5 years agoUpdate handling of input fields so that the mapping format is accepted.
eileen [Wed, 10 Jul 2019 08:25:02 +0000 (20:25 +1200)]
Update handling of input fields so that the mapping format is accepted.

At this point we are converting to the mapping format AFTEr the function receives the fields but
changing that is the next step

5 years agoMerge pull request #14787 from eileenmcnaughton/ex1
colemanw [Thu, 11 Jul 2019 02:06:01 +0000 (22:06 -0400)]
Merge pull request #14787 from eileenmcnaughton/ex1

[REF][Export] Minor cleanup on household merge properties

5 years agoEnsure recently converted groups cache matches previous behabiour my setting withArra...
Seamus Lee [Wed, 10 Jul 2019 22:19:18 +0000 (08:19 +1000)]
Ensure recently converted groups cache matches previous behabiour my setting withArray as fast for it

Add in code comment as per Eileen

5 years agodev/core#1093 add a bulkSave action for many customFields in one go
eileen [Thu, 4 Jul 2019 00:08:34 +0000 (12:08 +1200)]
dev/core#1093 add a bulkSave action for many customFields in one go

Add bulkCreate function for CustomField with a view towards this being a new protocol for how bulk create actions would look from a code POV which we could expose via apiv4

5 years agoMinor cleanup on household merge properties
eileen [Wed, 10 Jul 2019 01:28:50 +0000 (13:28 +1200)]
Minor cleanup on household merge properties

5 years ago[REF] cleanup setting of additional postal fields
eileen [Wed, 10 Jul 2019 02:20:21 +0000 (14:20 +1200)]
[REF] cleanup setting of additional postal fields

Further cleanup

5 years agoMerge pull request #14780 from eileenmcnaughton/export_test2
colemanw [Wed, 10 Jul 2019 23:49:48 +0000 (19:49 -0400)]
Merge pull request #14780 from eileenmcnaughton/export_test2

[NFC] [REF] [TEST] [EXPORT] Update various export tests to test csv output with new functions

5 years agoMerge pull request #14788 from eileenmcnaughton/ex2
colemanw [Wed, 10 Jul 2019 23:45:09 +0000 (19:45 -0400)]
Merge pull request #14788 from eileenmcnaughton/ex2

[REF] [EXPORT] partial cleanup on adding fields to returnProperties based on usage

5 years ago[REF] partial cleanup on adding fields to returnProperties based on usage
eileen [Wed, 10 Jul 2019 01:42:39 +0000 (13:42 +1200)]
[REF] partial cleanup on adding fields to returnProperties based on usage

5 years agoMerge pull request #14785 from colemanw/contactTypes
Eileen McNaughton [Wed, 10 Jul 2019 21:17:00 +0000 (09:17 +1200)]
Merge pull request #14785 from colemanw/contactTypes

[EXPORT] Minor fixes to the export form

5 years ago[NFC][REF][TEST] update im provider export test to use csv output
eileen [Wed, 10 Jul 2019 11:42:01 +0000 (23:42 +1200)]
[NFC][REF][TEST] update im provider export test to use csv output

The move from testing sqlColumns to csv output is deliberate. While refactoring, cleaning up the sqlColumns stuff
having test on it was VERY helpful. But, at the end of the day the csv IS the output and testing that allows
us to improve the mechanism to develop that output

5 years ago[NFC] [TEST] fix another test for output testing
eileen [Wed, 10 Jul 2019 10:44:58 +0000 (22:44 +1200)]
[NFC] [TEST] fix another test for output testing

5 years agoImprove another test to test csv output
eileen [Wed, 10 Jul 2019 09:46:11 +0000 (21:46 +1200)]
Improve another test to test csv output

Note we are implictly checking headers so no need to do so separately

5 years agoMerge pull request #14786 from civicrm/5.16
Eileen McNaughton [Wed, 10 Jul 2019 20:00:05 +0000 (08:00 +1200)]
Merge pull request #14786 from civicrm/5.16

5.16 to master

5 years agoRemove irrelevant relationship types from export options
Coleman Watts [Sun, 7 Jul 2019 02:05:06 +0000 (22:05 -0400)]
Remove irrelevant relationship types from export options

5 years agoUse function to get contactTypes instead of hardcoded list
Coleman Watts [Sun, 7 Jul 2019 01:12:26 +0000 (21:12 -0400)]
Use function to get contactTypes instead of hardcoded list

5 years agoMerge pull request #14783 from agh1/5.16.0-releasenotes
Eileen McNaughton [Wed, 10 Jul 2019 19:04:56 +0000 (07:04 +1200)]
Merge pull request #14783 from agh1/5.16.0-releasenotes

5.16.0 release notes first run

5 years agoMerge pull request #14773 from eileenmcnaughton/export
colemanw [Wed, 10 Jul 2019 18:23:20 +0000 (14:23 -0400)]
Merge pull request #14773 from eileenmcnaughton/export

 [REF] [export] remove chunk of non-functional code

5 years agoMerge pull request #14774 from eileenmcnaughton/export_again
colemanw [Wed, 10 Jul 2019 18:22:09 +0000 (14:22 -0400)]
Merge pull request #14774 from eileenmcnaughton/export_again

[REF] [export] Cleaner handling of additional return properties

5 years agoMerge pull request #14761 from eileenmcnaughton/unsub1
Seamus Lee [Wed, 10 Jul 2019 16:41:54 +0000 (12:41 -0400)]
Merge pull request #14761 from eileenmcnaughton/unsub1

dev/core#1108 Use api call to retrieve mailing_id

5 years ago5.16.0 release notes: include César Ramos
Andrew Hunt [Wed, 10 Jul 2019 16:26:04 +0000 (12:26 -0400)]
5.16.0 release notes: include César Ramos
per
https://github.com/civicrm/civicrm-core/pull/14518#issuecomment-501881835

5 years ago5.16.0 release notes: add boilerplate
Andrew Hunt [Wed, 10 Jul 2019 15:43:36 +0000 (11:43 -0400)]
5.16.0 release notes: add boilerplate

5 years ago5.16.0 release notes: raw from script
Andrew Hunt [Wed, 10 Jul 2019 15:48:47 +0000 (11:48 -0400)]
5.16.0 release notes: raw from script

5 years agoContributor key: fix invalid YAML
Andrew Hunt [Wed, 10 Jul 2019 15:34:49 +0000 (11:34 -0400)]
Contributor key: fix invalid YAML

5 years agoMerge pull request #14767 from eileenmcnaughton/export_2
colemanw [Wed, 10 Jul 2019 13:18:02 +0000 (09:18 -0400)]
Merge pull request #14767 from eileenmcnaughton/export_2

[REF] initial extraction of loading saved mapping to qf format

5 years agoMerge pull request #14769 from eileenmcnaughton/ex_test2
colemanw [Wed, 10 Jul 2019 13:16:34 +0000 (09:16 -0400)]
Merge pull request #14769 from eileenmcnaughton/ex_test2

[REF] simplify & add tests on getMappingParams

5 years agoMerge pull request #14781 from civicrm/5.16
Eileen McNaughton [Wed, 10 Jul 2019 12:11:09 +0000 (00:11 +1200)]
Merge pull request #14781 from civicrm/5.16

5.16 to master

5 years agoMerge pull request #14775 from eileenmcnaughton/bgm
Mathieu Lu [Wed, 10 Jul 2019 12:09:48 +0000 (08:09 -0400)]
Merge pull request #14775 from eileenmcnaughton/bgm

dev/drupal#75 Drupal8: fix call to languageNegotiationURL() when called from cv

5 years agoMerge pull request #14779 from eileenmcnaughton/export_test2
Matthew Wire [Wed, 10 Jul 2019 11:29:01 +0000 (12:29 +0100)]
Merge pull request #14779 from eileenmcnaughton/export_test2

[ref] [export] [test] Improve csv test to test final output rather than the csv

5 years agoMerge pull request #14750 from eileenmcnaughton/pay_notice
Monish Deb [Wed, 10 Jul 2019 09:12:05 +0000 (14:42 +0530)]
Merge pull request #14750 from eileenmcnaughton/pay_notice

Fix enotice on formatting credit card details

5 years agoImprove csv test to test final output rather than the csv
eileen [Wed, 10 Jul 2019 09:09:30 +0000 (21:09 +1200)]
Improve csv test to test final output rather than the csv

5 years agoMerge pull request #14770 from totten/master-config-ids
Eileen McNaughton [Wed, 10 Jul 2019 08:05:44 +0000 (20:05 +1200)]
Merge pull request #14770 from totten/master-config-ids

Finish removing references to Config.IDS.ini

5 years agoMerge pull request #14696 from totten/master-d8-url
Eileen McNaughton [Wed, 10 Jul 2019 08:01:34 +0000 (20:01 +1200)]
Merge pull request #14696 from totten/master-d8-url

Migrate CivicrmHelper::parseUrl() to CRM_Utils_System_Drupal8::parseUrl().

5 years agoMerge pull request #14777 from totten/master-clean-key
Eileen McNaughton [Wed, 10 Jul 2019 07:56:12 +0000 (19:56 +1200)]
Merge pull request #14777 from totten/master-clean-key

GenCode, Cache::cleanKey() - Fix deploop during clean initialization

5 years agoMerge pull request #14778 from totten/master-basefilepath
Eileen McNaughton [Wed, 10 Jul 2019 07:49:37 +0000 (19:49 +1200)]
Merge pull request #14778 from totten/master-basefilepath

(dev/cloud-native#3) CRM_Utils_File - Deprecate baseFilePath() et al

5 years agoCRM_Utils_File::relativeDirectory() - Mark as deprecated
Tim Otten [Wed, 10 Jul 2019 06:35:31 +0000 (23:35 -0700)]
CRM_Utils_File::relativeDirectory() - Mark as deprecated

Computation of a relative path requires some base.  This implementation is
problematic because it relies on an implicit base which was constructed
problematically.  Moreover, the function is not used anywhere in the known
`universe`.

5 years agoCRM_Utils_File::absoluteDirectory() - Make `$basePath` required
Tim Otten [Wed, 10 Jul 2019 06:32:10 +0000 (23:32 -0700)]
CRM_Utils_File::absoluteDirectory() - Make `$basePath` required

Previous versions interpreted `$basePath=NULL` to mean "default to `self::baseFilePath()`".
However, no code in the known `universe` relies on this interpretation, and
the `baseFilePath()` function is problematic/deprecated.

We could almost deprecate the entire function `absoluteDirectory()`;
however, it's fine to keep around: the semantics are reasonable if one
provides `$basePath`, and there is one active use-case in which
`Civi\Core\Paths` calls `absoluteDirectory()` with a suitable `$basePath`.

5 years agoCRM_Utils_File::baseFilePath() - Mark function as deprecated
Tim Otten [Wed, 10 Jul 2019 06:30:57 +0000 (23:30 -0700)]
CRM_Utils_File::baseFilePath() - Mark function as deprecated

The rationale is provided in the docblock.

5 years agoGenCode, Cache::cleanKey() - Fix deploop during clean initialization
Tim Otten [Wed, 10 Jul 2019 02:21:58 +0000 (19:21 -0700)]
GenCode, Cache::cleanKey() - Fix deploop during clean initialization

Overview
--------

Suppose you have a clean codebase with no DAO files, and you try to run `xml/GenCode.php`.
This currently crashes.

The problem is not symptomatic day-to-day because we commit DAOs, so it's
very rare to run a full/clean initialization.  However, it does get in the
way of stress-testing the correctness of GenCode.

Before
------

Since 76e697a9d750d568d0d12c10dd8173f656e8bb1e, I believe we've had a dependency-loop
in the clean-gencode scenario, which works as follows:

* We don't have any DAOs, so we run `GenCode`.
* Running `GenCode` does a partial bootstrap (i.e. `CRM_Core_Config::singleton($loadFromDB===FALSE)`)
* The partial bootstrap creates some thread-local caches (`Arraycache`)
* Before creating the cache, it normalizes the name by calling `CRM_Core_BAO_Cache::cleanKey()`
* `CRM_Core_BAO_Cache` extends `CRM_Core_DAO_Cache`
* `CRM_Core_BAO_Cache` doesn't exist - that's why we called `GenCode` at the beginning.

After
-----

This migrates the utility function `cleanKey()` to another class which is always available and
does not rely on DAOs.

5 years agodev/drupal#75 Drupal8: fix call to languageNegotiationURL() when called from cv
Mathieu Lutfy [Wed, 10 Jul 2019 00:07:16 +0000 (20:07 -0400)]
dev/drupal#75 Drupal8: fix call to languageNegotiationURL() when called from cv

5 years agoMerge pull request #14772 from mlutfy/drupal75
Eileen McNaughton [Wed, 10 Jul 2019 04:44:29 +0000 (16:44 +1200)]
Merge pull request #14772 from mlutfy/drupal75

dev/drupal#75 Drupal8: fix call to languageNegotiationURL() when called from cv

5 years agoCleaner handling of additional return properties
eileen [Wed, 10 Jul 2019 01:18:11 +0000 (13:18 +1200)]
Cleaner handling of additional return properties

5 years ago [REF] [export] remove chunk of non-functional code
eileen [Wed, 10 Jul 2019 00:24:35 +0000 (12:24 +1200)]
 [REF] [export] remove chunk of non-functional code

I worked through this & groups is only available as a return property from contact export so can only be hit from there.

However, the search string has a very specific format - involving parentheses - that is NOT present in the from
clause as currently calculated

      case 'civicrm_group_contact':
        return " $side JOIN civicrm_group_contact ON contact_a.id = civicrm_group_contact.contact_id ";

I don't kmow if there is some bug that if this worked it would fix or not but the original bug
it addressed referred to an old query format we don't use https://issues.civicrm.org/jira/browse/CRM-3618 now.

If there is a bug this won't change it & if we identify it we can add tests & fix properly

5 years agodev/drupal#75 Drupal8: fix call to languageNegotiationURL() when called from cv
Mathieu Lutfy [Wed, 10 Jul 2019 00:07:16 +0000 (20:07 -0400)]
dev/drupal#75 Drupal8: fix call to languageNegotiationURL() when called from cv

5 years agoMerge pull request #14768 from eileenmcnaughton/export_test
Eileen McNaughton [Wed, 10 Jul 2019 00:03:26 +0000 (12:03 +1200)]
Merge pull request #14768 from eileenmcnaughton/export_test

[REF] [export] . Move greeting params retrieval to the place in the code where it is used

5 years ago[REF] simplify & add tests on getMappingParams
eileen [Tue, 9 Jul 2019 22:26:38 +0000 (10:26 +1200)]
[REF] simplify & add tests on getMappingParams

Tests extended to cover search builder (all that operator stuff

5 years agoCRM-20926 - Finish killing Config.IDS.ini
Tim Otten [Tue, 9 Jul 2019 22:19:31 +0000 (15:19 -0700)]
CRM-20926 - Finish killing Config.IDS.ini

5 years agoMove greeting params retrieval to the place in the code where it is used
eileen [Tue, 9 Jul 2019 21:28:42 +0000 (09:28 +1200)]
Move greeting params retrieval to the place in the code where it is used

5 years agoMerge pull request #14765 from eileenmcnaughton/export_test
Eileen McNaughton [Tue, 9 Jul 2019 21:04:16 +0000 (09:04 +1200)]
Merge pull request #14765 from eileenmcnaughton/export_test

[REF] Update export test to new function

5 years ago[REF] initial extraction of loading saved mapping to qf format
eileen [Tue, 9 Jul 2019 20:48:44 +0000 (08:48 +1200)]
[REF] initial extraction of loading saved mapping to qf format

Janky but in the right direction. The phoneType & imProvider stuff looks nasty but not more nasty

5 years agoMerge pull request #14745 from eileenmcnaughton/fgb
Eileen McNaughton [Tue, 9 Jul 2019 19:47:16 +0000 (07:47 +1200)]
Merge pull request #14745 from eileenmcnaughton/fgb

dev/core#578 follow up fix on activity summary report

5 years agoMerge pull request #14615 from mattwire/contributionpage_title
Eileen McNaughton [Tue, 9 Jul 2019 19:46:39 +0000 (07:46 +1200)]
Merge pull request #14615 from mattwire/contributionpage_title

Set title using standard form method and use for success message on contributionpage

5 years agoMerge pull request #14762 from eileenmcnaughton/mapping_whomp
Matthew Wire [Tue, 9 Jul 2019 16:27:53 +0000 (17:27 +0100)]
Merge pull request #14762 from eileenmcnaughton/mapping_whomp

[REF] Extract mapping converter function, kinda brutally

5 years agoExtract mapping converter function, kinda brutally
eileen [Tue, 9 Jul 2019 08:23:38 +0000 (20:23 +1200)]
Extract mapping converter function, kinda brutally