diff --git a/UPGRADE-1.10.md b/UPGRADE-1.10.md
index 80de338b4ca..0c7aad9af6f 100644
--- a/UPGRADE-1.10.md
+++ b/UPGRADE-1.10.md
@@ -8,7 +8,7 @@ UPGRADE FROM 1.9 to 1.10
- Oro\Bundle\TestFrameworkBundle\Test\Client::startTransaction method was removed, use one from Oro\Bundle\TestFrameworkBundle\Test\WebTestCase class.
- Oro\Bundle\TestFrameworkBundle\Test\Client::rollbackTransaction method was removed, use one from Oro\Bundle\TestFrameworkBundle\Test\WebTestCase class.
- `\Oro\Bundle\TestFrameworkBundle\Fixtures\LoadUserData` is deprecated, use `\Oro\Bundle\TestFrameworkBundle\Migrations\Data\ORM\LoadUserData` instead
-- No need to load fixtures after test environment setup using `doctrine:fixture:load`
+- No need to load fixtures after test environment setup using `doctrine:fixtures:load`
####EntityBundle
- The implementation of `Oro\Bundle\EntityBundle\ORM\EntityAliasResolver` was changed. Now the loaded entity aliases is saved into a cache that gives significant performance gain. Also, from now, you can implement `Oro\Bundle\EntityBundle\Provider\EntityClassProviderInterface` to create aliases for any entities not only for ORM entities.
diff --git a/src/Oro/Bundle/ActivityBundle/Manager/ActivityManager.php b/src/Oro/Bundle/ActivityBundle/Manager/ActivityManager.php
index e1a47cf8989..8bbcb3ca6b5 100644
--- a/src/Oro/Bundle/ActivityBundle/Manager/ActivityManager.php
+++ b/src/Oro/Bundle/ActivityBundle/Manager/ActivityManager.php
@@ -187,7 +187,7 @@ public function setActivityTargets(ActivityInterface $activityEntity, array $tar
$oldTargetEntities = $activityEntity->getActivityTargetEntities();
foreach ($oldTargetEntities as $oldTargetEntity) {
- if (!in_array($oldTargetEntity, $targetEntities)) {
+ if (!in_array($oldTargetEntity, $targetEntities, true)) {
$this->removeActivityTarget($activityEntity, $oldTargetEntity);
$hasChanges = true;
}
diff --git a/src/Oro/Bundle/CalendarBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/CalendarBundle/Resources/config/datagrid.yml
index a73616d1713..6ce89ddb6e5 100644
--- a/src/Oro/Bundle/CalendarBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/CalendarBundle/Resources/config/datagrid.yml
@@ -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:
@@ -213,7 +213,7 @@ datagrid:
properties:
id: ~
options:
- entityHint: calendar_events
+ entityHint: calendar events
activity-calendar-event-grid:
extends: widget-base-calendar-event-grid
@@ -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:
@@ -391,7 +391,7 @@ datagrid:
icon: trash
link: delete_link
options:
- entityHint: calendar_events
+ entityHint: calendar events
entity_pagination: true
system-calendar-event-grid:
@@ -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:
diff --git a/src/Oro/Bundle/ConfigBundle/Form/Type/FormFieldType.php b/src/Oro/Bundle/ConfigBundle/Form/Type/FormFieldType.php
index b889f51d1c3..dc1e73411aa 100644
--- a/src/Oro/Bundle/ConfigBundle/Form/Type/FormFieldType.php
+++ b/src/Oro/Bundle/ConfigBundle/Form/Type/FormFieldType.php
@@ -74,8 +74,7 @@ function (FormEvent $event) {
FormEvents::POST_SUBMIT,
function (FormEvent $event) {
$form = $event->getForm()->getParent();
- $data = $event->getForm()->getData();
- $disabled = isset($data['use_parent_scope_value']) ? $data['use_parent_scope_value'] : false;
+ $disabled = $event->getForm()->getData();
FormUtils::replaceField($form, 'value', ['disabled' => $disabled]);
}
);
diff --git a/src/Oro/Bundle/CronBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/CronBundle/Resources/config/datagrid.yml
index 7268952f2a7..40db43a2bc9 100644
--- a/src/Oro/Bundle/CronBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/CronBundle/Resources/config/datagrid.yml
@@ -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:
diff --git a/src/Oro/Bundle/DataAuditBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/DataAuditBundle/Resources/config/datagrid.yml
index 6a7dd643079..d207afe5d64 100644
--- a/src/Oro/Bundle/DataAuditBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/DataAuditBundle/Resources/config/datagrid.yml
@@ -2,7 +2,7 @@ datagrid:
audit-grid:
acl_resource: oro_dataaudit_history
options:
- entityHint: audit
+ entityHint: audits
source:
type: orm
query:
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/action/delete-mass-action.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/action/delete-mass-action.js
index 28f8227ca05..eb7c1a5b5d9 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/action/delete-mass-action.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/action/delete-mass-action.js
@@ -135,7 +135,8 @@ define([
this.allowOk = false;
} else if (data.deletable <= data.max_limit) {
if (data.deletable >= data.selected) {
- this.confirmMessage = __(this.confirmMessages.selected_message, {selected: data.selected});
+ var placeholders = {selected: data.selected};
+ this.confirmMessage = __(this.confirmMessages.selected_message, placeholders, data.selected);
} else {
this.confirmMessage = __(this.confirmMessages.restricted_access_message, {
deletable: data.deletable,
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/cell/multi-select-cell.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/cell/multi-select-cell.js
index 5a3256f330c..8ed7ef82dcd 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/cell/multi-select-cell.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/cell/multi-select-cell.js
@@ -64,6 +64,7 @@ define([
'' +
value
.map(function(item) {return choices[item];})
+ .filter(function(item) {return item;})
.join('') +
''
) : '';
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml b/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
index 7563c05cbf2..a682705c68c 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
@@ -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 }}"
@@ -106,9 +106,7 @@ oro:
mass_action:
title: Mass Actions
delete:
- selected_message: >
- You have selected {{ selected }} records.
- Are you sure you want to delete them?
+ selected_message: You have selected {{ selected }} record.
Are you sure you want to delete it?|You have selected {{ selected }} records.
Are you sure you want to delete them?
max_limit_message: >
The maximum number of records that can be deleted at once is {{ max_limit }}.
Are you sure you want to delete first {{ max_limit }} records in the selection?
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/translations/messages.en.yml b/src/Oro/Bundle/DataGridBundle/Resources/translations/messages.en.yml
index fda88a5a8c4..70fcce504b4 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/translations/messages.en.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/translations/messages.en.yml
@@ -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:
diff --git a/src/Oro/Bundle/EmailBundle/Mailer/Processor.php b/src/Oro/Bundle/EmailBundle/Mailer/Processor.php
index d4230f7f252..c7e2102da6b 100644
--- a/src/Oro/Bundle/EmailBundle/Mailer/Processor.php
+++ b/src/Oro/Bundle/EmailBundle/Mailer/Processor.php
@@ -212,7 +212,7 @@ public function processSend($message, $emailOrigin)
}
$messageId = $message->getId();
if (!$this->mailer->send($message)) {
- throw new \Swift_SwiftException('An email was not delivered.');
+ throw new \Swift_SwiftException('The email was not delivered.');
}
/**
diff --git a/src/Oro/Bundle/EmailBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/EmailBundle/Resources/config/datagrid.yml
index c1519a78523..57a7e7dbac5 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/EmailBundle/Resources/config/datagrid.yml
@@ -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
@@ -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:
@@ -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:
@@ -621,7 +621,7 @@ datagrid:
email-for-context-grid:
extends: email-grid
options:
- entityHint: email
+ entityHint: emails
entity_pagination: true
toolbarOptions:
pageSize:
diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Mailer/ProcessorTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Mailer/ProcessorTest.php
index 73076a5aef6..a7e1780064f 100644
--- a/src/Oro/Bundle/EmailBundle/Tests/Unit/Mailer/ProcessorTest.php
+++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/Mailer/ProcessorTest.php
@@ -173,7 +173,7 @@ public function invalidModelDataProvider()
/**
* @expectedException \Swift_SwiftException
- * @expectedExceptionMessage An email was not delivered.
+ * @expectedExceptionMessage The email was not delivered.
*/
public function testProcessSendFailException()
{
diff --git a/src/Oro/Bundle/EmbeddedFormBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/EmbeddedFormBundle/Resources/config/datagrid.yml
index 32e079fe5bc..eb2934b4dad 100644
--- a/src/Oro/Bundle/EmbeddedFormBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/EmbeddedFormBundle/Resources/config/datagrid.yml
@@ -71,5 +71,5 @@ datagrid:
icon: trash
link: delete_link
options:
- entityHint: embedded form
+ entityHint: embedded forms
entity_pagination: true
diff --git a/src/Oro/Bundle/EntityBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/EntityBundle/Resources/config/datagrid.yml
index c466ba66850..25c9933aef7 100644
--- a/src/Oro/Bundle/EntityBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/EntityBundle/Resources/config/datagrid.yml
@@ -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:
@@ -63,7 +63,7 @@ datagrid:
entity-relation-grid:
acl_resource: ~
options:
- entityHint: entity
+ entityHint: entities
routerEnabled: false
rowSelection:
dataField: id
diff --git a/src/Oro/Bundle/EntityConfigBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/EntityConfigBundle/Resources/config/datagrid.yml
index 48a8d68e4ea..862e6b620d8 100644
--- a/src/Oro/Bundle/EntityConfigBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/EntityConfigBundle/Resources/config/datagrid.yml
@@ -2,7 +2,7 @@ datagrid:
# Entity config entities grid
entityconfig-grid:
options:
- entityHint: entity
+ entityHint: entities
toolbarOptions:
pageSize:
default_per_page: 100
@@ -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
diff --git a/src/Oro/Bundle/EntityExtendBundle/Resources/config/validation.yml b/src/Oro/Bundle/EntityExtendBundle/Resources/config/validation.yml
index 8e575eae57f..deb378c1cd7 100644
--- a/src/Oro/Bundle/EntityExtendBundle/Resources/config/validation.yml
+++ b/src/Oro/Bundle/EntityExtendBundle/Resources/config/validation.yml
@@ -31,7 +31,7 @@ Oro\Bundle\EntityConfigBundle\Entity\EntityConfigModel:
className:
- NotBlank: ~
- Regex:
- pattern: "/^[a-z]+[a-z0-9]*$/i"
+ pattern: "/^([0-9]+[a-zA-Z]+|[a-zA-Z]+)[0-9a-zA-Z]*$/i"
message: "This value should contain only alphabetic symbols and numbers."
- oro_entity_extend:NotSqlKeyword: {groups: Sql}
- oro_entity_extend:NotPhpKeyword: {groups: Php}
diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/choice-filter.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/choice-filter.js
index 31247ee44ad..e6b4ebc7faf 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/choice-filter.js
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/choice-filter.js
@@ -114,9 +114,10 @@ define([
var selectedChoiceLabel = '';
if (!_.isEmpty(this.choices)) {
var foundChoice = _.find(this.choices, function(choice) {
- return (choice.value === value.type);
+ return String(choice.value) === String(value.type);
});
- selectedChoiceLabel = foundChoice.label;
+ foundChoice = foundChoice || _.first(this.choices);
+ selectedChoiceLabel = _.result(foundChoice, 'label') || '';
}
var $filter = $(this.template({
name: this.name,
diff --git a/src/Oro/Bundle/FormBundle/Form/Type/OroEncodedPasswordType.php b/src/Oro/Bundle/FormBundle/Form/Type/OroEncodedPasswordType.php
index c99f0a24e29..cc863a9a425 100644
--- a/src/Oro/Bundle/FormBundle/Form/Type/OroEncodedPasswordType.php
+++ b/src/Oro/Bundle/FormBundle/Form/Type/OroEncodedPasswordType.php
@@ -68,6 +68,9 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
$resolver->setDefaults([
'encode' => true,
+ 'attr' => [
+ 'autocomplete' => 'new-password'
+ ]
]);
}
diff --git a/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/select2-autocomplete-component.js b/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/select2-autocomplete-component.js
index 7016512c85f..66c3522ba1e 100644
--- a/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/select2-autocomplete-component.js
+++ b/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/select2-autocomplete-component.js
@@ -43,11 +43,13 @@ define(function(require) {
makeItemTemplate: function(propName, forSelection) {
var labelTpl = '_.escape(' + propName + ')';
+ var newLabel = __('oro.form.add_new');
if (forSelection) {
labelTpl = 'highlight(' + labelTpl + ')';
+ newLabel = __('oro.form.new');
}
return '<%= ' + labelTpl + ' %><% if (id === null) { %>' +
- ' (' + __('oro.form.add_new') + ') <% } %>';
+ ' (' + newLabel + ') <% } %>';
}
});
diff --git a/src/Oro/Bundle/FormBundle/Resources/views/Autocomplete/fullName/selection.html.twig b/src/Oro/Bundle/FormBundle/Resources/views/Autocomplete/fullName/selection.html.twig
index 801d9a96b58..3a12400f4a7 100644
--- a/src/Oro/Bundle/FormBundle/Resources/views/Autocomplete/fullName/selection.html.twig
+++ b/src/Oro/Bundle/FormBundle/Resources/views/Autocomplete/fullName/selection.html.twig
@@ -1,5 +1,5 @@
<%= _.escape(fullName) %><% if (id === null) { %>
- (<%= _.__('oro.form.add_new') %>)
+ (<%= _.__('oro.form.new') %>)
<% } %>
diff --git a/src/Oro/Bundle/ImapBundle/Form/Type/ConfigurationType.php b/src/Oro/Bundle/ImapBundle/Form/Type/ConfigurationType.php
index b051f8dc650..00a0274d96c 100644
--- a/src/Oro/Bundle/ImapBundle/Form/Type/ConfigurationType.php
+++ b/src/Oro/Bundle/ImapBundle/Form/Type/ConfigurationType.php
@@ -124,8 +124,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
'tooltip' => 'oro.imap.configuration.tooltip',
])
->add('password', 'password', [
- 'label' => 'oro.imap.configuration.password.label', 'required' => true,
- 'attr' => ['class' => 'check-connection']
+ 'label' => 'oro.imap.configuration.password.label',
+ 'required' => true,
+ 'attr' => [
+ 'class' => 'check-connection',
+ 'autocomplete' => 'new-password'
+ ]
]);
if ($options['add_check_button']) {
$builder->add('check_connection', 'oro_imap_configuration_check', [
diff --git a/src/Oro/Bundle/IntegrationBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/IntegrationBundle/Resources/config/datagrid.yml
index 0754c8bf35e..9a25dc37920 100644
--- a/src/Oro/Bundle/IntegrationBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/IntegrationBundle/Resources/config/datagrid.yml
@@ -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:
diff --git a/src/Oro/Bundle/LocaleBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/LocaleBundle/Resources/config/datagrid.yml
index f29edfe71b5..9fd3583bd5e 100644
--- a/src/Oro/Bundle/LocaleBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/LocaleBundle/Resources/config/datagrid.yml
@@ -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:
diff --git a/src/Oro/Bundle/NotificationBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/NotificationBundle/Resources/config/datagrid.yml
index cf54193a784..718ccc4efff 100644
--- a/src/Oro/Bundle/NotificationBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/NotificationBundle/Resources/config/datagrid.yml
@@ -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:
diff --git a/src/Oro/Bundle/NotificationBundle/Resources/translations/messages.en.yml b/src/Oro/Bundle/NotificationBundle/Resources/translations/messages.en.yml
index ba95d5318dd..fc2e2b77da5 100644
--- a/src/Oro/Bundle/NotificationBundle/Resources/translations/messages.en.yml
+++ b/src/Oro/Bundle/NotificationBundle/Resources/translations/messages.en.yml
@@ -14,6 +14,8 @@ oro:
form:
choose_event: Choose an event...
+ recipient_list:
+ empty: At least one Recipient must be specified.
datagrid:
action:
diff --git a/src/Oro/Bundle/NotificationBundle/Resources/views/EmailNotification/update.html.twig b/src/Oro/Bundle/NotificationBundle/Resources/views/EmailNotification/update.html.twig
index f0cfc10397c..220c133a5bf 100644
--- a/src/Oro/Bundle/NotificationBundle/Resources/views/EmailNotification/update.html.twig
+++ b/src/Oro/Bundle/NotificationBundle/Resources/views/EmailNotification/update.html.twig
@@ -81,6 +81,7 @@
'subblocks': [{
'title': '',
'data': [
+ UI.renderHtmlProperty('', '* ' ~ 'oro.notification.form.recipient_list.empty'|trans),
form_widget(form.children.recipientList),
]
}]
diff --git a/src/Oro/Bundle/OrganizationBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/OrganizationBundle/Resources/config/datagrid.yml
index e3bf69adba3..9f5cffac3e4 100644
--- a/src/Oro/Bundle/OrganizationBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/OrganizationBundle/Resources/config/datagrid.yml
@@ -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
@@ -184,7 +184,7 @@ datagrid:
lastName: %oro_datagrid.extension.orm_sorter.class%::DIRECTION_ASC
options:
- entityHint: user
+ entityHint: users
rowSelection:
dataField: id
columnName: hasCurrentBusinessUnit
@@ -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:
diff --git a/src/Oro/Bundle/ReportBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/ReportBundle/Resources/config/datagrid.yml
index 65ab9552926..9a646f6ea05 100644
--- a/src/Oro/Bundle/ReportBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/ReportBundle/Resources/config/datagrid.yml
@@ -93,4 +93,4 @@ datagrid:
launcherOptions:
className: 'no-hash mobile-hide'
options:
- entityHint: report
+ entityHint: reports
diff --git a/src/Oro/Bundle/SegmentBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/SegmentBundle/Resources/config/datagrid.yml
index b7e43ccba97..7caaac3e8f9 100644
--- a/src/Oro/Bundle/SegmentBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/SegmentBundle/Resources/config/datagrid.yml
@@ -101,4 +101,4 @@ datagrid:
launcherOptions:
className: 'no-hash mobile-hide'
options:
- entityHint: segment
+ entityHint: segments
diff --git a/src/Oro/Bundle/TagBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/TagBundle/Resources/config/datagrid.yml
index a4fce92faf0..1313221315c 100644
--- a/src/Oro/Bundle/TagBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/TagBundle/Resources/config/datagrid.yml
@@ -1,7 +1,7 @@
datagrid:
tag-grid:
options:
- entityHint: tag
+ entityHint: tags
entity_pagination: true
acl_resource: oro_tag_view
source:
@@ -89,7 +89,7 @@ datagrid:
tag-results-grid:
options:
- entityHint: result
+ entityHint: results
acl_resource: oro_tag_view
source:
type: orm
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/extend/jquery.multiselect.js b/src/Oro/Bundle/UIBundle/Resources/public/js/extend/jquery.multiselect.js
index 97ed2605897..9eeba245cc3 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/js/extend/jquery.multiselect.js
+++ b/src/Oro/Bundle/UIBundle/Resources/public/js/extend/jquery.multiselect.js
@@ -20,16 +20,18 @@ define([
this.refresh();
}
this._superApply(arguments);
+ if (!this.options.appendTo) {
+ this.menu.css('zIndex', '');
+ var zIndex = Math.max.apply(Math, this.element.parents().add(this.menu).map(function() {
+ var zIndex = Number($(this).css('zIndex'));
+ return isNaN(zIndex) ? 0 : zIndex;
+ }));
- this.menu.css('zIndex', '');
- var zIndex = Math.max.apply(Math, this.element.parents().add(this.menu).map(function() {
- var zIndex = Number($(this).css('zIndex'));
- return isNaN(zIndex) ? 0 : zIndex;
- }));
+ this.menu.css('zIndex', zIndex + 2);
- this.menu.css('zIndex', zIndex + 2);
- mask.show(zIndex + 1)
- .onhide($.proxy(this.close, this));
+ mask.show(zIndex + 1)
+ .onhide($.proxy(this.close, this));
+ }
},
/**
diff --git a/src/Oro/Bundle/UserBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/UserBundle/Resources/config/datagrid.yml
index 426d933507f..53ce7785893 100644
--- a/src/Oro/Bundle/UserBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/UserBundle/Resources/config/datagrid.yml
@@ -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:
@@ -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:
@@ -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:
@@ -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
@@ -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
@@ -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:
diff --git a/src/Oro/Bundle/WorkflowBundle/Resources/config/conditions.yml b/src/Oro/Bundle/WorkflowBundle/Resources/config/conditions.yml
index 4f615d04005..61e90fd9ab1 100644
--- a/src/Oro/Bundle/WorkflowBundle/Resources/config/conditions.yml
+++ b/src/Oro/Bundle/WorkflowBundle/Resources/config/conditions.yml
@@ -70,12 +70,12 @@ services:
oro_workflow.expression.has_elements:
class: Oro\Component\ConfigExpression\Condition\HasElements
tags:
- - { name: oro_workflow.expression, alias: has_elements }
+ - { name: oro_workflow.condition, alias: has_elements }
oro_workflow.expression.no_elements:
class: Oro\Component\ConfigExpression\Condition\NoElements
tags:
- - { name: oro_workflow.expression, alias: no_elements }
+ - { name: oro_workflow.condition, alias: no_elements }
oro_workflow.expression.has_value:
class: Oro\Component\ConfigExpression\Condition\HasValue
diff --git a/src/Oro/Bundle/WorkflowBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/WorkflowBundle/Resources/config/datagrid.yml
index fffe6b7eaae..d86a65ccd4b 100644
--- a/src/Oro/Bundle/WorkflowBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/WorkflowBundle/Resources/config/datagrid.yml
@@ -98,7 +98,7 @@ datagrid:
workflow-definitions-grid:
options:
- entityHint: workflowssss
+ entityHint: workflows
export: false
acl_resource: oro_workflow_definition_view
source: