civicrm-core.git
4 years agoRemove deprecated CRM_Utils_Hook::alterMail
Coleman Watts [Wed, 18 Mar 2020 14:33:06 +0000 (10:33 -0400)]
Remove deprecated CRM_Utils_Hook::alterMail

4 years agoMerge pull request #16829 from demeritcowboy/blank-joindate
Seamus Lee [Tue, 17 Mar 2020 23:54:01 +0000 (10:54 +1100)]
Merge pull request #16829 from demeritcowboy/blank-joindate

dev/report#28 - Join date field has no label on constituent detail report

4 years agoMerge pull request #16831 from civicrm/5.24
Seamus Lee [Tue, 17 Mar 2020 23:47:27 +0000 (10:47 +1100)]
Merge pull request #16831 from civicrm/5.24

5.24

4 years agoMerge pull request #16830 from alifrumin/rn-5.24
Seamus Lee [Tue, 17 Mar 2020 22:09:24 +0000 (09:09 +1100)]
Merge pull request #16830 from alifrumin/rn-5.24

[NFC] release-notes 5.24 first pass

4 years agoMerge pull request #16828 from colemanw/api4Json
colemanw [Tue, 17 Mar 2020 21:34:14 +0000 (17:34 -0400)]
Merge pull request #16828 from colemanw/api4Json

APIv4 - convert Result object to array when running through json_encode

4 years agorelease-notes 5.24 first pass
Alice Frumin [Mon, 9 Mar 2020 18:29:08 +0000 (14:29 -0400)]
release-notes 5.24 first pass

4 years agojoin date checkbox is blank
demeritcowboy [Tue, 17 Mar 2020 19:51:10 +0000 (15:51 -0400)]
join date checkbox is blank

4 years agoAPIv4 - convert Result object to array when running through json_encode
Coleman Watts [Tue, 17 Mar 2020 19:09:16 +0000 (15:09 -0400)]
APIv4 - convert Result object to array when running through json_encode

Before: entire Result object was getting serialized leading to some weird output
After: only the array gets serialized

4 years agoMerge pull request #16827 from colemanw/typos
Mathieu Lu [Tue, 17 Mar 2020 17:47:51 +0000 (13:47 -0400)]
Merge pull request #16827 from colemanw/typos

Fix typos in xml/dao

4 years agoMerge pull request #16768 from colemanw/arrayValue5
Mathieu Lu [Tue, 17 Mar 2020 17:34:33 +0000 (13:34 -0400)]
Merge pull request #16768 from colemanw/arrayValue5

[REF] Replace CRM_Utils_Array::value with ?? in variable assignments

4 years agoReplace CRM_Utils_Array::value with ?? in variable assignments
Coleman Watts [Mon, 16 Mar 2020 13:21:02 +0000 (09:21 -0400)]
Replace CRM_Utils_Array::value with ?? in variable assignments

4 years agoMerge pull request #16802 from colemanw/coalesce
Mathieu Lu [Tue, 17 Mar 2020 17:25:09 +0000 (13:25 -0400)]
Merge pull request #16802 from colemanw/coalesce

[REF] Replace coalesce pattern with coalesce operator

4 years agoMerge pull request #16436 from seamuslee001/phpmimetype_library_upgrade
Mathieu Lu [Tue, 17 Mar 2020 15:40:55 +0000 (11:40 -0400)]
Merge pull request #16436 from seamuslee001/phpmimetype_library_upgrade

[REF] Switch to using a non abandoned library for getting a mapping of mimetypes to extensions

4 years agoFix typos in xml/dao
Coleman Watts [Tue, 17 Mar 2020 15:22:32 +0000 (11:22 -0400)]
Fix typos in xml/dao

4 years agoMerge pull request #16800 from pradpnayak/notifyEmail
colemanw [Tue, 17 Mar 2020 15:13:01 +0000 (11:13 -0400)]
Merge pull request #16800 from pradpnayak/notifyEmail

Respect 'Donot notify activity type' setting

4 years agoMerge pull request #16825 from eileenmcnaughton/del_test
colemanw [Tue, 17 Mar 2020 13:25:29 +0000 (09:25 -0400)]
Merge pull request #16825 from eileenmcnaughton/del_test

[NFC] Use helper / api to delete contacts in tests

4 years agoReplace coalesce pattern with coalesce operator
Coleman Watts [Mon, 16 Mar 2020 20:47:48 +0000 (16:47 -0400)]
Replace coalesce pattern with coalesce operator

4 years agoMerge pull request #16824 from eileenmcnaughton/cont_restore
colemanw [Tue, 17 Mar 2020 13:12:48 +0000 (09:12 -0400)]
Merge pull request #16824 from eileenmcnaughton/cont_restore

Deprecate calling contactTrashRestore function

4 years agoMerge pull request #16810 from eileenmcnaughton/xml
colemanw [Tue, 17 Mar 2020 13:08:13 +0000 (09:08 -0400)]
Merge pull request #16810 from eileenmcnaughton/xml

(NFC) Minor typo: receipients > recipients

4 years agoMerge pull request #16813 from eileenmcnaughton/deprecated
colemanw [Tue, 17 Mar 2020 13:06:45 +0000 (09:06 -0400)]
Merge pull request #16813 from eileenmcnaughton/deprecated

Remove deprecated parameter

4 years agoMerge pull request #16823 from eileenmcnaughton/cont_api
colemanw [Tue, 17 Mar 2020 13:04:10 +0000 (09:04 -0400)]
Merge pull request #16823 from eileenmcnaughton/cont_api

[NFC] Minor code cleanup

4 years agoFixed warnings
Pradeep Nayak [Mon, 16 Mar 2020 19:59:34 +0000 (19:59 +0000)]
Fixed warnings

4 years agouse activity type id from form object
Pradeep Nayak [Mon, 16 Mar 2020 19:46:13 +0000 (19:46 +0000)]
use activity type id from form object

4 years agoRespect 'Donot notify activity type' setting
Pradeep Nayak [Mon, 16 Mar 2020 17:30:05 +0000 (17:30 +0000)]
Respect 'Donot notify activity type' setting

4 years agoComplete deprecation of trashRestore
eileen [Tue, 17 Mar 2020 10:20:50 +0000 (23:20 +1300)]
Complete deprecation of trashRestore

4 years agoDeprecate calling deleteContact in order to undelete
eileen [Tue, 17 Mar 2020 07:42:56 +0000 (20:42 +1300)]
Deprecate calling deleteContact in order to undelete

This pattern really is very silly. We have one function doing both delete & an update that is
no different to the update done by a normal create call

4 years ago[NFC] Use helper / api to delete contacts in tests
eileen [Tue, 17 Mar 2020 10:04:29 +0000 (23:04 +1300)]
[NFC] Use helper / api to delete contacts in tests

CRM_Contact_BAO_Contact::deleteContact has a silly signature - let's use it less & improve it so
it doesn't have the silly idea of supporting restore in the same function as delete, with little shared
code

4 years agoMerge pull request #16822 from eileenmcnaughton/arraa4
Seamus Lee [Tue, 17 Mar 2020 07:52:46 +0000 (18:52 +1100)]
Merge pull request #16822 from eileenmcnaughton/arraa4

[REF] Simplify obtuse boolean expressions

4 years ago[NFC] Minor code cleanup
eileen [Tue, 17 Mar 2020 07:24:23 +0000 (20:24 +1300)]
[NFC] Minor code cleanup

Fix some exception declaration, comparisons, handling for non-present param

4 years agoMerge pull request #16818 from eileenmcnaughton/del
Seamus Lee [Tue, 17 Mar 2020 07:02:19 +0000 (18:02 +1100)]
Merge pull request #16818 from eileenmcnaughton/del

[NFC] Deprecate passing in silly data

4 years agoMerge pull request #16817 from eileenmcnaughton/deltest
Seamus Lee [Tue, 17 Mar 2020 06:56:53 +0000 (17:56 +1100)]
Merge pull request #16817 from eileenmcnaughton/deltest

[NFC] Test cleanup

4 years ago[REF] Simplify obtuse boolean expressions
eileen [Tue, 17 Mar 2020 06:05:40 +0000 (19:05 +1300)]
[REF] Simplify obtuse boolean expressions

Partial reviewer commit of https://github.com/civicrm/civicrm-core/pull/16814

4 years agoMerge pull request #16790 from eileenmcnaughton/pcp
Eileen McNaughton [Tue, 17 Mar 2020 05:57:52 +0000 (18:57 +1300)]
Merge pull request #16790 from eileenmcnaughton/pcp

[REF] Fix PCP getPcpDashboardInfo to be tested & use sensible functions

4 years agoMerge pull request #16820 from eileenmcnaughton/array2
Eileen McNaughton [Tue, 17 Mar 2020 05:57:35 +0000 (18:57 +1300)]
Merge pull request #16820 from eileenmcnaughton/array2

[REF] Replace CRM_Utils_Array::value with ?? in variable assignments

4 years agoMerge pull request #16821 from eileenmcnaughton/array3
Eileen McNaughton [Tue, 17 Mar 2020 05:57:00 +0000 (18:57 +1300)]
Merge pull request #16821 from eileenmcnaughton/array3

[REF] cleanups on array operator

4 years agoMerge pull request #16819 from eileenmcnaughton/array
Eileen McNaughton [Tue, 17 Mar 2020 05:56:44 +0000 (18:56 +1300)]
Merge pull request #16819 from eileenmcnaughton/array

[REF] Simplify obtuse boolean expressions

4 years ago[REF] Replace coalesce pattern with coalesce operator
eileen [Tue, 17 Mar 2020 03:26:24 +0000 (16:26 +1300)]
[REF] Replace coalesce pattern with coalesce operator

This replaces the innstances in the test folder.

4 years ago[REF] Replace CRM_Utils_Array::value with ?? in variable assignments
eileen [Tue, 17 Mar 2020 03:24:50 +0000 (16:24 +1300)]
[REF] Replace CRM_Utils_Array::value with ?? in variable assignments

Partial of  #16768 - only contains test lines which I don't think need individual review

4 years ago[REF] Replace CRM_Utils_Array::value with ?? in variable assignments
eileen [Tue, 17 Mar 2020 03:19:59 +0000 (16:19 +1300)]
[REF] Replace CRM_Utils_Array::value with ?? in variable assignments

This is a partial of https://github.com/civicrm/civicrm-core/pull/16768 & consists of the lines I have reviewed from it

4 years ago[REF] Simplify obtuse boolean expressions
eileen [Tue, 17 Mar 2020 03:05:29 +0000 (16:05 +1300)]
[REF] Simplify obtuse boolean expressions

Partial of https://github.com/civicrm/civicrm-core/pull/16814

I've reviewed this handful  & will merge on pass

4 years agoDeprecate passing in silly data
eileen [Tue, 17 Mar 2020 02:44:01 +0000 (15:44 +1300)]
Deprecate passing in silly data

Later we can move to requiring an integer

4 years agoMerge pull request #16816 from eileenmcnaughton/ex1
Eileen McNaughton [Tue, 17 Mar 2020 02:13:35 +0000 (15:13 +1300)]
Merge pull request #16816 from eileenmcnaughton/ex1

[REF] Remove titleHeader var

4 years ago[NFC] Test cleanup
eileen [Tue, 17 Mar 2020 01:44:09 +0000 (14:44 +1300)]
[NFC] Test cleanup

Fix some comment blocks, remove some unused variables

4 years agoFix PCP getPcpDashboardInfo to be tested & use sensible functions
eileen [Mon, 16 Mar 2020 01:41:01 +0000 (14:41 +1300)]
Fix PCP getPcpDashboardInfo to be tested & use sensible functions

4 years agoMerge pull request #16812 from eileenmcnaughton/deprec_gone
Eileen McNaughton [Tue, 17 Mar 2020 01:19:34 +0000 (14:19 +1300)]
Merge pull request #16812 from eileenmcnaughton/deprec_gone

Remove unused deprecated function

4 years agoRemove titleHeader var
eileen [Mon, 25 Nov 2019 04:50:53 +0000 (17:50 +1300)]
Remove titleHeader var

This is never passed in, and, logically, it would break the csv if it was

4 years agoMerge pull request #16731 from eileenmcnaughton/regress
Matthew Wire [Tue, 17 Mar 2020 00:31:06 +0000 (00:31 +0000)]
Merge pull request #16731 from eileenmcnaughton/regress

Skip expensive smarty Processing when nothing to see here

4 years agoRemove deprecated parameter
eileen [Tue, 17 Mar 2020 00:07:47 +0000 (13:07 +1300)]
Remove deprecated parameter

This parameter was deprecated a while back - we obviously used caution at the time
but we can remove it now

4 years agoMerge pull request #16774 from mattwire/settingssmtpfreezeoutboundoption
colemanw [Tue, 17 Mar 2020 00:05:34 +0000 (20:05 -0400)]
Merge pull request #16774 from mattwire/settingssmtpfreezeoutboundoption

Fix setting outBound_option readonly in UI

4 years agoRemove unused deprecated function
eileen [Sat, 15 Feb 2020 04:25:28 +0000 (17:25 +1300)]
Remove unused deprecated function

copyLocBlock was marked as deprecated & unused around 9 months ago - not much has changed - remove

4 years agoMerge pull request #16671 from eileenmcnaughton/acl
Seamus Lee [Mon, 16 Mar 2020 23:50:45 +0000 (10:50 +1100)]
Merge pull request #16671 from eileenmcnaughton/acl

[REF] simplify references to civicrm_acl

4 years ago(NFC) Minor typo: receipients > recipients
eileen [Mon, 16 Mar 2020 23:32:12 +0000 (12:32 +1300)]
(NFC) Minor typo: receipients > recipients

4 years agoMerge pull request #16804 from UshaMakoa/patch-9
colemanw [Mon, 16 Mar 2020 23:16:04 +0000 (19:16 -0400)]
Merge pull request #16804 from UshaMakoa/patch-9

(NFC) Minor typo: contacts(s) -> contact(s)

4 years agoMerge pull request #16803 from UshaMakoa/patch-8
colemanw [Mon, 16 Mar 2020 23:15:43 +0000 (19:15 -0400)]
Merge pull request #16803 from UshaMakoa/patch-8

(NFC) Query.php / Minor typo: Genrated -> Generated

4 years agoMerge pull request #16474 from sushantpaste/test-for-pr-13809
Mathieu Lu [Mon, 16 Mar 2020 22:57:10 +0000 (18:57 -0400)]
Merge pull request #16474 from sushantpaste/test-for-pr-13809

Test for PR 13809

4 years agoMerge pull request #15338 from totten/master-poc-postcommit
Seamus Lee [Mon, 16 Mar 2020 22:29:24 +0000 (09:29 +1100)]
Merge pull request #15338 from totten/master-poc-postcommit

(POC) Add `hook_civicrm_postCommit`, a less foot-gunny variant of `hook_civicrm_post`

4 years ago(NFC) Minor typo: contacts(s) -> contact(s)
Usha Matisson [Mon, 16 Mar 2020 21:25:24 +0000 (22:25 +0100)]
(NFC) Minor typo: contacts(s) -> contact(s)

4 years agoUpdate Query.php
Usha Matisson [Mon, 16 Mar 2020 21:21:16 +0000 (22:21 +0100)]
Update Query.php

4 years agoMerge pull request #16798 from systopia/CORE-1646
Eileen McNaughton [Mon, 16 Mar 2020 20:54:03 +0000 (09:54 +1300)]
Merge pull request #16798 from systopia/CORE-1646

dev/core#1646 Merge Case Modal not showing relevant cases

4 years agoMerge pull request #16799 from pradpnayak/priceSetSchema
Eileen McNaughton [Mon, 16 Mar 2020 20:50:20 +0000 (09:50 +1300)]
Merge pull request #16799 from pradpnayak/priceSetSchema

Added pseudoconstant for state province

4 years agoMerge pull request #16801 from civicrm/5.24
Eileen McNaughton [Mon, 16 Mar 2020 20:39:14 +0000 (09:39 +1300)]
Merge pull request #16801 from civicrm/5.24

5.24

4 years agoMerge pull request #16752 from eileenmcnaughton/ext24
Seamus Lee [Mon, 16 Mar 2020 20:37:23 +0000 (07:37 +1100)]
Merge pull request #16752 from eileenmcnaughton/ext24

Fix fatal error on loading extension page when an extension has been deleted

4 years agoMerge pull request #16496 from mattwire/billingsamecheckboxchange
Mathieu Lu [Mon, 16 Mar 2020 20:20:08 +0000 (16:20 -0400)]
Merge pull request #16496 from mattwire/billingsamecheckboxchange

Make the 'billing address is the same' checkbox respond to the change event

4 years agoMerge pull request #16773 from UshaMakoa/patch-7
Mathieu Lu [Mon, 16 Mar 2020 20:12:05 +0000 (16:12 -0400)]
Merge pull request #16773 from UshaMakoa/patch-7

(NFC) Minor string error : for for > for

4 years agoMerge pull request #13809 from sushantpaste/auto-complete-search
Mathieu Lu [Mon, 16 Mar 2020 20:08:59 +0000 (16:08 -0400)]
Merge pull request #13809 from sushantpaste/auto-complete-search

dev/core#787 Auto-complete search results fixes

4 years agoMerge pull request #16479 from twomice/1579_avoid_needless_getPayPalPaymentProcessorI...
Eileen McNaughton [Mon, 16 Mar 2020 19:41:35 +0000 (08:41 +1300)]
Merge pull request #16479 from twomice/1579_avoid_needless_getPayPalPaymentProcessorID_call

dev/core#1579 CRM_Core_Payment_PayPalProIPN should not call getPayPalPaymentProcessorID() if processor_id is clearly provided in URL

4 years agoAdded pseudoconstant for state province
Pradeep Nayak [Mon, 16 Mar 2020 17:28:48 +0000 (17:28 +0000)]
Added pseudoconstant for state province

4 years agoMerge pull request #16755 from eileenmcnaughton/et
colemanw [Mon, 16 Mar 2020 13:03:53 +0000 (09:03 -0400)]
Merge pull request #16755 from eileenmcnaughton/et

[NFC] Test cleanup, remove duplicate test

4 years agoMinor string error : for for > for
Usha Matisson [Sat, 14 Mar 2020 00:14:08 +0000 (01:14 +0100)]
Minor string error : for for > for

4 years agoMerge pull request #16546 from eileenmcnaughton/part_end2
Matthew Wire [Mon, 16 Mar 2020 10:37:37 +0000 (10:37 +0000)]
Merge pull request #16546 from eileenmcnaughton/part_end2

Fix Bug where Payment Balance is sometimes miscalculated

4 years agoMerge pull request #16797 from civicrm/5.24
Seamus Lee [Mon, 16 Mar 2020 08:46:44 +0000 (19:46 +1100)]
Merge pull request #16797 from civicrm/5.24

5.24

4 years agowould this fix CORE-1646?
B. Endres [Mon, 16 Mar 2020 07:43:43 +0000 (08:43 +0100)]
would this fix CORE-1646?

4 years agoMerge pull request #16796 from seamuslee001/notes_5_23_3
Seamus Lee [Mon, 16 Mar 2020 06:15:16 +0000 (17:15 +1100)]
Merge pull request #16796 from seamuslee001/notes_5_23_3

release-notes/5.23.3.md

4 years agorelease-notes/5.23.3.md
Tim Otten [Mon, 16 Mar 2020 06:08:46 +0000 (23:08 -0700)]
release-notes/5.23.3.md

4 years agoMerge pull request #16792 from colemanw/dashboardContact
Yashodha Chaku [Mon, 16 Mar 2020 06:02:08 +0000 (11:32 +0530)]
Merge pull request #16792 from colemanw/dashboardContact

[REF] Cleanup api3 DashboardContact

4 years agoMerge pull request #16788 from civicrm/msg_template_no_id
Eileen McNaughton [Mon, 16 Mar 2020 05:12:14 +0000 (18:12 +1300)]
Merge pull request #16788 from civicrm/msg_template_no_id

[REF] Fixes a bug in Message Template create API where by user permissions checks were being done on system workflow messages

4 years agoMerge pull request #16794 from civicrm/5.24
Seamus Lee [Mon, 16 Mar 2020 05:11:39 +0000 (16:11 +1100)]
Merge pull request #16794 from civicrm/5.24

5.24

4 years agoFix Bug where Payment Balance is sometimes miscalculated
eileen [Fri, 14 Feb 2020 22:03:08 +0000 (11:03 +1300)]
Fix Bug where Payment Balance is sometimes miscalculated

I observed that when this function is called without the mystical  the paymentBalance is miscalculated

The payment balance is calculated as the Contribution Total less the amount paid (for less queries the
total is passed into getContributionBalance & used if passed in). We were passing in the Balance
as the total causing the balance to be calculated as the Balance less any amount paid.

From what I can tell this function has been honed & cleaned up but because the parameter never made much sense
the impact of different variants was not really tested. This removes & fixes

4 years agoMerge pull request #16791 from totten/5.24-dot
Seamus Lee [Mon, 16 Mar 2020 03:51:27 +0000 (14:51 +1100)]
Merge pull request #16791 from totten/5.24-dot

(REF) dev/core#1637, dev/core#1651 - Restore format of packagesBase

4 years agoCleanup api3 DashboardContact
Coleman Watts [Mon, 16 Mar 2020 01:47:59 +0000 (21:47 -0400)]
Cleanup api3 DashboardContact

4 years ago(NFC) Document format of packagesBase, resourceBase.
Tim Otten [Mon, 16 Mar 2020 00:53:57 +0000 (17:53 -0700)]
(NFC) Document format of packagesBase, resourceBase.

Try to prevent future bounciness in changing these variables.

4 years agodev/core#1637 - Restore format of packagesBase
Tim Otten [Mon, 16 Mar 2020 00:52:26 +0000 (17:52 -0700)]
dev/core#1637 - Restore format of packagesBase

These use-cases had been tested during PR dev for 5.23.alpha, but they
regressed in 5.23.1.  In 5.23.1's #16735, note item (5) and the flip-flop on
`/.` Item (5) references some greps to find references `/.` For obscure
reasons, the  file `l10n.js.tpl` didn't match the greps.

4 years agoRevert "inline editing not working and other js packages issues"
Tim Otten [Mon, 16 Mar 2020 00:20:12 +0000 (17:20 -0700)]
Revert "inline editing not working and other js packages issues"

This reverts commit c68b3313741a367e2510ea6be54895405e4438ca.

4 years ago[REF] Fix permission check for system workflow message created
Seamus Lee [Mon, 16 Mar 2020 00:03:55 +0000 (11:03 +1100)]
[REF] Fix permission check for system workflow message created

4 years ago[NFC] Add in unit test for creating a new system work flow message template with...
Seamus Lee [Sun, 15 Mar 2020 22:55:22 +0000 (09:55 +1100)]
[NFC] Add in unit test for creating a new system work flow message template with only edit system workflow message templates permission

4 years agoMerge pull request #16746 from eileenmcnaughton/fatal
Seamus Lee [Mon, 16 Mar 2020 00:09:41 +0000 (11:09 +1100)]
Merge pull request #16746 from eileenmcnaughton/fatal

[REF] Remove calls to fatal()

4 years agoMerge pull request #16778 from colemanw/arrayValue6
Eileen McNaughton [Mon, 16 Mar 2020 00:05:04 +0000 (13:05 +1300)]
Merge pull request #16778 from colemanw/arrayValue6

[REF] Cleanup uses of CRM_Utils_Array::value related to numbers

4 years agoMerge pull request #16786 from civicrm/5.24
Eileen McNaughton [Sun, 15 Mar 2020 23:23:45 +0000 (12:23 +1300)]
Merge pull request #16786 from civicrm/5.24

5.24

4 years agoMerge pull request #16724 from kartik1000/core-1599
Eileen McNaughton [Sun, 15 Mar 2020 22:42:22 +0000 (11:42 +1300)]
Merge pull request #16724 from kartik1000/core-1599

dev/core#1599/Deceased Contact's Membership Marked to Deceased via Inline

4 years agoMerge pull request #16763 from eileenmcnaughton/mem_dash
Eileen McNaughton [Sun, 15 Mar 2020 22:29:21 +0000 (11:29 +1300)]
Merge pull request #16763 from eileenmcnaughton/mem_dash

dev/user-interface#14 Fix regression whereby links from membership dashboard don't work for export

4 years agoMerge pull request #16783 from civicrm/5.24
Eileen McNaughton [Sun, 15 Mar 2020 22:26:30 +0000 (11:26 +1300)]
Merge pull request #16783 from civicrm/5.24

5.24 to master

4 years agoMerge pull request #16775 from demeritcowboy/fin-fatals
Eileen McNaughton [Sun, 15 Mar 2020 22:26:02 +0000 (11:26 +1300)]
Merge pull request #16775 from demeritcowboy/fin-fatals

dev/core#1645 - (Test for) Fatal error when assigning account to financial type

4 years agoMerge pull request #16782 from civicrm/5.24
Eileen McNaughton [Sun, 15 Mar 2020 22:25:46 +0000 (11:25 +1300)]
Merge pull request #16782 from civicrm/5.24

5.24

4 years agoMerge pull request #16776 from eileenmcnaughton/fform
Seamus Lee [Sun, 15 Mar 2020 20:08:03 +0000 (07:08 +1100)]
Merge pull request #16776 from eileenmcnaughton/fform

dev/core#1645 fix  regression  by removing form inheritance

4 years agoMerge pull request #16779 from demeritcowboy/inline-edit
Seamus Lee [Sun, 15 Mar 2020 19:34:26 +0000 (06:34 +1100)]
Merge pull request #16779 from demeritcowboy/inline-edit

dev/core#1651 and dev/core#1637 - Inline editing not working on many admin screens and other js packages issues

4 years agoinline editing not working and other js packages issues
demeritcowboy [Sun, 15 Mar 2020 15:26:41 +0000 (11:26 -0400)]
inline editing not working and other js packages issues

4 years agoMerge pull request #16777 from eileenmcnaughton/ftype_form
colemanw [Sun, 15 Mar 2020 01:02:03 +0000 (21:02 -0400)]
Merge pull request #16777 from eileenmcnaughton/ftype_form

[REF]  cleanup financial type form - remove complex inheritence

4 years agoCleanup uses of CRM_Utils_Array::value related to numbers
Coleman Watts [Sun, 15 Mar 2020 00:20:06 +0000 (20:20 -0400)]
Cleanup uses of CRM_Utils_Array::value related to numbers

Some manual cleanup around the areas of code where CRM_Utils_Array::value is used for a number defaulting to 0

4 years agodev/core#1645 fix regression by removing form inheritence
eileen [Sat, 14 Mar 2020 21:38:28 +0000 (10:38 +1300)]
dev/core#1645 fix  regression  by removing form inheritence

The Assign  Account form is failing to load because it inherits indirectly from CRM_Admin_Form which
now has a different visibility on the _id property.

I  took a look and there really is no reason for this complex  inheritence - this is a standalone form
and the setDefaults of  the parent seems of no use, let alone the parent's parent.

Assign, edit & browse seem to still work fine

4 years agofatal error when assigning account to financial type
demeritcowboy [Sat, 14 Mar 2020 17:35:30 +0000 (13:35 -0400)]
fatal error when assigning account to financial type