Eileen McNaughton [Tue, 4 Dec 2018 22:16:24 +0000 (11:16 +1300)]
Merge pull request #13225 from seamuslee001/rename_load_search_functions
[REF] Rename recently added getUrlVariables getFormVariables function…
Seamus Lee [Tue, 4 Dec 2018 20:44:07 +0000 (07:44 +1100)]
[REF] Rename recently added getUrlVariables getFormVariables functions to be loadStandardSearchOptionsFromUrl loadFormValues
Seamus Lee [Tue, 4 Dec 2018 20:36:35 +0000 (07:36 +1100)]
Merge pull request #13219 from eileenmcnaughton/fix_type
Fix [unreleased] typo from https://github.com/civicrm/civicrm-core/pull/13210
Monish Deb [Tue, 4 Dec 2018 18:43:19 +0000 (00:13 +0530)]
Merge pull request #13169 from elisseck/dev/core/482
dev/core/482 standardize contact edit form delete block behavior
Monish Deb [Tue, 4 Dec 2018 18:32:53 +0000 (00:02 +0530)]
Merge pull request #13223 from colemanw/select2
dev/core#573 Fix select2 height on public pages
Monish Deb [Tue, 4 Dec 2018 18:27:40 +0000 (23:57 +0530)]
Merge pull request #13181 from eileenmcnaughton/financial_type_id_default
Set default financial_type_id for creating new payment processors (form & api)
Coleman Watts [Tue, 4 Dec 2018 12:52:42 +0000 (07:52 -0500)]
Fix select2 height on public pages
eileen [Tue, 4 Dec 2018 04:20:47 +0000 (17:20 +1300)]
Fix typo from https://github.com/civicrm/civicrm-core/pull/13210
Looks like I tabbed it out without noticing the wrong param
Seamus Lee [Tue, 4 Dec 2018 03:53:50 +0000 (14:53 +1100)]
Merge pull request #13212 from eileenmcnaughton/export_wr
Make world_region translate on advanced search field
Seamus Lee [Tue, 4 Dec 2018 03:53:23 +0000 (14:53 +1100)]
Merge pull request #13013 from eileenmcnaughton/search_defaults
Prototype for metadata based fields on search screens.
eileen [Mon, 3 Dec 2018 03:02:57 +0000 (16:02 +1300)]
Add world region to exportable fields
eileen [Mon, 3 Dec 2018 01:44:13 +0000 (14:44 +1300)]
Define gettext translation for world_region
eileen [Thu, 25 Oct 2018 22:40:47 +0000 (11:40 +1300)]
Prototype for metadata based fields on search screens.
This is a first step towards making search screens more metadata driven. It switches the activity_type_id field
to being metadata-added and adds support for activity_type_id=1 via the url.
The setting of defaults is more like 'normal' forms where they are loaded & can be changed in the UI
rather than 'search methods' where they only work in conjunction with 'force'
(which also still works).
This comes out of my concern that
a) we already have url defaults added badly on this form &
b) we have had more than one PR to add more defaults - eg. https://github.com/civicrm/civicrm-core/pull/12455
So I think we should define how we really want entity data to be used with search forms & move towards it.
Note also that the tpls for Contribution Search and one of the contact search panes have been amended to
be metadata driven. I haven't tried to align with that in this step but it should be down the track
Tim Otten [Mon, 3 Dec 2018 22:23:22 +0000 (14:23 -0800)]
Merge pull request #13214 from aydun/getcontextvalues
Add \Civi\Token\TokenProcessor::getContextValues()
Seamus Lee [Mon, 3 Dec 2018 20:24:29 +0000 (07:24 +1100)]
Merge pull request #13192 from aydun/no_dao_free
Remove '$dao->free()' part 1
Seamus Lee [Mon, 3 Dec 2018 19:28:11 +0000 (06:28 +1100)]
Merge pull request #13207 from JMAConsulting/core-11
dev/core#11: Email - send now error screen should display earlier
Aidan Saunders [Mon, 3 Dec 2018 14:05:46 +0000 (14:05 +0000)]
First round of '$dao->free()' removals
Aidan Saunders [Thu, 29 Nov 2018 12:59:13 +0000 (12:59 +0000)]
Add new testing helper: assertArrayValuesEqual($a1, $a2) - compare array values
Aidan Saunders [Thu, 29 Nov 2018 13:00:40 +0000 (13:00 +0000)]
Add tests for TokenProcessor::getContextValues()
Aidan Saunders [Mon, 19 Nov 2018 20:31:34 +0000 (20:31 +0000)]
Enhance getContextValues() to collect subfield values
Aidan Saunders [Mon, 3 Dec 2018 12:09:08 +0000 (12:09 +0000)]
Add \Civi\Token\TokenProcessor::getContextValues() from Tim
Seamus Lee [Mon, 3 Dec 2018 00:29:55 +0000 (11:29 +1100)]
Merge pull request #13210 from eileenmcnaughton/search_ref
[REF] refactor shared search functions in pre-Process
Seamus Lee [Sun, 2 Dec 2018 23:50:34 +0000 (10:50 +1100)]
Merge pull request #13206 from eileenmcnaughton/pledge_jcal
dev/core#561 Convert Pledge Payment form to use datepicker rather tha…
Seamus Lee [Sun, 2 Dec 2018 22:21:46 +0000 (09:21 +1100)]
Merge pull request #13208 from seamuslee001/final_custom_search_conversion_561
dev/core#561 Convert DateAdded and Tagged Contributions custom search…
eileen [Sun, 2 Dec 2018 21:28:57 +0000 (10:28 +1300)]
[REF] refactor shared search functions in pre-Process
This simply reduces some duplicate code in the search forms
Seamus Lee [Sun, 2 Dec 2018 20:53:59 +0000 (07:53 +1100)]
dev/core#561 Convert DateAdded and Tagged Contributions custom searches to using datepicker rather than jcalendar
eileen [Sun, 2 Dec 2018 20:39:17 +0000 (09:39 +1300)]
Make 'overdue' function robust by using strtotime comparisons
Eileen McNaughton [Sun, 2 Dec 2018 20:22:50 +0000 (09:22 +1300)]
Merge pull request #13203 from seamuslee001/activity_search_core_561
dev/core#561 Convert Activity Custom Search from jcalendar to datepic…
Monish Deb [Sun, 2 Dec 2018 19:46:43 +0000 (01:16 +0530)]
dev/core#11: Email - send now error screen should display earlier
Seamus Lee [Sun, 2 Dec 2018 10:10:00 +0000 (21:10 +1100)]
Merge pull request #13196 from seamuslee001/price_lab_core_561
dev/core#561 Replace jacalendar with datepicker in Price Field Form
Seamus Lee [Sun, 2 Dec 2018 09:43:16 +0000 (20:43 +1100)]
Merge pull request #13200 from JMAConsulting/mail-23
dev/mail#23: Bounce processing doesn't catch pattern 'user doesn't exist'
Seamus Lee [Fri, 30 Nov 2018 22:39:25 +0000 (22:39 +0000)]
dev/core#561 Replace jacalendar with datepicker in Price Field Form
Update Display of Field dates as well
Monish Deb [Sat, 1 Dec 2018 18:59:01 +0000 (00:29 +0530)]
dev/mail#23: Bounce processing doesn't catch pattern 'user doesn't exis'
colemanw [Sun, 2 Dec 2018 04:20:47 +0000 (23:20 -0500)]
Merge pull request #13173 from christianwach/issue-557
Prevent viewport jump when toggling help on "Administer CiviCRM" screen
colemanw [Sun, 2 Dec 2018 04:15:02 +0000 (23:15 -0500)]
Merge pull request #13190 from JMAConsulting/core-565
dev-core#565: Make subject field of Note, inline editable in contact summary page
Seamus Lee [Sun, 2 Dec 2018 01:07:26 +0000 (12:07 +1100)]
dev/core#561 Convert Pledge Payment form to use datepicker rather than jcalendar
Eileen McNaughton [Sun, 2 Dec 2018 02:25:04 +0000 (15:25 +1300)]
Merge pull request #13194 from seamuslee001/lab_core_498
dev/core#498 Update Mailing Report to fix undefined property error
Eileen McNaughton [Sun, 2 Dec 2018 02:21:43 +0000 (15:21 +1300)]
Merge pull request #13201 from seamuslee001/event_template_cleanup
Remove Defunct Templates from CiviMail
Eileen McNaughton [Sun, 2 Dec 2018 01:55:37 +0000 (14:55 +1300)]
Merge pull request #13204 from seamuslee001/nfc_checksum_dao
(NFC) Regenerate DAO Checksums after changes to codegen
Seamus Lee [Sat, 1 Dec 2018 23:58:09 +0000 (10:58 +1100)]
(NFC) Regenerate DAO Checksums after changes to codegen
Seamus Lee [Sat, 1 Dec 2018 21:48:59 +0000 (08:48 +1100)]
Merge pull request #13198 from seamuslee001/event_search_561
dev/core#561 Remove jcalendar from the Event Aggregate Custom Search
Eileen McNaughton [Sat, 1 Dec 2018 21:45:28 +0000 (10:45 +1300)]
Merge pull request #13195 from seamuslee001/npm_update
Update npm dependencies to fix audit issues
Eileen McNaughton [Sat, 1 Dec 2018 21:42:46 +0000 (10:42 +1300)]
Merge pull request #13176 from aydun/flatten_fix
Flatten fix
Seamus Lee [Sat, 1 Dec 2018 21:40:27 +0000 (08:40 +1100)]
dev/core#561 Convert Activtiy Custom Search from jcalendar to datepicker and fix indenting in tpl file
Eileen McNaughton [Sat, 1 Dec 2018 21:40:56 +0000 (10:40 +1300)]
Merge pull request #13199 from seamuslee001/lab_core_125
dev/core#125 Fix Doc url to custom fields user documentation
Eileen McNaughton [Sat, 1 Dec 2018 21:28:06 +0000 (10:28 +1300)]
Merge pull request #13186 from aydun/override_active_tokens
(REF) Allow subclasses of AbstractTokenSubscriber to override the determination of active tokens.
Seamus Lee [Sat, 1 Dec 2018 20:32:53 +0000 (20:32 +0000)]
Remove Defunct Templates from CiviMail
Seamus Lee [Sat, 1 Dec 2018 05:56:19 +0000 (05:56 +0000)]
dev/core#561 Remove jcalendar from the Event Aggregate Custom Search
Seamus Lee [Sat, 1 Dec 2018 08:26:17 +0000 (08:26 +0000)]
dev/core#125 Fix Doc url to custom fields user documentation
Seamus Lee [Fri, 30 Nov 2018 23:24:18 +0000 (10:24 +1100)]
Merge pull request #13193 from civicrm/5.8
5.8
Seamus Lee [Fri, 30 Nov 2018 22:17:23 +0000 (22:17 +0000)]
Update npm dependancies to fix audit issues
Seamus Lee [Fri, 30 Nov 2018 21:57:55 +0000 (21:57 +0000)]
dev/core#498 Update Mailing Report to fix undefined property error
Seamus Lee [Fri, 30 Nov 2018 21:53:47 +0000 (08:53 +1100)]
Merge pull request #13172 from mattwire/events_tabheader_fixselectedchild
Fix links for tabs on manage event
Aidan Saunders [Fri, 30 Nov 2018 13:39:38 +0000 (13:39 +0000)]
Fix test now that flatten does not suppress 0 values
Monish Deb [Fri, 30 Nov 2018 12:35:54 +0000 (18:05 +0530)]
dev-core#565: Make subject field of Note, inline editable in contact summary page
Matthew Wire (MJW Consulting) [Thu, 29 Nov 2018 10:20:25 +0000 (10:20 +0000)]
Fix links for tabs on manage event (events use separate URLs for each tab but need selectedChild to be specified or the default tab is loaded
Aidan Saunders [Fri, 30 Nov 2018 09:59:43 +0000 (09:59 +0000)]
Avoid any unintended consequences of flatten preserving keys with empty values (PR #13176)
Aidan Saunders [Mon, 5 Nov 2018 18:16:09 +0000 (18:16 +0000)]
Allow subclasses to override the determination of active tokens.
This enables variable named tokens.
Monish Deb [Fri, 30 Nov 2018 08:48:30 +0000 (14:18 +0530)]
Merge pull request #13151 from eileenmcnaughton/payment_function
Extract getContributionBalance function, use that rather than wrapper…
Seamus Lee [Fri, 30 Nov 2018 05:00:09 +0000 (16:00 +1100)]
Merge pull request #13179 from eileenmcnaughton/dedupe_rule
Test support for fixing dev/core#397 including adding Rule api
Eileen McNaughton [Fri, 30 Nov 2018 04:51:44 +0000 (17:51 +1300)]
Merge pull request #13184 from civicrm/5.8
5.8
Seamus Lee [Fri, 30 Nov 2018 04:50:04 +0000 (15:50 +1100)]
Merge pull request #13177 from eileenmcnaughton/net_amount
Fix failure to calculate net_amount correctly on update when fee_amount is not in the parameters.
Eileen McNaughton [Fri, 30 Nov 2018 04:48:42 +0000 (17:48 +1300)]
Merge pull request #13182 from civicrm/5.8
5.8
Seamus Lee [Fri, 30 Nov 2018 04:43:47 +0000 (15:43 +1100)]
Merge pull request #13178 from eileenmcnaughton/net_amount_form
dev/core#552 Fix missaving of net_amount
eileen [Fri, 30 Nov 2018 00:57:32 +0000 (13:57 +1300)]
Set default financial_type_id for creating new payment processors at form and api level
eileen [Thu, 29 Nov 2018 23:34:20 +0000 (12:34 +1300)]
Add Dedupe Rule api
Tim Otten [Fri, 30 Nov 2018 01:00:06 +0000 (17:00 -0800)]
Merge pull request #13180 from GinkgoFJG/dev/core#559
(dev/core#559) Declare crmUi's dependency on ui.utils.
Frank J. Gómez [Thu, 29 Nov 2018 23:19:14 +0000 (18:19 -0500)]
(dev/core#559) Declare crmUi's dependency on ui.utils.
eileen [Thu, 29 Nov 2018 23:14:32 +0000 (12:14 +1300)]
Add unit test improvements to support testing dev/core#397
I have marked the test incomplete as we get a fatal error on the actual test for #397
(with or without the proposed fix) but I think if we merge this it makes it easy to complete
#397
eileen [Thu, 29 Nov 2018 22:17:55 +0000 (11:17 +1300)]
Add Rule api for dedupe rule & fix tests to use it.
Tests seem to be languishing on the painfulness of creating Reules without an api so adding one.
Note that there is good automatic test coverage under SyntaxConformance for this.
I also removed a pointless piece of code
Eileen McNaughton [Thu, 29 Nov 2018 21:52:00 +0000 (10:52 +1300)]
Merge pull request #13175 from aydun/displayvalue_fixes
Displayvalue fixes
eileen [Thu, 29 Nov 2018 21:49:32 +0000 (10:49 +1300)]
Fix missaving of net_amount
dev/core#552 it seems net_amount was removed incompletely
from the additional info form - causing it to block updating of the value when it should have been updated
eileen [Thu, 29 Nov 2018 21:36:26 +0000 (10:36 +1300)]
Fix failure to calculate net_amount correctly on update when fee_amount is not in the parameters.
Aidan Saunders [Wed, 28 Nov 2018 15:37:23 +0000 (15:37 +0000)]
Test for CRM_Core_BAO_CustomField::displayValue() contact ref
Aidan Saunders [Wed, 28 Nov 2018 14:51:04 +0000 (14:51 +0000)]
Fix bug if string value is passed to CRM_Core_BAO_CustomField::displayValue() for a contact ref
Aidan Saunders [Wed, 31 Oct 2018 19:07:09 +0000 (19:07 +0000)]
Add test for CRM_Utils_Array::flatten()
Aidan Saunders [Wed, 15 Aug 2018 19:24:36 +0000 (20:24 +0100)]
Don't lose keys with empty values when flattening array
Christian Wach [Thu, 29 Nov 2018 11:23:43 +0000 (11:23 +0000)]
Prevent viewport jump when toggling help on "Administer CiviCRM" screen
Eileen McNaughton [Thu, 29 Nov 2018 05:45:55 +0000 (18:45 +1300)]
Merge pull request #13059 from seamuslee001/lab_core_505
dev/core#505 Allow Extensions to specify crmType and phpType when dea…
Eileen McNaughton [Thu, 29 Nov 2018 04:14:29 +0000 (17:14 +1300)]
Merge pull request #13147 from eileenmcnaughton/dash_fix
Fixes to enable UserDashboard tests to all run
Eli Lisseck [Thu, 29 Nov 2018 01:04:59 +0000 (17:04 -0800)]
dev/core/482 resolve issue for inline template as well
Eli Lisseck [Wed, 28 Nov 2018 23:38:11 +0000 (15:38 -0800)]
dev/core/482 standardize contact edit form delete block behavior
Seamus Lee [Wed, 28 Nov 2018 22:41:18 +0000 (09:41 +1100)]
Merge pull request #13168 from totten/master-prevnext-metadata
(dev/core#217) Search.setting.php - Fix mismatched metadata
Tim Otten [Wed, 28 Nov 2018 21:08:47 +0000 (13:08 -0800)]
(dev/core#217) Search.setting.php - Fix mismatched metadata
The setting `prevNextBackend` was introduced in PR #12665. The PR was
originally written for an earlier version (circa 5.6) and eventually
merged in a later version (circa 5.9). The metadata should match
the version-number of the actual release.
Eileen McNaughton [Wed, 28 Nov 2018 20:23:59 +0000 (09:23 +1300)]
Merge pull request #13157 from eileenmcnaughton/currency
Set currency template variable from contribution pages
Eileen McNaughton [Wed, 28 Nov 2018 20:19:09 +0000 (09:19 +1300)]
Merge pull request #13161 from colemanw/Api3
Api3 profile:submit - fix handling of greeting fields
eileen [Wed, 28 Nov 2018 02:11:53 +0000 (15:11 +1300)]
Fixes to enable UserDashboard tests to all run
Joe Murray [Wed, 28 Nov 2018 19:58:53 +0000 (14:58 -0500)]
Merge pull request #13162 from francescbassas/patch-16
Avoid permission checking on getOrganizationNames
Coleman Watts [Tue, 27 Nov 2018 19:23:17 +0000 (14:23 -0500)]
Api3 profile:submit - fix handling of greeting fields
colemanw [Wed, 28 Nov 2018 13:04:29 +0000 (08:04 -0500)]
Merge pull request #13166 from eileenmcnaughton/misc
Trivial code cleanup
Seamus Lee [Wed, 28 Nov 2018 11:48:41 +0000 (22:48 +1100)]
Merge pull request #13167 from eileenmcnaughton/checksum
[NFC] Extract getUserCheckSum function
eileen [Wed, 28 Nov 2018 04:28:34 +0000 (17:28 +1300)]
[NFC] Extract getUserCheckSum function
eileen [Wed, 28 Nov 2018 04:13:17 +0000 (17:13 +1300)]
Minor code cleanups.
Removes an instance where is instantiated using the old & pattern and
fixes a non-quoted word in a template which causes notices under some configs
Tim Otten [Tue, 27 Nov 2018 23:34:13 +0000 (15:34 -0800)]
(dev/core#217) PrevNext - More conservative transition (5.7=>5.8=>5.9)
This revision sets up more conservative transition process for adopting PrevNext drivers.
Before
------
* 5.7.x - Hard-coded to SQL driver.
* 5.8.x - Allow setting to pick driver. If left as `default`, then choose best-available (based on configured services).
After
------
* 5.7.x - Hard-coded to SQL driver.
* 5.8.x - Allow setting to pick driver. If left as `default`, then use SQL driver.
* 5.9.x - Allow setting to pick driver. If left as `default`, then choose best-available (based on configured services).
This essentially mitigates the risk that bugs in the new Redis driver cause regreessions for sites already running Redis.
Eileen McNaughton [Wed, 28 Nov 2018 04:03:46 +0000 (17:03 +1300)]
Merge pull request #12665 from totten/master-prevnext-redis
(dev/core#217) PrevNext - Implement Redis. Decouple Query::getCachedContacts().
Tim Otten [Tue, 14 Aug 2018 23:08:16 +0000 (16:08 -0700)]
(dev/core#217) PrevNext - Add settings for admin to choose backend
The auto-detection is a good default policy. However, this is new
functionality. If some bug gets through the review/RC cycles, then this
option provides an escape path.
Tim Otten [Thu, 26 Jul 2018 23:00:54 +0000 (16:00 -0700)]
(dev/core#217) PrevNext - Cleanup parameter name in Sql::markSelection
The new name is prettier and matches the names in `CRM_Core_PrevNextCache_{Interface,Redis}`.
Tim Otten [Mon, 9 Jul 2018 01:02:01 +0000 (18:02 -0700)]
(dev/core#217) Implement Redis driver for PrevNext handling
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.
francescbassas [Tue, 27 Nov 2018 21:02:47 +0000 (22:02 +0100)]
Avoid permission checking on getOrganizationNames
[Bookkeeping Transactions Report insufficient permissions](https://lab.civicrm.org/dev/core/issues/551)