civicrm-core.git
5 years agoMerge pull request #15922 from totten/5.20-e2e-cli
Seamus Lee [Thu, 21 Nov 2019 23:31:18 +0000 (10:31 +1100)]
Merge pull request #15922 from totten/5.20-e2e-cli

(dev/core#1412) E2E - Add test case for path+URL construction in CLI

5 years ago(dev/core#1412) E2E - Add test case for path+URL construction in CLI
Tim Otten [Thu, 21 Nov 2019 21:58:38 +0000 (13:58 -0800)]
(dev/core#1412) E2E - Add test case for path+URL construction in CLI

Overview
--------

In dev/core#1412, the regression involved CLI processes producing incorrect URLs.
This adds some test-coverage.

Before
------

No test coverage for URLs in CLI environment.

After
-----

There is some test-coverage. It's able to reveal the existence of the bug from 1412.

Comments
--------

A lot of path/URL construction is dependent on the environment/site-build.
The test does not, on its own, guarantee that all environments work.
Rather, it adds a new slice of cheese to the stack.

This slice is moderately generic - in that I've successfully tested it
localy on `drupal-demo` and `wp-demo` builds.  In theory, it should work on
other build types (as long as they set variables `CIVI_CORE`, `CMS_ROOT`,
`CMS_URL`).

5 years agoMerge pull request #15918 from MegaphoneJon/core-1411-rc
Seamus Lee [Thu, 21 Nov 2019 21:58:21 +0000 (08:58 +1100)]
Merge pull request #15918 from MegaphoneJon/core-1411-rc

core#1411: Advanced Search crashes when some form values start with 1

5 years agocore#1411: Advanced Search crashes when some form values start with 1
Jon Goldberg [Thu, 21 Nov 2019 18:32:56 +0000 (13:32 -0500)]
core#1411: Advanced Search crashes when some form values start with 1

5 years agoMerge pull request #15899 from greenpeace-cee/fix-ambiguous-order-column
Eileen McNaughton [Thu, 21 Nov 2019 19:08:32 +0000 (08:08 +1300)]
Merge pull request #15899 from greenpeace-cee/fix-ambiguous-order-column

Fix ambiguous column in search with ORDER BY

5 years agoFix ambiguous column in search with ORDER BY
Patrick Figel [Wed, 20 Nov 2019 23:47:18 +0000 (00:47 +0100)]
Fix ambiguous column in search with ORDER BY

This fixes an issue where columns whose names are not unique in a
search query cause a DB error when they're used as a sort column.
The issue can be observed in the contribution search when sorting
by contribution status.

The issue is resolved by using the where field of the column spec,
which holds the fully-qualified name of the column.

5 years agoMerge branch '5.20-security_release_release_notes' into '5.20-security'
totten [Wed, 20 Nov 2019 21:53:44 +0000 (21:53 +0000)]
Merge branch '5.20-security_release_release_notes' into '5.20-security'

Release notes for 5.19.2 Release

See merge request security/core!90

5 years agoUpdate 5.19.2.md
totten [Wed, 20 Nov 2019 20:09:10 +0000 (20:09 +0000)]
Update 5.19.2.md

5 years agoUpdate 5.19.2.md
totten [Wed, 20 Nov 2019 19:59:12 +0000 (19:59 +0000)]
Update 5.19.2.md

5 years agoUpdate release notes for Public MRs being merged into 5.19
Seamus Lee [Wed, 20 Nov 2019 19:23:24 +0000 (06:23 +1100)]
Update release notes for Public MRs being merged into 5.19

5 years agoUpdate 5.19.2.md
totten [Wed, 20 Nov 2019 08:14:02 +0000 (08:14 +0000)]
Update 5.19.2.md

5 years agoUpdate 5.19.2.md
totten [Wed, 20 Nov 2019 08:05:07 +0000 (08:05 +0000)]
Update 5.19.2.md

5 years agoUpdate 5.19.2.md
totten [Wed, 20 Nov 2019 07:35:07 +0000 (07:35 +0000)]
Update 5.19.2.md

5 years agoMinor update to release notes
Seamus Lee [Tue, 19 Nov 2019 22:18:42 +0000 (09:18 +1100)]
Minor update to release notes

5 years agoUpdate release notes as per Tim's copy editing of the SA
Seamus Lee [Mon, 18 Nov 2019 05:38:23 +0000 (16:38 +1100)]
Update release notes as per Tim's copy editing of the SA

5 years agoRelease notes for 5.19.2 Release
Seamus Lee [Mon, 18 Nov 2019 05:34:14 +0000 (16:34 +1100)]
Release notes for 5.19.2 Release

5 years agoUpdate to latest versions of polyfill-ctype and polyfill-iconv
Seamus Lee [Wed, 20 Nov 2019 02:13:35 +0000 (13:13 +1100)]
Update to latest versions of polyfill-ctype and polyfill-iconv

5 years agosecuriry/core#70 Upgrade Symfony version to 2.8.50
Seamus Lee [Wed, 20 Nov 2019 02:03:22 +0000 (13:03 +1100)]
securiry/core#70 Upgrade Symfony version to 2.8.50

5 years agoContactApiKeyTest - Add additional test-case
Tim Otten [Wed, 20 Nov 2019 03:50:11 +0000 (19:50 -0800)]
ContactApiKeyTest - Add additional test-case

This case was failing before but now passes with the update

5 years agoEnsure that APIv4 Properly filters out permissable fields when no permission to view...
Seamus Lee [Wed, 20 Nov 2019 03:14:16 +0000 (14:14 +1100)]
Ensure that APIv4 Properly filters out permissable fields when no permission to view field exists

5 years agoUpdate unit test to match the output of the CRM_Utils_String function
Jenkins [Sat, 9 Nov 2019 07:16:07 +0000 (07:16 +0000)]
Update unit test to match the output of the CRM_Utils_String function

5 years agoSavedSearch API - Only accept safe inputs
Tim Otten [Tue, 29 Oct 2019 01:55:18 +0000 (18:55 -0700)]
SavedSearch API - Only accept safe inputs

5 years agoCRM_Utils_String::unserialize() - Add wrapper for parsing safe exprs (int/string...
Tim Otten [Tue, 29 Oct 2019 01:53:03 +0000 (18:53 -0700)]
CRM_Utils_String::unserialize() - Add wrapper for parsing safe exprs (int/string/array/etc)

5 years ago[NFC] Update Doc block as per Patrick
Seamus Lee [Sun, 3 Nov 2019 06:20:31 +0000 (17:20 +1100)]
[NFC] Update Doc block as per Patrick

5 years agoRevert changes in CRM/Core/BAO{Cache|ConfigSetting}.php CRM/Extension/ClassLoader...
Seamus Lee [Tue, 29 Oct 2019 22:34:55 +0000 (09:34 +1100)]
Revert changes in CRM/Core/BAO{Cache|ConfigSetting}.php CRM/Extension/ClassLoader.php CRM/Queue and CRM/Utils/Cache

5 years agoReturn FALSE instead of throwing Exception if package throws Exception
Seamus Lee [Tue, 29 Oct 2019 04:26:57 +0000 (15:26 +1100)]
Return FALSE instead of throwing Exception if package throws Exception

5 years agoImplement xKerman/restricted-unserialize package to guard against unsafe unserialize
Seamus Lee [Tue, 29 Oct 2019 04:21:06 +0000 (15:21 +1100)]
Implement xKerman/restricted-unserialize package to guard against unsafe unserialize

5 years agoContactInterchangeTest - Add coverage for APIv4 joins/chains
Tim Otten [Thu, 31 Oct 2019 06:00:21 +0000 (23:00 -0700)]
ContactInterchangeTest - Add coverage for APIv4 joins/chains

5 years ago(security/core#67) Port APIv3's escaping scheme to APIv4
Tim Otten [Fri, 25 Oct 2019 03:59:08 +0000 (20:59 -0700)]
(security/core#67) Port APIv3's escaping scheme to APIv4

5 years agoHTMLInputCoder - Add more variants for encoding arrays
Tim Otten [Fri, 25 Oct 2019 03:57:34 +0000 (20:57 -0700)]
HTMLInputCoder - Add more variants for encoding arrays

5 years agoFix unit test for APIv4 format
Seamus Lee [Wed, 9 Oct 2019 09:24:42 +0000 (20:24 +1100)]
Fix unit test for APIv4 format

5 years agoFix api_key handling from joins
Coleman Watts [Mon, 1 Jul 2019 00:47:47 +0000 (20:47 -0400)]
Fix api_key handling from joins

5 years agosecurity/core#65 - Fix XSS in Dashboard Report Title
Patrick Figel [Wed, 9 Oct 2019 10:45:33 +0000 (12:45 +0200)]
security/core#65 - Fix XSS in Dashboard Report Title

This fixes an XSS in report titles displayed on the dashboard page
by escaping the title on output.

5 years agosecurity/core#65 Fix Display of Report title that contains XSS in it when shown on...
Seamus Lee [Thu, 8 Aug 2019 21:38:06 +0000 (07:38 +1000)]
security/core#65 Fix Display of Report title that contains XSS in it when shown on dashboard

5 years agosecurity/core#59 - Fix SQL injection in civicrm/ajax/dedupefind
Patrick Figel [Fri, 5 Jul 2019 18:49:44 +0000 (20:49 +0200)]
security/core#59 - Fix SQL injection in civicrm/ajax/dedupefind

This fixes an SQL injection in civicrm/ajax/dedupefind by validating
the order direction parameter.

Fixes #59

5 years agoMerge pull request #15889 from eileenmcnaughton/refund
Seamus Lee [Wed, 20 Nov 2019 19:44:00 +0000 (06:44 +1100)]
Merge pull request #15889 from eileenmcnaughton/refund

dev/core#1409 Remove net_amount from Addtional Payment form

5 years agodev/core#1409 Remove net_amount from Addtional Payment form
eileen [Wed, 20 Nov 2019 04:54:22 +0000 (17:54 +1300)]
dev/core#1409 Remove net_amount from Addtional Payment form

This is causing a validation problem. We used to have an issue on the contribution form which we eventually
resolved by removing net_amount as it's best calculated anyway

In order to make this changed I had to ensure Payment.create adds the net_amount & had
to do a couple of tweaks for the test to pass

5 years agoMerge pull request #15888 from seamuslee001/lab_core_1406
Seamus Lee [Wed, 20 Nov 2019 06:39:17 +0000 (17:39 +1100)]
Merge pull request #15888 from seamuslee001/lab_core_1406

dev/core#1406 Ensure that we use the CRM_Member_DAO_Membership as dao…

5 years agodev/core#1406 Ensure that we use the CRM_Member_DAO_Membership as dao for the civicrm...
Seamus Lee [Wed, 20 Nov 2019 04:42:52 +0000 (15:42 +1100)]
dev/core#1406 Ensure that we use the CRM_Member_DAO_Membership as dao for the civicrm_membership table

5 years agoMerge pull request #15879 from alifrumin/rn5.20
Seamus Lee [Mon, 18 Nov 2019 21:26:04 +0000 (08:26 +1100)]
Merge pull request #15879 from alifrumin/rn5.20

First pass at sorting and annotating 5.20 release notes

5 years agorelease notes 5.20 - first pass at editing, sorting and annotating
Alice Frumin [Fri, 8 Nov 2019 21:28:06 +0000 (16:28 -0500)]
release notes 5.20 - first pass at editing, sorting and annotating

5 years agoMerge pull request #15846 from greenpeace-cee/fix-cancel-date
Eileen McNaughton [Mon, 18 Nov 2019 20:25:44 +0000 (09:25 +1300)]
Merge pull request #15846 from greenpeace-cee/fix-cancel-date

Fix contribution cancel_date not being loaded

5 years agodev/core#1391 - Fix contribution cancel_date not being loaded
Patrick Figel [Thu, 14 Nov 2019 13:19:04 +0000 (14:19 +0100)]
dev/core#1391 - Fix contribution cancel_date not being loaded

This fixes an issue where the contribution cancel_date is not loaded
in the contribution search, causing cancelled contributions not to be
greyed out and the cancel date not to be shown.

5 years agoMerge pull request #15872 from eileenmcnaughton/sybunt
Seamus Lee [Sun, 17 Nov 2019 19:50:59 +0000 (06:50 +1100)]
Merge pull request #15872 from eileenmcnaughton/sybunt

Fix Sybunt to select mark rows as selected

5 years agoMerge pull request #15873 from eileenmcnaughton/cont_ag
Eileen McNaughton [Sun, 17 Nov 2019 19:29:04 +0000 (08:29 +1300)]
Merge pull request #15873 from eileenmcnaughton/cont_ag

dev/core#1377 Fix bug where search action doesn't work.

5 years agodev/core#1377 Fix bug where search action doesn't work.
eileen [Sun, 17 Nov 2019 08:18:47 +0000 (21:18 +1300)]
dev/core#1377 Fix bug where search action doesn't work.

Fixes a regression where the search actions are not working on the contributionAggregate custom search

5 years agoFix Sybunt to select mark rows as selected
eileen [Sun, 17 Nov 2019 07:04:26 +0000 (20:04 +1300)]
Fix Sybunt to select mark rows as selected

5 years agoMerge pull request #15844 from mlutfy/fixMsgTpl
Eileen McNaughton [Thu, 14 Nov 2019 22:01:24 +0000 (11:01 +1300)]
Merge pull request #15844 from mlutfy/fixMsgTpl

marketing/civicrm-website#163 Mitigate potential upgrade errors on missing msg_templates

5 years agomarketing/civicrm-website#163 Mitigate potential upgrade errors on missing msg_templates
Mathieu Lutfy [Wed, 13 Nov 2019 19:56:02 +0000 (14:56 -0500)]
marketing/civicrm-website#163 Mitigate potential upgrade errors on missing msg_templates

5 years agoMerge pull request #15804 from eileenmcnaughton/fns
Seamus Lee [Mon, 11 Nov 2019 03:19:01 +0000 (14:19 +1100)]
Merge pull request #15804 from eileenmcnaughton/fns

dev/core#1381 fix fatal on case search (unreleased regression

5 years agodev/core#1381 fix fatal on case search (unreleased regression
eileen [Mon, 11 Nov 2019 02:03:50 +0000 (15:03 +1300)]
dev/core#1381 fix fatal on case search (unreleased regression

5 years agoMerge pull request #15787 from eileenmcnaughton/recur_ug
Seamus Lee [Sat, 9 Nov 2019 05:30:13 +0000 (16:30 +1100)]
Merge pull request #15787 from eileenmcnaughton/recur_ug

Remove unhelpful alert from contribution search

5 years agoMerge pull request #15789 from seamuslee001/5_19_1_version_notes
Seamus Lee [Sat, 9 Nov 2019 02:57:37 +0000 (13:57 +1100)]
Merge pull request #15789 from seamuslee001/5_19_1_version_notes

5.19.1 Version Release Notes

5 years agoUpdate 5.19.1.md
Tim Otten [Sat, 9 Nov 2019 02:32:54 +0000 (18:32 -0800)]
Update 5.19.1.md

5 years agoAdd in release notes for 5.19.1 drop
Seamus Lee [Sat, 9 Nov 2019 01:39:44 +0000 (12:39 +1100)]
Add in release notes for 5.19.1 drop

5 years agoRemove unhelpful alert from contribution search
eileen [Sat, 9 Nov 2019 01:12:20 +0000 (14:12 +1300)]
Remove unhelpful alert from contribution search

5 years agoMerge pull request #15781 from eileenmcnaughton/cont_search
Seamus Lee [Sat, 9 Nov 2019 00:37:51 +0000 (11:37 +1100)]
Merge pull request #15781 from eileenmcnaughton/cont_search

dev/core#1374 Fix search formValue handling on contribution search

5 years agoMerge pull request #15782 from seamuslee001/dev_mailing_56_2
Seamus Lee [Fri, 8 Nov 2019 23:58:17 +0000 (10:58 +1100)]
Merge pull request #15782 from seamuslee001/dev_mailing_56_2

Add in unit test for dev/mailing#56 and dev/mailing#57 and also fix i…

5 years agodev/core#1374 Fix search formValue handling on contribution search
eileen [Fri, 8 Nov 2019 21:42:00 +0000 (10:42 +1300)]
dev/core#1374 Fix search formValue handling on contribution search

This fixes 2 issues
1) Search params being lost when editing a related entity per
https://lab.civicrm.org/dev/core/issues/1374
2) force=1&sort_name=p not working in contribution search url

In digging I concluded the problem is we have 3 underlying arrays which we keep jumbling together

1) formValues - the actual submitted values, augmented by any  url passed params
2) the default values - values to load by default on the form
3) our working query params - a copy of formValues that we have prepared for the query

We need to stop mangling them. I added subtle code comments

5 years agoAdd in unit test for dev/mailing#56 and dev/mailing#57 and also fix issue where by...
Seamus Lee [Fri, 8 Nov 2019 22:40:22 +0000 (09:40 +1100)]
Add in unit test for dev/mailing#56 and dev/mailing#57 and also fix issue where by mailing_name has been namespaced also in 5.20

5 years agoMerge pull request #15779 from seamuslee001/dev_mailing_56
Seamus Lee [Fri, 8 Nov 2019 22:35:25 +0000 (09:35 +1100)]
Merge pull request #15779 from seamuslee001/dev_mailing_56

dev/mailing#56 dev/mailing#57 Ensure that we don't pass in any namesp…

5 years agodev/mailing#56 dev/mailing#57 Ensure that we don't pass in any namespaced fields...
Seamus Lee [Fri, 8 Nov 2019 21:27:41 +0000 (08:27 +1100)]
dev/mailing#56 dev/mailing#57 Ensure that we don't pass in any namespaced fields when building the row array for mailing reports

5 years agoMerge pull request #15772 from agh1/5.20.0-releasenotes-initial
Seamus Lee [Fri, 8 Nov 2019 20:09:25 +0000 (07:09 +1100)]
Merge pull request #15772 from agh1/5.20.0-releasenotes-initial

5.20.0 release notes initial run

5 years ago5.20.0 release notes: added boilerplate
Andrew Hunt [Fri, 8 Nov 2019 17:26:55 +0000 (12:26 -0500)]
5.20.0 release notes: added boilerplate

5 years ago5.20.0 release notes: raw from script
Andrew Hunt [Fri, 8 Nov 2019 17:21:30 +0000 (12:21 -0500)]
5.20.0 release notes: raw from script

5 years agoMerge pull request #15765 from seamuslee001/5.20
Eileen McNaughton [Fri, 8 Nov 2019 02:19:21 +0000 (15:19 +1300)]
Merge pull request #15765 from seamuslee001/5.20

dev/core#1376 Catch Invalid Argument Exception when looking for APIv4…

5 years agodev/core#1376 Catch Invalid Argument Exception when looking for APIv4 Services
Seamus Lee [Thu, 7 Nov 2019 23:07:32 +0000 (10:07 +1100)]
dev/core#1376 Catch Invalid Argument Exception when looking for APIv4 Services

5 years agoMerge pull request #15762 from seamuslee001/dev_core_1371
Seamus Lee [Thu, 7 Nov 2019 20:47:49 +0000 (07:47 +1100)]
Merge pull request #15762 from seamuslee001/dev_core_1371

dev/core#1371 Fix e-notice caused by trying to pass in known  to the …

5 years agodev/core#1371 Fix e-notice caused by trying to pass in known to the extension downlo...
Seamus Lee [Thu, 7 Nov 2019 19:25:55 +0000 (06:25 +1100)]
dev/core#1371 Fix e-notice caused by trying to pass in known  to the extension downloader when checking requirements

5 years agoSet version to 5.20.beta1
CiviCRM [Thu, 7 Nov 2019 02:11:34 +0000 (02:11 +0000)]
Set version to 5.20.beta1

5 years agoMerge pull request #15754 from seamuslee001/master
Seamus Lee [Thu, 7 Nov 2019 01:44:11 +0000 (12:44 +1100)]
Merge pull request #15754 from seamuslee001/master

5.19

5 years agoMerge in 5.19
Seamus Lee [Thu, 7 Nov 2019 01:43:35 +0000 (12:43 +1100)]
Merge in 5.19

5 years agoSet version to 5.19.0
Tim Otten [Thu, 7 Nov 2019 01:39:32 +0000 (17:39 -0800)]
Set version to 5.19.0

5 years agoMerge pull request #15752 from agh1/5.19.0-releasenotes-final
Tim Otten [Thu, 7 Nov 2019 01:32:18 +0000 (17:32 -0800)]
Merge pull request #15752 from agh1/5.19.0-releasenotes-final

5.19.0 release notes: added late changes

5 years agoUpdate 5.19.0.md
Tim Otten [Thu, 7 Nov 2019 01:31:27 +0000 (17:31 -0800)]
Update 5.19.0.md

5 years agoMerge pull request #15751 from magnolia61/workflow_template_contribution_terms
Eileen McNaughton [Thu, 7 Nov 2019 01:26:14 +0000 (14:26 +1300)]
Merge pull request #15751 from magnolia61/workflow_template_contribution_terms

changed wording to Total Fee & Total Paid

5 years ago5.19.0 release notes: added late changes
Andrew Hunt [Thu, 7 Nov 2019 01:16:33 +0000 (20:16 -0500)]
5.19.0 release notes: added late changes

5 years agoMerge pull request #15748 from eileenmcnaughton/line_item_belt_braces
Eileen McNaughton [Thu, 7 Nov 2019 01:02:14 +0000 (14:02 +1300)]
Merge pull request #15748 from eileenmcnaughton/line_item_belt_braces

Provide precautionary handling for theoretical error scenario.

5 years agochanged wording to Total Fee & Total Paid
magnolia61 [Wed, 6 Nov 2019 23:38:40 +0000 (00:38 +0100)]
changed wording to Total Fee & Total Paid

5 years agoProvide precautionary handling for theoretical error scenario.
eileen [Wed, 6 Nov 2019 19:40:37 +0000 (08:40 +1300)]
Provide precautionary handling for theoretical error scenario.

While testing payments I hit a bug where I tried to add a payment to a contribution with no financial items.

I never managed to replicate it again or determine how the payment came to be in that state but
it's been playing in my mind that people could get fatal errors if the financial_items don't exist
and dealing with those as regression reports will very tough. So my plan is
- for 5.20 add this extra routine to create it if it does not exist
- use this mechanism + more digging to figure out how legit an issue it is https://github.com/civicrm/civicrm-core/pull/15706
- in future releases 'get noisy' about having to create them if they don't exist
- eventually remove this routine

5 years agoMerge pull request #15740 from eileenmcnaughton/partial
Seamus Lee [Wed, 6 Nov 2019 23:23:44 +0000 (10:23 +1100)]
Merge pull request #15740 from eileenmcnaughton/partial

dev/financial#40 Fix for non-allocation of payment to fully reversed checkboxes option

5 years agoMerge pull request #15745 from seamuslee001/master
Eileen McNaughton [Wed, 6 Nov 2019 22:07:34 +0000 (11:07 +1300)]
Merge pull request #15745 from seamuslee001/master

Update template upgrade list as per PR #15742

5 years agoMerge pull request #15750 from eileenmcnaughton/except
Eileen McNaughton [Wed, 6 Nov 2019 21:06:22 +0000 (10:06 +1300)]
Merge pull request #15750 from eileenmcnaughton/except

[NFC] Cleanup on exceptions

5 years agoMerge pull request #15744 from yashodha/participant_edit
Eileen McNaughton [Wed, 6 Nov 2019 21:04:13 +0000 (10:04 +1300)]
Merge pull request #15744 from yashodha/participant_edit

(dev/core#1065) Participant in Edit mode needs to be shown consistently

5 years agoMerge pull request #15749 from seamuslee001/Additional_Fixes_to_workflow_templates
Seamus Lee [Wed, 6 Nov 2019 20:56:27 +0000 (07:56 +1100)]
Merge pull request #15749 from seamuslee001/Additional_Fixes_to_workflow_templates

Additional fixes to workflow templates

5 years agoUpdate template upgrade list as per PR #15742
Seamus Lee [Wed, 6 Nov 2019 18:43:57 +0000 (05:43 +1100)]
Update template upgrade list as per PR #15742

5 years agoCleanup on exceptions
eileen [Wed, 6 Nov 2019 20:09:51 +0000 (09:09 +1300)]
Cleanup on exceptions

Fixes a low level function to throw a CRM_Core_Exception & tidies up functions
above to specify that. Fixes casing on a function call, removes a fatal
for status bounce

5 years agoFix Smarty Syntax in payment_or_refund_notification_text template and update unit...
Seamus Lee [Wed, 6 Nov 2019 19:44:21 +0000 (06:44 +1100)]
Fix Smarty Syntax in payment_or_refund_notification_text template and update unit tests to match the change in langauge in the templates

5 years agoMerge pull request #15746 from civicrm/5.19
Eileen McNaughton [Wed, 6 Nov 2019 19:29:45 +0000 (08:29 +1300)]
Merge pull request #15746 from civicrm/5.19

5.19

5 years agoMerge pull request #15741 from totten/5.19-volinst
Seamus Lee [Wed, 6 Nov 2019 19:18:37 +0000 (06:18 +1100)]
Merge pull request #15741 from totten/5.19-volinst

(dev/core#1093) Fix regression during extension activation

5 years agoMerge pull request #15743 from eileenmcnaughton/validate_test
Seamus Lee [Wed, 6 Nov 2019 18:35:01 +0000 (05:35 +1100)]
Merge pull request #15743 from eileenmcnaughton/validate_test

Fix test to be more valid

5 years agoAdditional changes to workflow message templates
magnolia61 [Wed, 6 Nov 2019 07:52:02 +0000 (08:52 +0100)]
Additional changes to workflow message templates

5 years ago(dev/core#1065) Participant in Edit mode needs to be shown consistently
yashodha [Wed, 6 Nov 2019 09:07:55 +0000 (14:37 +0530)]
(dev/core#1065) Participant in Edit mode needs to be shown consistently

5 years agoFix test to be more valid
eileen [Wed, 6 Nov 2019 08:51:35 +0000 (21:51 +1300)]
Fix test to be more valid

I've added a check to run after tests & before tearDown to ensure that all payments have the
right entity_financial_trxn records.

This required fixing one ttest to be valid. It's not possible to create a contribution using the
back office for with status set to Partially Paid (it's not an option in the drop down, so
the test should create as Pending & then add a payment to get to partially paid

5 years ago(dev/core#1093) Fix permission error when activating extension
Tim Otten [Wed, 6 Nov 2019 07:50:16 +0000 (23:50 -0800)]
(dev/core#1093) Fix permission error when activating extension

Overview
--------

This fixes a recent/unreleased regression from #15726 in which the D7 demo build fails.

Before
------

When running `civibuild reinstall ...` on a `drupal-demo` site, it fails at this step:

```
+++ drush -y cvapi extension.install key=org.civicrm.volunteer debug=1
Authorization failed                                                                                                                                                   [error]
Array
(
    [error_code] => unauthorized
    [entity] => Extension
    [action] => install
    [trace] => #0 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/API/Kernel.php(166): Civi\API\Kernel->authorize(Object(Civi\Api4\Provider\ActionObjectProvider), Object(Civi\Api4\Generic\DAOSaveAction))
1 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/Api4/Generic/AbstractAction.php(235): Civi\API\Kernel->runRequest(Object(Civi\Api4\Generic\DAOSaveAction))
2 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/CRM/Utils/Migrate/Import.php(374): Civi\Api4\Generic\AbstractAction->execute()
3 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/CRM/Utils/Migrate/Import.php(82): CRM_Utils_Migrate_Import->customFields(Object(SimpleXMLElement), Array)
4 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/tools/extensions/civivolunteer/CRM/Volunteer/Upgrader.php(836): CRM_Utils_Migrate_Import->runXmlElement(Object(SimpleXMLElement))
5 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/tools/extensions/civivolunteer/CRM/Volunteer/Upgrader.php(48): CRM_Volunteer_Upgrader->executeCustomDataTemplateFile('volunteer-custo...')
6 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/tools/extensions/civivolunteer/CRM/Volunteer/Upgrader/Base.php(306): CRM_Volunteer_Upgrader->install()
7 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/tools/extensions/civivolunteer/volunteer.civix.php(131): CRM_Volunteer_Upgrader_Base->onInstall()
8 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/tools/extensions/civivolunteer/volunteer.php(204): _volunteer_civix_civicrm_install()
9 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/CRM/Extension/Manager/Module.php(76): volunteer_civicrm_install()
10 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/CRM/Extension/Manager/Module.php(48): CRM_Extension_Manager_Module->callHook(Object(CRM_Extension_Info), 'install')
11 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/CRM/Extension/Manager.php(264): CRM_Extension_Manager_Module->onPreInstall(Object(CRM_Extension_Info))
12 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/api/v3/Extension.php(58): CRM_Extension_Manager->install(Array)
13 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/API/Provider/MagicFunctionProvider.php(101): civicrm_api3_extension_install(Array)
14 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/API/Kernel.php(168): Civi\API\Provider\MagicFunctionProvider->invoke(Array)
15 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/API/Kernel.php(99): Civi\API\Kernel->runRequest(Array)
16 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/api/api.php(23): Civi\API\Kernel->runSafe('extension', 'install', Array, NULL)
17 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/drupal/drush/civicrm.drush.inc(1557): civicrm_api('extension', 'install', Array)
18 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/includes/command.inc(422): drush_civicrm_api('extension.insta...', 'key=org.civicrm...', 'debug=1')
19 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/includes/command.inc(231): _drush_invoke_hooks(Array, Array)
20 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/includes/command.inc(199): drush_command('extension.insta...', 'key=org.civicrm...', 'debug=1')
21 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/lib/Drush/Boot/BaseBoot.php(67): drush_dispatch(Array)
22 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/includes/preflight.inc(66): Drush\Boot\BaseBoot->bootstrap_and_dispatch()
23 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/includes/startup.inc(465): drush_main()
24 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/includes/startup.inc(369): drush_run_main(false, '/', 'Phar detected. ...')
25 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/drush(114): drush_startup(Array)
26 /Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar(10): require('phar:///Users/t...')
27 {main}
    [is_error] => 1
    [error_message] => Authorization failed
)
```

After
-----

It works again.

5 years agoMerge pull request #15738 from agileware/CIVICRM-1354
Eileen McNaughton [Wed, 6 Nov 2019 05:35:02 +0000 (18:35 +1300)]
Merge pull request #15738 from agileware/CIVICRM-1354

Fix the relationship direction in testSingleMembershipForTwoRelationships

5 years agoFix for non-allocation of payment to fully reversed checkboxes option
eileen [Wed, 6 Nov 2019 04:51:20 +0000 (17:51 +1300)]
Fix for non-allocation of payment to fully reversed checkboxes option

This addresses an issue partially identified in https://lab.civicrm.org/dev/financial/issues/98 whereby
civicrm_entity_financial_trxn records for the civicrm_financial_item table are not created when
refunding against line items with a quantity of zero  - ie where there were selected checkboxes & they
were reversed.

The reason this check was there relates to former logic - now we have a calculated allocation
we don't need this check.

I want to do a test but need to do a bit of work to get it set up & I think this should hit 5.20
as it relates to an issue identified by Kevin in reviewing patches merged to that version

5 years agoMerge pull request #15731 from eileenmcnaughton/rel_clean
Eileen McNaughton [Wed, 6 Nov 2019 04:05:26 +0000 (17:05 +1300)]
Merge pull request #15731 from eileenmcnaughton/rel_clean

dev/core#1361 Fix bug where 2 memberships created for same relationship

5 years agoMerge pull request #15556 from demeritcowboy/convert-label-to-name-2
Eileen McNaughton [Wed, 6 Nov 2019 03:07:46 +0000 (16:07 +1300)]
Merge pull request #15556 from demeritcowboy/convert-label-to-name-2

Upgrade script for dev/core#1046

5 years agoCIVICRM-1354 fix test
Pengyi [Wed, 6 Nov 2019 03:04:25 +0000 (14:04 +1100)]
CIVICRM-1354 fix test