civicrm-core.git
3 years agoCaching fixes
Eileen McNaughton [Tue, 27 Jul 2021 22:57:30 +0000 (10:57 +1200)]
Caching fixes

3 years agodev/core#2650 Add support for names & labels for token pseudoconstants
Eileen McNaughton [Tue, 27 Jul 2021 07:40:13 +0000 (19:40 +1200)]
dev/core#2650 Add support for names & labels for token pseudoconstants

This is per https://lab.civicrm.org/dev/core/-/issues/2650 -
it
- ensures that the 4 existing functions that deal with tokens handle tokens for the
name and label for the (only) field that has had this treatment so far -contribution_status_id

Hence both CRM_Core_SelecetValues::contributionTokens and CRM_Contribute_Tokens->tokenNames
are tested to ensure they both return the same keys and labels for
{contribution.contribution_status_id}
{contribution.contribution_status_id:name}
{contribution.contribution_status_id:label}

And both rendering CRM_Contribute_Tokens via scheduled reminders and
using CRM_Contribute_BAO_Contribution::replaceContributionTokens are tested to ensure
they render them the same.

In the context of this PR no existing tokens are altered or removed & there is
only addition. However, the next step would be to remove the following token
from  {contribution.status}. Since there is no UI availability
of this token it is likely unused - but that step would entail an upgrade
script to remove it from the saved scheduled reminders.

With those parts in place it should be possible to reconcile the remaining tokens,
lock that parity in with tests and move on to exposing the contribution tokens
to message templates.

It would be nice to fully remove CRM_Contribute_BAO_Contribution::replaceContributionTokens
or make it a wrapper for  - however, I fear that might be quite
challenging due to the way it's used with group bys & some pretty intense hackery.

3 years agoMerge pull request #20964 from eileenmcnaughton/cast
Eileen McNaughton [Wed, 28 Jul 2021 00:58:49 +0000 (12:58 +1200)]
Merge pull request #20964 from eileenmcnaughton/cast

[REF] [Super trivial] -tighten up some casting

3 years ago[REF] [Super trivial] -tighten up some casting
Eileen McNaughton [Tue, 27 Jul 2021 23:11:21 +0000 (11:11 +1200)]
[REF] [Super trivial] -tighten up some casting

3 years agoMerge pull request #20308 from masetto/master
demeritcowboy [Tue, 27 Jul 2021 18:16:25 +0000 (14:16 -0400)]
Merge pull request #20308 from masetto/master

Fix unit translation for recurring contributions

3 years agofixed unit translation for recurring contributions
Samuele Masetto [Fri, 14 May 2021 17:33:34 +0000 (19:33 +0200)]
fixed unit translation for recurring contributions

small fix

 double "every" and `p` tag fixed, removed final `else`

3 years agoMerge pull request #20482 from MegaphoneJon/translation-69
demeritcowboy [Tue, 27 Jul 2021 13:36:03 +0000 (09:36 -0400)]
Merge pull request #20482 from MegaphoneJon/translation-69

fix missing 'on behalf of' and honoree labels in multilingual

3 years agoMerge pull request #20957 from demeritcowboy/smarty-tags
Eileen McNaughton [Tue, 27 Jul 2021 05:14:02 +0000 (17:14 +1200)]
Merge pull request #20957 from demeritcowboy/smarty-tags

Smarty notices for New Activity / New Case for tags for attachments

3 years agoMerge pull request #20955 from eileenmcnaughton/sql3
Seamus Lee [Tue, 27 Jul 2021 02:12:06 +0000 (12:12 +1000)]
Merge pull request #20955 from eileenmcnaughton/sql3

dev/core#2721 [Ref] simplify passed parameters

3 years agoMerge pull request #20956 from eileenmcnaughton/valid_fix
Seamus Lee [Tue, 27 Jul 2021 02:08:58 +0000 (12:08 +1000)]
Merge pull request #20956 from eileenmcnaughton/valid_fix

Fix test to use valid financials

3 years agoMerge pull request #20954 from eileenmcnaughton/sql2
Seamus Lee [Tue, 27 Jul 2021 02:08:28 +0000 (12:08 +1000)]
Merge pull request #20954 from eileenmcnaughton/sql2

dev/core#2721 [REF] Further divide savedSearchParam loading into the sql functions

3 years agoMerge pull request #20960 from civicrm/5.40
Seamus Lee [Tue, 27 Jul 2021 00:49:19 +0000 (10:49 +1000)]
Merge pull request #20960 from civicrm/5.40

5.40

3 years agoMerge pull request #20959 from alifrumin/rn5.40
Seamus Lee [Mon, 26 Jul 2021 22:10:23 +0000 (08:10 +1000)]
Merge pull request #20959 from alifrumin/rn5.40

[NFC] Release notes for 5.40

3 years agoMerge pull request #20685 from jaapjansma/dev_financials_6_contactsummary_3
Matthew Wire [Mon, 26 Jul 2021 21:01:43 +0000 (22:01 +0100)]
Merge pull request #20685 from jaapjansma/dev_financials_6_contactsummary_3

 dev/financial#6: Button for create/view template contribution on contact summary

3 years ago[NFC] 5.40: first stab at release notes
Alice Frumin [Thu, 15 Jul 2021 21:40:26 +0000 (17:40 -0400)]
[NFC] 5.40: first stab at release notes

3 years agoMerge pull request #20918 from eileenmcnaughton/cust2
demeritcowboy [Mon, 26 Jul 2021 19:16:23 +0000 (15:16 -0400)]
Merge pull request #20918 from eileenmcnaughton/cust2

dev/core#2709 Enable logging for custom data tables with non-standard names

3 years agosmarty notices
demeritcowboy [Mon, 26 Jul 2021 15:14:02 +0000 (11:14 -0400)]
smarty notices

3 years agodev/financial#6 exclude template contributions from the contact summary and add a...
Jaap Jansma [Wed, 30 Jun 2021 11:04:08 +0000 (13:04 +0200)]
dev/financial#6 exclude template contributions from the contact summary and add a button to view them to the recurring contributions tab

dev/financial#6 exclude template contributions from the contact summary and add a button to view them to the recurring contributions tab

dev/financial#6 exclude template contributions from the contact summary and add a button to view them to the recurring contributions tab

dev/financial#6 exclude template contributions from the contact summary and add a button to view them to the recurring contributions tab

3 years agoMerge pull request #20867 from eileenmcnaughton/display_name
Mathieu Lu [Mon, 26 Jul 2021 12:56:26 +0000 (08:56 -0400)]
Merge pull request #20867 from eileenmcnaughton/display_name

Swap {$displayName} smarty for {contact.display_name} token

3 years agoMerge pull request #20939 from eileenmcnaughton/num_term
Seamus Lee [Mon, 26 Jul 2021 10:19:47 +0000 (20:19 +1000)]
Merge pull request #20939 from eileenmcnaughton/num_term

[Test] Add cover for setting num_terms to 2

3 years agoAdditional opt ins & outs on validateFinancials
Eileen McNaughton [Mon, 26 Jul 2021 05:28:06 +0000 (17:28 +1200)]
Additional opt ins & outs on validateFinancials

Ideally we opt in the class & opt out specific tests as an interim. Moving
towards opt in everything & opt out specific tests

3 years ago[Test] Opt a couple more classes into validateFinancials
Eileen McNaughton [Mon, 26 Jul 2021 05:26:00 +0000 (17:26 +1200)]
[Test] Opt a couple more classes into validateFinancials

3 years agoFix test to use valid financials
Eileen McNaughton [Mon, 26 Jul 2021 05:07:34 +0000 (17:07 +1200)]
Fix test to use valid financials

3 years agoMerge pull request #20948 from demeritcowboy/smarty-repdet
Eileen McNaughton [Mon, 26 Jul 2021 04:48:06 +0000 (16:48 +1200)]
Merge pull request #20948 from demeritcowboy/smarty-repdet

Smarty notices on logging detail report

3 years ago[Ref] simplify passed parameters
Eileen McNaughton [Mon, 26 Jul 2021 04:30:19 +0000 (16:30 +1200)]
[Ref] simplify passed parameters

I think if we want to make this some sort of hook or listener we don't really
want to pass out 'add select' and 'exclude clause' when they are just group id
with a bit of string. It seems cleaner to specify the sql within the function

3 years ago[REF] Further divide savedSearchParam loading into the sql functions
Eileen McNaughton [Mon, 26 Jul 2021 02:10:46 +0000 (14:10 +1200)]
[REF] Further divide savedSearchParam loading into the sql functions

3 years ago[REF] start unravelling the way we retrieve the saved search
Eileen McNaughton [Mon, 26 Jul 2021 01:56:41 +0000 (13:56 +1200)]
[REF] start unravelling the way we retrieve the saved search

We have 3 types of saved searches
- search kit
- legacy core searches
- legacy custom searches

The only information these 3 need to load is the savedSearch details and
the group ID (to add in the add & exclude). The wrangling of the params should
happen in the getSql functions - which we can think about being in a listener once
they have standard inputs & outputs. However, to get to that point
we want to standardise those inputs & outputs. This removes
only point of randomness - ie savedSearch has a consistent value & the wrangling
of what is in it is pushed closer to the relevant functions

3 years agoMerge pull request #20923 from totten/master-phptype
colemanw [Sun, 25 Jul 2021 21:37:19 +0000 (17:37 -0400)]
Merge pull request #20923 from totten/master-phptype

CRM_Utils_Type::validatePhpType - Helper to validate PHP type expressions

3 years agoMerge pull request #20949 from demeritcowboy/smarty-reppager
Eileen McNaughton [Sun, 25 Jul 2021 21:11:01 +0000 (09:11 +1200)]
Merge pull request #20949 from demeritcowboy/smarty-reppager

Smarty warning about pager location on all CiviReports

3 years agosmarty warning - rows per page filter missing
demeritcowboy [Sun, 25 Jul 2021 17:02:36 +0000 (13:02 -0400)]
smarty warning - rows per page filter missing

3 years agosmarty warnings
demeritcowboy [Sun, 25 Jul 2021 16:39:11 +0000 (12:39 -0400)]
smarty warnings

3 years agoMerge pull request #20946 from mattwire/managedentitydeleteerror
Monish Deb [Sun, 25 Jul 2021 11:04:28 +0000 (16:34 +0530)]
Merge pull request #20946 from mattwire/managedentitydeleteerror

Fix error message when unable to delete ManagedEntity

3 years agoFix error message when unable to delete managedentity
Matthew Wire [Sat, 24 Jul 2021 22:19:54 +0000 (23:19 +0100)]
Fix error message when unable to delete managedentity

3 years agoMerge pull request #20857 from scardinius/translation-status-bounces
demeritcowboy [Sat, 24 Jul 2021 20:27:02 +0000 (16:27 -0400)]
Merge pull request #20857 from scardinius/translation-status-bounces

Add ts() function within CRM_Core_Error::statusBounce() method

3 years agoMerge pull request #20943 from eileenmcnaughton/cc
demeritcowboy [Sat, 24 Jul 2021 17:08:00 +0000 (13:08 -0400)]
Merge pull request #20943 from eileenmcnaughton/cc

[NFC] Remove exceptions from comments

3 years ago[NFC] Remove exceptions from comments
Eileen McNaughton [Sat, 24 Jul 2021 04:19:37 +0000 (16:19 +1200)]
[NFC] Remove exceptions from comments

callApiSuccess now uses fail rather than throwing an exception so
we don't need these here

3 years agoMerge pull request #20877 from kurund/patch-1
Eileen McNaughton [Sat, 24 Jul 2021 01:02:33 +0000 (13:02 +1200)]
Merge pull request #20877 from kurund/patch-1

add support for profile map view

3 years agoFix spelling
Eileen McNaughton [Sat, 24 Jul 2021 01:00:10 +0000 (13:00 +1200)]
Fix spelling

3 years agoUpdate CRM/Contribute/Page/ContributionRecur.php
Eileen McNaughton [Sat, 24 Jul 2021 00:57:08 +0000 (12:57 +1200)]
Update CRM/Contribute/Page/ContributionRecur.php

Co-authored-by: demeritcowboy <demeritcowboy@hotmail.com>
3 years ago[Test] Add cover for setting num_terms to 2
Eileen McNaughton [Fri, 23 Jul 2021 21:33:40 +0000 (09:33 +1200)]
[Test] Add cover for setting num_terms to 2

3 years agoMerge pull request #20882 from eileenmcnaughton/hh
Monish Deb [Fri, 23 Jul 2021 12:22:45 +0000 (17:52 +0530)]
Merge pull request #20882 from eileenmcnaughton/hh

Extract getCurrentMembership

3 years agoMerge pull request #20937 from civicrm/5.40
Eileen McNaughton [Fri, 23 Jul 2021 07:50:57 +0000 (19:50 +1200)]
Merge pull request #20937 from civicrm/5.40

5.40

3 years agoMerge pull request #20925 from demeritcowboy/install-linemode
Eileen McNaughton [Fri, 23 Jul 2021 04:11:13 +0000 (16:11 +1200)]
Merge pull request #20925 from demeritcowboy/install-linemode

dev/drupal#161 - (not just drupal) Can't install sample data using UI installer

3 years agoMerge pull request #20924 from JMAConsulting/cust_deadlock
Eileen McNaughton [Fri, 23 Jul 2021 01:47:40 +0000 (13:47 +1200)]
Merge pull request #20924 from JMAConsulting/cust_deadlock

Reduce deadlock while inserting custom data for Address

3 years agoSwap displayName smarty for {contact.display_name token}
Eileen McNaughton [Fri, 16 Jul 2021 02:27:29 +0000 (14:27 +1200)]
Swap displayName smarty for {contact.display_name token}

This swaps over the smartyToken for the token token on the template added on new installs, and adds a test.

Separately I will look at an upgrade script and other templates

To test make sure you enable invoicing & then generate an invoice from search results.
use the demo site due to aforementioned lack of upgrade and check the display name is still on
the left hand side

3 years agoMerge pull request #20932 from eileenmcnaughton/mgd
colemanw [Thu, 22 Jul 2021 22:29:05 +0000 (18:29 -0400)]
Merge pull request #20932 from eileenmcnaughton/mgd

Add v4 managed api entity

3 years agoMerge pull request #20835 from MegaphoneJon/core-2687
Eileen McNaughton [Thu, 22 Jul 2021 22:21:02 +0000 (10:21 +1200)]
Merge pull request #20835 from MegaphoneJon/core-2687

fixes core#2687: regression on group rebuild scheduled job

3 years agoMerge pull request #20934 from demeritcowboy/lybunt-param
Eileen McNaughton [Thu, 22 Jul 2021 21:53:05 +0000 (09:53 +1200)]
Merge pull request #20934 from demeritcowboy/lybunt-param

[NFC] Typo in parameter for lybunt test

3 years agoMerge pull request #20926 from mlutfy/fixInclusiveTaxTs
demeritcowboy [Thu, 22 Jul 2021 14:58:20 +0000 (10:58 -0400)]
Merge pull request #20926 from mlutfy/fixInclusiveTaxTs

Fix 'includes tax' translation for PriceSet Checkbox fields

3 years agoincorrect parameter
demeritcowboy [Thu, 22 Jul 2021 13:50:43 +0000 (09:50 -0400)]
incorrect parameter

3 years agoMerge pull request #20556 from ixiam/dev#2642
demeritcowboy [Thu, 22 Jul 2021 12:24:19 +0000 (08:24 -0400)]
Merge pull request #20556 from ixiam/dev#2642

Add filter by custom fields in Accounting Batch. https://lab.civicrm.…

3 years agoAdd filter by custom fields in Accounting Batch. https://lab.civicrm.org/dev/core...
Diego Muñio [Fri, 18 Jun 2021 14:37:11 +0000 (11:37 -0300)]
Add filter by custom fields in Accounting Batch. https://lab.civicrm.org/dev/core/-/issues/2642

3 years agoMerge pull request #20910 from colemanw/searchKitPickLists
Seamus Lee [Thu, 22 Jul 2021 09:14:44 +0000 (19:14 +1000)]
Merge pull request #20910 from colemanw/searchKitPickLists

[REF] SearchKit - Refactor pick-lists to use onCrmUiSelect directive

3 years agoAdd v4 managed api entity
Eileen McNaughton [Thu, 22 Jul 2021 02:08:59 +0000 (14:08 +1200)]
Add v4 managed api entity

Note that this is searchable since it seems useful to me to be able to search these - albeit
for more advanced users!

3 years agoMerge pull request #20930 from eileenmcnaughton/total
colemanw [Thu, 22 Jul 2021 01:26:33 +0000 (21:26 -0400)]
Merge pull request #20930 from eileenmcnaughton/total

Enable range search for money fields in search kit + afform

3 years agoMerge pull request #20931 from civicrm/5.40
Seamus Lee [Wed, 21 Jul 2021 22:32:51 +0000 (08:32 +1000)]
Merge pull request #20931 from civicrm/5.40

5.40

3 years agoEnable range search for money fields
Eileen McNaughton [Wed, 21 Jul 2021 21:15:46 +0000 (09:15 +1200)]
Enable range search for money fields

Allow total_amount to be exposed for searching by range

3 years agodev/core#2709 Enable logging for custom data tables with non-standard names
Eileen McNaughton [Wed, 21 Jul 2021 06:54:45 +0000 (18:54 +1200)]
dev/core#2709 Enable logging for custom data tables with non-standard names

3 years agoMerge pull request #20928 from demeritcowboy/20914-5.40
Eileen McNaughton [Wed, 21 Jul 2021 19:54:51 +0000 (07:54 +1200)]
Merge pull request #20928 from demeritcowboy/20914-5.40

dev/core#2699 - 5.40 version of Attempt regression fix

3 years agoFix for cust field
demeritcowboy [Wed, 21 Jul 2021 15:36:52 +0000 (11:36 -0400)]
Fix for cust field

3 years agoMerge pull request #20904 from mattwire/pcpcurrency
Mathieu Lu [Wed, 21 Jul 2021 17:27:16 +0000 (13:27 -0400)]
Merge pull request #20904 from mattwire/pcpcurrency

Display configured currency on PCPPage instead of default

3 years agoMerge pull request #20920 from eileenmcnaughton/cleanup2
colemanw [Wed, 21 Jul 2021 14:58:13 +0000 (10:58 -0400)]
Merge pull request #20920 from eileenmcnaughton/cleanup2

Add check to see if these indices are actually removed + call the function which should

3 years agoMerge pull request #20868 from eileenmcnaughton/load_acls
colemanw [Wed, 21 Jul 2021 14:19:06 +0000 (10:19 -0400)]
Merge pull request #20868 from eileenmcnaughton/load_acls

[REF] Extract the function to load from the acl table

3 years agoExtract getCurrentMembership
Eileen McNaughton [Fri, 16 Jul 2021 07:07:03 +0000 (19:07 +1200)]
Extract getCurrentMembership

Note I've moved the fixmembershipStatusBeforeRenew here - it is just compensating for the possibility of
the job not being run. On the Membership form we run it in preProcess but this feels like our first
chance in this form

3 years agoFix 'includes tax' translation for PriceSet Checkbox fields
Mathieu Lutfy [Wed, 21 Jul 2021 12:42:04 +0000 (08:42 -0400)]
Fix 'includes tax' translation for PriceSet Checkbox fields

3 years ago[REF] Extract the function to load from the acl table
Eileen McNaughton [Fri, 16 Jul 2021 03:17:10 +0000 (15:17 +1200)]
[REF] Extract the function to load from the acl table

3 years agolinemode not needed
demeritcowboy [Wed, 21 Jul 2021 11:58:12 +0000 (07:58 -0400)]
linemode not needed

3 years agoMerge pull request #20854 from eileenmcnaughton/response
Seamus Lee [Wed, 21 Jul 2021 11:25:26 +0000 (21:25 +1000)]
Merge pull request #20854 from eileenmcnaughton/response

Remove obsolete code

3 years agoReduce deadlock while inserting custom data from Address
Monish Deb [Wed, 21 Jul 2021 11:22:00 +0000 (16:52 +0530)]
Reduce deadlock while inserting custom data from Address

3 years agoMerge pull request #20911 from colemanw/select2css
Seamus Lee [Wed, 21 Jul 2021 11:14:35 +0000 (21:14 +1000)]
Merge pull request #20911 from colemanw/select2css

Greenwich - fix select2 font size

3 years agoCRM_Utils_Type::validatePhpType - Helper to validate PHP type expressions
Tim Otten [Wed, 21 Jul 2021 09:23:29 +0000 (02:23 -0700)]
CRM_Utils_Type::validatePhpType - Helper to validate PHP type expressions

3 years agoAdd check to see if these indices are actually removed
Eileen McNaughton [Wed, 21 Jul 2021 01:45:15 +0000 (13:45 +1200)]
Add check to see if these indices are actually removed

This check for indices seems to be much more reliable - the question is whether we can
run it against a range of dbs to confirm

3 years agoMerge pull request #20913 from colemanw/fixCapitalizationOfSqlFunction
Eileen McNaughton [Wed, 21 Jul 2021 04:09:52 +0000 (16:09 +1200)]
Merge pull request #20913 from colemanw/fixCapitalizationOfSqlFunction

Capitalization Fix

3 years agoCapitalization Fix
Coleman Watts [Wed, 21 Jul 2021 01:53:08 +0000 (21:53 -0400)]
Capitalization Fix

3 years agoGreenwich - fix select2 font size
Coleman Watts [Wed, 21 Jul 2021 01:14:22 +0000 (21:14 -0400)]
Greenwich - fix select2 font size

3 years agoSearchKit - Refactor pick-lists to use onCrmUiSelect directive
Coleman Watts [Wed, 21 Jul 2021 01:03:27 +0000 (21:03 -0400)]
SearchKit - Refactor pick-lists to use onCrmUiSelect directive

3 years agoMerge pull request #20908 from colemanw/fixApiCalculatedBridgeFields
Eileen McNaughton [Tue, 20 Jul 2021 23:34:05 +0000 (11:34 +1200)]
Merge pull request #20908 from colemanw/fixApiCalculatedBridgeFields

APIv4 - Fix calculated fields in bridge entities

3 years agoAPIv4 - Fix calculated fields in bridge entities
Coleman Watts [Tue, 20 Jul 2021 16:24:20 +0000 (12:24 -0400)]
APIv4 - Fix calculated fields in bridge entities

Fixes a crash-inducing bug in the use of calculated fields on a bridge entity,
such as RelationshipCache.is_current.

3 years agoMerge pull request #20886 from colemanw/searchKitRelationshipLinks
colemanw [Tue, 20 Jul 2021 14:04:42 +0000 (10:04 -0400)]
Merge pull request #20886 from colemanw/searchKitRelationshipLinks

SearchKit - Add links to view/edit/delete relationships

3 years agoMerge pull request #20866 from totten/master-pathmove
Seamus Lee [Tue, 20 Jul 2021 08:16:32 +0000 (18:16 +1000)]
Merge pull request #20866 from totten/master-pathmove

CRM_Utils_Array::pathMove - Add helper to move an item within array tree

3 years agoMerge pull request #20906 from eileenmcnaughton/api4
Seamus Lee [Tue, 20 Jul 2021 02:50:20 +0000 (12:50 +1000)]
Merge pull request #20906 from eileenmcnaughton/api4

Add test & fix for failing OR clause in apv4

3 years agoMerge pull request #20900 from colemanw/angularTraits
Seamus Lee [Tue, 20 Jul 2021 01:26:31 +0000 (11:26 +1000)]
Merge pull request #20900 from colemanw/angularTraits

[REF] Refactor SearchKit displays to inherit traits from a common base

3 years agoAdd test for failing OR clause
Eileen McNaughton [Tue, 20 Jul 2021 01:14:30 +0000 (13:14 +1200)]
Add test for failing OR clause

This fails because when the field is being concatenated like
`a`.`first_name`='x' OR`a`.`last_name`='x'

The lack of a space between OR and `a` is fugly but it
is parsed by mysql. However, when the value requires utf8mb4
to be supported to do the comparison it returns '0=1' if the
database does not support utf8mb (or it thinks it doesn't per

0 = 1 OR0 = 1

3 years agoMerge pull request #20870 from totten/master-tokensmarty
Seamus Lee [Mon, 19 Jul 2021 23:43:28 +0000 (09:43 +1000)]
Merge pull request #20870 from totten/master-tokensmarty

(REF) Extract TokenSmarty::render() from MessageTemplate::renderMessageTemplate()

3 years agoMerge pull request #20895 from demeritcowboy/test-upper
Seamus Lee [Mon, 19 Jul 2021 23:43:13 +0000 (09:43 +1000)]
Merge pull request #20895 from demeritcowboy/test-upper

[NFC/Unit test] - Test for #20892 - New smarty plugin crmUpper

3 years agoMerge pull request #20887 from demeritcowboy/lazytests
Seamus Lee [Mon, 19 Jul 2021 22:51:23 +0000 (08:51 +1000)]
Merge pull request #20887 from demeritcowboy/lazytests

[NFC/Unit test] ReportTemplateTest - fix tests that assume setup from a separate test

3 years agoDisplay configured currency on PCPPage instead of default
Matthew Wire [Mon, 19 Jul 2021 22:36:11 +0000 (23:36 +0100)]
Display configured currency on PCPPage instead of default

3 years agoMerge pull request #20892 from seamuslee001/utf8mb4_smarty_upper
demeritcowboy [Mon, 19 Jul 2021 21:35:30 +0000 (17:35 -0400)]
Merge pull request #20892 from seamuslee001/utf8mb4_smarty_upper

[REF] Add in smarty modifier to replcae the upper smarty modifier to …

3 years agoMerge pull request #20902 from colemanw/testNoNewOptionGroups
demeritcowboy [Mon, 19 Jul 2021 21:31:55 +0000 (17:31 -0400)]
Merge pull request #20902 from colemanw/testNoNewOptionGroups

APIv4 - Add test to ensure superfluous option groups are not created

3 years agoMerge pull request #20901 from demeritcowboy/fix-api4test
colemanw [Mon, 19 Jul 2021 19:56:39 +0000 (15:56 -0400)]
Merge pull request #20901 from demeritcowboy/fix-api4test

[NFC/Unit test] dev/core#2699 - Fix intermittent api4 test (part 1)

3 years agoAPIv4 - Add test to ensure superfluous option groups are not created
Coleman Watts [Mon, 19 Jul 2021 17:47:45 +0000 (13:47 -0400)]
APIv4 - Add test to ensure superfluous option groups are not created

3 years agofix intermittent api4 test
demeritcowboy [Mon, 19 Jul 2021 16:37:50 +0000 (12:37 -0400)]
fix intermittent api4 test

3 years agoRefactor SearchKit displays to inherit traits from a common base
Coleman Watts [Mon, 19 Jul 2021 03:58:21 +0000 (23:58 -0400)]
Refactor SearchKit displays to inherit traits from a common base

This refactors searchDisplayUtils to searchDisplayBaseTrait service,
which acts like a PHP trait, controllers use it via angular.extend().

3 years agoMerge pull request #20899 from mattwire/recaptchanotice
Matthew Wire [Mon, 19 Jul 2021 14:29:34 +0000 (15:29 +0100)]
Merge pull request #20899 from mattwire/recaptchanotice

Fix PHP notice in recaptcha lib

3 years agoFix PHP notice in recaptcha
Matthew Wire [Mon, 19 Jul 2021 14:28:24 +0000 (15:28 +0100)]
Fix PHP notice in recaptcha

3 years agoMerge pull request #20897 from yashodha/typo-fix
demeritcowboy [Mon, 19 Jul 2021 13:58:16 +0000 (09:58 -0400)]
Merge pull request #20897 from yashodha/typo-fix

some typo fixes

3 years agoMerge pull request #20875 from totten/master-field-spec
colemanw [Mon, 19 Jul 2021 13:24:33 +0000 (09:24 -0400)]
Merge pull request #20875 from totten/master-field-spec

(REF) APIv4 FieldSpec - Extract various traits (Civi\Schema\Traits\*)

3 years agoMerge pull request #20601 from kartik1000/pcpshortcode
Matthew Wire [Mon, 19 Jul 2021 13:06:59 +0000 (14:06 +0100)]
Merge pull request #20601 from kartik1000/pcpshortcode

Added setup pcp page wordpress shortcode

3 years agosome typo fixes
yashodha [Mon, 19 Jul 2021 11:28:32 +0000 (16:58 +0530)]
some typo fixes

3 years agoMerge pull request #20869 from eileenmcnaughton/acl3
Seamus Lee [Mon, 19 Jul 2021 09:23:19 +0000 (19:23 +1000)]
Merge pull request #20869 from eileenmcnaughton/acl3

[REF] Fix functions to be protected