civicrm-core.git
7 years agoNo need to truncate x_invoice_num.
KarinG [Wed, 12 Apr 2017 01:06:32 +0000 (19:06 -0600)]
No need to truncate x_invoice_num.

7 years agoAdded Test to Create Contribution -> then Edit it via BackOffice form - using default...
KarinG [Fri, 10 Mar 2017 03:43:58 +0000 (20:43 -0700)]
Added Test to Create Contribution -> then Edit it via BackOffice form - using default price_set.

7 years agoMerge pull request #3 from eileenmcnaughton/karing
Karin Gerritsen [Thu, 9 Mar 2017 16:41:46 +0000 (09:41 -0700)]
Merge pull request #3 from eileenmcnaughton/karing

Resolve immediate issues with test & add checks for mail content (sin…

7 years agoResolve immediate issues with test & add checks for mail content (since that function...
eileen [Thu, 9 Mar 2017 06:10:01 +0000 (19:10 +1300)]
Resolve immediate issues with test & add checks for mail content (since that function is edited

7 years agoFirst pass at PHP Unit test for reSubmit (without priceset).
KarinG [Thu, 9 Mar 2017 04:22:40 +0000 (21:22 -0700)]
First pass at PHP Unit test for reSubmit (without priceset).

7 years agoPHP Unit test fix: net_amount must equal total_amount minus fee_amount.
KarinG [Thu, 9 Mar 2017 03:10:17 +0000 (20:10 -0700)]
PHP Unit test fix: net_amount must equal total_amount minus fee_amount.

7 years agoRemove php unit test for function that no longer exists.
KarinG [Wed, 8 Mar 2017 20:36:25 +0000 (13:36 -0700)]
Remove php unit test for function that no longer exists.

7 years agoFixes for CRM-19966 and net_amounts.
KarinG [Wed, 8 Mar 2017 04:37:09 +0000 (21:37 -0700)]
Fixes for CRM-19966 and net_amounts.

7 years agoMerge pull request #9931 from ErichBSchulz/commentfixes
Eileen McNaughton [Sun, 5 Mar 2017 21:49:30 +0000 (10:49 +1300)]
Merge pull request #9931 from ErichBSchulz/commentfixes

comment changes only

7 years agoMerge pull request #9934 from civicrm/4.7.17-rc
Eileen McNaughton [Sun, 5 Mar 2017 21:49:03 +0000 (10:49 +1300)]
Merge pull request #9934 from civicrm/4.7.17-rc

4.7.17 rc

7 years agoMerge pull request #9922 from eileenmcnaughton/cust_date_part
Eileen McNaughton [Sun, 5 Mar 2017 20:49:42 +0000 (09:49 +1300)]
Merge pull request #9922 from eileenmcnaughton/cust_date_part

CRM-20213 Change participant_register_date to use datepicker widget

7 years agoMerge pull request #9933 from spalmstr/new
Eileen McNaughton [Sun, 5 Mar 2017 20:46:29 +0000 (09:46 +1300)]
Merge pull request #9933 from spalmstr/new

CRM-20004 Fix regression Event payment receipt sent twice

7 years agoCRM-20004 Fix regression Event payment receipt sent twice
spalmstr [Sat, 4 Mar 2017 12:23:12 +0000 (12:23 +0000)]
CRM-20004 Fix regression Event payment receipt sent twice

7 years agocomment changes only
Erich Schulz [Sun, 5 Mar 2017 07:10:12 +0000 (17:10 +1000)]
comment changes only

The magic __call method provides the ability to snoop on all hooks

7 years agoMerge pull request #9899 from colemanw/CRM-20179
Eileen McNaughton [Sat, 4 Mar 2017 03:01:33 +0000 (16:01 +1300)]
Merge pull request #9899 from colemanw/CRM-20179

CRM-20179 - jstree upgrade and other js performance improvements

7 years agoMerge pull request #9917 from JKingsnorth/CRM-20206
Eileen McNaughton [Fri, 3 Mar 2017 21:06:19 +0000 (10:06 +1300)]
Merge pull request #9917 from JKingsnorth/CRM-20206

CRM-20206 Fix encoding in plain text checksum links

7 years agoMerge pull request #9923 from eileenmcnaughton/acl
Eileen McNaughton [Fri, 3 Mar 2017 20:16:43 +0000 (09:16 +1300)]
Merge pull request #9923 from eileenmcnaughton/acl

CRM-19773 unit test to verify acls apply

7 years agoCRM-19773 unit test to verify acls apply
eileen [Fri, 3 Mar 2017 07:38:07 +0000 (20:38 +1300)]
CRM-19773 unit test to verify acls apply

7 years agoMerge pull request #9570 from colemanw/CRM-19773-report
Eileen McNaughton [Fri, 3 Mar 2017 07:36:15 +0000 (20:36 +1300)]
Merge pull request #9570 from colemanw/CRM-19773-report

CRM-19773 - Check permisions for all entities in reports

7 years agoCRM-20213 Change participant_register_date to use datepicker widget
eileen [Fri, 3 Mar 2017 06:14:55 +0000 (19:14 +1300)]
CRM-20213 Change participant_register_date to use datepicker widget

7 years agoMerge pull request #9921 from civicrm/4.7.17-rc
Eileen McNaughton [Fri, 3 Mar 2017 06:11:38 +0000 (19:11 +1300)]
Merge pull request #9921 from civicrm/4.7.17-rc

4.7.17 rc

7 years agoMerge pull request #9847 from eileenmcnaughton/cust_date_birth
Eileen McNaughton [Thu, 2 Mar 2017 21:09:04 +0000 (10:09 +1300)]
Merge pull request #9847 from eileenmcnaughton/cust_date_birth

CRM-19124 update birth_date to be consistent at point of hook (use da…

7 years agoMerge pull request #9919 from seamuslee001/CRM-20204-code-cleanup
Eileen McNaughton [Thu, 2 Mar 2017 20:55:39 +0000 (09:55 +1300)]
Merge pull request #9919 from seamuslee001/CRM-20204-code-cleanup

CRM-20201 add in escaped curly braces to ensure nothing unusual happens

7 years agoMerge pull request #9918 from colemanw/moveTags
Eileen McNaughton [Thu, 2 Mar 2017 20:38:57 +0000 (09:38 +1300)]
Merge pull request #9918 from colemanw/moveTags

CRM-19943 - Add permission check and move tags button

7 years agoCRM-20204 add in escaped curly braces to ensure nothing unusual happens
Seamus Lee [Thu, 2 Mar 2017 20:05:17 +0000 (07:05 +1100)]
CRM-20204 add in escaped curly braces to ensure nothing unusual happens

7 years agoCRM-19943 - Add permission check and move tags button
Coleman Watts [Thu, 2 Mar 2017 16:09:17 +0000 (11:09 -0500)]
CRM-19943 - Add permission check and move tags button

7 years agoCRM-20206 Use existing function to replace ampersand codes
JKingsnorth [Thu, 2 Mar 2017 13:49:44 +0000 (13:49 +0000)]
CRM-20206 Use existing function to replace ampersand codes

7 years agoCRM-20206 Fix encoding in plain text checksum links
JKingsnorth [Thu, 2 Mar 2017 12:19:07 +0000 (12:19 +0000)]
CRM-20206 Fix encoding in plain text checksum links

7 years agoMerge pull request #9914 from civicrm/4.7.17-rc
Eileen McNaughton [Thu, 2 Mar 2017 04:17:57 +0000 (17:17 +1300)]
Merge pull request #9914 from civicrm/4.7.17-rc

4.7.17 rc

7 years agoMerge pull request #9913 from seamuslee001/CRM-20201
Eileen McNaughton [Wed, 1 Mar 2017 21:09:13 +0000 (10:09 +1300)]
Merge pull request #9913 from seamuslee001/CRM-20201

CRM-20201 Fix issue where manage tags page would not display properly…

7 years agoCRM-20201 Fix issue where manage tags page would not display properly if tag set...
Seamus Lee [Wed, 1 Mar 2017 03:45:14 +0000 (14:45 +1100)]
CRM-20201 Fix issue where manage tags page would not display properly if tag set does not have a created by set

7 years agoMerge pull request #9911 from seamuslee001/CRM-15505-test-improvement
Eileen McNaughton [Tue, 28 Feb 2017 22:35:22 +0000 (11:35 +1300)]
Merge pull request #9911 from seamuslee001/CRM-15505-test-improvement

CRM-15505 Lock in to ensure that state_province is used to mean the a…

7 years agoCRM-15505 Lock in to ensure that state_province is used to mean the abbreviation...
Seamus Lee [Tue, 28 Feb 2017 20:24:45 +0000 (07:24 +1100)]
CRM-15505 Lock in to ensure that state_province is used to mean the abbreviation not full name

7 years agoMerge pull request #9905 from aydun/CRM-15505
Eileen McNaughton [Tue, 28 Feb 2017 20:01:11 +0000 (09:01 +1300)]
Merge pull request #9905 from aydun/CRM-15505

Fix CRM-15505: Make state_province_name return the full name of the state

7 years agoCrm19905 (#9749)
VasanthaKaje [Tue, 28 Feb 2017 16:49:13 +0000 (22:19 +0530)]
Crm19905 (#9749)

* CRM-19905 Drupal 8 User View and Edit pages broken when CiviCRM profiles set for User Registration

* CRM-19905 Drupal 8 User View and Edit pages broken when CiviCRM profiles set for User Registration
[moved the changes to Drupal8.php file to make it specific for D8]

* Overrode postURL function for D8 to fix CRM-19905

* CRM19905 correction for PR#9749, to remove Superflous whitespace error

* Update Drupal8.php

Remove extra whitespaces

7 years agoMerge pull request #9909 from eileenmcnaughton/membership
Eileen McNaughton [Tue, 28 Feb 2017 10:30:28 +0000 (23:30 +1300)]
Merge pull request #9909 from eileenmcnaughton/membership

Additional unit test, checking membership renewal

7 years agoAdditional unit test, checking membership renewal
eileen [Tue, 28 Feb 2017 07:53:30 +0000 (20:53 +1300)]
Additional unit test, checking membership renewal

7 years agoMerge pull request #9745 from jmcclelland/CRM-19937
Eileen McNaughton [Tue, 28 Feb 2017 04:33:25 +0000 (17:33 +1300)]
Merge pull request #9745 from jmcclelland/CRM-19937

CRM-19937 - ensure amount preceded by $ is still treated as a number

7 years agoMerge pull request #9901 from kurund/CRM-20187
Eileen McNaughton [Tue, 28 Feb 2017 04:23:06 +0000 (17:23 +1300)]
Merge pull request #9901 from kurund/CRM-20187

fixes for CRM-20187

7 years agoMerge pull request #9521 from seamuslee001/drupal8-url-fix
Eileen McNaughton [Tue, 28 Feb 2017 04:19:01 +0000 (17:19 +1300)]
Merge pull request #9521 from seamuslee001/drupal8-url-fix

CRM-19856 Fix Drupal 8 get User url

7 years agoMerge pull request #9859 from seamuslee001/CRM-20052
Eileen McNaughton [Tue, 28 Feb 2017 04:18:43 +0000 (17:18 +1300)]
Merge pull request #9859 from seamuslee001/CRM-20052

CRM-20052 get Billing Block js working as expeected on Drupal 8 as it…

7 years agoMerge pull request #9908 from eileenmcnaughton/regress
Tim Otten [Tue, 28 Feb 2017 03:06:03 +0000 (19:06 -0800)]
Merge pull request #9908 from eileenmcnaughton/regress

Towards CRM-19815 Fix misdisplay of gender on drupal user-view page as a result of previous work on this within this release

7 years agoMerge pull request #9906 from mattwire/verp_config_warning
Eileen McNaughton [Tue, 28 Feb 2017 02:59:48 +0000 (15:59 +1300)]
Merge pull request #9906 from mattwire/verp_config_warning

CRM-20196: Add a useful message when the user didn't setup bounce processing pro…

7 years agoMerge pull request #9874 from totten/master-acttok
Tim Otten [Tue, 28 Feb 2017 02:25:55 +0000 (18:25 -0800)]
Merge pull request #9874 from totten/master-acttok

(Regression) CRM_Mailing_ActionTokens - Degrade gracefully

7 years agoCRM-19815 Fix misdisplay of gender on drupal user-view page
eileen [Tue, 28 Feb 2017 00:58:39 +0000 (13:58 +1300)]
CRM-19815 Fix misdisplay of gender on drupal user-view page

Note that the click-throughs still do not work but this turns out to be
a pre-existing issue so I will leave that for a follow up

7 years agoAdd a useful message when the user didn't setup bounce processing properly
Matthew Wire [Mon, 27 Feb 2017 22:41:54 +0000 (22:41 +0000)]
Add a useful message when the user didn't setup bounce processing properly

7 years agoMerge pull request #9902 from JKingsnorth/CRM-19492
Eileen McNaughton [Mon, 27 Feb 2017 21:43:22 +0000 (10:43 +1300)]
Merge pull request #9902 from JKingsnorth/CRM-19492

CRM-19492 Merging: disable location settings if the relevant checkbox isn't selected

7 years agoMerge pull request #9893 from JKingsnorth/CRM-20154
Eileen McNaughton [Mon, 27 Feb 2017 19:37:01 +0000 (08:37 +1300)]
Merge pull request #9893 from JKingsnorth/CRM-20154

CRM-20154 Dedupe - remove unused autoflip parameter

7 years agoMerge pull request #9866 from lcdservices/CRM-20145
Eileen McNaughton [Mon, 27 Feb 2017 19:34:47 +0000 (08:34 +1300)]
Merge pull request #9866 from lcdservices/CRM-20145

CRM-20145 line_item $0 entity_financial_trxn fix

7 years agoFix CRM-15505: Make state_province_name return the full name of the state, not the...
Aidan Saunders [Mon, 27 Feb 2017 16:13:50 +0000 (16:13 +0000)]
Fix CRM-15505: Make state_province_name return the full name of the state, not the abbreviation

7 years agoCRM-20145 fix code style issues
Brian Shaughnessy [Mon, 27 Feb 2017 12:11:08 +0000 (07:11 -0500)]
CRM-20145 fix code style issues

7 years agoCRM-20145 fix code style issues
Brian Shaughnessy [Mon, 27 Feb 2017 11:42:34 +0000 (06:42 -0500)]
CRM-20145 fix code style issues

7 years agoCRM-20145 fix code style issues
Brian Shaughnessy [Mon, 27 Feb 2017 11:37:33 +0000 (06:37 -0500)]
CRM-20145 fix code style issues

7 years agoCRM-19492 Fixes for disabling location settings when checkbox isn't selected
JKingsnorth [Mon, 27 Feb 2017 10:38:28 +0000 (10:38 +0000)]
CRM-19492 Fixes for disabling location settings when checkbox isn't selected

7 years agoCRM-19492 disable location settings if the relevant checkbox is not enabled
eileen [Thu, 10 Nov 2016 10:28:37 +0000 (23:28 +1300)]
CRM-19492 disable location settings if the relevant checkbox is not enabled

7 years ago(towards CRM-19492) Remove defunct vars
eileen [Thu, 10 Nov 2016 04:12:07 +0000 (17:12 +1300)]
(towards CRM-19492) Remove defunct vars

I could find no evidence of these being used anywhere

7 years ago(towards CRM-19492) Improve whitespace layout
eileen [Thu, 10 Nov 2016 03:59:57 +0000 (16:59 +1300)]
(towards CRM-19492) Improve whitespace layout

7 years ago(towards CRM-19492) Do not assign variables by reference
eileen [Thu, 10 Nov 2016 03:49:24 +0000 (16:49 +1300)]
(towards CRM-19492) Do not assign variables by reference

They are not used as references & this just adds confusion.

7 years ago(towards CRM-19492) Extract bounce portion of code into separate function
eileen [Thu, 10 Nov 2016 03:25:00 +0000 (16:25 +1300)]
(towards CRM-19492) Extract bounce portion of code into separate function

7 years ago(towards CRM-19492) Minor variable simplification
eileen [Thu, 10 Nov 2016 03:21:34 +0000 (16:21 +1300)]
(towards CRM-19492) Minor variable simplification

7 years agofixes for CRM-20187
Kurund Jalmi [Mon, 27 Feb 2017 09:30:26 +0000 (15:00 +0530)]
fixes for CRM-20187

7 years agoFix another reference to removed autoFlip param
JKingsnorth [Mon, 27 Feb 2017 09:16:02 +0000 (09:16 +0000)]
Fix another reference to removed autoFlip param

7 years ago[NFC] Fix comments for lookupValues function
JKingsnorth [Fri, 24 Feb 2017 09:19:09 +0000 (09:19 +0000)]
[NFC] Fix comments for lookupValues function

7 years agoCRM-20154 Remove more unused autoflips
JKingsnorth [Fri, 24 Feb 2017 09:15:17 +0000 (09:15 +0000)]
CRM-20154 Remove more unused autoflips

7 years agoRemove function I added for date handling.
eileen [Mon, 27 Feb 2017 05:23:51 +0000 (18:23 +1300)]
Remove function I added for date handling.

In the end I opted to leave the date handling in smarty & have not unravelled our custom
version of strftime formatting

7 years agoCRM-19124 Profiles - update birth_date & deceased_date to use datepicker
eileen [Mon, 27 Feb 2017 02:53:10 +0000 (15:53 +1300)]
CRM-19124 Profiles - update birth_date & deceased_date to use datepicker

7 years agoCRM-19124 update birth_date to be consistent at point of hook (use datepicker)
eileen [Tue, 14 Feb 2017 12:38:59 +0000 (01:38 +1300)]
CRM-19124 update birth_date to be consistent at point of hook (use datepicker)

7 years agoMerge pull request #9900 from fuzionnz/CRM-20181-deprecate_crm_core_error_fatal
Eileen McNaughton [Sun, 26 Feb 2017 23:22:51 +0000 (12:22 +1300)]
Merge pull request #9900 from fuzionnz/CRM-20181-deprecate_crm_core_error_fatal

CRM-20181. Deprecate CRM_Core_Error::fatal().

7 years agoCRM-20181. Document why we must be rid of this troublesome function.
Chris Burgess [Sun, 26 Feb 2017 07:20:49 +0000 (20:20 +1300)]
CRM-20181. Document why we must be rid of this troublesome function.

7 years agoCRM-20181. Deprecate CRM_Core_Error::fatal().
Chris Burgess [Sun, 26 Feb 2017 07:12:03 +0000 (20:12 +1300)]
CRM-20181. Deprecate CRM_Core_Error::fatal().

7 years agoMerge pull request #9888 from eileenmcnaughton/cust_another
Eileen McNaughton [Sun, 26 Feb 2017 07:08:42 +0000 (20:08 +1300)]
Merge pull request #9888 from eileenmcnaughton/cust_another

CRM-19490: Profile date fields don't respect localisation on the Cont…

7 years agoCRM-19490 change 'view' action check to '&' to also pick up 'preview' action
eileen [Sun, 26 Feb 2017 04:06:45 +0000 (17:06 +1300)]
CRM-19490 change 'view' action check to '&' to also pick up 'preview' action

7 years agoEnotice fix from recent merge
eileen [Sun, 26 Feb 2017 03:56:59 +0000 (16:56 +1300)]
Enotice fix from recent merge

7 years agoMerge pull request #9890 from spalmstr/CRM-19453
Eileen McNaughton [Sun, 26 Feb 2017 03:02:58 +0000 (16:02 +1300)]
Merge pull request #9890 from spalmstr/CRM-19453

CRM-19453

7 years agoCRM-19490 define non-updated fields in a function for easier transition.
eileen [Thu, 23 Feb 2017 12:39:06 +0000 (01:39 +1300)]
CRM-19490 define non-updated fields in a function for easier transition.

Looking to find a way to migrate these as safely as possible. Defining them in one place seems like a good step

7 years agoCRM-19490: Profile date fields don't respect localisation on the Contribution Page...
eileen [Thu, 23 Feb 2017 11:35:14 +0000 (00:35 +1300)]
CRM-19490: Profile date fields don't respect localisation on the Contribution Page confirmation screen

7 years agoMerge pull request #9873 from eileenmcnaughton/dedupe_code
Eileen McNaughton [Sun, 26 Feb 2017 02:32:13 +0000 (15:32 +1300)]
Merge pull request #9873 from eileenmcnaughton/dedupe_code

CRM-20154 dedupe code improvement, remove unused autoflip parameter

7 years agoMerge pull request #9898 from totten/master-dl-only
Tim Otten [Sat, 25 Feb 2017 18:59:52 +0000 (11:59 -0700)]
Merge pull request #9898 from totten/master-dl-only

Extension.download API - Allow downloading without installing

7 years agoMerge pull request #9897 from totten/master-doclink
colemanw [Sat, 25 Feb 2017 04:01:21 +0000 (23:01 -0500)]
Merge pull request #9897 from totten/master-doclink

CRM-20180 - Documentation URLs should contain "stable" *or* "current", not both

7 years agoLazy load crmAjaxTable.js
Coleman Watts [Sat, 25 Feb 2017 03:47:53 +0000 (20:47 -0700)]
Lazy load crmAjaxTable.js

Move script out of Common.js and only load when needed

7 years agoCRM-20179 - Upgrade jstree on contact summary screen
Coleman Watts [Sat, 25 Feb 2017 03:33:32 +0000 (20:33 -0700)]
CRM-20179 - Upgrade jstree on contact summary screen

7 years agoLazy load crmEditable scripts
Coleman Watts [Wed, 7 Dec 2016 19:37:33 +0000 (14:37 -0500)]
Lazy load crmEditable scripts

Enhances CRM.loadScript to support jQuery plugins

7 years agoExtension.download API - Allow downloading without installing
Tim Otten [Sat, 25 Feb 2017 02:12:51 +0000 (19:12 -0700)]
Extension.download API - Allow downloading without installing

The current `download` action does both download and install. This option
preserves the default behavior but allows one to opt-out of installation.

7 years agoCRM-20180 - Documentation URLs should contain "stable" *or* "current", not both
Tim Otten [Sat, 25 Feb 2017 01:54:18 +0000 (18:54 -0700)]
CRM-20180 - Documentation URLs should contain "stable" *or* "current", not both

Examples:

 * In "Administer => Communications => Scheduled Reminders", the green box has
   a link to "learn more". This links to "https://docs.civicrm.org/user/en/stable/current/email/scheduled-reminders/"
 * In "Search =>= Advanced Search", view the help for "Views for Display Contacts".
   The help message includes a link to "https://docs.civicrm.org/user/en/stable/current/organising-your-data/profiles"

Both examples include the redundant formulation "user/en/stable/current" and
point to non-existent pages.  Use either "stable" or "current".  It would be
silly for one installation to contain a mix of links for "stable" and
"current".  It appears that `formatDocUrl()` aims to normalize these.

7 years agoCRM-20179 - Upgrade jstree on navigation admin screen
Coleman Watts [Fri, 24 Feb 2017 18:17:35 +0000 (11:17 -0700)]
CRM-20179 - Upgrade jstree on navigation admin screen

7 years agoMerge pull request #9894 from JKingsnorth/CRM-20175
colemanw [Fri, 24 Feb 2017 17:53:14 +0000 (12:53 -0500)]
Merge pull request #9894 from JKingsnorth/CRM-20175

CRM-20175 Increase pager support

7 years agoCRM-20175 Increase pager support
JKingsnorth [Fri, 24 Feb 2017 11:58:07 +0000 (11:58 +0000)]
CRM-20175 Increase pager support

7 years agoMerge pull request #9892 from totten/master-depr
colemanw [Fri, 24 Feb 2017 07:52:05 +0000 (02:52 -0500)]
Merge pull request #9892 from totten/master-depr

MailingGroup API - Tighten up deprecations

7 years agoMailingGroup API - Tighten up deprecations
Tim Otten [Fri, 24 Feb 2017 06:13:06 +0000 (23:13 -0700)]
MailingGroup API - Tighten up deprecations

The `MailingGroup.php` includes some very different APIs, e.g.
 * Several 'event'(subscribue/resubscribe) APIs
 * Some CRUD APIs for mailing data

The deprecation applies to the 'event' (subscribe/resubscribe) APIs --
because those can be done another way.  However, the CRUD for `MailingGroup`
records is the only way to do access that data.

7 years agoMerge pull request #9885 from eileenmcnaughton/search
Eileen McNaughton [Fri, 24 Feb 2017 02:49:51 +0000 (15:49 +1300)]
Merge pull request #9885 from eileenmcnaughton/search

CRM-19815, CRM-19830 make pseudoconstant handling more generic in order to improve performance

7 years agoTowards CRM-19815 make pseudoconstant handling more generic.
eileen [Thu, 23 Feb 2017 04:56:17 +0000 (17:56 +1300)]
Towards CRM-19815 make pseudoconstant handling more generic.

Using metadata pseudoconstants we can remove joins on the option_value table, which hur performance. This patch
only opens it up within the context of the Contact table. It is intended to open the code up to
allow us to extend the performance advantage of dropping the bad join to other entities.

The following fields have metadata links to the
option_value table:
 gender_id
 prefix_id
 suffix_id
 preferred_communication_method
 communication_style_id
 preferred_language

The general pattern for the api is to return (eg) communication_style_id = 1, communication_style = 'Formal', where communication_style is the db name of the option group for communication_style_id.

preferred_communication_method is the exception. For api calls it returns an array of ids like all other api calls.
However, it returns a string of names for non-api calls on that field, allowing us to avoid handling it in a number of other places.

I added tests to ensure no change on the api inputs & outputs and searched these fields through search builder & advanced
search + export. I also checked profile search listings. They are not using the convert routine & have some e-notices that
pre-existed, but no regression I could see.

7 years agoCRM-19453
spalmstr [Thu, 23 Feb 2017 14:34:03 +0000 (14:34 +0000)]
CRM-19453

7 years agoMerge pull request #9887 from JKingsnorth/CRM-20170
Eileen McNaughton [Thu, 23 Feb 2017 12:41:07 +0000 (01:41 +1300)]
Merge pull request #9887 from JKingsnorth/CRM-20170

CRM-20170 Fix participant count in summary report for free events

7 years agoMerge pull request #9884 from seamuslee001/CRM-20144-examples
Eileen McNaughton [Thu, 23 Feb 2017 11:33:56 +0000 (00:33 +1300)]
Merge pull request #9884 from seamuslee001/CRM-20144-examples

CRM-20144 (NFC) Update tests and example

7 years agoCRM-20170 Fix participant count in summary report for free events
JKingsnorth [Thu, 23 Feb 2017 11:22:48 +0000 (11:22 +0000)]
CRM-20170 Fix participant count in summary report for free events

7 years agoRevert changes to test and re-generate example from better test
Seamus Lee [Thu, 23 Feb 2017 10:35:12 +0000 (21:35 +1100)]
Revert changes to test and re-generate example from better test

7 years agoCRM-20144 (NFC) Update tests and example
Seamus Lee [Thu, 23 Feb 2017 06:50:57 +0000 (17:50 +1100)]
CRM-20144 (NFC) Update tests and example

7 years agoMerge pull request #9867 from seamuslee001/CRM-20144
Eileen McNaughton [Thu, 23 Feb 2017 06:30:01 +0000 (19:30 +1300)]
Merge pull request #9867 from seamuslee001/CRM-20144

CRM-20144 Fix contact.get api break where groups no longer returned i…

7 years agoCRM_Mailing_ActionTokens - Degarde gracefully
Tim Otten [Wed, 22 Feb 2017 18:04:34 +0000 (10:04 -0800)]
CRM_Mailing_ActionTokens - Degarde gracefully

Most of the `CRM_*_Tokens` classes include a `checkActive()` function whic
prevents them from trying to do anything if they don't have the necessary
data.  However, this one was missing it, which means that it attempts to
evalute `{action.*}` tokens even when they're not valid.

7 years agoMerge pull request #9876 from JMAConsulting/CRM-20158
Eileen McNaughton [Thu, 23 Feb 2017 02:51:16 +0000 (15:51 +1300)]
Merge pull request #9876 from JMAConsulting/CRM-20158

CRM-20158, added card_type and pan_truncation field