Skip to content

Commit b8d7c25

Browse files
ikrynychanskyialex-n-2k7
ikrynychanskyi
authored and
alex-n-2k7
committed
CRM-7776: Mistake in message when opportunity grid contains no records (#8503)
- Changed message if no records found - Changed entityHints to plural variant
1 parent 5a5a982 commit b8d7c25

File tree

18 files changed

+36
-36
lines changed

18 files changed

+36
-36
lines changed

Diff for: ‎src/Oro/Bundle/CalendarBundle/Resources/config/datagrid.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ datagrid:
173173
data_identifier: event.id
174174
handler: oro_calendar.datagrid.mass_action.handler.delete
175175
options:
176-
entityHint: calendar_events
176+
entityHint: calendar events
177177
entity_pagination: true
178178

179179
widget-base-calendar-event-grid:
@@ -213,7 +213,7 @@ datagrid:
213213
properties:
214214
id: ~
215215
options:
216-
entityHint: calendar_events
216+
entityHint: calendar events
217217

218218
activity-calendar-event-grid:
219219
extends: widget-base-calendar-event-grid
@@ -232,7 +232,7 @@ datagrid:
232232
users-calendar-select-grid-exclude-owner:
233233
acl_resource: oro_user_user_view
234234
options:
235-
entityHint: calendar
235+
entityHint: calendars
236236
source:
237237
type: orm
238238
query:
@@ -391,7 +391,7 @@ datagrid:
391391
icon: trash
392392
link: delete_link
393393
options:
394-
entityHint: calendar_events
394+
entityHint: calendar events
395395
entity_pagination: true
396396

397397
system-calendar-event-grid:
@@ -491,7 +491,7 @@ datagrid:
491491
extended_entity_name: %oro_calendar.calendar_event.entity.class%
492492
acl_resource: oro_calendar_event_view
493493
options:
494-
entityHint: calendar_events
494+
entityHint: calendar events
495495
entity_pagination: true
496496
toolbarOptions:
497497
pageSize:

Diff for: ‎src/Oro/Bundle/CronBundle/Resources/config/datagrid.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,12 @@ datagrid:
101101
acl_resource: oro_jobs
102102
rowAction: true
103103
options:
104-
entityHint: job
104+
entityHint: jobs
105105

106106
oro-cron-schedules-grid:
107107
acl_resource: oro_cron_schedule_view
108108
options:
109-
entityHint: schedule
109+
entityHint: schedules
110110
source:
111111
type: orm
112112
query:

Diff for: ‎src/Oro/Bundle/DataAuditBundle/Resources/config/datagrid.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ datagrid:
22
audit-grid:
33
acl_resource: oro_dataaudit_history
44
options:
5-
entityHint: audit
5+
entityHint: audits
66
source:
77
type: orm
88
query:

Diff for: ‎src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"Please select view": "Please select view"
3636
"oro.datagrid.entityHint": "Entity"
3737
"oro.datagrid.no.entities": "No records found"
38-
"oro.datagrid.no.results": "No {{ entityHint }} was found to match your search. Try modifying your search criteria..."
38+
"oro.datagrid.no.results": "No {{ entityHint }} were found to match your search. Try modifying your search criteria..."
3939
"oro.datagrid.no.columns": "No columns configured for this grid"
4040
"oro.datagrid.pagination.label": "Page"
4141
"oro.datagrid.pagination.totalPages": "of {{ totalPages }}"

Diff for: ‎src/Oro/Bundle/DataGridBundle/Resources/translations/messages.en.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"Item deleted": "Item deleted"
22
oro_datagrid:
33
no_data_hint %entityHint%: "No %entityHint% exists."
4-
not_found_hint %entityHint%: "No %entityHint% was found to match your search. Try modifying your search criteria ..."
4+
not_found_hint %entityHint%: "No %entityHint% were found to match your search. Try modifying your search criteria ..."
55
label_add_filter: Manage filters
66
label_loading_mask: "Loading . . ."
77
oro:

Diff for: ‎src/Oro/Bundle/EmailBundle/Resources/config/datagrid.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ datagrid:
192192
mailbox: { data_name: eu.origin }
193193
default: { receivedAt: %oro_datagrid.extension.orm_sorter.class%::DIRECTION_DESC }
194194
options:
195-
entityHint: email
195+
entityHint: emails
196196

197197
simplified-email-grid:
198198
extends: base-email-grid
@@ -346,7 +346,7 @@ datagrid:
346346
className: 'email-row-is-readed'
347347
callable: "@oro_email.helper.datagrid.emails->getReadedRowClosure"
348348
options:
349-
entityHint: email
349+
entityHint: emails
350350
toolbarOptions:
351351
hide: true
352352
pagination:
@@ -553,7 +553,7 @@ datagrid:
553553
entity_pagination: true
554554
action_configuration: "@oro_email.emailtemplate.datagrid_helper->getActionConfigurationClosure"
555555
views_list : "@oro_email.emailtemplate.datagrid_view_list"
556-
options: { entityHint: email template }
556+
options: { entityHint: email templates }
557557

558558
base-mailboxes-grid:
559559
source:
@@ -621,7 +621,7 @@ datagrid:
621621
email-for-context-grid:
622622
extends: email-grid
623623
options:
624-
entityHint: email
624+
entityHint: emails
625625
entity_pagination: true
626626
toolbarOptions:
627627
pageSize:

Diff for: ‎src/Oro/Bundle/EmbeddedFormBundle/Resources/config/datagrid.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,5 @@ datagrid:
7171
icon: trash
7272
link: delete_link
7373
options:
74-
entityHint: embedded form
74+
entityHint: embedded forms
7575
entity_pagination: true

Diff for: ‎src/Oro/Bundle/EntityBundle/Resources/config/datagrid.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ datagrid:
33
acl_resource: ~
44
options:
55
base_datagrid_class: Oro\Bundle\EntityBundle\Grid\CustomEntityDatagrid
6-
entityHint: entity
6+
entityHint: entities
77
export: true
88
entity_pagination: true
99
source:
@@ -63,7 +63,7 @@ datagrid:
6363
entity-relation-grid:
6464
acl_resource: ~
6565
options:
66-
entityHint: entity
66+
entityHint: entities
6767
routerEnabled: false
6868
rowSelection:
6969
dataField: id

Diff for: ‎src/Oro/Bundle/EntityConfigBundle/Resources/config/datagrid.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ datagrid:
22
# Entity config entities grid
33
entityconfig-grid:
44
options:
5-
entityHint: entity
5+
entityHint: entities
66
toolbarOptions:
77
pageSize:
88
default_per_page: 100
@@ -130,7 +130,7 @@ datagrid:
130130
# Audit entity log grid
131131
entity-audit-grid:
132132
options:
133-
entityHint: history
133+
entityHint: histories
134134
acl_resource: oro_entityconfig_manage
135135
source:
136136
type: orm

Diff for: ‎src/Oro/Bundle/IntegrationBundle/Resources/config/datagrid.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ datagrid:
114114
success: oro.integration.delete_sync_integration_window.success
115115
action_configuration: Oro\Bundle\IntegrationBundle\Datagrid\ActionConfiguration::getIsSyncAvailableCondition()
116116
options:
117-
entityHint: channel
117+
entityHint: channels
118118
entity_pagination: true
119119
mass_actions:
120120
delete:

Diff for: ‎src/Oro/Bundle/LocaleBundle/Resources/config/datagrid.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ datagrid:
22
base-oro-locale-localizations-grid:
33
acl_resource: oro_locale_localization_view
44
options:
5-
entityHint: localization
5+
entityHint: localizations
66
source:
77
type: orm
88
query:

Diff for: ‎src/Oro/Bundle/NotificationBundle/Resources/config/datagrid.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ datagrid:
8585

8686
email-notification-grid:
8787
options:
88-
entityHint: transactional email
88+
entityHint: transactional emails
8989
entity_pagination: true
9090
acl_resource: oro_notification_emailnotification_view
9191
source:

Diff for: ‎src/Oro/Bundle/OrganizationBundle/Resources/config/datagrid.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ datagrid:
22
business-unit-grid:
33
extended_entity_name: %oro_organization.business_unit.entity.class%
44
options:
5-
entityHint: business unit
5+
entityHint: business units
66
entity_pagination: true
77
source:
88
type: orm
@@ -184,7 +184,7 @@ datagrid:
184184
lastName: %oro_datagrid.extension.orm_sorter.class%::DIRECTION_ASC
185185

186186
options:
187-
entityHint: user
187+
entityHint: users
188188
rowSelection:
189189
dataField: id
190190
columnName: hasCurrentBusinessUnit
@@ -195,7 +195,7 @@ datagrid:
195195
bu-view-users-grid:
196196
extends: user-relation-grid
197197
options:
198-
entityHint: user
198+
entityHint: users
199199
acl_resource: oro_business_unit_view
200200
source:
201201
query:

Diff for: ‎src/Oro/Bundle/ReportBundle/Resources/config/datagrid.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,4 @@ datagrid:
9393
launcherOptions:
9494
className: 'no-hash mobile-hide'
9595
options:
96-
entityHint: report
96+
entityHint: reports

Diff for: ‎src/Oro/Bundle/SegmentBundle/Resources/config/datagrid.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,4 @@ datagrid:
101101
launcherOptions:
102102
className: 'no-hash mobile-hide'
103103
options:
104-
entityHint: segment
104+
entityHint: segments

Diff for: ‎src/Oro/Bundle/TagBundle/Resources/config/datagrid.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
datagrid:
22
tag-grid:
33
options:
4-
entityHint: tag
4+
entityHint: tags
55
entity_pagination: true
66
acl_resource: oro_tag_view
77
source:
@@ -89,7 +89,7 @@ datagrid:
8989

9090
tag-results-grid:
9191
options:
92-
entityHint: result
92+
entityHint: results
9393
acl_resource: oro_tag_view
9494
source:
9595
type: orm

Diff for: ‎src/Oro/Bundle/UserBundle/Resources/config/datagrid.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ datagrid:
22
users-grid:
33
extended_entity_name: %oro_user.entity.class%
44
options:
5-
entityHint: user
5+
entityHint: users
66
entity_pagination: true
77
acl_resource: oro_user_user_view
88
source:
@@ -148,7 +148,7 @@ datagrid:
148148
groups-grid:
149149
extended_entity_name: %oro_user.group.entity.class%
150150
options:
151-
entityHint: group
151+
entityHint: groups
152152
entity_pagination: true
153153
acl_resource: oro_user_group_view
154154
source:
@@ -208,7 +208,7 @@ datagrid:
208208
roles-grid:
209209
extended_entity_name: %oro_user.role.entity.class%
210210
options:
211-
entityHint: role
211+
entityHint: roles
212212
entity_pagination: true
213213
acl_resource: oro_user_role_view
214214
source:
@@ -570,7 +570,7 @@ datagrid:
570570
users-select-grid:
571571
extended_entity_name: %oro_user.entity.class%
572572
options:
573-
entityHint: user
573+
entityHint: users
574574
acl_resource: oro_user_user_view
575575
source:
576576
type: orm
@@ -642,7 +642,7 @@ datagrid:
642642
owner-users-select-grid:
643643
extended_entity_name: %oro_user.entity.class%
644644
options:
645-
entityHint: user
645+
entityHint: users
646646
source:
647647
type: orm
648648
skip_acl_apply: true
@@ -724,7 +724,7 @@ datagrid:
724724
users-for-context-grid:
725725
extended_entity_name: %oro_user.entity.class%
726726
options:
727-
entityHint: user
727+
entityHint: users
728728
entity_pagination: true
729729
toolbarOptions:
730730
pageSize:

Diff for: ‎src/Oro/Bundle/WorkflowBundle/Resources/config/datagrid.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ datagrid:
9898

9999
workflow-definitions-grid:
100100
options:
101-
entityHint: workflowssss
101+
entityHint: workflows
102102
export: false
103103
acl_resource: oro_workflow_definition_view
104104
source:

0 commit comments

Comments
 (0)