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

oroinc · Aug 3, 2016 · 9955b86 · 9955b86
2 parents 89c35b2 + b3f8db0
commit 9955b86
Show file tree

Hide file tree

Showing 23 changed files with 115 additions and 119 deletions.
diff --git a/src/OroCRM/Bundle/AccountBundle/Resources/config/datagrid.yml b/src/OroCRM/Bundle/AccountBundle/Resources/config/datagrid.yml
@@ -153,16 +153,14 @@ datagrid:
                     type: choice-tree
                     label: oro.user.owner.label
                     data_name: a.owner
-                    options:
-                        lazy: @oro_user.provider.filter.user_choice_tree->shouldBeLazy
-                        data: @?oro_user.provider.filter.user_choice_tree->getList
+                    autocomplete_alias: users
+                    renderedPropertyName: 'fullName'
+                    className: 'Oro\Bundle\UserBundle\Entity\User'
                 businessUnitId:
                     label: oro.business_unit.label
                     type: choice-business-unit
                     data_name: a.owner
-                    options:
-                        lazy: @oro_organization.provider.filter.busines_unit_choice_tree->shouldBeLazy
-                        data: @?oro_organization.provider.filter.busines_unit_choice_tree->getList
+                    className: 'Oro\Bundle\OrganizationBundle\Entity\BusinessUnit'
                 createdAt:
                     type:      datetime
                     data_name: a.createdAt
@@ -402,16 +400,14 @@ datagrid:
                     type: choice-tree
                     label: oro.user.owner.label
                     data_name: a.owner
-                    options:
-                        lazy: @oro_user.provider.filter.user_choice_tree->shouldBeLazy
-                        data: @?oro_user.provider.filter.user_choice_tree->getList
+                    autocomplete_alias: users
+                    renderedPropertyName: 'fullName'
+                    className: 'Oro\Bundle\UserBundle\Entity\User'
                 businessUnitId:
                     label: oro.business_unit.label
                     type: choice-business-unit
                     data_name: a.owner
-                    options:
-                        lazy: @oro_organization.provider.filter.busines_unit_choice_tree->shouldBeLazy
-                        data: @?oro_organization.provider.filter.busines_unit_choice_tree->getList
+                    className: 'Oro\Bundle\OrganizationBundle\Entity\BusinessUnit'
         options:
             entityHint: account
 

diff --git a/src/OroCRM/Bundle/AccountBundle/Tests/Functional/API/SoapAccountTest.php b/src/OroCRM/Bundle/AccountBundle/Tests/Functional/API/SoapAccountTest.php
@@ -7,6 +7,7 @@
 /**
  * @outputBuffering enabled
  * @dbIsolation
+ * @group soap
  */
 class SoapAccountTest extends WebTestCase
 {

diff --git a/src/OroCRM/Bundle/AccountBundle/Tests/Selenium/AclAccountTest.php b/src/OroCRM/Bundle/AccountBundle/Tests/Selenium/AclAccountTest.php
@@ -36,11 +36,9 @@ public function testCreateUser($role)
     {
         $username = 'User_'.mt_rand();
 
-        $login = $this->login();
-        /* @var Users $login */
-        $login->openUsers('Oro\Bundle\UserBundle')
-            ->add()
-            ->assertTitle('Create User - Users - User Management - System')
+        $page = $this->login()->openUsers('Oro\Bundle\UserBundle')->add();
+        /** @var Users $login */
+        $page->assertTitle('Create User - Users - User Management - System')
             ->setUsername($username)
             ->enable()
             ->setOwner('Main')
@@ -49,9 +47,11 @@ public function testCreateUser($role)
             ->setFirstName('First_'.$username)
             ->setLastName('Last_'.$username)
             ->setEmail($username.'@mail.com')
-            ->setRoles(array('Label_' . $role))
-            ->setBusinessUnit()
-            ->setOrganization('OroCRM')
+            ->setRoles(['Label_' . $role]);
+        if ($page->hasBusinessUnitOrganizationChoice()) {
+            $page->setBusinessUnitOrganization(['OroCRM']);
+        }
+        $page->setBusinessUnit()
             ->uncheckInviteUser()
             ->save()
             ->assertMessage('User saved')

diff --git a/src/OroCRM/Bundle/CallBundle/Tests/Functional/Controller/API/Soap/CallControllerTest.php b/src/OroCRM/Bundle/CallBundle/Tests/Functional/Controller/API/Soap/CallControllerTest.php
@@ -7,6 +7,7 @@
 /**
  * @outputBuffering enabled
  * @dbIsolation
+ * @group soap
  */
 class CallControllerTest extends WebTestCase
 {

diff --git a/src/OroCRM/Bundle/CallBundle/Tests/Selenium/AclCallTest.php b/src/OroCRM/Bundle/CallBundle/Tests/Selenium/AclCallTest.php
@@ -36,11 +36,9 @@ public function testCreateUser($role)
     {
         $username = 'User_'.mt_rand();
 
-        $login = $this->login();
+        $page = $this->login()->openUsers('Oro\Bundle\UserBundle')->add();
         /** @var Users $login */
-        $login->openUsers('Oro\Bundle\UserBundle')
-            ->add()
-            ->assertTitle('Create User - Users - User Management - System')
+        $page->assertTitle('Create User - Users - User Management - System')
             ->setUsername($username)
             ->enable()
             ->setOwner('Main')
@@ -49,9 +47,11 @@ public function testCreateUser($role)
             ->setFirstName('First_'.$username)
             ->setLastName('Last_'.$username)
             ->setEmail($username.'@mail.com')
-            ->setRoles(array('Label_' . $role))
-            ->setBusinessUnit()
-            ->setOrganization('OroCRM')
+            ->setRoles(['Label_' . $role]);
+        if ($page->hasBusinessUnitOrganizationChoice()) {
+            $page->setBusinessUnitOrganization(['OroCRM']);
+        }
+        $page->setBusinessUnit()
             ->uncheckInviteUser()
             ->save()
             ->assertMessage('User saved')

diff --git a/src/OroCRM/Bundle/CampaignBundle/Model/EmailCampaignStatisticsConnector.php b/src/OroCRM/Bundle/CampaignBundle/Model/EmailCampaignStatisticsConnector.php
@@ -91,7 +91,9 @@ public function getStatisticsRecord(EmailCampaign $emailCampaign, $entity)
         if ($marketingListItem->getId() !== null) {
             $statisticsRecord = $manager->getRepository($this->entityName)
                 ->findOneBy(['emailCampaign' => $emailCampaign, 'marketingListItem' => $marketingListItem]);
-        } elseif (!empty($this->statisticRecordsCache[$emailCampaign->getId()][$marketingListItemHash])) {
+        }
+
+        if (!empty($this->statisticRecordsCache[$emailCampaign->getId()][$marketingListItemHash])) {
             $statisticsRecord = $this->statisticRecordsCache[$emailCampaign->getId()][$marketingListItemHash];
         }
 

diff --git a/src/OroCRM/Bundle/CampaignBundle/Tests/Unit/Model/EmailCampaignStatisticsConnectorTest.php b/src/OroCRM/Bundle/CampaignBundle/Tests/Unit/Model/EmailCampaignStatisticsConnectorTest.php
@@ -108,7 +108,7 @@ public function testGetStatisticsRecordExisting($existing)
                 ->with(['emailCampaign' => $emailCampaign, 'marketingListItem' => $marketingListItem])
                 ->will($this->returnValue(null));
 
-            $manager->expects($this->exactly(2))
+            $manager->expects($this->exactly(1))
                 ->method('persist')
                 ->with($this->isInstanceOf('OroCRM\Bundle\CampaignBundle\Entity\EmailCampaignStatistics'));
         }

diff --git a/src/OroCRM/Bundle/CaseBundle/Tests/Functional/Controller/Api/Soap/CaseControllerTest.php b/src/OroCRM/Bundle/CaseBundle/Tests/Functional/Controller/Api/Soap/CaseControllerTest.php
@@ -11,6 +11,7 @@
 /**
  * @outputBuffering enabled
  * @dbIsolation
+ * @group soap
  */
 class CaseControllerTest extends WebTestCase
 {

diff --git a/src/OroCRM/Bundle/CaseBundle/Tests/Functional/Controller/Api/Soap/CommentControllerTest.php b/src/OroCRM/Bundle/CaseBundle/Tests/Functional/Controller/Api/Soap/CommentControllerTest.php
@@ -7,6 +7,7 @@
 /**
  * @outputBuffering enabled
  * @dbIsolation
+ * @group soap
  */
 class CommentControllerTest extends WebTestCase
 {

diff --git a/src/OroCRM/Bundle/CaseBundle/Tests/Selenium/AclCasesTest.php b/src/OroCRM/Bundle/CaseBundle/Tests/Selenium/AclCasesTest.php
@@ -36,11 +36,9 @@ public function testCreateUser($role)
     {
         $username = 'User_'.mt_rand();
 
-        $login = $this->login();
+        $page = $this->login()->openUsers('Oro\Bundle\UserBundle')->add();
         /** @var Users $login */
-        $login->openUsers('Oro\Bundle\UserBundle')
-            ->add()
-            ->assertTitle('Create User - Users - User Management - System')
+        $page->assertTitle('Create User - Users - User Management - System')
             ->setUsername($username)
             ->enable()
             ->setOwner('Main')
@@ -49,9 +47,11 @@ public function testCreateUser($role)
             ->setFirstName('First_'.$username)
             ->setLastName('Last_'.$username)
             ->setEmail($username.'@mail.com')
-            ->setRoles(array('Label_' . $role))
-            ->setBusinessUnit()
-            ->setOrganization('OroCRM')
+            ->setRoles(['Label_' . $role]);
+        if ($page->hasBusinessUnitOrganizationChoice()) {
+            $page->setBusinessUnitOrganization(['OroCRM']);
+        }
+        $page->setBusinessUnit()
             ->uncheckInviteUser()
             ->save()
             ->assertMessage('User saved')

diff --git a/src/OroCRM/Bundle/ContactBundle/Resources/config/datagrid.yml b/src/OroCRM/Bundle/ContactBundle/Resources/config/datagrid.yml
@@ -494,15 +494,15 @@ datagrid:
                     type: choice-tree
                     label: oro.user.owner.label
                     data_name: c.owner
-                    options:
-                        lazy: @oro_user.provider.filter.user_choice_tree->shouldBeLazy
-                        data: @?oro_user.provider.filter.user_choice_tree->getList
+                    autocomplete_alias: users
+                    renderedPropertyName: 'fullName'
+                    className: 'Oro\Bundle\UserBundle\Entity\User'
                 assignedName:
                     type: choice-tree
                     data_name: c.assignedTo
-                    options:
-                        lazy: @oro_user.provider.filter.user_choice_tree->shouldBeLazy
-                        data: @?oro_user.provider.filter.user_choice_tree->getList
+                    autocomplete_alias: users
+                    renderedPropertyName: 'fullName'
+                    className: 'Oro\Bundle\UserBundle\Entity\User'
                     enabled: false
                 reportsName:
                     type: string
@@ -512,9 +512,7 @@ datagrid:
                     label: oro.business_unit.label
                     type: choice-business-unit
                     data_name: c.owner
-                    options:
-                        lazy: @oro_organization.provider.filter.busines_unit_choice_tree->shouldBeLazy
-                        data: @?oro_organization.provider.filter.busines_unit_choice_tree->getList
+                    className: 'Oro\Bundle\OrganizationBundle\Entity\BusinessUnit'
         actions:
             view:
                 type: navigate
@@ -637,16 +635,14 @@ datagrid:
                     type: choice-tree
                     label: oro.user.owner.label
                     data_name: a.owner
-                    options:
-                        lazy: @oro_user.provider.filter.user_choice_tree->shouldBeLazy
-                        data: @?oro_user.provider.filter.user_choice_tree->getList
+                    autocomplete_alias: users
+                    renderedPropertyName: 'fullName'
+                    className: 'Oro\Bundle\UserBundle\Entity\User'
                 businessUnitId:
                     label: oro.business_unit.label
                     type: choice-business-unit
                     data_name: a.owner
-                    options:
-                        lazy: @oro_organization.provider.filter.busines_unit_choice_tree->shouldBeLazy
-                        data: @?oro_organization.provider.filter.busines_unit_choice_tree->getList
+                    className: 'Oro\Bundle\OrganizationBundle\Entity\BusinessUnit'
                 createdAt:
                     type:      datetime
                     data_name: a.createdAt

diff --git a/src/OroCRM/Bundle/ContactBundle/Tests/Functional/API/SoapContactApiTest.php b/src/OroCRM/Bundle/ContactBundle/Tests/Functional/API/SoapContactApiTest.php
@@ -7,6 +7,7 @@
 /**
  * @outputBuffering enabled
  * @dbIsolation
+ * @group soap
  */
 class SoapContactApiTest extends WebTestCase
 {

diff --git a/src/OroCRM/Bundle/ContactBundle/Tests/Functional/API/SoapContactGroupApiTest.php b/src/OroCRM/Bundle/ContactBundle/Tests/Functional/API/SoapContactGroupApiTest.php
@@ -7,6 +7,7 @@
 /**
  * @outputBuffering enabled
  * @dbIsolation
+ * @group soap
  */
 class SoapContactGroupApiTest extends WebTestCase
 {

diff --git a/src/OroCRM/Bundle/ContactBundle/Tests/Selenium/AclContactTest.php b/src/OroCRM/Bundle/ContactBundle/Tests/Selenium/AclContactTest.php
@@ -36,11 +36,9 @@ public function testCreateUser($role)
     {
         $username = 'User_'.mt_rand();
 
-        $login = $this->login();
+        $page = $this->login()->openUsers('Oro\Bundle\UserBundle')->add();
         /** @var Users $login */
-        $login->openUsers('Oro\Bundle\UserBundle')
-            ->add()
-            ->assertTitle('Create User - Users - User Management - System')
+        $page->assertTitle('Create User - Users - User Management - System')
             ->setUsername($username)
             ->enable()
             ->setOwner('Main')
@@ -49,9 +47,11 @@ public function testCreateUser($role)
             ->setFirstName('First_'.$username)
             ->setLastName('Last_'.$username)
             ->setEmail($username.'@mail.com')
-            ->setRoles(array('Label_' . $role))
-            ->setBusinessUnit()
-            ->setOrganization('OroCRM')
+            ->setRoles(['Label_' . $role]);
+        if ($page->hasBusinessUnitOrganizationChoice()) {
+            $page->setBusinessUnitOrganization(['OroCRM']);
+        }
+        $page->setBusinessUnit()
             ->uncheckInviteUser()
             ->save()
             ->assertMessage('User saved')

diff --git a/src/OroCRM/Bundle/ReportBundle/Resources/config/datagrid.yml b/src/OroCRM/Bundle/ReportBundle/Resources/config/datagrid.yml
@@ -452,9 +452,9 @@ datagrid:
                 ownerName:
                     type: choice-tree
                     data_name: o.owner
-                    options:
-                        lazy: @oro_user.provider.filter.user_choice_tree->shouldBeLazy
-                        data: @?oro_user.provider.filter.user_choice_tree->getList
+                    autocomplete_alias: users
+                    renderedPropertyName: 'fullName'
+                    className: 'Oro\Bundle\UserBundle\Entity\User'
                 inProgressCount:
                     type:      number
                     data_name: inProgressCount

diff --git a/src/OroCRM/Bundle/SalesBundle/Resources/config/datagrid.yml b/src/OroCRM/Bundle/SalesBundle/Resources/config/datagrid.yml
@@ -213,16 +213,14 @@ datagrid:
                     type: choice-tree
                     label: oro.user.owner.label
                     data_name: o.owner
-                    options:
-                        lazy: @oro_user.provider.filter.user_choice_tree->shouldBeLazy
-                        data: @?oro_user.provider.filter.user_choice_tree->getList
+                    autocomplete_alias: users
+                    renderedPropertyName: 'fullName'
+                    className: 'Oro\Bundle\UserBundle\Entity\User'
                 businessUnitId:
                     label: oro.business_unit.label
                     type: choice-business-unit
                     data_name: o.owner
-                    options:
-                        lazy: @oro_organization.provider.filter.busines_unit_choice_tree->shouldBeLazy
-                        data: @?oro_organization.provider.filter.busines_unit_choice_tree->getList
+                    className: 'Oro\Bundle\OrganizationBundle\Entity\BusinessUnit'
         actions:
             view:
                 type:          navigate
@@ -563,9 +561,9 @@ datagrid:
                     type: choice-tree
                     label: oro.user.owner.label
                     data_name: l.owner
-                    options:
-                        lazy: @oro_user.provider.filter.user_choice_tree->shouldBeLazy
-                        data: @?oro_user.provider.filter.user_choice_tree->getList
+                    autocomplete_alias: users
+                    renderedPropertyName: 'fullName'
+                    className: 'Oro\Bundle\UserBundle\Entity\User'
                 contactName:
                     type: string
                     data_name: contactName
@@ -574,9 +572,7 @@ datagrid:
                     label: oro.business_unit.label
                     type: choice-business-unit
                     data_name: l.owner
-                    options:
-                        lazy: @oro_organization.provider.filter.busines_unit_choice_tree->shouldBeLazy
-                        data: @?oro_organization.provider.filter.busines_unit_choice_tree->getList
+                    className: 'Oro\Bundle\OrganizationBundle\Entity\BusinessUnit'
 
     sales-funnel-grid:
         extended_entity_name: %orocrm_sales.salesfunnel.entity.class%
@@ -732,16 +728,14 @@ datagrid:
                     type: choice-tree
                     label: oro.user.owner.label
                     data_name: salesFunnel.owner
-                    options:
-                        lazy: @oro_user.provider.filter.user_choice_tree->shouldBeLazy
-                        data: @?oro_user.provider.filter.user_choice_tree->getList
+                    autocomplete_alias: users
+                    renderedPropertyName: 'fullName'
+                    className: 'Oro\Bundle\UserBundle\Entity\User'
                 businessUnitId:
                     label: oro.business_unit.label
                     type: choice-business-unit
                     data_name: salesFunnel.owner
-                    options:
-                        lazy: @oro_organization.provider.filter.busines_unit_choice_tree->shouldBeLazy
-                        data: @?oro_organization.provider.filter.busines_unit_choice_tree->getList
+                    className: 'Oro\Bundle\OrganizationBundle\Entity\BusinessUnit'
 
     sales-funnel-lead-with-data-channel-grid:
         extends: sales-funnel-lead-grid
@@ -1118,9 +1112,9 @@ datagrid:
                     type: choice-tree
                     data_name: c.owner
                     enabled: false                    
-                    options:
-                        lazy: @oro_user.provider.filter.user_choice_tree->shouldBeLazy
-                        data: @?oro_user.provider.filter.user_choice_tree->getList
+                    autocomplete_alias: users
+                    renderedPropertyName: 'fullName'
+                    className: 'Oro\Bundle\UserBundle\Entity\User'
                 accountName:
                     type: string
                     data_name: accountName