civicrm-core.git
5 years agoCleanup contribution & recurring contribution date field handling in query object
eileen [Mon, 15 Jul 2019 04:47:27 +0000 (16:47 +1200)]
Cleanup contribution & recurring contribution date field handling in query object

This gets us to the point where all date fields are handled the same way, which is now tested. Now that recurring
contribution fields have unique keys we can handle them as metadata

5 years agoAdd a swag of test cover on contribution & contribution recur date fields
eileen [Mon, 15 Jul 2019 04:19:19 +0000 (16:19 +1200)]
Add a swag of test cover on contribution & contribution recur date fields

5 years agoMerge pull request #14583 from seamuslee001/convert_custom_fields_cache_group
Eileen McNaughton [Sun, 14 Jul 2019 22:37:41 +0000 (10:37 +1200)]
Merge pull request #14583 from seamuslee001/convert_custom_fields_cache_group

Convert the contact fields cache group to standard cache backend

5 years agoMerge pull request #14820 from eileenmcnaughton/recur
Seamus Lee [Sun, 14 Jul 2019 21:32:38 +0000 (17:32 -0400)]
Merge pull request #14820 from eileenmcnaughton/recur

Add unique names and unique title for recurrings.

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

Also ensure contact fields uses fastArrayCache

5 years agoReplicate current practice of resetting of ACL and System caches sensibly
Seamus Lee [Sat, 22 Jun 2019 03:41:17 +0000 (13:41 +1000)]
Replicate current practice of resetting of ACL and System caches sensibly

5 years agoEnsure ACL and other caches are reset as well when flushing ACL Cache
Seamus Lee [Fri, 21 Jun 2019 22:31:35 +0000 (08:31 +1000)]
Ensure ACL and other caches are reset as well when flushing ACL Cache

5 years agoConvert the contact fields cache group to standard cache backend
Seamus Lee [Tue, 18 Jun 2019 22:46:06 +0000 (08:46 +1000)]
Convert the contact fields cache group to standard cache backend

5 years agoMerge pull request #14582 from seamuslee001/convert_custom_data_cache_group
Seamus Lee [Sun, 14 Jul 2019 12:16:28 +0000 (08:16 -0400)]
Merge pull request #14582 from seamuslee001/convert_custom_data_cache_group

Convert Custom Data cache group to be using standard cache backend

5 years agoMerge pull request #14821 from civicrm/5.16
Eileen McNaughton [Sun, 14 Jul 2019 08:56:34 +0000 (20:56 +1200)]
Merge pull request #14821 from civicrm/5.16

5.16 to master

5 years agoMerge pull request #14819 from eileenmcnaughton/export_up
colemanw [Sun, 14 Jul 2019 06:15:32 +0000 (02:15 -0400)]
Merge pull request #14819 from eileenmcnaughton/export_up

[REF] [Export] Stop passing export params to the merge function

5 years agoMerge pull request #14722 from JKingsnorth/fix-public-url-link-in-browse
Eileen McNaughton [Sun, 14 Jul 2019 06:00:33 +0000 (18:00 +1200)]
Merge pull request #14722 from JKingsnorth/fix-public-url-link-in-browse

Fix public URL link with hashed URLs in mailing browse screen

5 years agoMerge pull request #14816 from mlutfy/event8
Eileen McNaughton [Sun, 14 Jul 2019 05:55:30 +0000 (17:55 +1200)]
Merge pull request #14816 from mlutfy/event8

dev/event#8 Event Cart: save Participant custom field data

5 years agoAdd unique names and unique title for recurrings.
eileen [Sun, 14 Jul 2019 05:46:38 +0000 (17:46 +1200)]
Add unique names and unique title for recurrings.

Per
discussion https://github.com/civicrm/civicrm-core/pull/14737/files#r300889057
we hace a need sometimes to display context dependent titles & context independent titles.

This adds unique_title for the purpose

5 years agoMerge pull request #14815 from vingle/patch-7
Eileen McNaughton [Sun, 14 Jul 2019 05:08:03 +0000 (17:08 +1200)]
Merge pull request #14815 from vingle/patch-7

Remove the only two defined fonts from selectors

5 years agoMerge pull request #14675 from seamuslee001/cleanup_prev_next_set_item
Eileen McNaughton [Sun, 14 Jul 2019 05:06:13 +0000 (17:06 +1200)]
Merge pull request #14675 from seamuslee001/cleanup_prev_next_set_item

[REF] Cleanup usage of CRM_Core_BAO_PrevNextCache::setItem and deprec…

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

Ensure custom data cache use the fastArray Cache

5 years agoConvert Custom Data cache group to be using standard cache backend
Seamus Lee [Tue, 18 Jun 2019 22:33:30 +0000 (08:33 +1000)]
Convert Custom Data cache group to be using standard cache backend

5 years agoMerge pull request #14581 from seamuslee001/convert_navigation_cache
Eileen McNaughton [Sun, 14 Jul 2019 04:35:40 +0000 (16:35 +1200)]
Merge pull request #14581 from seamuslee001/convert_navigation_cache

Convert Navigation cache group to current cache defition system

5 years agoStop passing export params to the merge function
eileen [Sun, 14 Jul 2019 01:20:24 +0000 (13:20 +1200)]
Stop passing export params to the merge function

We have a string which does or doesn't have merge tokens in it - we don't need  to determine this

5 years agoMerge pull request #14817 from eileenmcnaughton/export_up
colemanw [Sat, 13 Jul 2019 22:38:07 +0000 (18:38 -0400)]
Merge pull request #14817 from eileenmcnaughton/export_up

[TEST] export - add unit test covering merge to same address addressee handling

5 years agoMerge pull request #14818 from totten/master-magic-cache
colemanw [Sat, 13 Jul 2019 20:45:33 +0000 (16:45 -0400)]
Merge pull request #14818 from totten/master-magic-cache

MagicMerge - Fix ephemeral overrides for aliased properties

5 years agoConvert static variable to class property (should prevent test leakage"
eileen [Fri, 12 Jul 2019 22:45:27 +0000 (10:45 +1200)]
Convert static variable to class property (should prevent test leakage"

5 years agoCRM_Core_Config_MagicMerge - Fix thread-local updates for aliased properties
Tim Otten [Fri, 12 Jul 2019 22:44:01 +0000 (15:44 -0700)]
CRM_Core_Config_MagicMerge - Fix thread-local updates for aliased properties

Overview
--------

`CRM_Core_Config_MagicMerge` allows properties to be temporarily modified
(for the duration the object's lifespan). However, this behavior does
not work correctly if the property-name uses aliasing.

The PR addresses a test-failure that became visible in #14718, and it adds
test-coverage for some typical and atypical examples.

Before
------

* (Vast majority of properties) If a property has a simple name (e.g.
  `maxFileSize`), then `$cache`-reads and `$cache`-writes are consistent.
* (Handful of properties) If a property has a split name (e.g.
  `maxAttachments`, `max_attachments`), then `$cache`-reads and
  `$cache`-writes are *not* consistent.  Writes basically don't work.

After
-----

* Aliased properties work the same as normal/non-aliased.

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

To understand the change, you should skim `MagicMerge` and observe
a few things:

* In `getPropertyMap()`,  observe that:
    * (a) Most properties have a singular name -- for example, `maxFileSize`
      has one name, which will be the same in the high-level facade (`$config->maxFileSize`)
      and in the underlying data-store (`settings->get('maxFileSize')`).
    * (b) Some properties are aliased. Ex: `$config->maxAttachments`
      corresponds to underlying item `settings->get('max_attachments')`.
* In `__get()` and `__set()`, note that properties are loaded initally from
  the underlying data-store once; thereafter, any reads or writes go to
  `$this->cache`. That's a thread-local place that stores temporary revisions.

To see the cache consistency problem, specifically note that:

* `__get()` consistently references `$this->cache[$k]`
* `__set()` was confused; at the start, it used `$this->cache[$k]`,
  and later it used `$this->cache[$name]`.

This PR adds a unit-test which ensures that the thread-local/cached value
works consistently.

5 years agoConsolidate handling of greeting label
eileen [Fri, 12 Jul 2019 22:01:51 +0000 (10:01 +1200)]
Consolidate handling of greeting label

5 years ago[TEST] export - add unit test covering merge to same address addressee handling
eileen [Fri, 12 Jul 2019 21:53:12 +0000 (09:53 +1200)]
[TEST] export - add unit test covering merge to same address addressee handling

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

Ensure that navigation cache is using fastArray

5 years agoConvert Navigation cache group to current cache defition system
Seamus Lee [Tue, 18 Jun 2019 22:21:31 +0000 (08:21 +1000)]
Convert Navigation cache group to current cache defition system

Also reset memory and system caches when resetting navigation

Additonal place to cause extra flush

Add in utility function for resetting ACL and System Level Caches

Use cache utility function

5 years ago[REF] Cleanup usage of CRM_Core_BAO_PrevNextCache::setItem and deprecate passing...
Seamus Lee [Sat, 29 Jun 2019 02:15:37 +0000 (12:15 +1000)]
[REF] Cleanup usage of CRM_Core_BAO_PrevNextCache::setItem and deprecate passing in array of values

Fix conversion from old style format to new and add in unit test of conversion and confirm it stores data correctly in the table

Reformat Function as per Patrick's comments

Update doc block and add in comment detailing the change in function param

Fix Test

5 years agoMerge pull request #14782 from eileenmcnaughton/export_wip
Eileen McNaughton [Fri, 12 Jul 2019 19:02:05 +0000 (07:02 +1200)]
Merge pull request #14782 from eileenmcnaughton/export_wip

[EXPORT] add getPreview function

5 years agodev/event#8 Event Cart: save Participant custom field data
Mathieu Lutfy [Fri, 12 Jul 2019 17:35:57 +0000 (13:35 -0400)]
dev/event#8 Event Cart: save Participant custom field data

5 years agoRemove 'font-family: Arial/etc' on two selectors
Nicol [Fri, 12 Jul 2019 17:01:06 +0000 (18:01 +0100)]
Remove 'font-family: Arial/etc' on two selectors

For some reason, thesae two selectors have hardcode Arial/etc as the font for form legends and H3 elements. Therefore while a front-end contribution page or profile will inherit the site fonts, but in these two instances it will use Arial/etc.

This can be overriden by the user, but given that there is no other use of Arial in CiviCRM, doesn't seem to make much sense. When theming front-end CiviCRM forms/pages these two elements have to be reset with "font-family: inherit". My guess is it's legacy from a much earlier version of the system (but in making this proposal perhaps the real reason will emerge).

5 years agoAdd getPreview function
eileen [Wed, 10 Jul 2019 14:13:43 +0000 (02:13 +1200)]
Add getPreview function

5 years agoMerge pull request #14811 from eileenmcnaughton/ex1
colemanw [Fri, 12 Jul 2019 13:55:19 +0000 (09:55 -0400)]
Merge pull request #14811 from eileenmcnaughton/ex1

[REF] [Export] clean up incorporation of order by & group by into ExportProcessor

5 years agoMerge pull request #14812 from eileenmcnaughton/ee
colemanw [Fri, 12 Jul 2019 12:02:20 +0000 (08:02 -0400)]
Merge pull request #14812 from eileenmcnaughton/ee

[REF] [Export] More export Structure arrays to processor

5 years agoMerge pull request #14813 from eileenmcnaughton/update_tests
colemanw [Fri, 12 Jul 2019 12:00:43 +0000 (08:00 -0400)]
Merge pull request #14813 from eileenmcnaughton/update_tests

[REF] [TEST] [Export] Update export tests to reflect new format

5 years agoUpdate export tests to reflect new format
eileen [Fri, 12 Jul 2019 04:09:54 +0000 (16:09 +1200)]
Update export tests to reflect new format

5 years agoStop passing processor to itself
eileen [Fri, 12 Jul 2019 04:23:11 +0000 (16:23 +1200)]
Stop passing processor to itself

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 agoMove order by to query generator
eileen [Wed, 10 Jul 2019 13:27:11 +0000 (01:27 +1200)]
Move order by to query generator

5 years agoMove group by to processor
eileen [Wed, 10 Jul 2019 13:24:10 +0000 (01:24 +1200)]
Move group by 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