civicrm-core.git
6 years agodev/core/#/233 Use merged data api to display navigation help on contact deleted...
eileen [Tue, 17 Jul 2018 05:18:42 +0000 (17:18 +1200)]
dev/core/#/233 Use merged data api to display navigation help on contact deleted by merge

6 years agodev/core/#/233 Add apis to retrieve information about the ultimate destination contac...
eileen [Tue, 17 Jul 2018 04:38:31 +0000 (16:38 +1200)]
dev/core/#/233 Add apis to retrieve information about the ultimate destination contact and source contacts for merged contacts.

This 'data structure' is 'owned' by core & somewhat subject to future change so establishing a tested methodology for retrieving contact history in
core can support extensions such as
- extended reports - which exposes an address_history tab
- privacy extensions - which need to recover and potentially delete contacts that were merged
into the current contact

6 years agoMerge pull request #12482 from mattwire/nfc_cc_premium_financial
Eileen McNaughton [Tue, 17 Jul 2018 07:00:28 +0000 (19:00 +1200)]
Merge pull request #12482 from mattwire/nfc_cc_premium_financial

NFC cleanup to financial classes

6 years agoMerge pull request #12230 from JMAConsulting/dev_core_150
Eileen McNaughton [Tue, 17 Jul 2018 06:24:52 +0000 (18:24 +1200)]
Merge pull request #12230 from JMAConsulting/dev_core_150

dev/core#150 : Chain select for country/state in Search Builder does not stay within OR groupings

6 years agoMerge pull request #12486 from eileenmcnaughton/savedSearch
Eileen McNaughton [Tue, 17 Jul 2018 04:50:25 +0000 (16:50 +1200)]
Merge pull request #12486 from eileenmcnaughton/savedSearch

dev/core#230 : set mapping id null on delete action

6 years agoMerge pull request #12415 from aydun/core-34-v2
Eileen McNaughton [Tue, 17 Jul 2018 00:20:47 +0000 (12:20 +1200)]
Merge pull request #12415 from aydun/core-34-v2

core-34 Add view-only option on permissioned relationships

6 years agodev/core#230 : set mapping id null on delete action
Sunil Pawar [Mon, 16 Jul 2018 23:07:09 +0000 (11:07 +1200)]
dev/core#230 : set mapping id null on delete action

6 years agoMerge pull request #12452 from colemanw/arrayPath
Eileen McNaughton [Mon, 16 Jul 2018 22:56:39 +0000 (10:56 +1200)]
Merge pull request #12452 from colemanw/arrayPath

Cleanup redundant array functions

6 years agoMerge pull request #12460 from freephile/patch-1
Eileen McNaughton [Mon, 16 Jul 2018 22:38:26 +0000 (10:38 +1200)]
Merge pull request #12460 from freephile/patch-1

Fix false negatives in checkResourceUrl()

6 years agoMerge pull request #12484 from eileenmcnaughton/queryFields
Eileen McNaughton [Mon, 16 Jul 2018 22:15:08 +0000 (10:15 +1200)]
Merge pull request #12484 from eileenmcnaughton/queryFields

Export code tidy up Use queryFields rather than query. Look to stop passing around query.

6 years agoMerge pull request #11660 from JMAConsulting/CRM-21754
colemanw [Mon, 16 Jul 2018 22:12:21 +0000 (18:12 -0400)]
Merge pull request #11660 from JMAConsulting/CRM-21754

CRM-21754: Duplicate rows in Activity Details report when address fields are displayed

6 years agoFix false positives in checkResourceUrl()
Greg Rundlett [Thu, 12 Jul 2018 13:47:27 +0000 (09:47 -0400)]
Fix false positives in checkResourceUrl()

Without this proposed fix, I'm receiving false errors about the CiviCRM Resource URL not being set correctly.

The stripos() function will return '0' if the needle string is the first thing found in the haystack. Thus, you must use equivalence rather than a true/false test where "position zero" evaluates to false.

Tested on Civi 5.3.0 on WordPress 4.9.7

I can access http://coastaltrails.org/wp-content/plugins/civicrm/civicrm/packages/jquery/css/images/arrow.png But WITHOUT the fix, I get an error
```
The Resource URL is not set correctly. Please set the CiviCRM Resource URL.
```
I have CiviCRM Resource URL set to `[civicrm.root]/`

My URL Variables are calculated as:
```
[cms.root] http://coastaltrails.org/
[civicrm.root] http://coastaltrails.org/wp-content/plugins/civicrm/civicrm/
[civicrm.files] http://coastaltrails.org/wp-content/uploads/civicrm/
These variables are computed automatically using civicrm.settings.php and its options, such as CIVICRM_TEMPLATE_COMPILEDIR.
```

6 years agoUse queryFields rather than query. Look to stop passing around query.
eileen [Mon, 16 Jul 2018 03:18:22 +0000 (15:18 +1200)]
Use queryFields rather than query. Look to stop passing around query.

6 years agoMerge pull request #12479 from eileenmcnaughton/export_class
Eileen McNaughton [Mon, 16 Jul 2018 12:42:04 +0000 (00:42 +1200)]
Merge pull request #12479 from eileenmcnaughton/export_class

Export class code cleanup Start building export processor class.

6 years agoNFC cleanup to financial classes
Matthew Wire [Mon, 16 Jul 2018 09:27:30 +0000 (10:27 +0100)]
NFC cleanup to financial classes

6 years agoStart building export processor class.
eileen [Sun, 15 Jul 2018 23:53:22 +0000 (11:53 +1200)]
Start building export processor class.

A fundamental cause of code mess in the Export class is that it is a mishmash of static functions with variables passed around crazily. This starts the process of moving work to a object oriented class.

I think this migratory approach is the best plan to clean up the code

I did move some vars to being accessed via 'self' but there is leakage across tests so going
full OOO seems like a better approach

6 years agoMerge pull request #12453 from eileenmcnaughton/activity_report
Eileen McNaughton [Mon, 16 Jul 2018 04:54:27 +0000 (16:54 +1200)]
Merge pull request #12453 from eileenmcnaughton/activity_report

Fix activity report to bring it under standardised report testing

6 years agoAlter temp report creation to
eileen [Fri, 13 Jul 2018 04:46:32 +0000 (16:46 +1200)]
Alter temp report creation to
a) use new temp table mechanism and
b) add sql to dev tab and
c) make temp table cleanup easier in tests

6 years agoFix activity report to bring it under standardised report testing
eileen [Wed, 11 Jul 2018 03:58:27 +0000 (15:58 +1200)]
Fix activity report to bring it under standardised report testing

6 years agoMerge pull request #12423 from mattwire/optiongroup_isreserved
Eileen McNaughton [Mon, 16 Jul 2018 00:39:30 +0000 (12:39 +1200)]
Merge pull request #12423 from mattwire/optiongroup_isreserved

dev/core#155 Fix optiongroup is_reserved data and use when selecting option group for custom fields

6 years agoMerge pull request #12474 from mattwire/deprecate_bao_managepremiums
Eileen McNaughton [Mon, 16 Jul 2018 00:17:21 +0000 (12:17 +1200)]
Merge pull request #12474 from mattwire/deprecate_bao_managepremiums

Rename CRM_Contribute_BAO_ManagePremiums to CRM_Contribute_BAO_Product and deprecate CRM_Contribute_BAO_ManagePremiums

6 years agoMerge pull request #12352 from MiyaNoctem/CRM-188-fix-floating-point-comparison
Eileen McNaughton [Sun, 15 Jul 2018 23:02:58 +0000 (11:02 +1200)]
Merge pull request #12352 from MiyaNoctem/CRM-188-fix-floating-point-comparison

dev/core#188: Fix Floating Point Precision Comparison Exception

6 years agoMerge pull request #12315 from mattwire/CRM-21682_onlyrenewmembershipwhencompleted
Eileen McNaughton [Sun, 15 Jul 2018 22:16:26 +0000 (10:16 +1200)]
Merge pull request #12315 from mattwire/CRM-21682_onlyrenewmembershipwhencompleted

Only auto-renew membership when contribution status is completed

6 years agoMerge pull request #12477 from seamuslee001/membership_type_test_comment
Eileen McNaughton [Sun, 15 Jul 2018 22:03:07 +0000 (10:03 +1200)]
Merge pull request #12477 from seamuslee001/membership_type_test_comment

(NFC) Update comment on membership type domain_id API Test

6 years agoMerge pull request #12478 from seamuslee001/optiongroup_regen_dao
Eileen McNaughton [Sun, 15 Jul 2018 22:02:31 +0000 (10:02 +1200)]
Merge pull request #12478 from seamuslee001/optiongroup_regen_dao

(NFC) Regenerate OptionGroup DAO file

6 years agoMerge pull request #12476 from colemanw/navigation
colemanw [Sun, 15 Jul 2018 20:57:54 +0000 (16:57 -0400)]
Merge pull request #12476 from colemanw/navigation

BAO_Navigation: Respect domain_id param

6 years agoAdd test, remove redundant api default
Coleman Watts [Sun, 15 Jul 2018 15:08:53 +0000 (11:08 -0400)]
Add test, remove redundant api default

6 years agoAdd unit test for Membership renewal when contribution not completed
Matthew Wire [Sat, 14 Jul 2018 17:46:31 +0000 (18:46 +0100)]
Add unit test for Membership renewal when contribution not completed

6 years agoDon't overwrite Product parameters on update
Matthew Wire [Sun, 15 Jul 2018 11:03:26 +0000 (12:03 +0100)]
Don't overwrite Product parameters on update

6 years agoOnly auto-renew membership when contribution status is completed
Matthew Wire [Fri, 15 Jun 2018 08:07:52 +0000 (09:07 +0100)]
Only auto-renew membership when contribution status is completed

6 years agoMerge pull request #12312 from colemanw/multiRecordCustomProfile
Seamus Lee [Sun, 15 Jul 2018 04:07:37 +0000 (14:07 +1000)]
Merge pull request #12312 from colemanw/multiRecordCustomProfile

Disable inline-edit of multi-record custom fields in profiles

6 years ago(NFC) Regenerate OptionGroup DAO file
Seamus Lee [Sun, 15 Jul 2018 03:57:00 +0000 (13:57 +1000)]
(NFC) Regenerate OptionGroup DAO file

6 years ago(NFC) Update comment on membership type domain_id API Test
Seamus Lee [Sun, 15 Jul 2018 03:50:49 +0000 (13:50 +1000)]
(NFC) Update comment on membership type domain_id API Test

6 years agoBAO_Navigation: Respect domain_id param
Coleman Watts [Sun, 15 Jul 2018 02:58:22 +0000 (22:58 -0400)]
BAO_Navigation: Respect domain_id param

6 years agoMerge pull request #12461 from eileenmcnaughton/domain_id
Seamus Lee [Sat, 14 Jul 2018 22:37:19 +0000 (08:37 +1000)]
Merge pull request #12461 from eileenmcnaughton/domain_id

Make domain_id optional in membership_type api.

6 years agoMerge pull request #12472 from eileenmcnaughton/add_product
Seamus Lee [Sat, 14 Jul 2018 21:22:30 +0000 (07:22 +1000)]
Merge pull request #12472 from eileenmcnaughton/add_product

Remove unused variables & comment cleanup

6 years agoRename CRM_Contribute_BAO_ManagePremiums to CRM_Contribute_BAO_Product and deprecate...
Matthew Wire [Sat, 14 Jul 2018 16:14:03 +0000 (17:14 +0100)]
Rename CRM_Contribute_BAO_ManagePremiums to CRM_Contribute_BAO_Product and deprecate CRM_Contribute_BAO_ManagePremiums

6 years agoFix is_reserved flag on option groups
Matthew Wire [Wed, 11 Jul 2018 11:59:29 +0000 (12:59 +0100)]
Fix is_reserved flag on option groups

6 years agoComment clean up
eileen [Sat, 14 Jul 2018 02:09:55 +0000 (14:09 +1200)]
Comment clean up

6 years agoRemove redundant variables
eileen [Sat, 14 Jul 2018 02:03:23 +0000 (14:03 +1200)]
Remove redundant variables

6 years agoMerge pull request #12464 from jaapjansma/issue_141
Eileen McNaughton [Sat, 14 Jul 2018 01:25:28 +0000 (13:25 +1200)]
Merge pull request #12464 from jaapjansma/issue_141

Fixed #141: only check if name exists.

6 years agoMerge pull request #12465 from WeMoveEU/core-256
Eileen McNaughton [Fri, 13 Jul 2018 23:22:14 +0000 (11:22 +1200)]
Merge pull request #12465 from WeMoveEU/core-256

dev/core#256 - use unsigned int for temporary recipient ids

6 years agoMerge pull request #12320 from mattwire/export_form_select_tweaks
Seamus Lee [Fri, 13 Jul 2018 21:29:35 +0000 (07:29 +1000)]
Merge pull request #12320 from mattwire/export_form_select_tweaks

Non functional changes towards shared functions in Core_Form_Task

6 years agodev/core#256 - use unsigned int for temporary recipient ids
Romain Thouvenin [Fri, 13 Jul 2018 13:55:43 +0000 (15:55 +0200)]
dev/core#256 - use unsigned int for temporary recipient ids

6 years agoCRM-188: Fix Floating Point Precision Comparison Exception
Camilo Rodriguez [Mon, 18 Jun 2018 18:48:44 +0000 (18:48 +0000)]
CRM-188: Fix Floating Point Precision Comparison Exception

Under certain circumstances, floating point comparison between set and
calculated values may fail, even if they should be equal. This is due to the
way floating point values are represented internally in binary form. To avoid
this problem, comparison needs to be made using an expected precision below
which compared values may be treated as equal. Implemented  precision of 0.001
and used it to check the difference between both values is less.

6 years agoMerge pull request #12290 from eileenmcnaughton/export
Eileen McNaughton [Fri, 13 Jul 2018 10:43:21 +0000 (22:43 +1200)]
Merge pull request #12290 from eileenmcnaughton/export

Export class code readability - Reduce passing of variable, define on class

6 years agoMerge pull request #12462 from seamuslee001/nfc_kamra_cv
Eileen McNaughton [Fri, 13 Jul 2018 10:24:52 +0000 (22:24 +1200)]
Merge pull request #12462 from seamuslee001/nfc_kamra_cv

(NFC) Ignore generated karma.cv.js file

6 years agoFixed #141: only check if name exists.
Jaap Jansma [Fri, 13 Jul 2018 09:33:10 +0000 (09:33 +0000)]
Fixed #141: only check if name exists.

6 years ago(NFC) Ignore generated karma.cv.js file
Seamus Lee [Fri, 13 Jul 2018 04:03:35 +0000 (14:03 +1000)]
(NFC) Ignore generated karma.cv.js file

Ingore /tmp as per tim

6 years agoMake domain_id optional in membership_type api.
eileen [Fri, 13 Jul 2018 03:53:32 +0000 (15:53 +1200)]
Make domain_id optional in membership_type api.

This is in support of #12439 & making domain_id optional

6 years agoMerge pull request #12456 from chamilwijesooriya/issue-93
Monish Deb [Fri, 13 Jul 2018 03:44:19 +0000 (09:14 +0530)]
Merge pull request #12456 from chamilwijesooriya/issue-93

Issue #93 Update CRM_Utils_Rule::mysqlOrderBy() to accommodate more than 2 joins

6 years agoMerge pull request #10673 from JMAConsulting/CRM-20845
Eileen McNaughton [Fri, 13 Jul 2018 03:37:29 +0000 (15:37 +1200)]
Merge pull request #10673 from JMAConsulting/CRM-20845

CRM-20845: create alterMailingRecipients hook

6 years agoMerge pull request #11838 from mfb/ses-smtp-support
Eileen McNaughton [Fri, 13 Jul 2018 02:31:25 +0000 (14:31 +1200)]
Merge pull request #11838 from mfb/ses-smtp-support

CiviMail: Fix logic for handling SMTP socket errors, temporary failures and permanent failures

6 years agoMerge pull request #12346 from michaelmcandrew/dev/mail/15
Seamus Lee [Fri, 13 Jul 2018 00:56:14 +0000 (10:56 +1000)]
Merge pull request #12346 from michaelmcandrew/dev/mail/15

dev/mail/15 deal better with spaces in from email address

6 years agoMerge pull request #12449 from colemanw/gettree
colemanw [Thu, 12 Jul 2018 23:13:33 +0000 (19:13 -0400)]
Merge pull request #12449 from colemanw/gettree

CustomValue gettree api - More accurate permission check

6 years agoMerge pull request #12436 from mattwire/financial_type_pseudoconstant
Eileen McNaughton [Thu, 12 Jul 2018 23:06:12 +0000 (11:06 +1200)]
Merge pull request #12436 from mattwire/financial_type_pseudoconstant

dev/core#241 Fix Manage Premiums UI

6 years agoMerge pull request #12459 from yashodha/dev-255
Eileen McNaughton [Thu, 12 Jul 2018 23:00:12 +0000 (11:00 +1200)]
Merge pull request #12459 from yashodha/dev-255

(dev/core#255) Changes to copied event location reflects in original …

6 years ago(dev/core#255) Changes to copied event location reflects in original event location
yashodha [Thu, 12 Jul 2018 09:45:20 +0000 (15:15 +0530)]
(dev/core#255) Changes to copied event location reflects in original event location

6 years agoFixed errors: "Failure in api call for Country get: Unknown field specified for...
Chamil Wijesooriya [Thu, 12 Jul 2018 08:52:43 +0000 (09:52 +0100)]
Fixed errors: "Failure in api call for Country get:  Unknown field specified for sort. Cannot order by ''id DESC''"

6 years agoMerge pull request #12458 from mlutfy/pricefield-isset
Eileen McNaughton [Thu, 12 Jul 2018 03:18:08 +0000 (15:18 +1200)]
Merge pull request #12458 from mlutfy/pricefield-isset

PriceField: show pre/post help if not empty, not if isset.

6 years agoPriceField: show pre/post help if not empty, not if isset.
Mathieu Lutfy [Wed, 11 Jul 2018 20:46:37 +0000 (16:46 -0400)]
PriceField: show pre/post help if not empty, not if isset.

6 years agoMerge pull request #12451 from eileenmcnaughton/premiums
colemanw [Wed, 11 Jul 2018 16:47:13 +0000 (12:47 -0400)]
Merge pull request #12451 from eileenmcnaughton/premiums

Deprecate  array on ManagePremiums

6 years agoIssue #93 Update CRM_Utils_Rule::mysqlOrderBy() to accommodate more than 2 joins
Chamil Wijesooriya [Wed, 11 Jul 2018 12:03:15 +0000 (13:03 +0100)]
Issue #93 Update CRM_Utils_Rule::mysqlOrderBy() to accommodate more than 2 joins

6 years agoSwitch to API and get all option groups that are not reserved instead of only ones...
Matthew Wire [Tue, 29 May 2018 20:57:35 +0000 (21:57 +0100)]
Switch to API and get all option groups that are not reserved instead of only ones that are already linked to custom fields

6 years agoDon't reset financial type every time product is edited
Matthew Wire [Tue, 10 Jul 2018 16:27:39 +0000 (17:27 +0100)]
Don't reset financial type every time product is edited

6 years agoEnable pseudoconstant for financial_type and use it to display financial type for...
Matthew Wire [Fri, 6 Jul 2018 17:37:20 +0000 (18:37 +0100)]
Enable pseudoconstant for financial_type and use it to display financial type for premiums. Add "cost" column to premium UI and properly format money

6 years agoMerge pull request #12450 from eileenmcnaughton/comments
Seamus Lee [Wed, 11 Jul 2018 04:00:09 +0000 (14:00 +1000)]
Merge pull request #12450 from eileenmcnaughton/comments

[NFC] Comment fixes

6 years agoCleanup redundant array functions
Coleman Watts [Wed, 11 Jul 2018 02:23:29 +0000 (22:23 -0400)]
Cleanup redundant array functions

6 years agoMerge pull request #12392 from madhavimalgaonkar/issue-221
Eileen McNaughton [Wed, 11 Jul 2018 01:00:32 +0000 (13:00 +1200)]
Merge pull request #12392 from madhavimalgaonkar/issue-221

dev/core#221, check if the grouptree is not empty

6 years agoComment fixes
eileen [Wed, 11 Jul 2018 00:36:11 +0000 (12:36 +1200)]
Comment fixes

6 years agoDeprecate array on ManagePremiums
eileen [Wed, 11 Jul 2018 00:33:53 +0000 (12:33 +1200)]
Deprecate  array on ManagePremiums

6 years agoMerge pull request #12448 from civicrm/5.4
Eileen McNaughton [Wed, 11 Jul 2018 00:20:53 +0000 (12:20 +1200)]
Merge pull request #12448 from civicrm/5.4

5.4

6 years agoMerge pull request #12410 from eileenmcnaughton/option_group
colemanw [Tue, 10 Jul 2018 23:49:31 +0000 (19:49 -0400)]
Merge pull request #12410 from eileenmcnaughton/option_group

dev/core/issues/228 fix OptionGroup create action to not disable on update

6 years agoCustomValue gettree api - More accurate permission check
Coleman Watts [Tue, 10 Jul 2018 22:45:43 +0000 (18:45 -0400)]
CustomValue gettree api - More accurate permission check

6 years agoMerge pull request #12373 from JMAConsulting/access-3-contact-dash
colemanw [Tue, 10 Jul 2018 21:28:56 +0000 (17:28 -0400)]
Merge pull request #12373 from JMAConsulting/access-3-contact-dash

dev/accessibility#3: Add accessible label on Contact Edit form elements and helpicon

6 years agoDisable inline-edit of multi-record custom fields in profiles
Coleman Watts [Fri, 15 Jun 2018 03:20:17 +0000 (23:20 -0400)]
Disable inline-edit of multi-record custom fields in profiles

6 years agoMerge pull request #12447 from mattwire/allcontactexport_regression
Seamus Lee [Tue, 10 Jul 2018 20:36:35 +0000 (06:36 +1000)]
Merge pull request #12447 from mattwire/allcontactexport_regression

dev/core#249 Fix crash when performing export all contacts from search

6 years agoFix crash when performing export all contacts from search
Matthew Wire [Mon, 9 Jul 2018 22:38:10 +0000 (23:38 +0100)]
Fix crash when performing export all contacts from search

6 years agoMerge pull request #12445 from MiyaNoctem/CRM-21425-make-inbound-emails-editable...
Seamus Lee [Mon, 9 Jul 2018 23:25:01 +0000 (09:25 +1000)]
Merge pull request #12445 from MiyaNoctem/CRM-21425-make-inbound-emails-editable-try-2

CRM-21425: Make Inbound Emails Editable With Permissions

6 years agoMerge pull request #12384 from JMAConsulting/dev-core-218
Eileen McNaughton [Mon, 9 Jul 2018 22:13:09 +0000 (10:13 +1200)]
Merge pull request #12384 from JMAConsulting/dev-core-218

dev/core#218 : On Case Type listing page, for reserved ones the, 'More' link don't show any options

6 years agoNon functional changes towards shared functions in Core_Form_Task
Matthew Wire [Fri, 15 Jun 2018 09:23:33 +0000 (10:23 +0100)]
Non functional changes towards shared functions in Core_Form_Task

6 years agoMerge pull request #12442 from colemanw/crmeditable.tpl
Eileen McNaughton [Mon, 9 Jul 2018 21:30:42 +0000 (09:30 +1200)]
Merge pull request #12442 from colemanw/crmeditable.tpl

Remove old deprecated crmeditable.tpl

6 years agoMerge pull request #12443 from colemanw/empty
Eileen McNaughton [Mon, 9 Jul 2018 21:29:47 +0000 (09:29 +1200)]
Merge pull request #12443 from colemanw/empty

Fix potential undefined array index

6 years agoMake permission condition more explicit
Aidan Saunders [Fri, 6 Jul 2018 14:51:28 +0000 (15:51 +0100)]
Make permission condition more explicit

6 years agoMerge pull request #12438 from totten/master-contact-sel
colemanw [Mon, 9 Jul 2018 11:44:07 +0000 (07:44 -0400)]
Merge pull request #12438 from totten/master-contact-sel

(dev/core#217) CRM_Contact_Selector::getRows() - Use generator instead of DAO loop

6 years agoCRM-21425: Fix 'Array' Appearing Insted of Empty Details
Camilo Rodriguez [Thu, 18 Jan 2018 22:19:19 +0000 (22:19 +0000)]
CRM-21425: Fix 'Array' Appearing Insted of Empty Details

When having only basic access to edit inbound e-mails, if the task's details
are null, an message saying 'Array' was being shown, instead of the empty
details.

Fixed by changing null for an empty string.

6 years agoCRM-21425: Allow to Edit Inbound E-mails Within CiviCase
Camilo Rodriguez [Thu, 11 Jan 2018 15:00:50 +0000 (15:00 +0000)]
CRM-21425: Allow to Edit Inbound E-mails Within CiviCase

Civicase used the activity's detail view form to show the detail for the
activity and the edit and delete buttons, but the preprocessing lacked setting
the required flags so the form buttons were shown.

Fixed by setting the required flags and refactoring the new permissions check
into the Activity BAO.

6 years agoCRM-21425: Add Permissions to Edit Inbound E-mails
Camilo Rodriguez [Tue, 14 Nov 2017 19:21:30 +0000 (19:21 +0000)]
CRM-21425: Add Permissions to Edit Inbound E-mails

The following permissions were added to CiviCRM core:

- CiviCRM: edit inbound email basic information
- CiviCRM: edit inbound email basic information and content

Having any of these permissions will alow  user to edit inbound E-mails, but
only the latter will allow users to also change the original email's content.

E-mails downloaded and stored as Inbound Email activities were saving their
details in two formats, as an ezComponents-parsed representation of
a text with alternatives. These alternatives were being stripped on the
Activity Form template, with the side effect of also stripping the textarea
where the wysiwyg editor would be built upon.

Fixed by stripping alternatives when preprocessing the quickform instead,
before the html for the textarea is generated.

6 years agoFix potential undefined array index
Coleman Watts [Sun, 8 Jul 2018 16:23:53 +0000 (12:23 -0400)]
Fix potential undefined array index

6 years agoRemove old deprecated crmeditable.tpl
Coleman Watts [Sun, 8 Jul 2018 16:23:06 +0000 (12:23 -0400)]
Remove old deprecated crmeditable.tpl

6 years agoMerge pull request #12441 from totten/master-sql-del
colemanw [Sun, 8 Jul 2018 15:59:46 +0000 (11:59 -0400)]
Merge pull request #12441 from totten/master-sql-del

Implement CRM_Utils_SQL_Delete

6 years agoImplement CRM_Utils_SQL_Delete
Tim Otten [Sun, 8 Jul 2018 01:48:30 +0000 (18:48 -0700)]
Implement CRM_Utils_SQL_Delete

Before
------
* `CRM_Utils_SQL_Select` and `CRM_Utils_SQL_Insert` are query-building utilities.

After
-----
* `CRM_Utils_SQL_Select`, `CRM_Utils_SQL_Insert`, and `CRM_Utils_SQL_Delete` are query-building utilities.
* `CRM_Utils_SQL_Select` and `CRM_Utils_SQL_Delete` extend a common base-class, which includes parameter-management/interpolation functions.
    * (*Note: Initially tried doing this as a trait, but traits aren't allowed to define constants.*)

6 years ago(dev/core#217) CRM_Contact_Selector::getRows() - Use generator instead of DAO loop
Tim Otten [Fri, 29 Jun 2018 21:35:47 +0000 (14:35 -0700)]
(dev/core#217) CRM_Contact_Selector::getRows() - Use generator instead of DAO loop

Currently, cached data is read from MySQL, so it's OK to treat `$result` as
DAO.  However, eventually, we'll cache in a different data-source, and (when
dealing with multiple backend) it'll be easier to support a
`Generator<Object>` rather than `CRM_Core_DAO`.

See also: http://php.net/manual/en/language.generators.overview.php

6 years ago(dev/core#217) CRM_Core_DAO - Add a helper which returns results in generator format
Tim Otten [Fri, 29 Jun 2018 20:58:11 +0000 (13:58 -0700)]
(dev/core#217) CRM_Core_DAO - Add a helper which returns results in generator format

6 years agodev/core/issues/228 fix OptionGroup create action to not disable on update
eileen [Wed, 4 Jul 2018 04:04:35 +0000 (16:04 +1200)]
dev/core/issues/228 fix OptionGroup create action to not disable on update

6 years agoMerge pull request #12430 from JMAConsulting/dev-core-239
Eileen McNaughton [Fri, 6 Jul 2018 22:08:31 +0000 (10:08 +1200)]
Merge pull request #12430 from JMAConsulting/dev-core-239

dev/core#239 : Fix title dialog box on hovering form element on Event's configuration backend form

6 years agoMerge pull request #12422 from JMAConsulting/dev-core-176
Eileen McNaughton [Fri, 6 Jul 2018 22:03:31 +0000 (10:03 +1200)]
Merge pull request #12422 from JMAConsulting/dev-core-176

dev/core#176 Odd / Even street number sort column missing from Reports

6 years agoMerge pull request #12429 from eileenmcnaughton/comment
Monish Deb [Fri, 6 Jul 2018 09:43:59 +0000 (15:13 +0530)]
Merge pull request #12429 from eileenmcnaughton/comment

[NFC] Update comment link

6 years agodev/core#239 : Huge title dialog box on hovering form element on Event's configuratio...
deb.monish [Fri, 6 Jul 2018 09:38:41 +0000 (15:08 +0530)]
dev/core#239 : Huge title dialog box on hovering form element on Event's configuration backend form

6 years agoUpdate code link
eileen [Fri, 6 Jul 2018 08:17:00 +0000 (20:17 +1200)]
Update code link