civicrm-core.git
8 years agoMerge pull request #7692 from sarehag/master
colemanw [Thu, 28 Jan 2016 19:34:45 +0000 (14:34 -0500)]
Merge pull request #7692 from sarehag/master

CRM-17852 - Misspeled state names in Estonia/Lithuania - updated wher…

8 years agoMerge pull request #7678 from eileenmcnaughton/CRM-17882
Eileen McNaughton [Thu, 28 Jan 2016 15:24:18 +0000 (04:24 +1300)]
Merge pull request #7678 from eileenmcnaughton/CRM-17882

CRM-17882 Add index to civicrm_contribution.credit_note_id

8 years agoMerge pull request #7659 from JMAConsulting/CRM-16188-1
Eileen McNaughton [Thu, 28 Jan 2016 15:22:10 +0000 (04:22 +1300)]
Merge pull request #7659 from JMAConsulting/CRM-16188-1

--CRM-16188, added function to check the total amount and sum of line…

8 years agoMerge pull request #7690 from sarehag/master
Eileen McNaughton [Thu, 28 Jan 2016 15:15:37 +0000 (04:15 +1300)]
Merge pull request #7690 from sarehag/master

CRM-17852 - Misspeled state names in Estonia/Lithuania

8 years agoCRM-17852 - Misspeled state names in Estonia/Lithuania - updated where statements
sarehag [Thu, 28 Jan 2016 14:07:23 +0000 (15:07 +0100)]
CRM-17852 - Misspeled state names in Estonia/Lithuania - updated where statements

8 years agoCRM-17852 - Misspeled state names in Estonia/Lithuania
sarehag [Thu, 28 Jan 2016 11:55:02 +0000 (12:55 +0100)]
CRM-17852 - Misspeled state names in Estonia/Lithuania

8 years agoUpdate version to 4.7.1
CiviCRM [Wed, 27 Jan 2016 23:49:33 +0000 (15:49 -0800)]
Update version to 4.7.1

8 years agoMerge pull request #7688 from totten/master-verchk
Tim Otten [Wed, 27 Jan 2016 23:31:36 +0000 (15:31 -0800)]
Merge pull request #7688 from totten/master-verchk

CRM_Utils_VersionCheck - Don't display warning on first login

8 years agoCRM_Utils_VersionCheck - Don't display warning on first login
Tim Otten [Wed, 27 Jan 2016 23:14:48 +0000 (15:14 -0800)]
CRM_Utils_VersionCheck - Don't display warning on first login

Using `$config->uploadDir` will trigger automatic setup for the dir.
Using `Civi::paths->getPath()` does not.

8 years agoMerge pull request #7668 from totten/master-16514
Tim Otten [Wed, 27 Jan 2016 22:11:12 +0000 (14:11 -0800)]
Merge pull request #7668 from totten/master-16514

CRM-16514 - Scheduled reminder should not be sent repeatedly

8 years agoCRM-17882 Add index to civicrm_contribution.credit_note_id
eileen [Wed, 27 Jan 2016 18:58:00 +0000 (07:58 +1300)]
CRM-17882 Add index to civicrm_contribution.credit_note_id

Change-Id: I5ad63820a3df93995ebd65ec76a8b3aac87ba1c6

8 years agoMerge pull request #7682 from colemanw/undefined-index
colemanw [Wed, 27 Jan 2016 22:01:18 +0000 (17:01 -0500)]
Merge pull request #7682 from colemanw/undefined-index

Fix undefined index

8 years agoMerge pull request #7681 from colemanw/CRM-17886
colemanw [Wed, 27 Jan 2016 21:54:55 +0000 (16:54 -0500)]
Merge pull request #7681 from colemanw/CRM-17886

CRM-17886 - Fix contribution page toggleSubmitButton js

8 years agoCleanup duplicate js
Coleman Watts [Wed, 27 Jan 2016 21:51:34 +0000 (16:51 -0500)]
Cleanup duplicate js

8 years agoCRM-16514 - Scheduled reminder should not be sent repeatedly
Tim Otten [Wed, 27 Jan 2016 01:30:31 +0000 (17:30 -0800)]
CRM-16514 - Scheduled reminder should not be sent repeatedly

Forward port of jitendra's df8bf05e2dc6d4bd7979a0487a76f59fabf8a68b

8 years agoFix undefined index
Coleman Watts [Wed, 27 Jan 2016 21:25:07 +0000 (16:25 -0500)]
Fix undefined index

8 years agoCRM-17886 - Fix contribution page toggleSubmitButton js
Coleman Watts [Wed, 27 Jan 2016 21:20:23 +0000 (16:20 -0500)]
CRM-17886 - Fix contribution page toggleSubmitButton js

8 years agoMerge pull request #7673 from eileenmcnaughton/CRM-17752-re-do
colemanw [Wed, 27 Jan 2016 20:04:42 +0000 (15:04 -0500)]
Merge pull request #7673 from eileenmcnaughton/CRM-17752-re-do

CRM-17881 change index upgrade addition civicrm_financian_trxn.trxn_i…

8 years agoMerge pull request #7648 from eileenmcnaughton/master
Eileen McNaughton [Wed, 27 Jan 2016 20:01:46 +0000 (09:01 +1300)]
Merge pull request #7648 from eileenmcnaughton/master

Test Fix (entity tag ACL also needs access CiviCRM)

8 years agoMerge pull request #7675 from PalanteJon/CRM-17885
colemanw [Wed, 27 Jan 2016 19:59:06 +0000 (14:59 -0500)]
Merge pull request #7675 from PalanteJon/CRM-17885

CRM-17885 - Allow hiding notices on status screen

8 years agoMerge pull request #7672 from eileenmcnaughton/index
Eileen McNaughton [Wed, 27 Jan 2016 19:56:37 +0000 (08:56 +1300)]
Merge pull request #7672 from eileenmcnaughton/index

CRM-17881 add test to CRM_Core_BAO_SchemaHandler::createIndexes fn

8 years agoTest fix
eileen [Wed, 27 Jan 2016 19:36:20 +0000 (08:36 +1300)]
Test fix

Change-Id: I37cdcb1eae7dba845c619400f95eef6ca63425b4

8 years agoCRM-17881 add test to CRM_Core_BAO_SchemaHandler::createIndexes fn
eileen [Wed, 27 Jan 2016 08:23:53 +0000 (21:23 +1300)]
CRM-17881 add test to CRM_Core_BAO_SchemaHandler::createIndexes fn

8 years agoCRM-17881 change index upgrade addition civicrm_financian_trxn.trxn_id to be upgrade...
eileen [Wed, 27 Jan 2016 08:38:10 +0000 (21:38 +1300)]
CRM-17881 change index upgrade addition civicrm_financian_trxn.trxn_id to be upgrade friendly

Also ref CRM-17752

8 years agoMerge pull request #7676 from colemanw/iats-lock
colemanw [Wed, 27 Jan 2016 18:38:58 +0000 (13:38 -0500)]
Merge pull request #7676 from colemanw/iats-lock

Remove iats from 4.7.0 release

8 years agoRemove iats from 4.7.0 release
Coleman Watts [Wed, 27 Jan 2016 17:46:27 +0000 (12:46 -0500)]
Remove iats from 4.7.0 release

8 years agoCRM-17885 - Allow hiding notices on status screen
Jon goldberg [Wed, 27 Jan 2016 17:17:43 +0000 (12:17 -0500)]
CRM-17885 - Allow hiding notices on status screen

8 years agoMerge pull request #7660 from JMAConsulting/CRM-16188-2
colemanw [Wed, 27 Jan 2016 14:42:51 +0000 (09:42 -0500)]
Merge pull request #7660 from JMAConsulting/CRM-16188-2

Crm 16188 2

8 years agoMerge pull request #7595 from monishdeb/CRM-17807
Monish Deb [Wed, 27 Jan 2016 06:52:33 +0000 (12:22 +0530)]
Merge pull request #7595 from monishdeb/CRM-17807

Crm 17807

8 years agoMerge pull request #7671 from eileenmcnaughton/comments
Eileen McNaughton [Wed, 27 Jan 2016 06:43:25 +0000 (19:43 +1300)]
Merge pull request #7671 from eileenmcnaughton/comments

some random comment fixes

8 years ago--CRM-16188, ignore syntax check for order
Pradeep Nayak [Wed, 27 Jan 2016 03:55:22 +0000 (09:25 +0530)]
--CRM-16188, ignore syntax check for order

8 years agosome random comment fixes
eileen [Wed, 27 Jan 2016 02:22:53 +0000 (15:22 +1300)]
some random comment fixes

8 years agoMerge pull request #7665 from julialongtin/safe_changes
colemanw [Wed, 27 Jan 2016 02:10:39 +0000 (21:10 -0500)]
Merge pull request #7665 from julialongtin/safe_changes

Safe changes

8 years agomissing period.
Julia Longtin [Tue, 26 Jan 2016 23:27:16 +0000 (23:27 +0000)]
missing period.

8 years agogroup assignments, and add some better comments.
Julia Longtin [Tue, 26 Jan 2016 23:23:26 +0000 (23:23 +0000)]
group assignments, and add some better comments.

8 years agoCRM-16188, fixed check style
Pradeep Nayak [Tue, 26 Jan 2016 22:19:08 +0000 (03:49 +0530)]
CRM-16188, fixed check style

----------------------------------------
* CRM-16188: Create an order API
  https://issues.civicrm.org/jira/browse/CRM-16188

8 years agoCRM-16188, modified code to add exception and also changed test to check exception...
Pradeep Nayak [Tue, 26 Jan 2016 22:15:47 +0000 (03:45 +0530)]
CRM-16188, modified code to add exception and also changed test to check exception errors

----------------------------------------
* CRM-16188: Create an order API
  https://issues.civicrm.org/jira/browse/CRM-16188

8 years agoCRM-16188, added test for changes for commit https://github.com/JMAConsulting/civicrm...
Pradeep Nayak [Tue, 26 Jan 2016 21:57:20 +0000 (03:27 +0530)]
CRM-16188, added test for changes for commit https://github.com/JMAConsulting/civicrm-core/commit/4a517906b390b7e9e73c77902f3a3ebf43c1ac15

----------------------------------------
* CRM-16188: Create an order API
  https://issues.civicrm.org/jira/browse/CRM-16188

8 years agoMerge pull request #7625 from totten/master-case-rel
colemanw [Tue, 26 Jan 2016 21:25:59 +0000 (16:25 -0500)]
Merge pull request #7625 from totten/master-case-rel

CRM-17342 - Case Managed Entities - Don't recreate disabled relationship types

8 years agoMerge pull request #7620 from monishdeb/CRM-17685
colemanw [Tue, 26 Jan 2016 21:21:39 +0000 (16:21 -0500)]
Merge pull request #7620 from monishdeb/CRM-17685

CRM-17836 fix - custom fields attached to relationships are unsearchable

8 years ago-- fixed array indentation, CRM-16188
Pradeep Nayak [Tue, 26 Jan 2016 21:05:02 +0000 (02:35 +0530)]
-- fixed array indentation, CRM-16188

----------------------------------------
* CRM-16188: Create an order API
  https://issues.civicrm.org/jira/browse/CRM-16188

8 years ago--CRM-16188, fixed typo
Pradeep Nayak [Tue, 26 Jan 2016 20:44:03 +0000 (02:14 +0530)]
--CRM-16188, fixed typo

8 years ago--CRM-16188, removed white spaces
Pradeep Nayak [Tue, 26 Jan 2016 20:39:51 +0000 (02:09 +0530)]
--CRM-16188, removed white spaces

8 years agoCRM-16188, removed white spaces
Pradeep Nayak [Tue, 26 Jan 2016 20:37:11 +0000 (02:07 +0530)]
CRM-16188,  removed white spaces

----------------------------------------
* CRM-16188: Create an order API
  https://issues.civicrm.org/jira/browse/CRM-16188

8 years agoCRM-16188, added order api test for get action
Pradeep Nayak [Tue, 26 Jan 2016 20:31:47 +0000 (02:01 +0530)]
CRM-16188, added order api test for get action

----------------------------------------
* CRM-16188: Create an order API
  https://issues.civicrm.org/jira/browse/CRM-16188

8 years ago--CRM-16188, changed code to use contribution_id when retrieving wrt contribution
Pradeep Nayak [Tue, 26 Jan 2016 20:31:19 +0000 (02:01 +0530)]
--CRM-16188, changed code to use contribution_id when retrieving wrt contribution

8 years agoCRM-16188, added get Order api
Pradeep Nayak [Tue, 26 Jan 2016 20:30:38 +0000 (02:00 +0530)]
CRM-16188, added get Order api

----------------------------------------
* CRM-16188: Create an order API
  https://issues.civicrm.org/jira/browse/CRM-16188

8 years ago--CRM-16188, added function to check the total amount and sum of line total
Pradeep Nayak [Tue, 26 Jan 2016 20:02:14 +0000 (01:32 +0530)]
--CRM-16188, added function to check the total amount and sum of line total

8 years agoMerge pull request #7657 from totten/master-wp-upgr
Tim Otten [Tue, 26 Jan 2016 19:52:23 +0000 (11:52 -0800)]
Merge pull request #7657 from totten/master-wp-upgr

SettingsBag - Fix upgrade failure for WP 4.4=>4.7

8 years agoFix function docblock
Coleman Watts [Tue, 26 Jan 2016 16:41:11 +0000 (11:41 -0500)]
Fix function docblock

8 years agoSettingsBag - Fix upgrade failure for WP 4.4=>4.7
Tim Otten [Tue, 26 Jan 2016 01:49:32 +0000 (17:49 -0800)]
SettingsBag - Fix upgrade failure for WP 4.4=>4.7

The WP integration attempts to define a new setting (`wpLoadPhp`) during
bootstrap -- before upgrade logic has run.  This was failing because the
`group_name` property wouldn't get passed through by DAO (because the DAO is
newer than the schema).

8 years agoMerge pull request #7651 from seamuslee001/CRM-14901
Eileen McNaughton [Tue, 26 Jan 2016 07:37:10 +0000 (20:37 +1300)]
Merge pull request #7651 from seamuslee001/CRM-14901

CRM-14901 Add in entity_table whitelists for uf_join, entity_tag, mai…

8 years agoMerge pull request #7656 from totten/master-civi-ns
colemanw [Tue, 26 Jan 2016 01:51:46 +0000 (20:51 -0500)]
Merge pull request #7656 from totten/master-civi-ns

CRM-17860 - tools/scripts/phpunit - Fix for 'Civi\Foo\Bar'

8 years agoMerge pull request #7642 from totten/master-wp-path
Tim Otten [Tue, 26 Jan 2016 00:57:33 +0000 (16:57 -0800)]
Merge pull request #7642 from totten/master-wp-path

CRM-17860 - CRM_Utils_System_WordPress - Path lookup

8 years agoCRM-17860 - tools/scripts/phpunit - Fix for 'Civi\Foo\Bar'
Tim Otten [Fri, 22 Jan 2016 09:48:17 +0000 (01:48 -0800)]
CRM-17860 - tools/scripts/phpunit - Fix for 'Civi\Foo\Bar'

8 years agotest coverage
monishdeb [Mon, 25 Jan 2016 19:46:00 +0000 (01:16 +0530)]
test coverage

8 years agoMerge pull request #7654 from yashodha/contributors-update
Yashodha Chaku [Mon, 25 Jan 2016 13:13:39 +0000 (18:43 +0530)]
Merge pull request #7654 from yashodha/contributors-update

update contributor list from github

8 years agoCRM-17836 fix - custom fields attached to relationships are unsearchable
monishdeb [Wed, 20 Jan 2016 20:24:56 +0000 (01:54 +0530)]
CRM-17836 fix - custom fields attached to relationships are unsearchable

https://issues.civicrm.org/jira/browse/CRM-17836

8 years agoupdate contributor list from github
yashodha [Mon, 25 Jan 2016 09:26:10 +0000 (14:56 +0530)]
update contributor list from github

8 years agoMerge pull request #7603 from jitendrapurohit/CRM-17810
Monish Deb [Mon, 25 Jan 2016 09:11:20 +0000 (14:41 +0530)]
Merge pull request #7603 from jitendrapurohit/CRM-17810

CRM-17810 Add pager to custom data tab

8 years agoadd in missing callback tag
Seamus Lee [Mon, 25 Jan 2016 07:24:16 +0000 (07:24 +0000)]
add in missing callback tag

8 years agoMerge pull request #7636 from jitendrapurohit/CRM-17839
Yashodha Chaku [Mon, 25 Jan 2016 05:33:45 +0000 (11:03 +0530)]
Merge pull request #7636 from jitendrapurohit/CRM-17839

CRM-17839 -- unable to edit custom data in tab if inline set already …

8 years agoMerge pull request #7649 from eileenmcnaughton/CRM-17350
Eileen McNaughton [Mon, 25 Jan 2016 05:02:38 +0000 (18:02 +1300)]
Merge pull request #7649 from eileenmcnaughton/CRM-17350

CRM-17350 - Allowing editing of tags by ACL

8 years agoCRM-14901 Add in entity_table whitelists for uf_join, entity_tag, mailing_group and...
Seamus Lee [Sun, 17 Jan 2016 23:53:39 +0000 (23:53 +0000)]
CRM-14901 Add in entity_table whitelists for uf_join, entity_tag, mailing_group and note

8 years agoCRM-17350 add unit test for tag api create permission
eileenmcnaughton [Mon, 25 Jan 2016 01:08:06 +0000 (01:08 +0000)]
CRM-17350 add unit test for tag api create permission

8 years agoCRM-17350 fix previous entity acl fix to make check_permissions optional
eileenmcnaughton [Mon, 25 Jan 2016 03:13:02 +0000 (03:13 +0000)]
CRM-17350 fix previous entity acl fix to make check_permissions optional

8 years agoCRM-17350 - Allowing editing of tags when you don't have 'edit all contacts' permission
Jon goldberg [Fri, 9 Oct 2015 01:21:58 +0000 (21:21 -0400)]
CRM-17350 - Allowing editing of tags when you don't have 'edit all contacts' permission

Conflicts:
CRM/Core/DAO/permissions.php

8 years agoMerge pull request #7650 from eileenmcnaughton/tests
Eileen McNaughton [Mon, 25 Jan 2016 02:55:37 +0000 (15:55 +1300)]
Merge pull request #7650 from eileenmcnaughton/tests

CRM-17350 preliminary test clean up for entity-tag acl permission fix

8 years agoMerge pull request #7647 from colemanw/CRM-17645
colemanw [Mon, 25 Jan 2016 02:24:06 +0000 (21:24 -0500)]
Merge pull request #7647 from colemanw/CRM-17645

CRM-17645 - Tests and better joins for selectWhereClause

8 years agoCRM-17350 preliminary test clean up for entity-tag acl permission fix
eileenmcnaughton [Mon, 25 Jan 2016 02:20:00 +0000 (02:20 +0000)]
CRM-17350 preliminary test clean up for entity-tag acl permission fix

8 years agoCRM-17645 - Tests and better joins for selectWhereClause
Coleman Watts [Sun, 24 Jan 2016 22:12:48 +0000 (17:12 -0500)]
CRM-17645 - Tests and better joins for selectWhereClause

8 years agoMerge pull request #7643 from lcdservices/CRM-17865
Eileen McNaughton [Sun, 24 Jan 2016 20:53:19 +0000 (09:53 +1300)]
Merge pull request #7643 from lcdservices/CRM-17865

CRM-17865: set participant custom field defaults on additional reg form

8 years agoMerge pull request #7646 from joshgowans/patch-1
Eileen McNaughton [Sun, 24 Jan 2016 20:52:53 +0000 (09:52 +1300)]
Merge pull request #7646 from joshgowans/patch-1

Update success.tpl

8 years agoUpdate success.tpl
joshgowans [Sun, 24 Jan 2016 17:29:16 +0000 (10:29 -0700)]
Update success.tpl

Looks like the upgrade message was already changed to reflect 4.7. Made a few very minor updates in the message.

8 years agoMerge pull request #7640 from eileenmcnaughton/lybunt
Eileen McNaughton [Sat, 23 Jan 2016 21:28:47 +0000 (10:28 +1300)]
Merge pull request #7640 from eileenmcnaughton/lybunt

CRM-17837 Improve Lybunt report. …

8 years agoCRM-17865: set participant custom field defaults on additional reg form
Brian Shaughnessy [Sat, 23 Jan 2016 19:37:13 +0000 (14:37 -0500)]
CRM-17865: set participant custom field defaults on additional reg form

8 years agoMerge pull request #7639 from colemanw/CRM-17857
colemanw [Sat, 23 Jan 2016 17:14:12 +0000 (12:14 -0500)]
Merge pull request #7639 from colemanw/CRM-17857

CRM-17857 - Update api explorer to exclude participant joins

8 years agoCRM-17860 - CRM_Utils_System_WordPress - Path lookup
Tim Otten [Sat, 23 Jan 2016 05:50:41 +0000 (21:50 -0800)]
CRM-17860 - CRM_Utils_System_WordPress - Path lookup

The implementations of `getDefaultFileStorage()` and
`getCiviSourceStorage()` depended on having the CMS bootstrapped, causing
failures in scripts that boot Civi first.

This patch computes those values by doing some arithmetic, e.g.
 * Civi source URL == CMS Base URL + relative path to source tree
 * Civi file URL == CMS Base URL + relative path to files dir

----------------------------------------
* CRM-17860: More consistent, flexible handling of tests for extensions
  https://issues.civicrm.org/jira/browse/CRM-17860

8 years agoCRM-17837 Improve Lybunt report.
eileen [Tue, 19 Jan 2016 18:56:21 +0000 (07:56 +1300)]
CRM-17837 Improve Lybunt report.

Add tests for lynbunt results, get custom data working for contacts in it, remove non-working address group bys,
fix query to be more efficient on a large dataset

8 years agoCRM-17857 - Update api explorer to exclude participant joins
Coleman Watts [Sat, 23 Jan 2016 03:23:25 +0000 (22:23 -0500)]
CRM-17857 - Update api explorer to exclude participant joins

8 years agoMerge pull request #7635 from jitendrapurohit/CRM-17844
Yashodha Chaku [Fri, 22 Jan 2016 14:33:46 +0000 (20:03 +0530)]
Merge pull request #7635 from jitendrapurohit/CRM-17844

CRM-17844 -- Registering 'as someone else' still affects logged-in user

8 years agoMerge pull request #7619 from joeyisking/Adding_class_2_text_field
Yashodha Chaku [Fri, 22 Jan 2016 14:14:38 +0000 (19:44 +0530)]
Merge pull request #7619 from joeyisking/Adding_class_2_text_field

CRM-17840 - Can't see outline of Full-text Search text field

8 years agoMerge pull request #7633 from jitendrapurohit/caseupgrade
Monish Deb [Fri, 22 Jan 2016 13:15:49 +0000 (18:45 +0530)]
Merge pull request #7633 from jitendrapurohit/caseupgrade

DB Error on enabling case component after multilingual upgrade to 4.7

8 years agoCRM-17844 -- Registering 'as someone else' still affects logged-in user
jitendrapurohit [Fri, 22 Jan 2016 10:38:26 +0000 (16:08 +0530)]
CRM-17844 -- Registering 'as someone else' still affects logged-in user

8 years agoMerge pull request #7634 from yashodha/CRM-17796
Yashodha Chaku [Fri, 22 Jan 2016 10:00:56 +0000 (15:30 +0530)]
Merge pull request #7634 from yashodha/CRM-17796

CRM-17796: profile search limit by group doesn't use the correct ID

8 years agoCRM-17796: profile search limit by group doesn't use the correct ID
yashodha [Fri, 22 Jan 2016 06:56:48 +0000 (12:26 +0530)]
CRM-17796: profile search limit by group doesn't use the correct ID

----------------------------------------
* CRM-17796: profile search limit by group doesn't use the correct ID
  https://issues.civicrm.org/jira/browse/CRM-17796

8 years agoCRM-17839 -- unable to edit custom data in tab if inline set already exists
jitendrapurohit [Fri, 22 Jan 2016 06:18:23 +0000 (11:48 +0530)]
CRM-17839 -- unable to edit custom data in tab if inline set already exists

8 years agoadditiopnal fix
jitendrapurohit [Fri, 22 Jan 2016 05:30:08 +0000 (11:00 +0530)]
additiopnal fix

8 years agoDB Error on enabling case component after multilingual upgrade to 4.7
jitendrapurohit [Tue, 22 Dec 2015 12:26:42 +0000 (17:56 +0530)]
DB Error on enabling case component after multilingual upgrade to 4.7

8 years agoCRM-17837 / CRM-17680 fix core Lybunt to sort by the sort field (and add last year...
eileen [Mon, 7 Dec 2015 09:45:07 +0000 (22:45 +1300)]
CRM-17837 / CRM-17680 fix core Lybunt to sort by the sort field (and add last year field to the list)

Bug: T119911

Change-Id: I0dd1ce2375b9aeb66368fc6f2ced650dde039b64

8 years agoMerge pull request #7631 from eileenmcnaughton/CRM-17837
Eileen McNaughton [Fri, 22 Jan 2016 03:14:41 +0000 (16:14 +1300)]
Merge pull request #7631 from eileenmcnaughton/CRM-17837

CRM-17837 report improvements (Lybunt & general)

8 years agoCRM-17837 Add communication preference fields to standard available contact info
eileen [Fri, 22 Jan 2016 02:12:49 +0000 (15:12 +1300)]
CRM-17837 Add communication preference fields to standard available contact info

Change-Id: Ic97e906b9f2513c6e87564fc3c1a222afa25f091

8 years agoAdd additional of customFieldTableJoins to be calculated for filters separately to...
eileen [Fri, 22 Jan 2016 02:10:38 +0000 (15:10 +1300)]
Add additional of customFieldTableJoins to be calculated for filters separately to select queries

This means that if the report runs 2 queries, one to get the filtered list of subjects and a second to render the appropriate fields for them the first query (likely to be bigger) can avoid joining in tables that are only used for rendering results

Change-Id: Iee0078054abe8b5e63435e66f9215fc2fd9cd62f

Change-Id: Ic4e9ed36cf1a186aeeb1c44d59661e8971612022

8 years agoMerge pull request #7630 from julialongtin/master
colemanw [Fri, 22 Jan 2016 02:21:39 +0000 (21:21 -0500)]
Merge pull request #7630 from julialongtin/master

Work around infinite memory consumption bug. CRM-17853

8 years agoCRM-17837 don't show linkable fields as links if the base url is not passed in.
eileen [Fri, 22 Jan 2016 02:08:03 +0000 (15:08 +1300)]
CRM-17837 don't show linkable fields as links if the base url is not passed in.

On some reports it may not be appropriate to have linkable urls. This currently applies to the lybunt - as the link is going through to the contribute/detail report which doesn't take the same filters - although making it self-linking might make sense this seems like a logical change to the parent function

Change-Id: I969c92755cb053181a53acb5d829d6d9a0554e06

p

Change-Id: I267409dced4602b028baa9c3beeaf8be70a712c3

8 years agoCRM-17837 move summary columns to the right hand side when using rollup.
eileen [Fri, 22 Jan 2016 02:04:22 +0000 (15:04 +1300)]
CRM-17837 move summary columns to the right hand side when using rollup.

Basically it just looks 'odd' to have calculated summary columns and then have custom fields to the right of them in a report

Change-Id: If46675141028bf362c3b3c2b509d9cd30fb25651

8 years agoCRM-17645 - Call hook for cases
Coleman Watts [Fri, 22 Jan 2016 00:33:47 +0000 (19:33 -0500)]
CRM-17645 - Call hook for cases

8 years agoMerge pull request #7629 from colemanw/CRM-17645
colemanw [Thu, 21 Jan 2016 22:45:43 +0000 (17:45 -0500)]
Merge pull request #7629 from colemanw/CRM-17645

CRM-17645 - Declare permissions for CaseType api

8 years agoWork around infinite memory consumption bug. CRM-17853
Julia Longtin [Thu, 21 Jan 2016 22:18:33 +0000 (22:18 +0000)]
Work around infinite memory consumption bug. CRM-17853

When handling an Unhandled exception, the default error handler path uses debug_var to handle outputting debug information. When calling debug_var, no print argument is passed. Without a print argument, debug_var uses print_r to dump a passed in variable's contents. This consumes all memory, and leads to a crash (500). passing a different option to debug_var works around the issue.

8 years agoPermissions code cleanup
Coleman Watts [Thu, 21 Jan 2016 22:01:49 +0000 (17:01 -0500)]
Permissions code cleanup