Seamus Lee [Tue, 26 May 2020 00:24:17 +0000 (10:24 +1000)]
Merge pull request #17244 from totten/master-preboot
dev/translation#39 - Fix `core:install --lang`. Realign boot plugins.
Seamus Lee [Tue, 26 May 2020 00:23:07 +0000 (10:23 +1000)]
Merge pull request #17392 from eileenmcnaughton/ct
Remove unused 'reset' param, other NFC tidy up:
Seamus Lee [Tue, 26 May 2020 00:08:07 +0000 (10:08 +1000)]
Merge pull request #17364 from eileenmcnaughton/price_pseudo
Fix pricefield pseudoconstant.
Eileen McNaughton [Mon, 25 May 2020 23:55:04 +0000 (11:55 +1200)]
Merge pull request #17390 from mattwire/api3activitydatetimedefault
Set default using spec for activity_date_time
Eileen McNaughton [Mon, 25 May 2020 22:53:31 +0000 (10:53 +1200)]
Merge pull request #17386 from seamuslee001/dev_core_1775
dev/core#1775 Fix fee amount reversals when doing a change of financi…
eileen [Mon, 25 May 2020 22:48:12 +0000 (10:48 +1200)]
Remove unused 'reset' param, other NFC tidy up:
colemanw [Mon, 25 May 2020 22:40:14 +0000 (18:40 -0400)]
Merge pull request #17387 from eileenmcnaughton/ct
Use apiv4, cache infra for basicTypes
eileen [Mon, 25 May 2020 06:51:33 +0000 (18:51 +1200)]
Use apiv4, cache infra for basicTypes
I came across this as using an old weird pattern accessing the DAO. On looking it made most
sense just to switch to an apiv4 call. The caching was not convoluted but effectively
used an array cache, if loaded, and the array or Redis or sql cache if not. This
is the same as using the 'metadata' or 'contactTypes' cache so I switched to the latter.
I was inclined towards the former as I lean towards thinking this metadata all belongs in one - but there
is already another function in the same class going to the latter.
Matthew Wire [Mon, 25 May 2020 14:29:03 +0000 (15:29 +0100)]
Set default using spec for activity_date_time
Mathieu Lu [Mon, 25 May 2020 12:33:45 +0000 (08:33 -0400)]
Merge pull request #17228 from mattwire/fixmultilingualoptiongroups
Fix adding languages in multilingual
Matthew Wire [Mon, 25 May 2020 11:33:32 +0000 (12:33 +0100)]
Merge pull request #17308 from colemanw/BAOcleanup
Various BAO create/add cleanups to use writeRecord()
Matthew Wire [Mon, 25 May 2020 11:31:59 +0000 (12:31 +0100)]
Merge pull request #17348 from eileenmcnaughton/payex
Remove instantiation of transaction from payment express ipn class
Seamus Lee [Mon, 25 May 2020 05:32:51 +0000 (15:32 +1000)]
Merge pull request #17381 from eileenmcnaughton/dao
Remove null code
Seamus Lee [Mon, 25 May 2020 05:30:53 +0000 (15:30 +1000)]
Merge pull request #17384 from eileenmcnaughton/abort
Remove validation bypass
Eileen McNaughton [Mon, 25 May 2020 01:50:07 +0000 (13:50 +1200)]
Merge pull request #17383 from eileenmcnaughton/ids
[NFC] Remove some more of the old cvs blocks
Seamus Lee [Mon, 25 May 2020 01:47:13 +0000 (11:47 +1000)]
dev/core#1775 Fix fee amount reversals when doing a change of financial type
eileen [Mon, 25 May 2020 00:15:55 +0000 (12:15 +1200)]
Remove validation bypass
I was trying to understand why executeQuery allows validation to be bypassed. That seems
intuitively like something that should be handled by the calling function. This is one of the few
places that calls it - but I can't see a reason for it to by pass validation....
My best guess is that a parameter could legitimately be NULL - and the group properly is the
only one that seems to be a candidate
I also note the case for passing i18nRewrite seems dubious as the table has no localisation
eileen [Sun, 24 May 2020 22:52:53 +0000 (10:52 +1200)]
[NFC] Remove some more of the old cvs blocks
eileen [Sun, 24 May 2020 22:32:00 +0000 (10:32 +1200)]
Remove null code
Eileen McNaughton [Sun, 24 May 2020 22:25:35 +0000 (10:25 +1200)]
Merge pull request #17358 from seamuslee001/d8_prevnext_cache_test_fix
[TEST] Fix test failure on Drupal 8 E2E PrevNextTest by only includin…
Eileen McNaughton [Sun, 24 May 2020 22:15:26 +0000 (10:15 +1200)]
Merge pull request #16541 from bhahumanists/subtype-issue-991
#991 subtypes not filled in when editing a smart group
Eileen McNaughton [Sun, 24 May 2020 22:12:07 +0000 (10:12 +1200)]
Merge pull request #17379 from colemanw/del
Don't exclude deleted contacts from ACL cache when user has permission
Seamus Lee [Fri, 22 May 2020 20:54:50 +0000 (06:54 +1000)]
Merge pull request #17318 from agh1/aria-hidden-icon
Make all icons aria-hidden
Seamus Lee [Fri, 22 May 2020 20:52:13 +0000 (06:52 +1000)]
Merge pull request #17378 from agh1/cleanup-feed-urls
CiviEvent Dashboard and Manage Events: clean up disused url template vars
Coleman Watts [Fri, 22 May 2020 18:45:33 +0000 (14:45 -0400)]
ACL - Don't exclude deleted contacts from ACL cache when user has permission to see them
Test failures seem to be due to assumptions of the test.
Removed via Hume's guillotine
When the user has 'access deleted contacts' permission, deleted contacts
should not be excluded from the ACL cache.
Andrew Hunt [Fri, 22 May 2020 15:15:33 +0000 (11:15 -0400)]
CiviEvent Dashboard and Manage Events: clean up disused url template vars
Andrew Hunt [Wed, 13 May 2020 18:10:44 +0000 (14:10 -0400)]
Add aria-hidden to extant icons
Andrew Hunt [Wed, 13 May 2020 16:15:52 +0000 (12:15 -0400)]
Add aria-hidden to icon helpers
Seamus Lee [Fri, 22 May 2020 06:59:10 +0000 (16:59 +1000)]
Merge pull request #17282 from agh1/calendar-icons
Replace ical and office calendar image icons
Seamus Lee [Fri, 22 May 2020 06:40:24 +0000 (16:40 +1000)]
Merge pull request #17345 from eileenmcnaughton/ev_batch
Preliminary cleanup on form
eileen [Wed, 20 May 2020 02:58:52 +0000 (14:58 +1200)]
Fix pricefield pseudoconstant.
The price field turns out not to be returning pseudoconstant fields for 2 reasons
1) the label field is defined but the name field is not
2) any price fields with no domain are filtered out. In my single domain db this is
all of them.
I think we can safely understand NULL domain_id as 'not restricted by domain'. For some tables
(membershipType) it is a required field but for PriceField it is not.
I would be inclined to say it should be required less often. However, where it is required thenn
the OR IS NULL should never be true
Eileen McNaughton [Thu, 21 May 2020 21:13:25 +0000 (09:13 +1200)]
Merge pull request #17376 from artfulrobot/artfulrobot-public-status-messages
Public status messages should show correct class/icon like error
Matthew Wire [Thu, 21 May 2020 14:20:24 +0000 (15:20 +0100)]
Merge pull request #17373 from eileenmcnaughton/post_simp
[REF] Minor code simplification
Matthew Wire [Thu, 21 May 2020 14:18:29 +0000 (15:18 +0100)]
Merge pull request #17346 from eileenmcnaughton/trans2
[REF] Call completeOrder directly from event status update form
Rich Lott / Artful Robot [Thu, 21 May 2020 13:19:55 +0000 (14:19 +0100)]
Public status messages should show correct class/icon like error
colemanw [Thu, 21 May 2020 12:10:18 +0000 (08:10 -0400)]
Merge pull request #17371 from eileenmcnaughton/too
Undo variable variable.
Seamus Lee [Thu, 21 May 2020 04:38:49 +0000 (14:38 +1000)]
Merge pull request #17370 from eileenmcnaughton/to
Use non-deprecated method
Eileen McNaughton [Thu, 21 May 2020 04:26:23 +0000 (16:26 +1200)]
Merge pull request #17368 from colemanw/api4suffix
APIv4 - Improve pseudoconstant suffix support
eileen [Thu, 21 May 2020 03:52:48 +0000 (15:52 +1200)]
[REF] Minor code simiplification
On digging the only reason for the array is to prevent duplicates.
The function is passed do doesn't care how it's indexed so
just use php array to prevent duplicates. Reduce brain hurt
eileen [Thu, 21 May 2020 02:52:40 +0000 (14:52 +1200)]
Undo variable variable.
This removes the remainder of a weird variable-varible loop.
No actual change
eileen [Thu, 21 May 2020 02:25:02 +0000 (14:25 +1200)]
Use non-deprecated methd
Eileen McNaughton [Thu, 21 May 2020 00:55:23 +0000 (12:55 +1200)]
Merge pull request #17312 from totten/url3
Migrate CiviMail "extern" scripts to conventional routes
colemanw [Thu, 21 May 2020 00:44:19 +0000 (20:44 -0400)]
Merge pull request #17362 from colemanw/dev-core-1757-hide-toggle-menu-button
dev/core#1757 hide menu toggle when D7 toolbar is absent
Eileen McNaughton [Wed, 20 May 2020 19:29:37 +0000 (07:29 +1200)]
Merge pull request #17369 from civicrm/5.26
5.26 to master
colemanw [Wed, 20 May 2020 19:22:25 +0000 (15:22 -0400)]
Merge pull request #17352 from christianwach/lab-wp-49-civi5-26
Remove "page=CiviCRM" query string from WordPress front-end (5.26)
Coleman Watts [Wed, 20 May 2020 18:55:20 +0000 (14:55 -0400)]
APIv4 - Improve pseudoconstant suffix support
Suffixes like :color now work for get actions (but not create because they are not unique idenfitiers).
Test added for rich option lists in getfields
Matthew Wire [Wed, 20 May 2020 17:54:03 +0000 (18:54 +0100)]
Merge pull request #17365 from eileenmcnaughton/pdf
Revert "[REF] Code readability changes on activity tokens."
Mathieu Lu [Wed, 20 May 2020 12:38:13 +0000 (08:38 -0400)]
Merge pull request #17356 from eileenmcnaughton/lang
Fix setLanguage docblock, other nfc changes
Mathieu Lu [Wed, 20 May 2020 12:33:01 +0000 (08:33 -0400)]
Merge pull request #17317 from colemanw/escJs
Improve js escaping in smarty {ts}
eileen [Wed, 20 May 2020 03:14:03 +0000 (15:14 +1200)]
Revert "[REF] Code readability changes on activity tokens."
Per https://docs.civicrm.org/dev/en/latest/framework/token/#token-processor
The contactId is actually documented. While I've been removing those in various places in
favour of contactID or contact_id it seems Tim has been putting them in so
I think it's safer to revert this change at this stage
This reverts commit
2ebb452b239c28e7ed2c50da69d324a8d40a7e88.
Coleman Watts [Tue, 19 May 2020 17:47:35 +0000 (13:47 -0400)]
dev/core#1757 - CRM Menubar - add method to remove toggle button
Seamus Lee [Tue, 19 May 2020 21:25:43 +0000 (07:25 +1000)]
Merge pull request #17355 from twomice/1608_recurring_membership_fails_paypal
Fix for dev/core#1608: correct date format for trxn_date.
Eileen McNaughton [Tue, 19 May 2020 21:21:14 +0000 (09:21 +1200)]
Merge pull request #17332 from colemanw/api4Joins
APIv4 - Remove implicit multi joins & add explicit joins
René Olivo [Tue, 19 May 2020 02:32:34 +0000 (03:32 +0100)]
dev/core#1757 - CRM Menubar - hide toggle menu button for non admin users
Coleman Watts [Wed, 13 May 2020 16:49:01 +0000 (12:49 -0400)]
Improve js escaping in smarty {ts}
Christian Wach [Tue, 19 May 2020 10:39:22 +0000 (11:39 +0100)]
Remove "page=CiviCRM" query string from WordPress front-end
Eileen McNaughton [Tue, 19 May 2020 08:54:05 +0000 (20:54 +1200)]
Merge pull request #17357 from seamuslee001/contrib_page_report_column
[REF] [Reports] Ensure that all contribution pages including disabled ones are return…
Eileen McNaughton [Tue, 19 May 2020 08:51:27 +0000 (20:51 +1200)]
Merge pull request #17354 from seamuslee001/mysql8_master
[TEST] Update test to support for 8.0.19 change
Seamus Lee [Mon, 11 May 2020 03:11:49 +0000 (13:11 +1000)]
Update test to support for 8.0.19 change
Update test following Eileen comments
Seamus Lee [Tue, 19 May 2020 01:56:33 +0000 (11:56 +1000)]
[TEST] Fix test failure on Drupal 8 E2E PrevNextTest by only including contacts where there is a sort name
Seamus Lee [Tue, 19 May 2020 01:56:27 +0000 (11:56 +1000)]
Ensure that all contribution pages including disabled ones are returned when viewing the contribution detailed report
eileen [Tue, 19 May 2020 00:58:50 +0000 (12:58 +1200)]
Fix setLanguage docblock, other nfc changes
The IDE can pick up the chaining if we tell it the object is being returned
Allen Shaw [Mon, 18 May 2020 22:53:32 +0000 (17:53 -0500)]
Toward fix for dev/core#1608: correct date format for trxn_date.
Eileen McNaughton [Mon, 18 May 2020 22:09:05 +0000 (10:09 +1200)]
Merge pull request #17330 from colemanw/dao_field
[REF] Cleanup and extract string functions specific to entity names.
eileen [Mon, 18 May 2020 05:07:41 +0000 (17:07 +1200)]
Preliminary cleanup on form
Eileen McNaughton [Mon, 18 May 2020 19:51:08 +0000 (07:51 +1200)]
Merge pull request #17304 from colemanw/endCode
Switch docblock code to use markdown syntax.
colemanw [Mon, 18 May 2020 14:01:37 +0000 (10:01 -0400)]
Merge pull request #17349 from eileenmcnaughton/validate
[REF] Stop passing by reference.
Seamus Lee [Mon, 18 May 2020 08:31:42 +0000 (18:31 +1000)]
Merge pull request #17347 from eileenmcnaughton/status
Call completeOrder directly from contribute status update form
Seamus Lee [Mon, 18 May 2020 07:37:43 +0000 (17:37 +1000)]
Merge pull request #17343 from eileenmcnaughton/js_curr
Use status bounces, not fatal, in front end contribution form base class
eileen [Mon, 18 May 2020 06:56:39 +0000 (18:56 +1200)]
[REF] Stop passing by reference.
By checking in BAOContribution::loadRelatedObjects we can see it is not modified. The other 2 functions
only pass input to that function, so can also be non-variables
eileen [Mon, 18 May 2020 06:12:03 +0000 (18:12 +1200)]
Remove instantiation of transaction from payment express ipn class
This class is hopefully used, however, this change should be safe regardless as it just calls the same function
without needlessly instantiating the parent.
Note this processor is not enabled on install or recommended
eileen [Mon, 18 May 2020 06:07:42 +0000 (18:07 +1200)]
Call completeOrder directly from event status update form
We should really call completetransaction but that has been left for later unravelling with the focus here being
to clarify the purpose of the transaction. We don't need to pass a transaction around unless it has DB changes not
yet committed - which is not eally the case here. There is no reason to invoke BaseIPN but more unravelling required...
eileen [Mon, 18 May 2020 06:04:31 +0000 (18:04 +1200)]
Call completeOrder directly from contribute status update form
We should really call completetransaction but that has been left for later unravelling with the focus here being
to clarify the purpose of the transaction. We don't need to pass a transaction around unless it has DB changes not
yet committed - which is not eally the case here. There is no reason to invoke BaseIPN but more unravelling required...
Eileen McNaughton [Mon, 18 May 2020 05:01:22 +0000 (17:01 +1200)]
Merge pull request #17341 from seamuslee001/fatal_exception_status_bounce
dev/core#560 Replace deprecated CRM_Core_Error::fatal with either sta…
eileen [Mon, 18 May 2020 04:44:50 +0000 (16:44 +1200)]
Use status bounces, not fatal, in front end contribution form base class
Eileen McNaughton [Mon, 18 May 2020 02:45:40 +0000 (14:45 +1200)]
Merge pull request #17342 from eileenmcnaughton/event
Remove code that still seems unnecessary.
colemanw [Mon, 18 May 2020 00:46:18 +0000 (20:46 -0400)]
Merge pull request #17338 from demeritcowboy/test-from-to
[TEST] dev/core#1766 - Remove flakiness from testGetFromTo tests
eileen [Mon, 18 May 2020 00:24:48 +0000 (12:24 +1200)]
Remove code that still seems unnecessary.
Per the code comment we should not need to unset these fields as they should not be present if not required.
I guess the test for this is whether the fields are unset if we start off with a payment processor & then deselect
it in favour of pay later
Eileen McNaughton [Sun, 17 May 2020 23:58:00 +0000 (11:58 +1200)]
Merge pull request #17340 from demeritcowboy/not-yet-deprecated
[NFC] Add comment that deprecated code is actually still reachable
Seamus Lee [Sun, 17 May 2020 23:48:55 +0000 (09:48 +1000)]
dev/core#560 Replace depreacted CRM_Core_Error::fatal with either statusBounce or Exceptions as appropriate in CRM/Core folder update langauge as per demeritcowboy
Eileen McNaughton [Sun, 17 May 2020 23:01:25 +0000 (11:01 +1200)]
Merge pull request #17336 from seamuslee001/fatal_exception_status_bounce
dev/core#560 Replace some instances of CRM_Core_Error::fatal with an …
Seamus Lee [Sun, 17 May 2020 21:58:36 +0000 (07:58 +1000)]
Merge pull request #17319 from agh1/icon-links
Extend icon helper support, including for formLink
demeritcowboy [Sun, 17 May 2020 20:35:26 +0000 (16:35 -0400)]
code is still reachable
Matthew Wire [Sun, 17 May 2020 10:27:20 +0000 (11:27 +0100)]
Merge pull request #17297 from agh1/treeminus-gone
Removed last TreePlus.gif and TreeMinus.gif spots
demeritcowboy [Sat, 16 May 2020 15:11:38 +0000 (11:11 -0400)]
switch away from dataprovider for time-sensitive test
Seamus Lee [Sat, 16 May 2020 20:15:47 +0000 (06:15 +1000)]
Merge pull request #17337 from civicrm/5.26
5.26
Coleman Watts [Fri, 15 May 2020 16:01:42 +0000 (12:01 -0400)]
APIv4 - Basic support for joins in api4 Explorer
Tim Otten [Sat, 16 May 2020 02:54:25 +0000 (19:54 -0700)]
Merge pull request #17331 from colemanw/briefName
[REF] CRM_Core_DAO_AllCoreTables::getBriefName to accept BAO name
Seamus Lee [Sat, 16 May 2020 01:20:30 +0000 (11:20 +1000)]
Merge pull request #17335 from demeritcowboy/missing-semicolon
[REF] Missing semicolon on smtp settings page, code cleanup in file-on-case, add test
Seamus Lee [Sat, 16 May 2020 01:18:20 +0000 (11:18 +1000)]
Merge pull request #17334 from seamuslee001/fix_d8_install
[REF] Fix install on Drupal 8 using new setup code
Seamus Lee [Sat, 16 May 2020 00:12:53 +0000 (10:12 +1000)]
dev/core#560 Replace some instances of CRM_Core_Error::fatal with an exception or status bounce
Seamus Lee [Fri, 15 May 2020 23:31:02 +0000 (09:31 +1000)]
[REF] Fix install on Drupal 8 using new setup code
demeritcowboy [Fri, 15 May 2020 21:47:42 +0000 (17:47 -0400)]
missing semicolon, other cleanup, add test
Seamus Lee [Fri, 15 May 2020 22:42:13 +0000 (08:42 +1000)]
Merge pull request #17291 from mfb/tracking-default
Allow click-through and open tracking to be enabled/disabled by default
Coleman Watts [Thu, 7 May 2020 20:51:52 +0000 (16:51 -0400)]
APIv4 - Add explicit joins
Coleman Watts [Thu, 7 May 2020 14:23:55 +0000 (10:23 -0400)]
APIv4 - Remove unused vars & uncalled methods. YAGNI.
Coleman Watts [Thu, 7 May 2020 14:14:32 +0000 (10:14 -0400)]
APIv4 - Remove unused event
This event was defined but never invoked.
Coleman Watts [Thu, 7 May 2020 14:01:17 +0000 (10:01 -0400)]
APIv4 - Remove implicit multi-joins
These were actually run as a separate query and "joined" to the main results array in PHP.
Removing them to make way for supporting explicit multi-joins which will use SQL.
Coleman Watts [Wed, 6 May 2020 15:33:09 +0000 (11:33 -0400)]
APIv4 - Remove optionValue joins
OptionValue joins were deprecated in favor of pseudoconstant suffixes. This removes them.
Coleman Watts [Fri, 15 May 2020 15:04:04 +0000 (11:04 -0400)]
Fix CRM_Core_DAO_AllCoreTables::getBriefName to accept BAO name
This function was overly strict about not accepting BAO names, prompting end-users of the function
to do their own ad-hoc conversions before using it.