civicrm-core.git
5 years agoe-notice fix & unit test
eileen [Thu, 4 Jul 2019 02:36:30 +0000 (14:36 +1200)]
e-notice fix & unit test

This addresses a fairly obscure enotice. The notice occurs when a table has been excluded from
triggers by a hook (as makes sense if the table includes only calculated fields) and then a new
custom field is added to the table (or presumably edited or removed). In this case we should
not go through the whole trigger handling loop.

Note I see it as a feature rather than a bug that this would also apply to triggers that
update the contact.modified_date as it's not helpful to update this when updating a
calculation - if someone decides to intervene by hook we should trust them

5 years agoMerge pull request #14616 from mattwire/contributionpage_tabset_cleanup
Eileen McNaughton [Sun, 7 Jul 2019 21:30:24 +0000 (09:30 +1200)]
Merge pull request #14616 from mattwire/contributionpage_tabset_cleanup

REF Simple cleanup of tabset code for contributionpages

5 years agoMerge pull request #14720 from pradpnayak/REF-1
Eileen McNaughton [Sun, 7 Jul 2019 16:41:59 +0000 (04:41 +1200)]
Merge pull request #14720 from pradpnayak/REF-1

Removed hardcoded activity status and used Activity create

5 years agoMerge pull request #14749 from civicrm/5.16
Eileen McNaughton [Sun, 7 Jul 2019 15:35:33 +0000 (03:35 +1200)]
Merge pull request #14749 from civicrm/5.16

5.16 to master

5 years agoMerge pull request #14746 from eileenmcnaughton/order_report
Eileen McNaughton [Sun, 7 Jul 2019 15:35:10 +0000 (03:35 +1200)]
Merge pull request #14746 from eileenmcnaughton/order_report

dev/core#1081 fix for error on contribution detail when using custom data order by without select

5 years agoRemoved hardcoded activity status and used Activity create
Pradeep Nayak [Wed, 3 Jul 2019 08:17:16 +0000 (09:17 +0100)]
Removed hardcoded activity status and used Activity create

Added unit test

Use unique subject for activity in test

5 years agodev/core#1081 fix for error on contribution detail when using custom data order by...
eileen [Sun, 7 Jul 2019 06:25:19 +0000 (18:25 +1200)]
dev/core#1081 fix for error on contribution detail when using custom data order by without select

5 years agoMerge pull request #13540 from davejenx/dev-core-577-activity-summary-report-db-error
Eileen McNaughton [Sun, 7 Jul 2019 05:13:53 +0000 (17:13 +1200)]
Merge pull request #13540 from davejenx/dev-core-577-activity-summary-report-db-error

dev/core/issues/577: Activity Summary report fix for db column count error with section header (without ONLY_FULL_GROUP_BY)

5 years agoMerge pull request #14743 from colemanw/mappingRef
Eileen McNaughton [Sat, 6 Jul 2019 05:54:00 +0000 (17:54 +1200)]
Merge pull request #14743 from colemanw/mappingRef

[REF] Further cleanup & extraction in getMappingFieds

5 years agoFurther cleanup & extraction in getMappingFieds
Coleman Watts [Fri, 5 Jul 2019 22:42:40 +0000 (18:42 -0400)]
Further cleanup & extraction in getMappingFieds

5 years agoMerge pull request #14741 from colemanw/mappingExt
Eileen McNaughton [Fri, 5 Jul 2019 20:47:43 +0000 (08:47 +1200)]
Merge pull request #14741 from colemanw/mappingExt

[REF] Simple function extraction for buildMappingForm

5 years ago[REF] Simple function extraction for buildMappingForm
Coleman Watts [Fri, 5 Jul 2019 13:53:32 +0000 (09:53 -0400)]
[REF] Simple function extraction for buildMappingForm

5 years agoMerge pull request #14727 from eileenmcnaughton/cust1
Eileen McNaughton [Fri, 5 Jul 2019 03:58:59 +0000 (15:58 +1200)]
Merge pull request #14727 from eileenmcnaughton/cust1

[REF] simple extraction of getFieldAlterSQL

5 years ago[REF] simple extraction of getFieldAlterSQL
eileen [Wed, 3 Jul 2019 23:57:59 +0000 (11:57 +1200)]
[REF] simple extraction of getFieldAlterSQL

5 years agoMerge pull request #14589 from eileenmcnaughton/money
Eileen McNaughton [Fri, 5 Jul 2019 00:13:40 +0000 (12:13 +1200)]
Merge pull request #14589 from eileenmcnaughton/money

 Fix creation of additional zero value line item when changing fee selection in edge case

5 years agoMerge pull request #14725 from eileenmcnaughton/cust_field4
Eileen McNaughton [Fri, 5 Jul 2019 00:04:29 +0000 (12:04 +1200)]
Merge pull request #14725 from eileenmcnaughton/cust_field4

[REF] extract portion that creates the custom field record

5 years agoMerge pull request #14738 from civicrm/5.16
Eileen McNaughton [Thu, 4 Jul 2019 23:47:07 +0000 (11:47 +1200)]
Merge pull request #14738 from civicrm/5.16

5.16 to master

5 years agoMerge pull request #14732 from eileenmcnaughton/backoffice
Eileen McNaughton [Thu, 4 Jul 2019 23:45:44 +0000 (11:45 +1200)]
Merge pull request #14732 from eileenmcnaughton/backoffice

dev/report#16 Unreleased regression - fee levels incorrectly show sol…

5 years agoMerge pull request #14733 from eileenmcnaughton/payment_reg
Eileen McNaughton [Thu, 4 Jul 2019 23:44:27 +0000 (11:44 +1200)]
Merge pull request #14733 from eileenmcnaughton/payment_reg

Fix refund payment not recording from additional payment form

5 years agoMerge pull request #14614 from mattwire/manageevent_title
Eileen McNaughton [Thu, 4 Jul 2019 21:58:44 +0000 (09:58 +1200)]
Merge pull request #14614 from mattwire/manageevent_title

Improve handling of 'Manage Event' title

5 years agoMerge pull request #14697 from eileenmcnaughton/schema
Eileen McNaughton [Thu, 4 Jul 2019 21:51:57 +0000 (09:51 +1200)]
Merge pull request #14697 from eileenmcnaughton/schema

[REF] Cleanup fixSchemaDifferencesFor()

5 years ago[REF] extract portion that creates the custom field record
eileen [Wed, 3 Jul 2019 23:33:51 +0000 (11:33 +1200)]
[REF] extract portion that creates the custom field record

5 years agoClarify appending field to column_name
eileen [Wed, 3 Jul 2019 23:27:22 +0000 (11:27 +1200)]
Clarify appending field to column_name

5 years ago[REF] further simplification of custom field create action
eileen [Mon, 1 Jul 2019 23:43:45 +0000 (11:43 +1200)]
[REF] further simplification of custom field create action

5 years agoMerge pull request #14724 from eileenmcnaughton/cust_field3
Eileen McNaughton [Thu, 4 Jul 2019 21:43:37 +0000 (09:43 +1200)]
Merge pull request #14724 from eileenmcnaughton/cust_field3

[REF] clarify  variable (very minor change with good test cover)

5 years agoMerge pull request #14731 from eileenmcnaughton/leaky
Seamus Lee [Thu, 4 Jul 2019 16:42:27 +0000 (12:42 -0400)]
Merge pull request #14731 from eileenmcnaughton/leaky

Fix some test leakage

5 years agoMerge pull request #14736 from pradpnayak/contriblist
Seamus Lee [Thu, 4 Jul 2019 16:41:56 +0000 (12:41 -0400)]
Merge pull request #14736 from pradpnayak/contriblist

Updated Circle-Interactive developers info

5 years agoMerge pull request #14701 from eileenmcnaughton/act_location
Seamus Lee [Thu, 4 Jul 2019 15:34:21 +0000 (11:34 -0400)]
Merge pull request #14701 from eileenmcnaughton/act_location

Activity search - convert priority_id to a metadata field and add location as a searchable field

5 years agoUpdated Circle-Interactive developers info
Pradeep Nayak [Thu, 4 Jul 2019 15:09:45 +0000 (16:09 +0100)]
Updated Circle-Interactive developers info

5 years agoSimple cleanup of tabset code for contributionpages
Matthew Wire (MJW Consulting) [Sun, 23 Jun 2019 12:05:24 +0000 (13:05 +0100)]
Simple cleanup of tabset code for contributionpages

5 years agoImprove handling of 'Manage Event' title
Matthew Wire (MJW Consulting) [Sun, 23 Jun 2019 10:47:25 +0000 (11:47 +0100)]
Improve handling of 'Manage Event' title

5 years agoMerge pull request #14726 from eileenmcnaughton/cust_field_5
Matthew Wire [Thu, 4 Jul 2019 12:52:18 +0000 (13:52 +0100)]
Merge pull request #14726 from eileenmcnaughton/cust_field_5

[REF] simple extraction of prepareCreateParams

5 years agoMerge pull request #14721 from kirk-circle/master
Matthew Wire [Thu, 4 Jul 2019 12:51:35 +0000 (13:51 +0100)]
Merge pull request #14721 from kirk-circle/master

dev/core#1097 - Ensure consistent count on Groups tab

5 years agoFix refund payment not recording from additional payment form
eileen [Thu, 4 Jul 2019 08:41:56 +0000 (20:41 +1200)]
Fix refund payment not recording from additional payment form

5 years agoRevert participant portion of https://github.com/civicrm/civicrm-core/pull/14244
eileen [Thu, 4 Jul 2019 08:30:23 +0000 (20:30 +1200)]
Revert participant portion of https://github.com/civicrm/civicrm-core/pull/14244

5 years agoSet version to 5.17.alpha1
CiviCRM [Thu, 4 Jul 2019 07:23:15 +0000 (07:23 +0000)]
Set version to 5.17.alpha1

5 years agoSet version to 5.16.beta1
CiviCRM [Thu, 4 Jul 2019 07:19:06 +0000 (07:19 +0000)]
Set version to 5.16.beta1

5 years agoMerge remote-tracking branch 'origin/5.15'
Tim Otten [Thu, 4 Jul 2019 07:18:18 +0000 (00:18 -0700)]
Merge remote-tracking branch 'origin/5.15'

5 years agodev/report#16 Unreleased regression - fee levels incorrectly show sold out
eileen [Thu, 4 Jul 2019 07:11:14 +0000 (19:11 +1200)]
dev/report#16 Unreleased regression - fee levels incorrectly show sold out

5 years agoMerge pull request #14730 from alifrumin/5.15.0-releasenotes
Tim Otten [Thu, 4 Jul 2019 06:07:41 +0000 (23:07 -0700)]
Merge pull request #14730 from alifrumin/5.15.0-releasenotes

5.15.0 releasenotes

5 years agoSet version to 5.15.0
Tim Otten [Thu, 4 Jul 2019 06:07:19 +0000 (23:07 -0700)]
Set version to 5.15.0

5 years agoUpdate 5.15.0.md
Tim Otten [Thu, 4 Jul 2019 04:35:46 +0000 (21:35 -0700)]
Update 5.15.0.md

5 years agocleanup
Alice Frumin [Mon, 17 Jun 2019 18:29:43 +0000 (14:29 -0400)]
cleanup

5 years agofinished annotating
Alice Frumin [Mon, 17 Jun 2019 17:54:06 +0000 (13:54 -0400)]
finished annotating

5 years agoannotating
Alice Frumin [Tue, 11 Jun 2019 19:54:48 +0000 (15:54 -0400)]
annotating

5 years agofinishing changes with git lab issues
Alice Frumin [Tue, 11 Jun 2019 18:54:29 +0000 (14:54 -0400)]
finishing changes with git lab issues

5 years agolinking and annotating
Alice Frumin [Tue, 11 Jun 2019 18:09:33 +0000 (14:09 -0400)]
linking and annotating

5 years agoannotating
Alice Frumin [Tue, 11 Jun 2019 16:05:48 +0000 (12:05 -0400)]
annotating

5 years agoannotating
Alice Frumin [Tue, 11 Jun 2019 15:45:06 +0000 (11:45 -0400)]
annotating

5 years agocontributors
Alice Frumin [Mon, 10 Jun 2019 19:27:29 +0000 (15:27 -0400)]
contributors

5 years agoorganizing by git lab issue and condensing as well as pulling out obvious misc
Alice Frumin [Mon, 10 Jun 2019 19:01:46 +0000 (15:01 -0400)]
organizing by git lab issue and condensing as well as pulling out obvious misc

5 years ago5.15.0 release notes: added boilerplate
Andrew Hunt [Mon, 10 Jun 2019 16:19:23 +0000 (12:19 -0400)]
5.15.0 release notes: added boilerplate

5 years ago5.15.0 release notes: raw from script
Andrew Hunt [Mon, 10 Jun 2019 16:15:51 +0000 (12:15 -0400)]
5.15.0 release notes: raw from script

5 years agoFix some test leakage
eileen [Wed, 3 Jul 2019 21:10:16 +0000 (09:10 +1200)]
Fix some test leakage

5 years ago[REF] simple extraction of prepareCreateParams
eileen [Tue, 2 Jul 2019 01:07:36 +0000 (13:07 +1200)]
[REF] simple extraction of prepareCreateParams

5 years ago[REF] clarify variable
eileen [Wed, 3 Jul 2019 22:46:43 +0000 (10:46 +1200)]
[REF] clarify  variable

The variable is clearer being defined directly as 'add' or 'modify' in the main function to reduce wrangling

5 years agoMerge pull request #14723 from seamuslee001/ref_date_to_local_extract
Eileen McNaughton [Wed, 3 Jul 2019 21:32:20 +0000 (09:32 +1200)]
Merge pull request #14723 from seamuslee001/ref_date_to_local_extract

Extract code converting a date object to local timezone object to own…

5 years agoExtract code converting a date object to local timezone object to own function
Seamus Lee [Wed, 3 Jul 2019 18:58:18 +0000 (04:58 +1000)]
Extract code converting a date object to local timezone object to own function

5 years agodev/core#1097 - Ensure consistent count on Groups tab
Kirk Jackson [Wed, 3 Jul 2019 11:03:35 +0000 (12:03 +0100)]
dev/core#1097 - Ensure consistent count on Groups tab

5 years agoMerge pull request #14717 from totten/master-rm-ser
Eileen McNaughton [Wed, 3 Jul 2019 11:55:37 +0000 (23:55 +1200)]
Merge pull request #14717 from totten/master-rm-ser

(dev/cloud-native#3) SerializeCache - Remove unused, incomplete cache-driver

5 years ago(dev/cloud-native#3) SerializeCache - Remove unused, incomplete cache-driver
Tim Otten [Wed, 3 Jul 2019 04:05:30 +0000 (21:05 -0700)]
(dev/cloud-native#3) SerializeCache - Remove unused, incomplete cache-driver

The class `CRM_Utils_Cache_SerializeCache` provides a cache-driver for
storing cache records in the filesystem (under `CIVICRM_TEMPLATE_COMPILEDIR`,
using PHP `serialize()` format). Why remove it?

1.  As we work through cleanup in file management (e.g.  #12843,
   dev/cloud-native#3), having an unnecessary reference to
   CIVICRM_TEMPLATE_COMPILEDIR makes it harder to reason about the system.

2. The class is not used. I'm pretty sure it was added speculatively
   (i.e.  with an aim to try using it some day), but that never came to
   pass.  Grepping `universe`, I cannot find any usages or references to
   `SerializeCache`.

3. The implementation is incomplete -- parameters like `get(..., $default)`
   and `set(..., $ttl)` will generate exceptions if used.

5 years agoMerge pull request #14714 from civicrm/5.15
Eileen McNaughton [Wed, 3 Jul 2019 01:22:48 +0000 (13:22 +1200)]
Merge pull request #14714 from civicrm/5.15

5.15 to master

5 years agoMerge branch 'master' into 5.15
Eileen McNaughton [Wed, 3 Jul 2019 01:22:37 +0000 (13:22 +1200)]
Merge branch 'master' into 5.15

5 years agoMerge pull request #14690 from eileenmcnaughton/profile_copy
Eileen McNaughton [Wed, 3 Jul 2019 00:59:48 +0000 (12:59 +1200)]
Merge pull request #14690 from eileenmcnaughton/profile_copy

dev/core#1088 Fix fatal error when copying profile with civirules enabled

5 years agoMerge pull request #14713 from pradpnayak/REF-1
Eileen McNaughton [Tue, 2 Jul 2019 22:32:20 +0000 (10:32 +1200)]
Merge pull request #14713 from pradpnayak/REF-1

Grab contribution status id from database

5 years agoMerge pull request #14608 from eileenmcnaughton/csv_test
Seamus Lee [Tue, 2 Jul 2019 20:37:02 +0000 (16:37 -0400)]
Merge pull request #14608 from eileenmcnaughton/csv_test

 [test] convert export test to handle exception rather than early return

5 years agoGrab contribution status id from database
Pradeep Nayak [Tue, 2 Jul 2019 20:36:36 +0000 (21:36 +0100)]
Grab contribution status id from database

5 years agoMerge pull request #14707 from demeritcowboy/why-is-php-case-insensitive-for-classnames-2
Eileen McNaughton [Tue, 2 Jul 2019 19:32:56 +0000 (07:32 +1200)]
Merge pull request #14707 from demeritcowboy/why-is-php-case-insensitive-for-classnames-2

dev/joomla#13 - followup 2 - Some class names have wrong upper/lower case spelling

5 years agoMerge pull request #14708 from demeritcowboy/why-is-php-case-insensitive-for-classnames-3
Eileen McNaughton [Tue, 2 Jul 2019 19:32:16 +0000 (07:32 +1200)]
Merge pull request #14708 from demeritcowboy/why-is-php-case-insensitive-for-classnames-3

dev/joomla#13 - followup 3 - Some class names have wrong upper/lower case spelling

5 years agoMerge pull request #14709 from demeritcowboy/why-is-php-case-insensitive-for-classnames-4
Eileen McNaughton [Tue, 2 Jul 2019 19:31:43 +0000 (07:31 +1200)]
Merge pull request #14709 from demeritcowboy/why-is-php-case-insensitive-for-classnames-4

dev/joomla#13 - followup 4 - Some class names have wrong upper/lower case spelling

5 years agoMerge pull request #14710 from demeritcowboy/why-is-php-case-insensitive-for-classnames-5
Seamus Lee [Tue, 2 Jul 2019 15:32:22 +0000 (11:32 -0400)]
Merge pull request #14710 from demeritcowboy/why-is-php-case-insensitive-for-classnames-5

dev/joomla#13 - followup 5 - Some class names have wrong upper/lower case spelling

5 years agoMerge pull request #14704 from pradpnayak/REF-1
Seamus Lee [Tue, 2 Jul 2019 15:29:54 +0000 (11:29 -0400)]
Merge pull request #14704 from pradpnayak/REF-1

Grab contribution status id from database

5 years agoMerge pull request #14685 from eileenmcnaughton/mark_conflict
Seamus Lee [Tue, 2 Jul 2019 15:29:28 +0000 (11:29 -0400)]
Merge pull request #14685 from eileenmcnaughton/mark_conflict

Consolidate handling of conflicts between the batch job and get_conflicts api

5 years agofix wrong spelling of classname
DemeritCowboy [Tue, 2 Jul 2019 14:31:47 +0000 (10:31 -0400)]
fix wrong spelling of classname

5 years agofix wrong spelling of classname
DemeritCowboy [Tue, 2 Jul 2019 14:25:29 +0000 (10:25 -0400)]
fix wrong spelling of classname

5 years agofix wrong spelling of classname
DemeritCowboy [Tue, 2 Jul 2019 14:19:54 +0000 (10:19 -0400)]
fix wrong spelling of classname

5 years agofix wrong spelling of classname
DemeritCowboy [Tue, 2 Jul 2019 14:09:21 +0000 (10:09 -0400)]
fix wrong spelling of classname

5 years agoMerge pull request #14693 from eileenmcnaughton/cust_field_sql
Monish Deb [Tue, 2 Jul 2019 09:13:03 +0000 (14:43 +0530)]
Merge pull request #14693 from eileenmcnaughton/cust_field_sql

[REF] remove instances of pass-by-reference where no change takes place

5 years agoMerge pull request #14503 from pradpnayak/ReportFix
Monish Deb [Tue, 2 Jul 2019 08:49:30 +0000 (14:19 +0530)]
Merge pull request #14503 from pradpnayak/ReportFix

$this->_selectedTables is not populated incase of boleen filters

5 years agoGrab contribution status id from database
Pradeep Nayak [Tue, 2 Jul 2019 08:43:48 +0000 (09:43 +0100)]
Grab contribution status id from database

5 years agoMerge pull request #14702 from demeritcowboy/why-is-php-case-insensitive-for-classnames
Eileen McNaughton [Tue, 2 Jul 2019 07:50:50 +0000 (19:50 +1200)]
Merge pull request #14702 from demeritcowboy/why-is-php-case-insensitive-for-classnames

dev/joomla#13 - followup - Some class names have wrong upper/lower case spelling

5 years agoMerge pull request #14689 from eileenmcnaughton/cust_field_create
Monish Deb [Tue, 2 Jul 2019 06:12:40 +0000 (11:42 +0530)]
Merge pull request #14689 from eileenmcnaughton/cust_field_create

[REF] extract prepareCreate from CustomField.create

5 years agoWIP
DemeritCowboy [Tue, 2 Jul 2019 06:05:45 +0000 (02:05 -0400)]
WIP

5 years ago[REF] Cleanup fixSchemaDifferencesFor()
eileen [Tue, 2 Jul 2019 00:14:38 +0000 (12:14 +1200)]
[REF] Cleanup fixSchemaDifferencesFor()

This is always called with FALSE as the last param except from the unit test - the test can do it's own work on it
Also passing NULL for param 2 is the same as not passing anything

5 years agoMerge pull request #14699 from eileenmcnaughton/activity_search
Monish Deb [Tue, 2 Jul 2019 05:47:31 +0000 (11:17 +0530)]
Merge pull request #14699 from eileenmcnaughton/activity_search

[NFC][test] reformat activity search test

5 years agoMerge pull request #14700 from eileenmcnaughton/search
Monish Deb [Tue, 2 Jul 2019 05:46:41 +0000 (11:16 +0530)]
Merge pull request #14700 from eileenmcnaughton/search

[NFC][test] code formatting only

5 years agoActivity search - convert priority_id to a metadata field and add location
eileen [Tue, 2 Jul 2019 05:22:39 +0000 (17:22 +1200)]
Activity search - convert priority_id to a metadata field and add location

The location field on activity in a generally exposed field so it makes sense it should be in the search. Priority_id
conversion is part of ongoing standardisation which includes adding url parameter support for the field

5 years ago[NFC][test] code formatting only SearchTest, SelectorTest
eileen [Tue, 2 Jul 2019 03:12:36 +0000 (15:12 +1200)]
[NFC][test] code formatting only SearchTest, SelectorTest

5 years ago[NFC][test] reformat activity search test
eileen [Tue, 2 Jul 2019 02:41:02 +0000 (14:41 +1200)]
[NFC][test] reformat activity search test

5 years agoMerge pull request #14695 from eileenmcnaughton/revert
Eileen McNaughton [Tue, 2 Jul 2019 02:35:05 +0000 (14:35 +1200)]
Merge pull request #14695 from eileenmcnaughton/revert

Remove failing assertion

5 years agoMerge pull request #14698 from civicrm/5.15
Eileen McNaughton [Tue, 2 Jul 2019 01:45:51 +0000 (13:45 +1200)]
Merge pull request #14698 from civicrm/5.15

5.15 to master

5 years agoMerge pull request #14692 from agh1/pseudoconstant-caps-5.15
Eileen McNaughton [Tue, 2 Jul 2019 01:45:27 +0000 (13:45 +1200)]
Merge pull request #14692 from agh1/pseudoconstant-caps-5.15

dev/joomla#13 lower-case C on CRM_Core_PseudoConstant breaks 5.14 upgrade on Joomla w/ CiviCase

5 years agoRemove failing assertion
eileen [Tue, 2 Jul 2019 00:25:45 +0000 (12:25 +1200)]
Remove failing assertion

This was a 'never worked' as the original call was doing no check. I changed it to do a check but
got confused & didn't realise thee check was actually failing when I merged. This check was never successful
we should remove it

5 years ago[REF] remove instances of pass-by-reference where no change takes place
eileen [Mon, 1 Jul 2019 23:01:08 +0000 (11:01 +1200)]
[REF] remove instances of pass-by-reference where no change takes place

I did a grep on these and the passed params are not altered - down with php4

5 years agoConsolidate handling of conflicts between the batch job and get_conflicts api
eileen [Mon, 1 Jul 2019 02:56:08 +0000 (14:56 +1200)]
Consolidate handling of conflicts between the batch job and get_conflicts api

This ensures that conflicts are stored during batch_merge to the prev_next cache with the same format as when the api
calls get_conflicts. The code doing this wrangling is moved from the api to the BAO layer.

We add a test to ensure the output is the same & use the previously added test to check the string is the same too.

Test cover here is pretty good

5 years ago[REF] move formatting of conflict into markConflict function
eileen [Mon, 1 Jul 2019 01:01:19 +0000 (13:01 +1200)]
[REF] move formatting of conflict into markConflict function

The goal here is to make this information more usable to an api caller. Currently the 'conflict' key holds text formatted
for a specific form. I was going to change this to hold an array of data that an api could use. However, the
Contact.get_merge_conflicts already has a specific api-friendly format that is keyed by 'mode'
at the top level so my revised plan is to return api-friendly data as well (without messign with the
existing form's data).

This change simply moves the decisions about what data to store & how down to the function whose responsibility
it is (markConflict) and adds a test to ensure that no change results

[REF] move formatting of conflict into markConflict function

The goal here is to make this information more usable to an api caller. Currently the 'conflict' key holds text formatted
for a specific form. I was going to change this to hold an array of data that an api could use. However, the
Contact.get_merge_conflicts already has a specific api-friendly format that is keyed by 'mode'
at the top level so my revised plan is to return api-friendly data as well (without messign with the
existing form's data).

This change simply moves the decisions about what data to store & how down to the function whose responsibility
it is (markConflict) and adds a test to ensure that no change results

5 years agoAdd test ensuring conflicts key existing behaviour is retained
eileen [Mon, 1 Jul 2019 00:40:54 +0000 (12:40 +1200)]
Add test ensuring conflicts key existing behaviour is retained

5 years agoUse correct caps for CRM_Core_PseudoConstant everywhere
Andrew Hunt [Mon, 1 Jul 2019 21:53:29 +0000 (17:53 -0400)]
Use correct caps for CRM_Core_PseudoConstant everywhere

5 years agoMerge pull request #14688 from eileenmcnaughton/revert
Eileen McNaughton [Mon, 1 Jul 2019 21:55:15 +0000 (09:55 +1200)]
Merge pull request #14688 from eileenmcnaughton/revert

 Fix erroneous variable passed to callAPISuccessGetValue

5 years agodev/joomla#13 CiviCase: use correct caps for CRM_Core_PseudoConstant
Andrew Hunt [Mon, 1 Jul 2019 21:26:44 +0000 (17:26 -0400)]
dev/joomla#13 CiviCase: use correct caps for CRM_Core_PseudoConstant