eileen [Sun, 27 Sep 2020 22:02:23 +0000 (11:02 +1300)]
Enotice fix
Seamus Lee [Sat, 26 Sep 2020 22:19:25 +0000 (08:19 +1000)]
Merge pull request #18593 from mattwire/joblog
Add an 'Execute Now' button to the job log
Matthew Wire [Sat, 26 Sep 2020 18:31:28 +0000 (19:31 +0100)]
Merge pull request #18604 from eileenmcnaughton/act_cont
[REF] Very minor cleanup
Matthew Wire [Fri, 17 Jan 2020 19:04:00 +0000 (19:04 +0000)]
Add an 'Execute Now' button to the job log
Eileen McNaughton [Sat, 26 Sep 2020 06:43:00 +0000 (18:43 +1200)]
Merge pull request #18605 from totten/master-pscss
dev/core#1393 - distmaker - Skip new file "vendor/bin/pscss"
colemanw [Sat, 26 Sep 2020 03:04:00 +0000 (23:04 -0400)]
Merge pull request #18586 from eileenmcnaughton/blok
[REF] Fix Event location to create it's locations directly rather than via shared methods
colemanw [Sat, 26 Sep 2020 02:32:19 +0000 (22:32 -0400)]
Merge pull request #18598 from eileenmcnaughton/prim
Fix bug in primary handling where TRUE rather than 1 used
Eileen McNaughton [Sat, 26 Sep 2020 02:25:37 +0000 (14:25 +1200)]
Merge pull request #18601 from eileenmcnaughton/apiv3activity
Test cleanup fix
Tim Otten [Sat, 26 Sep 2020 00:46:23 +0000 (17:46 -0700)]
dev/core#1393 - distmaker - Skip new file "vendor/bin/pscss"
This file was recently added by way of `scssphp`. We don't use it, and
trying to bundle the symlink into the tarball breaks some consumers.
* Before (last release): `vendor/bin/pscss` does not exist
* Before (current master): `vendor/bin/pscss` is created as symlink, copied to tarball
* After (this commit): `vendor/bin/pscss` is created on dev-builds but omitted from tarball
eileen [Wed, 23 Sep 2020 03:33:39 +0000 (15:33 +1200)]
Minor code cleanup
eileen [Wed, 23 Sep 2020 03:31:07 +0000 (15:31 +1200)]
Remove unused variable
eileen [Sat, 26 Sep 2020 00:23:33 +0000 (12:23 +1200)]
Test cleanup fix
Note it's better practice to clean up in the tear down but it looks like someone
tried & failed before so let's see....
Eileen McNaughton [Sat, 26 Sep 2020 00:17:16 +0000 (12:17 +1200)]
Merge pull request #18447 from mlutfy/inheritLocaleRegression
dev/translation#51 Fix inheritLocale regression
Seamus Lee [Fri, 25 Sep 2020 23:57:25 +0000 (09:57 +1000)]
Merge pull request #18567 from eileenmcnaughton/apiv3activity
dev/core#2057 Fix 'sleeper-bug' in apiv4, BAO activity.create
colemanw [Fri, 25 Sep 2020 22:59:54 +0000 (18:59 -0400)]
Merge pull request #18591 from eileenmcnaughton/search
[REF] Consolidate retrieval of searchFormValues
Eileen McNaughton [Fri, 25 Sep 2020 21:42:50 +0000 (09:42 +1200)]
Merge pull request #18597 from seamuslee001/core_exts_distmaker
[REF] Include recently added core extensions into distmaker
eileen [Fri, 25 Sep 2020 20:49:18 +0000 (08:49 +1200)]
Fix bug inn primary handling where TRUE rather than 1 used
colemanw [Fri, 25 Sep 2020 20:48:44 +0000 (16:48 -0400)]
Merge pull request #18571 from eileenmcnaughton/aipn
dev/financial#148 Duplicate validateData onto A.net
Seamus Lee [Fri, 25 Sep 2020 20:41:28 +0000 (06:41 +1000)]
[REF] Include recently added core extensions into distmaker
Eileen McNaughton [Fri, 25 Sep 2020 20:22:30 +0000 (08:22 +1200)]
Merge pull request #18594 from mattwire/repeattransactiondoubleexception
Remove double exception handling in repeattransaction
eileen [Fri, 25 Sep 2020 02:46:31 +0000 (14:46 +1200)]
[REF] Consolidate retrieval of searchFormValues
Currently there are 3 ways in which the values from the searchForm are retrieved
1) the search form sets a value 'searchFormName' on the form during search which can
be later retrieved
2) the search task has an action that reflects the form it came from
3) as per 2 but there is additional handling for the fact it might be
the contact search (knowable because the entity has been set to 'Contact'
I'm not 100% sure at this stage that the selected method (3) in this PR is the best -
but it seems 'as good' as 1 with less form-state stuff and this PR consolidates it
into 1 place so it is handled consistently
Eileen McNaughton [Fri, 25 Sep 2020 20:14:58 +0000 (08:14 +1200)]
Merge pull request #18587 from eileenmcnaughton/prevnext
dev/core#2029 E2E.Core.PrevNextTest.testDeleteByCacheKey More debug attempts
Eileen McNaughton [Fri, 25 Sep 2020 20:11:08 +0000 (08:11 +1200)]
Merge pull request #18595 from adixon/preferred-language-1883
pass in "required" value when building preferred_language form element
Alan Dixon [Fri, 25 Sep 2020 16:11:04 +0000 (12:11 -0400)]
pass in "required" value when building preferred_language form element
Matthew Wire [Fri, 25 Sep 2020 15:18:20 +0000 (16:18 +0100)]
Remove double exception handling in repeattransaction
eileen [Fri, 25 Sep 2020 08:45:25 +0000 (20:45 +1200)]
Fix MailingJob::writeToDB to handle it's own activityTarget wrangling
Per https://github.com/civicrm/civicrm-core/pull/18567 it makes sense for activity to have basic support for activity targets
but form more nuance the function can DIY
eileen [Wed, 23 Sep 2020 02:22:07 +0000 (14:22 +1200)]
Fix 'sleeper-bug' in api.
It turns out that the Activity.create BAO
- deletes the existing source contact for an activity if the param 'source_contact_id' is set
- deletes existing assignee contacts for an activity if the param 'assignee_contact_id' is empty
- deletes existing target contacts for an activity if the param 'target_contact_id' is empty
The v3 api provides some fairly convoluted wrapping to effectively convert is empty
to isset (via 2 params deleteActivityAssignment, deleteActivityTarget which would only
be anything other than true if the relevant value key is not set or we are operating from
the one place in universe that passes in this param (well actually it's true then too
https://github.com/eileenmcnaughton/civicrm_entity/commit/
bd779c19bbf82ca22260615b4f7667d02eee1200
)
The v4 api does no handling and we can expect that on update activity contact records are
likely being lost - ditto with direct BAO calls that were probably QAd at some point but
may have changed over time.
This changes the BAO to treat the assignee & target params the same way as source
- ie do nothing if not set, but empty means to delete them
Remove support for api param deleteActivityAssignment, deleteActivityTarget
I did a universe search & it was only called from one place which
I fixed
https://github.com/eileenmcnaughton/civicrm_entity/commit/
bd779c19bbf82ca22260615b4f7667d02eee1200
- it's never been a tested param so technically not supported
This is part of my effort to fix redundant queries in Activity.create regarding
activity contacts
eileen [Thu, 24 Sep 2020 23:01:09 +0000 (11:01 +1200)]
[REF] Fix Event location to create it's locations directly rather than via shared methods
This form does extra work in order to call CRM_Core_BAO_Block::create and CRM_Core_BAO_Address::create - but they have
extra handling that only exists for this code place. So, we are making 2 functions more complex in order to inter-relate them.
This simplifies the CRM_Event_Form_ManageEvent_Location and I will do follow on cleanup once merged. Note I previously
added tests to CRM_Event_Form_ManageEvent_LocationTest specifically to cover this (in a recent previous refactor
Eileen McNaughton [Fri, 25 Sep 2020 04:23:40 +0000 (16:23 +1200)]
Merge pull request #18588 from eileenmcnaughton/phone
dev/core#2046 Fix Phone:add to be a pseudonym for Phone.create
eileen [Thu, 24 Sep 2020 23:31:39 +0000 (11:31 +1200)]
dev/core#2046 Fix Phone:add to be a pseudonym for Phone.create
Per https://lab.civicrm.org/dev/core/-/issues/2046 we have discussed rationalising add vs create
In the case of phone making this change only affects one place - a place that currently has a
bug that relates specifically to the handling of is_primary & which is more solvable by
calling create with it's extra is_primary handling.
(the related bug is that the is_primary handling in Block::create is unreliable &
to mitigate that we are doing an additional 10 queries on every contact create - so
handling is_primary right in the first place helps address that)
colemanw [Fri, 25 Sep 2020 00:06:00 +0000 (20:06 -0400)]
Merge pull request #18510 from eileenmcnaughton/preprocess
[Ref] Extract getFormValues
eileen [Thu, 24 Sep 2020 23:17:47 +0000 (11:17 +1200)]
dev/core#2029 More debug attempts
Eileen McNaughton [Thu, 24 Sep 2020 22:40:33 +0000 (10:40 +1200)]
Merge pull request #18583 from colemanw/afformGui
Afform GUI: add bootstrap3
Seamus Lee [Thu, 24 Sep 2020 22:08:27 +0000 (08:08 +1000)]
Merge pull request #18397 from swastikpareek/issue-1987-fix-isFrontPage-function
dev/core#1987: Fix Drupal Base 'isFrontEndPage' function to consider Drupal public page for FE theme
Eileen McNaughton [Thu, 24 Sep 2020 21:40:29 +0000 (09:40 +1200)]
Merge pull request #18584 from demeritcowboy/schedmail-targets
[NFC/Test] Unit test for target contacts on Bulk Email when mailing in batches
Eileen McNaughton [Thu, 24 Sep 2020 20:51:24 +0000 (08:51 +1200)]
Merge pull request #18572 from colemanw/concat
APIv4 Search: Improve GROUP_CONCAT with :label prefix
Coleman Watts [Thu, 24 Sep 2020 18:27:45 +0000 (14:27 -0400)]
Afform: add bootstrap3 bundle
colemanw [Thu, 24 Sep 2020 19:28:49 +0000 (15:28 -0400)]
Merge pull request #18569 from eileenmcnaughton/synt
SyntaxConformance::testSqlOperators cleanup fix - ensure entities are deleted
colemanw [Thu, 24 Sep 2020 19:28:09 +0000 (15:28 -0400)]
Merge pull request #18538 from eileenmcnaughton/name
[REF] Remove checks as to whether entityShortName is in the component array
colemanw [Thu, 24 Sep 2020 18:58:58 +0000 (14:58 -0400)]
Merge pull request #18512 from eileenmcnaughton/export_classes
Separate export into separate classes to allow unravelling of component handling (Member)
Coleman Watts [Thu, 24 Sep 2020 18:27:20 +0000 (14:27 -0400)]
Afform: code cleanup & remove unused menu item
demeritcowboy [Thu, 24 Sep 2020 18:23:45 +0000 (14:23 -0400)]
test for target contacts on Bulk Email for mailing in batches
colemanw [Thu, 24 Sep 2020 15:21:55 +0000 (11:21 -0400)]
Merge pull request #18562 from eileenmcnaughton/locit
[Ref] Merge code - Move determination about location type to the getDAOForLocation…
colemanw [Thu, 24 Sep 2020 15:19:01 +0000 (11:19 -0400)]
Merge pull request #18578 from eileenmcnaughton/api42
Simplify CRM_Core_BAO_Location::createLocBlock by moving eventLocation specific handling back to the class
colemanw [Thu, 24 Sep 2020 14:58:09 +0000 (10:58 -0400)]
Merge pull request #18566 from eileenmcnaughton/act_contact
dev/core#2057 ActivityContact.create Remove select query that never or almost never finds something.
colemanw [Thu, 24 Sep 2020 14:43:46 +0000 (10:43 -0400)]
Merge pull request #18579 from colemanw/select2-bootstrap
Add select2-bootstrap to greenwich theme
Coleman Watts [Thu, 24 Sep 2020 14:31:09 +0000 (10:31 -0400)]
Search ext: Expose DISTINCT modifier
Coleman Watts [Wed, 23 Sep 2020 18:35:40 +0000 (14:35 -0400)]
APIv4 Search: Improve GROUP_CONCAT with :label prefix
This moves handing of pseudoconstant suffix replacement from the UI level to the API level,
which allows APIv4 to return GROUP_CONCAT results as an array (by default, if no separator specified).
It also improves post-query formatting in general, with finer-grained formating callbacks for sql functions.
Tim Otten [Thu, 24 Sep 2020 12:03:07 +0000 (05:03 -0700)]
ext/greenwich - Improve portability. Consolidate tasks.
1. Using 'php-eval' instead of 'shell' should make it safer to run on Windows.
2. The two steps are very closesly related. Putting them into the same 'task'
means that it's a bit easier to understand the 'watch' behavior.
Tim Otten [Thu, 24 Sep 2020 11:57:44 +0000 (04:57 -0700)]
composer.lock - Update compile plugin
Tim Otten [Thu, 24 Sep 2020 11:57:33 +0000 (04:57 -0700)]
composer.json - Update compile plugin
colemanw [Thu, 24 Sep 2020 12:01:50 +0000 (08:01 -0400)]
Merge pull request #18573 from eileenmcnaughton/nnfc
[NFC] Minor cleanup - use strict comparison where possible
colemanw [Thu, 24 Sep 2020 11:57:10 +0000 (07:57 -0400)]
ext/greenwich - Coerce `select2-bootstrap.css` to be handled as SCSS (#9)
Co-authored-by: Tim Otten <totten@civicrm.org>
Seamus Lee [Thu, 24 Sep 2020 11:02:01 +0000 (21:02 +1000)]
Merge pull request #18568 from mattwire/membershipdeprecated
Switch to non-deprecated/cached functions for membership pricesets
Seamus Lee [Thu, 24 Sep 2020 07:19:11 +0000 (17:19 +1000)]
Merge pull request #18580 from eileenmcnaughton/matt
Unit test for https://github.com/civicrm/civicrm-core/pull/18568
eileen [Thu, 24 Sep 2020 00:49:11 +0000 (12:49 +1200)]
Simplify CRM_Core_BAO_Location::createLocBlock by moving eventLocation specific handling back to the class
On grepping universe we find entity is only passed into
CRM_Core_BAO_Location::createLocBlock from this one place in the code - ergo we can
do the handling for it on that class & not in the shared code
Test cover added in preparation for this to CRM_Event_Form_ManageEvent_LocationTest
eileen [Thu, 24 Sep 2020 03:25:38 +0000 (15:25 +1200)]
Unit test for https://github.com/civicrm/civicrm-core/pull/18568
eileen [Wed, 23 Sep 2020 02:06:46 +0000 (14:06 +1200)]
dev/core#2057 Remove select query that never or almost never finds something.
When it comes to quey efficiency it's good to do an extra select if it saves an update/insert
but not if it never does. To test the theory that this 'never does' I put
removing this select through the entire test suite. No tests failed, meaning
it was unnecessary 100% of the time. Adding the catch ensures
it will still succeed if it the row exists but we have moved our query conservation
from doing an extraneous select in 99.9% of cases to an extraneous update in .1% of cases
https://lab.civicrm.org/dev/core/-/issues/2057
Eileen McNaughton [Thu, 24 Sep 2020 01:47:40 +0000 (13:47 +1200)]
Merge pull request #18576 from eileenmcnaughton/iso
dev/core#1921 Remove handling for Civi4.2 date bug from paypalProIPN
Coleman Watts [Thu, 24 Sep 2020 01:10:51 +0000 (21:10 -0400)]
Add select2-bootstrap to greenwich theme
eileen [Thu, 24 Sep 2020 00:36:52 +0000 (12:36 +1200)]
dev/core#2043 Remove pass by reference
Eileen McNaughton [Thu, 24 Sep 2020 00:40:32 +0000 (12:40 +1200)]
Merge pull request #18575 from eileenmcnaughton/api42
dev/core#2044 Make contact_id optional on v4 api for Address, phone, email
eileen [Wed, 23 Sep 2020 23:45:23 +0000 (11:45 +1200)]
dev/core#1921 Remove handling fo Civi4.2 from paypalProIPN
All the tests in
CRM_Core_Payment_PayPalProIPNTest pass through this line
It used to be necessary to reformat dates on a DAO before resaving
- up until 2014
eileen [Wed, 23 Sep 2020 23:23:20 +0000 (11:23 +1200)]
dev/core#2044 Make contact_id optional on v4 api for Address, phone, email
It's optional in the schema for events etc
eileen [Wed, 23 Sep 2020 22:38:51 +0000 (10:38 +1200)]
[NFC] Minor cleanup - use strict comparison where possible
colemanw [Wed, 23 Sep 2020 21:34:19 +0000 (17:34 -0400)]
Merge pull request #18550 from eileenmcnaughton/search
Add bootstrap bundle to search
eileen [Wed, 23 Sep 2020 20:25:46 +0000 (08:25 +1200)]
dev/financial#148 Duplicate validateData onto A.net
eileen [Wed, 23 Sep 2020 18:50:37 +0000 (06:50 +1200)]
Test cleanup fix
Eileen McNaughton [Wed, 23 Sep 2020 18:45:49 +0000 (06:45 +1200)]
Merge pull request #18528 from mattwire/inputpaymentprocessorid
Switch to passing payment_processor_id as input param to completeOrder
Matthew Wire [Sat, 19 Sep 2020 19:35:34 +0000 (20:35 +0100)]
Switch to passing payment_processor_id as input param to completeOrder
Matthew Wire [Mon, 7 Sep 2020 15:32:40 +0000 (16:32 +0100)]
Switch to non-deprecated/cached functions for membership pricesets
Seamus Lee [Wed, 23 Sep 2020 09:30:32 +0000 (19:30 +1000)]
Merge pull request #18515 from mattwire/membershipbaodeprecated
Switch membership BAO to use non-deprecated cached functions to get membershipType details
Seamus Lee [Wed, 23 Sep 2020 02:47:33 +0000 (12:47 +1000)]
Merge pull request #18558 from eileenmcnaughton/act_type
[REF] Remove wrangling on activityType param
Seamus Lee [Wed, 23 Sep 2020 02:29:25 +0000 (12:29 +1000)]
Merge pull request #18565 from eileenmcnaughton/cachekey
dev/core#2029 Extend test debug
colemanw [Wed, 23 Sep 2020 00:44:42 +0000 (20:44 -0400)]
Merge pull request #18535 from eileenmcnaughton/first
[REF] Remove unreachable lines
Eileen McNaughton [Wed, 23 Sep 2020 00:29:49 +0000 (12:29 +1200)]
Merge pull request #18504 from demeritcowboy/scrunched-cc
dev/core#2040 - Multiple email activity cc recipients get scrunched together in recorded activity details field
eileen [Tue, 22 Sep 2020 23:26:56 +0000 (11:26 +1200)]
Extend test debug
Maybe this will help us understand why the test is intermittant
Eileen McNaughton [Tue, 22 Sep 2020 22:29:40 +0000 (10:29 +1200)]
Merge pull request #18533 from seamuslee001/dev_core_2030
dev/core#2030 ensure that the Country selector is a Select 2 and ensu…
Eileen McNaughton [Tue, 22 Sep 2020 22:28:59 +0000 (10:28 +1200)]
Merge pull request #18561 from eileenmcnaughton/test_data
Minor test data fix up - ensure domain contact's email is primary
colemanw [Tue, 22 Sep 2020 22:23:38 +0000 (18:23 -0400)]
Merge pull request #18430 from eileenmcnaughton/open
dev/core#2017 Remove unused function OpenID::isAllowedToLogin
Seamus Lee [Tue, 22 Sep 2020 21:52:10 +0000 (07:52 +1000)]
Merge pull request #18560 from eileenmcnaughton/test
Minor test fix
eileen [Thu, 17 Sep 2020 04:34:10 +0000 (16:34 +1200)]
dev/core#2047 [REF] Move calculation of 'type' to copyDataToNewBlockDAO
eileen [Thu, 17 Sep 2020 03:49:12 +0000 (15:49 +1200)]
[Ref] Move determination about location type to the getDAOForLocationEntity function
This seems more legible than the metadata trick....
colemanw [Tue, 22 Sep 2020 20:05:41 +0000 (16:05 -0400)]
Merge pull request #18552 from eileenmcnaughton/ref
[REF] Move daoName generation so we don't need to pass the variable name
eileen [Tue, 22 Sep 2020 20:02:24 +0000 (08:02 +1200)]
Minor test data fix up - ensure domain contact's email is primary
eileen [Tue, 22 Sep 2020 19:40:33 +0000 (07:40 +1200)]
Minor test fix
Eileen McNaughton [Tue, 22 Sep 2020 19:22:11 +0000 (07:22 +1200)]
Merge pull request #18557 from eileenmcnaughton/dep2
[REF] Finally remove deprecated ids handling
eileen [Thu, 17 Sep 2020 03:34:30 +0000 (15:34 +1200)]
Determine name of DAO when needed rather than passing a variable around
Seamus Lee [Tue, 22 Sep 2020 05:45:37 +0000 (15:45 +1000)]
Merge pull request #18554 from civicrm/5.30
5.30
Eileen McNaughton [Tue, 22 Sep 2020 05:12:14 +0000 (17:12 +1200)]
Merge pull request #18553 from seamuslee001/master
[REF] Update composer compile plugin to latest version
eileen [Tue, 22 Sep 2020 04:59:48 +0000 (16:59 +1200)]
[REF] Remove wrangling on activityType param
There is only 1 remaining place that calls this function & does not specifiy activityType. This fixes
that place to pass in activityType and stops attempting to calculate activityType
based on in-function guess work
Eileen McNaughton [Tue, 22 Sep 2020 04:39:05 +0000 (16:39 +1200)]
Merge pull request #18551 from colemanw/dontLoadBootstrap
Remove obsolete load-bootstrap.js
eileen [Tue, 22 Sep 2020 04:16:07 +0000 (16:16 +1200)]
[REF] Finally remove deprecated ids handling
We've been pretty clear for a long time the only supported way to call crud functions is via the api.
We noisily deprecated ids about 9 months ago & it has been not-preferred for much longer
I only found one place in universe where ids IS passed in
https://github.com/lcdservices/biz.lcdservices.movecontrib/edit/master/CRM/LCD/MoveContrib/BAO/MoveContrib.php
Tim Otten [Tue, 22 Sep 2020 04:03:44 +0000 (21:03 -0700)]
Merge pull request #18471 from eileenmcnaughton/error
dev/core#2032 Add potential to vary query log files per process
Seamus Lee [Tue, 22 Sep 2020 02:35:51 +0000 (12:35 +1000)]
Merge pull request #18534 from eileenmcnaughton/5.30
Follow up fix on paypal redirect
Seamus Lee [Tue, 22 Sep 2020 02:01:44 +0000 (12:01 +1000)]
[REF] Update composer compile plugin to latest version
Seamus Lee [Tue, 22 Sep 2020 01:25:19 +0000 (11:25 +1000)]
Merge pull request #18541 from eileenmcnaughton/dep
Fix deprecation notice
Coleman Watts [Tue, 22 Sep 2020 01:16:22 +0000 (21:16 -0400)]
Remove obsolete load-bootstrap.js
eileen [Tue, 22 Sep 2020 01:04:34 +0000 (13:04 +1200)]
Add bootstrap bundle to search
Seamus Lee [Tue, 22 Sep 2020 00:46:08 +0000 (10:46 +1000)]
Merge pull request #18499 from eileenmcnaughton/merger
dev/core#2047 [REF] Minor code extraction