Tim Otten [Tue, 14 Aug 2018 22:12:57 +0000 (15:12 -0700)]
(dev/core#217) Query::getCachedContacts - Use swappable fetch() instead of SQL JOIN
The general context of this code is roughly as follows:
* We've already filled up the prevnext cache with a bunch of contact-IDs.
* The user wants to view a page of 50 contacts.
* We want to lookup full information about 50 specific contacts for this page.
It does makes sense to use `CRM_Contact_BAO_Query` for looking up the "full information"
about contacts. However, the function `Query::getCachedContacts()` is hard-coded to
read from the SQL-based prevnext cache.
Before
------
* In `getCachedContacts()`, it grabbed the full SQL for `CRM_Contact_BAO_Query`
and munged the query to:
* Add an extra JOIN on `civicrm_prevnext_cache` (with a constraint on `cacheKey`)
* Respect pagination (LIMIT/OFFSET)
* Order results based on their position in the prevnext cache
After
-----
* In `CRM_Core_PrevNextCache_Interface`, the `fetch()` function provides one page-worth
of contact IDs (in order). The `fetch()` function is tested by `E2E_Core_PrevNextTest`.
* In `getCachedContacts()`, it doesn't know anything about `civicrm_prevnext_cache`
or `cacheKey` or pagination. Instead, it just accepts CIDs for one page-worth of
contacts. It returns contacts in the same order that was given.
colemanw [Mon, 26 Nov 2018 02:02:27 +0000 (21:02 -0500)]
Merge pull request #13156 from eileenmcnaughton/please_print
dev/core#371 remove please print this page text
eileen [Sun, 25 Nov 2018 20:42:22 +0000 (09:42 +1300)]
dev/core#371 remove please print this page text
Eileen McNaughton [Sun, 25 Nov 2018 20:03:36 +0000 (09:03 +1300)]
Merge pull request #13154 from civicrm/5.8
5.8 to master
Eileen McNaughton [Sun, 25 Nov 2018 20:03:13 +0000 (09:03 +1300)]
Merge pull request #13153 from colemanw/removejstree
Remove redundant jstree script from search form
Coleman Watts [Sun, 25 Nov 2018 19:06:04 +0000 (14:06 -0500)]
Remove redundant jstree script from search form
Eileen McNaughton [Sat, 24 Nov 2018 22:16:53 +0000 (11:16 +1300)]
Merge pull request #13152 from civicrm/5.8
5.8 to master
Eileen McNaughton [Sat, 24 Nov 2018 22:16:24 +0000 (11:16 +1300)]
Merge pull request #13150 from eileenmcnaughton/acl
Fix check for financial acls to look for setting rather than sub-key of non-standard civicontribute_settings' setting
Monish Deb [Sat, 24 Nov 2018 10:01:44 +0000 (15:31 +0530)]
Merge pull request #13133 from eileenmcnaughton/php72import
dev/core#406 fix warnings under php 7.2 when importing
colemanw [Fri, 23 Nov 2018 00:40:30 +0000 (19:40 -0500)]
Merge pull request #13149 from eileenmcnaughton/no_double_contribution
dev/core#536 Remove duplicate call to contribution summary
Eileen McNaughton [Thu, 22 Nov 2018 21:56:05 +0000 (10:56 +1300)]
Merge pull request #13143 from eileenmcnaughton/importtest
Fix test name because it is not running & doesn't pass :-(
eileen [Wed, 21 Nov 2018 11:23:16 +0000 (00:23 +1300)]
Fix test name because it is not running & doesn't pass :-(
eileen [Thu, 22 Nov 2018 02:25:46 +0000 (15:25 +1300)]
Fix check for financial acls to look for setting rather than sub-key of non-standard civicontribute_settings' setting
Eileen McNaughton [Thu, 22 Nov 2018 04:00:04 +0000 (17:00 +1300)]
Merge pull request #13066 from ejegg/php73
Fix continue / break PHP 7.3 warnings
Eileen McNaughton [Thu, 22 Nov 2018 02:30:56 +0000 (15:30 +1300)]
Merge pull request #13146 from eileenmcnaughton/cont_test
Unit test set up tweak - Set trxn_id & invoice_id in tests as needed rather than by default.
eileen [Tue, 20 Nov 2018 07:31:14 +0000 (20:31 +1300)]
Remove duplicate call to contribution summary
This is an expensive call (we get it at over 10 seconds for high
giving contacts in a large database) and it is quite simply called twice.
Removing these few lines knock out several expensive queries but I have checked
contribution tab, user dashboard, contribution search and advanced search displayed
as contributions and can find no instances where less info is shown.
(in the case of advanced search displayed as contributions it doesn't show before or
after)
Eileen McNaughton [Thu, 22 Nov 2018 01:29:45 +0000 (14:29 +1300)]
Merge pull request #13140 from jitendrapurohit/core-540
dev/core#540 - Civicrm Contact Dashboard returns fatal error
eileen [Wed, 21 Nov 2018 21:22:44 +0000 (10:22 +1300)]
Set trxn_id & invoice_id in tests as needed rather than by default.
This causes work-arounds & flakiness by tests using this fn.
Better to add as required.
Eileen McNaughton [Wed, 21 Nov 2018 21:28:24 +0000 (10:28 +1300)]
Merge pull request #13126 from eileenmcnaughton/export_more
Export code cleanup - only construct one metadata array with all types of metadata
Eileen McNaughton [Wed, 21 Nov 2018 19:54:13 +0000 (08:54 +1300)]
Merge pull request #13145 from civicrm/5.8
5.8 to master
Eileen McNaughton [Wed, 21 Nov 2018 19:52:18 +0000 (08:52 +1300)]
Merge pull request #13137 from eileenmcnaughton/user58
dev/core#534 fix failure of print invoice to display on settings page
eileen [Wed, 21 Nov 2018 10:08:56 +0000 (23:08 +1300)]
Fix missing Pay now link
eileen [Wed, 21 Nov 2018 09:52:53 +0000 (22:52 +1300)]
Disable function that doesn't work on jenkins (but does locally) for not
eileen [Wed, 21 Nov 2018 08:21:03 +0000 (21:21 +1300)]
Remove static var from env function.
It is causing a test fail and is only saving us from calling a cached function....
eileen [Wed, 21 Nov 2018 07:03:44 +0000 (20:03 +1300)]
Test fixes, better cleanup
Jitendra Purohit [Wed, 21 Nov 2018 03:54:56 +0000 (09:24 +0530)]
dev/core#540 - Civicrm Contact Dashboard returns fatal error
eileen [Wed, 21 Nov 2018 00:49:42 +0000 (13:49 +1300)]
Use function to determinie if invoicing is enabled which accounts for historical weirdness
eileen [Wed, 21 Nov 2018 00:49:09 +0000 (13:49 +1300)]
Use onToggle feature for setting user_dashboard_options when toggling invoicing, remove from form
eileen [Wed, 21 Nov 2018 00:47:43 +0000 (13:47 +1300)]
Add test for user dashboard
Eileen McNaughton [Tue, 20 Nov 2018 05:34:40 +0000 (18:34 +1300)]
Merge pull request #13135 from civicrm/5.8
5.8
Seamus Lee [Tue, 20 Nov 2018 05:30:31 +0000 (16:30 +1100)]
Merge pull request #13131 from eileenmcnaughton/5.8
dev/core#534 Fix intra-rc regression mis-saving of invoicing setting
Seamus Lee [Tue, 20 Nov 2018 05:30:05 +0000 (16:30 +1100)]
Merge pull request #13132 from eileenmcnaughton/php72
Fix php 7.2 notice
eileen [Tue, 20 Nov 2018 03:50:06 +0000 (16:50 +1300)]
dev/core#406 fix warnings under php 7.2 when importing
eileen [Tue, 20 Nov 2018 03:33:02 +0000 (16:33 +1300)]
Fix php 7.2 notice
eileen [Tue, 20 Nov 2018 03:15:44 +0000 (16:15 +1300)]
Fix saving of invoicing.
Invoicing has setting metadata but this setting is ignored in various places in core in favour of using a hacky method. Don't break when
hackiness ensues
eileen [Mon, 19 Nov 2018 03:13:40 +0000 (16:13 +1300)]
Move construction of headers to ExportProcessor
eileen [Mon, 19 Nov 2018 01:04:57 +0000 (14:04 +1300)]
Stop setting header rows only to unset them
eileen [Mon, 19 Nov 2018 00:08:09 +0000 (13:08 +1300)]
Move definition of header rows to ExportProcessor
eileen [Sun, 18 Nov 2018 23:56:47 +0000 (12:56 +1300)]
Make getHeaderRows more sensible
Seamus Lee [Tue, 20 Nov 2018 02:31:40 +0000 (13:31 +1100)]
Merge pull request #13124 from eileenmcnaughton/export_fgb
Fix Export when full group by mode is used
Eileen McNaughton [Tue, 20 Nov 2018 02:22:10 +0000 (15:22 +1300)]
Merge pull request #13087 from eileenmcnaughton/lybunt
Lybunt report - improve developer support for debugging this report
Eileen McNaughton [Tue, 20 Nov 2018 00:10:05 +0000 (13:10 +1300)]
Merge pull request #13130 from civicrm/5.8
5.8 to master
Eileen McNaughton [Tue, 20 Nov 2018 00:09:17 +0000 (13:09 +1300)]
Merge pull request #13128 from colemanw/jstree
dev/core#507 - Fix wrong version of jstree in search popop
Coleman Watts [Mon, 19 Nov 2018 20:22:34 +0000 (15:22 -0500)]
dev/core#507 - Fix wrong version of jstree in search popop
Elliott Eggleston [Thu, 15 Nov 2018 22:06:51 +0000 (17:06 -0500)]
Extract switch, fix PHP 7.3 warnings
PHP 7.3 warns if a continue statement is used inside a switch, where
it functions as a break statement. This patch extracts the switch
from the loop, and also fixes the fall-through error from
civicrm_campaign to default, moving the civicrm_website case out of
the way.
Elliott Eggleston [Thu, 15 Nov 2018 20:22:22 +0000 (15:22 -0500)]
PHP 7.3 continue / break clarification
PHP 7.3 started warning on 'continue' statements inside switches,
where they act just like 'break' statements. To actually continue
the enclosing loop, it would have to be 'continue 2'. Since that's
a weird syntax and these two cases have nothing after the switch,
I've replaced them here with break.
eileen [Mon, 19 Nov 2018 02:58:12 +0000 (15:58 +1300)]
Fix a further fatal error when full group by is enabled
Eileen McNaughton [Mon, 19 Nov 2018 02:03:12 +0000 (15:03 +1300)]
Merge pull request #13122 from eileenmcnaughton/export_merge
Export code cleanup - remove silly function
Eileen McNaughton [Mon, 19 Nov 2018 00:54:57 +0000 (13:54 +1300)]
Merge pull request #13121 from pradpnayak/BatchSearchFix
dev/core#532 Batch search fix
eileen [Mon, 19 Nov 2018 00:45:54 +0000 (13:45 +1300)]
Fix Export when full group by mode is used
After upgrading locally to mysql 5.7 I found that the exportIM test
was taking so long locally that I was killing it rather than finding
out how long it would take.
Digging into it I found that we were changing the query so that
attempts to group by contact ID were being nullified when full group by
is enabled. This meant that we were winding up with
7776 rows being retrieved to reflect a grid of permutations, which was
being iterated down to 1 in php.
In general the practice of altering the groupby to meet this new
standard is one that we determined to be
causing problems and we discontinued / rolled back
eileen [Sat, 17 Nov 2018 02:24:54 +0000 (15:24 +1300)]
Remove silly manipulateHeaderRows function
Export code cleanup - Extend testing so we can get rid of silly manipulate fn
eileen [Sat, 17 Nov 2018 02:19:33 +0000 (15:19 +1300)]
Remove header handling that I think is unreachable
Eileen McNaughton [Sun, 18 Nov 2018 21:57:04 +0000 (10:57 +1300)]
Merge pull request #13117 from eileenmcnaughton/export2
Export code clean up - extract build row & getTransformed row off to ExportProcessor
Eileen McNaughton [Sun, 18 Nov 2018 21:48:11 +0000 (10:48 +1300)]
Merge pull request #13120 from eileenmcnaughton/less_primary
Export class cleanup - remove some unnecessary code
Eileen McNaughton [Sun, 18 Nov 2018 20:54:26 +0000 (09:54 +1300)]
Merge pull request #13098 from eileenmcnaughton/monish_pay
dev/core#153: Pending Pay Later /w Custom payment method
Pradeep Nayak [Sun, 18 Nov 2018 19:15:30 +0000 (00:45 +0530)]
Modified unit test
Pradeep Nayak [Sun, 18 Nov 2018 18:56:19 +0000 (00:26 +0530)]
format form values for multi-select fields
Pradeep Nayak [Sun, 18 Nov 2018 18:52:44 +0000 (00:22 +0530)]
Query building shouldn't be iterated
Eileen McNaughton [Sat, 17 Nov 2018 18:31:50 +0000 (07:31 +1300)]
Merge pull request #13115 from eileenmcnaughton/noah
Minor Contact BAO code cleanup
eileen [Sat, 17 Nov 2018 01:49:36 +0000 (14:49 +1300)]
Remove provider_id & duplicate key additions from export 'primary' (AKA all) fields
In testing all these fields except for provider_id are already in the primary field.
Provider ID is a psynonym for im_provider. Possibly it is the better name choice
but it has a lot of hacks associated with it that can go by removing it
Eileen McNaughton [Sat, 17 Nov 2018 04:20:53 +0000 (17:20 +1300)]
Merge pull request #13119 from civicrm/JoeMurray-patch-4
Update name of icon from pencil to wrench in EventInfo help
Joe Murray [Sat, 17 Nov 2018 03:02:43 +0000 (22:02 -0500)]
Merge pull request #13118 from civicrm/JoeMurray-patch-3
Fix Configure Event help grammar
Eileen McNaughton [Sat, 17 Nov 2018 02:34:23 +0000 (15:34 +1300)]
Merge pull request #12650 from JMAConsulting/dev-core-321
dev/core#321: Prevent duplicate entries in civicrm_entity_file
highfalutin [Fri, 16 Nov 2018 20:48:12 +0000 (09:48 +1300)]
Minor Contact BAO code cleanup
Eileen McNaughton [Fri, 16 Nov 2018 23:56:08 +0000 (12:56 +1300)]
Merge pull request #13113 from mattwire/fix_delete_participant
Regression: Fix delete event participant fatal error and display name if no email
Joe Murray [Fri, 16 Nov 2018 22:12:52 +0000 (17:12 -0500)]
Update name of icon from pencil to wrench in EventInfo help
Joe Murray [Fri, 16 Nov 2018 22:02:29 +0000 (17:02 -0500)]
Fix grammar
eileen [Fri, 16 Nov 2018 21:03:32 +0000 (10:03 +1300)]
Move buildRow to processor class
eileen [Fri, 16 Nov 2018 20:55:50 +0000 (09:55 +1300)]
Move getTransformedFieldValue to exportProcessor
eileen [Thu, 15 Nov 2018 23:45:03 +0000 (12:45 +1300)]
Don't pass il8n object, just use singleton
eileen [Thu, 15 Nov 2018 23:42:31 +0000 (12:42 +1300)]
Extract buildRow
Eileen McNaughton [Fri, 16 Nov 2018 20:34:05 +0000 (09:34 +1300)]
Merge pull request #13110 from eileenmcnaughton/profile_translate
dev/core#527 Permit translation of Public Title field for Profiles
Eileen McNaughton [Fri, 16 Nov 2018 20:27:47 +0000 (09:27 +1300)]
Merge pull request #13082 from eileenmcnaughton/export
Export code cleanup - Use getComponentPaymentFields from processorClass
Matthew Wire (MJW Consulting) [Fri, 16 Nov 2018 16:22:40 +0000 (16:22 +0000)]
Fix delete event participant fatal error and display name if no email
Monish Deb [Fri, 16 Nov 2018 11:01:34 +0000 (16:31 +0530)]
Merge pull request #13111 from eileenmcnaughton/php72Countable
Fix php7.2 notices on trying to count null
Monish Deb [Fri, 16 Nov 2018 10:58:26 +0000 (16:28 +0530)]
Merge pull request #13112 from jitendrapurohit/core-528
dev/core#528 - Advanced Search -> Contribution Tab and Contribution D…
Jitendra Purohit [Fri, 16 Nov 2018 07:06:00 +0000 (12:36 +0530)]
dev/core#528 - Advanced Search -> Contribution Tab and Contribution Dashboard returns a fatal error
eileen [Wed, 14 Nov 2018 02:13:05 +0000 (15:13 +1300)]
Lybunt report - improve developer support for debugging this report
By using the createTemporaryTable to create our temporaray table we
help developers out by
a) adding the query to the developer tab
b) supporting CIVICRM_TEMP_FORCE_DURABLE
(see debugging section in dev docs)
This fix updates a function used by reports that have been marked with
groupFilterNotOptimised = FALSE
The reports with optimised group filtering construct a temp table
of contacts in the groups & use those to inner join / limit
the contacts in the report.
They are tested via a bunch of tests in api_v3_ReportTemplateTest such as
testReportsWithNonSmartGroupFilter
m
Change-Id: I1102b43a643760320a4b011c7a11146c8d4f380f
eileen [Fri, 16 Nov 2018 01:55:38 +0000 (14:55 +1300)]
Fix php7.2 notices on trying to count null
Eileen McNaughton [Fri, 16 Nov 2018 00:43:45 +0000 (13:43 +1300)]
Merge pull request #13101 from systopia/issue_525
fix for issue-525: Extraneous br-tags in rendered note-fields
eileen [Thu, 15 Nov 2018 23:31:39 +0000 (12:31 +1300)]
Always create temp table at the start.
The saving of not creating an empty file occassionally doesn't warrant the code complexity
eileen [Mon, 12 Nov 2018 01:50:31 +0000 (14:50 +1300)]
Move wrangling payment header outside main row iteration
eileen [Mon, 12 Nov 2018 01:49:17 +0000 (14:49 +1300)]
Refactor out getPaymentHeaders function
eileen [Mon, 12 Nov 2018 01:04:42 +0000 (14:04 +1300)]
Use getComponentPaymentFields from processorClass
eileen [Thu, 15 Nov 2018 23:00:04 +0000 (12:00 +1300)]
Further the conversion to deal with non-entity pseudofield
eileen [Thu, 15 Nov 2018 22:44:39 +0000 (11:44 +1300)]
Partial converstion of Profile form to be an entity form, fixes translatability for frontend title
Eileen McNaughton [Thu, 15 Nov 2018 23:00:36 +0000 (12:00 +1300)]
Merge pull request #13107 from eileenmcnaughton/php72Countable
Fix warning error on php 7.2
Seamus Lee [Thu, 15 Nov 2018 22:47:49 +0000 (09:47 +1100)]
Merge pull request #13109 from civicrm/5.8
5.8
Seamus Lee [Thu, 15 Nov 2018 22:46:51 +0000 (09:46 +1100)]
Merge pull request #13108 from seamuslee001/5.8
Port Use tab title in feedback message
Christian Wach [Thu, 15 Nov 2018 13:16:03 +0000 (13:16 +0000)]
Use tab title in feedback message
eileen [Thu, 15 Nov 2018 20:12:46 +0000 (09:12 +1300)]
Fix warning error on php 7.2
Eileen McNaughton [Thu, 15 Nov 2018 20:09:52 +0000 (09:09 +1300)]
Merge pull request #13106 from seamuslee001/5.8
5.8
eileen [Thu, 15 Nov 2018 07:22:09 +0000 (20:22 +1300)]
Replace deprecated event function
Christian Wach [Thu, 15 Nov 2018 12:05:54 +0000 (12:05 +0000)]
Retrieve tab key from form attributes even when action is urlencoded
Eileen McNaughton [Thu, 15 Nov 2018 19:51:07 +0000 (08:51 +1300)]
Merge pull request #13093 from eileenmcnaughton/event_deprecated
Replace deprecated event function
Eileen McNaughton [Thu, 15 Nov 2018 19:48:15 +0000 (08:48 +1300)]
Merge pull request #13097 from eileenmcnaughton/website_type
CRM-21427 - Add form validation to make it clear we only allow a single website of each type
Seamus Lee [Thu, 15 Nov 2018 19:28:57 +0000 (06:28 +1100)]
Merge pull request #13100 from eileenmcnaughton/env
dev/cloud-native/issues#18: Soften messages for read-only extensionsDir
Seamus Lee [Thu, 15 Nov 2018 19:28:17 +0000 (06:28 +1100)]
Merge pull request #13102 from christianwach/issue-526
Use tab title in feedback message
Seamus Lee [Thu, 15 Nov 2018 19:24:24 +0000 (06:24 +1100)]
Merge pull request #13099 from christianwach/issue-wp-12-tab
Retrieve tab key from form attributes even when action is urlencoded
Christian Wach [Thu, 15 Nov 2018 13:16:03 +0000 (13:16 +0000)]
Use tab title in feedback message