civicrm-core.git
6 years agoMerge pull request #12351 from JMAConsulting/dev-core-41
Eileen McNaughton [Thu, 21 Jun 2018 21:34:05 +0000 (09:34 +1200)]
Merge pull request #12351 from JMAConsulting/dev-core-41

dev/core#41: Search Builder: Not empty with date or integer custom fields gives a sql warning

6 years agoMerge pull request #12317 from mattwire/grant_form_task
Eileen McNaughton [Thu, 21 Jun 2018 21:28:25 +0000 (09:28 +1200)]
Merge pull request #12317 from mattwire/grant_form_task

dev/core#187 Fix typo in CRM_Grant_Form_Task that prevents retrieving session key from URL

6 years agodev/core#41: Search Builder: Not empty with date or integer custom fields gives a...
deb.monish [Thu, 21 Jun 2018 11:14:28 +0000 (16:44 +0530)]
dev/core#41: Search Builder: Not empty with date or integer custom fields gives a sql warning

6 years agoMerge pull request #12349 from jitendrapurohit/profilefix
Seamus Lee [Thu, 21 Jun 2018 09:27:01 +0000 (19:27 +1000)]
Merge pull request #12349 from jitendrapurohit/profilefix

Fix profile load on update multiple action

6 years agoFix profile load on update multiple action
Jitendra Purohit [Thu, 21 Jun 2018 06:29:59 +0000 (11:59 +0530)]
Fix profile load on update multiple action

6 years agoMerge pull request #12347 from totten/master-hook-reset
Eileen McNaughton [Thu, 21 Jun 2018 04:12:10 +0000 (16:12 +1200)]
Merge pull request #12347 from totten/master-hook-reset

(NFC) CiviUnitTestCase - Fix edge-case for mis-reported error

6 years agoCiviUnitTestCase - Fix edge-case for mis-reported error
Tim Otten [Thu, 21 Jun 2018 01:16:32 +0000 (18:16 -0700)]
CiviUnitTestCase - Fix edge-case for mis-reported error

Suppose you run a test and it encounters an error very early in process --
e.g.  while processing `setUp()`, before constructing the instance of
`$this->hookClass`.  It then proceeds to `tearDown()`. Later, the test
runner will give you a report on the rrors.

Before
------------

The `tearDown` fails because the missing instance of `$this->hookClass`
raises another error, and test-report shows this misleading reference.

After
------------

The `tearDown` proceeds, and the test-report shows the real cause
of the failure.

6 years agoMerge pull request #12331 from totten/master-default-prefix
Eileen McNaughton [Thu, 21 Jun 2018 00:43:25 +0000 (12:43 +1200)]
Merge pull request #12331 from totten/master-default-prefix

(dev/core#174) CRM_Utils_Cache - Always use a prefix. Standardize delimiter

6 years agoMerge pull request #12228 from MiyaNoctem/CRM-151-fix-actions-on-membership-recurring...
Eileen McNaughton [Wed, 20 Jun 2018 20:23:52 +0000 (08:23 +1200)]
Merge pull request #12228 from MiyaNoctem/CRM-151-fix-actions-on-membership-recurring-contribution-list

dev/core#151: Allow to Edit Recurring Contributions From Membership

6 years agoMerge pull request #12178 from jitendrapurohit/membership-4
Eileen McNaughton [Wed, 20 Jun 2018 19:48:11 +0000 (07:48 +1200)]
Merge pull request #12178 from jitendrapurohit/membership-4

dev/membership#4 - Admin Membership type is displayed on Public contr…

6 years agoCRM-151: Allow to Edit Recurring Contributions From Membership
Camilo Rodriguez [Tue, 29 May 2018 18:12:32 +0000 (18:12 +0000)]
CRM-151: Allow to Edit Recurring Contributions From Membership

A check for payment processor id was causing all recurring contributions shown
on membership details view to never show the 'Edit' action, as this value was
not availble. Fixed by removing check, as it is no longer required.

6 years agoMerge pull request #12341 from eileenmcnaughton/matt
Seamus Lee [Wed, 20 Jun 2018 03:35:10 +0000 (13:35 +1000)]
Merge pull request #12341 from eileenmcnaughton/matt

Remove unused instances of usedTable

6 years agoMerge pull request #12339 from colemanw/colors
Eileen McNaughton [Wed, 20 Jun 2018 02:12:19 +0000 (14:12 +1200)]
Merge pull request #12339 from colemanw/colors

Use html5 color input for contribution page widget

6 years agoRemove unused instances of useTable var
eileen [Wed, 20 Jun 2018 00:38:41 +0000 (12:38 +1200)]
Remove unused instances of useTable var

6 years agoMerge pull request #12316 from mattwire/core_task_code_cleanup
Eileen McNaughton [Wed, 20 Jun 2018 00:21:40 +0000 (12:21 +1200)]
Merge pull request #12316 from mattwire/core_task_code_cleanup

NFC Code cleanup to core task class

6 years agoMerge pull request #12336 from totten/master-status-check
Eileen McNaughton [Tue, 19 Jun 2018 22:27:13 +0000 (10:27 +1200)]
Merge pull request #12336 from totten/master-status-check

(dev/core#174) systemStatusCheckResult - Migrate from settings to cache

6 years agoCRM_Utils_Cache_SqlGroup - Don't encourage infinite recursion
Tim Otten [Fri, 30 Mar 2018 01:57:26 +0000 (18:57 -0700)]
CRM_Utils_Cache_SqlGroup - Don't encourage infinite recursion

The `deleteGroup(...$clearAll...)` option is heavy-handed and leads to
call-paths that hard to grok.

In the current design of CRM_Core_BAO_Cache (with multi-tier caching), one
does need to clear these things.  But let's not clear everything under the
sun...

6 years ago(dev/core#174) System::flushCache() - Continue existing behavior aftering fixing...
Tim Otten [Mon, 18 Jun 2018 21:58:10 +0000 (14:58 -0700)]
(dev/core#174) System::flushCache() - Continue existing behavior aftering fixing prefixes

The preceding update to `CRM_Utils_Cache` meant that `CRM_Utils_Cache::singleton()->flush()`
(aka `Civi::cache()->flush()`) would flush only the *default* cache. This revision
ensures that a general system-flush still hits the same caches.

However, we can now define *other* caches which *won't* be hit by system-flush.

6 years agoCRM_Cxn_CiviCxnHttp - Expose getCache() function
Tim Otten [Mon, 18 Jun 2018 21:57:56 +0000 (14:57 -0700)]
CRM_Cxn_CiviCxnHttp - Expose getCache() function

6 years ago(dev/core#174) CRM_Utils_Cache - Always use a prefix. Standardize delimiter.
Tim Otten [Fri, 30 Mar 2018 00:36:56 +0000 (17:36 -0700)]
(dev/core#174) CRM_Utils_Cache - Always use a prefix. Standardize delimiter.

"Prefixes" are a way to have one cache-server (e.g. one instance of redis or memcached)
which stores several different data-sets. `CRM_Utils_Cache` uses prefixes in a couple ways:

* (1) General site prefix (controlled via `civicrm.settings.php`)
    * (1a) If you have a single-site deployment, then the general prefix is blank.
    * (1b) If you have a multi-site deployment, then each site should use a different prefix (`mysite_1`, `mysite_2`, etc).
* (2) Within a given deployment, prefixes may indicate different logical data-sets.
    * (2a) `Civi::cache()` or `Civi::cache('default')` or `CRM_Utils_Cache::singleton()` are the `default` data-set.
    * (2b) `CRM_Utils_Cache::create()` can instantiate new, special-purpose
      data-sets. For example, this is used for `Civi::cache('js_strings')`.

This patch addresses two issues:

 * (Functional) Flushing the 'default' cache would likely flush all other caches
   because the 'default' cache didn't have a distinctive prefix. (This was observed Redis. Theoretically,
   the bug would apply to some-but-not-all cache backends.)
 * (Aesthetic) The full cache paths don't look consistent because they don't have a standard dlimiter.

To fully understand, it helps to see example cache keys produced in a few
configurations before and after the patch.

See also: https://lab.civicrm.org/dev/core/issues/174

Before
-----------------------------

| |Deployment Type|Logical Cache  |Combined Cache Prefix |Example Cache Item (`foobar`)|
|-|-|---------------|-------|-----------------|
|1a,2a|Single-site|`default`    |(empty-string)|`foobar`|
|1a,2b|Single-site| `js_strings` |`_js_strings`|`_js_stringsfoobar`|
|1b,2a|Multi-site |`default`    |`mysite_1_`|`mysite_1_foobar`|
|1b,2b|Multi-site |`js_strings` |`mysite_1_js_strings`|`mysite_1_js_stringsfoobar`|

* If you have a single-site deployment and try to flush `default`, you
  inadvertently flush `js_strings` because everything matches the empty-string prefix.
* If you have a multi-site deployment and try to flush `default`, you
  inadvertently flush `js_strings` because the prefix overlaps.
* The three parts of the key (deployment ID, logical cache, and cache item) are not necessarily separated.

After
-----------------------------

| |Deployment Type|Logical Cache  |Combined Cache Prefix |Example Cache Item (`foobar`)|
|-|-|---------------|-------|-----------------|
|1a,2a|Single-site|`default`    |`/default/`|`/default/foobar`|
|1a,2b|Single-site|`js_strings` |`/js_strings/`|`/js_strings/foobar`|
|1b,2a|Multi-site |`default`    |`mysite_1/default/`|`mysite_1/default/foobar`|
|1b,2b|Multi-site |`js_strings` |`mysite_1/js_strings/`|`mysite_1/js_strings/foobar`|

* If you have a single-site deployment and try to flush `default`, you
  only flush `default` because the prefixes are distinct.
* If you have a multi-site deployment and try to flush `default`, you
  only flush `default` because the prefixes are distinct.
* The three parts of the key (deployment ID, logical cache, and cache item) are always separated by `/`.

Comments
--------

When developing this patch, I found it helpful to:

* Enable Redis driver
* Open `redis-cli` and view the list of cache items with `keys *`.

6 years agoFix missing quote
Coleman Watts [Tue, 19 Jun 2018 15:59:18 +0000 (11:59 -0400)]
Fix missing quote

6 years agoUse html5 color input for contribution page widget
Coleman Watts [Tue, 19 Jun 2018 15:55:25 +0000 (11:55 -0400)]
Use html5 color input for contribution page widget

6 years agoMerge pull request #12330 from totten/master-flush-prefix
Eileen McNaughton [Tue, 19 Jun 2018 08:30:56 +0000 (20:30 +1200)]
Merge pull request #12330 from totten/master-flush-prefix

(dev/core#174) CRM_Utils_Cache_Redis::flush() - Respect prefixes

6 years agoMerge pull request #12338 from seamuslee001/bootstrap_mailing_2
Seamus Lee [Tue, 19 Jun 2018 03:33:25 +0000 (13:33 +1000)]
Merge pull request #12338 from seamuslee001/bootstrap_mailing_2

Ensure classes are the same across all workflow templates

6 years agoEnsure classes are the same across all workflow templates
Seamus Lee [Tue, 19 Jun 2018 01:10:06 +0000 (11:10 +1000)]
Ensure classes are the same across all workflow templates

6 years agoMerge pull request #12270 from eileenmcnaughton/systememail
Seamus Lee [Tue, 19 Jun 2018 01:06:57 +0000 (11:06 +1000)]
Merge pull request #12270 from eileenmcnaughton/systememail

Towards CRM-17753 - consolidate code location for do-not-reply@mydomain.com

6 years agoMerge pull request #12013 from seamuslee001/button_bootstrap_classes_mailing
Seamus Lee [Tue, 19 Jun 2018 00:16:45 +0000 (10:16 +1000)]
Merge pull request #12013 from seamuslee001/button_bootstrap_classes_mailing

Add in bootstrap button classes to CiviMail interface

6 years agosystemStatusCheckResult - Migrate from settings to cache
Tim Otten [Thu, 29 Mar 2018 20:36:52 +0000 (13:36 -0700)]
systemStatusCheckResult - Migrate from settings to cache

This is fundamentally an ephemeral value. Storing this in the settings
table prevents one from accessing the system with a read-only database.

6 years agoCivi\Core\Container - Make it easier to define more named caches
Tim Otten [Thu, 29 Mar 2018 23:37:41 +0000 (16:37 -0700)]
Civi\Core\Container - Make it easier to define more named caches

6 years agoAdd in new classe to buttons in CiviMail Interface to allow them to be themed up...
Seamus Lee [Sun, 22 Apr 2018 01:45:27 +0000 (11:45 +1000)]
Add in new classe to buttons in CiviMail Interface to allow them to be themed up independantly by themes

Further remove bootstrap class infavor of namespaced class

6 years agoMerge pull request #12335 from civicrm/5.3
Eileen McNaughton [Mon, 18 Jun 2018 21:46:56 +0000 (09:46 +1200)]
Merge pull request #12335 from civicrm/5.3

5.3 merge to master

6 years agoMerge pull request #12333 from pradpnayak/185
Eileen McNaughton [Mon, 18 Jun 2018 21:09:39 +0000 (09:09 +1200)]
Merge pull request #12333 from pradpnayak/185

dev/core/issues/189, fixed smarty error

6 years agoMerge pull request #12176 from vinuvarshith/dev-core-133-reply-to-check
Eileen McNaughton [Mon, 18 Jun 2018 20:12:05 +0000 (08:12 +1200)]
Merge pull request #12176 from vinuvarshith/dev-core-133-reply-to-check

dev/core/#133 Make Conditions Stricter When Checking If Reply-To Field Is Empty

6 years agodev/core/#133 Make Conditions Stricter When Checking If Reply-To Field Is Empty
varshith89 [Mon, 21 May 2018 09:08:06 +0000 (09:08 +0000)]
dev/core/#133 Make Conditions Stricter When Checking If Reply-To Field Is Empty

dev/core/#133 Retain existing behaviour on update and only be aggressive on adding new

6 years agofixed smarty error
Pradeep Nayak [Mon, 18 Jun 2018 19:07:50 +0000 (00:37 +0530)]
fixed smarty error

6 years ago(dev/core#174) CRM_Utils_Cache_Redis::flush() - Respect prefixes
Tim Otten [Fri, 30 Mar 2018 00:11:45 +0000 (17:11 -0700)]
(dev/core#174) CRM_Utils_Cache_Redis::flush() - Respect prefixes

When flushing caches for an instance of `CRM_Utils_Cache_Redis`, you should
only delete the items with the matching prefix.

For example, we have two cache services for `js_strings` and
`community_messages`.  These caches always use the same backend with
different naming/prefixes. The backend depends on the system configuration...
might be Redis, Memcache, or SqlGroup. Let's suppose the configuration is `Redis`.

To consider the before/after, it helps to have these two snippets for reference:

```
1: Civi::cache('js_strings')->flush();
2: Civi::cache('community_messages')->flush();
```

Before
------

Flushing `js_strings` has the side-effect of flushing everything
else in Redis, such as `community_messages`.

After
-----

Flushing `js_strings` only flushes `js_strings`.

Comments
--------

The example above focuses on two relatively obscure caches.  In the future,
as part of dev/core#174, it will become possible to store sessions in Redis.
And then it will be more important -- e.g.  if a user creates a custom-field,
you do want to flush one set of data (e.g. the contact-fields cache), but you
don't want to flush another (e.g. the user sessions).

The current commit fixes Redis.  Although it's outside the scope of this
commit, here's an assessment of other drivers:

* `APCcache`, `ArrayCache`, `NoCache` should be fine already.
* `SqlGroup` is sort of right, sort of not. Another patch will address that.
* `Memcache` and `Memcached` look like they have the same bug. I don't
  have these systems locally, so I haven't tried to patch.

6 years agoMerge pull request #12329 from eileenmcnaughton/master
Eileen McNaughton [Mon, 18 Jun 2018 00:28:07 +0000 (12:28 +1200)]
Merge pull request #12329 from eileenmcnaughton/master

[NFC] Stop passing no-longer-part-of-signature variable

6 years agoStop passing no-longer-part-of-signature variable
eileen [Sun, 17 Jun 2018 21:51:52 +0000 (09:51 +1200)]
Stop passing no-longer-part-of-signature variable

6 years agoMerge pull request #12313 from mattwire/CRM-21682_api_v3_membership_cleanup
Eileen McNaughton [Sun, 17 Jun 2018 21:34:14 +0000 (09:34 +1200)]
Merge pull request #12313 from mattwire/CRM-21682_api_v3_membership_cleanup

Cleanup of api_v3_membership_create towards #11556

6 years agoMerge pull request #12322 from totten/master-unused-modulepaths
Eileen McNaughton [Sun, 17 Jun 2018 21:23:38 +0000 (09:23 +1200)]
Merge pull request #12322 from totten/master-unused-modulepaths

(dev/core#174) Remove reference to unused `modulePaths`

6 years agoMerge pull request #12311 from totten/master-tmpnam
Eileen McNaughton [Sun, 17 Jun 2018 21:08:46 +0000 (09:08 +1200)]
Merge pull request #12311 from totten/master-tmpnam

(dev/core#183) Temporary tables should follow consistent naming convention

6 years agoMerge pull request #12160 from aydun/core_124_event_approval_fixes
Eileen McNaughton [Sun, 17 Jun 2018 19:44:04 +0000 (07:44 +1200)]
Merge pull request #12160 from aydun/core_124_event_approval_fixes

dev/core#124 Enhancements for events requiring approval

6 years agoMerge pull request #12323 from totten/master-flush-sig
Eileen McNaughton [Sun, 17 Jun 2018 05:43:10 +0000 (17:43 +1200)]
Merge pull request #12323 from totten/master-flush-sig

(NFC) dev/core#174 - CRM_Utils_System::flushCache - Remove dead code

6 years agoMerge pull request #12328 from civicrm/5.3
Eileen McNaughton [Sat, 16 Jun 2018 22:23:23 +0000 (10:23 +1200)]
Merge pull request #12328 from civicrm/5.3

5.3 to master

6 years agoMerge pull request #12326 from pradpnayak/185
Eileen McNaughton [Sat, 16 Jun 2018 22:22:36 +0000 (10:22 +1200)]
Merge pull request #12326 from pradpnayak/185

dev/core/issues/185 “Print selected rows” option missing in Event Participant listing dropdown actions

6 years agoMerge pull request #12324 from colemanw/ApiExporerFix
Tim Otten [Sat, 16 Jun 2018 18:51:13 +0000 (11:51 -0700)]
Merge pull request #12324 from colemanw/ApiExporerFix

Fix typo in api explorer sample code

6 years agoWrong key assigned to task action
Pradeep Nayak [Thu, 14 Jun 2018 21:55:27 +0000 (03:25 +0530)]
Wrong key assigned to task action

6 years agoFix typo in api explorer sample code
Coleman Watts [Sat, 16 Jun 2018 03:09:19 +0000 (23:09 -0400)]
Fix typo in api explorer sample code

6 years ago(NFC) dev/core#174 - CRM_Utils_System::flushCache - Remove dead code
Tim Otten [Sat, 16 Jun 2018 02:01:35 +0000 (19:01 -0700)]
(NFC) dev/core#174 - CRM_Utils_System::flushCache - Remove dead code

Before
------

* The signature of `CRM_Utils_System::flushCache` does not accept arguments.
* Random forms call it with arguments.

After
-----

* The signature of `CRM_Utils_System::flushCache` does not accept arguments.
* Random forms call it without arguments.

6 years agoCRM_Utils_SQL_TempTable - Improve docblock
Tim Otten [Sat, 16 Jun 2018 00:40:39 +0000 (17:40 -0700)]
CRM_Utils_SQL_TempTable - Improve docblock

6 years agoMerge pull request #12321 from totten/master-unused-setitem
Seamus Lee [Sat, 16 Jun 2018 00:10:14 +0000 (10:10 +1000)]
Merge pull request #12321 from totten/master-unused-setitem

(dev/core#174) api_v3_SettingTest - Remove dead code

6 years ago(dev/core#174) Remove reference to unused `modulePaths`
Tim Otten [Fri, 15 Jun 2018 23:30:41 +0000 (16:30 -0700)]
(dev/core#174) Remove reference to unused `modulePaths`

The cache-clear operation removes this setting, but the setting does not
really exist today.  (Simply grep universe for `modulePaths` to see this.)
If you dig up the JIRA reference, it talks about the internals of v4.2.
There's been a lot of change in how this stuff works since v4.2.

6 years agoMerge pull request #12314 from mattwire/CRM-21682_cleanup_recordAdditionalPayment
Eileen McNaughton [Fri, 15 Jun 2018 22:44:21 +0000 (10:44 +1200)]
Merge pull request #12314 from mattwire/CRM-21682_cleanup_recordAdditionalPayment

Cleanup recordAdditionalPayment towards #11556

6 years agoMerge pull request #12318 from mattwire/inherit_core_form_task
Eileen McNaughton [Fri, 15 Jun 2018 22:36:33 +0000 (10:36 +1200)]
Merge pull request #12318 from mattwire/inherit_core_form_task

Make all form tasks inherit from Core_Form_Task

6 years ago(dev/core#174) api_v3_SettingTest - Remove unused cache reference
Tim Otten [Fri, 15 Jun 2018 21:48:57 +0000 (14:48 -0700)]
(dev/core#174) api_v3_SettingTest - Remove unused cache reference

This unit is clearing out a non-existent cache item. To see that it is non-existent, I grepped (case-insensitive) for
the expressions:

* `CiviCRM setting Spec`
* `CiviCRM setting `
* `setting spec`

This feels like left-overs from 4.6. In 4.7, the setting cache was reworked. Note that
`SettingTest` does clear newer cache (`Civi::cache('settings')->flush();`).

6 years agoMerge pull request #12218 from mattwire/getcustomfieldid
Eileen McNaughton [Fri, 15 Jun 2018 19:01:20 +0000 (07:01 +1200)]
Merge pull request #12218 from mattwire/getcustomfieldid

dev/core#144 getCustomFieldID switch to API, add caching, add full string return option

6 years agoMerge pull request #11578 from jitendrapurohit/CRM-20697
Monish Deb [Fri, 15 Jun 2018 13:19:34 +0000 (18:49 +0530)]
Merge pull request #11578 from jitendrapurohit/CRM-20697

CRM-20697 - Online pay now anomalies (contribution transfer to new contact)

6 years agogetCustomFieldID switch to API, add caching, add full string return option.
Matthew Wire [Sun, 27 May 2018 16:10:02 +0000 (17:10 +0100)]
getCustomFieldID switch to API, add caching, add full string return option.

6 years agoMake all form task inherit from Core_Form_Task otherwise export can fail when accesse...
Matthew Wire [Fri, 1 Jun 2018 15:34:28 +0000 (16:34 +0100)]
Make all form task inherit from Core_Form_Task otherwise export can fail when accessed from advanced search because properties are inaccessible

6 years agoNFC code cleanup to core task class
Matthew Wire [Fri, 1 Jun 2018 10:53:16 +0000 (11:53 +0100)]
NFC code cleanup to core task class

6 years agoFix typo in CRM_Grant_Form_Task that prevents retrieving session key from URL
Matthew Wire [Fri, 1 Jun 2018 15:35:01 +0000 (16:35 +0100)]
Fix typo in CRM_Grant_Form_Task that prevents retrieving session key from URL

6 years agoNFC: Cleanup recordAdditionalPayment
Matthew Wire [Fri, 15 Jun 2018 07:57:53 +0000 (08:57 +0100)]
NFC: Cleanup recordAdditionalPayment

6 years agoCleanup of api_v3_membership_create towards #11556
Matthew Wire [Fri, 15 Jun 2018 07:42:42 +0000 (08:42 +0100)]
Cleanup of api_v3_membership_create towards #11556

6 years ago(dev/core#183) Change temp table naming for CRM/Contact/Form/Search/Custom/DateAdded.php
Tim Otten [Fri, 15 Jun 2018 04:31:50 +0000 (21:31 -0700)]
(dev/core#183) Change temp table naming for CRM/Contact/Form/Search/Custom/DateAdded.php

Re:`r-run` -- Verified that these lines are executed by the search form -- and
that the outcomes of a few basic searches are the same with the patch.

6 years ago(dev/core#183) Change temp table naming for CRM/Contact/Form/Search/Custom/ContribSYB...
Tim Otten [Fri, 15 Jun 2018 03:52:56 +0000 (20:52 -0700)]
(dev/core#183) Change temp table naming for CRM/Contact/Form/Search/Custom/ContribSYBNT.php

Re:`r-run` -- Verified that these lines are executed by the search form -- and
that the outcomes of a few basic searches are the same with the patch.

6 years ago(dev/core#183) Change temp table naming for CRM_Activity_BAO_Activity
Tim Otten [Fri, 15 Jun 2018 03:35:05 +0000 (20:35 -0700)]
(dev/core#183) Change temp table naming for CRM_Activity_BAO_Activity

Note: Verified that changes to this line are reflected as passes/failures in
CRM_Activity_BAO_ActivityTest.

6 years agoMerge pull request #11495 from yashodha/CRM-21637
Monish Deb [Fri, 15 Jun 2018 03:09:38 +0000 (08:39 +0530)]
Merge pull request #11495 from yashodha/CRM-21637

CRM-21637 - Search Criteria for Card Type ID and Card Number not resp…

6 years ago(dev/core#183) Change temp table naming for reports
Tim Otten [Fri, 15 Jun 2018 00:03:54 +0000 (17:03 -0700)]
(dev/core#183) Change temp table naming for reports

Testing notes - This is a pretty formulaic change.  The main concern is some kind of typo or bad table name causing a
hard-fail.  To control that risk, we just run the code in a facile way:

* Navigate to "Reports => Contributions => Lybunt"
* Add a "Filter" by "Group"

We do this procedure under a few circumstances:

* With the original code
* With a purposefully bad edit (provoking an expected error)
* With the new code

In this commit, we changed two lines, so we do the above once for each line.

6 years ago(dev/core#183) Change temp table naming for exports
Tim Otten [Thu, 14 Jun 2018 23:27:37 +0000 (16:27 -0700)]
(dev/core#183) Change temp table naming for exports

Testing notes - This is a pretty formulaic change.  The main concern is some kind of typo or bad table name causing a
hard-fail.  To control that risk, we just run the code in a facile way:

* Perform a contact search
* Pick some contacts
* Export them
* Run the export

We do this procedure under a few circumstances:

* With the original code
* With a purposefully bad edit (provoking an expected error)
* With the new code

6 years ago(dev/core#183) Change temp table naming for search-tasks
Tim Otten [Thu, 14 Jun 2018 23:18:16 +0000 (16:18 -0700)]
(dev/core#183) Change temp table naming for search-tasks

Testing notes - This is a pretty formulaic change.  The main concern is some kind of typo or bad table name causing a
hard-fail.  To control that risk, we just run the code in a facile way:

* Perform a contact search
* Pick some contacts
* Export them

We do this procedure under a few circumstances:

* With the original code
* With a purposefully bad edit (provoking an expected error)
* With the new code

6 years ago(dev/core#183) Deprecate CRM_Core_DAO::createTempTableName()
Tim Otten [Thu, 14 Jun 2018 23:48:33 +0000 (16:48 -0700)]
(dev/core#183) Deprecate CRM_Core_DAO::createTempTableName()

We're changing the naming formula, but some use-cases may rely on the old
naming formula.  Anything based on the old formula needs to be examined.

6 years ago(dev/core#183) Add more robust TempTable generator
Tim Otten [Thu, 14 Jun 2018 22:51:25 +0000 (15:51 -0700)]
(dev/core#183) Add more robust TempTable generator

6 years agoMerge pull request #11907 from mattwire/contribution_financialtype_fix
Monish Deb [Thu, 14 Jun 2018 17:41:15 +0000 (23:11 +0530)]
Merge pull request #11907 from mattwire/contribution_financialtype_fix

dev/core#88 Make sure financial_type_id is set when contribution is created

6 years agoMerge pull request #12303 from totten/master-redis-errmsg
colemanw [Thu, 14 Jun 2018 16:46:33 +0000 (12:46 -0400)]
Merge pull request #12303 from totten/master-redis-errmsg

(dev/core#178) Redis - Report error messages

6 years agoMerge pull request #11881 from yashodha/CRM-21854
Eileen McNaughton [Thu, 14 Jun 2018 07:54:27 +0000 (19:54 +1200)]
Merge pull request #11881 from yashodha/CRM-21854

CRM-21854 - Contribution start date and end dates are not respected

6 years ago(dev/core#178) Redis - Be a little more conservative about sharing error info
Tim Otten [Thu, 14 Jun 2018 07:53:59 +0000 (00:53 -0700)]
(dev/core#178) Redis - Be a little more conservative about sharing error info

6 years agoMerge pull request #12309 from jaapjansma/issue_180_deleting_custom_values
colemanw [Wed, 13 Jun 2018 20:16:10 +0000 (16:16 -0400)]
Merge pull request #12309 from jaapjansma/issue_180_deleting_custom_values

Fix for #180: passing the entity ID to the custom hook when deleting a custom value

6 years agoMerge pull request #11733 from eileenmcnaughton/sched
Eileen McNaughton [Wed, 13 Jun 2018 19:06:44 +0000 (07:06 +1200)]
Merge pull request #11733 from eileenmcnaughton/sched

Fix access to scheduled reminders for admins without event access

6 years agoFix for #180: passing the entity ID to the custom hook when deleting a custom value...
Jaap Jansma [Wed, 13 Jun 2018 09:19:11 +0000 (11:19 +0200)]
Fix for #180: passing the entity ID to the custom hook when deleting a custom value record.

6 years agoMerge pull request #12308 from eileenmcnaughton/getty
Eileen McNaughton [Wed, 13 Jun 2018 07:44:31 +0000 (19:44 +1200)]
Merge pull request #12308 from eileenmcnaughton/getty

Only treat a request as a get request (and hence use GET) if it starts with get

6 years agoMerge pull request #12304 from totten/master-redis-anon
colemanw [Wed, 13 Jun 2018 03:43:05 +0000 (23:43 -0400)]
Merge pull request #12304 from totten/master-redis-anon

(dev/core#179) Redis - Only send AUTH if there's a password

6 years agoOnly treat a request as a get request (and hence use GET) if it starts with get
eileen [Wed, 13 Jun 2018 02:07:21 +0000 (14:07 +1200)]
Only treat a request as a get request (and hence use GET) if it starts with get

Current code looks for the word 'get' anywhere in the action so the action 'forget' is also picked up.

Further down we explicitly look for 0 so we should here too.

6 years agoMerge pull request #11830 from mattwire/devcore24_case_api_contact_fix
colemanw [Wed, 13 Jun 2018 01:40:52 +0000 (21:40 -0400)]
Merge pull request #11830 from mattwire/devcore24_case_api_contact_fix

dev/core#24 Passing an array for contact_id/client_id to Case.Create API when updating an existing case causes case to be "reassigned"

6 years agoMerge pull request #11481 from jitendrapurohit/CRM-21622
Eileen McNaughton [Tue, 12 Jun 2018 22:42:13 +0000 (10:42 +1200)]
Merge pull request #11481 from jitendrapurohit/CRM-21622

CRM-21622: Allow multiple parents to be created from 'New Group' form.

6 years agoMerge pull request #12276 from eileenmcnaughton/memory_more
colemanw [Tue, 12 Jun 2018 12:44:41 +0000 (08:44 -0400)]
Merge pull request #12276 from eileenmcnaughton/memory_more

CRM-19798 fix memory leak on EntityTag.get & other calls in the DB (generic fix)

6 years agoMerge pull request #12302 from totten/master-redis-null
Eileen McNaughton [Tue, 12 Jun 2018 05:15:18 +0000 (17:15 +1200)]
Merge pull request #12302 from totten/master-redis-null

(dev/core#177) Redis::get() should return NULL for undefined cache keys

6 years ago This is a combination of 2 commits.
eileen [Wed, 28 Feb 2018 02:15:31 +0000 (15:15 +1300)]
 This is a combination of 2 commits.

Fix access to scheduled reminders form.

The current logic is that if the context is not event (empty) and the user does not
have administer CiviCRM they get bounced. if they pass that check they are then
passed into the check that should only be applied when the context IS event. This results
in a bounce for a user without any manage event access.

6 years agoRemove code duplication
eileen [Wed, 28 Feb 2018 02:11:29 +0000 (15:11 +1300)]
Remove code duplication

6 years agoDeclare as a class property & get rid of e-notice handling for it.
eileen [Wed, 28 Feb 2018 02:09:53 +0000 (15:09 +1300)]
Declare  as a class property & get rid of e-notice handling for it.

There is no functional change here but the code change looks a little large due to the removal of a pointless if

6 years ago(dev/core#179) Redis - Only send AUTH if there's a password
Tim Otten [Fri, 30 Mar 2018 00:10:39 +0000 (17:10 -0700)]
(dev/core#179) Redis - Only send AUTH if there's a password

6 years ago(dev/core#178) Redis - Report error messages
Tim Otten [Fri, 30 Mar 2018 00:11:29 +0000 (17:11 -0700)]
(dev/core#178) Redis - Report error messages

6 years ago(dev/core#177) Redis::get() should return NULL for undefined cache keys
Tim Otten [Fri, 30 Mar 2018 01:14:48 +0000 (18:14 -0700)]
(dev/core#177) Redis::get() should return NULL for undefined cache keys

The docs for  `CRM_Utils_Cache_Interface::get()` specify that the return value should be NULL
if the key does not exist.

However, `CRM_Utils_Cache_Redis::get()` was returning FALSE in that circumstance
(because `unserialize(FALSE)===FALSE`). This fixes it comply.

6 years agoMerge pull request #12301 from jitendrapurohit/core-175
Seamus Lee [Mon, 11 Jun 2018 21:24:23 +0000 (07:24 +1000)]
Merge pull request #12301 from jitendrapurohit/core-175

dev/core#175 - Smart group involving relationship type filter display…

6 years agoMerge pull request #12281 from eileenmcnaughton/cont_detail_report
Seamus Lee [Mon, 11 Jun 2018 21:12:21 +0000 (07:12 +1000)]
Merge pull request #12281 from eileenmcnaughton/cont_detail_report

Add testing to contribution detail report, covering dev/core/issues#170

6 years agoMerge pull request #11883 from jitendrapurohit/core-32
Eileen McNaughton [Mon, 11 Jun 2018 20:00:02 +0000 (08:00 +1200)]
Merge pull request #11883 from jitendrapurohit/core-32

core-32 - Add option to disable cancel button on a profile form

6 years agoMerge pull request #11736 from jitendrapurohit/CRM-21815
colemanw [Mon, 11 Jun 2018 16:21:16 +0000 (12:21 -0400)]
Merge pull request #11736 from jitendrapurohit/CRM-21815

CRM-21815 - re-opening a civicase - Case Coordinator (and other roles…

6 years agoMerge pull request #12298 from eileenmcnaughton/notice
colemanw [Mon, 11 Jun 2018 15:44:08 +0000 (11:44 -0400)]
Merge pull request #12298 from eileenmcnaughton/notice

Fix e-notice, remove legacy code pattern

6 years agoMerge pull request #12299 from eileenmcnaughton/cancel_recur
colemanw [Mon, 11 Jun 2018 13:54:16 +0000 (09:54 -0400)]
Merge pull request #12299 from eileenmcnaughton/cancel_recur

Remove unused code variable

6 years agoMove upgrade function to 5.4
Jitendra Purohit [Mon, 11 Jun 2018 11:31:49 +0000 (17:01 +0530)]
Move upgrade function to 5.4

6 years agocore-32 - Add option to disable cancel button on a profile form
Jitendra Purohit [Tue, 27 Mar 2018 06:11:56 +0000 (11:41 +0530)]
core-32 - Add option to disable cancel button on a profile form