Merge remote-tracking branch 'remotes/dev/1.10' into 1.10

Author: rgrebenchuk

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.

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;
             }

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:

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]);
             }
         );

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:

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:

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,

src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/cell/multi-select-cell.js

@@ -64,6 +64,7 @@ define([
                     '<span class="multiselect-value-wrapper"><span class="value-item">' +
                     value
                         .map(function(item) {return choices[item];})
+                        .filter(function(item) {return item;})
                         .join('</span><span class="value-item">') +
                     '</span></span>'
                 ) : '';

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.<br/>
-                    Are you sure you want to delete them?
+                selected_message: You have selected {{ selected }} record.<br/> Are you sure you want to delete it?|You have selected {{ selected }} records.<br/> 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 }}.<br/>
                     Are you sure you want to delete first {{ max_limit }} records in the selection?

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: