civicrm-core.git
6 years agodev/core#367: Query optimization for A-Z pager by adding indices to temp table.
Allen Shaw [Tue, 28 Aug 2018 16:55:43 +0000 (11:55 -0500)]
dev/core#367: Query optimization for A-Z pager by adding indices to temp table.

6 years agoMerge pull request #12701 from magnolia61/Scheduled_reminders-default-sort
Eileen McNaughton [Tue, 28 Aug 2018 10:59:11 +0000 (22:59 +1200)]
Merge pull request #12701 from magnolia61/Scheduled_reminders-default-sort

dev/core#349 correct default sort for scheduled reminders list

6 years agoMerge pull request #12667 from mlutfy/translation-14
Eileen McNaughton [Tue, 28 Aug 2018 09:29:45 +0000 (21:29 +1200)]
Merge pull request #12667 from mlutfy/translation-14

dev/translation#14 Fix InnoDB Advanced Logging

6 years agoMerge pull request #12704 from colemanw/recent
colemanw [Mon, 27 Aug 2018 21:37:32 +0000 (17:37 -0400)]
Merge pull request #12704 from colemanw/recent

Fix recent item deduping & call hooks

6 years agoMerge pull request #12662 from eileenmcnaughton/net_amount
Eileen McNaughton [Mon, 27 Aug 2018 06:31:41 +0000 (18:31 +1200)]
Merge pull request #12662 from eileenmcnaughton/net_amount

Remove net_amount from the Back office contribution form.

6 years agoMerge pull request #12678 from kewljuice/patch-1
Eileen McNaughton [Mon, 27 Aug 2018 06:06:54 +0000 (18:06 +1200)]
Merge pull request #12678 from kewljuice/patch-1

Fix Undefined index: params in CRM_Event_BAO_Event::buildCustomProfile()

6 years agoMerge pull request #12700 from vinuvarshith/BASW-240-membership-network-error-fix
Eileen McNaughton [Mon, 27 Aug 2018 05:46:03 +0000 (17:46 +1200)]
Merge pull request #12700 from vinuvarshith/BASW-240-membership-network-error-fix

BASW-240: 'Network Error' when creating membership type from contact membership tab

6 years agoMerge pull request #12599 from lcdservices/dev-mail-21
Eileen McNaughton [Mon, 27 Aug 2018 05:31:13 +0000 (17:31 +1200)]
Merge pull request #12599 from lcdservices/dev-mail-21

dev/mail#21 trim test emails

6 years agoMerge pull request #12679 from mlutfy/core-334
Eileen McNaughton [Mon, 27 Aug 2018 05:27:27 +0000 (17:27 +1200)]
Merge pull request #12679 from mlutfy/core-334

dev/core#334 Fix Contribution Page with Checksum and multiple Payment Processors

6 years agoMerge pull request #12699 from chriscant/event-tell-a-friend-title
Eileen McNaughton [Mon, 27 Aug 2018 03:28:50 +0000 (15:28 +1200)]
Merge pull request #12699 from chriscant/event-tell-a-friend-title

Get title for event tell a friend mail

6 years agoMerge pull request #12703 from yashodha/CRM-21677
Eileen McNaughton [Mon, 27 Aug 2018 03:27:14 +0000 (15:27 +1200)]
Merge pull request #12703 from yashodha/CRM-21677

CRM-21677 - report clean up

6 years agoMerge pull request #12716 from calbasi/patch-1
colemanw [Mon, 27 Aug 2018 00:53:39 +0000 (20:53 -0400)]
Merge pull request #12716 from calbasi/patch-1

Wrap long labels onto multiple lines to prevent text being cut off

6 years agoMerge pull request #12613 from JMAConsulting/core-issue-297
colemanw [Sun, 26 Aug 2018 13:51:06 +0000 (09:51 -0400)]
Merge pull request #12613 from JMAConsulting/core-issue-297

dev/core#297 : fix broken permission 'access my cases and activities'

6 years agoWrap long labels onto multiple lines to prevent text being cut off
calbasi [Wed, 22 Aug 2018 19:59:02 +0000 (21:59 +0200)]
Wrap long labels onto multiple lines to prevent text being cut off

6 years agoMerge pull request #12726 from kainuk/issue-361
colemanw [Sat, 25 Aug 2018 00:37:02 +0000 (20:37 -0400)]
Merge pull request #12726 from kainuk/issue-361

Corrected tag_id parameter description to refer cases

6 years agoMerge pull request #12727 from pradpnayak/Pseudoconstant
colemanw [Fri, 24 Aug 2018 23:58:01 +0000 (19:58 -0400)]
Merge pull request #12727 from pradpnayak/Pseudoconstant

Added Pseudoconstant for phone and website type

6 years agoMerge pull request #12725 from civicrm/5.5
Seamus Lee [Fri, 24 Aug 2018 20:42:13 +0000 (06:42 +1000)]
Merge pull request #12725 from civicrm/5.5

5.5

6 years agoAdded Pseudoconstant for phone and website type
Pradeep Nayak [Fri, 24 Aug 2018 12:03:01 +0000 (13:03 +0100)]
Added Pseudoconstant for phone and website type

6 years agoCorrected tag_id parameter description to refer cases instead of activities (See...
Klaas Eikelboom [Fri, 24 Aug 2018 08:29:19 +0000 (10:29 +0200)]
Corrected tag_id parameter description to refer cases instead of activities (See https://lab.civicrm.org/dev/core/issues/361)

6 years agoMerge pull request #12720 from selwyntcy/patch-1
Monish Deb [Fri, 24 Aug 2018 06:31:21 +0000 (12:01 +0530)]
Merge pull request #12720 from selwyntcy/patch-1

(NFC) Fix incorrect reference of doTransferCheckout() in comments

6 years agoMerge pull request #12718 from mattwire/custom_field_optiongroup_fix
Monish Deb [Fri, 24 Aug 2018 06:30:47 +0000 (12:00 +0530)]
Merge pull request #12718 from mattwire/custom_field_optiongroup_fix

Fix for issue editing custom fields with option groups after #12423

6 years agoMerge pull request #12719 from seamuslee001/update_sql_generated
Eileen McNaughton [Thu, 23 Aug 2018 21:11:34 +0000 (09:11 +1200)]
Merge pull request #12719 from seamuslee001/update_sql_generated

Update civicrm_generated mysql file following changes to custom mysql…

6 years agoMerge pull request #12722 from eileenmcnaughton/report_instance
Monish Deb [Thu, 23 Aug 2018 18:02:47 +0000 (23:32 +0530)]
Merge pull request #12722 from eileenmcnaughton/report_instance

Fix ReportInstance BAO to call post hook after save (instead of calling pre twice).

6 years agoMerge pull request #12708 from colemanw/summary
colemanw [Thu, 23 Aug 2018 14:47:26 +0000 (10:47 -0400)]
Merge pull request #12708 from colemanw/summary

Contact summary - adjust block width when editing

6 years agoFix ReportInstance BAO to call post hook after save (instead of calling pre twice).
eileen [Thu, 23 Aug 2018 10:41:15 +0000 (22:41 +1200)]
Fix ReportInstance BAO to call post hook after save (instead of calling pre twice).

Also, remove one unused var

6 years agoFix inconsistent reference to function name
Selwyn Tang [Thu, 23 Aug 2018 08:06:42 +0000 (16:06 +0800)]
Fix inconsistent reference to function name

6 years agoFix inconsistent reference to function name
Selwyn Tang [Thu, 23 Aug 2018 08:05:24 +0000 (16:05 +0800)]
Fix inconsistent reference to function name

6 years agoFix inconsistent reference to function name
Selwyn Tang [Thu, 23 Aug 2018 08:03:11 +0000 (16:03 +0800)]
Fix inconsistent reference to function name

6 years agoUpdate civicrm_generated mysql file following changes to custom mysql file
Seamus Lee [Wed, 22 Aug 2018 22:09:59 +0000 (08:09 +1000)]
Update civicrm_generated mysql file following changes to custom mysql file

6 years agoFix for issue editing custom fields with option groups after #12423
Matthew Wire (MJW Consulting) [Wed, 22 Aug 2018 21:55:10 +0000 (22:55 +0100)]
Fix for issue editing custom fields with option groups after #12423

6 years agoContact summary - adjust block width when editing
Coleman Watts [Tue, 21 Aug 2018 20:52:26 +0000 (16:52 -0400)]
Contact summary - adjust block width when editing

6 years agoMerge pull request #12715 from mattwire/comments_2
colemanw [Wed, 22 Aug 2018 15:49:11 +0000 (11:49 -0400)]
Merge pull request #12715 from mattwire/comments_2

Minor comment and typo cleanup

6 years agoComments
Matthew Wire (MJW Consulting) [Wed, 22 Aug 2018 13:16:04 +0000 (14:16 +0100)]
Comments

6 years agoMerge pull request #12705 from pradpnayak/Visibility
Eileen McNaughton [Tue, 21 Aug 2018 19:59:33 +0000 (07:59 +1200)]
Merge pull request #12705 from pradpnayak/Visibility

Added Pseudoconstant tag for visibility

6 years agoAdded Pseudoconstant tag for visibility
Pradeep Nayak [Tue, 21 Aug 2018 14:58:22 +0000 (15:58 +0100)]
Added Pseudoconstant tag for visibility

6 years agoCall hooks when deleting recent items
Coleman Watts [Tue, 21 Aug 2018 13:39:03 +0000 (09:39 -0400)]
Call hooks when deleting recent items

6 years agoFix recent item deduping
Coleman Watts [Tue, 21 Aug 2018 12:43:00 +0000 (08:43 -0400)]
Fix recent item deduping

6 years agoMerge pull request #12702 from colemanw/urls
colemanw [Tue, 21 Aug 2018 11:15:31 +0000 (07:15 -0400)]
Merge pull request #12702 from colemanw/urls

Navigation - Don't reprocess fully-formed urls

6 years agoCRM-21677 - report clean up
yashodha [Tue, 21 Aug 2018 09:46:26 +0000 (15:16 +0530)]
CRM-21677 - report clean up

6 years agoMerge pull request #12692 from andrewpthompson/dev-joomla-2
Eileen McNaughton [Tue, 21 Aug 2018 05:31:31 +0000 (17:31 +1200)]
Merge pull request #12692 from andrewpthompson/dev-joomla-2

dev/joomla#2 Joomla on Windows cli.php & cron.php fail due to incorrect path

6 years agoNavigation - Don't reprocess fully-formed urls
Coleman Watts [Mon, 20 Aug 2018 21:52:57 +0000 (17:52 -0400)]
Navigation - Don't reprocess fully-formed urls

6 years agoMerge pull request #12696 from eileenmcnaughton/matt_1
Eileen McNaughton [Mon, 20 Aug 2018 20:50:21 +0000 (08:50 +1200)]
Merge pull request #12696 from eileenmcnaughton/matt_1

NFC cleanup to Membership/Renewal form classes.

6 years agoMerge pull request #12698 from yashodha/CRM-21677
Eileen McNaughton [Mon, 20 Aug 2018 20:48:16 +0000 (08:48 +1200)]
Merge pull request #12698 from yashodha/CRM-21677

CRM-21677 - report clean up

6 years agocorrect default sort for scheduled reminders list
magnolia61 [Mon, 20 Aug 2018 13:37:37 +0000 (15:37 +0200)]
correct default sort for scheduled reminders list

6 years agoBASW-240: Change Null Strings To Null Values As Null Strings Are Not Actually Null
varshith89 [Mon, 20 Aug 2018 09:48:12 +0000 (09:48 +0000)]
BASW-240: Change Null Strings To Null Values As Null Strings Are Not Actually Null

6 years agoGet title for event tell a friend mail
chriscant [Mon, 20 Aug 2018 09:14:50 +0000 (10:14 +0100)]
Get title for event tell a friend mail

6 years agoCRM-21677 - report clean up
yashodha [Mon, 20 Aug 2018 08:37:34 +0000 (14:07 +0530)]
CRM-21677 - report clean up

6 years agoNFC cleanup to Membership/Renewal form classes.
Matthew Wire (MJW Consulting) [Mon, 20 Aug 2018 04:58:25 +0000 (16:58 +1200)]
NFC cleanup to Membership/Renewal form classes.

6 years agoUse DIRECTORY_SEPARATOR in getBasePath()
andrewpthompson [Mon, 20 Aug 2018 04:15:58 +0000 (13:45 +0930)]
Use DIRECTORY_SEPARATOR in getBasePath()

Hard-coded forward slash resulted in incorrect path on Windows

6 years agoMerge pull request #12628 from colemanw/Use
Eileen McNaughton [Mon, 20 Aug 2018 03:00:10 +0000 (15:00 +1200)]
Merge pull request #12628 from colemanw/Use

Use static cache for UFMatch lookups to improve performance

6 years agoMerge pull request #12689 from eileenmcnaughton/money_fn
Eileen McNaughton [Mon, 20 Aug 2018 01:14:08 +0000 (13:14 +1200)]
Merge pull request #12689 from eileenmcnaughton/money_fn

Add test for new rounded money format functions

6 years agoAdd test for new rounded money format functions
eileen [Sun, 19 Aug 2018 22:40:57 +0000 (10:40 +1200)]
Add test for new rounded money format functions

Note that there are also some protected functions added. I have left those to be teste via this wrapper as they are not yet exposed

6 years agoMerge pull request #12626 from eileenmcnaughton/money_fn
Eileen McNaughton [Sun, 19 Aug 2018 22:28:23 +0000 (10:28 +1200)]
Merge pull request #12626 from eileenmcnaughton/money_fn

dev/core/#119 Fix mishandling of non decimal currency on additional payment form.

6 years agoMerge pull request #12686 from lcdservices/dev-core-341
Eileen McNaughton [Sun, 19 Aug 2018 21:51:43 +0000 (09:51 +1200)]
Merge pull request #12686 from lcdservices/dev-core-341

dev/core#341 sybunt custom search date field fix

6 years agodev/core#341 sybunt custom search date field fix
Brian Shaughnessy [Sat, 18 Aug 2018 14:20:33 +0000 (10:20 -0400)]
dev/core#341 sybunt custom search date field fix

6 years agoMerge pull request #12652 from davejenx/core-322
Seamus Lee [Fri, 17 Aug 2018 23:40:42 +0000 (09:40 +1000)]
Merge pull request #12652 from davejenx/core-322

dev/core/issues/322 - fix JS error on contribution page, completing form…

6 years agoMerge pull request #12642 from eileenmcnaughton/recur
Seamus Lee [Fri, 17 Aug 2018 22:34:33 +0000 (08:34 +1000)]
Merge pull request #12642 from eileenmcnaughton/recur

Code cleanup on Membership form when freezing fields in a recurring exists situation

6 years agoMerge pull request #12685 from MegaphoneJon/fix-pledge-report-group-filter
Yashodha Chaku [Fri, 17 Aug 2018 14:34:24 +0000 (20:04 +0530)]
Merge pull request #12685 from MegaphoneJon/fix-pledge-report-group-filter

Replicate fix on PR #12643 for pledge report

6 years agoReplicate fix on PR #12643 for pledge report
Jon Goldberg [Fri, 17 Aug 2018 11:51:21 +0000 (07:51 -0400)]
Replicate fix on PR #12643 for pledge report

6 years agoMerge pull request #12664 from totten/master-prevnext-ifclean
Eileen McNaughton [Fri, 17 Aug 2018 08:13:54 +0000 (20:13 +1200)]
Merge pull request #12664 from totten/master-prevnext-ifclean

(dev/core#217) PrevNext - Remove references to entity_table and entity_id2 from service. Add test.

6 years agoMerge pull request #12683 from civicrm/5.5
Eileen McNaughton [Fri, 17 Aug 2018 07:51:31 +0000 (19:51 +1200)]
Merge pull request #12683 from civicrm/5.5

5.5

6 years agoMerge pull request #12671 from eileenmcnaughton/ex55
Tim Otten [Fri, 17 Aug 2018 06:14:41 +0000 (23:14 -0700)]
Merge pull request #12671 from eileenmcnaughton/ex55

Fix + Add test for exporting location types with changed names

6 years ago(dev/core#217) Improve test coverage of PrevNext::deleteItem
Tim Otten [Sat, 21 Jul 2018 04:05:50 +0000 (21:05 -0700)]
(dev/core#217) Improve test coverage of PrevNext::deleteItem

6 years ago(dev/core#217) Add E2E_Core_PrevNextTest
Tim Otten [Tue, 10 Jul 2018 00:47:08 +0000 (17:47 -0700)]
(dev/core#217) Add E2E_Core_PrevNextTest

6 years ago(dev/core#217) PrevNext - Remove references to entity_table and entity_id2 from service
Tim Otten [Sun, 8 Jul 2018 02:31:36 +0000 (19:31 -0700)]
(dev/core#217) PrevNext - Remove references to entity_table and entity_id2 from service

The PrevNext service/interface aims to be a replaceable component for use
the search-caching (but not deduping).

The interface that we produced from refactoring includes several references
to `entity_table` and `entity_id2` -- these values are part of the SQL
table, and they're needed for dedupe, but they don't seem to convey anything
meaningful for search-caching.  Including these fields makes the interface
more complicated -- which will make it hard to implement other variants.

The general gist of this commit is that we no longer fill those two columns,
and we no longer read them.

In a couple functions, we split the new OOP implementation
(`CRM_Core_PrevNextCache_Sql`) from the traditional static BAO
implementation (`CRM_Core_BAO_PrevNext`) so that we can omit these fields.

6 years ago(dev/core#217) PrevNext - Make `entity_id2` optional (in SQL)
Tim Otten [Sun, 8 Jul 2018 02:30:47 +0000 (19:30 -0700)]
(dev/core#217) PrevNext - Make `entity_id2` optional (in SQL)

6 years agoMerge pull request #12680 from mattwire/comments
Eileen McNaughton [Thu, 16 Aug 2018 22:34:23 +0000 (10:34 +1200)]
Merge pull request #12680 from mattwire/comments

NFC Add/update two comments

6 years agoMerge pull request #12424 from alifrumin/editOwnEvents
Eileen McNaughton [Thu, 16 Aug 2018 22:16:55 +0000 (10:16 +1200)]
Merge pull request #12424 from alifrumin/editOwnEvents

 Ensure users with the perm "CiviEvent: access CiviEvent " can edit events they have created.

6 years agoNFC comments
Matthew Wire (MJW Consulting) [Thu, 16 Aug 2018 16:43:44 +0000 (17:43 +0100)]
NFC comments

6 years agodev/core#334 Fix Contribution Page with Checksum and multiple Payment Processors
Mathieu Lutfy [Thu, 16 Aug 2018 14:34:01 +0000 (10:34 -0400)]
dev/core#334 Fix Contribution Page with Checksum and multiple Payment Processors

6 years agoEvent.php:1830, ControlSignature, Priority: High
Wouter H [Thu, 16 Aug 2018 09:38:36 +0000 (11:38 +0200)]
Event.php:1830, ControlSignature, Priority: High

Expected "if (...) {\n"; found "if(...) {\n"

6 years agoMerge pull request #12663 from totten/master-prevnext-consistent
Eileen McNaughton [Thu, 16 Aug 2018 09:16:37 +0000 (21:16 +1200)]
Merge pull request #12663 from totten/master-prevnext-consistent

(dev/core#217) PrevNext - Use more consistent cache-keys while adjusting filters

6 years agoFix Undefined index: params in CRM_Event_BAO_Event::buildCustomProfile()
Wouter H [Thu, 16 Aug 2018 08:59:40 +0000 (10:59 +0200)]
Fix Undefined index: params in CRM_Event_BAO_Event::buildCustomProfile()

Added check to suppress notice: Undefined index: params in CRM_Event_BAO_Event::buildCustomProfile() which comes after returning to site from an online payment provider.

6 years agoMerge pull request #12677 from civicrm/5.5
Eileen McNaughton [Thu, 16 Aug 2018 08:44:55 +0000 (20:44 +1200)]
Merge pull request #12677 from civicrm/5.5

5.5 to master

6 years agoMerge pull request #12674 from totten/5.5-upgr-tpl-msg
Eileen McNaughton [Thu, 16 Aug 2018 08:44:20 +0000 (20:44 +1200)]
Merge pull request #12674 from totten/5.5-upgr-tpl-msg

Upgrader - When updating message templates, identify them by name

6 years agoMerge pull request #12670 from totten/5.5-perm-msg
Eileen McNaughton [Thu, 16 Aug 2018 06:44:05 +0000 (18:44 +1200)]
Merge pull request #12670 from totten/5.5-perm-msg

Refine upgrade message for `save Report Criteria`

6 years agoFix + Add test for exporting location types with changed names
eileen [Wed, 15 Aug 2018 07:48:28 +0000 (19:48 +1200)]
Fix + Add test for exporting location types with changed names

6 years agoMerge pull request #12676 from civicrm/5.5
Eileen McNaughton [Thu, 16 Aug 2018 05:58:26 +0000 (17:58 +1200)]
Merge pull request #12676 from civicrm/5.5

5.5 to master

6 years agoMerge pull request #12673 from eileenmcnaughton/atest
Eileen McNaughton [Thu, 16 Aug 2018 05:58:03 +0000 (17:58 +1200)]
Merge pull request #12673 from eileenmcnaughton/atest

Test fix for intermittant error

6 years agoUpgrader - When updating message templates, identify them by name
Tim Otten [Thu, 16 Aug 2018 05:14:23 +0000 (22:14 -0700)]
Upgrader - When updating message templates, identify them by name

Also: Fix a layout issue caused by a typo in the `<li>` tag.

6 years agoLoosedn activityTest on country order.
eileen [Thu, 16 Aug 2018 03:49:11 +0000 (15:49 +1200)]
Loosedn activityTest on country order.

The order is no considered significant, be open minded

6 years ago(NFC) Upgrade - Improve example of an upgrade message for a new permission
Tim Otten [Wed, 15 Aug 2018 21:33:52 +0000 (14:33 -0700)]
(NFC) Upgrade - Improve example of an upgrade message for a new permission

@bgm pointed out that the permission name should be translated as well.
This left me wondering...  why do we bother with parameterizing the string
with a `%1` if it's all going to be translated anyway?

There is a plausible reason.  It's not super-critical, but it's plausible --
the permission name is used in more contexts (like the permission mgmt
screen in D7/WP *as well as* the upgrade screen).  This arrangement ensures
that the name appears the same in *all those contexts*, even in various
edge-cases of the translation lifecycle (e.g.  where the permission-names
have been translated but the upgrade-messages have not).  Again...  it's not
a big deal, but it is a slightly better default.

6 years agoUpgrade messages - When going through 5.4.*, the permission name should be legible
Tim Otten [Wed, 15 Aug 2018 21:36:10 +0000 (14:36 -0700)]
Upgrade messages - When going through 5.4.*, the permission name should be legible

6 years agoUpgrade messages - When going through 5.4.*, only display permission message once
Tim Otten [Wed, 15 Aug 2018 21:09:04 +0000 (14:09 -0700)]
Upgrade messages - When going through 5.4.*, only display permission message once

6 years agoMerge pull request #12666 from jmcclelland/issue328
Eileen McNaughton [Wed, 15 Aug 2018 20:06:58 +0000 (08:06 +1200)]
Merge pull request #12666 from jmcclelland/issue328

don't add query to developer tab if we are downloading the data

6 years agodev/translation#14 Fix InnoDB Advanced Logging.
Mathieu Lutfy [Wed, 15 Aug 2018 16:41:48 +0000 (12:41 -0400)]
dev/translation#14 Fix InnoDB Advanced Logging.

6 years agodon't add query to dev tab for each row
Jamie McClelland [Wed, 15 Aug 2018 14:37:35 +0000 (10:37 -0400)]
don't add query to dev tab for each row

Adding the query to the dev tab for each row consumes a lot of resources
for the informational gain we get.

6 years agodon't output to dev tab if dev tab won't be displayed
Jamie McClelland [Wed, 15 Aug 2018 14:36:00 +0000 (10:36 -0400)]
don't output to dev tab if dev tab won't be displayed

https://lab.civicrm.org/dev/core/issues/328

6 years agoRemove net_amount from the Back office contribution form.
eileen [Fri, 20 Jul 2018 07:16:41 +0000 (19:16 +1200)]
Remove net_amount from the Back office contribution form.

Net amount is calculated in the BAO if not set so asking users to enter it does not gain us anything.

Currently we require them to calculate it & edit it if they change the fee_amount or total_amount
and we validate their data entry, and make them re-do it if they get it wrong.

Since the field is pretty hidden it's unintuitive to need to change it and
makes for a painful contribution update process.

The current behaviour dates back to svn days - however since 2015 the BAO has handled the possibility
of it not being set.

In addition we have had code issues with the comparison around currency & float comparison issues
eg. https://github.com/civicrm/civicrm-core/pull/11485
and https://lab.civicrm.org/dev/core/issues/260 ( in the latter case the data saves
correctly without net_amount and incorrectly if it is changed to meet the form validation rule.
(There was a proposal in Mar 2017 to address that https://github.com/civicrm/civicrm-core/pull/9948#issuecomment-285040403 by fixing the calculation but I believe just dropping the field is better).

Our unit tests test the form submissions but for some reason net_amoutn was removed from the tests
https://github.com/civicrm/civicrm-core/pull/9948/files#diff-40e2e0f106ba620465acf3a9a81f2498L1535
meaning our test coverage is more reliable without it being set.

6 years ago(dev/core#217) PrevNext - Use more consistent cache-keys while adjusting filters
Tim Otten [Sat, 7 Jul 2018 04:45:19 +0000 (21:45 -0700)]
(dev/core#217) PrevNext - Use more consistent cache-keys while adjusting filters

Suppose you run a search ("Find Contact", "Advanced Search", "Custom Search", etc). The result screen includes
several elements (which we'll reference below):

1. Standard pagination (Previous/Next; First/Last; Jump-To)
2. Numerical option for page-size
3. Sortable columns
4. An alphabetical filter
5. Checkboxes

As you work with these options, the content of the `civicrm_prevnext_cache` table may change. This patch does
not substantively change what's in that cache, but makes the column `cacheKey` simpler and more consistent.

Both Before and After (Unchanged)
---------------------------------
* The form's qfKey identifies the current screen/filters/cache.
* If you navigate to the next/previous page (`#1`) or adjust the page-size (`#2`), the content in `civicrm_prevnext_cache` remains the same (for the given qfKey).
* If you change the sort column (`#3`) or alphabetic filter (`#4`), the content in `civicrm_prevnext_cache` is deleted and repopulated (for the given qfKey).
* If you toggle a checkbox, the `civicrm_prevnext_cache.is_selected` property updates accordingly. These selections are retained when changing pages (`#1`/`#2`),
  but they're reset if you use sort or alphabet options (`#3`/`#4`).

Before
------
* The content of `civicrm_prevnext_cache.cacheKey` takes one of two forms, depending on whether you're using an alphabetic filter (`#4`).
    * `civicrm search {qfKey}` (typical, without any alphabetic filter)
    * `civicrm search {qfKey}_alphabet` (less common, with an alphabetic filter)
* The queries which read or delete the query-cache use a prefix+wildcard, i.e. `WHERE cacheKey LIKE 'civicrm search {qfKey}%'`.

After
-----
* The content of `civicrm_prevnext_cache.cacheKey` takes only one form
    * `civicrm search {qfKey}`
* The queries which read or delete the query-cache use an exact match, i.e. `WHERE cacheKey = 'civicrm search {qfKey}'`.`
* The text `_alphabet` does not appear in the PHP source folders (CRM, Civi, bin, api, extern, tests).

Comments
--------
In theory, one can imagine that it's desireable to keep the cached results for each of the sorted/filtered variants of the query.
That might allow the user to quickly switch among different sortings and different alphabetic-filters, or it might
allow some kind of clever management of the selections. But this is not so. As we see (both before and after), the substance
of the cache is deleted whenever the user changes `#3`/`#4`. In reality, one user browsing a search screen corresponds to exactly
one query-cache. As near as I can tell, the old code made the names change for no real reason at all.

To observe the behavior empirically, I would twiddle the UI widgets and concurrently inspect the content of the cache tables.  For example:

```
mysql> select group_name, path, FROM_BASE64(data), expired_date  from civicrm_cache where path like 'civicrm search%';
select 'Total records in' as label, cacheKey, count(*), min(id), max(id) from civicrm_prevnext_cache group by cacheKey
union select 'Selected records in ', cacheKey, count(*), min(id), max(id) from civicrm_prevnext_cache where is_selected=1 group by cacheKey;
+------------------------------+------------------------------------------------------+--------------------------------------------------------------+--------------+
| group_name                   | path                                                 | FROM_BASE64(data)                                            | expired_date |
+------------------------------+------------------------------------------------------+--------------------------------------------------------------+--------------+
| CiviCRM Search PrevNextCache | civicrm search a8ed1e2039241c41457a88f65aa8a8ee_7845 | s:52:"civicrm search a8ed1e2039241c41457a88f65aa8a8ee_7845"; | NULL         |
+------------------------------+------------------------------------------------------+--------------------------------------------------------------+--------------+
1 row in set (0.00 sec)

+----------------------+------------------------------------------------------+----------+---------+---------+
| label                | cacheKey                                             | count(*) | min(id) | max(id) |
+----------------------+------------------------------------------------------+----------+---------+---------+
| Total records in     | civicrm search a8ed1e2039241c41457a88f65aa8a8ee_7845 |        6 |     787 |     792 |
| Selected records in  | civicrm search a8ed1e2039241c41457a88f65aa8a8ee_7845 |        1 |     789 |     789 |
+----------------------+------------------------------------------------------+----------+---------+---------+
2 rows in set (0.01 sec)
```

6 years agoMerge pull request #12661 from pradpnayak/report-error-gender
Eileen McNaughton [Tue, 14 Aug 2018 19:44:21 +0000 (07:44 +1200)]
Merge pull request #12661 from pradpnayak/report-error-gender

Fixed fatal error when Gender is selected in column

6 years agoMerge pull request #12656 from eileenmcnaughton/dev_tab
colemanw [Tue, 14 Aug 2018 19:04:09 +0000 (15:04 -0400)]
Merge pull request #12656 from eileenmcnaughton/dev_tab

Add SQL modes to developer tab

6 years agoFixed fatal error when Gender is selected in column
Pradeep Nayak [Tue, 14 Aug 2018 15:43:04 +0000 (16:43 +0100)]
Fixed fatal error when Gender is selected in column

6 years agoMerge pull request #12579 from eileenmcnaughton/export_another
colemanw [Tue, 14 Aug 2018 15:31:11 +0000 (11:31 -0400)]
Merge pull request #12579 from eileenmcnaughton/export_another

Export minor refactor Move household relationship types to the processor

6 years agoMerge pull request #12658 from eileenmcnaughton/report_function
Eileen McNaughton [Tue, 14 Aug 2018 07:25:34 +0000 (19:25 +1200)]
Merge pull request #12658 from eileenmcnaughton/report_function

[NFC] Minor function extraction in report class.

6 years agoMinor function extraction in report class.
eileen [Tue, 14 Aug 2018 02:39:06 +0000 (14:39 +1200)]
Minor function extraction in report class.

This mirrors a similar refactor in the extended reports class (which also
allows it to be called from more than one place

6 years agoRemove nbsp handling (now it no longer works)
eileen [Tue, 14 Aug 2018 02:32:56 +0000 (14:32 +1200)]
Remove nbsp handling (now it no longer works)

6 years agoMerge pull request #12657 from civicrm/5.5
Eileen McNaughton [Tue, 14 Aug 2018 00:23:09 +0000 (12:23 +1200)]
Merge pull request #12657 from civicrm/5.5

5.5

6 years agoMerge pull request #12634 from seamuslee001/dev_core_273
Seamus Lee [Tue, 14 Aug 2018 00:20:01 +0000 (10:20 +1000)]
Merge pull request #12634 from seamuslee001/dev_core_273

dev/core/#273 Fix issue where sending an SMS with the To Field in the…

6 years agoAdd SQL modes to developer tab
eileen [Tue, 14 Aug 2018 00:14:29 +0000 (12:14 +1200)]
Add SQL modes to developer tab