civicrm-core.git
2 years agoRename function
Eileen McNaughton [Mon, 15 Aug 2022 22:40:48 +0000 (10:40 +1200)]
Rename function

2 years agoMake property private
Eileen McNaughton [Mon, 15 Aug 2022 22:38:54 +0000 (10:38 +1200)]
Make property private

2 years agoRemove last usage of _fields
Eileen McNaughton [Mon, 15 Aug 2022 22:36:56 +0000 (10:36 +1200)]
Remove last usage of _fields

2 years agoMerge pull request #24266 from demeritcowboy/case-revision-warning
Seamus Lee [Tue, 16 Aug 2022 04:13:36 +0000 (14:13 +1000)]
Merge pull request #24266 from demeritcowboy/case-revision-warning

dev/core#1532 - Add upgrade message about civicase activity revisions

2 years agoMerge pull request #24244 from colemanw/case_id
Seamus Lee [Tue, 16 Aug 2022 04:13:22 +0000 (14:13 +1000)]
Merge pull request #24244 from colemanw/case_id

APIv4 - Add `case_id` field to Activity entity

2 years agoMerge pull request #24272 from eileenmcnaughton/leg_act
colemanw [Tue, 16 Aug 2022 02:52:39 +0000 (22:52 -0400)]
Merge pull request #24272 from eileenmcnaughton/leg_act

Remove another three no-longer-used functions

2 years agoMerge pull request #24270 from eileenmcnaughton/pseudos
colemanw [Tue, 16 Aug 2022 02:50:39 +0000 (22:50 -0400)]
Merge pull request #24270 from eileenmcnaughton/pseudos

Fix use of legacy pseudoConstant methods

2 years agoMerge pull request #24271 from eileenmcnaughton/leg_select
colemanw [Tue, 16 Aug 2022 02:48:20 +0000 (22:48 -0400)]
Merge pull request #24271 from eileenmcnaughton/leg_select

Remove no-longer-used function

2 years agoMerge pull request #24134 from mattwire/customgroupcasesensitive
demeritcowboy [Tue, 16 Aug 2022 01:29:33 +0000 (21:29 -0400)]
Merge pull request #24134 from mattwire/customgroupcasesensitive

Case-insensitive match on subtypes when validating subtype by entity for custom groups

2 years agoadd upgrade message
demeritcowboy [Mon, 15 Aug 2022 20:13:06 +0000 (16:13 -0400)]
add upgrade message

2 years agoMerge pull request #24154 from totten/master-setting-validate
colemanw [Mon, 15 Aug 2022 23:58:38 +0000 (19:58 -0400)]
Merge pull request #24154 from totten/master-setting-validate

SettingsStyleTest - Stop the madness

2 years agoAdd test for case_id token
Coleman Watts [Mon, 15 Aug 2022 23:20:57 +0000 (19:20 -0400)]
Add test for case_id token

2 years agoFinish removing refs to unused activeFields
Eileen McNaughton [Mon, 15 Aug 2022 22:29:04 +0000 (10:29 +1200)]
Finish removing refs to unused activeFields

2 years agoRemove setActiveField
Eileen McNaughton [Mon, 15 Aug 2022 22:25:28 +0000 (10:25 +1200)]
Remove setActiveField

2 years agoRemove another no-longer-used function
Eileen McNaughton [Mon, 15 Aug 2022 22:24:04 +0000 (10:24 +1200)]
Remove another no-longer-used function

2 years agoRemove no-longer-used function
Eileen McNaughton [Mon, 15 Aug 2022 22:18:11 +0000 (10:18 +1200)]
Remove no-longer-used function

2 years agoFix use of legacy pseudoConstant methods
Eileen McNaughton [Mon, 15 Aug 2022 22:09:29 +0000 (10:09 +1200)]
Fix use of legacy pseudoConstant methods

2 years agoMerge pull request #24217 from eileenmcnaughton/map
colemanw [Mon, 15 Aug 2022 20:04:31 +0000 (16:04 -0400)]
Merge pull request #24217 from eileenmcnaughton/map

[Import] [Ref] Extract shared form rule code

2 years agoRemove token case_id handling
Eileen McNaughton [Mon, 15 Aug 2022 19:42:23 +0000 (07:42 +1200)]
Remove token case_id handling

2 years agoMerge pull request #24262 from demeritcowboy/file-on-case
demeritcowboy [Mon, 15 Aug 2022 18:06:31 +0000 (14:06 -0400)]
Merge pull request #24262 from demeritcowboy/file-on-case

[NFC] Add test for editing activity subject to file on case

2 years agoadd test for editing activity subject to file on case
demeritcowboy [Mon, 15 Aug 2022 13:54:40 +0000 (09:54 -0400)]
add test for editing activity subject to file on case

2 years agoAPIv4 - Support case_id param for Activity.create, add test
Coleman Watts [Sat, 13 Aug 2022 18:37:22 +0000 (14:37 -0400)]
APIv4 - Support case_id param for Activity.create, add test

This moves processCaseActivity call out of APIv3 and into the BAO where it can be re-used by APIv4.

2 years agoAPIv4 - Add `case_id` field to Activity entity
Coleman Watts [Sat, 13 Aug 2022 01:30:40 +0000 (21:30 -0400)]
APIv4 - Add `case_id` field to Activity entity

This virtual field allows an activity to be easily filed on a case,
and for cases to be looked up in SearchKit activity searches.

2 years agoMerge pull request #24253 from bjendres/patch-1
Eileen McNaughton [Mon, 15 Aug 2022 10:43:43 +0000 (22:43 +1200)]
Merge pull request #24253 from bjendres/patch-1

Add hint to create membership "You do not have all the permissions needed for this page" message

2 years agoMerge pull request #24257 from civicrm/5.53
Seamus Lee [Mon, 15 Aug 2022 02:52:31 +0000 (12:52 +1000)]
Merge pull request #24257 from civicrm/5.53

5.53

2 years agoMerge pull request #24250 from demeritcowboy/set-alias
Seamus Lee [Mon, 15 Aug 2022 02:02:26 +0000 (12:02 +1000)]
Merge pull request #24250 from demeritcowboy/set-alias

dev/core#3802 - Compatibility with symfony 6 for drupal 10 for listeners added via getSubscribedEvents

2 years agoMerge pull request #24256 from seamuslee001/5.53
Seamus Lee [Mon, 15 Aug 2022 01:05:14 +0000 (11:05 +1000)]
Merge pull request #24256 from seamuslee001/5.53

[NFC] Convert Payment Processor ID field to payment processor in even…

2 years agosymfony 6 compatiblity
demeritcowboy [Sun, 14 Aug 2022 01:08:28 +0000 (21:08 -0400)]
symfony 6 compatiblity

2 years agoMerge pull request #24249 from colemanw/goodbyeRevisions
demeritcowboy [Sun, 14 Aug 2022 23:31:47 +0000 (19:31 -0400)]
Merge pull request #24249 from colemanw/goodbyeRevisions

dev/core#1532 - Remove civicaseActivityRevisions setting & related code

2 years ago[NFC] Convert Payment Processor ID field to payment processor in event create in...
Seamus Lee [Sun, 14 Aug 2022 23:02:52 +0000 (09:02 +1000)]
[NFC] Convert Payment Processor ID field to payment processor in event create in tests

2 years agoMerge pull request #24252 from demeritcowboy/impossible
colemanw [Sun, 14 Aug 2022 15:32:10 +0000 (11:32 -0400)]
Merge pull request #24252 from demeritcowboy/impossible

Remove unused impossible function in upgrade page

2 years agoCiviCase - Remove the civicaseActivityRevisions setting and related code
Coleman Watts [Sat, 13 Aug 2022 22:51:25 +0000 (18:51 -0400)]
CiviCase - Remove the civicaseActivityRevisions setting and related code

This setting has been deprecated for years, and core CiviCase doesn't respect it
anyway. Only the API was really paying attention to it. Time to get rid of that stuff
as a preamble to ripping out all of the case activity revisioning.

2 years agoAdd error hint
Björn Endres [Sun, 14 Aug 2022 14:55:04 +0000 (16:55 +0200)]
Add error hint

This exception is *also* raised, when no membership types have been configured yet, which can be very confusing. It cost me a two hours to figure out the real reason, and I have the nagging suspicion that this had happened to me before. I'm not too happy about the phrasing, but it would be good to have a reference to a potentially incomplete configuration. Thanks.

2 years agounused impossible function
demeritcowboy [Sun, 14 Aug 2022 11:52:07 +0000 (07:52 -0400)]
unused impossible function

2 years agoMerge pull request #24251 from colemanw/activityCaseCleanupDoc
demeritcowboy [Sun, 14 Aug 2022 11:13:08 +0000 (07:13 -0400)]
Merge pull request #24251 from colemanw/activityCaseCleanupDoc

Fix processCaseActivity docblock

2 years agoMerge pull request #24247 from colemanw/activityCaseCleanup
demeritcowboy [Sun, 14 Aug 2022 11:11:51 +0000 (07:11 -0400)]
Merge pull request #24247 from colemanw/activityCaseCleanup

[REF] Activity BAO - Decouple CiviCase logic from create function

2 years agoFix processCaseActivity docblock
Coleman Watts [Sun, 14 Aug 2022 03:40:50 +0000 (23:40 -0400)]
Fix processCaseActivity docblock

2 years agoActivity BAO - Decouple CiviCase logic from create function
Coleman Watts [Sat, 13 Aug 2022 18:56:06 +0000 (14:56 -0400)]
Activity BAO - Decouple CiviCase logic from create function

A big chunk of civicase code was jammed into the Activity create function.
This moves it to the Case BAO.

2 years agoMerge pull request #24248 from colemanw/deprecatedDaoProp
colemanw [Sat, 13 Aug 2022 22:34:50 +0000 (18:34 -0400)]
Merge pull request #24248 from colemanw/deprecatedDaoProp

NFC - Make it possible to mark a dao field @deprecated

2 years agoNFC - Make it possible to mark a dao field @deprecated
Coleman Watts [Sat, 13 Aug 2022 20:15:18 +0000 (16:15 -0400)]
NFC - Make it possible to mark a dao field @deprecated

2 years agoMerge pull request #24246 from demeritcowboy/bool-again
colemanw [Sat, 13 Aug 2022 18:25:01 +0000 (14:25 -0400)]
Merge pull request #24246 from demeritcowboy/bool-again

Resolve existential crisis for customfield.is_active

2 years agoresolve existential crisis
demeritcowboy [Sat, 13 Aug 2022 12:48:39 +0000 (08:48 -0400)]
resolve existential crisis

2 years agoMerge pull request #24240 from civicrm/5.53
demeritcowboy [Sat, 13 Aug 2022 12:17:08 +0000 (08:17 -0400)]
Merge pull request #24240 from civicrm/5.53

5.53

2 years agoMerge pull request #24239 from colemanw/joinComments
Tim Otten [Sat, 13 Aug 2022 01:16:50 +0000 (18:16 -0700)]
Merge pull request #24239 from colemanw/joinComments

APIv4 - Add comments and fix data type for contact location joins

2 years agoMerge pull request #24238 from demeritcowboy/boo
Tim Otten [Fri, 12 Aug 2022 22:40:16 +0000 (15:40 -0700)]
Merge pull request #24238 from demeritcowboy/boo

dev/core#3799 - Fix incorrectly changed default for contact_dashboard.is_active

2 years agoMerge pull request #24233 from demeritcowboy/zetapatookens
Tim Otten [Fri, 12 Aug 2022 22:33:49 +0000 (15:33 -0700)]
Merge pull request #24233 from demeritcowboy/zetapatookens

zetacomponents/mail - Ensure latest mail patches are included

2 years agoAPIv4 - Add comments and fix data type for contact location joins
Coleman Watts [Fri, 12 Aug 2022 21:27:09 +0000 (17:27 -0400)]
APIv4 - Add comments and fix data type for contact location joins

2 years agoMerge pull request #24205 from eileenmcnaughton/obsolete
colemanw [Fri, 12 Aug 2022 19:46:18 +0000 (15:46 -0400)]
Merge pull request #24205 from eileenmcnaughton/obsolete

[Import-code-cleanup] Remove now-unused summary forms

2 years agoMerge pull request #24226 from eileenmcnaughton/import_pledge_payment
colemanw [Fri, 12 Aug 2022 19:44:27 +0000 (15:44 -0400)]
Merge pull request #24226 from eileenmcnaughton/import_pledge_payment

Remove unreachable legacy code

2 years agofix incorrectly changed default
demeritcowboy [Fri, 12 Aug 2022 17:02:57 +0000 (13:02 -0400)]
fix incorrectly changed default

2 years agoensure latest mail patches are included
demeritcowboy [Fri, 12 Aug 2022 13:25:35 +0000 (09:25 -0400)]
ensure latest mail patches are included

2 years agoMerge pull request #24231 from demeritcowboy/msgtpl-47
Seamus Lee [Thu, 11 Aug 2022 21:35:43 +0000 (07:35 +1000)]
Merge pull request #24231 from demeritcowboy/msgtpl-47

[REF] Remove unused message template upgrade code

2 years agoMerge pull request #24225 from eileenmcnaughton/importable
colemanw [Thu, 11 Aug 2022 19:54:21 +0000 (15:54 -0400)]
Merge pull request #24225 from eileenmcnaughton/importable

Deprecate `BAO_Contribution::importableFields`

2 years agoMerge pull request #24191 from colemanw/civiGrantPerms
Eileen McNaughton [Thu, 11 Aug 2022 19:40:36 +0000 (07:40 +1200)]
Merge pull request #24191 from colemanw/civiGrantPerms

[REF] Decouple CiviGrant from core permission function

2 years agoMerge pull request #24229 from civicrm/5.53
Eileen McNaughton [Thu, 11 Aug 2022 19:33:25 +0000 (07:33 +1200)]
Merge pull request #24229 from civicrm/5.53

5.53

2 years agoMerge pull request #24227 from eileenmcnaughton/mapping
Eileen McNaughton [Thu, 11 Aug 2022 19:28:25 +0000 (07:28 +1200)]
Merge pull request #24227 from eileenmcnaughton/mapping

Move non-shared function to private function on using class

2 years agoremove unused code
demeritcowboy [Thu, 11 Aug 2022 14:27:13 +0000 (10:27 -0400)]
remove unused code

2 years agoMove non-shared function to private function on using class
Eileen McNaughton [Thu, 11 Aug 2022 00:30:47 +0000 (12:30 +1200)]
Move non-shared function to private function on using class

2 years agoMerge pull request #24210 from eileenmcnaughton/goner
demeritcowboy [Thu, 11 Aug 2022 12:37:09 +0000 (08:37 -0400)]
Merge pull request #24210 from eileenmcnaughton/goner

[Import-code-cleanup] Remove unused function

2 years agoMerge pull request #24214 from eileenmcnaughton/tpl
demeritcowboy [Thu, 11 Aug 2022 12:33:50 +0000 (08:33 -0400)]
Merge pull request #24214 from eileenmcnaughton/tpl

[Import-code-cleanup] Remove now-unused tpl

2 years agoMerge pull request #24194 from yashodha/dev-3141
Matthew Wire [Thu, 11 Aug 2022 09:12:37 +0000 (10:12 +0100)]
Merge pull request #24194 from yashodha/dev-3141

(dev/core#3141) Membership should be listed chronologically by end da…

2 years agoMerge pull request #24224 from colemanw/fixSelect2AndNgOptions
Seamus Lee [Thu, 11 Aug 2022 05:32:30 +0000 (15:32 +1000)]
Merge pull request #24224 from colemanw/fixSelect2AndNgOptions

CrmUi - Fix crmSelect2 to work with ngOptions

2 years agoMerge pull request #24165 from colemanw/afformExisting
Seamus Lee [Thu, 11 Aug 2022 01:26:08 +0000 (11:26 +1000)]
Merge pull request #24165 from colemanw/afformExisting

Afform - add "Existing entity" selector

2 years agoMerge pull request #24223 from civicrm/5.53
demeritcowboy [Thu, 11 Aug 2022 00:58:02 +0000 (20:58 -0400)]
Merge pull request #24223 from civicrm/5.53

5.53

2 years agoMerge pull request #24222 from herbdool/core-3796
demeritcowboy [Thu, 11 Aug 2022 00:51:33 +0000 (20:51 -0400)]
Merge pull request #24222 from herbdool/core-3796

dev/core#3796 include subtypes where filter > 0

2 years agoMerge pull request #24216 from eileenmcnaughton/ds
colemanw [Thu, 11 Aug 2022 00:08:29 +0000 (20:08 -0400)]
Merge pull request #24216 from eileenmcnaughton/ds

Consolidate error handling on Custom data import tpl

2 years agoRemove always-the-same parameter
Eileen McNaughton [Wed, 10 Aug 2022 22:03:14 +0000 (10:03 +1200)]
Remove always-the-same parameter

2 years agoMerge pull request #24220 from colemanw/customGroupFix
Seamus Lee [Wed, 10 Aug 2022 22:14:25 +0000 (08:14 +1000)]
Merge pull request #24220 from colemanw/customGroupFix

Fix regression causing custom groups to reset to 'Contact' when updated

2 years agoRemove unreachable legacy code
Eileen McNaughton [Wed, 10 Aug 2022 22:07:42 +0000 (10:07 +1200)]
Remove unreachable legacy code

2 years agoDeprecated BAO_Contribution::importableFields
Eileen McNaughton [Wed, 10 Aug 2022 21:53:50 +0000 (09:53 +1200)]
Deprecated BAO_Contribution::importableFields

2 years agoMerge pull request #24199 from colemanw/searchKitNew
demeritcowboy [Wed, 10 Aug 2022 21:48:49 +0000 (17:48 -0400)]
Merge pull request #24199 from colemanw/searchKitNew

SearchKit - Use combo button+dropdown for creating new search or segment

2 years agoStop calling BAO function in test
Eileen McNaughton [Wed, 10 Aug 2022 21:39:34 +0000 (09:39 +1200)]
Stop calling BAO function in test

2 years ago[Import] [Ref] Extract shared form rule code
Eileen McNaughton [Wed, 10 Aug 2022 07:04:44 +0000 (19:04 +1200)]
[Import] [Ref] Extract shared form rule code

2 years agoMerge pull request #24218 from eileenmcnaughton/shared_import
colemanw [Wed, 10 Aug 2022 21:11:48 +0000 (17:11 -0400)]
Merge pull request #24218 from eileenmcnaughton/shared_import

Move unshared code to unshared function

2 years agoMerge pull request #24198 from demeritcowboy/zetacompootens
Seamus Lee [Wed, 10 Aug 2022 20:59:33 +0000 (06:59 +1000)]
Merge pull request #24198 from demeritcowboy/zetacompootens

Update zetacomponents/mail to 1.9.3 so can remove patches

2 years agoCrmUi - Fix crmSelect2 to work with ngOptions
Coleman Watts [Wed, 10 Aug 2022 20:53:54 +0000 (16:53 -0400)]
CrmUi - Fix crmSelect2 to work with ngOptions

As part of https://github.com/civicrm/civicrm-core/pull/23749 select elements using
ui-jq were switched to crm-ui-select, which should have been a drop-in replacement,
but it turns out it broke for widgets using ngOptions. This fixes it.

Fixes dev/core#3797

2 years agoMerge pull request #24212 from eileenmcnaughton/data
colemanw [Wed, 10 Aug 2022 19:30:36 +0000 (15:30 -0400)]
Merge pull request #24212 from eileenmcnaughton/data

dev/core#3664 Remove dataColumnGuessing

2 years agoFix regression causing custom groups to reset to 'Contact' when updated
Coleman Watts [Wed, 10 Aug 2022 14:58:36 +0000 (10:58 -0400)]
Fix regression causing custom groups to reset to 'Contact' when updated

Fixes dev/core#3794

2 years agodev/core#3796 include subtypes where filter > 0
Herb [Wed, 10 Aug 2022 19:27:13 +0000 (15:27 -0400)]
dev/core#3796 include subtypes where filter > 0

2 years agoMerge pull request #24190 from eileenmcnaughton/load_related
Matthew Wire [Wed, 10 Aug 2022 16:46:41 +0000 (17:46 +0100)]
Merge pull request #24190 from eileenmcnaughton/load_related

Move a little code from legacy function `loadRelatedObjects` to the calling functions

2 years agoAPIv4 Autocomplete - Fix anonymous access and add tests
Coleman Watts [Wed, 10 Aug 2022 01:18:38 +0000 (21:18 -0400)]
APIv4 Autocomplete - Fix anonymous access and add tests

2 years agoMerge pull request #24211 from eileenmcnaughton/goneier
colemanw [Wed, 10 Aug 2022 12:24:30 +0000 (08:24 -0400)]
Merge pull request #24211 from eileenmcnaughton/goneier

[Import-code-cleanup] Remove another now-unused class `CRM_Contact_Import_ImportJob`

2 years agoupdate zeta/mail to 1.9.3
demeritcowboy [Wed, 10 Aug 2022 11:38:53 +0000 (07:38 -0400)]
update zeta/mail to 1.9.3

2 years agoMerge pull request #24215 from eileenmcnaughton/map_type
Eileen McNaughton [Wed, 10 Aug 2022 09:14:29 +0000 (21:14 +1200)]
Merge pull request #24215 from eileenmcnaughton/map_type

NFC IDE code format to get rid of array()

2 years agoMove unshared code to unshared function
Eileen McNaughton [Wed, 10 Aug 2022 07:18:46 +0000 (19:18 +1200)]
Move unshared code to unshared function

2 years agoConsolidate error handling on Custom data import tpl
Eileen McNaughton [Wed, 10 Aug 2022 06:03:07 +0000 (18:03 +1200)]
Consolidate error handling on Custom data import tpl

2 years agoNFC IDE code format to get rid of array()
Eileen McNaughton [Thu, 7 Jul 2022 02:11:32 +0000 (14:11 +1200)]
NFC IDE code format to get rid of array()

2 years agoRemove now-unused tpl
Eileen McNaughton [Wed, 6 Jul 2022 06:34:40 +0000 (18:34 +1200)]
Remove now-unused tpl

2 years agoMerge pull request #24213 from civicrm/5.53
Eileen McNaughton [Wed, 10 Aug 2022 04:54:55 +0000 (16:54 +1200)]
Merge pull request #24213 from civicrm/5.53

5.53 to master

2 years agoMerge pull request #24204 from totten/5.53-tabsetoptions
Eileen McNaughton [Wed, 10 Aug 2022 04:54:23 +0000 (16:54 +1200)]
Merge pull request #24204 from totten/5.53-tabsetoptions

CrmUi - Fix tabSetOptions variable

2 years agoMerge pull request #24208 from eileenmcnaughton/deprecated
Eileen McNaughton [Wed, 10 Aug 2022 04:53:27 +0000 (16:53 +1200)]
Merge pull request #24208 from eileenmcnaughton/deprecated

Finally remove apiv2 DeprecatedUtils

2 years agodev/core#3664 Remove dataColumnGuessing
Eileen McNaughton [Wed, 10 Aug 2022 04:26:58 +0000 (16:26 +1200)]
dev/core#3664 Remove dataColumnGuessing

2 years agoMerge pull request #24206 from eileenmcnaughton/rc
Eileen McNaughton [Wed, 10 Aug 2022 03:44:54 +0000 (15:44 +1200)]
Merge pull request #24206 from eileenmcnaughton/rc

removed import contacts access argument for summary path

2 years agoRemove another now-unused class
Eileen McNaughton [Wed, 10 Aug 2022 02:50:29 +0000 (14:50 +1200)]
Remove another now-unused class

2 years agoRemove unused function
Eileen McNaughton [Wed, 10 Aug 2022 02:40:22 +0000 (14:40 +1200)]
Remove unused function

2 years agoAPIv4 - Prevent fatal error when looking up pseudoconstant for field with no options
Coleman Watts [Mon, 8 Aug 2022 21:57:30 +0000 (17:57 -0400)]
APIv4 - Prevent fatal error when looking up pseudoconstant for field with no options

2 years agoAfform - Fix compatability of existing contact widget and 'current user' default
Coleman Watts [Sun, 7 Aug 2022 01:32:14 +0000 (21:32 -0400)]
Afform - Fix compatability of existing contact widget and 'current user' default

2 years agoAfform - Apply "type" values to autocomplete filters
Coleman Watts [Sat, 6 Aug 2022 21:50:40 +0000 (17:50 -0400)]
Afform - Apply "type" values to autocomplete filters

This ensures that if e.g. a Contact or Activity has its type specified on the form
it will also be limited to that type in autocomplete results when selecting an existing entity.

2 years agoAPIv4 Autocomplete - Add metadata and tests
Coleman Watts [Sat, 6 Aug 2022 19:33:02 +0000 (15:33 -0400)]
APIv4 Autocomplete - Add metadata and tests

2 years agoAfform - fill entity based on existing entity selection
Coleman Watts [Fri, 5 Aug 2022 22:02:19 +0000 (18:02 -0400)]
Afform - fill entity based on existing entity selection