colemanw [Wed, 10 Jul 2019 13:18:02 +0000 (09:18 -0400)]
Merge pull request #14767 from eileenmcnaughton/export_2
[REF] initial extraction of loading saved mapping to qf format
colemanw [Wed, 10 Jul 2019 13:16:34 +0000 (09:16 -0400)]
Merge pull request #14769 from eileenmcnaughton/ex_test2
[REF] simplify & add tests on getMappingParams
Eileen McNaughton [Wed, 10 Jul 2019 12:11:09 +0000 (00:11 +1200)]
Merge pull request #14781 from civicrm/5.16
5.16 to master
Mathieu Lu [Wed, 10 Jul 2019 12:09:48 +0000 (08:09 -0400)]
Merge pull request #14775 from eileenmcnaughton/bgm
dev/drupal#75 Drupal8: fix call to languageNegotiationURL() when called from cv
Matthew Wire [Wed, 10 Jul 2019 11:29:01 +0000 (12:29 +0100)]
Merge pull request #14779 from eileenmcnaughton/export_test2
[ref] [export] [test] Improve csv test to test final output rather than the csv
Monish Deb [Wed, 10 Jul 2019 09:12:05 +0000 (14:42 +0530)]
Merge pull request #14750 from eileenmcnaughton/pay_notice
Fix enotice on formatting credit card details
eileen [Wed, 10 Jul 2019 09:09:30 +0000 (21:09 +1200)]
Improve csv test to test final output rather than the csv
Eileen McNaughton [Wed, 10 Jul 2019 08:05:44 +0000 (20:05 +1200)]
Merge pull request #14770 from totten/master-config-ids
Finish removing references to Config.IDS.ini
Eileen McNaughton [Wed, 10 Jul 2019 08:01:34 +0000 (20:01 +1200)]
Merge pull request #14696 from totten/master-d8-url
Migrate CivicrmHelper::parseUrl() to CRM_Utils_System_Drupal8::parseUrl().
Eileen McNaughton [Wed, 10 Jul 2019 07:56:12 +0000 (19:56 +1200)]
Merge pull request #14777 from totten/master-clean-key
GenCode, Cache::cleanKey() - Fix deploop during clean initialization
Eileen McNaughton [Wed, 10 Jul 2019 07:49:37 +0000 (19:49 +1200)]
Merge pull request #14778 from totten/master-basefilepath
(dev/cloud-native#3) CRM_Utils_File - Deprecate baseFilePath() et al
Tim Otten [Wed, 10 Jul 2019 06:35:31 +0000 (23:35 -0700)]
CRM_Utils_File::relativeDirectory() - Mark as deprecated
Computation of a relative path requires some base. This implementation is
problematic because it relies on an implicit base which was constructed
problematically. Moreover, the function is not used anywhere in the known
`universe`.
Tim Otten [Wed, 10 Jul 2019 06:32:10 +0000 (23:32 -0700)]
CRM_Utils_File::absoluteDirectory() - Make `$basePath` required
Previous versions interpreted `$basePath=NULL` to mean "default to `self::baseFilePath()`".
However, no code in the known `universe` relies on this interpretation, and
the `baseFilePath()` function is problematic/deprecated.
We could almost deprecate the entire function `absoluteDirectory()`;
however, it's fine to keep around: the semantics are reasonable if one
provides `$basePath`, and there is one active use-case in which
`Civi\Core\Paths` calls `absoluteDirectory()` with a suitable `$basePath`.
Tim Otten [Wed, 10 Jul 2019 06:30:57 +0000 (23:30 -0700)]
CRM_Utils_File::baseFilePath() - Mark function as deprecated
The rationale is provided in the docblock.
Tim Otten [Wed, 10 Jul 2019 02:21:58 +0000 (19:21 -0700)]
GenCode, Cache::cleanKey() - Fix deploop during clean initialization
Overview
--------
Suppose you have a clean codebase with no DAO files, and you try to run `xml/GenCode.php`.
This currently crashes.
The problem is not symptomatic day-to-day because we commit DAOs, so it's
very rare to run a full/clean initialization. However, it does get in the
way of stress-testing the correctness of GenCode.
Before
------
Since
76e697a9d750d568d0d12c10dd8173f656e8bb1e, I believe we've had a dependency-loop
in the clean-gencode scenario, which works as follows:
* We don't have any DAOs, so we run `GenCode`.
* Running `GenCode` does a partial bootstrap (i.e. `CRM_Core_Config::singleton($loadFromDB===FALSE)`)
* The partial bootstrap creates some thread-local caches (`Arraycache`)
* Before creating the cache, it normalizes the name by calling `CRM_Core_BAO_Cache::cleanKey()`
* `CRM_Core_BAO_Cache` extends `CRM_Core_DAO_Cache`
* `CRM_Core_BAO_Cache` doesn't exist - that's why we called `GenCode` at the beginning.
After
-----
This migrates the utility function `cleanKey()` to another class which is always available and
does not rely on DAOs.
Mathieu Lutfy [Wed, 10 Jul 2019 00:07:16 +0000 (20:07 -0400)]
dev/drupal#75 Drupal8: fix call to languageNegotiationURL() when called from cv
Eileen McNaughton [Wed, 10 Jul 2019 04:44:29 +0000 (16:44 +1200)]
Merge pull request #14772 from mlutfy/drupal75
dev/drupal#75 Drupal8: fix call to languageNegotiationURL() when called from cv
Mathieu Lutfy [Wed, 10 Jul 2019 00:07:16 +0000 (20:07 -0400)]
dev/drupal#75 Drupal8: fix call to languageNegotiationURL() when called from cv
Eileen McNaughton [Wed, 10 Jul 2019 00:03:26 +0000 (12:03 +1200)]
Merge pull request #14768 from eileenmcnaughton/export_test
[REF] [export] . Move greeting params retrieval to the place in the code where it is used
eileen [Tue, 9 Jul 2019 22:26:38 +0000 (10:26 +1200)]
[REF] simplify & add tests on getMappingParams
Tests extended to cover search builder (all that operator stuff
Tim Otten [Tue, 9 Jul 2019 22:19:31 +0000 (15:19 -0700)]
CRM-20926 - Finish killing Config.IDS.ini
eileen [Tue, 9 Jul 2019 21:28:42 +0000 (09:28 +1200)]
Move greeting params retrieval to the place in the code where it is used
Eileen McNaughton [Tue, 9 Jul 2019 21:04:16 +0000 (09:04 +1200)]
Merge pull request #14765 from eileenmcnaughton/export_test
[REF] Update export test to new function
eileen [Tue, 9 Jul 2019 20:48:44 +0000 (08:48 +1200)]
[REF] initial extraction of loading saved mapping to qf format
Janky but in the right direction. The phoneType & imProvider stuff looks nasty but not more nasty
Eileen McNaughton [Tue, 9 Jul 2019 19:47:16 +0000 (07:47 +1200)]
Merge pull request #14745 from eileenmcnaughton/fgb
dev/core#578 follow up fix on activity summary report
Eileen McNaughton [Tue, 9 Jul 2019 19:46:39 +0000 (07:46 +1200)]
Merge pull request #14615 from mattwire/contributionpage_title
Set title using standard form method and use for success message on contributionpage
Matthew Wire [Tue, 9 Jul 2019 16:27:53 +0000 (17:27 +0100)]
Merge pull request #14762 from eileenmcnaughton/mapping_whomp
[REF] Extract mapping converter function, kinda brutally
eileen [Tue, 9 Jul 2019 08:23:38 +0000 (20:23 +1200)]
Extract mapping converter function, kinda brutally
eileen [Tue, 9 Jul 2019 12:19:15 +0000 (00:19 +1200)]
Update export test to new function
Eileen McNaughton [Tue, 9 Jul 2019 12:13:34 +0000 (00:13 +1200)]
Merge pull request #14706 from ixiam/dev-SmartyCompiled
expose smarty's compile_check to be overridden in civicrm.settings.php
colemanw [Tue, 9 Jul 2019 12:05:07 +0000 (08:05 -0400)]
Merge pull request #14758 from eileenmcnaughton/export_test_improve
[REF] export code simplification
eileen [Tue, 9 Jul 2019 07:08:35 +0000 (19:08 +1200)]
Add unit test for saveFieldMapping
Eileen McNaughton [Tue, 9 Jul 2019 08:27:55 +0000 (20:27 +1200)]
Merge pull request #14757 from eileenmcnaughton/mapping_fields
[REF] Extract saveMapping Field
Eileen McNaughton [Tue, 9 Jul 2019 08:08:18 +0000 (20:08 +1200)]
Merge pull request #14729 from eileenmcnaughton/enotice
e-notice fix & unit test
eileen [Tue, 9 Jul 2019 05:00:30 +0000 (17:00 +1200)]
Remove unecessary pass-by-reference
eileen [Tue, 9 Jul 2019 04:43:26 +0000 (16:43 +1200)]
[REF] export code simplification
On review I find the value ['exportOption'] is a parameter used at the form later to determine whether to
export 'Primary fields only' (ahem) or the user should select an array of fields. By the time the form is submitted we
either have an array of selected fields or NULL denoting that there is no selection (& hence the defaults should be used)
and the selection at the form layer is redundant. However it is still being referenced in one place (and hence the tests
are passing it in to avoid an enotice). This fixes that one place & removes it from the tests. It also extracts part of
a test to move towards making it easier to alter the signature of exportComponents without messing with so many places in
the code
Eileen McNaughton [Tue, 9 Jul 2019 03:57:09 +0000 (15:57 +1200)]
Merge pull request #14756 from eileenmcnaughton/wrangle
Extract field wrangling to determineReturnProperties
eileen [Tue, 9 Jul 2019 00:58:16 +0000 (12:58 +1200)]
Extract saveMapping Field
Basic extraction. Tangental to export mapping cleanup
colemanw [Tue, 9 Jul 2019 02:53:52 +0000 (22:53 -0400)]
Merge pull request #14754 from eileenmcnaughton/cust_field_fix
Fix obscure bug on updating custom fields (not necessarily hittable via UI)
colemanw [Tue, 9 Jul 2019 02:51:37 +0000 (22:51 -0400)]
Merge pull request #14755 from eileenmcnaughton/mapping_sane
[REF] Remove call to getMappingFields in favour of api call.
eileen [Mon, 8 Jul 2019 23:22:00 +0000 (11:22 +1200)]
Extract field wrangling to determineReturnProperties
This encases the wrangling of the field format to it's own function
colemanw [Mon, 8 Jul 2019 23:51:34 +0000 (19:51 -0400)]
Merge pull request #14742 from eileenmcnaughton/payment_out
[REF] un-extract createProportionalFinancialEntities
eileen [Mon, 8 Jul 2019 22:41:20 +0000 (10:41 +1200)]
Fix obscure bug on updating custom fields (not necessarily hittable via UI)
This fixes a bug which I think only applies to programatically created custom fields -basically if the field has an empty option_group_id
and then you update it to have one it does a check to see if the existing option_group_id is in use and does not handle the
fact the field is empty - leading to a mysql error.
eileen [Mon, 8 Jul 2019 23:08:18 +0000 (11:08 +1200)]
Remove call to getMappingFields in favour of api call.
The getMappingFields function is confusing - it turns out we just need an array of names
Eileen McNaughton [Mon, 8 Jul 2019 23:13:26 +0000 (11:13 +1200)]
Merge pull request #14752 from eileenmcnaughton/export
[REF] Move function onto the processor class
eileen [Mon, 8 Jul 2019 22:28:28 +0000 (10:28 +1200)]
NFC - reformat test class
eileen [Mon, 8 Jul 2019 21:35:32 +0000 (09:35 +1200)]
Move function onto the processor class
I went to extract the function that determines fields off to be a funciton on the processor class
but moving this first simplifies it
Eileen McNaughton [Mon, 8 Jul 2019 21:25:38 +0000 (09:25 +1200)]
Merge pull request #14514 from eileenmcnaughton/export_sc_jus_test
dev/core#1015 Unit test for fix regression on exporting soft credits
colemanw [Mon, 8 Jul 2019 16:14:59 +0000 (12:14 -0400)]
Merge pull request #14751 from colemanw/extractCompFields
[REF] Extract CRM_Core_BAO_Mapping::addComponentFields
Coleman Watts [Mon, 8 Jul 2019 13:48:43 +0000 (09:48 -0400)]
Extract CRM_Core_BAO_Mapping::addComponentFields
Yashodha Chaku [Mon, 8 Jul 2019 04:31:28 +0000 (10:01 +0530)]
Merge pull request #14744 from lcdservices/dev-report-17
dev/report#17 fix postal_code_suffix col
eileen [Sun, 7 Jul 2019 23:51:14 +0000 (11:51 +1200)]
Fix entoice on formatting credit card details
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
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
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
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
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
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
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
eileen [Sun, 7 Jul 2019 05:17:19 +0000 (17:17 +1200)]
dev/core#578 handle full group by on activity summary.
Dave J did a tonne of work fixing up this report & adding a unit test - this complete by just handling FGB very specifically
on one query
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)
Brian Shaughnessy [Sat, 6 Jul 2019 13:39:33 +0000 (09:39 -0400)]
dev/report#17 fix postal_code_suffix col
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
Coleman Watts [Fri, 5 Jul 2019 22:42:40 +0000 (18:42 -0400)]
Further cleanup & extraction in getMappingFieds
eileen [Fri, 5 Jul 2019 20:56:19 +0000 (08:56 +1200)]
[REF] un-extract createProportionalFinancialEntities
This is one of those places where, unituitively, I think undoing an extraction makes sense.
The code for allocating monies to financial items is shared with the change payment instrument functionality
but fundamentally these are different processes and sharing the code is making it less rather than more readable.
My goal is to pull back all the code that handles processing financials off a payment back into Payment.create
and to clean it up from there
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
Coleman Watts [Fri, 5 Jul 2019 13:53:32 +0000 (09:53 -0400)]
[REF] Simple function extraction for buildMappingForm
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
eileen [Wed, 3 Jul 2019 23:57:59 +0000 (11:57 +1200)]
[REF] simple extraction of getFieldAlterSQL
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
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
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
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…
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
eileen [Sat, 22 Jun 2019 22:58:20 +0000 (10:58 +1200)]
dev/core#1015 Unit test for (merged) regression on exporting soft credits
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
Eileen McNaughton [Thu, 4 Jul 2019 21:51:57 +0000 (09:51 +1200)]
Merge pull request #14697 from eileenmcnaughton/schema
[REF] Cleanup fixSchemaDifferencesFor()
eileen [Wed, 3 Jul 2019 23:33:51 +0000 (11:33 +1200)]
[REF] extract portion that creates the custom field record
eileen [Wed, 3 Jul 2019 23:27:22 +0000 (11:27 +1200)]
Clarify appending field to column_name
eileen [Mon, 1 Jul 2019 23:43:45 +0000 (11:43 +1200)]
[REF] further simplification of custom field create action
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)
Seamus Lee [Thu, 4 Jul 2019 16:42:27 +0000 (12:42 -0400)]
Merge pull request #14731 from eileenmcnaughton/leaky
Fix some test leakage
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
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
Pradeep Nayak [Thu, 4 Jul 2019 15:09:45 +0000 (16:09 +0100)]
Updated Circle-Interactive developers info
Matthew Wire (MJW Consulting) [Sun, 23 Jun 2019 12:05:24 +0000 (13:05 +0100)]
Simple cleanup of tabset code for contributionpages
Matthew Wire (MJW Consulting) [Sun, 23 Jun 2019 12:11:45 +0000 (13:11 +0100)]
Set title using standard form method and use for success message on contributionpage
Matthew Wire (MJW Consulting) [Sun, 23 Jun 2019 10:47:25 +0000 (11:47 +0100)]
Improve handling of 'Manage Event' title
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
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
eileen [Thu, 4 Jul 2019 08:41:56 +0000 (20:41 +1200)]
Fix refund payment not recording from additional payment form
eileen [Thu, 4 Jul 2019 08:30:23 +0000 (20:30 +1200)]
Revert participant portion of https://github.com/civicrm/civicrm-core/pull/14244
CiviCRM [Thu, 4 Jul 2019 07:23:15 +0000 (07:23 +0000)]
Set version to 5.17.alpha1
CiviCRM [Thu, 4 Jul 2019 07:19:06 +0000 (07:19 +0000)]
Set version to 5.16.beta1
Tim Otten [Thu, 4 Jul 2019 07:18:18 +0000 (00:18 -0700)]
Merge remote-tracking branch 'origin/5.15'
eileen [Thu, 4 Jul 2019 07:11:14 +0000 (19:11 +1200)]
dev/report#16 Unreleased regression - fee levels incorrectly show sold out
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
Tim Otten [Thu, 4 Jul 2019 06:07:19 +0000 (23:07 -0700)]
Set version to 5.15.0
Tim Otten [Thu, 4 Jul 2019 04:35:46 +0000 (21:35 -0700)]
Update 5.15.0.md
Alice Frumin [Mon, 17 Jun 2019 18:29:43 +0000 (14:29 -0400)]
cleanup