Skip to content

Commit

Permalink
CRM-7776: Mistake in message when opportunity grid contains no record…
Browse files Browse the repository at this point in the history
…s (#8503)

- Changed message if no records found
- Changed entityHints to plural variant
  • Loading branch information
ikrynychanskyi authored and alex-n-2k7 committed Mar 17, 2017
1 parent 5a5a982 commit b8d7c25
Show file tree
Hide file tree
Showing 18 changed files with 36 additions and 36 deletions.
10 changes: 5 additions & 5 deletions src/Oro/Bundle/CalendarBundle/Resources/config/datagrid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ datagrid:
data_identifier: event.id
handler: oro_calendar.datagrid.mass_action.handler.delete
options:
entityHint: calendar_events
entityHint: calendar events
entity_pagination: true

widget-base-calendar-event-grid:
Expand Down Expand Up @@ -213,7 +213,7 @@ datagrid:
properties:
id: ~
options:
entityHint: calendar_events
entityHint: calendar events

activity-calendar-event-grid:
extends: widget-base-calendar-event-grid
Expand All @@ -232,7 +232,7 @@ datagrid:
users-calendar-select-grid-exclude-owner:
acl_resource: oro_user_user_view
options:
entityHint: calendar
entityHint: calendars
source:
type: orm
query:
Expand Down Expand Up @@ -391,7 +391,7 @@ datagrid:
icon: trash
link: delete_link
options:
entityHint: calendar_events
entityHint: calendar events
entity_pagination: true

system-calendar-event-grid:
Expand Down Expand Up @@ -491,7 +491,7 @@ datagrid:
extended_entity_name: %oro_calendar.calendar_event.entity.class%
acl_resource: oro_calendar_event_view
options:
entityHint: calendar_events
entityHint: calendar events
entity_pagination: true
toolbarOptions:
pageSize:
Expand Down
4 changes: 2 additions & 2 deletions src/Oro/Bundle/CronBundle/Resources/config/datagrid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,12 @@ datagrid:
acl_resource: oro_jobs
rowAction: true
options:
entityHint: job
entityHint: jobs

oro-cron-schedules-grid:
acl_resource: oro_cron_schedule_view
options:
entityHint: schedule
entityHint: schedules
source:
type: orm
query:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ datagrid:
audit-grid:
acl_resource: oro_dataaudit_history
options:
entityHint: audit
entityHint: audits
source:
type: orm
query:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"Please select view": "Please select view"
"oro.datagrid.entityHint": "Entity"
"oro.datagrid.no.entities": "No records found"
"oro.datagrid.no.results": "No {{ entityHint }} was found to match your search. Try modifying your search criteria..."
"oro.datagrid.no.results": "No {{ entityHint }} were found to match your search. Try modifying your search criteria..."
"oro.datagrid.no.columns": "No columns configured for this grid"
"oro.datagrid.pagination.label": "Page"
"oro.datagrid.pagination.totalPages": "of {{ totalPages }}"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"Item deleted": "Item deleted"
oro_datagrid:
no_data_hint %entityHint%: "No %entityHint% exists."
not_found_hint %entityHint%: "No %entityHint% was found to match your search. Try modifying your search criteria ..."
not_found_hint %entityHint%: "No %entityHint% were found to match your search. Try modifying your search criteria ..."
label_add_filter: Manage filters
label_loading_mask: "Loading . . ."
oro:
Expand Down
8 changes: 4 additions & 4 deletions src/Oro/Bundle/EmailBundle/Resources/config/datagrid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ datagrid:
mailbox: { data_name: eu.origin }
default: { receivedAt: %oro_datagrid.extension.orm_sorter.class%::DIRECTION_DESC }
options:
entityHint: email
entityHint: emails

simplified-email-grid:
extends: base-email-grid
Expand Down Expand Up @@ -346,7 +346,7 @@ datagrid:
className: 'email-row-is-readed'
callable: "@oro_email.helper.datagrid.emails->getReadedRowClosure"
options:
entityHint: email
entityHint: emails
toolbarOptions:
hide: true
pagination:
Expand Down Expand Up @@ -553,7 +553,7 @@ datagrid:
entity_pagination: true
action_configuration: "@oro_email.emailtemplate.datagrid_helper->getActionConfigurationClosure"
views_list : "@oro_email.emailtemplate.datagrid_view_list"
options: { entityHint: email template }
options: { entityHint: email templates }

base-mailboxes-grid:
source:
Expand Down Expand Up @@ -621,7 +621,7 @@ datagrid:
email-for-context-grid:
extends: email-grid
options:
entityHint: email
entityHint: emails
entity_pagination: true
toolbarOptions:
pageSize:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,5 +71,5 @@ datagrid:
icon: trash
link: delete_link
options:
entityHint: embedded form
entityHint: embedded forms
entity_pagination: true
4 changes: 2 additions & 2 deletions src/Oro/Bundle/EntityBundle/Resources/config/datagrid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ datagrid:
acl_resource: ~
options:
base_datagrid_class: Oro\Bundle\EntityBundle\Grid\CustomEntityDatagrid
entityHint: entity
entityHint: entities
export: true
entity_pagination: true
source:
Expand Down Expand Up @@ -63,7 +63,7 @@ datagrid:
entity-relation-grid:
acl_resource: ~
options:
entityHint: entity
entityHint: entities
routerEnabled: false
rowSelection:
dataField: id
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ datagrid:
# Entity config entities grid
entityconfig-grid:
options:
entityHint: entity
entityHint: entities
toolbarOptions:
pageSize:
default_per_page: 100
Expand Down Expand Up @@ -130,7 +130,7 @@ datagrid:
# Audit entity log grid
entity-audit-grid:
options:
entityHint: history
entityHint: histories
acl_resource: oro_entityconfig_manage
source:
type: orm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ datagrid:
success: oro.integration.delete_sync_integration_window.success
action_configuration: Oro\Bundle\IntegrationBundle\Datagrid\ActionConfiguration::getIsSyncAvailableCondition()
options:
entityHint: channel
entityHint: channels
entity_pagination: true
mass_actions:
delete:
Expand Down
2 changes: 1 addition & 1 deletion src/Oro/Bundle/LocaleBundle/Resources/config/datagrid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ datagrid:
base-oro-locale-localizations-grid:
acl_resource: oro_locale_localization_view
options:
entityHint: localization
entityHint: localizations
source:
type: orm
query:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ datagrid:

email-notification-grid:
options:
entityHint: transactional email
entityHint: transactional emails
entity_pagination: true
acl_resource: oro_notification_emailnotification_view
source:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ datagrid:
business-unit-grid:
extended_entity_name: %oro_organization.business_unit.entity.class%
options:
entityHint: business unit
entityHint: business units
entity_pagination: true
source:
type: orm
Expand Down Expand Up @@ -184,7 +184,7 @@ datagrid:
lastName: %oro_datagrid.extension.orm_sorter.class%::DIRECTION_ASC

options:
entityHint: user
entityHint: users
rowSelection:
dataField: id
columnName: hasCurrentBusinessUnit
Expand All @@ -195,7 +195,7 @@ datagrid:
bu-view-users-grid:
extends: user-relation-grid
options:
entityHint: user
entityHint: users
acl_resource: oro_business_unit_view
source:
query:
Expand Down
2 changes: 1 addition & 1 deletion src/Oro/Bundle/ReportBundle/Resources/config/datagrid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,4 @@ datagrid:
launcherOptions:
className: 'no-hash mobile-hide'
options:
entityHint: report
entityHint: reports
2 changes: 1 addition & 1 deletion src/Oro/Bundle/SegmentBundle/Resources/config/datagrid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,4 @@ datagrid:
launcherOptions:
className: 'no-hash mobile-hide'
options:
entityHint: segment
entityHint: segments
4 changes: 2 additions & 2 deletions src/Oro/Bundle/TagBundle/Resources/config/datagrid.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
datagrid:
tag-grid:
options:
entityHint: tag
entityHint: tags
entity_pagination: true
acl_resource: oro_tag_view
source:
Expand Down Expand Up @@ -89,7 +89,7 @@ datagrid:

tag-results-grid:
options:
entityHint: result
entityHint: results
acl_resource: oro_tag_view
source:
type: orm
Expand Down
12 changes: 6 additions & 6 deletions src/Oro/Bundle/UserBundle/Resources/config/datagrid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ datagrid:
users-grid:
extended_entity_name: %oro_user.entity.class%
options:
entityHint: user
entityHint: users
entity_pagination: true
acl_resource: oro_user_user_view
source:
Expand Down Expand Up @@ -148,7 +148,7 @@ datagrid:
groups-grid:
extended_entity_name: %oro_user.group.entity.class%
options:
entityHint: group
entityHint: groups
entity_pagination: true
acl_resource: oro_user_group_view
source:
Expand Down Expand Up @@ -208,7 +208,7 @@ datagrid:
roles-grid:
extended_entity_name: %oro_user.role.entity.class%
options:
entityHint: role
entityHint: roles
entity_pagination: true
acl_resource: oro_user_role_view
source:
Expand Down Expand Up @@ -570,7 +570,7 @@ datagrid:
users-select-grid:
extended_entity_name: %oro_user.entity.class%
options:
entityHint: user
entityHint: users
acl_resource: oro_user_user_view
source:
type: orm
Expand Down Expand Up @@ -642,7 +642,7 @@ datagrid:
owner-users-select-grid:
extended_entity_name: %oro_user.entity.class%
options:
entityHint: user
entityHint: users
source:
type: orm
skip_acl_apply: true
Expand Down Expand Up @@ -724,7 +724,7 @@ datagrid:
users-for-context-grid:
extended_entity_name: %oro_user.entity.class%
options:
entityHint: user
entityHint: users
entity_pagination: true
toolbarOptions:
pageSize:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ datagrid:

workflow-definitions-grid:
options:
entityHint: workflowssss
entityHint: workflows
export: false
acl_resource: oro_workflow_definition_view
source:
Expand Down

0 comments on commit b8d7c25

Please sign in to comment.