From 49e4a4d799a6024828240ff4a9d5fafd862ad92c Mon Sep 17 00:00:00 2001
From: Ruslan Voitenko <psw1986@gmail.com>
Date: Tue, 14 Jul 2015 14:38:54 +0300
Subject: [PATCH 001/471] AEIV-116: Override providers

---
 .../Compiler/HwiConfigurationPass.php         |  5 ++
 .../SSOBundle/Resources/config/services.yml   |  4 ++
 .../SSOBundle/Security/OAuthProvider.php      | 19 +++++++-
 .../SSOBundle/Security/OAuthTokenFactory.php  | 16 +++++++
 .../Security/OAuthTokenFactoryInterface.php   | 13 +++++
 .../Tests/Unit/Security/OAuthProviderTest.php | 47 +++++++++++++++++--
 ...zationRememberMeAuthenticationProvider.php | 35 +++++++++++---
 ...wordOrganizationAuthenticationProvider.php | 24 +++++++++-
 .../OrganizationRememberMeTokenFactory.php    | 25 ++++++++++
 ...izationRememberMeTokenFactoryInterface.php | 19 ++++++++
 ...ernamePasswordOrganizationTokenFactory.php | 29 ++++++++++++
 ...swordOrganizationTokenFactoryInterface.php | 18 +++++++
 ...rganizationBasicAuthenticationListener.php | 31 +++++++++---
 .../Resources/config/services.yml             | 14 ++++++
 ...onRememberMeAuthenticationProviderTest.php | 15 ++++++
 .../Compiler/EscapeWsseConfigurationPass.php  | 21 +++++++++
 src/Oro/Bundle/UserBundle/OroUserBundle.php   | 11 +++++
 .../UserBundle/Resources/config/services.yml  |  5 ++
 .../UserBundle/Security/WsseAuthProvider.php  | 19 +++++++-
 .../UserBundle/Security/WsseTokenFactory.php  | 14 ++++++
 .../Security/WsseTokenFactoryInterface.php    | 12 +++++
 .../Unit/Security/WsseAuthProviderTest.php    | 12 +++++
 22 files changed, 386 insertions(+), 22 deletions(-)
 create mode 100644 src/Oro/Bundle/SSOBundle/Security/OAuthTokenFactory.php
 create mode 100644 src/Oro/Bundle/SSOBundle/Security/OAuthTokenFactoryInterface.php
 create mode 100644 src/Oro/Bundle/SecurityBundle/Authentication/Token/OrganizationRememberMeTokenFactory.php
 create mode 100644 src/Oro/Bundle/SecurityBundle/Authentication/Token/OrganizationRememberMeTokenFactoryInterface.php
 create mode 100644 src/Oro/Bundle/SecurityBundle/Authentication/Token/UsernamePasswordOrganizationTokenFactory.php
 create mode 100644 src/Oro/Bundle/SecurityBundle/Authentication/Token/UsernamePasswordOrganizationTokenFactoryInterface.php
 create mode 100644 src/Oro/Bundle/UserBundle/DependencyInjection/Compiler/EscapeWsseConfigurationPass.php
 create mode 100644 src/Oro/Bundle/UserBundle/Security/WsseTokenFactory.php
 create mode 100644 src/Oro/Bundle/UserBundle/Security/WsseTokenFactoryInterface.php

diff --git a/src/Oro/Bundle/SSOBundle/DependencyInjection/Compiler/HwiConfigurationPass.php b/src/Oro/Bundle/SSOBundle/DependencyInjection/Compiler/HwiConfigurationPass.php
index 226ab63cc43..c51a6ed8643 100644
--- a/src/Oro/Bundle/SSOBundle/DependencyInjection/Compiler/HwiConfigurationPass.php
+++ b/src/Oro/Bundle/SSOBundle/DependencyInjection/Compiler/HwiConfigurationPass.php
@@ -28,5 +28,10 @@ public function process(ContainerBuilder $container)
                 new Reference('oro_config.global'),
             ]);
         }
+
+        if ($container->hasDefinition('hwi_oauth.authentication.provider.oauth')) {
+            $definition = $container->getDefinition('hwi_oauth.authentication.provider.oauth');
+            $definition->addMethodCall('setTokenFactory', [new Reference('oro_sso.token.factory.oauth')]);
+        }
     }
 }
diff --git a/src/Oro/Bundle/SSOBundle/Resources/config/services.yml b/src/Oro/Bundle/SSOBundle/Resources/config/services.yml
index 7e9de4322ca..bf35d4d014a 100644
--- a/src/Oro/Bundle/SSOBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/SSOBundle/Resources/config/services.yml
@@ -3,6 +3,7 @@ parameters:
     oro_sso.event_listener.user_email_change_listener.class: Oro\Bundle\SSOBundle\EventListener\UserEmailChangeListener
     hwi_oauth.authentication.provider.oauth.class: Oro\Bundle\SSOBundle\Security\OAuthProvider
     hwi_oauth.resource_owner.google.class: Oro\Bundle\SSOBundle\OAuth\ResourceOwner\GoogleResourceOwner
+    oro_sso.token.factory.oauth.class: Oro\Bundle\SSOBundle\Security\OAuthTokenFactory
 
 services:
     oro_sso.oauth_provider:
@@ -13,3 +14,6 @@ services:
         class:  %oro_sso.event_listener.user_email_change_listener.class%
         tags:
             - { name: doctrine.event_listener, event: preUpdate }
+
+    oro_sso.token.factory.oauth:
+        class: %oro_sso.token.factory.oauth.class%
diff --git a/src/Oro/Bundle/SSOBundle/Security/OAuthProvider.php b/src/Oro/Bundle/SSOBundle/Security/OAuthProvider.php
index f7b0e441d86..e735078aa20 100644
--- a/src/Oro/Bundle/SSOBundle/Security/OAuthProvider.php
+++ b/src/Oro/Bundle/SSOBundle/Security/OAuthProvider.php
@@ -32,6 +32,11 @@ class OAuthProvider extends HWIOAuthProvider
      */
     protected $userChecker;
 
+    /**
+     * @var OAuthTokenFactoryInterface
+     */
+    protected $tokenFactory;
+
     /**
      * @param OAuthAwareUserProviderInterface $userProvider User provider
      * @param ResourceOwnerMap $resourceOwnerMap Resource owner map
@@ -47,6 +52,14 @@ public function __construct(
         $this->userChecker = $userChecker;
     }
 
+    /**
+     * @param OAuthTokenFactoryInterface $tokenFactory
+     */
+    public function setTokenFactory(OAuthTokenFactoryInterface $tokenFactory)
+    {
+        $this->tokenFactory = $tokenFactory;
+    }
+
     /**
      * Attempts to authenticate a TokenInterface object.
      *
@@ -58,6 +71,10 @@ public function __construct(
      */
     public function authenticate(TokenInterface $token)
     {
+        if (null === $this->tokenFactory) {
+            throw new AuthenticationException('Token Factory is not set in OAuthProvider.');
+        }
+
         $resourceOwner = $this->resourceOwnerMap->getResourceOwnerByName($token->getResourceOwnerName());
 
         try {
@@ -72,7 +89,7 @@ public function authenticate(TokenInterface $token)
 
         $organization = $this->guessOrganization($user, $token);
 
-        $token = new OAuthToken($token->getRawToken(), $user->getRoles());
+        $token = $this->tokenFactory->create($token->getRawToken(), $user->getRoles());
         $token->setResourceOwnerName($resourceOwner->getName());
         $token->setOrganizationContext($organization);
         $token->setUser($user);
diff --git a/src/Oro/Bundle/SSOBundle/Security/OAuthTokenFactory.php b/src/Oro/Bundle/SSOBundle/Security/OAuthTokenFactory.php
new file mode 100644
index 00000000000..9eadbedc8ed
--- /dev/null
+++ b/src/Oro/Bundle/SSOBundle/Security/OAuthTokenFactory.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Oro\Bundle\SSOBundle\Security;
+
+class OAuthTokenFactory implements OAuthTokenFactoryInterface
+{
+    /**
+     * @param string|array $accessToken
+     * @param array $roles
+     * @return OAuthToken
+     */
+    public function create($accessToken, array $roles = [])
+    {
+        return new OAuthToken($accessToken, $roles);
+    }
+}
diff --git a/src/Oro/Bundle/SSOBundle/Security/OAuthTokenFactoryInterface.php b/src/Oro/Bundle/SSOBundle/Security/OAuthTokenFactoryInterface.php
new file mode 100644
index 00000000000..3215dd6ea9a
--- /dev/null
+++ b/src/Oro/Bundle/SSOBundle/Security/OAuthTokenFactoryInterface.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Oro\Bundle\SSOBundle\Security;
+
+interface OAuthTokenFactoryInterface
+{
+    /**
+     * @param string|array $accessToken
+     * @param array $roles
+     * @return OAuthToken
+     */
+    public function create($accessToken, array $roles = []);
+}
diff --git a/src/Oro/Bundle/SSOBundle/Tests/Unit/Security/OAuthProviderTest.php b/src/Oro/Bundle/SSOBundle/Tests/Unit/Security/OAuthProviderTest.php
index d78710d852c..08de7c8ebf5 100644
--- a/src/Oro/Bundle/SSOBundle/Tests/Unit/Security/OAuthProviderTest.php
+++ b/src/Oro/Bundle/SSOBundle/Tests/Unit/Security/OAuthProviderTest.php
@@ -2,18 +2,43 @@
 
 namespace Oro\Bundle\SSOBundle\Tests\Security;
 
+use HWI\Bundle\OAuthBundle\Security\Core\User\OAuthAwareUserProviderInterface;
+use HWI\Bundle\OAuthBundle\Security\Http\ResourceOwnerMap;
+
 use Oro\Bundle\OrganizationBundle\Entity\Organization;
 use Oro\Bundle\SSOBundle\Security\OAuthProvider;
 use Oro\Bundle\SSOBundle\Security\OAuthToken;
+use Oro\Bundle\SSOBundle\Security\OAuthTokenFactory;
 use Oro\Bundle\UserBundle\Entity\User;
+use Symfony\Component\Security\Core\User\UserCheckerInterface;
 
 class OAuthProviderTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @var OAuthProvider
+     */
     private $oauthProvider;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|OAuthAwareUserProviderInterface
+     */
     private $userProvider;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|ResourceOwnerMap
+     */
     private $resourceOwnerMap;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|UserCheckerInterface
+     */
     private $userChecker;
 
+    /**
+     * @var OAuthTokenFactory
+     */
+    private $tokenFactory;
+
     public function setUp()
     {
         $this->userProvider = $this
@@ -22,18 +47,32 @@ public function setUp()
                 ->disableOriginalConstructor()
                 ->getMock();
         $this->userChecker = $this->getMock('Symfony\Component\Security\Core\User\UserCheckerInterface');
-        
+
+        $this->tokenFactory = new OAuthTokenFactory();
+
         $this->oauthProvider = new OAuthProvider($this->userProvider, $this->resourceOwnerMap, $this->userChecker);
     }
 
-    public function testSupportsShuldReturnTrueForOAuthToken()
+    public function testSupportsShouldReturnTrueForOAuthToken()
     {
         $token = new OAuthToken('token');
         $this->assertTrue($this->oauthProvider->supports($token));
     }
-    
+
+    /**
+     * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationException
+     * @expectedExceptionMessage Token Factory is not set in OAuthProvider.
+     */
+    public function testAuthenticateIfTokenFactoryIsNotSet()
+    {
+        $token = new OAuthToken('token');
+        $this->oauthProvider->authenticate($token);
+    }
+
     public function testTokenShouldBeAuthenticated()
     {
+        $this->oauthProvider->setTokenFactory($this->tokenFactory);
+
         $token = new OAuthToken('token');
         $token->setResourceOwnerName('google');
         $organization = new Organization();
@@ -41,7 +80,7 @@ public function testTokenShouldBeAuthenticated()
         $token->setOrganizationContext($organization);
 
         $userResponse = $this->getMock('HWI\Bundle\OAuthBundle\OAuth\Response\UserResponseInterface');
-        
+
         $resourceOwner = $this->getMock('HWI\Bundle\OAuthBundle\OAuth\ResourceOwnerInterface');
         $resourceOwner
             ->expects($this->any())
diff --git a/src/Oro/Bundle/SecurityBundle/Authentication/Provider/OrganizationRememberMeAuthenticationProvider.php b/src/Oro/Bundle/SecurityBundle/Authentication/Provider/OrganizationRememberMeAuthenticationProvider.php
index eec23366d77..b3dd010e2e2 100644
--- a/src/Oro/Bundle/SecurityBundle/Authentication/Provider/OrganizationRememberMeAuthenticationProvider.php
+++ b/src/Oro/Bundle/SecurityBundle/Authentication/Provider/OrganizationRememberMeAuthenticationProvider.php
@@ -2,21 +2,41 @@
 
 namespace Oro\Bundle\SecurityBundle\Authentication\Provider;
 
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Core\Exception\BadCredentialsException;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authentication\Provider\RememberMeAuthenticationProvider;
 
 use Oro\Bundle\UserBundle\Entity\User;
 use Oro\Bundle\SecurityBundle\Authentication\Guesser\UserOrganizationGuesser;
-use Oro\Bundle\SecurityBundle\Authentication\Token\OrganizationRememberMeToken;
+use Oro\Bundle\SecurityBundle\Authentication\Token\OrganizationRememberMeTokenFactoryInterface as TokenFactory;
 
 class OrganizationRememberMeAuthenticationProvider extends RememberMeAuthenticationProvider
 {
+    /**
+     * @var TokenFactory
+     */
+    protected $tokenFactory;
+
+    /**
+     * @param TokenFactory $tokenFactory
+     */
+    public function setTokenFactory(TokenFactory $tokenFactory)
+    {
+        $this->tokenFactory = $tokenFactory;
+    }
+
     /**
      * {@inheritdoc}
      */
     public function authenticate(TokenInterface $token)
     {
+        if (null === $this->tokenFactory) {
+            throw new AuthenticationException(
+                'Token Factory is not set in OrganizationRememberMeAuthenticationProvider.'
+            );
+        }
+
         $guesser = new UserOrganizationGuesser();
         /**  @var TokenInterface $token */
         $authenticatedToken = parent::authenticate($token);
@@ -33,12 +53,13 @@ public function authenticate(TokenInterface $token)
             );
         }
 
-        $authenticatedToken = new OrganizationRememberMeToken(
-            $user,
-            $authenticatedToken->getProviderKey(),
-            $authenticatedToken->getKey(),
-            $organization
-        );
+        $authenticatedToken = $this->tokenFactory
+            ->create(
+                $user,
+                $authenticatedToken->getProviderKey(),
+                $authenticatedToken->getKey(),
+                $organization
+            );
 
         return $authenticatedToken;
     }
diff --git a/src/Oro/Bundle/SecurityBundle/Authentication/Provider/UsernamePasswordOrganizationAuthenticationProvider.php b/src/Oro/Bundle/SecurityBundle/Authentication/Provider/UsernamePasswordOrganizationAuthenticationProvider.php
index 8971dc68639..9b5d2449266 100644
--- a/src/Oro/Bundle/SecurityBundle/Authentication/Provider/UsernamePasswordOrganizationAuthenticationProvider.php
+++ b/src/Oro/Bundle/SecurityBundle/Authentication/Provider/UsernamePasswordOrganizationAuthenticationProvider.php
@@ -2,21 +2,41 @@
 
 namespace Oro\Bundle\SecurityBundle\Authentication\Provider;
 
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Core\Exception\BadCredentialsException;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authentication\Provider\DaoAuthenticationProvider;
 
 use Oro\Bundle\UserBundle\Entity\User;
 use Oro\Bundle\SecurityBundle\Authentication\Guesser\UserOrganizationGuesser;
-use Oro\Bundle\SecurityBundle\Authentication\Token\UsernamePasswordOrganizationToken;
+use Oro\Bundle\SecurityBundle\Authentication\Token\UsernamePasswordOrganizationTokenFactoryInterface as TokenFactory;
 
 class UsernamePasswordOrganizationAuthenticationProvider extends DaoAuthenticationProvider
 {
+    /**
+     * @var TokenFactory
+     */
+    protected $tokenFactory;
+
+    /**
+     * @param TokenFactory $tokenFactory
+     */
+    public function setTokenFactory(TokenFactory $tokenFactory)
+    {
+        $this->tokenFactory = $tokenFactory;
+    }
+
     /**
      * {@inheritdoc}
      */
     public function authenticate(TokenInterface $token)
     {
+        if (null === $this->tokenFactory) {
+            throw new AuthenticationException(
+                'Token Factory is not set in UsernamePasswordOrganizationAuthenticationProvider.'
+            );
+        }
+
         $guesser = new UserOrganizationGuesser();
         /**  @var TokenInterface $token */
         $authenticatedToken = parent::authenticate($token);
@@ -33,7 +53,7 @@ public function authenticate(TokenInterface $token)
             );
         }
 
-        $authenticatedToken = new UsernamePasswordOrganizationToken(
+        $authenticatedToken = $this->tokenFactory->create(
             $authenticatedToken->getUser(),
             $authenticatedToken->getCredentials(),
             $authenticatedToken->getProviderKey(),
diff --git a/src/Oro/Bundle/SecurityBundle/Authentication/Token/OrganizationRememberMeTokenFactory.php b/src/Oro/Bundle/SecurityBundle/Authentication/Token/OrganizationRememberMeTokenFactory.php
new file mode 100644
index 00000000000..8289c2e77e9
--- /dev/null
+++ b/src/Oro/Bundle/SecurityBundle/Authentication/Token/OrganizationRememberMeTokenFactory.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Oro\Bundle\SecurityBundle\Authentication\Token;
+
+use Symfony\Component\Security\Core\User\UserInterface;
+
+use Oro\Bundle\OrganizationBundle\Entity\Organization;
+
+class OrganizationRememberMeTokenFactory implements OrganizationRememberMeTokenFactoryInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function create(UserInterface $user, $providerKey, $key, Organization $organizationContext)
+    {
+        $authenticatedToken = new OrganizationRememberMeToken(
+            $user,
+            $providerKey,
+            $key,
+            $organizationContext
+        );
+
+        return $authenticatedToken;
+    }
+}
diff --git a/src/Oro/Bundle/SecurityBundle/Authentication/Token/OrganizationRememberMeTokenFactoryInterface.php b/src/Oro/Bundle/SecurityBundle/Authentication/Token/OrganizationRememberMeTokenFactoryInterface.php
new file mode 100644
index 00000000000..686552d4493
--- /dev/null
+++ b/src/Oro/Bundle/SecurityBundle/Authentication/Token/OrganizationRememberMeTokenFactoryInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Oro\Bundle\SecurityBundle\Authentication\Token;
+
+use Symfony\Component\Security\Core\User\UserInterface;
+
+use Oro\Bundle\OrganizationBundle\Entity\Organization;
+
+interface OrganizationRememberMeTokenFactoryInterface
+{
+    /**
+     * @param UserInterface $user
+     * @param string $providerKey
+     * @param string $key
+     * @param Organization $organizationContext
+     * @return OrganizationRememberMeToken
+     */
+    public function create(UserInterface $user, $providerKey, $key, Organization $organizationContext);
+}
diff --git a/src/Oro/Bundle/SecurityBundle/Authentication/Token/UsernamePasswordOrganizationTokenFactory.php b/src/Oro/Bundle/SecurityBundle/Authentication/Token/UsernamePasswordOrganizationTokenFactory.php
new file mode 100644
index 00000000000..635a68c545f
--- /dev/null
+++ b/src/Oro/Bundle/SecurityBundle/Authentication/Token/UsernamePasswordOrganizationTokenFactory.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Oro\Bundle\SecurityBundle\Authentication\Token;
+
+use Oro\Bundle\OrganizationBundle\Entity\Organization;
+
+class UsernamePasswordOrganizationTokenFactory implements UsernamePasswordOrganizationTokenFactoryInterface
+{
+    /**
+     * @param string $user
+     * @param string $credentials
+     * @param string $providerKey
+     * @param Organization $organizationContext
+     * @param array $roles
+     * @return UsernamePasswordOrganizationToken
+     */
+    public function create($user, $credentials, $providerKey, Organization $organizationContext, array $roles = [])
+    {
+        $authenticatedToken = new UsernamePasswordOrganizationToken(
+            $user,
+            $credentials,
+            $providerKey,
+            $organizationContext,
+            $roles
+        );
+
+        return $authenticatedToken;
+    }
+}
diff --git a/src/Oro/Bundle/SecurityBundle/Authentication/Token/UsernamePasswordOrganizationTokenFactoryInterface.php b/src/Oro/Bundle/SecurityBundle/Authentication/Token/UsernamePasswordOrganizationTokenFactoryInterface.php
new file mode 100644
index 00000000000..7d53d7d23c3
--- /dev/null
+++ b/src/Oro/Bundle/SecurityBundle/Authentication/Token/UsernamePasswordOrganizationTokenFactoryInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Oro\Bundle\SecurityBundle\Authentication\Token;
+
+use Oro\Bundle\OrganizationBundle\Entity\Organization;
+
+interface UsernamePasswordOrganizationTokenFactoryInterface
+{
+    /**
+     * @param string $user
+     * @param string $credentials
+     * @param string $providerKey
+     * @param Organization $organizationContext
+     * @param array $roles
+     * @return UsernamePasswordOrganizationToken
+     */
+    public function create($user, $credentials, $providerKey, Organization $organizationContext, array $roles = []);
+}
diff --git a/src/Oro/Bundle/SecurityBundle/Http/Firewall/OrganizationBasicAuthenticationListener.php b/src/Oro/Bundle/SecurityBundle/Http/Firewall/OrganizationBasicAuthenticationListener.php
index dc8bf471ed6..979035ef17a 100644
--- a/src/Oro/Bundle/SecurityBundle/Http/Firewall/OrganizationBasicAuthenticationListener.php
+++ b/src/Oro/Bundle/SecurityBundle/Http/Firewall/OrganizationBasicAuthenticationListener.php
@@ -13,7 +13,7 @@
 
 use Oro\Bundle\OrganizationBundle\Entity\Manager\OrganizationManager;
 use Oro\Bundle\SecurityBundle\Authentication\Token\OrganizationContextTokenInterface;
-use Oro\Bundle\SecurityBundle\Authentication\Token\UsernamePasswordOrganizationToken;
+use Oro\Bundle\SecurityBundle\Authentication\Token\UsernamePasswordOrganizationTokenFactoryInterface as TokenFactory;
 
 class OrganizationBasicAuthenticationListener
 {
@@ -38,12 +38,27 @@ class OrganizationBasicAuthenticationListener
     /** @var OrganizationManager */
     protected $manager;
 
+    /**
+     * @var TokenFactory
+     */
+    protected $tokenFactory;
+
+    /**
+     * @param SecurityContextInterface $securityContext
+     * @param AuthenticationManagerInterface $authenticationManager
+     * @param string $providerKey
+     * @param AuthenticationEntryPointInterface $authenticationEntryPoint
+     * @param OrganizationManager $manager
+     * @param TokenFactory $tokenFactory
+     * @param LoggerInterface $logger
+     */
     public function __construct(
         SecurityContextInterface $securityContext,
         AuthenticationManagerInterface $authenticationManager,
         $providerKey,
         AuthenticationEntryPointInterface $authenticationEntryPoint,
         OrganizationManager $manager,
+        TokenFactory $tokenFactory,
         LoggerInterface $logger = null
     ) {
         if (empty($providerKey)) {
@@ -57,6 +72,7 @@ public function __construct(
         $this->logger = $logger;
         $this->manager = $manager;
         $this->ignoreFailure = false;
+        $this->tokenFactory = $tokenFactory;
     }
 
     /**
@@ -86,12 +102,13 @@ public function handle(GetResponseEvent $event)
         try {
             $organizationId = $request->headers->get('PHP_AUTH_ORGANIZATION');
             if ($organizationId) {
-                $authToken = new UsernamePasswordOrganizationToken(
-                    $username,
-                    $request->headers->get('PHP_AUTH_PW'),
-                    $this->providerKey,
-                    $this->manager->getOrganizationById($organizationId)
-                );
+                $authToken = $this->tokenFactory
+                    ->create(
+                        $username,
+                        $request->headers->get('PHP_AUTH_PW'),
+                        $this->providerKey,
+                        $this->manager->getOrganizationById($organizationId)
+                    );
             } else {
                 $authToken = new UsernamePasswordToken(
                     $username,
diff --git a/src/Oro/Bundle/SecurityBundle/Resources/config/services.yml b/src/Oro/Bundle/SecurityBundle/Resources/config/services.yml
index f9f8bf5499f..d29986b467e 100644
--- a/src/Oro/Bundle/SecurityBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/SecurityBundle/Resources/config/services.yml
@@ -45,6 +45,9 @@ parameters:
 
     oro_security.encoder.mcrypt.class:                         Oro\Bundle\SecurityBundle\Encoder\Mcrypt
 
+    oro_security.token.factory.username_password_organization.class: Oro\Bundle\SecurityBundle\Authentication\Token\UsernamePasswordOrganizationTokenFactory
+    oro_security.token.factory.organization_rememberme.class: Oro\Bundle\SecurityBundle\Authentication\Token\OrganizationRememberMeTokenFactory
+
     oro_security.acl_helper.class:                             Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper
     oro_security.orm.ownership_sql_walker_builder.class:       Oro\Bundle\SecurityBundle\ORM\Walker\OwnershipConditionDataBuilder
     oro_security.ownership_tree_provider.class:                Oro\Bundle\SecurityBundle\Owner\OwnerTreeProvider
@@ -396,6 +399,12 @@ services:
         tags:
             - { name: doctrine.event_listener, event: onFlush }
 
+    oro_security.token.factory.username_password_organization:
+        class: %oro_security.token.factory.username_password_organization.class%
+
+    oro_security.token.factory.organization_rememberme:
+        class: %oro_security.token.factory.organization_rememberme.class%
+
     oro_security.authentication.listener.basic:
         class: %oro-security.authentication.listener.basic.class%
         arguments:
@@ -404,6 +413,7 @@ services:
             - null
             - null
             - @oro_organization.organization_manager
+            - @oro_security.token.factory.username_password_organization
             - @?logger
         public: false
         abstract: true
@@ -416,6 +426,8 @@ services:
             - null
             - @security.encoder_factory
             - %security.authentication.hide_user_not_found%
+        calls:
+            - [setTokenFactory, [@oro_security.token.factory.username_password_organization]]
         abstract: true
         public: false
 
@@ -423,6 +435,8 @@ services:
         class: %oro_security.authentication.provider.organization_rememberme.class%
         arguments:
             - @security.user_checker
+        calls:
+            - [setTokenFactory, [@oro_security.token.factory.organization_rememberme]]
         abstract: true
         public: false
 
diff --git a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Authentication/Provider/OrganizationRememberMeAuthenticationProviderTest.php b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Authentication/Provider/OrganizationRememberMeAuthenticationProviderTest.php
index b87ae7477de..54a0f9ba6e6 100644
--- a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Authentication/Provider/OrganizationRememberMeAuthenticationProviderTest.php
+++ b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Authentication/Provider/OrganizationRememberMeAuthenticationProviderTest.php
@@ -6,6 +6,7 @@
 
 use Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures\Entity\User;
 use Oro\Bundle\SecurityBundle\Authentication\Token\OrganizationRememberMeToken;
+use Oro\Bundle\SecurityBundle\Authentication\Token\OrganizationRememberMeTokenFactory;
 use Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Domain\Fixtures\Entity\Organization;
 use Oro\Bundle\SecurityBundle\Authentication\Provider\OrganizationRememberMeAuthenticationProvider;
 
@@ -25,6 +26,7 @@ public function setUp()
     {
         $this->userChecker = $this->getMock('Symfony\Component\Security\Core\User\UserCheckerInterface');
         $this->provider = new OrganizationRememberMeAuthenticationProvider($this->userChecker, 'testKey', 'provider');
+        $this->provider->setTokenFactory(new OrganizationRememberMeTokenFactory());
     }
 
     public function testSupports()
@@ -43,6 +45,19 @@ public function testSupports()
         $this->assertFalse($this->provider->supports($token));
     }
 
+    /**
+     * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationException
+     * @expectedExceptionMessage Token Factory is not set in OrganizationRememberMeAuthenticationProvider.
+     */
+    public function testAuthenticateIfTokenFactoryIsNotSet()
+    {
+        $user = new User(1);
+        $organization = new Organization(2);
+        $token = new OrganizationRememberMeToken($user, 'provider', 'testKey', $organization);
+        $provider = new OrganizationRememberMeAuthenticationProvider($this->userChecker, 'testKey', 'provider');
+        $provider->authenticate($token);
+    }
+
     public function testAuthenticate()
     {
         $organization = new Organization(2);
diff --git a/src/Oro/Bundle/UserBundle/DependencyInjection/Compiler/EscapeWsseConfigurationPass.php b/src/Oro/Bundle/UserBundle/DependencyInjection/Compiler/EscapeWsseConfigurationPass.php
new file mode 100644
index 00000000000..db91b89a25b
--- /dev/null
+++ b/src/Oro/Bundle/UserBundle/DependencyInjection/Compiler/EscapeWsseConfigurationPass.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Oro\Bundle\UserBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+class EscapeWsseConfigurationPass implements CompilerPassInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        if ($container->hasDefinition('escape_wsse_authentication.provider')) {
+            $definition = $container->getDefinition('escape_wsse_authentication.provider');
+            $definition->addMethodCall('setTokenFactory', [new Reference('oro_user.token.factory.wsse')]);
+        }
+    }
+}
diff --git a/src/Oro/Bundle/UserBundle/OroUserBundle.php b/src/Oro/Bundle/UserBundle/OroUserBundle.php
index 7f8e7e8be21..14f8b6ca082 100644
--- a/src/Oro/Bundle/UserBundle/OroUserBundle.php
+++ b/src/Oro/Bundle/UserBundle/OroUserBundle.php
@@ -2,8 +2,19 @@
 
 namespace Oro\Bundle\UserBundle;
 
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
+use Oro\Bundle\UserBundle\DependencyInjection\Compiler\EscapeWsseConfigurationPass;
+
 class OroUserBundle extends Bundle
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function build(ContainerBuilder $container)
+    {
+        parent::build($container);
+        $container->addCompilerPass(new EscapeWsseConfigurationPass());
+    }
 }
diff --git a/src/Oro/Bundle/UserBundle/Resources/config/services.yml b/src/Oro/Bundle/UserBundle/Resources/config/services.yml
index 4533f94a9b8..6d2ed56877e 100644
--- a/src/Oro/Bundle/UserBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/UserBundle/Resources/config/services.yml
@@ -30,6 +30,8 @@ parameters:
     oro_user.placeholder.filter.class:            Oro\Bundle\UserBundle\Placeholder\PlaceholderFilter
 
     oro_user.security.user_checker.class:         Oro\Bundle\UserBundle\Security\UserChecker
+
+    oro_user.token.factory.wsse.class:            Oro\Bundle\UserBundle\Security\WsseTokenFactory
 services:
     oro_user.manager:
         class: %oro_user.manager.class%
@@ -250,3 +252,6 @@ services:
             - @doctrine.orm.entity_manager
         tags:
             - { name: kernel.event_listener, event: oro_datagrid.datagrid.build.after.users-for-context-grid, method: onBuildAfter }
+
+    oro_user.token.factory.wsse:
+        class: %oro_user.token.factory.wsse.class%
diff --git a/src/Oro/Bundle/UserBundle/Security/WsseAuthProvider.php b/src/Oro/Bundle/UserBundle/Security/WsseAuthProvider.php
index 16c5845ca26..d5b45e5609b 100644
--- a/src/Oro/Bundle/UserBundle/Security/WsseAuthProvider.php
+++ b/src/Oro/Bundle/UserBundle/Security/WsseAuthProvider.php
@@ -24,6 +24,19 @@
  */
 class WsseAuthProvider extends Provider
 {
+    /**
+     * @var WsseTokenFactoryInterface
+     */
+    protected $tokenFactory;
+
+    /**
+     * @param WsseTokenFactoryInterface $tokenFactory
+     */
+    public function setTokenFactory(WsseTokenFactoryInterface $tokenFactory)
+    {
+        $this->tokenFactory = $tokenFactory;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -59,6 +72,10 @@ protected function getSalt(UserInterface $user)
      */
     public function authenticate(TokenInterface $token)
     {
+        if (null === $this->tokenFactory) {
+            throw new AuthenticationException('Token Factory is not set in WsseAuthProvider.');
+        }
+
         /** @var User $user */
         $user = $this->getUserProvider()->loadUserByUsername($token->getUsername());
         if ($user) {
@@ -66,7 +83,7 @@ public function authenticate(TokenInterface $token)
             if ($secret instanceof PersistentCollection) {
                 $validUserApi = $this->getValidUserApi($token, $secret, $user);
                 if ($validUserApi) {
-                    $authenticatedToken = new WsseToken($user->getRoles());
+                    $authenticatedToken = $this->tokenFactory->create($user->getRoles());
                     $authenticatedToken->setUser($user);
                     $authenticatedToken->setOrganizationContext($validUserApi->getOrganization());
                     $authenticatedToken->setAuthenticated(true);
diff --git a/src/Oro/Bundle/UserBundle/Security/WsseTokenFactory.php b/src/Oro/Bundle/UserBundle/Security/WsseTokenFactory.php
new file mode 100644
index 00000000000..ba7008b23ee
--- /dev/null
+++ b/src/Oro/Bundle/UserBundle/Security/WsseTokenFactory.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Oro\Bundle\UserBundle\Security;
+
+class WsseTokenFactory implements WsseTokenFactoryInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function create(array $roles = [])
+    {
+        return new WsseToken($roles);
+    }
+}
diff --git a/src/Oro/Bundle/UserBundle/Security/WsseTokenFactoryInterface.php b/src/Oro/Bundle/UserBundle/Security/WsseTokenFactoryInterface.php
new file mode 100644
index 00000000000..778ef9c9543
--- /dev/null
+++ b/src/Oro/Bundle/UserBundle/Security/WsseTokenFactoryInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Oro\Bundle\UserBundle\Security;
+
+interface WsseTokenFactoryInterface
+{
+    /**
+     * @param array $roles
+     * @return WsseToken
+     */
+    public function create(array $roles = []);
+}
diff --git a/src/Oro/Bundle/UserBundle/Tests/Unit/Security/WsseAuthProviderTest.php b/src/Oro/Bundle/UserBundle/Tests/Unit/Security/WsseAuthProviderTest.php
index 54b1b80efa0..f770107ed6f 100644
--- a/src/Oro/Bundle/UserBundle/Tests/Unit/Security/WsseAuthProviderTest.php
+++ b/src/Oro/Bundle/UserBundle/Tests/Unit/Security/WsseAuthProviderTest.php
@@ -12,6 +12,7 @@
 
 use Oro\Bundle\UserBundle\Entity\UserApi;
 use Oro\Bundle\UserBundle\Security\WsseAuthProvider;
+use Oro\Bundle\UserBundle\Security\WsseTokenFactory;
 
 class WsseAuthProviderTest extends \PHPUnit_Framework_TestCase
 {
@@ -36,6 +37,7 @@ protected function setUp()
         $cache = new ArrayCache();
 
         $this->provider = new WsseAuthProvider($this->userProvider, $this->encoder, $cache);
+        $this->provider->setTokenFactory(new WsseTokenFactory());
     }
 
     protected function tearDown()
@@ -43,6 +45,16 @@ protected function tearDown()
         unset($this->userProvider, $this->encoder, $this->provider);
     }
 
+    /**
+     * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationException
+     * @expectedExceptionMessage Token Factory is not set in WsseAuthProvider.
+     */
+    public function testAuthenticateIfTokenFactoryIsNotSet()
+    {
+        $provider = new WsseAuthProvider($this->userProvider, $this->encoder, new ArrayCache());
+        $provider->authenticate(new Token());
+    }
+
     /**
      * @dataProvider userProvider
      *

From 3513ebdbcb77095a7a56ff2040fdbb0be37cade2 Mon Sep 17 00:00:00 2001
From: Ruslan Voitenko <psw1986@gmail.com>
Date: Tue, 14 Jul 2015 14:58:17 +0300
Subject: [PATCH 002/471] AEIV-116: Override providers. Factory unit tests

---
 .../Unit/Security/OAuthTokenFactoryTest.php   | 17 +++++++++++++
 ...OrganizationRememberMeTokenFactoryTest.php | 24 ++++++++++++++++++
 ...mePasswordOrganizationTokenFactoryTest.php | 25 +++++++++++++++++++
 .../Unit/Security/WsseTokenFactoryTest.php    | 16 ++++++++++++
 4 files changed, 82 insertions(+)
 create mode 100644 src/Oro/Bundle/SSOBundle/Tests/Unit/Security/OAuthTokenFactoryTest.php
 create mode 100644 src/Oro/Bundle/SecurityBundle/Tests/Unit/Authentication/Token/OrganizationRememberMeTokenFactoryTest.php
 create mode 100644 src/Oro/Bundle/SecurityBundle/Tests/Unit/Authentication/Token/UsernamePasswordOrganizationTokenFactoryTest.php
 create mode 100644 src/Oro/Bundle/UserBundle/Tests/Unit/Security/WsseTokenFactoryTest.php

diff --git a/src/Oro/Bundle/SSOBundle/Tests/Unit/Security/OAuthTokenFactoryTest.php b/src/Oro/Bundle/SSOBundle/Tests/Unit/Security/OAuthTokenFactoryTest.php
new file mode 100644
index 00000000000..0f3d55ad4ca
--- /dev/null
+++ b/src/Oro/Bundle/SSOBundle/Tests/Unit/Security/OAuthTokenFactoryTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Oro\Bundle\SSOBundle\Tests\Unit\Security;
+
+use Oro\Bundle\SSOBundle\Security\OAuthTokenFactory;
+
+class OAuthTokenFactoryTest extends \PHPUnit_Framework_TestCase
+{
+    public function testCreate()
+    {
+        $factory = new OAuthTokenFactory();
+        $token = $factory->create('accessToken');
+
+        $this->assertInstanceOf('Oro\Bundle\SSOBundle\Security\OAuthToken', $token);
+        $this->assertEquals('accessToken', $token->getAccessToken());
+    }
+}
diff --git a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Authentication/Token/OrganizationRememberMeTokenFactoryTest.php b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Authentication/Token/OrganizationRememberMeTokenFactoryTest.php
new file mode 100644
index 00000000000..f366fd687e6
--- /dev/null
+++ b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Authentication/Token/OrganizationRememberMeTokenFactoryTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Oro\Bundle\SecurityBundle\Tests\Unit\Authentication\Token;
+
+use Oro\Bundle\OrganizationBundle\Entity\Organization;
+use Oro\Bundle\SecurityBundle\Authentication\Token\OrganizationRememberMeTokenFactory;
+use Oro\Bundle\UserBundle\Entity\User;
+
+class OrganizationRememberMeTokenFactoryTest extends \PHPUnit_Framework_TestCase
+{
+    public function testCreate()
+    {
+        $user = new User();
+        $organization = new Organization();
+        $factory = new OrganizationRememberMeTokenFactory();
+        $token = $factory->create($user, 'testProvider', 'testKey', $organization);
+
+        $this->assertInstanceOf('Oro\Bundle\SecurityBundle\Authentication\Token\OrganizationRememberMeToken', $token);
+        $this->assertEquals($user, $token->getUser());
+        $this->assertEquals($organization, $token->getOrganizationContext());
+        $this->assertEquals('testProvider', $token->getProviderKey());
+        $this->assertEquals('testKey', $token->getKey());
+    }
+}
diff --git a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Authentication/Token/UsernamePasswordOrganizationTokenFactoryTest.php b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Authentication/Token/UsernamePasswordOrganizationTokenFactoryTest.php
new file mode 100644
index 00000000000..a20ae07afb1
--- /dev/null
+++ b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Authentication/Token/UsernamePasswordOrganizationTokenFactoryTest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Oro\Bundle\SecurityBundle\Tests\Unit\Authentication\Token;
+
+use Oro\Bundle\OrganizationBundle\Entity\Organization;
+use Oro\Bundle\SecurityBundle\Authentication\Token\UsernamePasswordOrganizationTokenFactory;
+
+class UsernamePasswordOrganizationTokenFactoryTest extends \PHPUnit_Framework_TestCase
+{
+    public function testCreate()
+    {
+        $organization = new Organization();
+        $factory = new UsernamePasswordOrganizationTokenFactory();
+        $token = $factory->create('username', 'credentials', 'testProvider', $organization);
+
+        $this->assertInstanceOf(
+            'Oro\Bundle\SecurityBundle\Authentication\Token\UsernamePasswordOrganizationToken',
+            $token
+        );
+        $this->assertEquals($organization, $token->getOrganizationContext());
+        $this->assertEquals('username', $token->getUser());
+        $this->assertEquals('credentials', $token->getCredentials());
+        $this->assertEquals('testProvider', $token->getProviderKey());
+    }
+}
diff --git a/src/Oro/Bundle/UserBundle/Tests/Unit/Security/WsseTokenFactoryTest.php b/src/Oro/Bundle/UserBundle/Tests/Unit/Security/WsseTokenFactoryTest.php
new file mode 100644
index 00000000000..7ab9992608e
--- /dev/null
+++ b/src/Oro/Bundle/UserBundle/Tests/Unit/Security/WsseTokenFactoryTest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Oro\Bundle\UserBundle\Tests\Unit\Security;
+
+use Oro\Bundle\UserBundle\Security\WsseTokenFactory;
+
+class WsseTokenFactoryTest extends \PHPUnit_Framework_TestCase
+{
+    public function testCreate()
+    {
+        $factory = new WsseTokenFactory();
+        $token = $factory->create();
+
+        $this->assertInstanceOf('Oro\Bundle\UserBundle\Security\WsseToken', $token);
+    }
+}

From 3df059c9fab40e966beabcd939cd2d30a1ac1bad Mon Sep 17 00:00:00 2001
From: alex gotgelf <gotgelf@gmail.com>
Date: Thu, 6 Aug 2015 19:20:04 +0200
Subject: [PATCH 003/471] AEIV-173: Validate implementation with business
 requirements

---
 .../Firewall/OrganizationBasicAuthenticationListener.php | 9 +++++++--
 .../Bundle/SecurityBundle/Resources/config/services.yml  | 3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Oro/Bundle/SecurityBundle/Http/Firewall/OrganizationBasicAuthenticationListener.php b/src/Oro/Bundle/SecurityBundle/Http/Firewall/OrganizationBasicAuthenticationListener.php
index 979035ef17a..5268ccceda0 100644
--- a/src/Oro/Bundle/SecurityBundle/Http/Firewall/OrganizationBasicAuthenticationListener.php
+++ b/src/Oro/Bundle/SecurityBundle/Http/Firewall/OrganizationBasicAuthenticationListener.php
@@ -49,7 +49,6 @@ class OrganizationBasicAuthenticationListener
      * @param string $providerKey
      * @param AuthenticationEntryPointInterface $authenticationEntryPoint
      * @param OrganizationManager $manager
-     * @param TokenFactory $tokenFactory
      * @param LoggerInterface $logger
      */
     public function __construct(
@@ -58,7 +57,6 @@ public function __construct(
         $providerKey,
         AuthenticationEntryPointInterface $authenticationEntryPoint,
         OrganizationManager $manager,
-        TokenFactory $tokenFactory,
         LoggerInterface $logger = null
     ) {
         if (empty($providerKey)) {
@@ -72,6 +70,13 @@ public function __construct(
         $this->logger = $logger;
         $this->manager = $manager;
         $this->ignoreFailure = false;
+    }
+
+    /**
+     * @param TokenFactory $tokenFactory
+     */
+    public function setTokenFactory(TokenFactory $tokenFactory)
+    {
         $this->tokenFactory = $tokenFactory;
     }
 
diff --git a/src/Oro/Bundle/SecurityBundle/Resources/config/services.yml b/src/Oro/Bundle/SecurityBundle/Resources/config/services.yml
index d2c9605fc71..ff811be916f 100644
--- a/src/Oro/Bundle/SecurityBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/SecurityBundle/Resources/config/services.yml
@@ -460,8 +460,9 @@ services:
             - null
             - null
             - @oro_organization.organization_manager
-            - @oro_security.token.factory.username_password_organization
             - @?logger
+        calls:
+            - [setTokenFactory, [@oro_security.token.factory.username_password_organization]]
         public: false
         abstract: true
 

From 3767096806c4071ea0b61ad1fe7cc97e321d273d Mon Sep 17 00:00:00 2001
From: Ruslan Voitenko <psw1986@gmail.com>
Date: Wed, 12 Aug 2015 14:43:36 +0300
Subject: [PATCH 004/471] Fix of usage of non existent method in
 OrganizationRepository

---
 .../Autocomplete/OrganizationSearchHandler.php                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/OrganizationBundle/Autocomplete/OrganizationSearchHandler.php b/src/Oro/Bundle/OrganizationBundle/Autocomplete/OrganizationSearchHandler.php
index 1548a0dd216..7a39ac1331f 100644
--- a/src/Oro/Bundle/OrganizationBundle/Autocomplete/OrganizationSearchHandler.php
+++ b/src/Oro/Bundle/OrganizationBundle/Autocomplete/OrganizationSearchHandler.php
@@ -60,7 +60,7 @@ public function search($query, $page, $perPage, $searchById = false)
         $user = $this->securityContextLink->getService()->getToken()->getUser();
         $repository = $this->managerRegistry->getRepository($this->className);
         if (!$searchById) {
-            $items = $repository->getEnabledUserOrganizationsByName($user, $query);
+            $items = $repository->getEnabledByUserAndName($user, $query);
         } else {
             $items = $repository->getEnabledUserOrganizationById($user, $query);
         }

From ef09e5d23104693a0d6132d3991974349a079405 Mon Sep 17 00:00:00 2001
From: Ruslan Voitenko <psw1986@gmail.com>
Date: Wed, 12 Aug 2015 15:35:50 +0300
Subject: [PATCH 005/471] Update of Upgrade.md (introducing of security token
 factories).

---
 UPGRADE-1.8.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/UPGRADE-1.8.md b/UPGRADE-1.8.md
index 3cfd93ead5a..904da2fa521 100644
--- a/UPGRADE-1.8.md
+++ b/UPGRADE-1.8.md
@@ -176,7 +176,8 @@ Removed parameters `websocket_host` and `websocket_port` from `parameters.yml`.
 - `Oro\Bundle\UserBundle\Mailer\Processor` is now based on `Oro\Bundle\UserBundle\Mailer\BaseProcessor`
 - `Oro\Bundle\UserBundle\Mailer\Processor` - first argument `$user` of `sendChangePasswordEmail`, `sendResetPasswordEmail` and `sendResetPasswordAsAdminEmail` methods must implement `Oro\Bundle\UserBundle\Entity\UserInterface`
 - First argument `Doctrine\Common\Persistence\ObjectManager $objectManager` and fourth argument `Oro\Bundle\UserBundle\Entity\UserManager $userManager` of `Oro\Bundle\UserBundle\Mailer\Processor` constructor (which now is located in `Oro\Bundle\UserBundle\Mailer\BaseProcessor`) replaced by `Doctrine\Common\Persistence\ManagerRegistry $managerRegistry` and `Oro\Bundle\EmailBundle\Tools\EmailHolderHelper $emailHolderHelper` accordingly
-- `Oro\Bundle\UserBundle\Form\Handler\AclRoleHandler` is now accepts Manager Registry instead of Entity Manager, added method `setManagerRegistry`, method `setEntityManager` marked as deprecated 
+- `Oro\Bundle\UserBundle\Form\Handler\AclRoleHandler` is now accepts Manager Registry instead of Entity Manager, added method `setManagerRegistry`, method `setEntityManager` marked as deprecated
+- `Oro\Bundle\UserBundle\Security\WsseTokenFactoryInterface` and its implementation `Oro\Bundle\UserBundle\Security\WsseTokenFactory` were introduced to encapsulate creation of `WsseToken` in `Oro\Bundle\UserBundle\Security\WsseAuthProvider`
 
 ####SecurityBundle
 - `Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadataInterface` was introduced and based on access levels, considered to use in security layer instead of direct `Oro\Bundle\SecurityBundle\Owner\Metadata\OwnershipMetadata` usage
@@ -229,6 +230,8 @@ Removed parameters `websocket_host` and `websocket_port` from `parameters.yml`.
     * `oro_security.ownership_tree.cache.warmer`
     * `oro_security.orm.ownership_sql_walker_builder`
 - Service `@oro_security.link.ownership_tree_provider` is deprecated, please use `Symfony\Component\DependencyInjection\ContainerInterface` directly
+- `Oro\Bundle\SecurityBundle\Authentication\Token\UsernamePasswordOrganizationTokenFactoryInterface` and its implementation `Oro\Bundle\SecurityBundle\Authentication\Token\UsernamePasswordOrganizationTokenFactory` were introduced to encapsulate creation of `UsernamePasswordOrganizationToken` in `Oro\Bundle\SecurityBundle\Authentication\Provider\UsernamePasswordOrganizationAuthenticationProvider` and `Oro\Bundle\SecurityBundle\Http\Firewall\OrganizationBasicAuthenticationListener`
+- `Oro\Bundle\SecurityBundle\Authentication\Token\OrganizationRememberMeTokenFactoryInterface` and its implementation `Oro\Bundle\SecurityBundle\Authentication\Token\OrganizationRememberMeTokenFactory` were introduced to encapsulate creation of `OrganizationRememberMeToken` in `Oro\Bundle\SecurityBundle\Authentication\Provider\UsernamePasswordOrganizationAuthenticationProvider`
 
 ####AddressBundle
 - `Oro\Bundle\AddressBundle\Form\EventListener\FixAddressesPrimaryAndTypesSubscriber` marked deprecated. Use `Oro\Bundle\AddressBundle\Form\EventListener\FixAddressesPrimarySubscriber` and `Oro\Bundle\AddressBundle\Form\EventListener\FixAddressesTypesSubscriber` instead.
@@ -238,3 +241,6 @@ Removed parameters `websocket_host` and `websocket_port` from `parameters.yml`.
 
 ####DataAuditBundle
 - `Oro\Bundle\DataAuditBundle\Loggable\LoggableManager` `logEntityClass` and `logEntityFieldClass` parameters replaced by `oro_dataaudit.loggable.audit_entity_mapper` service `getAuditEntryClass` and `getAuditEntryFieldClass` methods
+
+####SSOBundle
+- `Oro\Bundle\SSOBundle\Security\OAuthTokenFactoryInterface` and its implementation `Oro\Bundle\SSOBundle\Security\OAuthTokenFactory` were introduced to encapsulate creation of `OAuthToken` in `Oro\Bundle\SSOBundle\Security\OAuthProvider`

From 720fdd6715b9473b032cccedcd5f3208ff6b7bb2 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Thu, 27 Aug 2015 18:47:41 +0200
Subject: [PATCH 006/471] CRM-3997: Make all mailboxes available under System
 organization

    - choose organization in system organization when in system configuration
---
 .../Resources/views/Configuration/Mailbox/update.html.twig  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/EmailBundle/Resources/views/Configuration/Mailbox/update.html.twig b/src/Oro/Bundle/EmailBundle/Resources/views/Configuration/Mailbox/update.html.twig
index fc7ac6299a4..886716897f6 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/views/Configuration/Mailbox/update.html.twig
+++ b/src/Oro/Bundle/EmailBundle/Resources/views/Configuration/Mailbox/update.html.twig
@@ -22,10 +22,14 @@
     },
     mailboxTitle
 ] %}
+{% set formActionParams = app.request.attributes.get('_route_params')|merge({redirectData: redirectData}) %}
+{% if app.request.query.has('form') %}
+    {% set formActionParams = formActionParams|merge({form: app.request.query.get('form')}) %}
+{% endif %}
 
 {% set formAction = path(
     app.request.attributes.get('_route'),
-    app.request.attributes.get('_route_params')|merge({redirectData: redirectData})
+    formActionParams
 ) %}
 
 {% set routeName = 'oro_config_configuration_system' %}

From 15f7d1df457e8ad4c024e5494a21f0f776c5c878 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Thu, 27 Aug 2015 19:48:50 +0200
Subject: [PATCH 007/471] CRM-3997: Make all mailboxes available under System
 organization

    - fix mailbox choice
---
 .../EmailBundle/Datagrid/MailboxChoiceList.php      | 11 ++++++++++-
 .../Entity/Repository/MailboxRepository.php         | 13 +++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/Oro/Bundle/EmailBundle/Datagrid/MailboxChoiceList.php b/src/Oro/Bundle/EmailBundle/Datagrid/MailboxChoiceList.php
index 3e5805b066e..11f7025f937 100644
--- a/src/Oro/Bundle/EmailBundle/Datagrid/MailboxChoiceList.php
+++ b/src/Oro/Bundle/EmailBundle/Datagrid/MailboxChoiceList.php
@@ -7,6 +7,7 @@
 use Oro\Bundle\EmailBundle\Entity\EmailOrigin;
 use Oro\Bundle\EmailBundle\Entity\Mailbox;
 use Oro\Bundle\SecurityBundle\SecurityFacade;
+use Oro\Bundle\OrganizationBundle\Entity\Organization;
 
 class MailboxChoiceList
 {
@@ -38,7 +39,7 @@ public function getChoiceList()
         /** @var Mailbox[] $systemMailboxes */
         $systemMailboxes = $repo->findAvailableMailboxes(
             $this->securityFacade->getLoggedUser(),
-            $this->securityFacade->getOrganization()
+            $this->getOrganization()
         );
         $origins = $this->getOriginsList();
 
@@ -58,6 +59,14 @@ public function getChoiceList()
         return $choiceList;
     }
 
+    /**
+     * @return Organization|null
+     */
+    protected function getOrganization()
+    {
+        return $this->securityFacade->getOrganization();
+    }
+
     /**
      * @return EmailOrigin[]
      */
diff --git a/src/Oro/Bundle/EmailBundle/Entity/Repository/MailboxRepository.php b/src/Oro/Bundle/EmailBundle/Entity/Repository/MailboxRepository.php
index 3e436a192b2..22efdfb329d 100644
--- a/src/Oro/Bundle/EmailBundle/Entity/Repository/MailboxRepository.php
+++ b/src/Oro/Bundle/EmailBundle/Entity/Repository/MailboxRepository.php
@@ -70,7 +70,7 @@ public function findAvailableMailboxIds($user, $organization)
 
     /**
      * @param User|integer $user User or user id
-     * @param Organization $organization
+     * @param Organization|integer|null $organization
      *
      * @return \Doctrine\ORM\QueryBuilder
      */
@@ -79,7 +79,8 @@ protected function createAvailableMailboxesQuery($user, $organization)
         if (!$user instanceof User) {
             $user = $this->getEntityManager()->getRepository('OroUserBundle:User')->find($user);
         }
-        if (!$organization instanceof Organization) {
+
+        if ($organization !== null && !$organization instanceof Organization) {
             $organization = $this->getEntityManager()
                 ->getRepository('OroOrganizationBundle:Organization')
                 ->find($organization);
@@ -92,7 +93,6 @@ protected function createAvailableMailboxesQuery($user, $organization)
             ->from('OroEmailBundle:Mailbox', 'mb')
             ->leftJoin('mb.authorizedUsers', 'au')
             ->leftJoin('mb.authorizedRoles', 'ar')
-            ->andWhere('mb.organization = :organization')
             ->andWhere(
                 $qb->expr()->orX(
                     'au = :user',
@@ -101,7 +101,12 @@ protected function createAvailableMailboxesQuery($user, $organization)
             );
         $qb->setParameter('user', $user);
         $qb->setParameter('roles', $roles);
-        $qb->setParameter('organization', $organization);
+
+        if ($organization) {
+            $qb
+                ->andWhere('mb.organization = :organization')
+                ->setParameter('organization', $organization);;
+        }
 
         return $qb;
     }

From 387a9c3b18549ab21d52baa6539eaf4da01865d0 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Fri, 28 Aug 2015 09:31:00 +0200
Subject: [PATCH 008/471] CRM-3997: Make all mailboxes available under System
 organization

- fix phpcs
---
 .../Bundle/EmailBundle/Entity/Repository/MailboxRepository.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/EmailBundle/Entity/Repository/MailboxRepository.php b/src/Oro/Bundle/EmailBundle/Entity/Repository/MailboxRepository.php
index 22efdfb329d..56dd22ec26f 100644
--- a/src/Oro/Bundle/EmailBundle/Entity/Repository/MailboxRepository.php
+++ b/src/Oro/Bundle/EmailBundle/Entity/Repository/MailboxRepository.php
@@ -105,7 +105,7 @@ protected function createAvailableMailboxesQuery($user, $organization)
         if ($organization) {
             $qb
                 ->andWhere('mb.organization = :organization')
-                ->setParameter('organization', $organization);;
+                ->setParameter('organization', $organization);
         }
 
         return $qb;

From 55c0d28166cd99310fbea2f36567c6ded391f330 Mon Sep 17 00:00:00 2001
From: jakubbabiak <jakub@babiak.cz>
Date: Fri, 28 Aug 2015 17:21:27 +0200
Subject: [PATCH 009/471] CRM-3997: Make all mailboxes available under System
 organization  - Replaced repository for available mailboxes by manager.

---
 .../EmailBundle/Acl/Voter/EmailVoter.php      |  4 +-
 .../Helper/EmailModelBuilderHelper.php        | 13 +++-
 .../Datagrid/EmailQueryFactory.php            | 12 ++--
 .../Datagrid/MailboxChoiceList.php            | 12 ++--
 .../Entity/Manager/MailboxManager.php         | 60 +++++++++++++++++++
 .../Entity/Repository/MailboxRepository.php   | 38 +-----------
 .../Provider/EmailActivityListProvider.php    | 14 ++---
 .../EmailBundle/Resources/config/services.yml | 16 ++++-
 .../Unit/Datagrid/EmailQueryFactoryTest.php   | 30 +++-------
 9 files changed, 119 insertions(+), 80 deletions(-)
 create mode 100644 src/Oro/Bundle/EmailBundle/Entity/Manager/MailboxManager.php

diff --git a/src/Oro/Bundle/EmailBundle/Acl/Voter/EmailVoter.php b/src/Oro/Bundle/EmailBundle/Acl/Voter/EmailVoter.php
index bb725b5eb08..a73d68d83f8 100644
--- a/src/Oro/Bundle/EmailBundle/Acl/Voter/EmailVoter.php
+++ b/src/Oro/Bundle/EmailBundle/Acl/Voter/EmailVoter.php
@@ -85,8 +85,8 @@ public function vote(TokenInterface $token, $object, array $attributes)
                 if ($mailbox = $emailUser->getMailboxOwner() !== null
                     && $token instanceof UsernamePasswordOrganizationToken
                 ) {
-                    $repo = $this->container->get('doctrine')->getRepository('OroEmailBundle:Mailbox');
-                    $mailboxes = $repo->findAvailableMailboxes(
+                    $manager = $this->container->get('oro_email.mailbox.manager');
+                    $mailboxes = $manager->findAvailableMailboxes(
                         $token->getUser(),
                         $token->getOrganizationContext()
                     );
diff --git a/src/Oro/Bundle/EmailBundle/Builder/Helper/EmailModelBuilderHelper.php b/src/Oro/Bundle/EmailBundle/Builder/Helper/EmailModelBuilderHelper.php
index f6b04a9a670..03d1524dfce 100644
--- a/src/Oro/Bundle/EmailBundle/Builder/Helper/EmailModelBuilderHelper.php
+++ b/src/Oro/Bundle/EmailBundle/Builder/Helper/EmailModelBuilderHelper.php
@@ -13,6 +13,7 @@
 use Oro\Bundle\EmailBundle\Entity\EmailOwnerInterface;
 use Oro\Bundle\EmailBundle\Entity\Mailbox;
 use Oro\Bundle\EmailBundle\Entity\Manager\EmailAddressManager;
+use Oro\Bundle\EmailBundle\Entity\Manager\MailboxManager;
 use Oro\Bundle\EmailBundle\Exception\LoadEmailBodyException;
 use Oro\Bundle\EmailBundle\Model\EmailHolderInterface;
 use Oro\Bundle\EmailBundle\Tools\EmailAddressHelper;
@@ -67,6 +68,11 @@ class EmailModelBuilderHelper
      */
     protected $templating;
 
+    /**
+     * @var MailboxManager
+     */
+    protected $mailboxManager;
+
     /**
      * @param EntityRoutingHelper $entityRoutingHelper
      * @param EmailAddressHelper  $emailAddressHelper
@@ -76,6 +82,7 @@ class EmailModelBuilderHelper
      * @param EntityManager       $entityManager
      * @param EmailCacheManager   $emailCacheManager
      * @param EngineInterface     $engineInterface
+     * @param MailboxManager      $mailboxManager
      */
     public function __construct(
         EntityRoutingHelper $entityRoutingHelper,
@@ -85,7 +92,8 @@ public function __construct(
         EmailAddressManager $emailAddressManager,
         EntityManager $entityManager,
         EmailCacheManager $emailCacheManager,
-        EngineInterface $engineInterface
+        EngineInterface $engineInterface,
+        MailboxManager $mailboxManager
     ) {
         $this->entityRoutingHelper = $entityRoutingHelper;
         $this->emailAddressHelper  = $emailAddressHelper;
@@ -95,6 +103,7 @@ public function __construct(
         $this->entityManager       = $entityManager;
         $this->emailCacheManager   = $emailCacheManager;
         $this->templating          = $engineInterface;
+        $this->mailboxManager      = $mailboxManager;
     }
 
     /**
@@ -262,7 +271,7 @@ public function getTargetEntity($entityClass, $entityId)
      */
     public function getMailboxes()
     {
-        $mailboxes = $this->entityManager->getRepository('OroEmailBundle:Mailbox')->findAvailableMailboxes(
+        $mailboxes = $this->mailboxManager->findAvailableMailboxes(
             $this->getUser(),
             $this->getOrganization()
         );
diff --git a/src/Oro/Bundle/EmailBundle/Datagrid/EmailQueryFactory.php b/src/Oro/Bundle/EmailBundle/Datagrid/EmailQueryFactory.php
index c72eeadcb8a..02b84bb545b 100644
--- a/src/Oro/Bundle/EmailBundle/Datagrid/EmailQueryFactory.php
+++ b/src/Oro/Bundle/EmailBundle/Datagrid/EmailQueryFactory.php
@@ -5,6 +5,7 @@
 use Doctrine\Bundle\DoctrineBundle\Registry;
 use Doctrine\ORM\QueryBuilder;
 
+use Oro\Bundle\EmailBundle\Entity\Manager\MailboxManager;
 use Oro\Bundle\EntityBundle\Provider\EntityNameResolver;
 use Oro\Bundle\EmailBundle\Entity\Provider\EmailOwnerProviderStorage;
 use Oro\Bundle\SecurityBundle\SecurityFacade;
@@ -21,7 +22,7 @@ class EmailQueryFactory
     protected $fromEmailExpression;
 
     /** @var Registry */
-    protected $doctrine;
+    protected $mailboxManager;
 
     /** @var SecurityFacade */
     protected $securityFacade;
@@ -29,18 +30,18 @@ class EmailQueryFactory
     /**
      * @param EmailOwnerProviderStorage $emailOwnerProviderStorage
      * @param EntityNameResolver        $entityNameResolver
-     * @param Registry                  $doctrine
+     * @param MailboxManager            $mailboxManager
      * @param SecurityFacade            $securityFacade
      */
     public function __construct(
         EmailOwnerProviderStorage $emailOwnerProviderStorage,
         EntityNameResolver $entityNameResolver,
-        Registry $doctrine,
+        MailboxManager $mailboxManager,
         SecurityFacade $securityFacade
     ) {
         $this->emailOwnerProviderStorage = $emailOwnerProviderStorage;
         $this->entityNameResolver        = $entityNameResolver;
-        $this->doctrine                  = $doctrine;
+        $this->mailboxManager            = $mailboxManager;
         $this->securityFacade            = $securityFacade;
     }
 
@@ -68,8 +69,7 @@ public function applyAcl(QueryBuilder $qb)
         $user = $this->securityFacade->getLoggedUser();
         $organization = $this->securityFacade->getOrganization();
 
-        $mailboxIds = $this->doctrine->getRepository('OroEmailBundle:Mailbox')
-             ->findAvailableMailboxIds($user, $organization);
+        $mailboxIds = $this->mailboxManager->findAvailableMailboxIds($user, $organization);
         $uoCheck = $qb->expr()->andX(
             $qb->expr()->eq('eu.owner', ':owner'),
             $qb->expr()->eq('eu.organization ', ':organization')
diff --git a/src/Oro/Bundle/EmailBundle/Datagrid/MailboxChoiceList.php b/src/Oro/Bundle/EmailBundle/Datagrid/MailboxChoiceList.php
index 11f7025f937..81c134df08d 100644
--- a/src/Oro/Bundle/EmailBundle/Datagrid/MailboxChoiceList.php
+++ b/src/Oro/Bundle/EmailBundle/Datagrid/MailboxChoiceList.php
@@ -6,6 +6,7 @@
 
 use Oro\Bundle\EmailBundle\Entity\EmailOrigin;
 use Oro\Bundle\EmailBundle\Entity\Mailbox;
+use Oro\Bundle\EmailBundle\Entity\Manager\MailboxManager;
 use Oro\Bundle\SecurityBundle\SecurityFacade;
 use Oro\Bundle\OrganizationBundle\Entity\Organization;
 
@@ -17,14 +18,19 @@ class MailboxChoiceList
     /** @var SecurityFacade */
     private $securityFacade;
 
+    /** @var MailboxManager */
+    private $mailboxManager;
+
     /**
      * @param Registry       $doctrine
      * @param SecurityFacade $securityFacade
+     * @param MailboxManager $mailboxManager
      */
-    public function __construct(Registry $doctrine, SecurityFacade $securityFacade)
+    public function __construct(Registry $doctrine, SecurityFacade $securityFacade, MailboxManager $mailboxManager)
     {
         $this->doctrine = $doctrine;
         $this->securityFacade = $securityFacade;
+        $this->mailboxManager = $mailboxManager;
     }
 
     /**
@@ -34,10 +40,8 @@ public function __construct(Registry $doctrine, SecurityFacade $securityFacade)
      */
     public function getChoiceList()
     {
-        $repo = $this->doctrine->getRepository('OroEmailBundle:Mailbox');
-
         /** @var Mailbox[] $systemMailboxes */
-        $systemMailboxes = $repo->findAvailableMailboxes(
+        $systemMailboxes = $this->mailboxManager->findAvailableMailboxes(
             $this->securityFacade->getLoggedUser(),
             $this->getOrganization()
         );
diff --git a/src/Oro/Bundle/EmailBundle/Entity/Manager/MailboxManager.php b/src/Oro/Bundle/EmailBundle/Entity/Manager/MailboxManager.php
new file mode 100644
index 00000000000..05c7c1d407f
--- /dev/null
+++ b/src/Oro/Bundle/EmailBundle/Entity/Manager/MailboxManager.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Oro\Bundle\EmailBundle\Entity\Manager;
+
+use Doctrine\Bundle\DoctrineBundle\Registry;
+use Doctrine\Common\Collections\Collection;
+
+use Oro\Bundle\EmailBundle\Entity\Mailbox;
+use Oro\Bundle\OrganizationBundle\Entity\Organization;
+use Oro\Bundle\UserBundle\Entity\User;
+
+class MailboxManager
+{
+    /** @var Registry */
+    protected $registry;
+
+    /**
+     * @param Registry $registry
+     */
+    public function __construct(Registry $registry)
+    {
+        $this->registry = $registry;
+    }
+
+    /**
+     * Returns a list of ids of mailboxes available to user logged under organization.
+     *
+     * @param User|integer $user User or user id
+     * @param Organization $organization
+     *
+     * @return array Array of ids
+     */
+    public function findAvailableMailboxIds($user, $organization)
+    {
+        $mailboxes = $this->findAvailableMailboxes($user, $organization);
+
+        $ids = [];
+        foreach ($mailboxes as $mailbox) {
+            $ids[] = $mailbox->getId();
+        }
+
+        return $ids;
+    }
+
+    /**
+     * Returns a list of mailboxes available to user logged under organization.
+     *
+     * @param User|integer $user User or user id
+     * @param Organization $organization
+     *
+     * @return Collection|Mailbox[] Array or collection of Mailboxes
+     */
+    public function findAvailableMailboxes($user, Organization $organization)
+    {
+        $qb = $this->registry->getRepository('OroEmailBundle:Mailbox')
+            ->createAvailableMailboxesQuery($user, $organization);
+
+        return $qb->getQuery()->getResult();
+    }
+}
diff --git a/src/Oro/Bundle/EmailBundle/Entity/Repository/MailboxRepository.php b/src/Oro/Bundle/EmailBundle/Entity/Repository/MailboxRepository.php
index 56dd22ec26f..73fefd53e29 100644
--- a/src/Oro/Bundle/EmailBundle/Entity/Repository/MailboxRepository.php
+++ b/src/Oro/Bundle/EmailBundle/Entity/Repository/MailboxRepository.php
@@ -34,47 +34,15 @@ public function findOneByEmail($email)
     }
 
     /**
-     * Returns a list of mailboxes available to user.
+     * Creates query for mailboxes available to user logged under organization.
+     * If no organization is provided, does not filter by it (useful when looking for mailboxes across organizations).
      *
-     * @param User|integer $user User or user id
-     * @param Organization $organization
-     *
-     * @return Collection|Mailbox[] Array or collection of Mailboxes
-     */
-    public function findAvailableMailboxes($user, $organization)
-    {
-        $qb = $this->createAvailableMailboxesQuery($user, $organization);
-
-        return $qb->getQuery()->getResult();
-    }
-
-    /**
-     * Returns a list of ids of mailboxes available to user.
-     *
-     * @param User|integer $user User or user id
-     * @param Organization $organization
-     *
-     * @return array Array of ids
-     */
-    public function findAvailableMailboxIds($user, $organization)
-    {
-        $mailboxes = $this->findAvailableMailboxes($user, $organization);
-
-        $ids = [];
-        foreach ($mailboxes as $mailbox) {
-            $ids[] = $mailbox->getId();
-        }
-
-        return $ids;
-    }
-
-    /**
      * @param User|integer $user User or user id
      * @param Organization|integer|null $organization
      *
      * @return \Doctrine\ORM\QueryBuilder
      */
-    protected function createAvailableMailboxesQuery($user, $organization)
+    public function createAvailableMailboxesQuery($user, $organization = null)
     {
         if (!$user instanceof User) {
             $user = $this->getEntityManager()->getRepository('OroUserBundle:User')->find($user);
diff --git a/src/Oro/Bundle/EmailBundle/Provider/EmailActivityListProvider.php b/src/Oro/Bundle/EmailBundle/Provider/EmailActivityListProvider.php
index f6b995150b0..37a8cac4a22 100644
--- a/src/Oro/Bundle/EmailBundle/Provider/EmailActivityListProvider.php
+++ b/src/Oro/Bundle/EmailBundle/Provider/EmailActivityListProvider.php
@@ -68,14 +68,14 @@ class EmailActivityListProvider implements
     /** @var HtmlTagHelper */
     protected $htmlTagHelper;
 
-    /** @var  ServiceLink */
+    /** @var ServiceLink */
     protected $securityContextLink;
 
     /** @var ServiceLink */
     protected $securityFacadeLink;
 
-    /** @var MailboxProcessStorage */
-    protected $mailboxProcessStorage;
+    /** @var ServiceLink */
+    protected $mailboxProcessStorageLink;
 
     /**
      * @param DoctrineHelper        $doctrineHelper
@@ -86,7 +86,7 @@ class EmailActivityListProvider implements
      * @param EmailThreadProvider   $emailThreadProvider
      * @param HtmlTagHelper         $htmlTagHelper
      * @param ServiceLink           $securityFacadeLink
-     * @param MailboxProcessStorage $mailboxProcessStorage
+     * @param ServiceLink           $mailboxProcessStorageLink
      */
     public function __construct(
         DoctrineHelper $doctrineHelper,
@@ -97,7 +97,7 @@ public function __construct(
         EmailThreadProvider $emailThreadProvider,
         HtmlTagHelper $htmlTagHelper,
         ServiceLink $securityFacadeLink,
-        MailboxProcessStorage $mailboxProcessStorage
+        ServiceLink $mailboxProcessStorageLink
     ) {
         $this->doctrineHelper        = $doctrineHelper;
         $this->doctrineRegistryLink  = $doctrineRegistryLink;
@@ -107,7 +107,7 @@ public function __construct(
         $this->emailThreadProvider   = $emailThreadProvider;
         $this->htmlTagHelper         = $htmlTagHelper;
         $this->securityFacadeLink    = $securityFacadeLink;
-        $this->mailboxProcessStorage = $mailboxProcessStorage;
+        $this->mailboxProcessStorageLink = $mailboxProcessStorageLink;
     }
 
     /**
@@ -231,7 +231,7 @@ public function getOrganization($activityEntity)
             return $token->getOrganizationContext();
         }
 
-        $processes = $this->mailboxProcessStorage->getProcesses();
+        $processes = $this->mailboxProcessStorageLink->getService()->getProcesses();
         foreach ($processes as $process) {
             $settingsClass = $process->getSettingsEntityFQCN();
 
diff --git a/src/Oro/Bundle/EmailBundle/Resources/config/services.yml b/src/Oro/Bundle/EmailBundle/Resources/config/services.yml
index 2ae430ad7c6..5966b307446 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/EmailBundle/Resources/config/services.yml
@@ -121,6 +121,7 @@ parameters:
     oro_email.listener.mailbox.authorization.class:     Oro\Bundle\EmailBundle\EventListener\MailboxAuthorizationListener
     oro_email.listener.datagrid.mailbox_grid.class:     Oro\Bundle\EmailBundle\EventListener\Datagrid\MailboxGridListener
     oro_email.autocomplete.mailbox_user_search_handler.class: Oro\Bundle\EmailBundle\Autocomplete\MailboxUserSearchHandler
+    oro_email.mailbox.manager.class:                    Oro\Bundle\EmailBundle\Entity\Manager\MailboxManager
 
     # Workflow conditions
     oro_email.workflow.condition.instanceof.class:      Oro\Bundle\EmailBundle\Model\Condition\IsInstanceOf
@@ -212,6 +213,7 @@ services:
             - @doctrine.orm.entity_manager
             - @oro_email.email.cache.manager
             - @templating
+            - @oro_email.mailbox.manager
 
     oro_email.email.entity.builder:
         class: %oro_email.email.entity.builder.class%
@@ -442,7 +444,7 @@ services:
         arguments:
             - @oro_email.email.owner.provider.storage
             - @oro_entity.entity_name_resolver
-            - @doctrine
+            - @oro_email.mailbox.manager
             - @oro_security.security_facade
 
     oro_email.emailtemplate.datagrid_view_list:
@@ -610,6 +612,10 @@ services:
           tags:
               - { name: kernel.event_listener, event: oro_search.prepare_entity_map, method: prepareEntityMapEvent, priority: 10 }
 
+    oro_email.mailbox.process_storage.link:
+        tags:
+            - { name: oro_service_link, service: oro_email.mailbox.process_storage }
+
     oro_email.activity_list.provider:
         class: %oro_email.activity_list.provider.class%
         arguments:
@@ -621,7 +627,7 @@ services:
            - @oro_email.email.thread.provider
            - @oro_ui.html_tag_helper
            - @oro_security.security_facade.link
-           - @oro_email.mailbox.process_storage
+           - @oro_email.mailbox.process_storage.link
         calls:
            - [ setSecurityContextLink, [@security.context.link] ]
         tags:
@@ -802,6 +808,7 @@ services:
         arguments:
             - @doctrine
             - @oro_security.security_facade
+            - @oro_email.mailbox.manager
 
     oro_email.mailbox.manager.api:
         class: %oro_email.mailbox.manager.api.class%
@@ -854,6 +861,11 @@ services:
             - { name: kernel.event_listener, event: oro_datagrid.datagrid.build.pre, method: onPreBuild }
             - { name: kernel.event_listener, event: oro_datagrid.datagrid.build.after.base-mailboxes-grid, method: onBuildAfter }
 
+    oro_email.mailbox.manager:
+        class: %oro_email.mailbox.manager.class%
+        arguments:
+            - @doctrine
+
     oro_email.workflow.condition.instanceof:
         class: %oro_email.workflow.condition.instanceof.class%
         tags:
diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Datagrid/EmailQueryFactoryTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Datagrid/EmailQueryFactoryTest.php
index 75ca70423f3..e3124589bbc 100644
--- a/src/Oro/Bundle/EmailBundle/Tests/Unit/Datagrid/EmailQueryFactoryTest.php
+++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/Datagrid/EmailQueryFactoryTest.php
@@ -2,11 +2,9 @@
 
 namespace Oro\Bundle\EmailBundle\Tests\Unit\Datagrid;
 
-use Doctrine\Bundle\DoctrineBundle\Registry;
-
 use Oro\Bundle\EmailBundle\Datagrid\EmailQueryFactory;
+use Oro\Bundle\EmailBundle\Entity\Manager\MailboxManager;
 use Oro\Bundle\EmailBundle\Entity\Provider\EmailOwnerProviderStorage;
-use Oro\Bundle\EmailBundle\Entity\Repository\MailboxRepository;
 use Oro\Bundle\EntityBundle\Provider\EntityNameResolver;
 use Oro\Bundle\OrganizationBundle\Entity\Organization;
 use Oro\Bundle\SecurityBundle\SecurityFacade;
@@ -28,14 +26,11 @@ class EmailQueryFactoryTest extends OrmTestCase
     /** @var EmailQueryFactory */
     protected $factory;
 
-    /** @var Registry */
-    protected $doctrine;
-
     /** @var SecurityFacade */
     protected $securityFacade;
 
-    /** @var MailboxRepository */
-    protected $mailboxRepository;
+    /** @var MailboxManager */
+    protected $mailboxManager;
 
     public function setUp()
     {
@@ -44,19 +39,10 @@ public function setUp()
         $this->entityNameResolver = $this->getMockBuilder('Oro\Bundle\EntityBundle\Provider\EntityNameResolver')
             ->disableOriginalConstructor()->getMock();
 
-        $this->mailboxRepository = $this->getMockBuilder('Oro\Bundle\EmailBundle\Entity\Repository\MailboxRepository')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->doctrine = $this->getMockBuilder('Doctrine\Bundle\DoctrineBundle\Registry')
+        $this->mailboxManager = $this->getMockBuilder('Oro\Bundle\EmailBundle\Entity\Manager\MailboxManager')
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->doctrine->expects($this->any())
-            ->method('getRepository')
-            ->with($this->equalTo('OroEmailBundle:Mailbox'))
-            ->will($this->returnValue($this->mailboxRepository));
-
         $this->securityFacade = $this->getMockBuilder('Oro\Bundle\SecurityBundle\SecurityFacade')
             ->disableOriginalConstructor()
             ->getMock();
@@ -64,7 +50,7 @@ public function setUp()
         $this->factory = new EmailQueryFactory(
             $this->providerStorage,
             $this->entityNameResolver,
-            $this->doctrine,
+            $this->mailboxManager,
             $this->securityFacade
         );
     }
@@ -75,7 +61,7 @@ public function tearDown()
             $this->factory,
             $this->entityNameResolver,
             $this->providerStorage,
-            $this->mailboxRepository,
+            $this->mailboxManager,
             $this->doctrine
         );
     }
@@ -141,7 +127,7 @@ public function testFilterQueryByUserIdWhenMailboxesAreFound()
             ->method('getOrganization')
             ->will($this->returnValue($organization));
 
-        $this->mailboxRepository->expects($this->any())
+        $this->mailboxManager->expects($this->any())
             ->method('findAvailableMailboxIds')
             ->with($user, $organization)
             ->will($this->returnValue([1, 3, 5]));
@@ -174,7 +160,7 @@ public function testFilterQueryByUserIdWhenNoMailboxesFound()
             ->method('getOrganization')
             ->will($this->returnValue($organization));
 
-        $this->mailboxRepository->expects($this->any())
+        $this->mailboxManager->expects($this->any())
             ->method('findAvailableMailboxIds')
             ->with($user, $organization)
             ->will($this->returnValue([1, 3, 5]));

From 61698ae68a43579857218fe69f77abfbe42058a3 Mon Sep 17 00:00:00 2001
From: Ignat Shcheglovskyi <ignat@orocrm.com>
Date: Tue, 22 Sep 2015 16:27:13 -0700
Subject: [PATCH 010/471] AEIV-41: Organization Specific Roles - update upgrade
 instruction

---
 UPGRADE-1.9.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/UPGRADE-1.9.md b/UPGRADE-1.9.md
index 8fb46f3e5dc..af9fa773bba 100644
--- a/UPGRADE-1.9.md
+++ b/UPGRADE-1.9.md
@@ -9,3 +9,16 @@ UPGRADE FROM 1.8 to 1.9
 - `Oro\Bundle\ActivityListBundle\Model\ActivityListProviderInterface::getOwner` added.
 ####EntityConfigBundle
 - Removed `optionSet` field type deprecated since v1.4. Existing options sets are converted to `Select` or `Multi-Select` automatically during the Platform update.
+
+####NoteBundle
+ - Added parameter `DoctrineHelper $doctrineHelper` to constructor of `\Oro\Bundle\NoteBundle\Placeholder\PlaceholderFilter`
+
+####SecurityBundle
+- `Oro\Bundle\SecurityBundle\Authentication\Token\UsernamePasswordOrganizationTokenFactoryInterface` and its implementation `Oro\Bundle\SecurityBundle\Authentication\Token\UsernamePasswordOrganizationTokenFactory` were introduced to encapsulate creation of `UsernamePasswordOrganizationToken` in `Oro\Bundle\SecurityBundle\Authentication\Provider\UsernamePasswordOrganizationAuthenticationProvider` and `Oro\Bundle\SecurityBundle\Http\Firewall\OrganizationBasicAuthenticationListener`
+- `Oro\Bundle\SecurityBundle\Authentication\Token\OrganizationRememberMeTokenFactoryInterface` and its implementation `Oro\Bundle\SecurityBundle\Authentication\Token\OrganizationRememberMeTokenFactory` were introduced to encapsulate creation of `OrganizationRememberMeToken` in `Oro\Bundle\SecurityBundle\Authentication\Provider\UsernamePasswordOrganizationAuthenticationProvider`
+
+####SSOBundle
+- `Oro\Bundle\SSOBundle\Security\OAuthTokenFactoryInterface` and its implementation `Oro\Bundle\SSOBundle\Security\OAuthTokenFactory` were introduced to encapsulate creation of `OAuthToken` in `Oro\Bundle\SSOBundle\Security\OAuthProvider`
+
+####UserBundle
+- `Oro\Bundle\UserBundle\Security\WsseTokenFactoryInterface` and its implementation `Oro\Bundle\UserBundle\Security\WsseTokenFactory` were introduced to encapsulate creation of `WsseToken` in `Oro\Bundle\UserBundle\Security\WsseAuthProvider`

From 70cc16992c518260530730d36a25ec6f65b27e21 Mon Sep 17 00:00:00 2001
From: Ignat Shcheglovskyi <ignat@orocrm.com>
Date: Mon, 28 Sep 2015 14:18:58 -0700
Subject: [PATCH 011/471] AEIV-172: Review Organization Specific Roles - fixed
 ResultRecord::getRootEntity to get root entity from result - updated
 roles-grid, added root entity to select to be able to check permissions in
 enterprise edition

---
 .../Datasource/ResultRecord.php               |  6 ++--
 .../Unit/Datasource/ResultRecordTest.php      | 35 +++++++++++++++++++
 .../FormBundle/Autocomplete/SearchHandler.php |  1 -
 .../UserBundle/Resources/config/datagrid.yml  |  3 ++
 4 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Datasource/ResultRecord.php b/src/Oro/Bundle/DataGridBundle/Datasource/ResultRecord.php
index 818e4d95260..c715e7f8538 100644
--- a/src/Oro/Bundle/DataGridBundle/Datasource/ResultRecord.php
+++ b/src/Oro/Bundle/DataGridBundle/Datasource/ResultRecord.php
@@ -76,8 +76,10 @@ public function getValue($name)
      */
     public function getRootEntity()
     {
-        if (array_key_exists(0, $this->valueContainers) && is_object($this->valueContainers[0])) {
-            return $this->valueContainers[0];
+        foreach ($this->valueContainers as $value) {
+            if (is_object($value)) {
+                return $value;
+            }
         }
 
         return null;
diff --git a/src/Oro/Bundle/DataGridBundle/Tests/Unit/Datasource/ResultRecordTest.php b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Datasource/ResultRecordTest.php
index 47c8b273331..479d01989ea 100644
--- a/src/Oro/Bundle/DataGridBundle/Tests/Unit/Datasource/ResultRecordTest.php
+++ b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Datasource/ResultRecordTest.php
@@ -74,4 +74,39 @@ public function getValueProvider()
             ],
         ];
     }
+
+    /**
+     * @dataProvider getRootEntityProvider
+     */
+    public function testGetRootEntity($data, $expectedValue)
+    {
+        $resultRecord = new ResultRecord($data);
+
+        $this->assertEquals($expectedValue, $resultRecord->getRootEntity());
+    }
+
+    public function getRootEntityProvider()
+    {
+        $obj        = new \stdClass();
+        $obj->item1 = 'val1';
+
+        return [
+            [
+                'data'          => [],
+                'expectedValue' => null
+            ],
+            [
+                'data'          => ['item1' => 'val1'],
+                'expectedValue' => null
+            ],
+            [
+                'data'          => $obj,
+                'expectedValue' => $obj
+            ],
+            [
+                'data'          => [['item1' => 'val1'], $obj],
+                'expectedValue' => $obj
+            ],
+        ];
+    }
 }
diff --git a/src/Oro/Bundle/FormBundle/Autocomplete/SearchHandler.php b/src/Oro/Bundle/FormBundle/Autocomplete/SearchHandler.php
index 79fb764aee5..fdaa55db9e1 100644
--- a/src/Oro/Bundle/FormBundle/Autocomplete/SearchHandler.php
+++ b/src/Oro/Bundle/FormBundle/Autocomplete/SearchHandler.php
@@ -230,7 +230,6 @@ protected function findById($query)
         return $this->getEntitiesByIds(explode(',', $query));
     }
 
-
     /**
      * @param array $items
      * @return array
diff --git a/src/Oro/Bundle/UserBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/UserBundle/Resources/config/datagrid.yml
index 2c44421ab21..01f6ad47d13 100644
--- a/src/Oro/Bundle/UserBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/UserBundle/Resources/config/datagrid.yml
@@ -196,6 +196,7 @@ datagrid:
             type: orm
             query:
                 select:
+                    - r
                     - r.id
                     - r.role
                     - r.label
@@ -237,6 +238,8 @@ datagrid:
                 icon:          trash
                 acl_resource:  oro_user_role_delete
 
+        action_configuration: @oro_user.role.datagrid_helper->getActionConfigurationClosure
+
         sorters:
             columns:
                 label:

From 66e1dfc4c5f37fcaa8138bc305c55daf8afe85ac Mon Sep 17 00:00:00 2001
From: AlexandrDmitriev <admitriev@magecore.com>
Date: Wed, 30 Sep 2015 17:25:32 +0300
Subject: [PATCH 012/471] AEIV-172: Review Organization Specific Roles

---
 ...UsernamePasswordOrganizationAuthenticationProvider.php | 8 ++++----
 .../Token/UsernamePasswordOrganizationTokenFactory.php    | 7 +------
 src/Oro/Bundle/UserBundle/Resources/config/datagrid.yml   | 2 --
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/Oro/Bundle/SecurityBundle/Authentication/Provider/UsernamePasswordOrganizationAuthenticationProvider.php b/src/Oro/Bundle/SecurityBundle/Authentication/Provider/UsernamePasswordOrganizationAuthenticationProvider.php
index 9b5d2449266..99051f757f7 100644
--- a/src/Oro/Bundle/SecurityBundle/Authentication/Provider/UsernamePasswordOrganizationAuthenticationProvider.php
+++ b/src/Oro/Bundle/SecurityBundle/Authentication/Provider/UsernamePasswordOrganizationAuthenticationProvider.php
@@ -9,19 +9,19 @@
 
 use Oro\Bundle\UserBundle\Entity\User;
 use Oro\Bundle\SecurityBundle\Authentication\Guesser\UserOrganizationGuesser;
-use Oro\Bundle\SecurityBundle\Authentication\Token\UsernamePasswordOrganizationTokenFactoryInterface as TokenFactory;
+use Oro\Bundle\SecurityBundle\Authentication\Token\UsernamePasswordOrganizationTokenFactoryInterface;
 
 class UsernamePasswordOrganizationAuthenticationProvider extends DaoAuthenticationProvider
 {
     /**
-     * @var TokenFactory
+     * @var UsernamePasswordOrganizationTokenFactoryInterface
      */
     protected $tokenFactory;
 
     /**
-     * @param TokenFactory $tokenFactory
+     * @param UsernamePasswordOrganizationTokenFactoryInterface $tokenFactory
      */
-    public function setTokenFactory(TokenFactory $tokenFactory)
+    public function setTokenFactory(UsernamePasswordOrganizationTokenFactoryInterface $tokenFactory)
     {
         $this->tokenFactory = $tokenFactory;
     }
diff --git a/src/Oro/Bundle/SecurityBundle/Authentication/Token/UsernamePasswordOrganizationTokenFactory.php b/src/Oro/Bundle/SecurityBundle/Authentication/Token/UsernamePasswordOrganizationTokenFactory.php
index 635a68c545f..762ef1464b1 100644
--- a/src/Oro/Bundle/SecurityBundle/Authentication/Token/UsernamePasswordOrganizationTokenFactory.php
+++ b/src/Oro/Bundle/SecurityBundle/Authentication/Token/UsernamePasswordOrganizationTokenFactory.php
@@ -7,12 +7,7 @@
 class UsernamePasswordOrganizationTokenFactory implements UsernamePasswordOrganizationTokenFactoryInterface
 {
     /**
-     * @param string $user
-     * @param string $credentials
-     * @param string $providerKey
-     * @param Organization $organizationContext
-     * @param array $roles
-     * @return UsernamePasswordOrganizationToken
+     * {@inheritdoc}
      */
     public function create($user, $credentials, $providerKey, Organization $organizationContext, array $roles = [])
     {
diff --git a/src/Oro/Bundle/UserBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/UserBundle/Resources/config/datagrid.yml
index e6b5bda8990..f954b273a2b 100644
--- a/src/Oro/Bundle/UserBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/UserBundle/Resources/config/datagrid.yml
@@ -238,8 +238,6 @@ datagrid:
                 icon:          trash
                 acl_resource:  oro_user_role_delete
 
-        action_configuration: @oro_user.role.datagrid_helper->getActionConfigurationClosure
-
         sorters:
             columns:
                 label:

From 0d1533936316d73c2cf2aa5057f8393982d9a99c Mon Sep 17 00:00:00 2001
From: AlexandrDmitriev <admitriev@magecore.com>
Date: Wed, 30 Sep 2015 17:41:32 +0300
Subject: [PATCH 013/471] AEIV-172: Review Organization Specific Roles - fix
 code styles

---
 .../OrganizationRememberMeAuthenticationProvider.php      | 8 ++++----
 .../Firewall/OrganizationBasicAuthenticationListener.php  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Oro/Bundle/SecurityBundle/Authentication/Provider/OrganizationRememberMeAuthenticationProvider.php b/src/Oro/Bundle/SecurityBundle/Authentication/Provider/OrganizationRememberMeAuthenticationProvider.php
index b3dd010e2e2..0f7341b80c9 100644
--- a/src/Oro/Bundle/SecurityBundle/Authentication/Provider/OrganizationRememberMeAuthenticationProvider.php
+++ b/src/Oro/Bundle/SecurityBundle/Authentication/Provider/OrganizationRememberMeAuthenticationProvider.php
@@ -9,19 +9,19 @@
 
 use Oro\Bundle\UserBundle\Entity\User;
 use Oro\Bundle\SecurityBundle\Authentication\Guesser\UserOrganizationGuesser;
-use Oro\Bundle\SecurityBundle\Authentication\Token\OrganizationRememberMeTokenFactoryInterface as TokenFactory;
+use Oro\Bundle\SecurityBundle\Authentication\Token\OrganizationRememberMeTokenFactoryInterface;
 
 class OrganizationRememberMeAuthenticationProvider extends RememberMeAuthenticationProvider
 {
     /**
-     * @var TokenFactory
+     * @var OrganizationRememberMeTokenFactoryInterface
      */
     protected $tokenFactory;
 
     /**
-     * @param TokenFactory $tokenFactory
+     * @param OrganizationRememberMeTokenFactoryInterface $tokenFactory
      */
-    public function setTokenFactory(TokenFactory $tokenFactory)
+    public function setTokenFactory(OrganizationRememberMeTokenFactoryInterface $tokenFactory)
     {
         $this->tokenFactory = $tokenFactory;
     }
diff --git a/src/Oro/Bundle/SecurityBundle/Http/Firewall/OrganizationBasicAuthenticationListener.php b/src/Oro/Bundle/SecurityBundle/Http/Firewall/OrganizationBasicAuthenticationListener.php
index 5268ccceda0..b1bf33e6ce7 100644
--- a/src/Oro/Bundle/SecurityBundle/Http/Firewall/OrganizationBasicAuthenticationListener.php
+++ b/src/Oro/Bundle/SecurityBundle/Http/Firewall/OrganizationBasicAuthenticationListener.php
@@ -13,7 +13,7 @@
 
 use Oro\Bundle\OrganizationBundle\Entity\Manager\OrganizationManager;
 use Oro\Bundle\SecurityBundle\Authentication\Token\OrganizationContextTokenInterface;
-use Oro\Bundle\SecurityBundle\Authentication\Token\UsernamePasswordOrganizationTokenFactoryInterface as TokenFactory;
+use Oro\Bundle\SecurityBundle\Authentication\Token\UsernamePasswordOrganizationTokenFactoryInterface;
 
 class OrganizationBasicAuthenticationListener
 {
@@ -39,7 +39,7 @@ class OrganizationBasicAuthenticationListener
     protected $manager;
 
     /**
-     * @var TokenFactory
+     * @var UsernamePasswordOrganizationTokenFactoryInterface
      */
     protected $tokenFactory;
 
@@ -73,9 +73,9 @@ public function __construct(
     }
 
     /**
-     * @param TokenFactory $tokenFactory
+     * @param UsernamePasswordOrganizationTokenFactoryInterface $tokenFactory
      */
-    public function setTokenFactory(TokenFactory $tokenFactory)
+    public function setTokenFactory(UsernamePasswordOrganizationTokenFactoryInterface $tokenFactory)
     {
         $this->tokenFactory = $tokenFactory;
     }

From 42de3a7a72dd3d0e94e54166468c08133fdfe1f8 Mon Sep 17 00:00:00 2001
From: AlexandrDmitriev <admitriev@magecore.com>
Date: Wed, 30 Sep 2015 20:20:01 +0300
Subject: [PATCH 014/471] AEIV-172: Review Organization Specific Roles - fix
 grid

---
 .../UserBundle/Datagrid/RoleGridHelper.php    | 41 +++++++++++++++++++
 .../UserBundle/Resources/config/datagrid.yml  |  2 +
 .../UserBundle/Resources/config/services.yml  |  7 ++++
 3 files changed, 50 insertions(+)
 create mode 100644 src/Oro/Bundle/UserBundle/Datagrid/RoleGridHelper.php

diff --git a/src/Oro/Bundle/UserBundle/Datagrid/RoleGridHelper.php b/src/Oro/Bundle/UserBundle/Datagrid/RoleGridHelper.php
new file mode 100644
index 00000000000..58c2298afdd
--- /dev/null
+++ b/src/Oro/Bundle/UserBundle/Datagrid/RoleGridHelper.php
@@ -0,0 +1,41 @@
+<?php
+namespace Oro\Bundle\UserBundle\Datagrid;
+
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+
+use Oro\Bundle\DataGridBundle\Datasource\ResultRecordInterface;
+
+/**
+ * Used in grid of roles to provide permissions for actions on level of each role in the grid.
+ */
+class RoleGridHelper
+{
+    /**
+     * @var AuthorizationCheckerInterface
+     */
+    protected $authorizationChecker;
+
+    /**
+     * @param AuthorizationCheckerInterface $authorizationChecker
+     */
+    public function __construct(AuthorizationCheckerInterface $authorizationChecker)
+    {
+        $this->authorizationChecker = $authorizationChecker;
+    }
+
+    /**
+     * Returns callback for configuration of grid/actions visibility per row
+     *
+     * @return callable
+     */
+    public function getActionConfigurationClosure()
+    {
+        return function (ResultRecordInterface $record) {
+            $role = $record->getRootEntity();
+            return [
+                'update' => $this->authorizationChecker->isGranted('EDIT', $role),
+                'delete' => $this->authorizationChecker->isGranted('DELETE', $role),
+            ];
+        };
+    }
+}
diff --git a/src/Oro/Bundle/UserBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/UserBundle/Resources/config/datagrid.yml
index f954b273a2b..e6b5bda8990 100644
--- a/src/Oro/Bundle/UserBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/UserBundle/Resources/config/datagrid.yml
@@ -238,6 +238,8 @@ datagrid:
                 icon:          trash
                 acl_resource:  oro_user_role_delete
 
+        action_configuration: @oro_user.role.datagrid_helper->getActionConfigurationClosure
+
         sorters:
             columns:
                 label:
diff --git a/src/Oro/Bundle/UserBundle/Resources/config/services.yml b/src/Oro/Bundle/UserBundle/Resources/config/services.yml
index fb7dc629de5..c89d87a305c 100644
--- a/src/Oro/Bundle/UserBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/UserBundle/Resources/config/services.yml
@@ -37,6 +37,8 @@ parameters:
 
     oro_user.token.factory.wsse.class:            Oro\Bundle\UserBundle\Security\WsseTokenFactory
 
+    oro_user.role.datagrid_helper.class:          Oro\Bundle\UserBundle\Datagrid\RoleGridHelper
+
 services:
     oro_user.manager:
         class: %oro_user.manager.class%
@@ -300,3 +302,8 @@ services:
 
     oro_user.token.factory.wsse:
         class: %oro_user.token.factory.wsse.class%
+
+    oro_user.role.datagrid_helper:
+        class: %oro_user.role.datagrid_helper.class%
+        arguments:
+            - @security.authorization_checker

From 4a5a86e68f8db9baaa856b951ebb8b13e4d947d0 Mon Sep 17 00:00:00 2001
From: AlexandrDmitriev <admitriev@magecore.com>
Date: Thu, 1 Oct 2015 18:09:08 +0300
Subject: [PATCH 015/471] AEIV-172: Review Organization Specific Roles - fix
 selenium tests

---
 .../Bundle/UserBundle/Tests/Selenium/Pages/User.php   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Oro/Bundle/UserBundle/Tests/Selenium/Pages/User.php b/src/Oro/Bundle/UserBundle/Tests/Selenium/Pages/User.php
index 80938f6f29b..1991983c979 100644
--- a/src/Oro/Bundle/UserBundle/Tests/Selenium/Pages/User.php
+++ b/src/Oro/Bundle/UserBundle/Tests/Selenium/Pages/User.php
@@ -254,17 +254,22 @@ public function setRoles($roles = array(), $oneOf = false)
                 if ($condition != '') {
                     $condition .= ' or ';
                 }
-                $condition .= "normalize-space(text()) = '{$role}'";
+                $condition .= "contains(., '{$role}')";
             }
             $element = $this->roles->element(
-                $this->test->using('xpath')->value("div[label[{$condition}]]/input")
+                $this->test->using('xpath')->value(
+                    "div[@data-ftid='oro_user_user_form_roles']/div[label[{$condition}]]/input"
+                )
             );
             $this->test->moveto($element);
             $element->click();
         } else {
             foreach ($roles as $role) {
                 $element = $this->roles->element(
-                    $this->test->using('xpath')->value("div[label[normalize-space(text()) = '{$role}']]/input")
+                    $this->test->using('xpath')->value(
+                        "div[@data-ftid='oro_user_user_form_roles']".
+                        "/div[label[normalize-space(text()) = '{$role}']]/input"
+                    )
                 );
                 $this->test->moveto($element);
                 $element->click();

From c1573fa5fb6ef9c41ba6bbbe094b55394b725801 Mon Sep 17 00:00:00 2001
From: AlexandrDmitriev <admitriev@magecore.com>
Date: Fri, 2 Oct 2015 13:40:25 +0300
Subject: [PATCH 016/471] AEIV-172: Review Organization Specific Roles - fix
 selenium tests

---
 src/Oro/Bundle/UserBundle/Tests/Selenium/Pages/User.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Oro/Bundle/UserBundle/Tests/Selenium/Pages/User.php b/src/Oro/Bundle/UserBundle/Tests/Selenium/Pages/User.php
index 1991983c979..816258cef29 100644
--- a/src/Oro/Bundle/UserBundle/Tests/Selenium/Pages/User.php
+++ b/src/Oro/Bundle/UserBundle/Tests/Selenium/Pages/User.php
@@ -258,7 +258,7 @@ public function setRoles($roles = array(), $oneOf = false)
             }
             $element = $this->roles->element(
                 $this->test->using('xpath')->value(
-                    "div[@data-ftid='oro_user_user_form_roles']/div[label[{$condition}]]/input"
+                    "//div[@data-ftid='oro_user_user_form_roles']/div[label[{$condition}]]/input"
                 )
             );
             $this->test->moveto($element);
@@ -267,8 +267,8 @@ public function setRoles($roles = array(), $oneOf = false)
             foreach ($roles as $role) {
                 $element = $this->roles->element(
                     $this->test->using('xpath')->value(
-                        "div[@data-ftid='oro_user_user_form_roles']".
-                        "/div[label[normalize-space(text()) = '{$role}']]/input"
+                        "//div[@data-ftid='oro_user_user_form_roles']".
+                        "/div[label[contains(normalize-space(text()), '{$role}')]]/input"
                     )
                 );
                 $this->test->moveto($element);

From 394ac26cf454712aca691721cb29d4332135d6c5 Mon Sep 17 00:00:00 2001
From: AlexandrDmitriev <admitriev@magecore.com>
Date: Fri, 2 Oct 2015 16:35:28 +0300
Subject: [PATCH 017/471] AEIV-172: Review Organization Specific Roles - fix
 selenium tests

---
 .../UserBundle/Tests/Selenium/RolesTest.php   | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/Oro/Bundle/UserBundle/Tests/Selenium/RolesTest.php b/src/Oro/Bundle/UserBundle/Tests/Selenium/RolesTest.php
index 66dfc8b1daf..44fc48f20c6 100644
--- a/src/Oro/Bundle/UserBundle/Tests/Selenium/RolesTest.php
+++ b/src/Oro/Bundle/UserBundle/Tests/Selenium/RolesTest.php
@@ -16,25 +16,26 @@ class RolesTest extends Selenium2TestCase
     protected $newRole = array('LABEL' => 'NEW_LABEL_', 'ROLE_NAME' => 'NEW_ROLE_');
 
     protected $defaultRoles = array(
-        'header' => array(
-            'ROLE' => 'ROLE',
-            'LABEL' => 'LABEL',
-            '' => 'ACTION'
+        'header'             => array(
+            'ROLE'         => 'ROLE',
+            'LABEL'        => 'LABEL',
+            'ORGANIZATION' => 'ORGANIZATION',
+            ''             => 'ACTION'
         ),
-        'ROLE_MANAGER' => array(
+        'ROLE_MANAGER'       => array(
             'ROLE_MANAGER' => 'ROLE_MANAGER',
-            'Manager' => 'Manager',
-            '...' => 'ACTION'
+            'Manager'      => 'Manager',
+            '...'          => 'ACTION'
         ),
         'ROLE_ADMINISTRATOR' => array(
             'ROLE_ADMINISTRATOR' => 'ROLE_ADMINISTRATOR',
-            'Administrator' => 'Administrator',
-            '...' => 'ACTION'
+            'Administrator'      => 'Administrator',
+            '...'                => 'ACTION'
         ),
-        'ROLE_USER' => array(
+        'ROLE_USER'          => array(
             'ROLE_USER' => 'ROLE_USER',
-            'User' => 'User',
-            '...' => 'ACTION'
+            'User'      => 'User',
+            '...'       => 'ACTION'
         )
     );
 
@@ -86,12 +87,14 @@ public function testRolesAdd()
         $randomPrefix = WebTestCase::generateRandomString(5);
 
         $login = $this->login();
+        $roleLabel = $this->newRole['LABEL'] . $randomPrefix;
+
         /** @var Roles $login */
         $roles = $login->openRoles('Oro\Bundle\UserBundle')
             ->assertTitle('All - Roles - User Management - System')
             ->add()
             ->assertTitle('Create Role - Roles - User Management - System')
-            ->setLabel($this->newRole['LABEL'] . $randomPrefix)
+            ->setLabel($roleLabel)
             ->save()
             ->assertMessage('Role saved')
             ->close();
@@ -99,7 +102,7 @@ public function testRolesAdd()
         //verify new Role
         $roles->refresh();
 
-        static::assertTrue($roles->entityExists(array('name' => $this->newRole['LABEL'] . $randomPrefix)));
+        static::assertTrue($roles->entityExists(array('name' => $roleLabel)));
 
         return $randomPrefix;
     }

From 7a202419de258205a7d090f2a6cf7405ab765672 Mon Sep 17 00:00:00 2001
From: Sergey Zhuravel <zhuravel.sergey@gmail.com>
Date: Fri, 9 Oct 2015 14:52:09 +0300
Subject: [PATCH 018/471] BB-1334: Add STI for audit

---
 .../DataAuditBundle/Entity/AbstractAudit.php  | 10 +++++++-
 .../Entity/AbstractAuditField.php             |  9 ++++++-
 .../Bundle/DataAuditBundle/Entity/Audit.php   |  3 ---
 .../DataAuditBundle/Entity/AuditField.php     |  5 +---
 .../Schema/OroDataAuditBundleInstaller.php    |  9 ++++++-
 .../Schema/v1_6/OroDataAuditBundle.php        | 25 +++++++++++++++++++
 6 files changed, 51 insertions(+), 10 deletions(-)
 create mode 100644 src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/OroDataAuditBundle.php

diff --git a/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAudit.php b/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAudit.php
index cf72f0cb974..db53da55a05 100644
--- a/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAudit.php
+++ b/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAudit.php
@@ -12,7 +12,15 @@
 use Oro\Bundle\UserBundle\Entity\AbstractUser;
 
 /**
- * @ORM\MappedSuperclass
+ * @ORM\MappedSuperclass()
+ * @ORM\Entity()
+ * @ORM\Table(name="oro_audit", indexes={
+ *      @ORM\Index(name="idx_oro_audit_logged_at", columns={"logged_at"}),
+ *      @ORM\Index(name="idx_oro_audit_type", columns={"type"})
+ * })
+ * @ORM\InheritanceType("SINGLE_TABLE")
+ * @ORM\DiscriminatorColumn(name="type", type="string")
+ * @ORM\DiscriminatorMap({"audit" = "Audit"})
  */
 abstract class AbstractAudit extends AbstractLogEntry
 {
diff --git a/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAuditField.php b/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAuditField.php
index 8ffed588692..aa2e8bafab3 100644
--- a/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAuditField.php
+++ b/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAuditField.php
@@ -9,7 +9,14 @@
 use Oro\Bundle\DataAuditBundle\Model\AuditFieldTypeRegistry;
 
 /**
- * @ORM\MappedSuperclass
+ * @ORM\MappedSuperclass()
+ * @ORM\Entity()
+ * @ORM\Table(name="oro_audit_field", indexes={
+ *      @ORM\Index(name="idx_oro_audit_field_type", columns={"type"})
+ * })
+ * @ORM\InheritanceType("SINGLE_TABLE")
+ * @ORM\DiscriminatorColumn(name="type", type="string")
+ * @ORM\DiscriminatorMap({"audit_field" = "AuditField"})
  */
 abstract class AbstractAuditField
 {
diff --git a/src/Oro/Bundle/DataAuditBundle/Entity/Audit.php b/src/Oro/Bundle/DataAuditBundle/Entity/Audit.php
index 9f14e64c274..5f6405caf57 100644
--- a/src/Oro/Bundle/DataAuditBundle/Entity/Audit.php
+++ b/src/Oro/Bundle/DataAuditBundle/Entity/Audit.php
@@ -14,9 +14,6 @@
 
 /**
  * @ORM\Entity(repositoryClass="Oro\Bundle\DataAuditBundle\Entity\Repository\AuditRepository")
- * @ORM\Table(name="oro_audit", indexes={
- *      @ORM\Index(name="idx_oro_audit_logged_at", columns={"logged_at"})
- * })
  */
 class Audit extends AbstractAudit
 {
diff --git a/src/Oro/Bundle/DataAuditBundle/Entity/AuditField.php b/src/Oro/Bundle/DataAuditBundle/Entity/AuditField.php
index 8321a2c8474..b96ecdbe5e7 100644
--- a/src/Oro/Bundle/DataAuditBundle/Entity/AuditField.php
+++ b/src/Oro/Bundle/DataAuditBundle/Entity/AuditField.php
@@ -9,10 +9,7 @@
 
 /**
  * @ORM\Entity
- * @ORM\Table(name="oro_audit_field")
- * @Config(
- *      mode="hidden"
- * )
+ * @Config(mode="hidden")
  */
 class AuditField extends ExtendAuditField
 {
diff --git a/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/OroDataAuditBundleInstaller.php b/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/OroDataAuditBundleInstaller.php
index 8afbf51ff61..d813ce77f81 100644
--- a/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/OroDataAuditBundleInstaller.php
+++ b/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/OroDataAuditBundleInstaller.php
@@ -14,7 +14,7 @@ class OroDataAuditBundleInstaller implements Installation
      */
     public function getMigrationVersion()
     {
-        return 'v1_5';
+        return 'v1_6';
     }
 
     /**
@@ -41,9 +41,13 @@ private function createAudit(Schema $schema)
         $auditTable->addColumn('object_name', 'string', ['length' => 255]);
         $auditTable->addColumn('version', 'integer', []);
         $auditTable->addColumn('organization_id', 'integer', ['notnull' => false]);
+        $auditTable->addColumn('type', 'string', ['length' => 255]);
+
         $auditTable->setPrimaryKey(['id']);
 
         $auditTable->addIndex(['user_id'], 'IDX_5FBA427CA76ED395', []);
+        $auditTable->addIndex(['type'], 'idx_oro_audit_type');
+
         $auditTable->addForeignKeyConstraint(
             $schema->getTable('oro_user'),
             ['user_id'],
@@ -110,6 +114,9 @@ private function createAuditField(Schema $schema)
             'comment' => '(DC2Type:json_array)',
         ]);
         $auditFieldTable->setPrimaryKey(['id']);
+        $auditFieldTable->addColumn('type', 'string', ['length' => 255]);
+
+        $auditFieldTable->addIndex(['type'], 'idx_oro_audit_field_type');
         $auditFieldTable->addIndex(['audit_id'], 'IDX_9A31A824BD29F359', []);
 
         $auditFieldTable->addForeignKeyConstraint(
diff --git a/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/OroDataAuditBundle.php b/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/OroDataAuditBundle.php
new file mode 100644
index 00000000000..b3ab2bdcde3
--- /dev/null
+++ b/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/OroDataAuditBundle.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Oro\Bundle\DataAuditBundle\Migrations\Schema\v1_6;
+
+use Doctrine\DBAL\Schema\Schema;
+
+use Oro\Bundle\MigrationBundle\Migration\Migration;
+use Oro\Bundle\MigrationBundle\Migration\QueryBag;
+
+class OroDataAuditBundle implements Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function up(Schema $schema, QueryBag $queries)
+    {
+        $auditTable = $schema->getTable('oro_audit');
+        $auditTable->addColumn('type', 'string', ['length' => 255]);
+        $auditTable->addIndex(['type'], 'idx_oro_audit_type');
+
+        $auditFieldTable = $schema->getTable('oro_audit_field');
+        $auditFieldTable->addColumn('type', 'string', ['length' => 255]);
+        $auditFieldTable->addIndex(['type'], 'idx_oro_audit_field_type');
+    }
+}

From a6f1a4a60da2b976474fa80861adc49c803a91eb Mon Sep 17 00:00:00 2001
From: Sergey Zhuravel <zhuravel.sergey@gmail.com>
Date: Fri, 9 Oct 2015 15:14:48 +0300
Subject: [PATCH 019/471] BB-1334: Add STI for audit - fix migrations

---
 .../{OroDataAuditBundle.php => AddColumn.php} | 15 ++++---
 .../Migrations/Schema/v1_6/SetNotNullable.php | 32 ++++++++++++++
 .../Migrations/Schema/v1_6/SetValue.php       | 42 +++++++++++++++++++
 3 files changed, 84 insertions(+), 5 deletions(-)
 rename src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/{OroDataAuditBundle.php => AddColumn.php} (67%)
 create mode 100644 src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/SetNotNullable.php
 create mode 100644 src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/SetValue.php

diff --git a/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/OroDataAuditBundle.php b/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/AddColumn.php
similarity index 67%
rename from src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/OroDataAuditBundle.php
rename to src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/AddColumn.php
index b3ab2bdcde3..ce855ca4ce0 100644
--- a/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/OroDataAuditBundle.php
+++ b/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/AddColumn.php
@@ -5,21 +5,26 @@
 use Doctrine\DBAL\Schema\Schema;
 
 use Oro\Bundle\MigrationBundle\Migration\Migration;
+use Oro\Bundle\MigrationBundle\Migration\OrderedMigrationInterface;
 use Oro\Bundle\MigrationBundle\Migration\QueryBag;
 
-class OroDataAuditBundle implements Migration
+class AddColumn implements Migration, OrderedMigrationInterface
 {
+    /** {@inheritdoc} */
+    public function getOrder()
+    {
+        return 10;
+    }
+
     /**
      * {@inheritdoc}
      */
     public function up(Schema $schema, QueryBag $queries)
     {
         $auditTable = $schema->getTable('oro_audit');
-        $auditTable->addColumn('type', 'string', ['length' => 255]);
-        $auditTable->addIndex(['type'], 'idx_oro_audit_type');
+        $auditTable->addColumn('type', 'string', ['length' => 255, 'notnull' => false]);
 
         $auditFieldTable = $schema->getTable('oro_audit_field');
-        $auditFieldTable->addColumn('type', 'string', ['length' => 255]);
-        $auditFieldTable->addIndex(['type'], 'idx_oro_audit_field_type');
+        $auditFieldTable->addColumn('type', 'string', ['length' => 255, 'notnull' => false]);
     }
 }
diff --git a/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/SetNotNullable.php b/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/SetNotNullable.php
new file mode 100644
index 00000000000..4913018216a
--- /dev/null
+++ b/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/SetNotNullable.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Oro\Bundle\DataAuditBundle\Migrations\Schema\v1_6;
+
+use Doctrine\DBAL\Schema\Schema;
+
+use Oro\Bundle\MigrationBundle\Migration\Migration;
+use Oro\Bundle\MigrationBundle\Migration\OrderedMigrationInterface;
+use Oro\Bundle\MigrationBundle\Migration\QueryBag;
+
+class SetNotNullable implements Migration, OrderedMigrationInterface
+{
+    /** {@inheritdoc} */
+    public function getOrder()
+    {
+        return 30;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function up(Schema $schema, QueryBag $queries)
+    {
+        $auditTable = $schema->getTable('oro_audit');
+        $auditTable->getColumn('type')->setOptions(['length' => 255]);
+        $auditTable->addIndex(['type'], 'idx_oro_audit_type');
+
+        $auditFieldTable = $schema->getTable('oro_audit_field');
+        $auditFieldTable->getColumn('type')->setOptions(['length' => 255]);
+        $auditFieldTable->addIndex(['type'], 'idx_oro_audit_field_type');
+    }
+}
diff --git a/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/SetValue.php b/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/SetValue.php
new file mode 100644
index 00000000000..cda73823e17
--- /dev/null
+++ b/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/SetValue.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Oro\Bundle\DataAuditBundle\Migrations\Schema\v1_6;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Types\Type;
+
+use Oro\Bundle\MigrationBundle\Migration\Migration;
+use Oro\Bundle\MigrationBundle\Migration\OrderedMigrationInterface;
+use Oro\Bundle\MigrationBundle\Migration\ParametrizedSqlMigrationQuery;
+use Oro\Bundle\MigrationBundle\Migration\QueryBag;
+
+class SetValue implements Migration, OrderedMigrationInterface
+{
+    /** {@inheritdoc} */
+    public function getOrder()
+    {
+        return 20;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function up(Schema $schema, QueryBag $queries)
+    {
+        $queries->addPreQuery(
+            new ParametrizedSqlMigrationQuery(
+                'UPDATE oro_audit SET type = :type',
+                ['type' => 'audit'],
+                ['type' => Type::STRING]
+            )
+        );
+
+        $queries->addPreQuery(
+            new ParametrizedSqlMigrationQuery(
+                'UPDATE oro_audit_field SET type = :type',
+                ['type' => 'audit_field'],
+                ['type' => Type::STRING]
+            )
+        );
+    }
+}

From 57e67d0826e87f14843da03247c17a3deed331cf Mon Sep 17 00:00:00 2001
From: Sergey Zhuravel <zhuravel.sergey@gmail.com>
Date: Fri, 9 Oct 2015 16:12:38 +0300
Subject: [PATCH 020/471] BB-1334: Add STI for audit - fix migrations

---
 .../Migrations/Schema/v1_6/SetNotNullable.php                | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/SetNotNullable.php b/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/SetNotNullable.php
index 4913018216a..1f0ff9a0a96 100644
--- a/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/SetNotNullable.php
+++ b/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/SetNotNullable.php
@@ -4,6 +4,7 @@
 
 use Doctrine\DBAL\Schema\Schema;
 
+use Doctrine\DBAL\Types\Type;
 use Oro\Bundle\MigrationBundle\Migration\Migration;
 use Oro\Bundle\MigrationBundle\Migration\OrderedMigrationInterface;
 use Oro\Bundle\MigrationBundle\Migration\QueryBag;
@@ -22,11 +23,11 @@ public function getOrder()
     public function up(Schema $schema, QueryBag $queries)
     {
         $auditTable = $schema->getTable('oro_audit');
-        $auditTable->getColumn('type')->setOptions(['length' => 255]);
+        $auditTable->getColumn('type')->setType(Type::getType(Type::STRING))->setOptions(['length' => 255]);
         $auditTable->addIndex(['type'], 'idx_oro_audit_type');
 
         $auditFieldTable = $schema->getTable('oro_audit_field');
-        $auditFieldTable->getColumn('type')->setOptions(['length' => 255]);
+        $auditFieldTable->getColumn('type')->setType(Type::getType(Type::STRING))->setOptions(['length' => 255]);
         $auditFieldTable->addIndex(['type'], 'idx_oro_audit_field_type');
     }
 }

From 866b6a07079300735b385a927880ccd95e3cdeba Mon Sep 17 00:00:00 2001
From: Sergey Zhuravel <zhuravel.sergey@gmail.com>
Date: Fri, 9 Oct 2015 16:59:21 +0300
Subject: [PATCH 021/471] BB-1334: Add STI for audit - fix migrations

---
 .../Migrations/Schema/v1_6/SetNotNullable.php             | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/SetNotNullable.php b/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/SetNotNullable.php
index 1f0ff9a0a96..5f3c143a4ac 100644
--- a/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/SetNotNullable.php
+++ b/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/SetNotNullable.php
@@ -23,11 +23,15 @@ public function getOrder()
     public function up(Schema $schema, QueryBag $queries)
     {
         $auditTable = $schema->getTable('oro_audit');
-        $auditTable->getColumn('type')->setType(Type::getType(Type::STRING))->setOptions(['length' => 255]);
+        $auditTable->getColumn('type')
+            ->setType(Type::getType(Type::STRING))
+            ->setOptions(['length' => 255, 'notnull' => true]);
         $auditTable->addIndex(['type'], 'idx_oro_audit_type');
 
         $auditFieldTable = $schema->getTable('oro_audit_field');
-        $auditFieldTable->getColumn('type')->setType(Type::getType(Type::STRING))->setOptions(['length' => 255]);
+        $auditFieldTable->getColumn('type')
+            ->setType(Type::getType(Type::STRING))
+            ->setOptions(['length' => 255, 'notnull' => true]);
         $auditFieldTable->addIndex(['type'], 'idx_oro_audit_field_type');
     }
 }

From 919e1dada59ec25ccbbf994abd055030e608bb19 Mon Sep 17 00:00:00 2001
From: Sergey Zhuravel <zhuravel.sergey@gmail.com>
Date: Wed, 28 Oct 2015 15:16:05 +0200
Subject: [PATCH 022/471] BB-1334: Add STI for audit - fix commit order

---
 src/Oro/Bundle/DataAuditBundle/Entity/AbstractAuditField.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAuditField.php b/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAuditField.php
index aa2e8bafab3..efaa1286892 100644
--- a/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAuditField.php
+++ b/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAuditField.php
@@ -38,9 +38,6 @@ abstract class AbstractAuditField
 
     /**
      * @var AbstractAudit
-     *
-     * @ORM\ManyToOne(targetEntity="AbstractAudit", inversedBy="fields", cascade={"persist"})
-     * @ORM\JoinColumn(name="audit_id", referencedColumnName="id", nullable=false, onDelete="CASCADE")
      */
     protected $audit;
 

From 6be359eddcfa1218fef17f953eaa265bf82ae797 Mon Sep 17 00:00:00 2001
From: Sergey Zhuravel <zhuravel.sergey@gmail.com>
Date: Wed, 28 Oct 2015 15:35:33 +0200
Subject: [PATCH 023/471] BB-1334: Add STI for audit - fix commit order

---
 src/Oro/Bundle/DataAuditBundle/Entity/AbstractAudit.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAudit.php b/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAudit.php
index db53da55a05..a4870754c18 100644
--- a/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAudit.php
+++ b/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAudit.php
@@ -47,8 +47,6 @@ abstract class AbstractAudit extends AbstractLogEntry
 
     /**
      * @var AbstractAuditField[]|Collection
-     *
-     * @ORM\OneToMany(targetEntity="AbstractAuditField", mappedBy="audit", cascade={"persist"})
      */
     protected $fields;
 

From 1a48a93d9785f4f9830962beaabe4c1259441381 Mon Sep 17 00:00:00 2001
From: Sergey Zhuravel <zhuravel.sergey@gmail.com>
Date: Wed, 28 Oct 2015 17:14:35 +0200
Subject: [PATCH 024/471] BB-1334: Add STI for audit - fix commit order

---
 src/Oro/Bundle/DataAuditBundle/Entity/AbstractAudit.php      | 2 ++
 src/Oro/Bundle/DataAuditBundle/Entity/AbstractAuditField.php | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAudit.php b/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAudit.php
index a4870754c18..db53da55a05 100644
--- a/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAudit.php
+++ b/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAudit.php
@@ -47,6 +47,8 @@ abstract class AbstractAudit extends AbstractLogEntry
 
     /**
      * @var AbstractAuditField[]|Collection
+     *
+     * @ORM\OneToMany(targetEntity="AbstractAuditField", mappedBy="audit", cascade={"persist"})
      */
     protected $fields;
 
diff --git a/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAuditField.php b/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAuditField.php
index efaa1286892..aa2e8bafab3 100644
--- a/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAuditField.php
+++ b/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAuditField.php
@@ -38,6 +38,9 @@ abstract class AbstractAuditField
 
     /**
      * @var AbstractAudit
+     *
+     * @ORM\ManyToOne(targetEntity="AbstractAudit", inversedBy="fields", cascade={"persist"})
+     * @ORM\JoinColumn(name="audit_id", referencedColumnName="id", nullable=false, onDelete="CASCADE")
      */
     protected $audit;
 

From 248dbedb48f7a96df825307fdae46d2dc1468f58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A1gi-Kaz=C3=A1r=20M=C3=A1rk?=
 <mark.sagikazar@gmail.com>
Date: Fri, 6 Nov 2015 23:55:02 +0100
Subject: [PATCH 025/471] Update Sensio Distribution Bundle, closes #339

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 6045b5d6073..9c34dd44514 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
         "symfony/icu": "~1.1",
         "symfony/swiftmailer-bundle": "2.3.*",
         "symfony/monolog-bundle": "2.7.*",
-        "sensio/distribution-bundle": "2.3.14",
+        "sensio/distribution-bundle": "4.0.3",
         "sensio/framework-extra-bundle": "2.3.4",
         "incenteev/composer-parameter-handler": "2.1.0",
         "jms/job-queue-bundle": "1.2.*",

From 4112a18de05961d4efc87229f5ff4d52401e9e8f Mon Sep 17 00:00:00 2001
From: Ignat Shcheglovskyi <ignat@orocrm.com>
Date: Mon, 9 Nov 2015 11:26:21 -0800
Subject: [PATCH 026/471] BAP-9220: Upgrade fails on not existing roles - fix
 bug when role is not exist

---
 .../Migrations/Data/ORM/UpdateAclRoles.php    | 69 +++++++++++--------
 1 file changed, 39 insertions(+), 30 deletions(-)

diff --git a/src/Oro/Bundle/CalendarBundle/Migrations/Data/ORM/UpdateAclRoles.php b/src/Oro/Bundle/CalendarBundle/Migrations/Data/ORM/UpdateAclRoles.php
index cea2ba64f09..b14ed14e9cd 100644
--- a/src/Oro/Bundle/CalendarBundle/Migrations/Data/ORM/UpdateAclRoles.php
+++ b/src/Oro/Bundle/CalendarBundle/Migrations/Data/ORM/UpdateAclRoles.php
@@ -9,6 +9,7 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 use Oro\Bundle\SecurityBundle\Acl\Persistence\AclManager;
+use Oro\Bundle\UserBundle\Entity\Role;
 use Oro\Bundle\UserBundle\Migrations\Data\ORM\LoadRolesData;
 
 class UpdateAclRoles extends AbstractFixture implements DependentFixtureInterface, ContainerAwareInterface
@@ -60,40 +61,48 @@ public function load(ObjectManager $manager)
 
     protected function updateUserRole(AclManager $manager)
     {
-        $sid = $manager->getSid($this->getRole(LoadRolesData::ROLE_USER));
-
-        // grant to manage own calendar events
-        $oid = $manager->getOid('entity:Oro\Bundle\CalendarBundle\Entity\CalendarEvent');
-        $maskBuilder = $manager->getMaskBuilder($oid)
-            // ->add('VIEW_BASIC')
-            // ->add('CREATE_BASIC')
-            // ->add('EDIT_BASIC')
-            // ->add('DELETE_BASIC');
-            // @todo now only SYSTEM level is supported
-            ->add('VIEW_SYSTEM')
-            ->add('CREATE_SYSTEM')
-            ->add('EDIT_SYSTEM')
-            ->add('DELETE_SYSTEM');
-        $manager->setPermission($sid, $oid, $maskBuilder->get());
+        $role = $this->getRole(LoadRolesData::ROLE_USER);
+
+        if ($role) {
+            $sid = $manager->getSid($role);
+
+            // grant to manage own calendar events
+            $oid = $manager->getOid('entity:Oro\Bundle\CalendarBundle\Entity\CalendarEvent');
+            $maskBuilder = $manager->getMaskBuilder($oid)
+                // ->add('VIEW_BASIC')
+                // ->add('CREATE_BASIC')
+                // ->add('EDIT_BASIC')
+                // ->add('DELETE_BASIC');
+                // @todo now only SYSTEM level is supported
+                ->add('VIEW_SYSTEM')
+                ->add('CREATE_SYSTEM')
+                ->add('EDIT_SYSTEM')
+                ->add('DELETE_SYSTEM');
+            $manager->setPermission($sid, $oid, $maskBuilder->get());
+        }
     }
 
     protected function updateManagerRole(AclManager $manager)
     {
-        $sid = $manager->getSid($this->getRole(LoadRolesData::ROLE_MANAGER));
-
-        // grant to manage own calendar events
-        $oid = $manager->getOid('entity:Oro\Bundle\CalendarBundle\Entity\CalendarEvent');
-        $maskBuilder = $manager->getMaskBuilder($oid)
-            // ->add('VIEW_BASIC')
-            // ->add('CREATE_BASIC')
-            // ->add('EDIT_BASIC')
-            // ->add('DELETE_BASIC');
-            // @todo now only SYSTEM level is supported
-            ->add('VIEW_SYSTEM')
-            ->add('CREATE_SYSTEM')
-            ->add('EDIT_SYSTEM')
-            ->add('DELETE_SYSTEM');
-        $manager->setPermission($sid, $oid, $maskBuilder->get());
+        $role = $this->getRole(LoadRolesData::ROLE_MANAGER);
+
+        if ($role) {
+            $sid = $manager->getSid($role);
+
+            // grant to manage own calendar events
+            $oid = $manager->getOid('entity:Oro\Bundle\CalendarBundle\Entity\CalendarEvent');
+            $maskBuilder = $manager->getMaskBuilder($oid)
+                // ->add('VIEW_BASIC')
+                // ->add('CREATE_BASIC')
+                // ->add('EDIT_BASIC')
+                // ->add('DELETE_BASIC');
+                // @todo now only SYSTEM level is supported
+                ->add('VIEW_SYSTEM')
+                ->add('CREATE_SYSTEM')
+                ->add('EDIT_SYSTEM')
+                ->add('DELETE_SYSTEM');
+            $manager->setPermission($sid, $oid, $maskBuilder->get());
+        }
     }
 
     /**

From bb4ddfe65e2a6e49ab9f1e2bb32230922bf591ff Mon Sep 17 00:00:00 2001
From: Olexandr Radchenko <olexandr.radchenko@eltrino.com>
Date: Thu, 12 Nov 2015 17:18:32 +0200
Subject: [PATCH 027/471] Problem with process parameters in
 EntityPaginationBundle

---
 .../Storage/StorageDataCollector.php               | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/Oro/Bundle/EntityPaginationBundle/Storage/StorageDataCollector.php b/src/Oro/Bundle/EntityPaginationBundle/Storage/StorageDataCollector.php
index 8ebc7c46e80..a4a36b3656f 100644
--- a/src/Oro/Bundle/EntityPaginationBundle/Storage/StorageDataCollector.php
+++ b/src/Oro/Bundle/EntityPaginationBundle/Storage/StorageDataCollector.php
@@ -83,10 +83,18 @@ public function collect(Request $request, $scope)
 
         $isDataCollected = false;
 
-        $gridNames = array_keys($request->query->get('grid', []));
+        $gridNames = array();
+        if ($request->query->get('grid')) {
+            $gridNames = array_keys($request->query->get('grid', []));
+        }
         foreach ($gridNames as $gridName) {
-            // datagrid manager automatically extracts all required parameters from request
-            $dataGrid = $this->datagridManager->getDatagridByRequestParams($gridName);
+            try {
+                // datagrid manager automatically extracts all required parameters from request
+                $dataGrid = $this->datagridManager->getDatagridByRequestParams($gridName);
+            } catch (\RuntimeException $e) {
+                continue;
+            }
+
             if (!$this->paginationManager->isDatagridApplicable($dataGrid)) {
                 continue;
             }

From d7fd9dcd55c0e0753b97094748ef406149478eef Mon Sep 17 00:00:00 2001
From: Oleksandr Nechyporenko <onechyporenko@magecore.com>
Date: Thu, 12 Nov 2015 20:32:10 +0200
Subject: [PATCH 028/471] BB-1532: Dump layout styles in css  - add 
 ArrayOptionValueBuilder  - fix OptionValueBag

---
 .../Layout/ArrayOptionValueBuilder.php        | 83 +++++++++++++++++++
 src/Oro/Component/Layout/OptionValueBag.php   | 22 +++--
 2 files changed, 100 insertions(+), 5 deletions(-)
 create mode 100644 src/Oro/Component/Layout/ArrayOptionValueBuilder.php

diff --git a/src/Oro/Component/Layout/ArrayOptionValueBuilder.php b/src/Oro/Component/Layout/ArrayOptionValueBuilder.php
new file mode 100644
index 00000000000..749e116b3cf
--- /dev/null
+++ b/src/Oro/Component/Layout/ArrayOptionValueBuilder.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace Oro\Component\Layout;
+
+use Oro\Component\Layout\Exception\UnexpectedTypeException;
+use Oro\Component\Layout\Exception\InvalidArgumentException;
+
+class ArrayOptionValueBuilder implements OptionValueBuilderInterface
+{
+    /** @var mixed[] */
+    protected $values = [];
+
+    /**
+     * @param $value
+     * @return array
+     * @throws UnexpectedTypeException
+     */
+    protected function prepareValueType($value)
+    {
+        if (!is_array($value)) {
+            throw new UnexpectedTypeException($value, 'array', 'value');
+        }
+
+        return array_values($value);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function add($value)
+    {
+        if (!($value = $this->prepareValueType($value))) {
+            return;
+        }
+
+        $this->values = array_merge($this->values, $value);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function remove($value)
+    {
+        if (!($value = $this->prepareValueType($value))) {
+            return;
+        }
+
+        $this->values = array_values(array_diff($this->values, $value));
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function replace($oldValues, $newValue)
+    {
+        if (!($value = $this->prepareValueType($oldValues))) {
+            return;
+        }
+
+        if (!($value = $this->prepareValueType($newValue))) {
+            return;
+        }
+
+        if (count($oldValues) !== count($newValue)) {
+            throw new InvalidArgumentException(sprintf('$oldValues should be the same as $newValue size.'));
+        }
+
+        foreach ($oldValues as $index => $oldValue) {
+            $key = array_search($oldValue, $this->values, true);
+            if (false !== $key) {
+                $this->values[$key] = $newValue[$index];
+            }
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function get()
+    {
+        return $this->values;
+    }
+}
diff --git a/src/Oro/Component/Layout/OptionValueBag.php b/src/Oro/Component/Layout/OptionValueBag.php
index 7058feb6e60..e5f56283407 100644
--- a/src/Oro/Component/Layout/OptionValueBag.php
+++ b/src/Oro/Component/Layout/OptionValueBag.php
@@ -60,20 +60,32 @@ public function all()
      */
     public function buildValue(OptionValueBuilderInterface $builder)
     {
+        $actions = [
+            'add' => [],
+            'replace' => [],
+            'remove' => [],
+        ];
+
         foreach ($this->actions as $action) {
             switch ($action->getName()) {
                 case 'add':
-                    $builder->add($action->getArgument(0));
-                    break;
-                case 'remove':
-                    $builder->remove($action->getArgument(0));
+                    $actions['add'][] = [$action->getArgument(0)];
                     break;
                 case 'replace':
-                    $builder->replace($action->getArgument(0), $action->getArgument(1));
+                    $actions['replace'][] = [$action->getArgument(0), $action->getArgument(1)];
+                    break;
+                case 'remove':
+                    $actions['remove'][] = [$action->getArgument(0)];
                     break;
             }
         }
 
+        foreach ($actions as $action => $calls) {
+            foreach ($calls as $arguments) {
+                call_user_func_array([$builder, $action], $arguments);
+            }
+        }
+
         return $builder->get();
     }
 }

From ec3bc84d8f9809c128adb37a3d8daf740eb8769f Mon Sep 17 00:00:00 2001
From: Oleksandr Nechyporenko <onechyporenko@magecore.com>
Date: Thu, 12 Nov 2015 20:32:56 +0200
Subject: [PATCH 029/471] BB-1532: Dump layout styles in css  - add block
 StylesheetsType

---
 .../Layout/Block/Type/StylesheetsType.php     | 45 +++++++++++++++++++
 .../Resources/config/block_types.yml          |  5 +++
 .../views/Layout/div_layout.html.twig         |  6 +++
 3 files changed, 56 insertions(+)
 create mode 100644 src/Oro/Bundle/LayoutBundle/Layout/Block/Type/StylesheetsType.php

diff --git a/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/StylesheetsType.php b/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/StylesheetsType.php
new file mode 100644
index 00000000000..4815520f3aa
--- /dev/null
+++ b/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/StylesheetsType.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Oro\Bundle\LayoutBundle\Layout\Block\Type;
+
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+
+use Oro\Component\Layout\OptionValueBag;
+use Oro\Component\Layout\ArrayOptionValueBuilder;
+use Oro\Component\Layout\Block\Type\AbstractType;
+use Oro\Component\Layout\BlockInterface;
+use Oro\Component\Layout\BlockView;
+
+class StylesheetsType extends AbstractType
+{
+    const NAME = 'stylesheets';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $resolver->setRequired(['styles']);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function finishView(BlockView $view, BlockInterface $block, array $options)
+    {
+        $styles = $block->getOptions()['styles'];
+        if ($styles instanceof OptionValueBag) {
+            $styles = $styles->buildValue(new ArrayOptionValueBuilder());
+        }
+
+        $view->vars['styles'] = $styles;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return self::NAME;
+    }
+}
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/config/block_types.yml b/src/Oro/Bundle/LayoutBundle/Resources/config/block_types.yml
index 17a23227d80..cfe5fc0a04a 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/config/block_types.yml
+++ b/src/Oro/Bundle/LayoutBundle/Resources/config/block_types.yml
@@ -29,6 +29,11 @@ services:
         tags:
              - { name: layout.block_type, alias: script }
 
+    oro_layout.block_type.stylesheets:
+        class: Oro\Bundle\LayoutBundle\Layout\Block\Type\StylesheetsType
+        tags:
+             - { name: layout.block_type, alias: stylesheets }
+
     oro_layout.block_type.style:
         class: Oro\Bundle\LayoutBundle\Layout\Block\Type\StyleType
         tags:
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
index 3883c5692a5..94a826621c8 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
+++ b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
@@ -57,6 +57,12 @@
     {% endif %}
 {% endblock %}
 
+{% block stylesheets_widget %}
+    {% for style in styles %}
+        <link rel="stylesheet" href="{{ style }}" />
+    {% endfor %}
+{% endblock %}
+
 {% block style_widget %}
     {% if attr.href is defined and attr.href is not empty %}
         <link rel="stylesheet"{{ block('block_attributes') }}/>

From 6984e95935869f4d795897b4e7ead202f070ef00 Mon Sep 17 00:00:00 2001
From: Oleksandr Nechyporenko <onechyporenko@magecore.com>
Date: Thu, 12 Nov 2015 20:34:01 +0200
Subject: [PATCH 030/471] BB-1532: Dump layout styles in css  - add empty
 LayoutFormulaLoader and LayoutResource

---
 .../Assetic/LayoutFormulaLoader.php           | 18 +++++++++++++++
 .../LayoutBundle/Assetic/LayoutResource.php   | 23 +++++++++++++++++++
 .../Resources/config/services.yml             | 20 +++++++++++++---
 3 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 src/Oro/Bundle/LayoutBundle/Assetic/LayoutFormulaLoader.php
 create mode 100644 src/Oro/Bundle/LayoutBundle/Assetic/LayoutResource.php

diff --git a/src/Oro/Bundle/LayoutBundle/Assetic/LayoutFormulaLoader.php b/src/Oro/Bundle/LayoutBundle/Assetic/LayoutFormulaLoader.php
new file mode 100644
index 00000000000..546a425f5d7
--- /dev/null
+++ b/src/Oro/Bundle/LayoutBundle/Assetic/LayoutFormulaLoader.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Oro\Bundle\LayoutBundle\Assetic;
+
+use Assetic\Factory\Loader\FormulaLoaderInterface;
+use Assetic\Factory\Resource\ResourceInterface;
+use Symfony\Bundle\AsseticBundle\Factory\Resource\ConfigurationResource;
+
+class LayoutFormulaLoader implements FormulaLoaderInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function load(ResourceInterface $resource)
+    {
+        return $resource instanceof LayoutResource ? $resource->getContent() : [];
+    }
+}
diff --git a/src/Oro/Bundle/LayoutBundle/Assetic/LayoutResource.php b/src/Oro/Bundle/LayoutBundle/Assetic/LayoutResource.php
new file mode 100644
index 00000000000..b5115d59fab
--- /dev/null
+++ b/src/Oro/Bundle/LayoutBundle/Assetic/LayoutResource.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Oro\Bundle\LayoutBundle\Assetic;
+
+use Assetic\Factory\Resource\ResourceInterface;
+
+class LayoutResource implements ResourceInterface
+{
+    public function isFresh($timestamp)
+    {
+        return true;
+    }
+
+    public function getContent()
+    {
+        return [];
+    }
+
+    public function __toString()
+    {
+        return 'layout';
+    }
+}
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/config/services.yml b/src/Oro/Bundle/LayoutBundle/Resources/config/services.yml
index 4d1da69f8cd..e1048a93c6a 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/LayoutBundle/Resources/config/services.yml
@@ -1,7 +1,9 @@
 parameters:
-    oro_layout.layout_factory_builder.class:    Oro\Component\Layout\LayoutFactoryBuilder
-    oro_layout.layout_manager.class:            Oro\Component\Layout\LayoutManager
-    oro_layout.form_layout_builder.class:       Oro\Bundle\LayoutBundle\Layout\Form\GroupingFormLayoutBuilder
+    oro_layout.layout_factory_builder.class:            Oro\Component\Layout\LayoutFactoryBuilder
+    oro_layout.layout_manager.class:                    Oro\Component\Layout\LayoutManager
+    oro_layout.form_layout_builder.class:               Oro\Bundle\LayoutBundle\Layout\Form\GroupingFormLayoutBuilder
+    oro_layout.assetic.layout_formula_loader.class:     Oro\Bundle\LayoutBundle\Assetic\LayoutFormulaLoader
+    oro_layout.assetic.layout_resource.class:           Oro\Bundle\LayoutBundle\Assetic\LayoutResource
 
 services:
     oro_layout.extension:
@@ -133,3 +135,15 @@ services:
         class: Oro\Bundle\LayoutBundle\Layout\Encoder\JsonConfigExpressionEncoder
         tags:
             - { name: oro_layout.expression.encoder, format: json }
+
+    oro_layout.assetic.layout_formula_loader:
+        public: false
+        class: %oro_layout.assetic.layout_formula_loader.class%
+        tags:
+            - { name: assetic.formula_loader, alias: layout }
+
+    oro_layout.assetic.layout_resource:
+        public: false
+        class: %oro_layout.assetic.layout_resource.class%
+        tags:
+            - { name: assetic.formula_resource, loader: layout }

From 79cbf4f6522713ce4e6a1259934140c8110d886b Mon Sep 17 00:00:00 2001
From: Oleksandr Nechyporenko <onechyporenko@magecore.com>
Date: Mon, 16 Nov 2015 12:15:39 +0200
Subject: [PATCH 031/471] BB-1532: Dump layout styles in css  - rename options
 "styles" to  "inputs"  - dump layout styles in one file

---
 .../LayoutBundle/Assetic/LayoutResource.php   | 72 ++++++++++++++++++-
 .../Layout/Block/Type/StylesheetsType.php     | 40 +++++++++--
 .../Resources/config/services.yml             |  3 +
 .../views/Layout/div_layout.html.twig         |  4 +-
 4 files changed, 110 insertions(+), 9 deletions(-)

diff --git a/src/Oro/Bundle/LayoutBundle/Assetic/LayoutResource.php b/src/Oro/Bundle/LayoutBundle/Assetic/LayoutResource.php
index b5115d59fab..fe55c711300 100644
--- a/src/Oro/Bundle/LayoutBundle/Assetic/LayoutResource.php
+++ b/src/Oro/Bundle/LayoutBundle/Assetic/LayoutResource.php
@@ -4,8 +4,28 @@
 
 use Assetic\Factory\Resource\ResourceInterface;
 
+use Oro\Bundle\LayoutBundle\Layout\Block\Type\StylesheetsType;
+use Oro\Component\Layout\Layout;
+use Oro\Component\Layout\BlockView;
+use Oro\Component\Layout\LayoutManager;
+use Oro\Component\Layout\LayoutContext;
+use Oro\Component\Layout\Extension\Theme\Model\ThemeManager;
+use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException;
+
 class LayoutResource implements ResourceInterface
 {
+    /** @var ThemeManager */
+    protected $themeManager;
+
+    /** @var LayoutManager $layoutManager */
+    protected $layoutManager;
+
+    public function __construct(ThemeManager $themeManager, LayoutManager $layoutManager)
+    {
+        $this->themeManager = $themeManager;
+        $this->layoutManager = $layoutManager;
+    }
+
     public function isFresh($timestamp)
     {
         return true;
@@ -13,7 +33,57 @@ public function isFresh($timestamp)
 
     public function getContent()
     {
-        return [];
+        $formulae = [];
+        $themes = $this->themeManager->getThemeNames();
+        foreach ($themes as $theme) {
+            $layout = $this->getLayout($theme);
+            if ($layout) {
+                $formulae += $this->collectViewStylesheets($theme, $layout->getView());
+            }
+        }
+        return $formulae;
+    }
+
+    /**
+     * @param string $theme
+     * @return Layout
+     */
+    protected function getLayout($theme)
+    {
+        $builder = $this->layoutManager->getLayoutBuilder();
+        $builder->add('root', null, 'root');
+
+        $context = new LayoutContext();
+        $context->set('theme', $theme);
+
+        try {
+            $layout = $builder->getLayout($context);
+        } catch (NoSuchPropertyException $ex) {
+            $ex;
+            $layout = null;
+        }
+
+        return $layout;
+    }
+
+    protected function collectViewStylesheets($theme, BlockView $view, $formulae = [])
+    {
+        if ($view->vars['block_type'] === StylesheetsType::NAME) {
+            $name = 'layout_' . $theme . $view->vars['cache_key'];
+            $formulae[$name] = [
+                $view->vars['inputs'],
+                $view->vars['filters'],
+                [
+                    'output' => $view->vars['output'],
+                    'name' => $name,
+                ],
+            ];
+        } else {
+            foreach ($view as $childView) {
+                $formulae = $this->collectViewStylesheets($theme, $childView, $formulae);
+            }
+        }
+        return $formulae;
     }
 
     public function __toString()
diff --git a/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/StylesheetsType.php b/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/StylesheetsType.php
index 4815520f3aa..109b669b399 100644
--- a/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/StylesheetsType.php
+++ b/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/StylesheetsType.php
@@ -19,7 +19,25 @@ class StylesheetsType extends AbstractType
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setRequired(['styles']);
+        $resolver->setRequired(
+            [
+                'inputs'
+            ]
+        );
+        $resolver->setDefaults(
+            [
+                'filters' => [
+                    'cssrewrite',
+                    'lessphp',
+                    'cssmin',
+                ],
+                'output' => null,
+            ]
+        );
+
+        $resolver->setAllowedTypes('inputs', ['array', 'Oro\Component\Layout\OptionValueBag']);
+        $resolver->setAllowedTypes('filters', ['array', 'Oro\Component\Layout\OptionValueBag']);
+        $resolver->setAllowedTypes('output', ['null', 'string']);
     }
 
     /**
@@ -27,12 +45,24 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
      */
     public function finishView(BlockView $view, BlockInterface $block, array $options)
     {
-        $styles = $block->getOptions()['styles'];
-        if ($styles instanceof OptionValueBag) {
-            $styles = $styles->buildValue(new ArrayOptionValueBuilder());
+        $theme = $block->getContext()->get('theme');
+        
+        $inputs = $block->getOptions()['inputs'];
+        if ($inputs instanceof OptionValueBag) {
+            $inputs = $inputs->buildValue(new ArrayOptionValueBuilder());
+        }
+        $view->vars['inputs'] = $inputs;
+
+        $filters = $block->getOptions()['filters'];
+        if ($filters instanceof OptionValueBag) {
+            $filters = $filters->buildValue(new ArrayOptionValueBuilder());
         }
+        $view->vars['filters'] = $filters;
 
-        $view->vars['styles'] = $styles;
+        $view->vars['output'] = $block->getOptions()['output'];
+        if (!$view->vars['output']) {
+            $view->vars['output'] = 'css/layout/'.$theme.'/'.$view->vars['cache_key'].'.css';
+        }
     }
 
     /**
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/config/services.yml b/src/Oro/Bundle/LayoutBundle/Resources/config/services.yml
index e1048a93c6a..dad44a3ee7e 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/LayoutBundle/Resources/config/services.yml
@@ -145,5 +145,8 @@ services:
     oro_layout.assetic.layout_resource:
         public: false
         class: %oro_layout.assetic.layout_resource.class%
+        arguments:
+            - @oro_layout.theme_manager
+            - @oro_layout.layout_manager
         tags:
             - { name: assetic.formula_resource, loader: layout }
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
index 94a826621c8..eafb9e0daac 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
+++ b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
@@ -58,9 +58,7 @@
 {% endblock %}
 
 {% block stylesheets_widget %}
-    {% for style in styles %}
-        <link rel="stylesheet" href="{{ style }}" />
-    {% endfor %}
+    <link rel="stylesheet" href="{{ asset(output)}}" />
 {% endblock %}
 
 {% block style_widget %}

From a1aee92eb41b002d42bbfcd9561f9105c27e42cb Mon Sep 17 00:00:00 2001
From: Ivan Shakuta <ishakuta@gmail.com>
Date: Mon, 16 Nov 2015 14:02:05 +0200
Subject: [PATCH 032/471] Fix typo in select2-entity-field-choice-component -
 fix typo

---
 .../components/select2-entity-field-choice-component.js  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Oro/Bundle/EntityBundle/Resources/public/js/components/select2-entity-field-choice-component.js b/src/Oro/Bundle/EntityBundle/Resources/public/js/components/select2-entity-field-choice-component.js
index c2db68fe60b..160303cc003 100644
--- a/src/Oro/Bundle/EntityBundle/Resources/public/js/components/select2-entity-field-choice-component.js
+++ b/src/Oro/Bundle/EntityBundle/Resources/public/js/components/select2-entity-field-choice-component.js
@@ -1,15 +1,16 @@
 define(function(require) {
     'use strict';
 
-    var Select2EntityFieldChoiseComponent;
+    var Select2EntityFieldChoiceComponent;
     var EntityFieldUtil = require('oroentity/js/entity-field-choice-util');
     var Select2EntityFieldComponent = require('oro/select2-entity-field-component');
 
-    Select2EntityFieldChoiseComponent = Select2EntityFieldComponent.extend({
+    Select2EntityFieldChoiceComponent = Select2EntityFieldComponent.extend({
         initialize: function(options) {
             this.util = new EntityFieldUtil(options._sourceElement);
-            Select2EntityFieldChoiseComponent.__super__.initialize.call(this, options);
+            Select2EntityFieldChoiceComponent.__super__.initialize.call(this, options);
         }
     });
-    return Select2EntityFieldChoiseComponent;
+
+    return Select2EntityFieldChoiceComponent;
 });

From 0f695568409b56ce9dd1741b4d2ecf0c2fb16ef6 Mon Sep 17 00:00:00 2001
From: Oleksandr Nechyporenko <onechyporenko@magecore.com>
Date: Tue, 17 Nov 2015 15:53:49 +0200
Subject: [PATCH 033/471] BB-1582: Move theme info file to theme folder  - move
 layout theme definition to theme folder

---
 UPGRADE-1.9.md                                |  4 ++
 .../layouts/embedded_default/theme.yml}       |  0
 .../OroLayoutExtension.php                    | 44 +++++++++++++++++--
 .../LayoutBundle/Resources/doc/quick_start.md |  3 +-
 .../Resources/doc/theme_definition.md         | 13 +++++-
 .../OroLayoutExtensionTest.php                | 11 +++--
 .../Resources/views/layouts/base/theme.yml    |  4 ++
 7 files changed, 69 insertions(+), 10 deletions(-)
 rename src/Oro/Bundle/EmbeddedFormBundle/Resources/{config/oro/layout.yml => views/layouts/embedded_default/theme.yml} (100%)
 create mode 100644 src/Oro/Bundle/LayoutBundle/Tests/Unit/Stubs/Bundles/TestBundle/Resources/views/layouts/base/theme.yml

diff --git a/UPGRADE-1.9.md b/UPGRADE-1.9.md
index b42256e5a31..f5209c8df4d 100644
--- a/UPGRADE-1.9.md
+++ b/UPGRADE-1.9.md
@@ -49,6 +49,10 @@ UPGRADE FROM 1.8 to 1.9
 ####FormBundle
 - Add new form type: `oro_autocomplete`. See [text_autocomplete_form_type.md](./src/Oro/Bundle/FormBundle/Resources/doc/reference/text_autocomplete_form_type.md) for more detailed info.
 
+####LayoutBundle
+- The theme definition should be placed at theme folder and named `theme.yml`, for example `DemoBundle/Resources/views/layouts/first_theme/theme.yml`
+- Deprecated method: placed at `Resources/config/oro/` and named `layout.yml`, for example `DemoBundle/Resources/config/oro/layout.yml`
+
 ####SecurityBundle
 - `Oro\Bundle\SecurityBundle\Owner\OwnerTreeInterface` is changed. New method `buildTree` added (due to performance issues). It should be called once after all `addDeepEntity` calls. See [OwnerTreeProvider](./src/Oro/Bundle/SecurityBundle/Owner/OwnerTreeProvider.php) method `fillTree`. Implementation example [OwnerTree](./src/Oro/Bundle/SecurityBundle/Owner/OwnerTree.php).
 - Bundle now contains part of Symfony security configuration (ACL configuration and access decision manager strategy)
diff --git a/src/Oro/Bundle/EmbeddedFormBundle/Resources/config/oro/layout.yml b/src/Oro/Bundle/EmbeddedFormBundle/Resources/views/layouts/embedded_default/theme.yml
similarity index 100%
rename from src/Oro/Bundle/EmbeddedFormBundle/Resources/config/oro/layout.yml
rename to src/Oro/Bundle/EmbeddedFormBundle/Resources/views/layouts/embedded_default/theme.yml
diff --git a/src/Oro/Bundle/LayoutBundle/DependencyInjection/OroLayoutExtension.php b/src/Oro/Bundle/LayoutBundle/DependencyInjection/OroLayoutExtension.php
index 3b57865e4b0..237b35efb10 100644
--- a/src/Oro/Bundle/LayoutBundle/DependencyInjection/OroLayoutExtension.php
+++ b/src/Oro/Bundle/LayoutBundle/DependencyInjection/OroLayoutExtension.php
@@ -10,6 +10,7 @@
 use Oro\Component\Config\Loader\CumulativeConfigLoader;
 use Oro\Component\Config\Loader\YamlCumulativeFileLoader;
 use Oro\Component\Config\Loader\FolderContentCumulativeLoader;
+use Oro\Component\Config\Loader\FolderingCumulativeFileLoader;
 
 class OroLayoutExtension extends Extension
 {
@@ -23,10 +24,19 @@ public function load(array $configs, ContainerBuilder $container)
     {
         $configLoader = new CumulativeConfigLoader(
             'oro_layout',
-            new YamlCumulativeFileLoader('Resources/config/oro/layout.yml')
+            [
+                new FolderingCumulativeFileLoader(
+                    '{folder}',
+                    '\w+',
+                    new YamlCumulativeFileLoader('Resources/views/layouts/{folder}/theme.yml')
+                ),
+                new YamlCumulativeFileLoader('Resources/config/oro/layout.yml')
+            ]
         );
-        $resources    = $configLoader->load($container);
-        foreach ($resources as $resource) {
+        $themesResources    = $configLoader->load($container);
+        $existThemePaths = [];
+        foreach ($themesResources as $resource) {
+            $existThemePaths[$resource->path] = true;
             $configs[] = $resource->data['oro_layout'];
         }
 
@@ -94,9 +104,35 @@ public function load(array $configs, ContainerBuilder $container)
              *    ]
              * ]
              */
-            $foundThemeLayoutUpdates = array_merge_recursive($foundThemeLayoutUpdates, $resource->data);
+            $foundThemeLayoutUpdates = array_merge_recursive(
+                $foundThemeLayoutUpdates,
+                $this->filterThemeLayoutUpdates($existThemePaths, $resource->data)
+            );
         }
 
         $container->setParameter('oro_layout.theme_updates_resources', $foundThemeLayoutUpdates);
     }
+
+    /**
+     * @param array $existThemePaths
+     * @param array $themes
+     * @return array
+     */
+    protected function filterThemeLayoutUpdates($existThemePaths, array $themes)
+    {
+        foreach ($themes as $theme => $themePaths) {
+            foreach ($themePaths as $pathIndex => $path) {
+                if (is_string($path) && isset($existThemePaths[$path])) {
+                    unset($themePaths[$pathIndex]);
+                }
+            }
+            if (empty($themePaths)) {
+                unset($themes[$theme]);
+            } else {
+                $themes[$theme] = $themePaths;
+            }
+        }
+
+        return $themes;
+    }
 }
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/doc/quick_start.md b/src/Oro/Bundle/LayoutBundle/Resources/doc/quick_start.md
index 30e2d20ccc6..4eb08725708 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/doc/quick_start.md
+++ b/src/Oro/Bundle/LayoutBundle/Resources/doc/quick_start.md
@@ -6,7 +6,8 @@ The following examples may help to start using layouts in your application.
 Create the layout theme
 -----------------------
 
-The theme definition should be placed at `Resources/config/oro/` and named `layout.yml`, for example `DemoBundle/Resources/config/oro/layout.yml`:
+The theme definition should be placed at theme folder and named `theme.yml`, for example `DemoBundle/Resources/views/layouts/first_theme/theme.yml`
+Deprecated method: placed at `Resources/config/oro/` and named `layout.yml`, for example `DemoBundle/Resources/config/oro/layout.yml`
 
 ```yaml
 oro_layout:
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/doc/theme_definition.md b/src/Oro/Bundle/LayoutBundle/Resources/doc/theme_definition.md
index 74bce92d903..ab6ccd885a2 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/doc/theme_definition.md
+++ b/src/Oro/Bundle/LayoutBundle/Resources/doc/theme_definition.md
@@ -8,7 +8,8 @@ Basically, think of a **theme** as a skin for your application. Files, that the
 
 ## Configuration
 
-The configuration file should be placed at `Resources/config/oro/` and named `layout.yml`.
+The configuration file should be placed at theme folder and named `theme.yml`, for example `DemoBundle/Resources/views/layouts/first_theme/theme.yml`
+Deprecated method: placed at `Resources/config/oro/` and named `layout.yml`, for example `DemoBundle/Resources/config/oro/layout.yml`
 
 ### Themes configuration reference
 
@@ -27,7 +28,7 @@ You can find additional information if you execute the `app/console config:dump-
 **Example:**
 
 ```yaml
-# src/Acme/Bundle/DemoBundle/Resources/config/oro/layout.yml
+# src/Acme/Bundle/DemoBundle/Resources/views/layouts/base/theme.yml
 
 oro_layout:
     themes:
@@ -37,6 +38,10 @@ oro_layout:
             label:  ~ # this is a "hidden" theme
             groups: [ main ]
 
+# src/Acme/Bundle/DemoBundle/Resources/views/layouts/oro/theme.yml
+
+oro_layout:
+    themes:
         oro:
             # Default layout theme for the Oro Platform
             label:  Oro Theme
@@ -44,6 +49,10 @@ oro_layout:
             parent: base
             groups: [ main ]
 
+# src/Acme/Bundle/DemoBundle/Resources/views/layouts/oro-gold/theme.yml
+
+oro_layout:
+    themes:
         oro-gold:
             label:          Nice ORO gold theme
             directory:      OroGold
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/DependencyInjection/OroLayoutExtensionTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/DependencyInjection/OroLayoutExtensionTest.php
index 43c6752449f..74655866e4b 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/DependencyInjection/OroLayoutExtensionTest.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/DependencyInjection/OroLayoutExtensionTest.php
@@ -204,9 +204,14 @@ public function testLoadWithBundleThemesConfig()
         $extension = new OroLayoutExtension();
         $extension->load([], $container);
 
-        $expectedResult = ['base', 'oro-black'];
-        $result         = $container->get(OroLayoutExtension::THEME_MANAGER_SERVICE_ID)->getThemeNames();
-        $this->assertSame(sort($expectedResult), sort($result));
+        $expectedThemeNames = ['base', 'oro-black'];
+
+        $themes = $container->get(OroLayoutExtension::THEME_MANAGER_SERVICE_ID)->getAllThemes();
+        $themeNames = $container->get(OroLayoutExtension::THEME_MANAGER_SERVICE_ID)->getThemeNames();
+
+        $this->assertSame(sort($expectedThemeNames), sort($themeNames));
+        $this->assertSame('Oro Black theme', $themes['oro-black']->getLabel());
+        $this->assertSame('Oro Black theme description', $themes['oro-black']->getDescription());
     }
 
     public function testLoadingLayoutUpdates()
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Stubs/Bundles/TestBundle/Resources/views/layouts/base/theme.yml b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Stubs/Bundles/TestBundle/Resources/views/layouts/base/theme.yml
new file mode 100644
index 00000000000..61b85a00112
--- /dev/null
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Stubs/Bundles/TestBundle/Resources/views/layouts/base/theme.yml
@@ -0,0 +1,4 @@
+oro_layout:
+    themes:
+        oro-black:
+            description: Oro Black theme description

From 94fcf7a79ee4675168debd0acb643c3da67616a9 Mon Sep 17 00:00:00 2001
From: Oleksandr Nechyporenko <onechyporenko@magecore.com>
Date: Tue, 17 Nov 2015 17:00:33 +0200
Subject: [PATCH 034/471] BB-1582: Move theme info file to theme folder  -
 remove unnecessary information from theme config

---
 .../views/layouts/embedded_default/theme.yml  |  7 ++----
 .../OroLayoutExtension.php                    | 25 ++++++++++++++++---
 .../Resources/views/layouts/base/theme.yml    |  4 ---
 .../views/layouts/oro-black/theme.yml         |  1 +
 4 files changed, 25 insertions(+), 12 deletions(-)
 delete mode 100644 src/Oro/Bundle/LayoutBundle/Tests/Unit/Stubs/Bundles/TestBundle/Resources/views/layouts/base/theme.yml
 create mode 100644 src/Oro/Bundle/LayoutBundle/Tests/Unit/Stubs/Bundles/TestBundle/Resources/views/layouts/oro-black/theme.yml

diff --git a/src/Oro/Bundle/EmbeddedFormBundle/Resources/views/layouts/embedded_default/theme.yml b/src/Oro/Bundle/EmbeddedFormBundle/Resources/views/layouts/embedded_default/theme.yml
index fc3c643e37b..0824e79e6a4 100644
--- a/src/Oro/Bundle/EmbeddedFormBundle/Resources/views/layouts/embedded_default/theme.yml
+++ b/src/Oro/Bundle/EmbeddedFormBundle/Resources/views/layouts/embedded_default/theme.yml
@@ -1,5 +1,2 @@
-oro_layout:
-    themes:
-        embedded_default:
-            label:   Default theme for embedded forms
-            groups:  [ embedded_forms ]
+label:   Default theme for embedded forms
+groups:  [ embedded_forms ]
diff --git a/src/Oro/Bundle/LayoutBundle/DependencyInjection/OroLayoutExtension.php b/src/Oro/Bundle/LayoutBundle/DependencyInjection/OroLayoutExtension.php
index 237b35efb10..d18863341df 100644
--- a/src/Oro/Bundle/LayoutBundle/DependencyInjection/OroLayoutExtension.php
+++ b/src/Oro/Bundle/LayoutBundle/DependencyInjection/OroLayoutExtension.php
@@ -7,6 +7,7 @@
 use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
+use Oro\Component\Config\CumulativeResourceInfo;
 use Oro\Component\Config\Loader\CumulativeConfigLoader;
 use Oro\Component\Config\Loader\YamlCumulativeFileLoader;
 use Oro\Component\Config\Loader\FolderContentCumulativeLoader;
@@ -27,7 +28,7 @@ public function load(array $configs, ContainerBuilder $container)
             [
                 new FolderingCumulativeFileLoader(
                     '{folder}',
-                    '\w+',
+                    '[a-zA-Z][a-zA-Z0-9_\-:]*',
                     new YamlCumulativeFileLoader('Resources/views/layouts/{folder}/theme.yml')
                 ),
                 new YamlCumulativeFileLoader('Resources/config/oro/layout.yml')
@@ -37,7 +38,7 @@ public function load(array $configs, ContainerBuilder $container)
         $existThemePaths = [];
         foreach ($themesResources as $resource) {
             $existThemePaths[$resource->path] = true;
-            $configs[] = $resource->data['oro_layout'];
+            $configs[] = $this->getThemeConfig($resource);
         }
 
         $configuration = new Configuration();
@@ -118,7 +119,7 @@ public function load(array $configs, ContainerBuilder $container)
      * @param array $themes
      * @return array
      */
-    protected function filterThemeLayoutUpdates($existThemePaths, array $themes)
+    protected function filterThemeLayoutUpdates(array $existThemePaths, array $themes)
     {
         foreach ($themes as $theme => $themePaths) {
             foreach ($themePaths as $pathIndex => $path) {
@@ -135,4 +136,22 @@ protected function filterThemeLayoutUpdates($existThemePaths, array $themes)
 
         return $themes;
     }
+
+    /**
+     * @param CumulativeResourceInfo $resource
+     * @return array
+     */
+    protected function getThemeConfig(CumulativeResourceInfo $resource)
+    {
+        if ($resource->name === 'layout') {
+            return $resource->data['oro_layout'];
+        } else {
+            $themeName = basename(dirname($resource->path));
+            return [
+                'themes' => [
+                    $themeName => $resource->data
+                ]
+            ];
+        }
+    }
 }
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Stubs/Bundles/TestBundle/Resources/views/layouts/base/theme.yml b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Stubs/Bundles/TestBundle/Resources/views/layouts/base/theme.yml
deleted file mode 100644
index 61b85a00112..00000000000
--- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Stubs/Bundles/TestBundle/Resources/views/layouts/base/theme.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-oro_layout:
-    themes:
-        oro-black:
-            description: Oro Black theme description
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Stubs/Bundles/TestBundle/Resources/views/layouts/oro-black/theme.yml b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Stubs/Bundles/TestBundle/Resources/views/layouts/oro-black/theme.yml
new file mode 100644
index 00000000000..8ea6f7f8f7c
--- /dev/null
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Stubs/Bundles/TestBundle/Resources/views/layouts/oro-black/theme.yml
@@ -0,0 +1 @@
+description: Oro Black theme description

From ce9b7f9b267e1806f8d3990f8ca05187928c51cc Mon Sep 17 00:00:00 2001
From: Oleksandr Nechyporenko <onechyporenko@magecore.com>
Date: Tue, 17 Nov 2015 17:02:59 +0200
Subject: [PATCH 035/471] BB-1582: Move theme info file to theme folder  -
 update docs

---
 .../LayoutBundle/Resources/doc/quick_start.md |  8 ++++-
 .../Resources/doc/theme_definition.md         | 36 +++++++------------
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/Oro/Bundle/LayoutBundle/Resources/doc/quick_start.md b/src/Oro/Bundle/LayoutBundle/Resources/doc/quick_start.md
index 4eb08725708..852e6b39141 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/doc/quick_start.md
+++ b/src/Oro/Bundle/LayoutBundle/Resources/doc/quick_start.md
@@ -7,9 +7,15 @@ Create the layout theme
 -----------------------
 
 The theme definition should be placed at theme folder and named `theme.yml`, for example `DemoBundle/Resources/views/layouts/first_theme/theme.yml`
-Deprecated method: placed at `Resources/config/oro/` and named `layout.yml`, for example `DemoBundle/Resources/config/oro/layout.yml`
+Deprecated method: placed  `Resources/config/oro/` and named `layout.yml`, for example `DemoBundle/Resources/config/oro/layout.yml`:
 
 ```yaml
+#DemoBundle/Resources/views/layouts/first_theme/theme.yml
+label:  Test Theme
+icon:   bundles/demo/images/favicon.ico
+groups: [ main ]
+
+#DemoBundle/Resources/config/oro/layout.yml
 oro_layout:
     themes:
         first_theme:
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/doc/theme_definition.md b/src/Oro/Bundle/LayoutBundle/Resources/doc/theme_definition.md
index ab6ccd885a2..38b88b484e0 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/doc/theme_definition.md
+++ b/src/Oro/Bundle/LayoutBundle/Resources/doc/theme_definition.md
@@ -29,34 +29,22 @@ You can find additional information if you execute the `app/console config:dump-
 
 ```yaml
 # src/Acme/Bundle/DemoBundle/Resources/views/layouts/base/theme.yml
-
-oro_layout:
-    themes:
-        base:
-            # The layout theme that is used to add the page content and common page elements
-            # for all themes in "main" group
-            label:  ~ # this is a "hidden" theme
-            groups: [ main ]
+# The layout theme that is used to add the page content and common page elements
+# for all themes in "main" group
+label:  ~ # this is a "hidden" theme
+groups: [ main ]
 
 # src/Acme/Bundle/DemoBundle/Resources/views/layouts/oro/theme.yml
-
-oro_layout:
-    themes:
-        oro:
-            # Default layout theme for the Oro Platform
-            label:  Oro Theme
-            icon:   bundles/oroui/themes/oro/images/favicon.ico
-            parent: base
-            groups: [ main ]
+# Default layout theme for the Oro Platform
+label:  Oro Theme
+icon:   bundles/oroui/themes/oro/images/favicon.ico
+parent: base
+groups: [ main ]
 
 # src/Acme/Bundle/DemoBundle/Resources/views/layouts/oro-gold/theme.yml
-
-oro_layout:
-    themes:
-        oro-gold:
-            label:          Nice ORO gold theme
-            directory:      OroGold
-            parent:         oro
+label:          Nice ORO gold theme
+directory:      OroGold
+parent:         oro
 ```
 
 Where `base`, `oro` and `oro-gold` are unique theme identifiers.

From 2572d8e21bb17a76edde21096e985e4bc5433c6b Mon Sep 17 00:00:00 2001
From: Oleksandr Nechyporenko <onechyporenko@magecore.com>
Date: Tue, 17 Nov 2015 17:57:29 +0200
Subject: [PATCH 036/471] BB-1582: Move theme info file to theme folder  -
 update docs

---
 src/Oro/Bundle/LayoutBundle/Resources/doc/theme_definition.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Oro/Bundle/LayoutBundle/Resources/doc/theme_definition.md b/src/Oro/Bundle/LayoutBundle/Resources/doc/theme_definition.md
index 38b88b484e0..0d9f36d59e2 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/doc/theme_definition.md
+++ b/src/Oro/Bundle/LayoutBundle/Resources/doc/theme_definition.md
@@ -10,6 +10,7 @@ Basically, think of a **theme** as a skin for your application. Files, that the
 
 The configuration file should be placed at theme folder and named `theme.yml`, for example `DemoBundle/Resources/views/layouts/first_theme/theme.yml`
 Deprecated method: placed at `Resources/config/oro/` and named `layout.yml`, for example `DemoBundle/Resources/config/oro/layout.yml`
+Theme folder(name) must match [a-zA-Z][a-zA-Z0-9_\-:]* expression.
 
 ### Themes configuration reference
 

From 983d4addf9e38d51b9e64d0c377ad5304f839f87 Mon Sep 17 00:00:00 2001
From: Andrey Yatsenco <yatsenco@gmail.com>
Date: Tue, 17 Nov 2015 18:06:37 +0200
Subject: [PATCH 037/471] BB-1533: Create form template for new theme and apply
 - added setFormTheme method to all Layout building related classes -
 overrided symfony form renderer engines to provide posibility to change
 defaultThemes set during application run

---
 .../Compiler/OverrideServiceCompilerPass.php  | 43 +++++++++++++++++
 .../TemplatingRendererEngine.php              | 23 ++++++++++
 .../RendererEngine/TwigRendererEngine.php     | 23 ++++++++++
 .../Layout/TwigLayoutRenderer.php             | 13 ++++--
 .../Bundle/LayoutBundle/OroLayoutBundle.php   |  2 +
 .../Resources/config/php_renderer.yml         |  8 ++++
 .../Resources/config/twig_renderer.yml        |  6 +++
 .../OverrideServiceCompilerPassTest.php       | 46 +++++++++++++++++++
 .../RendererEngine/RendererEngineTest.php     | 34 ++++++++++++++
 .../TemplatingRendererEngineTest.php          | 19 ++++++++
 .../RendererEngine/TwigRendererEngineTest.php | 16 +++++++
 .../Unit/Layout/TwigLayoutRendererTest.php    |  3 +-
 .../Layout/DeferredLayoutManipulator.php      | 17 +++++++
 .../DeferredLayoutManipulatorInterface.php    |  9 ++++
 .../FormRendererEngineInterface.php           | 19 ++++++++
 src/Oro/Component/Layout/Layout.php           | 19 ++++++++
 src/Oro/Component/Layout/LayoutBuilder.php    | 12 +++++
 .../Layout/LayoutBuilderInterface.php         |  9 ++++
 .../Layout/LayoutManipulatorInterface.php     |  9 ++++
 src/Oro/Component/Layout/LayoutRenderer.php   | 17 ++++++-
 .../Layout/LayoutRendererInterface.php        |  7 +++
 src/Oro/Component/Layout/RawLayout.php        | 38 +++++++++++++++
 src/Oro/Component/Layout/RawLayoutBuilder.php | 10 ++++
 .../Layout/RawLayoutBuilderInterface.php      |  9 ++++
 .../Layout/Templating/Helper/LayoutHelper.php | 29 ++++++++++--
 .../Unit/DeferredLayoutManipulatorTest.php    | 15 ++++++
 .../Layout/Tests/Unit/LayoutBuilderTest.php   | 25 +++++++++-
 .../Layout/Tests/Unit/LayoutRendererTest.php  | 18 +++++++-
 .../Layout/Tests/Unit/LayoutTest.php          | 12 +++++
 .../Layout/Tests/Unit/RawLayoutTest.php       | 24 ++++++++++
 .../Templating/Helper/LayoutHelperTest.php    | 19 +++++++-
 31 files changed, 539 insertions(+), 14 deletions(-)
 create mode 100644 src/Oro/Bundle/LayoutBundle/DependencyInjection/Compiler/OverrideServiceCompilerPass.php
 create mode 100644 src/Oro/Bundle/LayoutBundle/Form/RendererEngine/TemplatingRendererEngine.php
 create mode 100644 src/Oro/Bundle/LayoutBundle/Form/RendererEngine/TwigRendererEngine.php
 create mode 100644 src/Oro/Bundle/LayoutBundle/Tests/Unit/DependencyInjection/Compiler/OverrideServiceCompilerPassTest.php
 create mode 100644 src/Oro/Bundle/LayoutBundle/Tests/Unit/Form/RendererEngine/RendererEngineTest.php
 create mode 100644 src/Oro/Bundle/LayoutBundle/Tests/Unit/Form/RendererEngine/TemplatingRendererEngineTest.php
 create mode 100644 src/Oro/Bundle/LayoutBundle/Tests/Unit/Form/RendererEngine/TwigRendererEngineTest.php
 create mode 100644 src/Oro/Component/Layout/Form/RendererEngine/FormRendererEngineInterface.php

diff --git a/src/Oro/Bundle/LayoutBundle/DependencyInjection/Compiler/OverrideServiceCompilerPass.php b/src/Oro/Bundle/LayoutBundle/DependencyInjection/Compiler/OverrideServiceCompilerPass.php
new file mode 100644
index 00000000000..de6b8b84d02
--- /dev/null
+++ b/src/Oro/Bundle/LayoutBundle/DependencyInjection/Compiler/OverrideServiceCompilerPass.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Oro\Bundle\LayoutBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class OverrideServiceCompilerPass implements CompilerPassInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        $this->changeService(
+            $container,
+            'twig.form.engine',
+            'oro_layout.twig.form.engine'
+        );
+
+        $this->changeService(
+            $container,
+            'templating.form.engine',
+            'oro_layout.php.templating.form.engine'
+        );
+    }
+
+    /**
+     * @param ContainerBuilder $container
+     * @param string $serviceName
+     * @param string $newServiceName
+     */
+    private function changeService(ContainerBuilder $container, $serviceName, $newServiceName)
+    {
+        $service = $container->getDefinition($serviceName);
+        $newService = $container->getDefinition($newServiceName);
+
+        if ($service && $newService) {
+            $container->removeDefinition($serviceName);
+            $container->setDefinition($serviceName, $newService);
+        }
+    }
+}
diff --git a/src/Oro/Bundle/LayoutBundle/Form/RendererEngine/TemplatingRendererEngine.php b/src/Oro/Bundle/LayoutBundle/Form/RendererEngine/TemplatingRendererEngine.php
new file mode 100644
index 00000000000..7a2a2c4b060
--- /dev/null
+++ b/src/Oro/Bundle/LayoutBundle/Form/RendererEngine/TemplatingRendererEngine.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Oro\Bundle\LayoutBundle\Form\RendererEngine;
+
+use Symfony\Component\Form\Extension\Templating\TemplatingRendererEngine as BaseEngine;
+
+use Oro\Component\Layout\Form\RendererEngine\FormRendererEngineInterface;
+
+/**
+ * Extends Templating Renderer Engine to add possibility for changing default themes after container was locked
+ */
+class TemplatingRendererEngine extends BaseEngine implements FormRendererEngineInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function addDefaultThemes($themes)
+    {
+        $themes = is_array($themes) ? $themes : [$themes];
+
+        $this->defaultThemes = array_merge($this->defaultThemes, $themes);
+    }
+}
diff --git a/src/Oro/Bundle/LayoutBundle/Form/RendererEngine/TwigRendererEngine.php b/src/Oro/Bundle/LayoutBundle/Form/RendererEngine/TwigRendererEngine.php
new file mode 100644
index 00000000000..a4332cfbbac
--- /dev/null
+++ b/src/Oro/Bundle/LayoutBundle/Form/RendererEngine/TwigRendererEngine.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Oro\Bundle\LayoutBundle\Form\RendererEngine;
+
+use Symfony\Bridge\Twig\Form\TwigRendererEngine as BaseEngine;
+
+use Oro\Component\Layout\Form\RendererEngine\FormRendererEngineInterface;
+
+/**
+ * Extends Twig Renderer Engine to add possibility for changing default themes after container was locked
+ */
+class TwigRendererEngine extends BaseEngine implements FormRendererEngineInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function addDefaultThemes($themes)
+    {
+        $themes = is_array($themes) ? $themes : [$themes];
+
+        $this->defaultThemes = array_merge($this->defaultThemes, $themes);
+    }
+}
diff --git a/src/Oro/Bundle/LayoutBundle/Layout/TwigLayoutRenderer.php b/src/Oro/Bundle/LayoutBundle/Layout/TwigLayoutRenderer.php
index b1be8bb5fa3..f99765b11e4 100644
--- a/src/Oro/Bundle/LayoutBundle/Layout/TwigLayoutRenderer.php
+++ b/src/Oro/Bundle/LayoutBundle/Layout/TwigLayoutRenderer.php
@@ -5,16 +5,21 @@
 use Symfony\Bridge\Twig\Form\TwigRendererInterface;
 
 use Oro\Component\Layout\LayoutRenderer;
+use Oro\Component\Layout\Form\RendererEngine\FormRendererEngineInterface;
 
 class TwigLayoutRenderer extends LayoutRenderer
 {
     /**
      * @param TwigRendererInterface $innerRenderer
-     * @param \Twig_Environment     $environment
+     * @param FormRendererEngineInterface $formRendererEngine
+     * @param \Twig_Environment $environment
      */
-    public function __construct(TwigRendererInterface $innerRenderer, \Twig_Environment $environment)
-    {
+    public function __construct(
+        TwigRendererInterface $innerRenderer,
+        FormRendererEngineInterface $formRendererEngine,
+        \Twig_Environment $environment
+    ) {
         $innerRenderer->setEnvironment($environment);
-        parent::__construct($innerRenderer);
+        parent::__construct($innerRenderer, $formRendererEngine);
     }
 }
diff --git a/src/Oro/Bundle/LayoutBundle/OroLayoutBundle.php b/src/Oro/Bundle/LayoutBundle/OroLayoutBundle.php
index d0b290d2f93..5c2ba6ce62a 100644
--- a/src/Oro/Bundle/LayoutBundle/OroLayoutBundle.php
+++ b/src/Oro/Bundle/LayoutBundle/OroLayoutBundle.php
@@ -8,6 +8,7 @@
 use Oro\Bundle\LayoutBundle\DependencyInjection\Compiler\ConfigurationPass;
 use Oro\Bundle\LayoutBundle\DependencyInjection\Compiler\ResourcePathProvidersPass;
 use Oro\Bundle\LayoutBundle\DependencyInjection\Compiler\ConfigExpressionCompilerPass;
+use Oro\Bundle\LayoutBundle\DependencyInjection\Compiler\OverrideServiceCompilerPass;
 
 class OroLayoutBundle extends Bundle
 {
@@ -21,5 +22,6 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new ConfigurationPass());
         $container->addCompilerPass(new ConfigExpressionCompilerPass());
         $container->addCompilerPass(new ResourcePathProvidersPass());
+        $container->addCompilerPass(new OverrideServiceCompilerPass());
     }
 }
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/config/php_renderer.yml b/src/Oro/Bundle/LayoutBundle/Resources/config/php_renderer.yml
index 7e136deed51..1d33c50a9ff 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/config/php_renderer.yml
+++ b/src/Oro/Bundle/LayoutBundle/Resources/config/php_renderer.yml
@@ -23,11 +23,19 @@ services:
         class: %oro_layout.php.layout_renderer.class%
         arguments:
             - @oro_layout.php.renderer
+            - @templating.form.engine
 
     oro_layout.php.templating.helper:
         class: %oro_layout.php.templating.helper.class%
         arguments:
             - @oro_layout.php.renderer
             - @oro_layout.text.helper
+            - @templating.form.engine
         tags:
              - { name: templating.helper, alias: layout }
+
+    oro_layout.php.templating.form.engine:
+        class: Oro\Bundle\LayoutBundle\Form\RendererEngine\TemplatingRendererEngine
+        arguments:
+            - @templating.engine.php
+            - %templating.helper.form.resources%
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/config/twig_renderer.yml b/src/Oro/Bundle/LayoutBundle/Resources/config/twig_renderer.yml
index 159e0a73f0d..c88f0413861 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/config/twig_renderer.yml
+++ b/src/Oro/Bundle/LayoutBundle/Resources/config/twig_renderer.yml
@@ -31,4 +31,10 @@ services:
         class: %oro_layout.twig.layout_renderer.class%
         arguments:
             - @oro_layout.twig.renderer
+            - @twig.form.engine
             - @twig
+
+    oro_layout.twig.form.engine:
+        class: Oro\Bundle\LayoutBundle\Form\RendererEngine\TwigRendererEngine
+        arguments:
+            - %twig.form.resources%
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/DependencyInjection/Compiler/OverrideServiceCompilerPassTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/DependencyInjection/Compiler/OverrideServiceCompilerPassTest.php
new file mode 100644
index 00000000000..6aa5b5afc3e
--- /dev/null
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/DependencyInjection/Compiler/OverrideServiceCompilerPassTest.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Oro\Bundle\LayoutBundle\Tests\Unit\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+use Oro\Bundle\LayoutBundle\DependencyInjection\Compiler\OverrideServiceCompilerPass;
+
+class OverrideServiceCompilerPassTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var OverrideServiceCompilerPass */
+    protected $pass;
+
+    protected function setUp()
+    {
+        $this->pass = new OverrideServiceCompilerPass();
+    }
+
+    protected function tearDown()
+    {
+        unset($this->pass);
+    }
+
+    public function testProcess()
+    {
+        $container = new ContainerBuilder();
+        $twigFormEngine = new Definition('\TwigFormEngineClass');
+        $container->setDefinition('twig.form.engine', $twigFormEngine);
+
+        $newTwigFormEngine = new Definition('\OroLayoutTwigFormEngineClass');
+        $container->setDefinition('oro_layout.twig.form.engine', $newTwigFormEngine);
+
+        $phpFormEngine = new Definition('\PhpFormEngineClass');
+        $container->setDefinition('templating.form.engine', $phpFormEngine);
+
+        $newPhpFormEngine = new Definition('\OroLayoutPhpFormEngineClass');
+        $container->setDefinition('oro_layout.php.templating.form.engine', $newPhpFormEngine);
+
+        $this->pass->process($container);
+
+        $this->assertEquals($newTwigFormEngine, $container->getDefinition('twig.form.engine'));
+        $this->assertEquals($newPhpFormEngine, $container->getDefinition('templating.form.engine'));
+    }
+}
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Form/RendererEngine/RendererEngineTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Form/RendererEngine/RendererEngineTest.php
new file mode 100644
index 00000000000..49c592d252a
--- /dev/null
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Form/RendererEngine/RendererEngineTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Oro\Bundle\LayoutBundle\Tests\Unit\Form\RendererEngine;
+
+use Oro\Component\Layout\Form\RendererEngine\FormRendererEngineInterface;
+
+abstract class RendererEngineTest extends \PHPUnit_Framework_TestCase
+{
+    public function testAddDefaultThemes()
+    {
+        $renderingEngine = $this->createRendererEngine();
+
+        $reflectionClass = new \ReflectionClass(get_class($renderingEngine));
+        $property = $reflectionClass->getProperty('defaultThemes');
+        $property->setAccessible(true);
+
+        $actual = $property->getValue($renderingEngine);
+        $this->assertNotContains('newThemePath', $actual);
+
+        $renderingEngine->addDefaultThemes('newThemePath');
+        $actual = $property->getValue($renderingEngine);
+        $this->assertContains('newThemePath', $actual);
+
+        $renderingEngine->addDefaultThemes(['newThemePath2', 'newThemePath3']);
+        $actual = $property->getValue($renderingEngine);
+        $this->assertContains('newThemePath2', $actual);
+        $this->assertContains('newThemePath3', $actual);
+    }
+
+    /**
+     * @return \Oro\Component\Layout\Form\RendererEngine\FormRendererEngineInterface
+     */
+    abstract public function createRendererEngine();
+}
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Form/RendererEngine/TemplatingRendererEngineTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Form/RendererEngine/TemplatingRendererEngineTest.php
new file mode 100644
index 00000000000..1797e9de97d
--- /dev/null
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Form/RendererEngine/TemplatingRendererEngineTest.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Oro\Bundle\LayoutBundle\Tests\Unit\Form\RendererEngine;
+
+use Oro\Bundle\LayoutBundle\Form\RendererEngine\TemplatingRendererEngine;
+
+class TemplatingRendererEngineTest extends RendererEngineTest
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function createRendererEngine()
+    {
+        /** @var \Symfony\Component\Templating\EngineInterface $templatingEngine */
+        $templatingEngine = $this->getMock('Symfony\Component\Templating\EngineInterface');
+
+        return new TemplatingRendererEngine($templatingEngine);
+    }
+}
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Form/RendererEngine/TwigRendererEngineTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Form/RendererEngine/TwigRendererEngineTest.php
new file mode 100644
index 00000000000..5f47013f90b
--- /dev/null
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Form/RendererEngine/TwigRendererEngineTest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Oro\Bundle\LayoutBundle\Tests\Unit\Form\RendererEngine;
+
+use Oro\Bundle\LayoutBundle\Form\RendererEngine\TwigRendererEngine;
+
+class TwigRendererEngineTest extends RendererEngineTest
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function createRendererEngine()
+    {
+        return new TwigRendererEngine();
+    }
+}
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/TwigLayoutRendererTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/TwigLayoutRendererTest.php
index 146a2a297a2..5cd6685f071 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/TwigLayoutRendererTest.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/TwigLayoutRendererTest.php
@@ -14,7 +14,8 @@ public function testEnvironmentSet()
         $innerRenderer->expects($this->once())
             ->method('setEnvironment')
             ->with($this->identicalTo($environment));
+        $formRenderer = $this->getMock('Oro\Component\Layout\Form\RendererEngine\FormRendererEngineInterface');
 
-        new TwigLayoutRenderer($innerRenderer, $environment);
+        new TwigLayoutRenderer($innerRenderer, $formRenderer, $environment);
     }
 }
diff --git a/src/Oro/Component/Layout/DeferredLayoutManipulator.php b/src/Oro/Component/Layout/DeferredLayoutManipulator.php
index a6c5956477f..576cb40cb4c 100644
--- a/src/Oro/Component/Layout/DeferredLayoutManipulator.php
+++ b/src/Oro/Component/Layout/DeferredLayoutManipulator.php
@@ -51,6 +51,9 @@ class DeferredLayoutManipulator implements DeferredLayoutManipulatorInterface
     /** The action name for add the theme(s) to be used for rendering the layout item and its children */
     const SET_BLOCK_THEME = 12;
 
+    /** The action name for add the form theme(s) to be used for rendering forms */
+    const SET_FORM_THEME = 13;
+
     /** @var LayoutRegistryInterface */
     protected $registry;
 
@@ -291,6 +294,20 @@ public function setBlockTheme($themes, $id = null)
         return $this;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function setFormTheme($themes)
+    {
+        $this->actions[self::GROUP_ADD][++$this->lastIndex] = [
+            self::SET_FORM_THEME,
+            __FUNCTION__,
+            [$themes]
+        ];
+
+        return $this;
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Oro/Component/Layout/DeferredLayoutManipulatorInterface.php b/src/Oro/Component/Layout/DeferredLayoutManipulatorInterface.php
index 03e102700dd..2f8867f4278 100644
--- a/src/Oro/Component/Layout/DeferredLayoutManipulatorInterface.php
+++ b/src/Oro/Component/Layout/DeferredLayoutManipulatorInterface.php
@@ -158,6 +158,15 @@ public function changeBlockType($id, $blockType, $optionsCallback = null);
      */
     public function setBlockTheme($themes, $id = null);
 
+    /**
+     * Sets the theme(s) to be used for rendering forms
+     *
+     * @param string|string[] $themes The theme(s). For example 'MyBundle:Layout:my_theme.html.twig'
+     *
+     * @return self
+     */
+    public function setFormTheme($themes);
+
     /**
      * Reverts the manipulator to the initial state
      *
diff --git a/src/Oro/Component/Layout/Form/RendererEngine/FormRendererEngineInterface.php b/src/Oro/Component/Layout/Form/RendererEngine/FormRendererEngineInterface.php
new file mode 100644
index 00000000000..321facf430b
--- /dev/null
+++ b/src/Oro/Component/Layout/Form/RendererEngine/FormRendererEngineInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Oro\Component\Layout\Form\RendererEngine;
+
+use Symfony\Component\Form\FormRendererEngineInterface as BaseFormRendererEngineInterfaceInterface;
+
+/**
+ * {@inheritdoc}
+ */
+interface FormRendererEngineInterface extends BaseFormRendererEngineInterfaceInterface
+{
+    /**
+     * Sets the theme(s) to be used for rendering a view and its children.
+     *
+     * @param string|string[] $themes The theme(s). The type of these themes
+     * is open to the implementation.
+     */
+    public function addDefaultThemes($themes);
+}
diff --git a/src/Oro/Component/Layout/Layout.php b/src/Oro/Component/Layout/Layout.php
index a2c476a3445..403e96a35b6 100644
--- a/src/Oro/Component/Layout/Layout.php
+++ b/src/Oro/Component/Layout/Layout.php
@@ -16,6 +16,9 @@ class Layout
     /** @var array */
     protected $themes = [];
 
+    /** @var array */
+    protected $formThemes = [];
+
     /**
      * @param BlockView                       $view
      * @param LayoutRendererRegistryInterface $rendererRegistry
@@ -45,6 +48,7 @@ public function render()
         foreach ($this->themes as $theme) {
             $renderer->setBlockTheme($theme[0], $theme[1]);
         }
+        $renderer->setFormTheme($this->formThemes);
 
         return $renderer->renderBlock($this->view);
     }
@@ -81,4 +85,19 @@ public function setBlockTheme($themes, $blockId = null)
 
         return $this;
     }
+
+    /**
+     * Sets the theme(s) to be used for rendering forms
+     *
+     * @param string|string[] $themes  The theme(s). For example 'MyBundle:Layout:my_theme.html.twig'
+     *
+     * @return self
+     */
+    public function setFormTheme($themes)
+    {
+        $themes = is_array($themes) ? $themes : [$themes];
+        $this->formThemes = array_merge($this->formThemes, $themes);
+
+        return $this;
+    }
 }
diff --git a/src/Oro/Component/Layout/LayoutBuilder.php b/src/Oro/Component/Layout/LayoutBuilder.php
index 00f7b1989e4..12a5ae6103c 100644
--- a/src/Oro/Component/Layout/LayoutBuilder.php
+++ b/src/Oro/Component/Layout/LayoutBuilder.php
@@ -166,6 +166,16 @@ public function setBlockTheme($themes, $id = null)
         return $this;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function setFormTheme($themes)
+    {
+        $this->layoutManipulator->setFormTheme($themes);
+
+        return $this;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -195,6 +205,8 @@ public function getLayout(ContextInterface $context, $rootId = null)
         foreach ($blockThemes as $blockId => $themes) {
             $layout->setBlockTheme($themes, $blockId !== $rootBlockId ? $blockId : null);
         }
+        $formThemes = $rawLayout->getFormThemes();
+        $layout->setFormTheme($formThemes);
 
         return $layout;
     }
diff --git a/src/Oro/Component/Layout/LayoutBuilderInterface.php b/src/Oro/Component/Layout/LayoutBuilderInterface.php
index d3f01eb01e4..5723ec1da62 100644
--- a/src/Oro/Component/Layout/LayoutBuilderInterface.php
+++ b/src/Oro/Component/Layout/LayoutBuilderInterface.php
@@ -159,6 +159,15 @@ public function changeBlockType($id, $blockType, $optionsCallback = null);
      */
     public function setBlockTheme($themes, $id = null);
 
+    /**
+     * Sets the theme(s) to be used for rendering forms
+     *
+     * @param string|string[] $themes The theme(s). For example 'MyBundle:Layout:my_theme.html.twig'
+     *
+     * @return self
+     */
+    public function setFormTheme($themes);
+
     /**
      * Reverts the builder to the initial state
      *
diff --git a/src/Oro/Component/Layout/LayoutManipulatorInterface.php b/src/Oro/Component/Layout/LayoutManipulatorInterface.php
index 8f9928d3c3b..ff937a4163b 100644
--- a/src/Oro/Component/Layout/LayoutManipulatorInterface.php
+++ b/src/Oro/Component/Layout/LayoutManipulatorInterface.php
@@ -155,6 +155,15 @@ public function changeBlockType($id, $blockType, $optionsCallback = null);
      */
     public function setBlockTheme($themes, $id = null);
 
+    /**
+     * Sets the theme(s) to be used for rendering forms
+     *
+     * @param string|string[] $themes The theme(s). For example 'MyBundle:Layout:my_theme.html.twig'
+     *
+     * @return self
+     */
+    public function setFormTheme($themes);
+
     /**
      * Reverts the manipulator to the initial state
      *
diff --git a/src/Oro/Component/Layout/LayoutRenderer.php b/src/Oro/Component/Layout/LayoutRenderer.php
index 09388501e0d..08610ad8e69 100644
--- a/src/Oro/Component/Layout/LayoutRenderer.php
+++ b/src/Oro/Component/Layout/LayoutRenderer.php
@@ -4,17 +4,24 @@
 
 use Symfony\Component\Form\FormRendererInterface;
 
+use Oro\Component\Layout\Form\RendererEngine\FormRendererEngineInterface;
+
 class LayoutRenderer implements LayoutRendererInterface
 {
     /** @var FormRendererInterface */
     protected $innerRenderer;
 
+    /** @var FormRendererEngineInterface */
+    private $formRendererEngine;
+
     /**
      * @param FormRendererInterface $innerRenderer
+     * @param FormRendererEngineInterface $formRendererEngine
      */
-    public function __construct(FormRendererInterface $innerRenderer)
+    public function __construct(FormRendererInterface $innerRenderer, FormRendererEngineInterface $formRendererEngine)
     {
         $this->innerRenderer = $innerRenderer;
+        $this->formRendererEngine = $formRendererEngine;
     }
 
     /**
@@ -32,4 +39,12 @@ public function setBlockTheme(BlockView $view, $themes)
     {
         $this->innerRenderer->setTheme($view, $themes);
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setFormTheme($themes)
+    {
+        $this->formRendererEngine->addDefaultThemes($themes);
+    }
 }
diff --git a/src/Oro/Component/Layout/LayoutRendererInterface.php b/src/Oro/Component/Layout/LayoutRendererInterface.php
index f60ccad0019..4d52933925f 100644
--- a/src/Oro/Component/Layout/LayoutRendererInterface.php
+++ b/src/Oro/Component/Layout/LayoutRendererInterface.php
@@ -20,4 +20,11 @@ public function renderBlock(BlockView $view);
      * @param string|string[] $themes The theme(s). For example 'MyBundle:Layout:my_theme.html.twig'
      */
     public function setBlockTheme(BlockView $view, $themes);
+
+    /**
+     * Sets the theme(s) to be used for rendering forms
+     *
+     * @param string|string[] $themes The theme(s). For example 'MyBundle:Layout:my_theme.html.twig'
+     */
+    public function setFormTheme($themes);
 }
diff --git a/src/Oro/Component/Layout/RawLayout.php b/src/Oro/Component/Layout/RawLayout.php
index 398f7be2550..f2806ade0d9 100644
--- a/src/Oro/Component/Layout/RawLayout.php
+++ b/src/Oro/Component/Layout/RawLayout.php
@@ -58,6 +58,9 @@ class RawLayout
     /** @var array */
     protected $blockThemes = [];
 
+    /** @var array */
+    protected $formThemes = [];
+
     public function __construct()
     {
         $this->hierarchy = new HierarchyCollection();
@@ -509,6 +512,41 @@ public function setBlockTheme($id, $themes)
         }
     }
 
+    /**
+     * Returns all registered themes to be used for rendering forms
+     *
+     * Example of returned data:
+     *  [
+     *      'MyBundle:Layout:div_form_layout.html.twig',
+     *      'AcmeBundle:Layout:div_form_layout.html.twig'
+     *  ]
+     *
+     * @return array
+     */
+    public function getFormThemes()
+    {
+        return $this->formThemes;
+    }
+
+    /**
+     * Sets the theme(s) to be used for rendering the layout item and its children
+     *
+     * @param string|string[] $themes The theme(s). For example 'MyBundle:Layout:my_theme.html.twig'
+     *
+     * @return self
+     */
+    public function setFormTheme($themes)
+    {
+        if (empty($themes)) {
+            throw new Exception\InvalidArgumentException('The theme must not be empty.');
+        }
+        if (!is_string($themes) && !is_array($themes)) {
+            throw new Exception\UnexpectedTypeException($themes, 'string or array of strings', 'themes');
+        }
+
+        $this->formThemes = array_merge($this->formThemes, (array)$themes);
+    }
+
     /**
      * Returns the layout items hierarchy from the given path
      *
diff --git a/src/Oro/Component/Layout/RawLayoutBuilder.php b/src/Oro/Component/Layout/RawLayoutBuilder.php
index d38e3cb57d7..de99a244f71 100644
--- a/src/Oro/Component/Layout/RawLayoutBuilder.php
+++ b/src/Oro/Component/Layout/RawLayoutBuilder.php
@@ -359,6 +359,16 @@ public function setBlockTheme($themes, $id = null)
         return $this;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function setFormTheme($themes)
+    {
+        $this->rawLayout->setFormTheme($themes);
+
+        return $this;
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Oro/Component/Layout/RawLayoutBuilderInterface.php b/src/Oro/Component/Layout/RawLayoutBuilderInterface.php
index 06b0728fd34..c1adf9b8b67 100644
--- a/src/Oro/Component/Layout/RawLayoutBuilderInterface.php
+++ b/src/Oro/Component/Layout/RawLayoutBuilderInterface.php
@@ -165,6 +165,15 @@ public function clear();
      */
     public function setBlockTheme($themes, $id = null);
 
+    /**
+     * Sets the theme(s) to be used for rendering forms
+     *
+     * @param string|string[] $themes The theme(s). For example 'MyBundle:Layout:my_theme.html.twig'
+     *
+     * @return self
+     */
+    public function setFormTheme($themes);
+
     /**
      * Checks whether at least one item exists in the layout
      *
diff --git a/src/Oro/Component/Layout/Templating/Helper/LayoutHelper.php b/src/Oro/Component/Layout/Templating/Helper/LayoutHelper.php
index f231d37d9e4..719b085a5a9 100644
--- a/src/Oro/Component/Layout/Templating/Helper/LayoutHelper.php
+++ b/src/Oro/Component/Layout/Templating/Helper/LayoutHelper.php
@@ -7,6 +7,7 @@
 
 use Oro\Component\Layout\BlockView;
 use Oro\Component\Layout\Templating\TextHelper;
+use Oro\Component\Layout\Form\RendererEngine\FormRendererEngineInterface;
 
 /**
  * LayoutHelper provides helpers to help display layout blocks
@@ -19,14 +20,22 @@ class LayoutHelper extends Helper
     /** @var TextHelper */
     private $textHelper;
 
+    /** @var \Oro\Component\Layout\Form\RendererEngine\FormRendererEngineInterface */
+    private $formRendererEngine;
+
     /**
      * @param FormRendererInterface $renderer
-     * @param TextHelper            $textHelper
+     * @param TextHelper $textHelper
+     * @param FormRendererEngineInterface $formRendererEngine
      */
-    public function __construct(FormRendererInterface $renderer, TextHelper $textHelper)
-    {
-        $this->renderer   = $renderer;
+    public function __construct(
+        FormRendererInterface $renderer,
+        TextHelper $textHelper,
+        FormRendererEngineInterface $formRendererEngine
+    ) {
+        $this->renderer = $renderer;
         $this->textHelper = $textHelper;
+        $this->formRendererEngine = $formRendererEngine;
     }
 
     /**
@@ -50,6 +59,18 @@ public function setBlockTheme(BlockView $view, $themes)
         $this->renderer->setTheme($view, $themes);
     }
 
+    /**
+     * Sets the theme(s) to be used for rendering forms
+     *
+     * The theme format is "<Bundle>:<Controller>".
+     *
+     * @param string|string[] $themes The theme(s). For example 'MuBundle:Layout/php'
+     */
+    public function setFormTheme($themes)
+    {
+        $this->formRendererEngine->addDefaultThemes($themes);
+    }
+
     /**
      * Renders the HTML for a given view
      *
diff --git a/src/Oro/Component/Layout/Tests/Unit/DeferredLayoutManipulatorTest.php b/src/Oro/Component/Layout/Tests/Unit/DeferredLayoutManipulatorTest.php
index c8fc81da1b8..442d0807db8 100644
--- a/src/Oro/Component/Layout/Tests/Unit/DeferredLayoutManipulatorTest.php
+++ b/src/Oro/Component/Layout/Tests/Unit/DeferredLayoutManipulatorTest.php
@@ -1601,6 +1601,21 @@ public function testSetBlockTheme()
         );
     }
 
+    public function testSetFormTheme()
+    {
+        $this->layoutManipulator
+            ->add('root', null, 'root')
+            ->setFormTheme(['MyBundle:Layout:form_theme1.html.twig', 'MyBundle:Layout:form_theme2.html.twig']);
+
+        $this->getLayoutView();
+
+        $formThemes = $this->rawLayoutBuilder->getRawLayout()->getFormThemes();
+        $this->assertSame(
+            ['MyBundle:Layout:form_theme1.html.twig', 'MyBundle:Layout:form_theme2.html.twig'],
+            $formThemes
+        );
+    }
+
     // @codingStandardsIgnoreStart
     /**
      * @expectedException \Oro\Component\Layout\Exception\DeferredUpdateFailureException
diff --git a/src/Oro/Component/Layout/Tests/Unit/LayoutBuilderTest.php b/src/Oro/Component/Layout/Tests/Unit/LayoutBuilderTest.php
index 49302a84afe..3464b9e0ae5 100644
--- a/src/Oro/Component/Layout/Tests/Unit/LayoutBuilderTest.php
+++ b/src/Oro/Component/Layout/Tests/Unit/LayoutBuilderTest.php
@@ -253,6 +253,13 @@ public function testGetLayout()
             ->method('setBlockTheme')
             ->with('TestTheme3', 'test_block');
 
+        $this->layoutManipulator->expects($this->at(4))
+            ->method('setFormTheme')
+            ->with('TestFormTheme1');
+        $this->layoutManipulator->expects($this->at(5))
+            ->method('setFormTheme')
+            ->with(['TestFormTheme2']);
+
         $this->layoutManipulator->expects($this->once())
             ->method('applyChanges')
             ->with($this->identicalTo($context), false);
@@ -281,7 +288,6 @@ public function testGetLayout()
                     ]
                 )
             );
-
         $layout->expects($this->at(0))
             ->method('setBlockTheme')
             ->with(['RootTheme1', 'RootTheme2', 'RootTheme3'], $this->identicalTo(null));
@@ -291,11 +297,26 @@ public function testGetLayout()
         $layout->expects($this->exactly(2))
             ->method('setBlockTheme');
 
+        $rawLayout->expects($this->once())
+            ->method('getFormThemes')
+            ->will(
+                $this->returnValue(
+                    ['TestFormTheme1', 'TestFormTheme2']
+                )
+            );
+        $layout->expects($this->at(2))
+            ->method('setFormTheme')
+            ->with(['TestFormTheme1', 'TestFormTheme2']);
+        $layout->expects($this->once())
+            ->method('setFormTheme');
+
         $this->layoutBuilder
             ->setBlockTheme('RootTheme1')
             ->setBlockTheme(['RootTheme2', 'RootTheme3'])
             ->setBlockTheme(['TestTheme1', 'TestTheme2'], 'test_block')
-            ->setBlockTheme('TestTheme3', 'test_block');
+            ->setBlockTheme('TestTheme3', 'test_block')
+            ->setFormTheme('TestFormTheme1')
+            ->setFormTheme(['TestFormTheme2']);
 
         $result = $this->layoutBuilder->getLayout($context, $rootId);
         $this->assertSame($layout, $result);
diff --git a/src/Oro/Component/Layout/Tests/Unit/LayoutRendererTest.php b/src/Oro/Component/Layout/Tests/Unit/LayoutRendererTest.php
index de7b3ef377b..d0399a21047 100644
--- a/src/Oro/Component/Layout/Tests/Unit/LayoutRendererTest.php
+++ b/src/Oro/Component/Layout/Tests/Unit/LayoutRendererTest.php
@@ -4,6 +4,7 @@
 
 use Oro\Component\Layout\BlockView;
 use Oro\Component\Layout\LayoutRenderer;
+use Oro\Component\Layout\Form\RendererEngine\FormRendererEngineInterface;
 
 class LayoutRendererTest extends \PHPUnit_Framework_TestCase
 {
@@ -13,10 +14,14 @@ class LayoutRendererTest extends \PHPUnit_Framework_TestCase
     /** @var LayoutRenderer */
     protected $renderer;
 
+    /** @var FormRendererEngineInterface */
+    protected $formRenderer;
+
     protected function setUp()
     {
         $this->innerRenderer = $this->getMock('Symfony\Component\Form\FormRendererInterface');
-        $this->renderer      = new LayoutRenderer($this->innerRenderer);
+        $this->formRenderer = $this->getMock('Oro\Component\Layout\Form\RendererEngine\FormRendererEngineInterface');
+        $this->renderer      = new LayoutRenderer($this->innerRenderer, $this->formRenderer);
     }
 
     public function testRenderBlock()
@@ -46,4 +51,15 @@ public function testSetBlockTheme()
 
         $this->renderer->setBlockTheme($view, $theme);
     }
+
+    public function testSetFormTheme()
+    {
+        $theme = 'MyBundle::forms.html.twig';
+
+        $this->formRenderer->expects($this->once())
+            ->method('addDefaultThemes')
+            ->with($theme);
+
+        $this->renderer->setFormTheme($theme);
+    }
 }
diff --git a/src/Oro/Component/Layout/Tests/Unit/LayoutTest.php b/src/Oro/Component/Layout/Tests/Unit/LayoutTest.php
index 045daac1aa2..de1d07773db 100644
--- a/src/Oro/Component/Layout/Tests/Unit/LayoutTest.php
+++ b/src/Oro/Component/Layout/Tests/Unit/LayoutTest.php
@@ -123,4 +123,16 @@ public function testRenderWithBlockThemeForChild()
         $result = $layout->render();
         $this->assertEquals($expected, $result);
     }
+
+    public function testSetFormTheme()
+    {
+        $theme = 'MyBundle::forms.html.twig';
+        $view = new BlockView();
+        $this->renderer->expects($this->once())
+            ->method('setFormTheme')
+            ->with([$theme]);
+        $layout = new Layout($view, $this->rendererRegistry);
+        $layout->setFormTheme($theme);
+        $layout->render();
+    }
 }
diff --git a/src/Oro/Component/Layout/Tests/Unit/RawLayoutTest.php b/src/Oro/Component/Layout/Tests/Unit/RawLayoutTest.php
index 8391bee332e..bfc6994d5a7 100644
--- a/src/Oro/Component/Layout/Tests/Unit/RawLayoutTest.php
+++ b/src/Oro/Component/Layout/Tests/Unit/RawLayoutTest.php
@@ -1007,6 +1007,30 @@ public function testSetBlockThemeWithInvalidThemeType()
         $this->rawLayout->setBlockTheme('root', 123);
     }
 
+    public function testSetFormTheme()
+    {
+        // prepare test data
+        $this->rawLayout->add('root', null, 'root');
+
+        // do test
+        $this->rawLayout->setFormTheme(
+            ['MyBundle:Layout:theme1.html.twig', 'MyBundle:Layout:theme2.html.twig']
+        );
+        $this->rawLayout->setFormTheme(
+            'MyBundle:Layout:theme3.html.twig'
+        );
+
+        $formThemes = $this->rawLayout->getFormThemes();
+        $this->assertSame(
+            [
+                'MyBundle:Layout:theme1.html.twig',
+                'MyBundle:Layout:theme2.html.twig',
+                'MyBundle:Layout:theme3.html.twig'
+            ],
+            $formThemes
+        );
+    }
+
     public function testGetHierarchy()
     {
         // prepare test data
diff --git a/src/Oro/Component/Layout/Tests/Unit/Templating/Helper/LayoutHelperTest.php b/src/Oro/Component/Layout/Tests/Unit/Templating/Helper/LayoutHelperTest.php
index bb27f2b61a9..0082935a818 100644
--- a/src/Oro/Component/Layout/Tests/Unit/Templating/Helper/LayoutHelperTest.php
+++ b/src/Oro/Component/Layout/Tests/Unit/Templating/Helper/LayoutHelperTest.php
@@ -4,6 +4,7 @@
 
 use Oro\Component\Layout\BlockView;
 use Oro\Component\Layout\Templating\Helper\LayoutHelper;
+use Oro\Component\Layout\Form\RendererEngine\FormRendererEngineInterface;
 
 class LayoutHelperTest extends \PHPUnit_Framework_TestCase
 {
@@ -16,6 +17,9 @@ class LayoutHelperTest extends \PHPUnit_Framework_TestCase
     /** @var LayoutHelper */
     protected $helper;
 
+    /** @var \Oro\Component\Layout\Form\RendererEngine\FormRendererEngineInterface */
+    protected $formRenderer;
+
     protected function setUp()
     {
         $this->renderer   = $this->getMock('Symfony\Component\Form\FormRendererInterface');
@@ -23,7 +27,9 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->helper = new LayoutHelper($this->renderer, $this->textHelper);
+        $this->formRenderer = $this->getMock('Oro\Component\Layout\Form\RendererEngine\FormRendererEngineInterface');
+
+        $this->helper = new LayoutHelper($this->renderer, $this->textHelper, $this->formRenderer);
     }
 
     public function testGetName()
@@ -43,6 +49,17 @@ public function testSetBlockTheme()
         $this->helper->setBlockTheme($view, $theme);
     }
 
+    public function testSetFormTheme()
+    {
+        $theme = 'MyBundle:Layout\php';
+
+        $this->formRenderer->expects($this->once())
+            ->method('addDefaultThemes')
+            ->with($theme);
+
+        $this->helper->setFormTheme($theme);
+    }
+
     public function testWidgetRendering()
     {
         $view      = new BlockView();

From ffbf9435affa4699d2115e1009d70fbf0679ad7c Mon Sep 17 00:00:00 2001
From: Oleksandr Nechyporenko <onechyporenko@magecore.com>
Date: Wed, 18 Nov 2015 12:47:57 +0200
Subject: [PATCH 038/471] BB-1596: Add ability to set additional data for theme
  - add data property and methods to Theme model

---
 .../DependencyInjection/Configuration.php     |  4 +++
 .../Layout/Extension/Theme/Model/Theme.php    | 32 +++++++++++++++++++
 .../Extension/Theme/Model/ThemeFactory.php    |  3 ++
 .../Theme/Model/ThemeFactoryTest.php          |  4 ++-
 .../Unit/Extension/Theme/Model/ThemeTest.php  | 13 ++++++++
 5 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/LayoutBundle/DependencyInjection/Configuration.php b/src/Oro/Bundle/LayoutBundle/DependencyInjection/Configuration.php
index 864057aab02..c3ada1db73b 100644
--- a/src/Oro/Bundle/LayoutBundle/DependencyInjection/Configuration.php
+++ b/src/Oro/Bundle/LayoutBundle/DependencyInjection/Configuration.php
@@ -145,6 +145,10 @@ protected function appendThemingNodes(ArrayNodeDefinition $parentNode)
                         ->prototype('scalar')->end()
                         ->cannotBeEmpty()
                     ->end()
+                    ->arrayNode('data')
+                        ->prototype('array')
+                        ->info('Layout additional data')
+                    ->end()
                 ->end()
             ->end();
 
diff --git a/src/Oro/Component/Layout/Extension/Theme/Model/Theme.php b/src/Oro/Component/Layout/Extension/Theme/Model/Theme.php
index 30b15c84b74..c1dc6ebd1f0 100644
--- a/src/Oro/Component/Layout/Extension/Theme/Model/Theme.php
+++ b/src/Oro/Component/Layout/Extension/Theme/Model/Theme.php
@@ -31,6 +31,9 @@ class Theme
     /** @var string[] */
     protected $groups = [];
 
+    /** @var mixed[] */
+    protected $data = [];
+
     /**
      * @param string $name
      * @param        $parentTheme
@@ -176,4 +179,33 @@ public function getGroups()
     {
         return $this->groups;
     }
+
+    /**
+     * @param mixed[] $data
+     */
+    public function setData(array $data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * @return mixed[]
+     */
+    public function getAllData()
+    {
+        return $this->data;
+    }
+
+    /**
+     * @param string $key
+     * @param mixed $default
+     * @return mixed|null
+     */
+    public function getData($key, $default = null)
+    {
+        if (array_key_exists($key, $this->data)) {
+            return $this->data[$key];
+        }
+        return $default;
+    }
 }
diff --git a/src/Oro/Component/Layout/Extension/Theme/Model/ThemeFactory.php b/src/Oro/Component/Layout/Extension/Theme/Model/ThemeFactory.php
index b4a54cfa3dd..9f83873efc7 100644
--- a/src/Oro/Component/Layout/Extension/Theme/Model/ThemeFactory.php
+++ b/src/Oro/Component/Layout/Extension/Theme/Model/ThemeFactory.php
@@ -37,6 +37,9 @@ public function create($themeName, array $themeDefinition)
         if (isset($themeDefinition['description'])) {
             $theme->setDescription($themeDefinition['description']);
         }
+        if (isset($themeDefinition['data'])) {
+            $theme->setData($themeDefinition['data']);
+        }
 
         return $theme;
     }
diff --git a/src/Oro/Component/Layout/Tests/Unit/Extension/Theme/Model/ThemeFactoryTest.php b/src/Oro/Component/Layout/Tests/Unit/Extension/Theme/Model/ThemeFactoryTest.php
index 2cf83fd0fcf..24e99a80a01 100644
--- a/src/Oro/Component/Layout/Tests/Unit/Extension/Theme/Model/ThemeFactoryTest.php
+++ b/src/Oro/Component/Layout/Tests/Unit/Extension/Theme/Model/ThemeFactoryTest.php
@@ -49,6 +49,7 @@ public function themeDefinitionDataProvider()
         $fullDefinition->setDirectory('OroBlack');
         $fullDefinition->setGroups(['main', 'frontend']);
         $fullDefinition->setDescription('description');
+        $fullDefinition->setData(['key' => 'value']);
 
         return [
             'minimal definition given' => [
@@ -66,7 +67,8 @@ public function themeDefinitionDataProvider()
                     'icon'       => 'oro-black-icon.ico',
                     'logo'       => 'oro-black-logo.png',
                     'directory'  => 'OroBlack',
-                    'description' => 'description'
+                    'description' => 'description',
+                    'data' => ['key' => 'value']
                 ],
                 '$expectedResult' => $fullDefinition,
             ]
diff --git a/src/Oro/Component/Layout/Tests/Unit/Extension/Theme/Model/ThemeTest.php b/src/Oro/Component/Layout/Tests/Unit/Extension/Theme/Model/ThemeTest.php
index a6ab3f9773e..308c5c06e29 100644
--- a/src/Oro/Component/Layout/Tests/Unit/Extension/Theme/Model/ThemeTest.php
+++ b/src/Oro/Component/Layout/Tests/Unit/Extension/Theme/Model/ThemeTest.php
@@ -84,4 +84,17 @@ public function testDescriptionMethods()
         $this->theme->setDescription('test');
         $this->assertEquals('test', $this->theme->getDescription());
     }
+
+    public function testDataMethods()
+    {
+        $data = [
+            'key' => 'value',
+        ];
+
+        $this->assertEquals([], $this->theme->getAllData());
+        $this->theme->setData($data);
+        $this->assertEquals($data, $this->theme->getAllData());
+        $this->assertEquals($data['key'], $this->theme->getData('key'));
+        $this->assertEquals('default value', $this->theme->getData('unknown key', 'default value'));
+    }
 }

From bd3141cb2dbc0d16b917bf57369ccad23054becb Mon Sep 17 00:00:00 2001
From: Oleksandr Nechyporenko <onechyporenko@magecore.com>
Date: Wed, 18 Nov 2015 13:07:45 +0200
Subject: [PATCH 039/471] BB-1596: Add ability to set additional data for theme
  - add method to access data by key

---
 .../Layout/Extension/Theme/Model/Theme.php        | 15 +++++++++++++--
 .../Unit/Extension/Theme/Model/ThemeTest.php      | 10 ++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/Oro/Component/Layout/Extension/Theme/Model/Theme.php b/src/Oro/Component/Layout/Extension/Theme/Model/Theme.php
index c1dc6ebd1f0..9f20806638b 100644
--- a/src/Oro/Component/Layout/Extension/Theme/Model/Theme.php
+++ b/src/Oro/Component/Layout/Extension/Theme/Model/Theme.php
@@ -191,17 +191,28 @@ public function setData(array $data)
     /**
      * @return mixed[]
      */
-    public function getAllData()
+    public function getData()
     {
         return $this->data;
     }
 
+    /**
+     * @param string $key
+     * @param mixed $value
+     * @return $this
+     */
+    public function setDataByKey($key, $value)
+    {
+        $this->data[$key] = $value;
+        return $this;
+    }
+
     /**
      * @param string $key
      * @param mixed $default
      * @return mixed|null
      */
-    public function getData($key, $default = null)
+    public function getDataByKey($key, $default = null)
     {
         if (array_key_exists($key, $this->data)) {
             return $this->data[$key];
diff --git a/src/Oro/Component/Layout/Tests/Unit/Extension/Theme/Model/ThemeTest.php b/src/Oro/Component/Layout/Tests/Unit/Extension/Theme/Model/ThemeTest.php
index 308c5c06e29..f64fcccdfd4 100644
--- a/src/Oro/Component/Layout/Tests/Unit/Extension/Theme/Model/ThemeTest.php
+++ b/src/Oro/Component/Layout/Tests/Unit/Extension/Theme/Model/ThemeTest.php
@@ -91,10 +91,12 @@ public function testDataMethods()
             'key' => 'value',
         ];
 
-        $this->assertEquals([], $this->theme->getAllData());
+        $this->assertEquals([], $this->theme->getData());
         $this->theme->setData($data);
-        $this->assertEquals($data, $this->theme->getAllData());
-        $this->assertEquals($data['key'], $this->theme->getData('key'));
-        $this->assertEquals('default value', $this->theme->getData('unknown key', 'default value'));
+        $this->assertEquals($data, $this->theme->getData());
+        $this->assertEquals($data['key'], $this->theme->getDataByKey('key'));
+        $this->assertEquals('default value', $this->theme->getDataByKey('unknown key', 'default value'));
+        $this->theme->setDataByKey('unknown key', 'unknown value');
+        $this->assertEquals('unknown value', $this->theme->getDataByKey('unknown key', 'default value'));
     }
 }

From fbdf0d6222278733f7fec0a1bc9ce7afd116ea13 Mon Sep 17 00:00:00 2001
From: Konstantin Stupak <kosmass.zt@gmail.com>
Date: Fri, 20 Nov 2015 16:39:59 +0200
Subject: [PATCH 040/471] Grammar fixes

---
 .../Resources/public/js/datagrid/action/delete-mass-action.js   | 2 +-
 .../DataGridBundle/Resources/translations/jsmessages.en.yml     | 2 +-
 .../DataGridBundle/Resources/translations/messages.en.yml       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 6cca0a491b7..7759f5498eb 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
@@ -20,7 +20,7 @@ define([
         /** @property {Object} */
         defaultMessages: {
             confirm_title: 'Delete Confirmation',
-            confirm_content: 'Are you sure you want to do remove selected items?',
+            confirm_content: 'Are you sure you want to remove selected items?',
             confirm_ok: 'Yes, Delete',
             confirm_cancel: 'Cancel',
             success: 'Selected items were removed.',
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml b/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
index 74eba96ad8b..ceae1410c71 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
@@ -1,7 +1,7 @@
 "Item deleted": "Item deleted"
 "Are you sure you want to delete this item?": "Are you sure you want to delete this item?"
 "Delete Error": "Delete Error"
-"Are you sure you want to do remove selected items?": "Are you sure you want to do remove selected items?"
+"Are you sure you want to remove selected items?": "Are you sure you want to remove selected items?"
 "Are you sure you want to remove this item?": "Are you sure you want to remove this item?"
 "Selected items were removed.": "Selected items were removed."
 "Selected items were not removed.": "Selected items were removed."
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/translations/messages.en.yml b/src/Oro/Bundle/DataGridBundle/Resources/translations/messages.en.yml
index ef7d2c28631..e8c016fe3b2 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/translations/messages.en.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/translations/messages.en.yml
@@ -32,7 +32,7 @@ oro:
             delete:
                 label: Delete
                 confirm_title: Mass Delete Confirmation
-                confirm_content: Are you sure you want to do delete selected items?
+                confirm_content: Are you sure you want to delete selected items?
                 success_message: "{0} No entities were removed|{1} One entity was removed|]1,Inf[ %count% entities were removed"
         datagrid.page_size.all: All
         export.csv: CSV

From e21295187c45fa52c52985f84ce331430275fb8f Mon Sep 17 00:00:00 2001
From: rodolfobandeira <contato@rodolfobandeira.com>
Date: Sat, 21 Nov 2015 19:21:46 -0500
Subject: [PATCH 041/471] Add @remove_entity on doc reference

---
 .../workflow-entities/transition-actions.md   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/Oro/Bundle/WorkflowBundle/Resources/doc/reference/workflow/workflow-entities/transition-actions.md b/src/Oro/Bundle/WorkflowBundle/Resources/doc/reference/workflow/workflow-entities/transition-actions.md
index 37d8837efcd..58b00c4995b 100644
--- a/src/Oro/Bundle/WorkflowBundle/Resources/doc/reference/workflow/workflow-entities/transition-actions.md
+++ b/src/Oro/Bundle/WorkflowBundle/Resources/doc/reference/workflow/workflow-entities/transition-actions.md
@@ -10,6 +10,7 @@ Table of Contents
  - [Unset Value](#unset-value)
  - [Create Object](#create-object)
  - [Create Entity](#create-entity)
+ - [Remove Entity](#remove-entity)
  - [Create Related Entity](#create-related-entity)
  - [Find Entity](#find-entity)
  - [Format Name](#format-name)
@@ -231,6 +232,24 @@ OR
 
 ```
 
+Remove Entity
+-------------
+
+**Class:** Oro\Bundle\WorkflowBundle\Model\Action\RemoveEntity
+
+**Alias:** remove_entity
+
+**Description:** Removes entity with specified class instance.
+
+**Parameters:**
+ - target - target that will contain entity instance;
+
+**Configuration Example**
+```
+- @remove_entity:
+    target: $.data #remove the entity being processed
+```
+
 Create Related Entity
 ---------------------
 

From 7126889e650a57360210866ab2b4f9b8c5a1c8fa Mon Sep 17 00:00:00 2001
From: Ivan Shakuta <ishakuta@gmail.com>
Date: Mon, 23 Nov 2015 18:31:43 +0200
Subject: [PATCH 042/471] Add helper methods to grid configuration

provide a way to manipulate grid configuration without knowing exact inner array structure
- add/remove column, filter, sorter
- add mass action
- update label
- join table
- add enum filter
- add twig column
---
 .../Datagrid/Common/DatagridConfiguration.php | 251 ++++++++++++++++++
 .../Common/DatagridConfigurationTest.php      | 207 +++++++++++++++
 2 files changed, 458 insertions(+)
 create mode 100644 src/Oro/Bundle/DataGridBundle/Tests/Unit/Datagrid/Common/DatagridConfigurationTest.php

diff --git a/src/Oro/Bundle/DataGridBundle/Datagrid/Common/DatagridConfiguration.php b/src/Oro/Bundle/DataGridBundle/Datagrid/Common/DatagridConfiguration.php
index 261ceb16a7d..2ce3314d429 100644
--- a/src/Oro/Bundle/DataGridBundle/Datagrid/Common/DatagridConfiguration.php
+++ b/src/Oro/Bundle/DataGridBundle/Datagrid/Common/DatagridConfiguration.php
@@ -2,8 +2,259 @@
 
 namespace Oro\Bundle\DataGridBundle\Datagrid\Common;
 
+use Doctrine\ORM\EntityRepository;
+
 use Oro\Bundle\DataGridBundle\Common\Object;
+use Oro\Bundle\EntityExtendBundle\Tools\ExtendHelper;
 
 class DatagridConfiguration extends Object
 {
+    const COLUMN_PATH = '[columns][%s]';
+    const SORTER_PATH = '[sorters][columns][%s]';
+    const FILTER_PATH = '[filters][columns][%s]';
+
+    /**
+     * @param string $name
+     * @param string $label
+     *
+     * @return DatagridConfiguration
+     */
+    public function updateLabel($name, $label)
+    {
+        if (empty($name)) {
+            throw new \BadMethodCallException('DatagridConfiguration::updateLabel: name should not be empty');
+        }
+
+        $this->offsetSetByPath(sprintf(self::COLUMN_PATH.'[label]', $name), $label);
+
+        return $this;
+    }
+
+    /**
+     * @param string      $name       column name
+     * @param array       $definition definition array as in datagrid.yml
+     * @param null|string $select     select part for the column
+     * @param array       $sorter     sorter definition
+     * @param array       $filter     filter definition
+     *
+     * @return DatagridConfiguration
+     */
+    public function addColumn($name, array $definition, $select = null, array $sorter = [], array $filter = [])
+    {
+        if (empty($name)) {
+            throw new \BadMethodCallException('DatagridConfiguration::addColumn: name should not be empty');
+        }
+
+        $this->offsetSetByPath(
+            sprintf(self::COLUMN_PATH, $name),
+            $definition
+        );
+
+        if (!is_null($select)) {
+            $this->addSelect($select);
+        }
+
+        if (!empty($sorter)) {
+            $this->addSorter($name, $sorter);
+        }
+
+        if (!empty($filter)) {
+            $this->addFilter($name, $filter);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param string $select
+     *
+     * @return DatagridConfiguration
+     */
+    public function addSelect($select)
+    {
+        if (empty($select)) {
+            throw new \BadMethodCallException('DatagridConfiguration::addSelect: select should not be empty');
+        }
+
+        $this->offsetAddToArrayByPath(
+            '[source][query][select]',
+            [$select]
+        );
+
+        return $this;
+    }
+
+    /**
+     * @param string $type
+     * @param array  $definition
+     *
+     * @return DatagridConfiguration
+     */
+    public function joinTable($type, array $definition)
+    {
+        $this
+            ->offsetAddToArrayByPath(
+                sprintf('[source][query][join][%s]', $type),
+                [$definition]
+            );
+
+        return $this;
+    }
+
+    /**
+     * @param string $name
+     * @param array  $definition
+     *
+     * @return DatagridConfiguration
+     */
+    public function addFilter($name, array $definition)
+    {
+        $this->offsetSetByPath(
+            sprintf(self::FILTER_PATH, $name),
+            $definition
+        );
+
+        return $this;
+    }
+
+    /**
+     * @param string $name
+     * @param array  $definition
+     *
+     * @return DatagridConfiguration
+     */
+    public function addSorter($name, array $definition)
+    {
+        $this->offsetSetByPath(
+            sprintf(self::SORTER_PATH, $name),
+            $definition
+        );
+
+        return $this;
+    }
+
+    /**
+     * Remove column definition
+     * should remove sorters as well and optionally filters
+     *
+     * @param string $name         column name from grid definition
+     * @param bool   $removeFilter whether remove filter or not, true by default
+     *
+     * @return DatagridConfiguration
+     */
+    public function removeColumn($name, $removeFilter = true)
+    {
+        $this->offsetUnsetByPath(
+            sprintf(self::COLUMN_PATH, $name)
+        );
+
+        $this->removeSorter($name);
+        if ($removeFilter) {
+            $this->removeFilter($name);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param string $name column name
+     */
+    public function removeSorter($name)
+    {
+        $this->offsetUnsetByPath(
+            sprintf(self::SORTER_PATH, $name)
+        );
+    }
+
+    /**
+     * Remove filter definition
+     *
+     * @param string $name column name
+     *
+     * @return DatagridConfiguration
+     */
+    public function removeFilter($name)
+    {
+        $this->offsetUnsetByPath(
+            sprintf(self::FILTER_PATH, $name)
+        );
+
+        return $this;
+    }
+
+    /**
+     * @param string $columnName column name
+     * @param string $dataName   property path of the field, e.g. entity.enum_field
+     * @param string $enumCode   enum code
+     * @param bool   $isMultiple allow to filter by several values
+     *
+     * @return DatagridConfiguration
+     */
+    public function addEnumFilter($columnName, $dataName, $enumCode, $isMultiple = false)
+    {
+        $this->addFilter(
+            $columnName,
+            [
+                'type'      => 'entity',
+                'data_name' => $dataName,
+                'options'   => [
+                    'field_options' => [
+                        'class'         => ExtendHelper::buildEnumValueClassName($enumCode),
+                        'property'      => 'name',
+                        'query_builder' => function (EntityRepository $entityRepository) {
+                            return $entityRepository->createQueryBuilder('c')
+                                ->orderBy('c.name', 'ASC');
+                        },
+                        'multiple'      => $isMultiple,
+                    ],
+                ],
+            ]
+        );
+
+        return $this;
+    }
+
+    /**
+     * @param string      $name
+     * @param string      $label
+     * @param string      $templatePath
+     * @param null|string $select select part for the column
+     * @param array       $sorter sorter definition
+     * @param array       $filter filter definitio
+     *
+     * @return DatagridConfiguration
+     */
+    public function addTwigColumn($name, $label, $templatePath, $select = null, array $sorter = [], array $filter = [])
+    {
+        $this->addColumn(
+            $name,
+            [
+                'label'         => $label,
+                'type'          => 'twig',
+                'frontend_type' => 'html',
+                'template'      => $templatePath,
+            ],
+            $select,
+            $sorter,
+            $filter
+        );
+
+        return $this;
+    }
+
+    /**
+     * @param string $name
+     * @param array  $options
+     *
+     * @return DatagridConfiguration
+     */
+    public function addMassAction($name, array $options)
+    {
+        $this->offsetSetByPath(
+            sprintf('[mass_actions][%s]', $name),
+            $options
+        );
+
+        return $this;
+    }
 }
diff --git a/src/Oro/Bundle/DataGridBundle/Tests/Unit/Datagrid/Common/DatagridConfigurationTest.php b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Datagrid/Common/DatagridConfigurationTest.php
new file mode 100644
index 00000000000..5c253b6ae2c
--- /dev/null
+++ b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Datagrid/Common/DatagridConfigurationTest.php
@@ -0,0 +1,207 @@
+<?php
+
+namespace Oro\Bundle\DataGridBundle\Tests\Unit\Datagrid\Common;
+
+use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
+
+class DatagridConfigurationTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var DatagridConfiguration */
+    protected $configuration;
+
+    protected function setUp()
+    {
+        $this->configuration = DatagridConfiguration::create([]);
+    }
+
+    /**
+     * @dataProvider addColumnDataProvider
+     *
+     * @param array  $expected
+     * @param string $name
+     * @param string $select
+     * @param array  $definition
+     * @param array  $sorter
+     * @param array  $filter
+     */
+    public function testAddColumn(
+        $expected,
+        $name,
+        $definition,
+        $select = null,
+        $sorter = [],
+        $filter = []
+    ) {
+        $this->configuration->addColumn(
+            $name,
+            $definition,
+            $select,
+            $sorter,
+            $filter
+        );
+
+        $configArray = $this->configuration->toArray();
+        $this->assertEquals($expected, $configArray);
+    }
+
+    public function testExceptions()
+    {
+        $this->setExpectedException(
+            'BadMethodCallException',
+            'DatagridConfiguration::addColumn: name should not be empty'
+        );
+        $this->configuration->addColumn(null, []);
+
+        $this->setExpectedException(
+            'BadMethodCallException',
+            'DatagridConfiguration::updateLabel: name should not be empty'
+        );
+        $this->configuration->updateLabel(null, []);
+
+        $this->setExpectedException(
+            'BadMethodCallException',
+            'DatagridConfiguration::addSelect: select should not be empty'
+        );
+        $this->configuration->addSelect(null);
+    }
+
+    public function testUpdateLabel()
+    {
+        $this->configuration->updateLabel('testColumn', 'label1');
+
+        $configArray = $this->configuration->toArray();
+        $this->assertEquals(
+            ['columns' => ['testColumn' => ['label' => 'label1']]],
+            $configArray
+        );
+
+        $this->configuration->updateLabel('testColumn1', null);
+        $configArray = $this->configuration->toArray();
+        $this->assertEquals(
+            [
+                'columns' => [
+                    'testColumn'  => ['label' => 'label1'],
+                    'testColumn1' => ['label' => null],
+                ]
+            ],
+            $configArray
+        );
+
+        $this->configuration->updateLabel('testColumn', 'label2');
+        $configArray = $this->configuration->toArray();
+        $this->assertEquals(
+            [
+                'columns' => [
+                    'testColumn'  => ['label' => 'label2'],
+                    'testColumn1' => ['label' => null],
+                ]
+            ],
+            $configArray
+        );
+    }
+
+    public function testAddSelect()
+    {
+        $this->configuration->addSelect('testColumn');
+
+        $configArray = $this->configuration->toArray();
+        $this->assertEquals(
+            [
+                'source' => [
+                    'query' => ['select' => ['testColumn']],
+                ]
+            ],
+            $configArray
+        );
+    }
+
+    public function testJoinTable()
+    {
+        $this->configuration->joinTable('left', ['param' => 'value']);
+
+        $configArray = $this->configuration->toArray();
+        $this->assertEquals(
+            [
+                'source' => [
+                    'query' => ['join' => ['left' => [['param' => 'value']]]],
+                ]
+            ],
+            $configArray
+        );
+    }
+
+    public function testRemoveColumn()
+    {
+        $this->configuration->addColumn('testColumn', ['param' => 123], null, ['param' => 123], ['param' => 123]);
+
+        $configArray = $this->configuration->toArray();
+        $this->assertTrue(isset($configArray['columns']['testColumn']));
+
+        $this->configuration->removeColumn('testColumn');
+        $configArray = $this->configuration->toArray();
+
+        $this->assertEmpty($configArray['columns']);
+        $this->assertEmpty($configArray['sorters']['columns']);
+        $this->assertEmpty($configArray['filters']['columns']);
+    }
+
+    /**
+     * @return array
+     */
+    public function addColumnDataProvider()
+    {
+        return [
+            'all data supplied'         => [
+                'expected'   => [
+                    'source'  => [
+                        'query' => ['select' => ['entity.testColumn1',]],
+                    ],
+                    'columns' => ['testColumn1' => ['testParam1' => 'abc', 'testParam2' => 123,]],
+                    'sorters' => ['columns' => ['testColumn1' => ['data_name' => 'testColumn1']]],
+                    'filters' => ['columns' => ['testColumn1' => ['data_name' => 'testColumn1', 'type' => 'string']]],
+                ],
+                'name'       => 'testColumn1',
+                'definition' => ['testParam1' => 'abc', 'testParam2' => 123,],
+                'select'     => 'entity.testColumn1',
+                'sorter'     => ['data_name' => 'testColumn1'],
+                'filter'     => ['data_name' => 'testColumn1', 'type' => 'string'],
+            ],
+            'without sorter and filter' => [
+                'expected'   => [
+                    'source'  => [
+                        'query' => ['select' => ['entity.testColumn2',]],
+                    ],
+                    'columns' => ['testColumn2' => ['testParam1' => 'abc', 'testParam2' => 123,]],
+                ],
+                'name'       => 'testColumn2',
+                'definition' => ['testParam1' => 'abc', 'testParam2' => 123,],
+                'select'     => 'entity.testColumn2',
+            ],
+            'without select part'       => [
+                'expected'   => [
+                    'columns' => ['testColumn2' => ['testParam1' => 'abc', 'testParam2' => 123,]],
+                ],
+                'name'       => 'testColumn2',
+                'definition' => ['testParam1' => 'abc', 'testParam2' => 123,],
+            ],
+            'without sorter and select' => [
+                'expected'   => [
+                    'columns' => ['testColumn1' => ['testParam1' => 'abc', 'testParam2' => 123,]],
+                    'filters' => ['columns' => ['testColumn1' => ['data_name' => 'testColumn1', 'type' => 'string']]],
+                ],
+                'name'       => 'testColumn1',
+                'definition' => ['testParam1' => 'abc', 'testParam2' => 123,],
+                'select'     => null,
+                'sorter'     => [],
+                'filter'     => ['data_name' => 'testColumn1', 'type' => 'string'],
+            ],
+            'with empty definition'     => [
+                'expected'   => [
+                    'columns' => ['testColumn1' => []],
+                ],
+                'name'       => 'testColumn1',
+                'definition' => [],
+            ],
+        ];
+    }
+}

From 9a82d98bfe1f7b51bd22b737d195b0f4a2e62a04 Mon Sep 17 00:00:00 2001
From: Ivan Shakuta <ishakuta@gmail.com>
Date: Mon, 23 Nov 2015 21:03:45 +0200
Subject: [PATCH 043/471] Fix typo

- fix typo
- remove unnecessary use statement
---
 .../EntityExtendBundle/Form/Type/DictionaryFilterType.php      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/EntityExtendBundle/Form/Type/DictionaryFilterType.php b/src/Oro/Bundle/EntityExtendBundle/Form/Type/DictionaryFilterType.php
index fe73b686f96..fb8057e8786 100644
--- a/src/Oro/Bundle/EntityExtendBundle/Form/Type/DictionaryFilterType.php
+++ b/src/Oro/Bundle/EntityExtendBundle/Form/Type/DictionaryFilterType.php
@@ -10,7 +10,6 @@
 use Oro\Bundle\EntityExtendBundle\Provider\EnumValueProvider;
 use Oro\Bundle\EntityExtendBundle\Entity\AbstractEnumValue;
 use Oro\Bundle\EntityExtendBundle\Tools\ExtendHelper;
-use Oro\Bundle\EntityExtendBundle\Form\Type\AbstractMultiChoiceType;
 
 use Oro\Bundle\FilterBundle\Form\Type\Filter\ChoiceFilterType;
 
@@ -59,7 +58,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
 
                     if (empty($options['dictionary_code'])) {
                         throw new InvalidOptionsException(
-                            'Either "class" or "dictionary_code" must option must be set.'
+                            'Either "class" or "dictionary_code" option must be set.'
                         );
                     }
 

From a08fd47e6930455016293fb8ab14ca11f784853c Mon Sep 17 00:00:00 2001
From: Oleksandr Nechyporenko <onechyporenko@magecore.com>
Date: Tue, 24 Nov 2015 12:00:42 +0200
Subject: [PATCH 044/471] BB-1582: Move theme info file to theme folder  - add
 assets support in theme data

---
 .../LayoutBundle/Assetic/LayoutResource.php   | 82 +++++++------------
 .../DependencyInjection/Configuration.php     | 44 +++++++++-
 .../Layout/Block/Type/StylesheetsType.php     | 75 -----------------
 .../Resources/config/block_types.yml          |  5 --
 .../views/Layout/div_layout.html.twig         |  5 +-
 5 files changed, 72 insertions(+), 139 deletions(-)
 delete mode 100644 src/Oro/Bundle/LayoutBundle/Layout/Block/Type/StylesheetsType.php

diff --git a/src/Oro/Bundle/LayoutBundle/Assetic/LayoutResource.php b/src/Oro/Bundle/LayoutBundle/Assetic/LayoutResource.php
index fe55c711300..cbd76c389e1 100644
--- a/src/Oro/Bundle/LayoutBundle/Assetic/LayoutResource.php
+++ b/src/Oro/Bundle/LayoutBundle/Assetic/LayoutResource.php
@@ -4,90 +4,70 @@
 
 use Assetic\Factory\Resource\ResourceInterface;
 
-use Oro\Bundle\LayoutBundle\Layout\Block\Type\StylesheetsType;
-use Oro\Component\Layout\Layout;
-use Oro\Component\Layout\BlockView;
-use Oro\Component\Layout\LayoutManager;
-use Oro\Component\Layout\LayoutContext;
+use Oro\Component\Layout\Extension\Theme\Model\Theme;
 use Oro\Component\Layout\Extension\Theme\Model\ThemeManager;
-use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException;
 
 class LayoutResource implements ResourceInterface
 {
     /** @var ThemeManager */
     protected $themeManager;
 
-    /** @var LayoutManager $layoutManager */
-    protected $layoutManager;
-
-    public function __construct(ThemeManager $themeManager, LayoutManager $layoutManager)
+    /**
+     * @param ThemeManager $themeManager
+     */
+    public function __construct(ThemeManager $themeManager)
     {
         $this->themeManager = $themeManager;
-        $this->layoutManager = $layoutManager;
     }
 
+    /**
+     * @inheritdoc
+     */
     public function isFresh($timestamp)
     {
         return true;
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function __toString()
+    {
+        return 'layout';
+    }
+
+    /**
+     * @inheritdoc
+     */
     public function getContent()
     {
         $formulae = [];
-        $themes = $this->themeManager->getThemeNames();
+        $themes = $this->themeManager->getAllThemes();
         foreach ($themes as $theme) {
-            $layout = $this->getLayout($theme);
-            if ($layout) {
-                $formulae += $this->collectViewStylesheets($theme, $layout->getView());
-            }
+            $formulae += $this->collectThemeAssets($theme);
         }
         return $formulae;
     }
 
     /**
-     * @param string $theme
-     * @return Layout
+     * @param Theme $theme
+     * @return array
      */
-    protected function getLayout($theme)
+    protected function collectThemeAssets(Theme $theme)
     {
-        $builder = $this->layoutManager->getLayoutBuilder();
-        $builder->add('root', null, 'root');
-
-        $context = new LayoutContext();
-        $context->set('theme', $theme);
-
-        try {
-            $layout = $builder->getLayout($context);
-        } catch (NoSuchPropertyException $ex) {
-            $ex;
-            $layout = null;
-        }
-
-        return $layout;
-    }
-
-    protected function collectViewStylesheets($theme, BlockView $view, $formulae = [])
-    {
-        if ($view->vars['block_type'] === StylesheetsType::NAME) {
-            $name = 'layout_' . $theme . $view->vars['cache_key'];
+        $formulae = [];
+        $assets = $theme->getDataByKey('assets', []);
+        foreach ($assets as $assetKey => $asset) {
+            $name = 'layout_' . $theme->getName(). '_' . $assetKey;
             $formulae[$name] = [
-                $view->vars['inputs'],
-                $view->vars['filters'],
+                $asset['inputs'],
+                $asset['filters'],
                 [
-                    'output' => $view->vars['output'],
+                    'output' => $asset['output'],
                     'name' => $name,
                 ],
             ];
-        } else {
-            foreach ($view as $childView) {
-                $formulae = $this->collectViewStylesheets($theme, $childView, $formulae);
-            }
         }
         return $formulae;
     }
-
-    public function __toString()
-    {
-        return 'layout';
-    }
 }
diff --git a/src/Oro/Bundle/LayoutBundle/DependencyInjection/Configuration.php b/src/Oro/Bundle/LayoutBundle/DependencyInjection/Configuration.php
index c3ada1db73b..bff642eb6b5 100644
--- a/src/Oro/Bundle/LayoutBundle/DependencyInjection/Configuration.php
+++ b/src/Oro/Bundle/LayoutBundle/DependencyInjection/Configuration.php
@@ -112,6 +112,10 @@ protected function appendThemingNodes(ArrayNodeDefinition $parentNode)
         $treeBuilder = new TreeBuilder();
         $node        = $treeBuilder->root('themes');
 
+        $dataTreeBuilder = new TreeBuilder();
+        $dataNode = $dataTreeBuilder->root('data');
+        $dataNode->info('Layout additional data')->end();
+
         $node
             ->useAttributeAsKey('theme-identifier')
             ->normalizeKeys(false)
@@ -145,13 +149,12 @@ protected function appendThemingNodes(ArrayNodeDefinition $parentNode)
                         ->prototype('scalar')->end()
                         ->cannotBeEmpty()
                     ->end()
-                    ->arrayNode('data')
-                        ->prototype('array')
-                        ->info('Layout additional data')
-                    ->end()
+                    ->append($dataNode)
                 ->end()
             ->end();
 
+        $this->appendDataNodes($dataNode);
+
         $parentNode
             ->append($node)
             ->children()
@@ -164,4 +167,37 @@ protected function appendThemingNodes(ArrayNodeDefinition $parentNode)
                 ->end()
             ->end();
     }
+
+    /**
+     * @param ArrayNodeDefinition $dataNode
+     */
+    protected function appendDataNodes($dataNode)
+    {
+        $treeBuilder = new TreeBuilder();
+        $assetsNode = $treeBuilder->root('assets');
+
+        $assetsNode
+            ->useAttributeAsKey('asset-identifier')
+            ->normalizeKeys(false)
+            ->prototype('array')
+                ->children()
+                    ->arrayNode('inputs')
+                        ->info('Input assets list')
+                        ->prototype('scalar')->end()
+                        ->isRequired()
+                    ->end()
+                    ->arrayNode('filters')
+                        ->info('Filters to manipulate input assets')
+                        ->prototype('scalar')->end()
+                        ->isRequired()
+                    ->end()
+                    ->scalarNode('output')
+                        ->info('Output asset')
+                        ->isRequired()
+                    ->end()
+                ->end()
+            ->end();
+
+        $dataNode->append($assetsNode);
+    }
 }
diff --git a/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/StylesheetsType.php b/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/StylesheetsType.php
deleted file mode 100644
index 109b669b399..00000000000
--- a/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/StylesheetsType.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-namespace Oro\Bundle\LayoutBundle\Layout\Block\Type;
-
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
-
-use Oro\Component\Layout\OptionValueBag;
-use Oro\Component\Layout\ArrayOptionValueBuilder;
-use Oro\Component\Layout\Block\Type\AbstractType;
-use Oro\Component\Layout\BlockInterface;
-use Oro\Component\Layout\BlockView;
-
-class StylesheetsType extends AbstractType
-{
-    const NAME = 'stylesheets';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
-    {
-        $resolver->setRequired(
-            [
-                'inputs'
-            ]
-        );
-        $resolver->setDefaults(
-            [
-                'filters' => [
-                    'cssrewrite',
-                    'lessphp',
-                    'cssmin',
-                ],
-                'output' => null,
-            ]
-        );
-
-        $resolver->setAllowedTypes('inputs', ['array', 'Oro\Component\Layout\OptionValueBag']);
-        $resolver->setAllowedTypes('filters', ['array', 'Oro\Component\Layout\OptionValueBag']);
-        $resolver->setAllowedTypes('output', ['null', 'string']);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function finishView(BlockView $view, BlockInterface $block, array $options)
-    {
-        $theme = $block->getContext()->get('theme');
-        
-        $inputs = $block->getOptions()['inputs'];
-        if ($inputs instanceof OptionValueBag) {
-            $inputs = $inputs->buildValue(new ArrayOptionValueBuilder());
-        }
-        $view->vars['inputs'] = $inputs;
-
-        $filters = $block->getOptions()['filters'];
-        if ($filters instanceof OptionValueBag) {
-            $filters = $filters->buildValue(new ArrayOptionValueBuilder());
-        }
-        $view->vars['filters'] = $filters;
-
-        $view->vars['output'] = $block->getOptions()['output'];
-        if (!$view->vars['output']) {
-            $view->vars['output'] = 'css/layout/'.$theme.'/'.$view->vars['cache_key'].'.css';
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return self::NAME;
-    }
-}
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/config/block_types.yml b/src/Oro/Bundle/LayoutBundle/Resources/config/block_types.yml
index cfe5fc0a04a..17a23227d80 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/config/block_types.yml
+++ b/src/Oro/Bundle/LayoutBundle/Resources/config/block_types.yml
@@ -29,11 +29,6 @@ services:
         tags:
              - { name: layout.block_type, alias: script }
 
-    oro_layout.block_type.stylesheets:
-        class: Oro\Bundle\LayoutBundle\Layout\Block\Type\StylesheetsType
-        tags:
-             - { name: layout.block_type, alias: stylesheets }
-
     oro_layout.block_type.style:
         class: Oro\Bundle\LayoutBundle\Layout\Block\Type\StyleType
         tags:
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
index eafb9e0daac..02c1d538678 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
+++ b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
@@ -57,12 +57,9 @@
     {% endif %}
 {% endblock %}
 
-{% block stylesheets_widget %}
-    <link rel="stylesheet" href="{{ asset(output)}}" />
-{% endblock %}
-
 {% block style_widget %}
     {% if attr.href is defined and attr.href is not empty %}
+        {% set attr = attr|merge({href: asset(attr.href)}) %}
         <link rel="stylesheet"{{ block('block_attributes') }}/>
     {% else %}
         <style{{ block('block_attributes') }}>

From fc3b20997cfc2b64a7e15d534d52e53e11dca866 Mon Sep 17 00:00:00 2001
From: Oleksandr Nechyporenko <onechyporenko@magecore.com>
Date: Tue, 24 Nov 2015 13:27:11 +0200
Subject: [PATCH 045/471] BB-1582: Move theme info file to theme folder  - fix
 tests

---
 .../Unit/Assetic/LayoutFormulaLoaderTest.php  |  30 +++++
 .../Tests/Unit/Assetic/LayoutResourceTest.php | 110 ++++++++++++++++++
 .../Unit/ArrayOptionValueBuilderTest.php      |  97 +++++++++++++++
 .../Unit/DeferredLayoutManipulatorTest.php    |   2 +-
 4 files changed, 238 insertions(+), 1 deletion(-)
 create mode 100644 src/Oro/Bundle/LayoutBundle/Tests/Unit/Assetic/LayoutFormulaLoaderTest.php
 create mode 100644 src/Oro/Bundle/LayoutBundle/Tests/Unit/Assetic/LayoutResourceTest.php
 create mode 100644 src/Oro/Component/Layout/Tests/Unit/ArrayOptionValueBuilderTest.php

diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Assetic/LayoutFormulaLoaderTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Assetic/LayoutFormulaLoaderTest.php
new file mode 100644
index 00000000000..5c9b874b99f
--- /dev/null
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Assetic/LayoutFormulaLoaderTest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Oro\Bundle\LayoutBundle\Tests\Unit\Assetic;
+
+use Assetic\Factory\Resource\ResourceInterface;
+
+use Oro\Bundle\LayoutBundle\Assetic\LayoutFormulaLoader;
+
+class LayoutFormulaLoaderTest extends \PHPUnit_Framework_TestCase
+{
+    public function testLoad()
+    {
+        $formulae = [1, 2, 3];
+        $loader = new LayoutFormulaLoader();
+
+        /** @var ResourceInterface|\PHPUnit_Framework_MockObject_MockObject $resource */
+        $resource = $this->getMock('Assetic\Factory\Resource\ResourceInterface');
+
+        /** @var ResourceInterface|\PHPUnit_Framework_MockObject_MockObject $layoutResource */
+        $layoutResource = $this->getMockBuilder('Oro\Bundle\LayoutBundle\Assetic\LayoutResource')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $layoutResource->expects($this->once())
+            ->method('getContent')
+            ->willReturn($formulae);
+
+        $this->assertEquals([], $loader->load($resource));
+        $this->assertEquals($formulae, $loader->load($layoutResource));
+    }
+}
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Assetic/LayoutResourceTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Assetic/LayoutResourceTest.php
new file mode 100644
index 00000000000..a708405c068
--- /dev/null
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Assetic/LayoutResourceTest.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace Oro\Bundle\LayoutBundle\Tests\Unit\Assetic;
+
+use Oro\Bundle\LayoutBundle\Assetic\LayoutResource;
+use Oro\Component\Layout\Extension\Theme\Model\ThemeManager;
+use Oro\Component\Layout\Extension\Theme\Model\ThemeFactory;
+
+class LayoutResourceTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var LayoutResource */
+    protected $layoutResource;
+
+    /** @var ThemeManager */
+    protected $themeManager;
+
+    protected function setUp()
+    {
+        $this->layoutResource = new LayoutResource($this->getThemeManager());
+    }
+
+    protected function tearDown()
+    {
+        unset($this->layoutResource, $this->themeManager);
+    }
+
+    /**
+     * @return ThemeManager
+     */
+    protected function getThemeManager()
+    {
+        if (!$this->themeManager) {
+            $this->themeManager = new ThemeManager(new ThemeFactory(), $this->getThemes());
+        }
+        return $this->themeManager;
+    }
+
+    /**
+     * @return array
+     */
+    protected function getThemes()
+    {
+        $asset = [
+            'inputs' => ['styles.css'],
+            'filters' => ['filters'],
+            'output' => ['output.css'],
+        ];
+
+        return [
+            'without_assets' => [],
+            'with_empty_assets' => [
+                'data' => ['assets' => []],
+            ],
+            'with_one_asset' => [
+                'data' => [
+                    'assets' => [
+                        'first' => $asset,
+                    ]
+                ],
+            ],
+            'with_two_asset' => [
+                'data' => [
+                    'assets' => [
+                        'first' => $asset,
+                        'second' => $asset,
+                    ]
+                ],
+            ],
+        ];
+    }
+
+    public function testIsFresh()
+    {
+        $this->assertTrue($this->layoutResource->isFresh(1));
+    }
+
+    public function testToString()
+    {
+        $this->assertEquals('layout', (string)$this->layoutResource);
+    }
+
+    public function testGetContent()
+    {
+        $themes = $this->getThemes();
+        $formulae = [];
+        foreach ($themes as $themeName => $theme) {
+            if (!isset($theme['data']) || !isset($theme['data']['assets']) || empty($theme['data']['assets'])) {
+                continue;
+            }
+
+            $assets = $theme['data']['assets'];
+            foreach ($assets as $assetKey => $asset) {
+                $name = 'layout_' . $themeName . '_' . $assetKey;
+                $formulae[$name] = [
+                    $asset['inputs'],
+                    $asset['filters'],
+                    [
+                        'output' => $asset['output'],
+                        'name' => $name,
+                    ],
+                ];
+            }
+        }
+
+        $this->assertArrayHasKey('layout_with_one_asset_first', $formulae);
+        $this->assertArrayHasKey('layout_with_two_asset_first', $formulae);
+        $this->assertArrayHasKey('layout_with_two_asset_second', $formulae);
+        $this->assertEquals($formulae, $this->layoutResource->getContent());
+    }
+}
diff --git a/src/Oro/Component/Layout/Tests/Unit/ArrayOptionValueBuilderTest.php b/src/Oro/Component/Layout/Tests/Unit/ArrayOptionValueBuilderTest.php
new file mode 100644
index 00000000000..213f7381c9f
--- /dev/null
+++ b/src/Oro/Component/Layout/Tests/Unit/ArrayOptionValueBuilderTest.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace Oro\Component\Layout\Tests\Unit;
+
+use Oro\Component\Layout\ArrayOptionValueBuilder;
+use Oro\Component\Layout\Exception\InvalidArgumentException;
+
+class ArrayOptionValueBuilderTest extends \PHPUnit_Framework_TestCase
+{
+    public function testBuildWithDefaultOptions()
+    {
+        $builder = new ArrayOptionValueBuilder();
+        $builder->add(['val1']);
+        $builder->add(['val2']);
+        $builder->add(['val3', 'val4']);
+        $builder->remove(['val2']);
+        $builder->replace(['val3'], ['replaced_val3']);
+        $this->assertEquals(['val1', 'replaced_val3', 'val4'], $builder->get());
+    }
+
+    /**
+     * @expectedException \Oro\Component\Layout\Exception\UnexpectedTypeException
+     */
+    public function testAddThrowsExceptionIfInvalidValue()
+    {
+        $builder = new ArrayOptionValueBuilder();
+        $builder->add(123);
+    }
+
+    /**
+     * @expectedException \Oro\Component\Layout\Exception\UnexpectedTypeException
+     */
+    public function testRemoveThrowsExceptionIfInvalidValue()
+    {
+        $builder = new ArrayOptionValueBuilder();
+        $builder->remove(123);
+    }
+
+    /**
+     * @expectedException \Oro\Component\Layout\Exception\UnexpectedTypeException
+     */
+    public function testReplaceThrowsExceptionIfInvalidOldValue()
+    {
+        $builder = new ArrayOptionValueBuilder();
+        $builder->replace(123, ['new']);
+    }
+
+    /**
+     * @expectedException \Oro\Component\Layout\Exception\UnexpectedTypeException
+     */
+    public function testReplaceThrowsExceptionIfInvalidNewValue()
+    {
+        $builder = new ArrayOptionValueBuilder();
+        $builder->replace(['old'], 123);
+    }
+
+    /**
+     * @expectedException InvalidArgumentException
+     */
+    public function testReplaceThrowsExceptionIfCountNotEqual()
+    {
+        $builder = new ArrayOptionValueBuilder();
+        $builder->replace(['old'], ['new1', 'new2']);
+    }
+
+    public function testAddWithEmptyValue()
+    {
+        $builder = new ArrayOptionValueBuilder();
+        $builder->add(['']);
+        $this->assertEquals([''], $builder->get());
+    }
+
+    public function testRemoveWithEmptyValue()
+    {
+        $builder = new ArrayOptionValueBuilder();
+        $builder->add(['val1']);
+        $builder->remove(['']);
+        $this->assertEquals(['val1'], $builder->get());
+    }
+
+    public function testReplaceWithEmptyOldValue()
+    {
+        $builder = new ArrayOptionValueBuilder();
+        $builder->add(['val1']);
+        $builder->replace([''], ['new']);
+        $this->assertEquals(['val1'], $builder->get());
+    }
+
+    public function testReplaceWithEmptyNewValue()
+    {
+        $builder = new ArrayOptionValueBuilder();
+        $builder->add(['val1']);
+        $builder->add(['val2']);
+        $builder->replace(['val1'], ['']);
+        $this->assertEquals(['', 'val2'], $builder->get());
+    }
+}
diff --git a/src/Oro/Component/Layout/Tests/Unit/DeferredLayoutManipulatorTest.php b/src/Oro/Component/Layout/Tests/Unit/DeferredLayoutManipulatorTest.php
index c8fc81da1b8..5763ab705cf 100644
--- a/src/Oro/Component/Layout/Tests/Unit/DeferredLayoutManipulatorTest.php
+++ b/src/Oro/Component/Layout/Tests/Unit/DeferredLayoutManipulatorTest.php
@@ -1055,7 +1055,7 @@ public function testSubtractAndThenAppendOption()
                                 'vars' => [
                                     'id'    => 'logo',
                                     'title' => '',
-                                    'attr'  => ['class' => 'test_class1 test_class2']
+                                    'attr'  => ['class' => 'test_class1']
                                 ]
                             ]
                         ]

From 4de860748068b4c37363301d51458cf87eefb4cc Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Tue, 24 Nov 2015 12:31:50 +0100
Subject: [PATCH 046/471] CRM-4618: Impossible to define import strategy on the
 field configuration

---
 .../Resources/config/entity_config.yml        | 14 +++++++++
 .../Resources/translations/messages.en.yml    |  1 +
 .../Import/AbstractImportStrategy.php         | 29 +++++++++++++++++--
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/Oro/Bundle/ImportExportBundle/Resources/config/entity_config.yml b/src/Oro/Bundle/ImportExportBundle/Resources/config/entity_config.yml
index 66e7c42d260..8656c776650 100644
--- a/src/Oro/Bundle/ImportExportBundle/Resources/config/entity_config.yml
+++ b/src/Oro/Bundle/ImportExportBundle/Resources/config/entity_config.yml
@@ -45,6 +45,20 @@ oro_entity_config:
                             empty_value:    false
                             required:       false
                             block:          import_export
+                identity_when_empty:
+                    options:
+                        value_type:         boolean
+                        allowed_type:       [string, text, integer, smallint, bigint, boolean, date, float, decimal, money, percent, enum]
+                    form:
+                        type:               choice
+                        options:
+                            label:          oro.importexport.entity_config.identity_when_empty.label
+                            choices:
+                                true:       'Yes'
+                                false:      'No'
+                            empty_value:    false
+                            required:       false
+                            block:          import_export
                 # is field must be excluded from import/export
                 excluded:
                     options:
diff --git a/src/Oro/Bundle/ImportExportBundle/Resources/translations/messages.en.yml b/src/Oro/Bundle/ImportExportBundle/Resources/translations/messages.en.yml
index 81655cad9da..9981accd3dc 100644
--- a/src/Oro/Bundle/ImportExportBundle/Resources/translations/messages.en.yml
+++ b/src/Oro/Bundle/ImportExportBundle/Resources/translations/messages.en.yml
@@ -16,6 +16,7 @@ oro:
             header.label:   "Column Name"
             header.tooltip: "If blank Label will be used"
             identity.label: "Use as Identity Field"
+            identity_when_empty.label: "Use as Identity Field even if empty"
             order.label:    "Column Position"
 
         import:
diff --git a/src/Oro/Bundle/ImportExportBundle/Strategy/Import/AbstractImportStrategy.php b/src/Oro/Bundle/ImportExportBundle/Strategy/Import/AbstractImportStrategy.php
index c30b8e0bcce..3dd2d61988d 100644
--- a/src/Oro/Bundle/ImportExportBundle/Strategy/Import/AbstractImportStrategy.php
+++ b/src/Oro/Bundle/ImportExportBundle/Strategy/Import/AbstractImportStrategy.php
@@ -124,9 +124,7 @@ protected function findExistingEntity($entity, array $searchContext = [])
         if (!$existingEntity
             && (!$searchContext || $this->databaseHelper->getIdentifier(current($searchContext)))
         ) {
-            $identityValues = $searchContext;
-            $identityValues += $this->fieldHelper->getIdentityValues($entity);
-            $existingEntity = $this->findEntityByIdentityValues($entityName, $identityValues);
+            $existingEntity = $this->findExistingEntityByIdentityFields($entity, $searchContext);
         }
 
         if ($existingEntity && !$identifier) {
@@ -138,6 +136,31 @@ protected function findExistingEntity($entity, array $searchContext = [])
         return $existingEntity;
     }
 
+    /**
+     * @param object $entity
+     * @param array $searchContext
+     *
+     * @return object|null
+     */
+    protected function findExistingEntityByIdentityFields($entity, array $searchContext = [])
+    {
+        $entityName = ClassUtils::getClass($entity);
+
+        $identityValues = $searchContext;
+        $identityValues += $this->fieldHelper->getIdentityValues($entity);
+        foreach ($identityValues as $fieldName => $value) {
+            if ($value !== null ||
+                $this->fieldHelper->getConfigValue($entityName, $fieldName, 'identity_when_empty', true)
+            ) {
+                continue;
+            }
+
+            unset($identityValues[$fieldName]);
+        }
+
+        return $this->findEntityByIdentityValues($entityName, $identityValues);
+    }
+
     /**
      * Try to find entity by identity fields if at least one is specified
      *

From 20a8ef211257f5accc0fbc74f6057cc211f89f7e Mon Sep 17 00:00:00 2001
From: Oleksandr Nechyporenko <onechyporenko@magecore.com>
Date: Tue, 24 Nov 2015 14:57:50 +0200
Subject: [PATCH 047/471] BB-1582: Move theme info file to theme folder  - fix
 tests

---
 .../Resources/views/Layout/php/style_widget.html.php            | 1 +
 src/Oro/Bundle/LayoutBundle/Tests/Functional/RendererTest.php   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/style_widget.html.php b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/style_widget.html.php
index 618a97a77d1..5fd9ff82bc0 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/style_widget.html.php
+++ b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/style_widget.html.php
@@ -1,5 +1,6 @@
 <?php //@codingStandardsIgnoreFile ?>
 <?php if (!empty($attr['href'])): ?>
+    <?php $attr['href'] = $view['assets']->getUrl($attr['href']); ?>
     <link rel="stylesheet" <?php echo $view['layout']->block($block, 'block_attributes', array('attr' => $attr)) ?>/>
 <?php else: ?>
     <style <?php echo $view['layout']->block($block, 'block_attributes', array('attr' => $attr)) ?>>
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Functional/RendererTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Functional/RendererTest.php
index 1fbf9b80f0b..58cb0c96476 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Functional/RendererTest.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Functional/RendererTest.php
@@ -322,7 +322,7 @@ protected function getCoreBlocksTestLayoutResult($formLayout)
         <style type="text/css" scoped="scoped">
             body { color: red; }
         </style>
-        <link rel="stylesheet" type="text/css" href="test.css"/>
+        <link rel="stylesheet" type="text/css" href="/test.css"/>
         <script type="text/javascript" async="async">
             alert('test');
         </script>

From 9337c8a44907699f3a20a4c8ec5e220d5049e11d Mon Sep 17 00:00:00 2001
From: Mykhailo Kudelia <mkudelia@magecore.com>
Date: Fri, 27 Nov 2015 14:00:41 +0200
Subject: [PATCH 048/471] BAP-9418: Reports field filter with source or quarter
 type unexpected behaviour

---
 .../FilterBundle/Form/EventListener/DateFilterSubscriber.php    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Oro/Bundle/FilterBundle/Form/EventListener/DateFilterSubscriber.php b/src/Oro/Bundle/FilterBundle/Form/EventListener/DateFilterSubscriber.php
index 94ba5a0c051..3822f505694 100644
--- a/src/Oro/Bundle/FilterBundle/Form/EventListener/DateFilterSubscriber.php
+++ b/src/Oro/Bundle/FilterBundle/Form/EventListener/DateFilterSubscriber.php
@@ -119,9 +119,7 @@ function ($data) {
                 $this->mapValues($children, $data, $this->getDatePartAccessorClosure('Y'));
                 $this->replaceValueFields($form->get('value'), array_flip(range(date('Y') - 50, date('Y') + 50)));
                 break;
-            // in case we do not need any value to be mapped(converted), in other words - use as is
             case DateModifierInterface::PART_SOURCE:
-                return;
             case DateModifierInterface::PART_VALUE:
             default:
                 $this->mapValues(

From 3628d7e8c4d6ad13a85258f760c8f7b186ca6680 Mon Sep 17 00:00:00 2001
From: Oleksandr Nechyporenko <onechyporenko@magecore.com>
Date: Fri, 27 Nov 2015 15:12:48 +0200
Subject: [PATCH 049/471] BB-1535: Create login page based on new layout  - add
 html block type

---
 .../Layout/Block/Type/HtmlType.php            | 26 +++++++++++++++++++
 .../Resources/config/block_types.yml          |  5 ++++
 .../Resources/doc/what_is_layout.md           |  1 +
 .../views/Layout/div_layout.html.twig         |  4 +++
 .../views/Layout/php/html_widget.html.php     |  2 ++
 .../Tests/Functional/RendererTest.php         |  2 ++
 .../Tests/Unit/BlockTypeTestCase.php          |  3 ++-
 .../Unit/Layout/Block/Type/HtmlTypeTest.php   | 24 +++++++++++++++++
 8 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 src/Oro/Bundle/LayoutBundle/Layout/Block/Type/HtmlType.php
 create mode 100644 src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/html_widget.html.php
 create mode 100644 src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/HtmlTypeTest.php

diff --git a/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/HtmlType.php b/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/HtmlType.php
new file mode 100644
index 00000000000..37cfa544b2c
--- /dev/null
+++ b/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/HtmlType.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Oro\Bundle\LayoutBundle\Layout\Block\Type;
+
+use Oro\Component\Layout\Block\Type\AbstractType;
+
+class HtmlType extends AbstractType
+{
+    const NAME = 'html';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return self::NAME;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getParent()
+    {
+        return TextType::NAME;
+    }
+}
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/config/block_types.yml b/src/Oro/Bundle/LayoutBundle/Resources/config/block_types.yml
index 17a23227d80..9af68398aa0 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/config/block_types.yml
+++ b/src/Oro/Bundle/LayoutBundle/Resources/config/block_types.yml
@@ -71,6 +71,11 @@ services:
         tags:
              - { name: layout.block_type, alias: text }
 
+    oro_layout.block_type.html:
+        class: Oro\Bundle\LayoutBundle\Layout\Block\Type\HtmlType
+        tags:
+             - { name: layout.block_type, alias: html }
+
     oro_layout.block_type.link:
         class: Oro\Bundle\LayoutBundle\Layout\Block\Type\LinkType
         tags:
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/doc/what_is_layout.md b/src/Oro/Bundle/LayoutBundle/Resources/doc/what_is_layout.md
index 465c1712f1f..d597db463e2 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/doc/what_is_layout.md
+++ b/src/Oro/Bundle/LayoutBundle/Resources/doc/what_is_layout.md
@@ -58,5 +58,6 @@ The **OroLayoutBundle** introduces a set of block types that allow to easily bui
 | `ordered_list` | [OrderedListType.php](../../Layout/Block/Type/OrderedListType.php) | `<ol>` |
 | `list_item` | [ListItemType.php](../../Layout/Block/Type/ListItemType.php) | `<li>`, this block type can be used if you want to control rendering of `li` tag and its attributes |
 | `text` | [TextType.php](../../Layout/Block/Type/TextType.php) | Text node |
+| `html` | [HtmlType.php](../../Layout/Block/Type/HtmlType.php) | Html node |
 | `button` | [ButtonType.php](../../Layout/Block/Type/ButtonType.php) | `<button>` or `<input type="submit/reset/button">` |
 | `button_group` | [ButtonGroupType.php](../../Layout/Block/Type/ButtonGroupType.php) | Nothing, this is just a logical grouping of buttons. You can define how to render the button group in your application |
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
index 02c1d538678..74da72dbf74 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
+++ b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
@@ -104,6 +104,10 @@
     {{ text|block_text(translation_domain) }}
 {%- endblock %}
 
+{% block html_widget -%}
+    {{ text|block_text(translation_domain)|raw }}
+{%- endblock %}
+
 {% block link_widget -%}
     <a{{ block('block_attributes') }} href="{{ path is defined ? path : path(route_name, route_parameters) }}">
         {%- if icon is defined %}{{ block('icon_block') }}{% endif %}
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/html_widget.html.php b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/html_widget.html.php
new file mode 100644
index 00000000000..6099166cd73
--- /dev/null
+++ b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/html_widget.html.php
@@ -0,0 +1,2 @@
+<?php //@codingStandardsIgnoreFile ?>
+<?php echo $view['layout']->text($text, $translation_domain) ?>
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Functional/RendererTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Functional/RendererTest.php
index 58cb0c96476..09219448169 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Functional/RendererTest.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Functional/RendererTest.php
@@ -156,6 +156,7 @@ protected function getCoreBlocksTestLayout(ContextInterface $context)
             )
             ->add('external_resource', 'head', 'external_resource', ['href' => 'test.css', 'rel' => 'stylesheet'])
             ->add('content', 'root', 'body')
+            ->add('top_content', 'content', 'html', ['text' => '<header>Renderer <b>Test</b>!</header>'])
             ->add('list', 'content', 'list')
             ->add(
                 'list_item_1',
@@ -331,6 +332,7 @@ protected function getCoreBlocksTestLayoutResult($formLayout)
 <body class="test-body class2">
     <button name="btn1"><i class="icon-plus hide-text"></i>Btn1</button>
     <input type="submit" name="btn2" value="Btn2"/>
+    <header>Renderer <b>Test</b>!</header>
     <ul>
         <li>Hi World!</li>
         <li class="list-item-2"><a href="http://example.com">Hi World!</a></li>
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/BlockTypeTestCase.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/BlockTypeTestCase.php
index ea17024cf6a..54ff7d76450 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/BlockTypeTestCase.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/BlockTypeTestCase.php
@@ -45,6 +45,7 @@ protected function initializeLayoutFactoryBuilder(LayoutFactoryBuilderInterface
             ->addType(new Type\ButtonGroupType())
             ->addType(new Type\ListType())
             ->addType(new Type\OrderedListType())
-            ->addType(new Type\ListItemType());
+            ->addType(new Type\ListItemType())
+            ->addType(new Type\HtmlType());
     }
 }
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/HtmlTypeTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/HtmlTypeTest.php
new file mode 100644
index 00000000000..692e0c52986
--- /dev/null
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/HtmlTypeTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Oro\Bundle\LayoutBundle\Tests\Unit\Layout\Block\Type;
+
+use Oro\Bundle\LayoutBundle\Layout\Block\Type\HtmlType;
+use Oro\Bundle\LayoutBundle\Layout\Block\Type\TextType;
+use Oro\Bundle\LayoutBundle\Tests\Unit\BlockTypeTestCase;
+
+class HtmlTypeTest extends BlockTypeTestCase
+{
+    public function testGetName()
+    {
+        $type = $this->getBlockType(HtmlType::NAME);
+
+        $this->assertSame(HtmlType::NAME, $type->getName());
+    }
+
+    public function testGetParent()
+    {
+        $type = $this->getBlockType(HtmlType::NAME);
+
+        $this->assertSame(TextType::NAME, $type->getParent());
+    }
+}

From 76aa9ed520720c48d518be5a2f6f5481e468bfb3 Mon Sep 17 00:00:00 2001
From: Oleksandr Nechyporenko <onechyporenko@magecore.com>
Date: Fri, 27 Nov 2015 17:07:53 +0200
Subject: [PATCH 050/471] BB-1535: Create login page based on new layout  -
 update base block type functionality

---
 .../views/Layout/div_layout.html.twig         | 21 ++++++++++++++-
 .../Layout/php/block_attributes.html.php      |  3 ++-
 .../views/Layout/php/block_widget.html.php    |  5 +++-
 .../Tests/Functional/RendererTest.php         | 17 +++++++++++-
 .../Component/Layout/Block/Type/BaseType.php  | 27 ++++++++++++++++++-
 5 files changed, 68 insertions(+), 5 deletions(-)

diff --git a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
index 74da72dbf74..13c27d964f9 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
+++ b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
@@ -1,4 +1,8 @@
 {% block block_widget -%}
+    {% if tag %}
+        <{{ tag }}{{ block('block_attributes') }}>
+        </{{ tag }}>
+    {% endif %}
 {%- endblock %}
 
 {% block block_label -%}
@@ -6,7 +10,7 @@
         {%- if label is empty -%}
             {% set label = id|humanize %}
         {%- endif -%}
-        <label{% if label_attr is defined %}{% for attrname, attrvalue in label_attr %} {% if attrname is same as('title') %}{{ attrname }}="{{ attrvalue|block_text(translation_domain) }}"{% else %}{{ attrname }}="{{ attrvalue }}"{% endif %}{% endfor %}{% endif %}>{{ label|block_text(translation_domain) }}</label>
+        <label{{ block('block_label_attributes') }}>{{ label|block_text(translation_domain) }}</label>
     {%- endif %}
 {%- endblock %}
 
@@ -16,9 +20,23 @@
 {%- endblock %}
 
 {% block block_attributes -%}
+    {% if attr.class is defined %}
+        {% set attr = attr|merge({
+            class: attr.class|replace({'{{ class_prefix }}': class_prefix})
+        }) %}
+    {% endif %}
     {% for attrname, attrvalue in attr %} {% if attrname is same as('title') %}{{ attrname }}="{{ attrvalue|block_text(translation_domain) }}"{% else %}{{ attrname }}="{{ attrvalue }}"{% endif %}{% endfor %}
 {%- endblock %}
 
+{% block block_label_attributes -%}
+    {% if label_attr.class is defined %}
+        {% set label_attr = label_attr|merge({
+            class: label_attr.class|replace({'{{ class_prefix }}': class_prefix})
+        }) %}
+    {% endif %}
+    {% for attrname, attrvalue in label_attr %} {% if attrname is same as('title') %}{{ attrname }}="{{ attrvalue|block_text(translation_domain) }}"{% else %}{{ attrname }}="{{ attrvalue }}"{% endif %}{% endfor %}
+{%- endblock %}
+
 {% block icon_block -%}
     <i class="icon-{{ icon }}{% if icon_class is defined %} {{ icon_class }}{% endif %}"></i>
 {%- endblock %}
@@ -49,6 +67,7 @@
 
 {% block script_widget %}
     {% if attr.src is defined and attr.src is not empty %}
+        {% set attr = attr|merge({src: asset(attr.src)}) %}
         <script{{ block('block_attributes') }}></script>
     {% else %}
         <script{{ block('block_attributes') }}>
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/block_attributes.html.php b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/block_attributes.html.php
index c7d9ca9af26..4057855695b 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/block_attributes.html.php
+++ b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/block_attributes.html.php
@@ -1,4 +1,5 @@
 <?php //@codingStandardsIgnoreFile ?>
+<?php if (isset($attr['class'])) $attr['class'] = str_replace('{{ class_prefix }}', $class_prefix, $attr['class']); ?>
 <?php foreach ($attr as $k => $v): ?>
-<?php printf('%s="%s" ', $view->escape($k), $view->escape($k === 'title' ? $view['layout']->text($v, $translation_domain) : $v)) ?>
+    <?php printf('%s="%s" ', $view->escape($k), $view->escape($k === 'title' ? $view['layout']->text($v, $translation_domain) : $v)) ?>
 <?php endforeach; ?>
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/block_widget.html.php b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/block_widget.html.php
index 9eaca89c8bf..9ef2b87daee 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/block_widget.html.php
+++ b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/block_widget.html.php
@@ -1,2 +1,5 @@
 <?php //@codingStandardsIgnoreFile ?>
-<?php echo '' ?>
+<?php if ($tag): ?>
+    <<?php echo $tag ?> <?php echo $view['layout']->block($block, 'block_attributes') ?>>
+    </<?php echo $tag ?>>
+<?php endif ?>
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Functional/RendererTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Functional/RendererTest.php
index 09219448169..30564b64429 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Functional/RendererTest.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Functional/RendererTest.php
@@ -155,7 +155,7 @@ protected function getCoreBlocksTestLayout(ContextInterface $context)
                 ]
             )
             ->add('external_resource', 'head', 'external_resource', ['href' => 'test.css', 'rel' => 'stylesheet'])
-            ->add('content', 'root', 'body')
+            ->add('content', 'root', 'body', ['class_prefix' => 'content'])
             ->add('top_content', 'content', 'html', ['text' => '<header>Renderer <b>Test</b>!</header>'])
             ->add('list', 'content', 'list')
             ->add(
@@ -273,6 +273,20 @@ protected function getCoreBlocksTestLayout(ContextInterface $context)
                 ['type' => 'input', 'action' => 'submit', 'name' => 'btn2', 'text' => 'Btn2'],
                 'button'
             )
+            ->add(
+                'block_tag',
+                'content',
+                'block',
+                [
+                    'tag' => 'input',
+                    'attr' => [
+                        'type' => 'button',
+                        'value' => 'Block button',
+                        'class' => '{{ class_prefix }}_input',
+                    ]
+                ],
+                'button'
+            )
             // test manipulations of 'class' attribute
             ->appendOption('content', 'attr.class', ['@join' => [' ', 'class1', 'class2']])
             ->replaceOption('content', 'attr.class', 'class1', ['@value' => ['$context.body_class']])
@@ -331,6 +345,7 @@ protected function getCoreBlocksTestLayoutResult($formLayout)
     </head>
 <body class="test-body class2">
     <button name="btn1"><i class="icon-plus hide-text"></i>Btn1</button>
+    <input type="button" value="Block button" class="content_input"></input>
     <input type="submit" name="btn2" value="Btn2"/>
     <header>Renderer <b>Test</b>!</header>
     <ul>
diff --git a/src/Oro/Component/Layout/Block/Type/BaseType.php b/src/Oro/Component/Layout/Block/Type/BaseType.php
index 95f5c984038..fa96e24f013 100644
--- a/src/Oro/Component/Layout/Block/Type/BaseType.php
+++ b/src/Oro/Component/Layout/Block/Type/BaseType.php
@@ -16,7 +16,14 @@ class BaseType extends AbstractType
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setOptional(['vars', 'attr', 'label', 'label_attr', 'translation_domain']);
+        $resolver->setDefaults(
+            [
+                'tag' => null,
+                'attr' => [],
+                'label_attr' => [],
+            ]
+        );
+        $resolver->setOptional(['vars', 'label', 'translation_domain', 'class_prefix']);
         $resolver->setAllowedTypes(
             [
                 'vars'       => 'array',
@@ -39,6 +46,14 @@ public function buildView(BlockView $view, BlockInterface $block, array $options
         // add the view to itself vars to allow get it using 'block' variable in a rendered, for example TWIG
         $view->vars['block'] = $view;
 
+        $view->vars['tag'] = $options['tag'];
+        $view->vars['class_prefix'] = null;
+        if (isset($options['class_prefix'])) {
+            $view->vars['class_prefix'] = $options['class_prefix'];
+        } elseif($view->parent) {
+            $view->vars['class_prefix'] = $view->parent->vars['class_prefix'];
+        }
+
         // replace attributes if specified ('attr' variable always exists in a view because it is added by FormView)
         if (isset($options['attr'])) {
             $view->vars['attr'] = $options['attr'];
@@ -72,6 +87,16 @@ public function buildView(BlockView $view, BlockInterface $block, array $options
         $view->vars['cache_key']           = sprintf('_%s_%s', $id, $name);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function finishView(BlockView $view, BlockInterface $block, array $options)
+    {
+        if (isset($view->vars['attr']['id']) && !isset($view->vars['label_attr']['for'])) {
+            $view->vars['label_attr']['for'] = $view->vars['attr']['id'];
+        }
+    }
+
     /**
      * {@inheritdoc}
      */

From 554131a6fc00212fd31371b0bf46f0a29a23f9ee Mon Sep 17 00:00:00 2001
From: Oleksandr Nechyporenko <onechyporenko@magecore.com>
Date: Fri, 27 Nov 2015 18:36:01 +0200
Subject: [PATCH 051/471] BB-1535: Create login page based on new layout  - add
 input block type

---
 .../Layout/Block/Type/InputType.php           | 65 ++++++++++++++
 .../Resources/config/block_types.yml          |  5 ++
 .../Resources/doc/what_is_layout.md           |  1 +
 .../views/Layout/div_layout.html.twig         | 11 +++
 .../Tests/Functional/RendererTest.php         |  8 ++
 .../Tests/Unit/BlockTypeTestCase.php          |  3 +-
 .../Unit/Layout/Block/Type/InputTypeTest.php  | 90 +++++++++++++++++++
 .../Component/Layout/Block/Type/BaseType.php  | 22 +++--
 8 files changed, 196 insertions(+), 9 deletions(-)
 create mode 100644 src/Oro/Bundle/LayoutBundle/Layout/Block/Type/InputType.php
 create mode 100644 src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/InputTypeTest.php

diff --git a/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/InputType.php b/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/InputType.php
new file mode 100644
index 00000000000..e7806ca8193
--- /dev/null
+++ b/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/InputType.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Oro\Bundle\LayoutBundle\Layout\Block\Type;
+
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+
+use Oro\Component\Layout\Block\Type\AbstractType;
+use Oro\Component\Layout\BlockInterface;
+use Oro\Component\Layout\BlockView;
+
+class InputType extends AbstractType
+{
+    const NAME = 'input';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $resolver
+            ->setDefaults(
+                [
+                    'tag' => 'input',
+                    'type' => 'text',
+                    'id' => null,
+                    'name' => null,
+                    'value' => null,
+                    'placeholder' => null,
+                ]
+            );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function buildView(BlockView $view, BlockInterface $block, array $options)
+    {
+        $view->vars['type'] = $view->vars['attr']['type'] = $options['type'];
+
+        if ($options['name']) {
+            $view->vars['attr']['name'] = $options['name'];
+        }
+        if ($options['id']) {
+            $view->vars['attr']['id'] = $options['id'];
+        }
+        if ($options['placeholder']) {
+            $view->vars['attr']['placeholder'] = $options['placeholder'];
+        }
+        if ($options['value']) {
+            $view->vars['attr']['value'] = $options['value'];
+        }
+
+        if ($options['type'] === 'password') {
+            $view->vars['attr']['autocomplete'] = 'off';
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return self::NAME;
+    }
+}
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/config/block_types.yml b/src/Oro/Bundle/LayoutBundle/Resources/config/block_types.yml
index 9af68398aa0..299c49aa3a9 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/config/block_types.yml
+++ b/src/Oro/Bundle/LayoutBundle/Resources/config/block_types.yml
@@ -34,6 +34,11 @@ services:
         tags:
              - { name: layout.block_type, alias: style }
 
+    oro_layout.block_type.input:
+        class: Oro\Bundle\LayoutBundle\Layout\Block\Type\InputType
+        tags:
+             - { name: layout.block_type, alias: input }
+
     oro_layout.block_type.body:
         class: Oro\Bundle\LayoutBundle\Layout\Block\Type\BodyType
         tags:
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/doc/what_is_layout.md b/src/Oro/Bundle/LayoutBundle/Resources/doc/what_is_layout.md
index d597db463e2..ca50b736d52 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/doc/what_is_layout.md
+++ b/src/Oro/Bundle/LayoutBundle/Resources/doc/what_is_layout.md
@@ -59,5 +59,6 @@ The **OroLayoutBundle** introduces a set of block types that allow to easily bui
 | `list_item` | [ListItemType.php](../../Layout/Block/Type/ListItemType.php) | `<li>`, this block type can be used if you want to control rendering of `li` tag and its attributes |
 | `text` | [TextType.php](../../Layout/Block/Type/TextType.php) | Text node |
 | `html` | [HtmlType.php](../../Layout/Block/Type/HtmlType.php) | Html node |
+| `input` | [InputType.php](../../Layout/Block/Type/InputType.php) | Input node |
 | `button` | [ButtonType.php](../../Layout/Block/Type/ButtonType.php) | `<button>` or `<input type="submit/reset/button">` |
 | `button_group` | [ButtonGroupType.php](../../Layout/Block/Type/ButtonGroupType.php) | Nothing, this is just a logical grouping of buttons. You can define how to render the button group in your application |
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
index 13c27d964f9..d68b3144dad 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
+++ b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
@@ -41,6 +41,17 @@
     <i class="icon-{{ icon }}{% if icon_class is defined %} {{ icon_class }}{% endif %}"></i>
 {%- endblock %}
 
+{% block input_widget -%}
+    {% if attr.placeholder is defined %}
+        {% set attr = attr|merge({
+            placeholder: attr.placeholder|block_text(translation_domain)
+        }) %}
+    {% endif %}
+    {{ block_widget(block, {
+        attr: attr
+    }) }}
+{%- endblock %}
+
 {% block container_widget -%}
     {% for child in block if child.vars.visible -%}
         {{ block_widget(child) }}
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Functional/RendererTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Functional/RendererTest.php
index 30564b64429..0643a83aac8 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Functional/RendererTest.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Functional/RendererTest.php
@@ -273,6 +273,13 @@ protected function getCoreBlocksTestLayout(ContextInterface $context)
                 ['type' => 'input', 'action' => 'submit', 'name' => 'btn2', 'text' => 'Btn2'],
                 'button'
             )
+            ->add(
+                'input_text',
+                'content',
+                'input',
+                ['name' => 'search'],
+                'button'
+            )
             ->add(
                 'block_tag',
                 'content',
@@ -346,6 +353,7 @@ protected function getCoreBlocksTestLayoutResult($formLayout)
 <body class="test-body class2">
     <button name="btn1"><i class="icon-plus hide-text"></i>Btn1</button>
     <input type="button" value="Block button" class="content_input"></input>
+    <input type="text" name="search"></input>
     <input type="submit" name="btn2" value="Btn2"/>
     <header>Renderer <b>Test</b>!</header>
     <ul>
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/BlockTypeTestCase.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/BlockTypeTestCase.php
index 54ff7d76450..5c8942fcb6c 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/BlockTypeTestCase.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/BlockTypeTestCase.php
@@ -46,6 +46,7 @@ protected function initializeLayoutFactoryBuilder(LayoutFactoryBuilderInterface
             ->addType(new Type\ListType())
             ->addType(new Type\OrderedListType())
             ->addType(new Type\ListItemType())
-            ->addType(new Type\HtmlType());
+            ->addType(new Type\HtmlType())
+            ->addType(new Type\InputType());
     }
 }
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/InputTypeTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/InputTypeTest.php
new file mode 100644
index 00000000000..75d18b0c27f
--- /dev/null
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/InputTypeTest.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace Oro\Bundle\LayoutBundle\Tests\Unit\Layout\Block\Type;
+
+use Oro\Component\Layout\Block\Type\BaseType;
+
+use Oro\Bundle\LayoutBundle\Layout\Block\Type\InputType;
+use Oro\Bundle\LayoutBundle\Tests\Unit\BlockTypeTestCase;
+
+class InputTypeTest extends BlockTypeTestCase
+{
+    public function testGetName()
+    {
+        $type = $this->getBlockType(InputType::NAME);
+
+        $this->assertSame(InputType::NAME, $type->getName());
+    }
+
+    public function testGetParent()
+    {
+        $type = $this->getBlockType(InputType::NAME);
+
+        $this->assertSame(BaseType::NAME, $type->getParent());
+    }
+
+    public function testSetDefaultOptions()
+    {
+        $this->assertEquals(
+            [
+                'tag' => 'input',
+                'type' => 'text',
+                'id' => null,
+                'name' => null,
+                'value' => null,
+                'placeholder' => null,
+            ],
+            $this->resolveOptions(InputType::NAME, [])
+        );
+
+        $options = [
+            'type' => 'password',
+            'id' => 'passwordId',
+            'name' => 'passwordName',
+            'value' => '***',
+            'placeholder' => 'Enter password',
+        ];
+        $this->assertEquals(['tag' => 'input'] + $options, $this->resolveOptions(InputType::NAME, $options));
+    }
+
+    public function testBuildViewPassword()
+    {
+        $view = $this->getBlockView(InputType::NAME, ['type' => 'password']);
+
+        $this->assertEquals('password', $view->vars['type']);
+        $this->assertEquals(
+            [
+                'type' => 'password',
+                'autocomplete' => 'off',
+            ],
+            $view->vars['attr']
+        );
+    }
+
+    public function testBuildViewWithoutOptions()
+    {
+        $view = $this->getBlockView(InputType::NAME);
+
+        $this->assertEquals(
+            [
+                'type' => 'text',
+            ],
+            $view->vars['attr']
+        );
+    }
+
+    public function testBuildView()
+    {
+        $options = [
+            'id' => 'usernameId',
+            'name' => 'usernameName',
+            'value' => 'username',
+            'placeholder' => 'Enter username',
+        ];
+
+        $view = $this->getBlockView(InputType::NAME, $options);
+
+        $this->assertEquals('text', $view->vars['type']);
+        $this->assertEquals(['type' => 'text'] + $options, $view->vars['attr']);
+    }
+}
diff --git a/src/Oro/Component/Layout/Block/Type/BaseType.php b/src/Oro/Component/Layout/Block/Type/BaseType.php
index fa96e24f013..12795a9f947 100644
--- a/src/Oro/Component/Layout/Block/Type/BaseType.php
+++ b/src/Oro/Component/Layout/Block/Type/BaseType.php
@@ -16,19 +16,24 @@ class BaseType extends AbstractType
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(
+        $resolver->setOptional(
             [
-                'tag' => null,
-                'attr' => [],
-                'label_attr' => [],
+                'vars',
+                'tag',
+                'attr',
+                'label',
+                'label_attr',
+                'translation_domain',
+                'class_prefix'
             ]
         );
-        $resolver->setOptional(['vars', 'label', 'translation_domain', 'class_prefix']);
         $resolver->setAllowedTypes(
             [
                 'vars'       => 'array',
+                'tag'        => 'string',
                 'attr'       => 'array',
-                'label_attr' => 'array'
+                'label_attr' => 'array',
+                'class_prefix' => 'string'
             ]
         );
     }
@@ -46,11 +51,11 @@ public function buildView(BlockView $view, BlockInterface $block, array $options
         // add the view to itself vars to allow get it using 'block' variable in a rendered, for example TWIG
         $view->vars['block'] = $view;
 
-        $view->vars['tag'] = $options['tag'];
+        $view->vars['tag'] = isset($options['tag']) ? $options['tag'] : null;
         $view->vars['class_prefix'] = null;
         if (isset($options['class_prefix'])) {
             $view->vars['class_prefix'] = $options['class_prefix'];
-        } elseif($view->parent) {
+        } elseif ($view->parent) {
             $view->vars['class_prefix'] = $view->parent->vars['class_prefix'];
         }
 
@@ -62,6 +67,7 @@ public function buildView(BlockView $view, BlockInterface $block, array $options
         // add label text and attributes if specified
         if (isset($options['label'])) {
             $view->vars['label'] = $options['label'];
+            $view->vars['label_attr'] = [];
             if (isset($options['label_attr'])) {
                 $view->vars['label_attr'] = $options['label_attr'];
             }

From eeb3eb65f16be9fab68d441c282b14316b0d2bf6 Mon Sep 17 00:00:00 2001
From: Andrey Yatsenco <yatsenco@gmail.com>
Date: Mon, 30 Nov 2015 18:21:10 +0200
Subject: [PATCH 052/471] BB-1534: Create abstract form context configurator in
 LayoutBundle - added $data.accountUserDataProvider for registration form -
 added $context.frontend_account_registration_form with registration form -
 added posibility to set form data from layout updates like, you can now
 create form like this                 form:                     blockType:
 form                     options:                         form_name:
 'frontend_account_registration_form'                         form_data: {
 @value: $data.newAccountUser }                 form_start:                   
  blockType: form_start                     options:                        
 form_name: 'frontend_account_registration_form'                        
 form_method: 'POST'                         form_route_name:
 'orob2b_account_frontend_account_user_register'                 form_end:    
                 blockType: form_end                     options:             
            form_name: 'frontend_account_registration_form'

---
 .../Extension/ConfigExpressionExtension.php   | 10 +--
 .../Layout/Block/Type/FormStartType.php       |  6 +-
 .../Layout/Block/Type/FormType.php            |  9 +++
 ...ndencyInjectionFormContextConfigurator.php | 66 +++++++++++++++++++
 .../Layout/Form/AbstractFormAccessor.php      | 33 ++++++++++
 .../ConfigurableFormAccessorInterface.php     | 13 ++++
 .../Form/DependencyInjectionFormAccessor.php  | 10 ++-
 .../Layout/AbstractBlockTypeExtension.php     |  2 +-
 src/Oro/Component/Layout/BlockBuilder.php     | 18 ++++-
 .../Layout/BlockBuilderInterface.php          |  6 ++
 src/Oro/Component/Layout/BlockFactory.php     |  5 +-
 .../Layout/BlockTypeExtensionInterface.php    |  4 +-
 src/Oro/Component/Layout/LayoutRegistry.php   |  2 +-
 .../Layout/LayoutRegistryInterface.php        |  4 +-
 14 files changed, 171 insertions(+), 17 deletions(-)
 create mode 100644 src/Oro/Bundle/LayoutBundle/Layout/Extension/DependencyInjectionFormContextConfigurator.php
 create mode 100644 src/Oro/Bundle/LayoutBundle/Layout/Form/ConfigurableFormAccessorInterface.php

diff --git a/src/Oro/Bundle/LayoutBundle/Layout/Block/Extension/ConfigExpressionExtension.php b/src/Oro/Bundle/LayoutBundle/Layout/Block/Extension/ConfigExpressionExtension.php
index 094692958d5..58ccf45bb37 100644
--- a/src/Oro/Bundle/LayoutBundle/Layout/Block/Extension/ConfigExpressionExtension.php
+++ b/src/Oro/Bundle/LayoutBundle/Layout/Block/Extension/ConfigExpressionExtension.php
@@ -6,8 +6,7 @@
 use Oro\Component\ConfigExpression\ExpressionInterface;
 use Oro\Component\Layout\AbstractBlockTypeExtension;
 use Oro\Component\Layout\Block\Type\BaseType;
-use Oro\Component\Layout\BlockInterface;
-use Oro\Component\Layout\BlockView;
+use Oro\Component\Layout\BlockBuilderInterface;
 use Oro\Component\Layout\ContextInterface;
 use Oro\Component\Layout\DataAccessorInterface;
 use Oro\Component\Layout\OptionValueBag;
@@ -40,13 +39,14 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function finishView(BlockView $view, BlockInterface $block, array $options)
+    public function buildBlock(BlockBuilderInterface $builder, array &$options)
     {
-        $context  = $block->getContext();
+        $context  = $builder->getContext();
+        $data  = $builder->getDataAccessor();
         $evaluate = $context->getOr('expressions_evaluate');
         $encoding = $context->getOr('expressions_encoding');
         if ($evaluate || $encoding !== null) {
-            $this->processExpressions($view->vars, $context, $block->getData(), $evaluate, $encoding);
+            $this->processExpressions($options, $context, $data, $evaluate, $encoding);
         }
     }
 
diff --git a/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/FormStartType.php b/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/FormStartType.php
index 696031816ab..c65dbd5e12f 100644
--- a/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/FormStartType.php
+++ b/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/FormStartType.php
@@ -37,8 +37,6 @@ public function buildView(BlockView $view, BlockInterface $block, array $options
     {
         $formAccessor = $this->getFormAccessor($block->getContext(), $options);
 
-        $view->vars['form'] = $formAccessor->getView();
-
         // form action
         if (isset($options['form_action'])) {
             $path = $options['form_action'];
@@ -89,6 +87,10 @@ public function buildView(BlockView $view, BlockInterface $block, array $options
      */
     public function finishView(BlockView $view, BlockInterface $block, array $options)
     {
+        $formAccessor = $this->getFormAccessor($block->getContext(), $options);
+
+        $view->vars['form'] = $formAccessor->getView();
+
         // final check of the view vars and their modification (if required)
         // we have to do this in the finishView because only here we can be sure that
         // expressions have been evaluated (if $context.expressions_evaluate is true)
diff --git a/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/FormType.php b/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/FormType.php
index a0699278c87..de79b3a607a 100644
--- a/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/FormType.php
+++ b/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/FormType.php
@@ -11,6 +11,7 @@
 use Oro\Component\Layout\BlockInterface;
 use Oro\Component\Layout\BlockBuilderInterface;
 
+use Oro\Bundle\LayoutBundle\Layout\Form\ConfigurableFormAccessorInterface;
 use Oro\Bundle\LayoutBundle\Layout\Form\FormLayoutBuilderInterface;
 
 /**
@@ -69,6 +70,9 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
                 }
             ]
         );
+        $resolver
+            ->setOptional(['form_data']);
+
         $resolver->setAllowedTypes(
             [
                 'preferred_fields'  => 'array',
@@ -95,7 +99,12 @@ public function buildBlock(BlockBuilderInterface $builder, array $options)
      */
     public function buildView(BlockView $view, BlockInterface $block, array $options)
     {
+        $view->vars['form_data'] = isset($options['form_data']) ? $options['form_data'] : null;
+
         $formAccessor = $this->getFormAccessor($block->getContext(), $options);
+        if ($formAccessor instanceof ConfigurableFormAccessorInterface) {
+            $formAccessor->setFormData($view->vars['form_data']);
+        }
 
         $view->vars['form'] = $formAccessor->getView();
     }
diff --git a/src/Oro/Bundle/LayoutBundle/Layout/Extension/DependencyInjectionFormContextConfigurator.php b/src/Oro/Bundle/LayoutBundle/Layout/Extension/DependencyInjectionFormContextConfigurator.php
new file mode 100644
index 00000000000..a1ba6876bd4
--- /dev/null
+++ b/src/Oro/Bundle/LayoutBundle/Layout/Extension/DependencyInjectionFormContextConfigurator.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Oro\Bundle\LayoutBundle\Layout\Extension;
+
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\Routing\RouterInterface;
+
+use Oro\Component\Layout\ContextConfiguratorInterface;
+use Oro\Component\Layout\ContextInterface;
+use Oro\Bundle\LayoutBundle\Layout\Form\DependencyInjectionFormAccessor;
+
+/**
+ * Adds FormAccessor to Context by name of form type
+ */
+class DependencyInjectionFormContextConfigurator implements ContextConfiguratorInterface
+{
+    /** @var  string */
+    protected $contextOptionName;
+
+    /** @var  string */
+    protected $formServiceId;
+
+    /** @var ContainerInterface */
+    protected $container;
+
+    /**
+     * @param ContainerInterface $container
+     */
+    public function __construct(ContainerInterface $container)
+    {
+        $this->container = $container;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureContext(ContextInterface $context)
+    {
+        if (!$this->formServiceId) {
+            throw new \Exception('formServiceId should be specified.');
+        }
+        $formAccessor = new DependencyInjectionFormAccessor(
+            $this->container,
+            $this->formServiceId
+        );
+
+        $context->getResolver()
+            ->setDefaults([$this->contextOptionName => $formAccessor]);
+    }
+
+    /**
+     * @param string $contextOptionName
+     */
+    public function setContextOptionName($contextOptionName)
+    {
+        $this->contextOptionName = $contextOptionName;
+    }
+
+    /**
+     * @param string $formServiceId
+     */
+    public function setFormServiceId($formServiceId)
+    {
+        $this->formServiceId = $formServiceId;
+    }
+}
diff --git a/src/Oro/Bundle/LayoutBundle/Layout/Form/AbstractFormAccessor.php b/src/Oro/Bundle/LayoutBundle/Layout/Form/AbstractFormAccessor.php
index 48bb7316865..fe8761d0711 100644
--- a/src/Oro/Bundle/LayoutBundle/Layout/Form/AbstractFormAccessor.php
+++ b/src/Oro/Bundle/LayoutBundle/Layout/Form/AbstractFormAccessor.php
@@ -50,6 +50,23 @@ public function getAction()
         return $this->action;
     }
 
+    /**
+     * @param FormAction $action
+     */
+    public function setAction(FormAction $action)
+    {
+        $this->action = $action;
+    }
+
+    /**
+     * @param string $route
+     * @param array $routeParams
+     */
+    public function setActionRoute($route, array $routeParams = [])
+    {
+        $this->action = FormAction::createByRoute($route, $routeParams);
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -60,6 +77,14 @@ public function getMethod()
         return $this->method;
     }
 
+    /**
+     * @param string|null $method
+     */
+    public function setMethod($method)
+    {
+        $this->method = $method;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -70,6 +95,14 @@ public function getEnctype()
         return $this->enctype;
     }
 
+    /**
+     * @param string|null $enctype
+     */
+    public function setEnctype($enctype)
+    {
+        $this->enctype = $enctype;
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Oro/Bundle/LayoutBundle/Layout/Form/ConfigurableFormAccessorInterface.php b/src/Oro/Bundle/LayoutBundle/Layout/Form/ConfigurableFormAccessorInterface.php
new file mode 100644
index 00000000000..2e0f3de1eb4
--- /dev/null
+++ b/src/Oro/Bundle/LayoutBundle/Layout/Form/ConfigurableFormAccessorInterface.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Oro\Bundle\LayoutBundle\Layout\Form;
+
+interface ConfigurableFormAccessorInterface extends FormAccessorInterface
+{
+    /**
+     * Sets the form data.
+     *
+     * @param mixed
+     */
+    public function setFormData($data);
+}
diff --git a/src/Oro/Bundle/LayoutBundle/Layout/Form/DependencyInjectionFormAccessor.php b/src/Oro/Bundle/LayoutBundle/Layout/Form/DependencyInjectionFormAccessor.php
index 77caa370fb3..29589f32252 100644
--- a/src/Oro/Bundle/LayoutBundle/Layout/Form/DependencyInjectionFormAccessor.php
+++ b/src/Oro/Bundle/LayoutBundle/Layout/Form/DependencyInjectionFormAccessor.php
@@ -5,7 +5,7 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Form\FormInterface;
 
-class DependencyInjectionFormAccessor extends AbstractFormAccessor
+class DependencyInjectionFormAccessor extends AbstractFormAccessor implements ConfigurableFormAccessorInterface
 {
     /** @var ContainerInterface */
     protected $container;
@@ -61,4 +61,12 @@ public function toString()
     {
         return $this->hash;
     }
+
+    /**
+     * @param mixed $formData
+     */
+    public function setFormData($formData)
+    {
+        $this->form->setData($formData);
+    }
 }
diff --git a/src/Oro/Component/Layout/AbstractBlockTypeExtension.php b/src/Oro/Component/Layout/AbstractBlockTypeExtension.php
index 363894a4edf..7aff9cb0e8c 100644
--- a/src/Oro/Component/Layout/AbstractBlockTypeExtension.php
+++ b/src/Oro/Component/Layout/AbstractBlockTypeExtension.php
@@ -9,7 +9,7 @@ abstract class AbstractBlockTypeExtension implements BlockTypeExtensionInterface
     /**
      * {@inheritdoc}
      */
-    public function buildBlock(BlockBuilderInterface $builder, array $options)
+    public function buildBlock(BlockBuilderInterface $builder, array &$options)
     {
     }
 
diff --git a/src/Oro/Component/Layout/BlockBuilder.php b/src/Oro/Component/Layout/BlockBuilder.php
index 6ee743d894b..52d72a70d9d 100644
--- a/src/Oro/Component/Layout/BlockBuilder.php
+++ b/src/Oro/Component/Layout/BlockBuilder.php
@@ -19,22 +19,30 @@ final class BlockBuilder implements BlockBuilderInterface
     /** @var string */
     private $id;
 
+    /**
+     * @var DataAccessorInterface
+     */
+    private $dataAccessor;
+
     /**
      * @param LayoutManipulatorInterface $layoutManipulator
      * @param RawLayout                $rawLayout
      * @param BlockTypeHelperInterface $typeHelper
      * @param ContextInterface         $context
+     * @param DataAccessorInterface    $dataAccessor
      */
     public function __construct(
         LayoutManipulatorInterface $layoutManipulator,
         RawLayout $rawLayout,
         BlockTypeHelperInterface $typeHelper,
-        ContextInterface $context
+        ContextInterface $context,
+        DataAccessorInterface $dataAccessor
     ) {
         $this->layoutManipulator = $layoutManipulator;
         $this->rawLayout         = $rawLayout;
         $this->typeHelper        = $typeHelper;
         $this->context           = $context;
+        $this->dataAccessor      = $dataAccessor;
     }
 
     /**
@@ -90,4 +98,12 @@ public function getContext()
     {
         return $this->context;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getDataAccessor()
+    {
+        return $this->dataAccessor;
+    }
 }
diff --git a/src/Oro/Component/Layout/BlockBuilderInterface.php b/src/Oro/Component/Layout/BlockBuilderInterface.php
index f359cd5502c..f87d9bfff71 100644
--- a/src/Oro/Component/Layout/BlockBuilderInterface.php
+++ b/src/Oro/Component/Layout/BlockBuilderInterface.php
@@ -38,4 +38,10 @@ public function getTypeHelper();
      * @return ContextInterface
      */
     public function getContext();
+
+    /**
+     * Returns the layout data
+     * @return DataAccessorInterface
+     */
+    public function getDataAccessor();
 }
diff --git a/src/Oro/Component/Layout/BlockFactory.php b/src/Oro/Component/Layout/BlockFactory.php
index 2450cbaf3be..26918b2adb1 100644
--- a/src/Oro/Component/Layout/BlockFactory.php
+++ b/src/Oro/Component/Layout/BlockFactory.php
@@ -87,7 +87,8 @@ protected function initializeState(RawLayout $rawLayout, ContextInterface $conte
             $this->layoutManipulator,
             $this->rawLayout,
             $this->typeHelper,
-            $this->context
+            $this->context,
+            $this->dataAccessor
         );
         $this->block           = new Block(
             $this->rawLayout,
@@ -204,7 +205,6 @@ protected function buildBlock($id)
 
         // resolve options
         $resolvedOptions = $this->optionsResolver->resolveOptions($blockType, $options);
-        $this->rawLayout->setProperty($id, RawLayout::RESOLVED_OPTIONS, $resolvedOptions);
 
         // point the block builder state to the current block
         $this->blockBuilder->initialize($id);
@@ -213,6 +213,7 @@ protected function buildBlock($id)
             $type->buildBlock($this->blockBuilder, $resolvedOptions);
             $this->registry->buildBlock($type->getName(), $this->blockBuilder, $resolvedOptions);
         }
+        $this->rawLayout->setProperty($id, RawLayout::RESOLVED_OPTIONS, $resolvedOptions);
     }
 
     /**
diff --git a/src/Oro/Component/Layout/BlockTypeExtensionInterface.php b/src/Oro/Component/Layout/BlockTypeExtensionInterface.php
index 662b1fe8584..808b8f8decd 100644
--- a/src/Oro/Component/Layout/BlockTypeExtensionInterface.php
+++ b/src/Oro/Component/Layout/BlockTypeExtensionInterface.php
@@ -10,14 +10,14 @@ interface BlockTypeExtensionInterface
      * Builds the block.
      *
      * This method is called after the extended type has built the block
-     * and can be used to further modify the block.
+     * and can be used to further modify the block and prepare block options.
      *
      * @see BlockTypeInterface::buildForm()
      *
      * @param BlockBuilderInterface $builder
      * @param array                 $options
      */
-    public function buildBlock(BlockBuilderInterface $builder, array $options);
+    public function buildBlock(BlockBuilderInterface $builder, array &$options);
 
     /**
      * Builds the block view.
diff --git a/src/Oro/Component/Layout/LayoutRegistry.php b/src/Oro/Component/Layout/LayoutRegistry.php
index 82c8046551d..f9bff164fb1 100644
--- a/src/Oro/Component/Layout/LayoutRegistry.php
+++ b/src/Oro/Component/Layout/LayoutRegistry.php
@@ -124,7 +124,7 @@ public function setDefaultOptions($name, OptionsResolverInterface $resolver)
     /**
      * {@inheritdoc}
      */
-    public function buildBlock($name, BlockBuilderInterface $builder, array $options)
+    public function buildBlock($name, BlockBuilderInterface $builder, array &$options)
     {
         $extensions = isset($this->typeExtensions[$name])
             ? $this->typeExtensions[$name]
diff --git a/src/Oro/Component/Layout/LayoutRegistryInterface.php b/src/Oro/Component/Layout/LayoutRegistryInterface.php
index c9d8d1af118..f7bad529f26 100644
--- a/src/Oro/Component/Layout/LayoutRegistryInterface.php
+++ b/src/Oro/Component/Layout/LayoutRegistryInterface.php
@@ -60,7 +60,7 @@ public function setDefaultOptions($name, OptionsResolverInterface $resolver);
      * Builds the block.
      *
      * This method is called after the extended type has built the block
-     * and can be used to further modify the block.
+     * and can be used to further modify the block and prepare block options.
      *
      * @see BlockTypeInterface::buildForm()
      *
@@ -68,7 +68,7 @@ public function setDefaultOptions($name, OptionsResolverInterface $resolver);
      * @param BlockBuilderInterface $builder The block builder
      * @param array                 $options The options
      */
-    public function buildBlock($name, BlockBuilderInterface $builder, array $options);
+    public function buildBlock($name, BlockBuilderInterface $builder, array &$options);
 
     /**
      * Builds the block view.

From fdb71ec23365ee761883fa53eb755b449738e5a1 Mon Sep 17 00:00:00 2001
From: Oleksandr Nechyporenko <onechyporenko@magecore.com>
Date: Tue, 1 Dec 2015 12:16:13 +0200
Subject: [PATCH 053/471] BB-1532: Dump layout styles in css  - fix CS issues

---
 src/Oro/Bundle/LayoutBundle/Assetic/LayoutResource.php      | 6 ++++--
 .../LayoutBundle/DependencyInjection/Configuration.php      | 2 +-
 src/Oro/Bundle/LayoutBundle/Resources/config/services.yml   | 1 -
 src/Oro/Component/Layout/ArrayOptionValueBuilder.php        | 2 +-
 src/Oro/Component/Layout/Extension/Theme/Model/Theme.php    | 6 +++---
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Oro/Bundle/LayoutBundle/Assetic/LayoutResource.php b/src/Oro/Bundle/LayoutBundle/Assetic/LayoutResource.php
index cbd76c389e1..9360282249a 100644
--- a/src/Oro/Bundle/LayoutBundle/Assetic/LayoutResource.php
+++ b/src/Oro/Bundle/LayoutBundle/Assetic/LayoutResource.php
@@ -9,6 +9,8 @@
 
 class LayoutResource implements ResourceInterface
 {
+    const RESOURCE_ALIAS = 'layout';
+
     /** @var ThemeManager */
     protected $themeManager;
 
@@ -33,7 +35,7 @@ public function isFresh($timestamp)
      */
     public function __toString()
     {
-        return 'layout';
+        return self::RESOURCE_ALIAS;
     }
 
     /**
@@ -58,7 +60,7 @@ protected function collectThemeAssets(Theme $theme)
         $formulae = [];
         $assets = $theme->getDataByKey('assets', []);
         foreach ($assets as $assetKey => $asset) {
-            $name = 'layout_' . $theme->getName(). '_' . $assetKey;
+            $name = self::RESOURCE_ALIAS . '_' . $theme->getName(). '_' . $assetKey;
             $formulae[$name] = [
                 $asset['inputs'],
                 $asset['filters'],
diff --git a/src/Oro/Bundle/LayoutBundle/DependencyInjection/Configuration.php b/src/Oro/Bundle/LayoutBundle/DependencyInjection/Configuration.php
index bff642eb6b5..10f754c7077 100644
--- a/src/Oro/Bundle/LayoutBundle/DependencyInjection/Configuration.php
+++ b/src/Oro/Bundle/LayoutBundle/DependencyInjection/Configuration.php
@@ -114,7 +114,7 @@ protected function appendThemingNodes(ArrayNodeDefinition $parentNode)
 
         $dataTreeBuilder = new TreeBuilder();
         $dataNode = $dataTreeBuilder->root('data');
-        $dataNode->info('Layout additional data')->end();
+        $dataNode->info('Layout theme additional data')->end();
 
         $node
             ->useAttributeAsKey('theme-identifier')
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/config/services.yml b/src/Oro/Bundle/LayoutBundle/Resources/config/services.yml
index dad44a3ee7e..f630b91b536 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/LayoutBundle/Resources/config/services.yml
@@ -147,6 +147,5 @@ services:
         class: %oro_layout.assetic.layout_resource.class%
         arguments:
             - @oro_layout.theme_manager
-            - @oro_layout.layout_manager
         tags:
             - { name: assetic.formula_resource, loader: layout }
diff --git a/src/Oro/Component/Layout/ArrayOptionValueBuilder.php b/src/Oro/Component/Layout/ArrayOptionValueBuilder.php
index 749e116b3cf..5e327d94578 100644
--- a/src/Oro/Component/Layout/ArrayOptionValueBuilder.php
+++ b/src/Oro/Component/Layout/ArrayOptionValueBuilder.php
@@ -7,7 +7,7 @@
 
 class ArrayOptionValueBuilder implements OptionValueBuilderInterface
 {
-    /** @var mixed[] */
+    /** @var array */
     protected $values = [];
 
     /**
diff --git a/src/Oro/Component/Layout/Extension/Theme/Model/Theme.php b/src/Oro/Component/Layout/Extension/Theme/Model/Theme.php
index 9f20806638b..26f59417037 100644
--- a/src/Oro/Component/Layout/Extension/Theme/Model/Theme.php
+++ b/src/Oro/Component/Layout/Extension/Theme/Model/Theme.php
@@ -31,7 +31,7 @@ class Theme
     /** @var string[] */
     protected $groups = [];
 
-    /** @var mixed[] */
+    /** @var array */
     protected $data = [];
 
     /**
@@ -181,7 +181,7 @@ public function getGroups()
     }
 
     /**
-     * @param mixed[] $data
+     * @param array $data
      */
     public function setData(array $data)
     {
@@ -189,7 +189,7 @@ public function setData(array $data)
     }
 
     /**
-     * @return mixed[]
+     * @return array
      */
     public function getData()
     {

From 5b079249df03f5b88e602f0218a98d92fa210e24 Mon Sep 17 00:00:00 2001
From: Oleksandr Nechyporenko <onechyporenko@magecore.com>
Date: Tue, 1 Dec 2015 17:41:23 +0200
Subject: [PATCH 054/471] BB-1533: Create form template for new theme and apply
  - fix CS issues

---
 .../Compiler/OverrideServiceCompilerPass.php          |  8 +++-----
 .../LayoutBundle/Resources/config/php_renderer.yml    |  5 +++--
 .../LayoutBundle/Resources/config/twig_renderer.yml   |  3 ++-
 .../Compiler/OverrideServiceCompilerPassTest.php      |  2 +-
 .../Unit/Form/RendererEngine/RendererEngineTest.php   |  2 +-
 .../Tests/Unit/Layout/TwigLayoutRendererTest.php      |  6 ++++++
 .../Layout/Templating/Helper/LayoutHelper.php         |  2 +-
 .../Tests/Unit/Templating/Helper/LayoutHelperTest.php | 11 +++++++----
 8 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/Oro/Bundle/LayoutBundle/DependencyInjection/Compiler/OverrideServiceCompilerPass.php b/src/Oro/Bundle/LayoutBundle/DependencyInjection/Compiler/OverrideServiceCompilerPass.php
index de6b8b84d02..b300c718ed0 100644
--- a/src/Oro/Bundle/LayoutBundle/DependencyInjection/Compiler/OverrideServiceCompilerPass.php
+++ b/src/Oro/Bundle/LayoutBundle/DependencyInjection/Compiler/OverrideServiceCompilerPass.php
@@ -21,7 +21,7 @@ public function process(ContainerBuilder $container)
         $this->changeService(
             $container,
             'templating.form.engine',
-            'oro_layout.php.templating.form.engine'
+            'oro_layout.templating.form.engine'
         );
     }
 
@@ -35,9 +35,7 @@ private function changeService(ContainerBuilder $container, $serviceName, $newSe
         $service = $container->getDefinition($serviceName);
         $newService = $container->getDefinition($newServiceName);
 
-        if ($service && $newService) {
-            $container->removeDefinition($serviceName);
-            $container->setDefinition($serviceName, $newService);
-        }
+        $container->removeDefinition($serviceName);
+        $container->setDefinition($serviceName, $newService);
     }
 }
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/config/php_renderer.yml b/src/Oro/Bundle/LayoutBundle/Resources/config/php_renderer.yml
index 1d33c50a9ff..57e81da2178 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/config/php_renderer.yml
+++ b/src/Oro/Bundle/LayoutBundle/Resources/config/php_renderer.yml
@@ -3,6 +3,7 @@ parameters:
     oro_layout.php.renderer.engine.class:    Symfony\Component\Form\Extension\Templating\TemplatingRendererEngine
     oro_layout.php.layout_renderer.class:    Oro\Component\Layout\LayoutRenderer
     oro_layout.php.templating.helper.class:  Oro\Component\Layout\Templating\Helper\LayoutHelper
+    oro_layout.templating.form.engine.class: Oro\Bundle\LayoutBundle\Form\RendererEngine\TemplatingRendererEngine
 
 services:
     oro_layout.php.renderer:
@@ -34,8 +35,8 @@ services:
         tags:
              - { name: templating.helper, alias: layout }
 
-    oro_layout.php.templating.form.engine:
-        class: Oro\Bundle\LayoutBundle\Form\RendererEngine\TemplatingRendererEngine
+    oro_layout.templating.form.engine:
+        class: %oro_layout.templating.form.engine.class%
         arguments:
             - @templating.engine.php
             - %templating.helper.form.resources%
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/config/twig_renderer.yml b/src/Oro/Bundle/LayoutBundle/Resources/config/twig_renderer.yml
index c88f0413861..864aa8ecbeb 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/config/twig_renderer.yml
+++ b/src/Oro/Bundle/LayoutBundle/Resources/config/twig_renderer.yml
@@ -3,6 +3,7 @@ parameters:
     oro_layout.twig.renderer.class:           Symfony\Bridge\Twig\Form\TwigRenderer
     oro_layout.twig.renderer.engine.class:    Symfony\Bridge\Twig\Form\TwigRendererEngine
     oro_layout.twig.layout_renderer.class:    Oro\Bundle\LayoutBundle\Layout\TwigLayoutRenderer
+    oro_layout.twig.form.engine.class:        Oro\Bundle\LayoutBundle\Form\RendererEngine\TwigRendererEngine
 
 services:
     oro_layout.twig.extension.layout:
@@ -35,6 +36,6 @@ services:
             - @twig
 
     oro_layout.twig.form.engine:
-        class: Oro\Bundle\LayoutBundle\Form\RendererEngine\TwigRendererEngine
+        class: %oro_layout.twig.form.engine.class%
         arguments:
             - %twig.form.resources%
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/DependencyInjection/Compiler/OverrideServiceCompilerPassTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/DependencyInjection/Compiler/OverrideServiceCompilerPassTest.php
index 6aa5b5afc3e..0215cbb019a 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/DependencyInjection/Compiler/OverrideServiceCompilerPassTest.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/DependencyInjection/Compiler/OverrideServiceCompilerPassTest.php
@@ -36,7 +36,7 @@ public function testProcess()
         $container->setDefinition('templating.form.engine', $phpFormEngine);
 
         $newPhpFormEngine = new Definition('\OroLayoutPhpFormEngineClass');
-        $container->setDefinition('oro_layout.php.templating.form.engine', $newPhpFormEngine);
+        $container->setDefinition('oro_layout.templating.form.engine', $newPhpFormEngine);
 
         $this->pass->process($container);
 
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Form/RendererEngine/RendererEngineTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Form/RendererEngine/RendererEngineTest.php
index 49c592d252a..346999bfa99 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Form/RendererEngine/RendererEngineTest.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Form/RendererEngine/RendererEngineTest.php
@@ -28,7 +28,7 @@ public function testAddDefaultThemes()
     }
 
     /**
-     * @return \Oro\Component\Layout\Form\RendererEngine\FormRendererEngineInterface
+     * @return FormRendererEngineInterface
      */
     abstract public function createRendererEngine();
 }
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/TwigLayoutRendererTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/TwigLayoutRendererTest.php
index 5cd6685f071..703c6f9734a 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/TwigLayoutRendererTest.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/TwigLayoutRendererTest.php
@@ -2,18 +2,24 @@
 
 namespace Oro\Bundle\LayoutBundle\Tests\Unit\Layout;
 
+use Symfony\Bridge\Twig\Form\TwigRendererInterface;
+
 use Oro\Bundle\LayoutBundle\Layout\TwigLayoutRenderer;
+use Oro\Component\Layout\Form\RendererEngine\FormRendererEngineInterface;
 
 class TwigLayoutRendererTest extends \PHPUnit_Framework_TestCase
 {
     public function testEnvironmentSet()
     {
+        /** @var TwigRendererInterface|\PHPUnit_Framework_MockObject_MockObject $innerRenderer */
         $innerRenderer = $this->getMock('Symfony\Bridge\Twig\Form\TwigRendererInterface');
+        /** @var \Twig_Environment $environment */
         $environment   = $this->getMockBuilder('\Twig_Environment')->getMock();
 
         $innerRenderer->expects($this->once())
             ->method('setEnvironment')
             ->with($this->identicalTo($environment));
+        /** @var FormRendererEngineInterface $formRenderer */
         $formRenderer = $this->getMock('Oro\Component\Layout\Form\RendererEngine\FormRendererEngineInterface');
 
         new TwigLayoutRenderer($innerRenderer, $formRenderer, $environment);
diff --git a/src/Oro/Component/Layout/Templating/Helper/LayoutHelper.php b/src/Oro/Component/Layout/Templating/Helper/LayoutHelper.php
index 719b085a5a9..c48f896ad53 100644
--- a/src/Oro/Component/Layout/Templating/Helper/LayoutHelper.php
+++ b/src/Oro/Component/Layout/Templating/Helper/LayoutHelper.php
@@ -20,7 +20,7 @@ class LayoutHelper extends Helper
     /** @var TextHelper */
     private $textHelper;
 
-    /** @var \Oro\Component\Layout\Form\RendererEngine\FormRendererEngineInterface */
+    /** @var FormRendererEngineInterface */
     private $formRendererEngine;
 
     /**
diff --git a/src/Oro/Component/Layout/Tests/Unit/Templating/Helper/LayoutHelperTest.php b/src/Oro/Component/Layout/Tests/Unit/Templating/Helper/LayoutHelperTest.php
index 0082935a818..87813e29ced 100644
--- a/src/Oro/Component/Layout/Tests/Unit/Templating/Helper/LayoutHelperTest.php
+++ b/src/Oro/Component/Layout/Tests/Unit/Templating/Helper/LayoutHelperTest.php
@@ -2,22 +2,25 @@
 
 namespace Oro\Component\Layout\Tests\Unit\Templating\Helper;
 
+use Symfony\Component\Form\FormRendererInterface;
+
 use Oro\Component\Layout\BlockView;
-use Oro\Component\Layout\Templating\Helper\LayoutHelper;
 use Oro\Component\Layout\Form\RendererEngine\FormRendererEngineInterface;
+use Oro\Component\Layout\Templating\Helper\LayoutHelper;
+use Oro\Component\Layout\Templating\TextHelper;
 
 class LayoutHelperTest extends \PHPUnit_Framework_TestCase
 {
-    /** @var \PHPUnit_Framework_MockObject_MockObject */
+    /** @var FormRendererInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $renderer;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject */
+    /** @var \PHPUnit_Framework_MockObject_MockObject|TextHelper */
     protected $textHelper;
 
     /** @var LayoutHelper */
     protected $helper;
 
-    /** @var \Oro\Component\Layout\Form\RendererEngine\FormRendererEngineInterface */
+    /** @var FormRendererEngineInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $formRenderer;
 
     protected function setUp()

From 5f831541c13496096ac681abb7a6d2b447162c1f Mon Sep 17 00:00:00 2001
From: Sergey Zhuravel <zhuravel.sergey@gmail.com>
Date: Wed, 2 Dec 2015 01:15:48 +0200
Subject: [PATCH 055/471] BB-1385: Add listener to add both backend and
 frontend audits to backend grid - cr fixes

---
 .../DataAuditBundle/Entity/AbstractAudit.php  | 17 +++--
 .../Entity/AbstractAuditField.php             |  7 --
 .../Bundle/DataAuditBundle/Entity/Audit.php   | 16 -----
 .../DataAuditBundle/Entity/AuditField.php     |  5 +-
 .../EventListener/AuditGridListener.php       |  8 +--
 .../Schema/OroDataAuditBundleInstaller.php    |  3 -
 .../Migrations/Schema/v1_6/AddColumn.php      |  3 -
 .../Migrations/Schema/v1_6/SetNotNullable.php |  6 --
 .../Migrations/Schema/v1_6/SetValue.php       |  8 ---
 .../Resources/config/datagrid.yml             | 69 +++++++++----------
 .../Resources/config/placeholders.yml         |  4 +-
 .../CompilerPass/ConfigurationPass.php        |  5 +-
 12 files changed, 58 insertions(+), 93 deletions(-)

diff --git a/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAudit.php b/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAudit.php
index db53da55a05..4510a86c27e 100644
--- a/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAudit.php
+++ b/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAudit.php
@@ -12,7 +12,6 @@
 use Oro\Bundle\UserBundle\Entity\AbstractUser;
 
 /**
- * @ORM\MappedSuperclass()
  * @ORM\Entity()
  * @ORM\Table(name="oro_audit", indexes={
  *      @ORM\Index(name="idx_oro_audit_logged_at", columns={"logged_at"}),
@@ -20,7 +19,7 @@
  * })
  * @ORM\InheritanceType("SINGLE_TABLE")
  * @ORM\DiscriminatorColumn(name="type", type="string")
- * @ORM\DiscriminatorMap({"audit" = "Audit"})
+ * @ORM\DiscriminatorMap({"audit" = "Oro\Bundle\DataAuditBundle\Entity\Audit"})
  */
 abstract class AbstractAudit extends AbstractLogEntry
 {
@@ -48,7 +47,11 @@ abstract class AbstractAudit extends AbstractLogEntry
     /**
      * @var AbstractAuditField[]|Collection
      *
-     * @ORM\OneToMany(targetEntity="AbstractAuditField", mappedBy="audit", cascade={"persist"})
+     * @ORM\OneToMany(
+     *     targetEntity="Oro\Bundle\DataAuditBundle\Entity\AuditField",
+     *     mappedBy="audit",
+     *     cascade={"persist"}
+     * )
      */
     protected $fields;
 
@@ -88,7 +91,13 @@ abstract public function getUser();
      * @param mixed $oldValue
      * @return AbstractAuditField
      */
-    abstract protected function getAuditFieldInstance(AbstractAudit $audit, $field, $dataType, $newValue, $oldValue);
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuditFieldInstance(AbstractAudit $audit, $field, $dataType, $newValue, $oldValue)
+    {
+        return new AuditField($audit, $field, $dataType, $newValue, $oldValue);
+    }
 
     /**
      * Constructor
diff --git a/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAuditField.php b/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAuditField.php
index aa2e8bafab3..9dd1e449c45 100644
--- a/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAuditField.php
+++ b/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAuditField.php
@@ -10,13 +10,6 @@
 
 /**
  * @ORM\MappedSuperclass()
- * @ORM\Entity()
- * @ORM\Table(name="oro_audit_field", indexes={
- *      @ORM\Index(name="idx_oro_audit_field_type", columns={"type"})
- * })
- * @ORM\InheritanceType("SINGLE_TABLE")
- * @ORM\DiscriminatorColumn(name="type", type="string")
- * @ORM\DiscriminatorMap({"audit_field" = "AuditField"})
  */
 abstract class AbstractAuditField
 {
diff --git a/src/Oro/Bundle/DataAuditBundle/Entity/Audit.php b/src/Oro/Bundle/DataAuditBundle/Entity/Audit.php
index 5f6405caf57..3a7bbc13a25 100644
--- a/src/Oro/Bundle/DataAuditBundle/Entity/Audit.php
+++ b/src/Oro/Bundle/DataAuditBundle/Entity/Audit.php
@@ -2,7 +2,6 @@
 
 namespace Oro\Bundle\DataAuditBundle\Entity;
 
-use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 
 use JMS\Serializer\Annotation\Type;
@@ -67,13 +66,6 @@ class Audit extends AbstractAudit
      */
     protected $version;
 
-    /**
-     * @var AuditField[]|Collection
-     *
-     * @ORM\OneToMany(targetEntity="AuditField", mappedBy="audit", cascade={"persist"})
-     */
-    protected $fields;
-
     /**
      * @var string $username
      *
@@ -91,14 +83,6 @@ class Audit extends AbstractAudit
      */
     protected $user;
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function getAuditFieldInstance(AbstractAudit $audit, $field, $dataType, $newValue, $oldValue)
-    {
-        return new AuditField($audit, $field, $dataType, $newValue, $oldValue);
-    }
-
     /**
      * {@inheritdoc}
      */
diff --git a/src/Oro/Bundle/DataAuditBundle/Entity/AuditField.php b/src/Oro/Bundle/DataAuditBundle/Entity/AuditField.php
index b96ecdbe5e7..02fc5b05b8a 100644
--- a/src/Oro/Bundle/DataAuditBundle/Entity/AuditField.php
+++ b/src/Oro/Bundle/DataAuditBundle/Entity/AuditField.php
@@ -8,7 +8,8 @@
 use Oro\Bundle\EntityConfigBundle\Metadata\Annotation\Config;
 
 /**
- * @ORM\Entity
+ * @ORM\Entity()
+ * @ORM\Table(name="oro_audit_field")
  * @Config(mode="hidden")
  */
 class AuditField extends ExtendAuditField
@@ -16,7 +17,7 @@ class AuditField extends ExtendAuditField
     /**
      * @var Audit
      *
-     * @ORM\ManyToOne(targetEntity="Audit", inversedBy="fields", cascade={"persist"})
+     * @ORM\ManyToOne(targetEntity="AbstractAudit", inversedBy="fields", cascade={"persist"})
      * @ORM\JoinColumn(name="audit_id", referencedColumnName="id", nullable=false, onDelete="CASCADE")
      */
     protected $audit;
diff --git a/src/Oro/Bundle/DataAuditBundle/EventListener/AuditGridListener.php b/src/Oro/Bundle/DataAuditBundle/EventListener/AuditGridListener.php
index 9e64668f3a2..9369178778d 100644
--- a/src/Oro/Bundle/DataAuditBundle/EventListener/AuditGridListener.php
+++ b/src/Oro/Bundle/DataAuditBundle/EventListener/AuditGridListener.php
@@ -16,7 +16,7 @@ class AuditGridListener
     protected $em;
 
     /** @var null|array */
-    protected $objectClassChoices = null;
+    protected $objectClassChoices;
 
     /**
      * @param EntityManager $em
@@ -34,11 +34,11 @@ public function __construct(EntityManager $em)
     public function getObjectClassOptions()
     {
         if (is_null($this->objectClassChoices)) {
-            $options = array();
+            $options = [];
 
             $result = $this->em->createQueryBuilder()
-                ->add('select', 'a.objectClass')
-                ->add('from', 'Oro\Bundle\DataAuditBundle\Entity\Audit a')
+                ->select('a.objectClass')
+                ->from('Oro\Bundle\DataAuditBundle\Entity\AbstractAudit', 'a')
                 ->distinct('a.objectClass')
                 ->getQuery()
                 ->getArrayResult();
diff --git a/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/OroDataAuditBundleInstaller.php b/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/OroDataAuditBundleInstaller.php
index d813ce77f81..f80c60f5788 100644
--- a/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/OroDataAuditBundleInstaller.php
+++ b/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/OroDataAuditBundleInstaller.php
@@ -114,9 +114,6 @@ private function createAuditField(Schema $schema)
             'comment' => '(DC2Type:json_array)',
         ]);
         $auditFieldTable->setPrimaryKey(['id']);
-        $auditFieldTable->addColumn('type', 'string', ['length' => 255]);
-
-        $auditFieldTable->addIndex(['type'], 'idx_oro_audit_field_type');
         $auditFieldTable->addIndex(['audit_id'], 'IDX_9A31A824BD29F359', []);
 
         $auditFieldTable->addForeignKeyConstraint(
diff --git a/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/AddColumn.php b/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/AddColumn.php
index ce855ca4ce0..5f5ed5f4a8e 100644
--- a/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/AddColumn.php
+++ b/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/AddColumn.php
@@ -23,8 +23,5 @@ public function up(Schema $schema, QueryBag $queries)
     {
         $auditTable = $schema->getTable('oro_audit');
         $auditTable->addColumn('type', 'string', ['length' => 255, 'notnull' => false]);
-
-        $auditFieldTable = $schema->getTable('oro_audit_field');
-        $auditFieldTable->addColumn('type', 'string', ['length' => 255, 'notnull' => false]);
     }
 }
diff --git a/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/SetNotNullable.php b/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/SetNotNullable.php
index 5f3c143a4ac..365b6a485bd 100644
--- a/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/SetNotNullable.php
+++ b/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/SetNotNullable.php
@@ -27,11 +27,5 @@ public function up(Schema $schema, QueryBag $queries)
             ->setType(Type::getType(Type::STRING))
             ->setOptions(['length' => 255, 'notnull' => true]);
         $auditTable->addIndex(['type'], 'idx_oro_audit_type');
-
-        $auditFieldTable = $schema->getTable('oro_audit_field');
-        $auditFieldTable->getColumn('type')
-            ->setType(Type::getType(Type::STRING))
-            ->setOptions(['length' => 255, 'notnull' => true]);
-        $auditFieldTable->addIndex(['type'], 'idx_oro_audit_field_type');
     }
 }
diff --git a/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/SetValue.php b/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/SetValue.php
index cda73823e17..642674c05c0 100644
--- a/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/SetValue.php
+++ b/src/Oro/Bundle/DataAuditBundle/Migrations/Schema/v1_6/SetValue.php
@@ -30,13 +30,5 @@ public function up(Schema $schema, QueryBag $queries)
                 ['type' => Type::STRING]
             )
         );
-
-        $queries->addPreQuery(
-            new ParametrizedSqlMigrationQuery(
-                'UPDATE oro_audit_field SET type = :type',
-                ['type' => 'audit_field'],
-                ['type' => Type::STRING]
-            )
-        );
     }
 }
diff --git a/src/Oro/Bundle/DataAuditBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/DataAuditBundle/Resources/config/datagrid.yml
index d49bde388fd..b0730a6904e 100644
--- a/src/Oro/Bundle/DataAuditBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/DataAuditBundle/Resources/config/datagrid.yml
@@ -7,37 +7,34 @@ datagrid:
             type: orm
             query:
                 select:
-                    - a
-                    - a.id
-                    - a.action
-                    - a.version
-                    - a.objectClass
-                    - a.objectName
-                    - a.objectId
-                    - a.loggedAt
-                    - >
-                      CONCAT(
-                        CONCAT(
-                            CONCAT(u.firstName, ' '),
-                            CONCAT(u.lastName, ' ')
-                        ),
-                        CONCAT(' - ', u.email)
-                      ) as author
-                    - o.name as organization
+                    audit: a
+                    id: a.id
+                    section: a.action
+                    version: a.version
+                    objectClass: a.objectClass
+                    objectName: a.objectName
+                    objectId: a.objectId
+                    loggedAt: a.loggedAt
+                    author:  CONCAT(u.firstName, ' ', u.lastName, ' - ', u.email) as author
+                    organization: o.name as organization
                 from:
-                    - { table: OroDataAuditBundle:Audit, alias: a }
+                    - { table: OroDataAuditBundle:AbstractAudit, alias: a }
                 join:
                     left:
-                        user:
-                            join: a.user
-                            alias: u
                         organization:
                             join: a.organization
                             alias: o
                         fields:
                             join: a.fields
                             alias: f
-
+                        audit:
+                            join: OroDataAuditBundle:Audit
+                            alias: ua
+                            conditionType: WITH
+                            condition: ua.id = a.id
+                        user:
+                            join: ua.user
+                            alias: u
                 where:
                     and:
                         - o.id = @oro_security.security_facade->getOrganizationId
@@ -130,27 +127,25 @@ datagrid:
             type: orm
             query:
                 select:
-                    - a
-                    - a.id
-                    - a.loggedAt
-                    - >
-                      CONCAT(
-                        CONCAT(
-                            CONCAT(u.firstName, ' '),
-                            CONCAT(u.lastName, ' ')
-                        ),
-                        CONCAT(' - ', u.email)
-                      ) as author
+                    audit: a
+                    id: a.id
+                    loggedAt: a.loggedAt
+                    author:  CONCAT(u.firstName, ' ', u.lastName, ' - ', u.email) as author
                 from:
-                    - { table: OroDataAuditBundle:Audit, alias: a }
+                    - { table: OroDataAuditBundle:AbstractAudit, alias: a }
                 join:
                     left:
-                        user:
-                            join: a.user
-                            alias: u
                         fields:
                             join: a.fields
                             alias: f
+                        audit:
+                            join: OroDataAuditBundle:Audit
+                            alias: ua
+                            conditionType: WITH
+                            condition: ua.id = a.id
+                        user:
+                            join: ua.user
+                            alias: u
                 where:
                     and:
                         - a.objectClass = :objectClass AND a.objectId = :objectId
diff --git a/src/Oro/Bundle/DataAuditBundle/Resources/config/placeholders.yml b/src/Oro/Bundle/DataAuditBundle/Resources/config/placeholders.yml
index b208a31289a..6df62f1c029 100644
--- a/src/Oro/Bundle/DataAuditBundle/Resources/config/placeholders.yml
+++ b/src/Oro/Bundle/DataAuditBundle/Resources/config/placeholders.yml
@@ -12,7 +12,9 @@ placeholders:
 items:
     change_history_link:
         template: OroDataAuditBundle::change_history_link.html.twig
-        applicable: @oro_dataaudit.placeholder.filter->isEntityAuditable($entity$, $audit_show_change_history$)
+        applicable:
+            - @oro_dataaudit.placeholder.filter->isEntityAuditable($entity$, $audit_show_change_history$)
+            - @oro_user.placeholder.filter->isUserApplicable()
         acl: oro_dataaudit_history
     template_audit_condition_type_select:
         template: OroDataAuditBundle:js:audit-condition-type-select.html.twig
diff --git a/src/Oro/Bundle/DataGridBundle/DependencyInjection/CompilerPass/ConfigurationPass.php b/src/Oro/Bundle/DataGridBundle/DependencyInjection/CompilerPass/ConfigurationPass.php
index 04860ed3947..1c422f34d46 100644
--- a/src/Oro/Bundle/DataGridBundle/DependencyInjection/CompilerPass/ConfigurationPass.php
+++ b/src/Oro/Bundle/DataGridBundle/DependencyInjection/CompilerPass/ConfigurationPass.php
@@ -6,6 +6,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
+use Oro\Bundle\UIBundle\Tools\ArrayUtils;
 use Oro\Component\Config\Loader\CumulativeConfigLoader;
 use Oro\Component\Config\Loader\YamlCumulativeFileLoader;
 
@@ -48,7 +49,7 @@ protected function registerConfigFiles(ContainerBuilder $container)
             $resources    = $configLoader->load($container);
             foreach ($resources as $resource) {
                 if (isset($resource->data[self::ROOT_PARAMETER]) && is_array($resource->data[self::ROOT_PARAMETER])) {
-                    $config = array_merge_recursive($config, $resource->data[self::ROOT_PARAMETER]);
+                    $config = ArrayUtils::arrayMergeRecursiveDistinct($config, $resource->data[self::ROOT_PARAMETER]);
                 }
             }
 
@@ -65,7 +66,7 @@ protected function registerConfigFiles(ContainerBuilder $container)
     protected function registerConfigProviders(ContainerBuilder $container)
     {
         if ($container->hasDefinition(self::CHAIN_PROVIDER_SERVICE_ID)) {
-            $providers = array();
+            $providers = [];
             foreach ($container->findTaggedServiceIds(self::PROVIDER_TAG_NAME) as $id => $attributes) {
                 $priority = isset($attributes[0]['priority']) ? $attributes[0]['priority'] : 0;
                 $providers[$priority][] = new Reference($id);

From e2c7e7e8a15cf61982603b979ea0ce269b776ef6 Mon Sep 17 00:00:00 2001
From: Sergey Zhuravel <zhuravel.sergey@gmail.com>
Date: Wed, 2 Dec 2015 01:21:04 +0200
Subject: [PATCH 056/471] BB-1385: Add listener to add both backend and
 frontend audits to backend grid - cr fixes

---
 src/Oro/Bundle/DataAuditBundle/Entity/AbstractAudit.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAudit.php b/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAudit.php
index 4510a86c27e..215ad0ae863 100644
--- a/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAudit.php
+++ b/src/Oro/Bundle/DataAuditBundle/Entity/AbstractAudit.php
@@ -91,9 +91,6 @@ abstract public function getUser();
      * @param mixed $oldValue
      * @return AbstractAuditField
      */
-    /**
-     * {@inheritdoc}
-     */
     protected function getAuditFieldInstance(AbstractAudit $audit, $field, $dataType, $newValue, $oldValue)
     {
         return new AuditField($audit, $field, $dataType, $newValue, $oldValue);

From 73e4234698415e75e1dd69a493ac09319443e007 Mon Sep 17 00:00:00 2001
From: Oleksandr Nechyporenko <onechyporenko@magecore.com>
Date: Wed, 2 Dec 2015 15:36:49 +0200
Subject: [PATCH 057/471] BB-1534: Create abstract form context configurator in
 LayoutBundle  - fix issues

---
 .../Extension/DependencyInjectionFormContextConfigurator.php    | 1 -
 .../Layout/Form/DependencyInjectionFormAccessor.php             | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/LayoutBundle/Layout/Extension/DependencyInjectionFormContextConfigurator.php b/src/Oro/Bundle/LayoutBundle/Layout/Extension/DependencyInjectionFormContextConfigurator.php
index a1ba6876bd4..b0c01aefe35 100644
--- a/src/Oro/Bundle/LayoutBundle/Layout/Extension/DependencyInjectionFormContextConfigurator.php
+++ b/src/Oro/Bundle/LayoutBundle/Layout/Extension/DependencyInjectionFormContextConfigurator.php
@@ -3,7 +3,6 @@
 namespace Oro\Bundle\LayoutBundle\Layout\Extension;
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\Routing\RouterInterface;
 
 use Oro\Component\Layout\ContextConfiguratorInterface;
 use Oro\Component\Layout\ContextInterface;
diff --git a/src/Oro/Bundle/LayoutBundle/Layout/Form/DependencyInjectionFormAccessor.php b/src/Oro/Bundle/LayoutBundle/Layout/Form/DependencyInjectionFormAccessor.php
index 29589f32252..6d834d1711e 100644
--- a/src/Oro/Bundle/LayoutBundle/Layout/Form/DependencyInjectionFormAccessor.php
+++ b/src/Oro/Bundle/LayoutBundle/Layout/Form/DependencyInjectionFormAccessor.php
@@ -67,6 +67,6 @@ public function toString()
      */
     public function setFormData($formData)
     {
-        $this->form->setData($formData);
+        $this->getForm()->setData($formData);
     }
 }

From 68ee20259d689fdb09bd0283b2a7f425bf06bb58 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Thu, 3 Dec 2015 10:28:51 +0100
Subject: [PATCH 058/471] BAP-9429: Missing column functions for Date columns
 in Report builder

---
 .../ReportBundle/Resources/config/query_designer.yml   |  7 +++++++
 .../Resources/translations/messages.en.yml             | 10 ++++++++++
 2 files changed, 17 insertions(+)

diff --git a/src/Oro/Bundle/ReportBundle/Resources/config/query_designer.yml b/src/Oro/Bundle/ReportBundle/Resources/config/query_designer.yml
index fab369f3daa..ebbde9b0357 100644
--- a/src/Oro/Bundle/ReportBundle/Resources/config/query_designer.yml
+++ b/src/Oro/Bundle/ReportBundle/Resources/config/query_designer.yml
@@ -19,3 +19,10 @@ query_designer:
                 - { name: Min,   expr: MIN($column) }
                 - { name: Max,   expr: MAX($column) }
             query_type: [report]
+        date:
+            applicable: [{type: date}, {type: datetime}]
+            functions:
+                - { name: Count, expr: COUNT($column), return_type: integer }
+                - { name: Min,   expr: MIN($column) }
+                - { name: Max,   expr: MAX($column) }
+            query_type: [report]
diff --git a/src/Oro/Bundle/ReportBundle/Resources/translations/messages.en.yml b/src/Oro/Bundle/ReportBundle/Resources/translations/messages.en.yml
index 3dbc7513c2a..077c6487251 100644
--- a/src/Oro/Bundle/ReportBundle/Resources/translations/messages.en.yml
+++ b/src/Oro/Bundle/ReportBundle/Resources/translations/messages.en.yml
@@ -25,6 +25,16 @@ oro:
                 Max:
                     name: Max
                     hint: Maximum value
+            date:
+                Count:
+                    name: Count
+                    hint: Number of items
+                Min:
+                    name: Min
+                    hint: Minimum value
+                Max:
+                    name: Max
+                    hint: Maximum value
 
     report:
         menu:

From e0e3a998a578ba6bcc15fd8037a3b74dc684453c Mon Sep 17 00:00:00 2001
From: Andrey Yatsenco <yatsenco@gmail.com>
Date: Thu, 3 Dec 2015 13:07:17 +0200
Subject: [PATCH 059/471] BB-1536: Create register page based on new layout -
 added handling of registartion form

---
 .../Layout/Form/DependencyInjectionFormAccessor.php           | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/LayoutBundle/Layout/Form/DependencyInjectionFormAccessor.php b/src/Oro/Bundle/LayoutBundle/Layout/Form/DependencyInjectionFormAccessor.php
index 29589f32252..871fbc2be8c 100644
--- a/src/Oro/Bundle/LayoutBundle/Layout/Form/DependencyInjectionFormAccessor.php
+++ b/src/Oro/Bundle/LayoutBundle/Layout/Form/DependencyInjectionFormAccessor.php
@@ -67,6 +67,8 @@ public function toString()
      */
     public function setFormData($formData)
     {
-        $this->form->setData($formData);
+        if (!$this->form->isSubmitted()) {
+            $this->form->setData($formData);
+        }
     }
 }

From d7faeaba2c151163e129dcc657b489f45f4a09b8 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Thu, 3 Dec 2015 13:56:27 +0100
Subject: [PATCH 060/471] BAP-9430: Report builder filters does not contain
 aggregation columns

- prepare backend for filters using aggregated functions
---
 .../QueryDesigner/AbstractQueryConverter.php  | 48 +++++++++++++------
 .../GroupingOrmQueryConverter.php             | 18 ++++++-
 2 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/AbstractQueryConverter.php b/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/AbstractQueryConverter.php
index 5b879885abf..198f592ef15 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/AbstractQueryConverter.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/AbstractQueryConverter.php
@@ -440,6 +440,32 @@ protected function prepareColumnAliases()
         }
     }
 
+    /**
+     * @param array $column
+     *
+     * @return array Where array has elements: string|FunctionInterface|null, string|null
+     */
+    protected function createColumnFuncion(array $column)
+    {
+        if (!empty($column['func'])) {
+            $function           = $this->functionProvider->getFunction(
+                $column['func']['name'],
+                $column['func']['group_name'],
+                $column['func']['group_type']
+            );
+            $functionExpr       = $function['expr'];
+            if (isset($function['return_type'])) {
+                $functionReturnType = $function['return_type'];
+            } else {
+                $functionReturnType = null;
+            }
+
+            return [$functionExpr, $functionReturnType];
+        }
+
+        return [null, null];
+    }
+
     /**
      * Performs conversion of SELECT statement
      */
@@ -448,21 +474,7 @@ protected function addSelectStatement()
         foreach ($this->definition['columns'] as $column) {
             $columnName         = $column['name'];
             $fieldName          = $this->getFieldName($columnName);
-            $functionExpr       = null;
-            $functionReturnType = null;
-            if (!empty($column['func'])) {
-                $function           = $this->functionProvider->getFunction(
-                    $column['func']['name'],
-                    $column['func']['group_name'],
-                    $column['func']['group_type']
-                );
-                $functionExpr       = $function['expr'];
-                if (isset($function['return_type'])) {
-                    $functionReturnType = $function['return_type'];
-                } else {
-                    $functionReturnType = null;
-                }
-            }
+            list($functionExpr, $functionReturnType) = $this->createColumnFuncion($column);
             $isDistinct = !empty($column['distinct']);
             $tableAlias = $this->getTableAliasForColumn($columnName);
             if (isset($column['label'])) {
@@ -651,6 +663,12 @@ protected function processFilter($filter)
         $fieldName      = $this->getFieldName($columnName);
         $columnAliasKey = $this->buildColumnAliasKey($columnName);
         $tableAlias     = $this->getTableAliasForColumn($columnName);
+        $column = ['name' => $fieldName];
+        if (isset($filter['func'])) {
+            $column['func'] = $filter['func'];
+        }
+        list($functionExpr) = $this->createColumnFuncion($column);
+
         $this->addWhereCondition(
             $this->getEntityClassName($columnName),
             $tableAlias,
diff --git a/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/GroupingOrmQueryConverter.php b/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/GroupingOrmQueryConverter.php
index 9f7a948e2d7..4d5e64167e6 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/GroupingOrmQueryConverter.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/GroupingOrmQueryConverter.php
@@ -91,10 +91,24 @@ protected function addWhereCondition(
         $columnExpr,
         $columnAlias,
         $filterName,
-        array $filterData
+        array $filterData,
+        $functionExpr = null
     ) {
         $filter = [
-            'column'     => $this->getFilterByExpr($entityClassName, $tableAlias, $fieldName, $columnExpr),
+            'column'     => $this->getFilterByExpr(
+                $entityClassName,
+                $tableAlias,
+                $fieldName,
+                $functionExpr
+                    ? $this->prepareFunctionExpression(
+                        $functionExpr,
+                        $tableAlias,
+                        $fieldName,
+                        $columnExpr,
+                        $columnAlias
+                    )
+                    : $columnExpr
+            ),
             'filter'     => $filterName,
             'filterData' => $filterData
         ];

From 18a91a65e58e751fe9f4a03ea6f9d0980c9fdadf Mon Sep 17 00:00:00 2001
From: Oleksandr Nechyporenko <onechyporenko@magecore.com>
Date: Thu, 3 Dec 2015 17:44:38 +0200
Subject: [PATCH 061/471] BB-1661: Fix tests  - fix failed tests

---
 .../Extension/ConfigExpressionExtension.php   |   4 +-
 .../ConfigExpressionExtensionTest.php         | 127 ++++++++++--------
 .../Layout/Tests/Unit/BlockBuilderTest.php    |  14 +-
 .../Tests/Unit/LayoutFactoryBuilderTest.php   |  22 ++-
 .../Layout/Tests/Unit/LayoutTestCase.php      |   6 +
 5 files changed, 110 insertions(+), 63 deletions(-)

diff --git a/src/Oro/Bundle/LayoutBundle/Layout/Block/Extension/ConfigExpressionExtension.php b/src/Oro/Bundle/LayoutBundle/Layout/Block/Extension/ConfigExpressionExtension.php
index 58ccf45bb37..cc87bef29c2 100644
--- a/src/Oro/Bundle/LayoutBundle/Layout/Block/Extension/ConfigExpressionExtension.php
+++ b/src/Oro/Bundle/LayoutBundle/Layout/Block/Extension/ConfigExpressionExtension.php
@@ -41,11 +41,11 @@ public function __construct(
      */
     public function buildBlock(BlockBuilderInterface $builder, array &$options)
     {
-        $context  = $builder->getContext();
-        $data  = $builder->getDataAccessor();
+        $context = $builder->getContext();
         $evaluate = $context->getOr('expressions_evaluate');
         $encoding = $context->getOr('expressions_encoding');
         if ($evaluate || $encoding !== null) {
+            $data = $builder->getDataAccessor();
             $this->processExpressions($options, $context, $data, $evaluate, $encoding);
         }
     }
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Extension/ConfigExpressionExtensionTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Extension/ConfigExpressionExtensionTest.php
index f254d71cd41..29ce992450d 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Extension/ConfigExpressionExtensionTest.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Extension/ConfigExpressionExtensionTest.php
@@ -4,20 +4,22 @@
 
 use Symfony\Component\PropertyAccess\PropertyPath;
 
+use Oro\Component\ConfigExpression\AssemblerInterface;
 use Oro\Component\ConfigExpression\Condition;
 use Oro\Component\ConfigExpression\ContextAccessor;
 use Oro\Component\ConfigExpression\Func;
 use Oro\Component\Layout\Block\Type\BaseType;
-use Oro\Component\Layout\BlockView;
+use Oro\Component\Layout\BlockBuilderInterface;
 use Oro\Component\Layout\LayoutContext;
 use Oro\Component\Layout\OptionValueBag;
 
 use Oro\Bundle\LayoutBundle\Layout\Block\Extension\ConfigExpressionExtension;
+use Oro\Bundle\LayoutBundle\Layout\Encoder\ConfigExpressionEncoderRegistry;
 use Oro\Bundle\LayoutBundle\Layout\Encoder\JsonConfigExpressionEncoder;
 
 class ConfigExpressionExtensionTest extends \PHPUnit_Framework_TestCase
 {
-    /** @var \PHPUnit_Framework_MockObject_MockObject */
+    /** @var AssemblerInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $expressionAssembler;
 
     /** @var ConfigExpressionExtension */
@@ -27,6 +29,7 @@ protected function setUp()
     {
         $this->expressionAssembler = $this->getMock('Oro\Component\ConfigExpression\AssemblerInterface');
 
+        /** @var ConfigExpressionEncoderRegistry|\PHPUnit_Framework_MockObject_MockObject $encoderRegistry */
         $encoderRegistry = $this
             ->getMockBuilder('Oro\Bundle\LayoutBundle\Layout\Encoder\ConfigExpressionEncoderRegistry')
             ->disableOriginalConstructor()
@@ -50,19 +53,20 @@ public function testGetExtendedType()
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function testFinishViewEvaluatesAllExpressions()
+    public function testBuildBlockEvaluatesAllExpressions()
     {
         $context = new LayoutContext();
         $context->set('css_class', 'test_class');
         $data  = $this->getMock('Oro\Component\Layout\DataAccessorInterface');
-        $block = $this->getMock('Oro\Component\Layout\BlockInterface');
+
+        /** @var BlockBuilderInterface|\PHPUnit_Framework_MockObject_MockObject $block */
+        $block = $this->getMock('Oro\Component\Layout\BlockBuilderInterface');
         $block->expects($this->once())
             ->method('getContext')
             ->will($this->returnValue($context));
         $block->expects($this->once())
-            ->method('getData')
+            ->method('getDataAccessor')
             ->will($this->returnValue($data));
-        $view = new BlockView();
 
         $expr = $this->getMock('Oro\Component\ConfigExpression\ExpressionInterface');
         $expr->expects($this->once())
@@ -78,16 +82,17 @@ public function testFinishViewEvaluatesAllExpressions()
         $expectedClassAttr = new OptionValueBag();
         $expectedClassAttr->add('test_class');
 
-        $view->vars['expr_object']           = $expr;
-        $view->vars['expr_array']            = ['@true' => null];
-        $view->vars['not_expr_array']        = ['\@true' => null];
-        $view->vars['scalar']                = 123;
-        $view->vars['attr']['enabled']       = ['@true' => null];
-        $view->vars['attr']['data-scalar']   = 'foo';
-        $view->vars['attr']['data-expr']     = ['@true' => null];
-        $view->vars['attr']['class']         = $classAttr;
-        $view->vars['label_attr']['enabled'] = ['@true' => null];
-        $view->vars['array_with_expr']       = ['item1' => 'val1', 'item2' => ['@true' => null]];
+        $options = [];
+        $options['expr_object']           = $expr;
+        $options['expr_array']            = ['@true' => null];
+        $options['not_expr_array']        = ['\@true' => null];
+        $options['scalar']                = 123;
+        $options['attr']['enabled']       = ['@true' => null];
+        $options['attr']['data-scalar']   = 'foo';
+        $options['attr']['data-expr']     = ['@true' => null];
+        $options['attr']['class']         = $classAttr;
+        $options['label_attr']['enabled'] = ['@true' => null];
+        $options['array_with_expr']       = ['item1' => 'val1', 'item2' => ['@true' => null]];
 
         $this->expressionAssembler->expects($this->exactly(6))
             ->method('assemble')
@@ -101,70 +106,71 @@ public function testFinishViewEvaluatesAllExpressions()
             );
 
         $context['expressions_evaluate'] = true;
-        $this->extension->finishView($view, $block, []);
+        $this->extension->buildBlock($block, $options);
 
         $this->assertSame(
             true,
-            $view->vars['expr_object'],
+            $options['expr_object'],
             'Failed asserting that an expression is evaluated'
         );
         $this->assertSame(
             true,
-            $view->vars['expr_array'],
+            $options['expr_array'],
             'Failed asserting that an expression is assembled and evaluated'
         );
         $this->assertSame(
             ['@true' => null],
-            $view->vars['not_expr_array'],
+            $options['not_expr_array'],
             'Failed asserting that a backslash at the begin of the array key is removed'
         );
         $this->assertSame(
             123,
-            $view->vars['scalar'],
+            $options['scalar'],
             'Failed asserting that a scalar value is not changed'
         );
         $this->assertSame(
             true,
-            $view->vars['attr']['enabled'],
+            $options['attr']['enabled'],
             'Failed asserting that an expression in "attr" is assembled and evaluated'
         );
         $this->assertSame(
             'foo',
-            $view->vars['attr']['data-scalar'],
+            $options['attr']['data-scalar'],
             'Failed asserting that "attr.data-scalar" exists'
         );
         $this->assertSame(
             true,
-            $view->vars['attr']['data-expr'],
+            $options['attr']['data-expr'],
             'Failed asserting that "attr.data-expr" is assembled and evaluated'
         );
         $this->assertEquals(
             $expectedClassAttr,
-            $view->vars['attr']['class'],
+            $options['attr']['class'],
             'Failed asserting that "attr.class" is assembled and evaluated'
         );
         $this->assertSame(
             true,
-            $view->vars['label_attr']['enabled'],
+            $options['label_attr']['enabled'],
             'Failed asserting that an expression in "label_attr" is assembled and evaluated'
         );
         $this->assertSame(
             ['item1' => 'val1', 'item2' => true],
-            $view->vars['array_with_expr'],
+            $options['array_with_expr'],
             'Failed asserting that an expression is assembled and evaluated in nested array'
         );
     }
 
-    public function testFinishViewDoNothingIfEvaluationOfExpressionsDisabledAndEncodingIsNotSet()
+    public function testBuildBlockDoNothingIfEvaluationOfExpressionsDisabledAndEncodingIsNotSet()
     {
         $context = new LayoutContext();
-        $block   = $this->getMock('Oro\Component\Layout\BlockInterface');
+
+        /** @var BlockBuilderInterface|\PHPUnit_Framework_MockObject_MockObject $block */
+        $block = $this->getMock('Oro\Component\Layout\BlockBuilderInterface');
         $block->expects($this->once())
             ->method('getContext')
             ->will($this->returnValue($context));
         $block->expects($this->never())
-            ->method('getData');
-        $view = new BlockView();
+            ->method('getDataAccessor');
 
         $expr = $this->getMock('Oro\Component\ConfigExpression\ExpressionInterface');
         $expr->expects($this->never())
@@ -172,36 +178,38 @@ public function testFinishViewDoNothingIfEvaluationOfExpressionsDisabledAndEncod
         $expr->expects($this->never())
             ->method('toArray');
 
-        $view->vars['expr_object']           = $expr;
-        $view->vars['expr_array']            = ['@true' => null];
-        $view->vars['not_expr_array']        = ['\@true' => null];
-        $view->vars['scalar']                = 123;
-        $view->vars['attr']['enabled']       = ['@true' => null];
-        $view->vars['label_attr']['enabled'] = ['@true' => null];
+        $options = [];
+        $options['expr_object']           = $expr;
+        $options['expr_array']            = ['@true' => null];
+        $options['not_expr_array']        = ['\@true' => null];
+        $options['scalar']                = 123;
+        $options['attr']['enabled']       = ['@true' => null];
+        $options['label_attr']['enabled'] = ['@true' => null];
 
         $this->expressionAssembler->expects($this->never())
             ->method('assemble');
 
-        $initialVars = $view->vars;
+        $initialVars = $options;
 
         $context['expressions_evaluate'] = false;
-        $this->extension->finishView($view, $block, []);
+        $this->extension->buildBlock($block, $options);
 
-        $this->assertSame($initialVars, $view->vars);
+        $this->assertSame($initialVars, $options);
     }
 
-    public function testFinishViewEncodesAllExpressions()
+    public function testBuildBlockEncodesAllExpressions()
     {
         $context = new LayoutContext();
         $data    = $this->getMock('Oro\Component\Layout\DataAccessorInterface');
-        $block   = $this->getMock('Oro\Component\Layout\BlockInterface');
+
+        /** @var BlockBuilderInterface|\PHPUnit_Framework_MockObject_MockObject $block */
+        $block = $this->getMock('Oro\Component\Layout\BlockBuilderInterface');
         $block->expects($this->once())
             ->method('getContext')
             ->will($this->returnValue($context));
         $block->expects($this->once())
-            ->method('getData')
+            ->method('getDataAccessor')
             ->will($this->returnValue($data));
-        $view = new BlockView();
 
         $expr = $this->getMock('Oro\Component\ConfigExpression\ExpressionInterface');
         $expr->expects($this->once())
@@ -215,13 +223,14 @@ public function testFinishViewEncodesAllExpressions()
         $expectedClassAttr = new OptionValueBag();
         $expectedClassAttr->add('{"@value":{"parameters":["$context.css_class"]}}');
 
-        $view->vars['expr_object']           = $expr;
-        $view->vars['expr_array']            = ['@true' => null];
-        $view->vars['not_expr_array']        = ['\@true' => null];
-        $view->vars['scalar']                = 123;
-        $view->vars['attr']['enabled']       = ['@true' => null];
-        $view->vars['attr']['class']         = $classAttr;
-        $view->vars['label_attr']['enabled'] = ['@true' => null];
+        $options = [];
+        $options['expr_object']           = $expr;
+        $options['expr_array']            = ['@true' => null];
+        $options['not_expr_array']        = ['\@true' => null];
+        $options['scalar']                = 123;
+        $options['attr']['enabled']       = ['@true' => null];
+        $options['attr']['class']         = $classAttr;
+        $options['label_attr']['enabled'] = ['@true' => null];
 
         $this->expressionAssembler->expects($this->exactly(4))
             ->method('assemble')
@@ -236,41 +245,41 @@ public function testFinishViewEncodesAllExpressions()
 
         $context['expressions_evaluate'] = false;
         $context['expressions_encoding'] = 'json';
-        $this->extension->finishView($view, $block, []);
+        $this->extension->buildBlock($block, $options);
 
         $this->assertSame(
             '{"@true":null}',
-            $view->vars['expr_object'],
+            $options['expr_object'],
             'Failed asserting that an expression is encoded'
         );
         $this->assertSame(
             '{"@true":null}',
-            $view->vars['expr_array'],
+            $options['expr_array'],
             'Failed asserting that an expression is assembled and encoded'
         );
         $this->assertSame(
             ['@true' => null],
-            $view->vars['not_expr_array'],
+            $options['not_expr_array'],
             'Failed asserting that a backslash at the begin of the array key is removed'
         );
         $this->assertSame(
             123,
-            $view->vars['scalar'],
+            $options['scalar'],
             'Failed asserting that a scalar value is not changed'
         );
         $this->assertSame(
             '{"@true":null}',
-            $view->vars['attr']['enabled'],
+            $options['attr']['enabled'],
             'Failed asserting that an expression in "attr" is assembled and encoded'
         );
         $this->assertEquals(
             $expectedClassAttr,
-            $view->vars['attr']['class'],
+            $options['attr']['class'],
             'Failed asserting that "attr.class" is assembled and encoded'
         );
         $this->assertSame(
             '{"@true":null}',
-            $view->vars['label_attr']['enabled'],
+            $options['label_attr']['enabled'],
             'Failed asserting that an expression in "label_attr" is assembled and encoded'
         );
     }
diff --git a/src/Oro/Component/Layout/Tests/Unit/BlockBuilderTest.php b/src/Oro/Component/Layout/Tests/Unit/BlockBuilderTest.php
index 4ee7ce0a53a..8c3b6842578 100644
--- a/src/Oro/Component/Layout/Tests/Unit/BlockBuilderTest.php
+++ b/src/Oro/Component/Layout/Tests/Unit/BlockBuilderTest.php
@@ -4,8 +4,10 @@
 
 use Oro\Component\Layout\BlockBuilder;
 use Oro\Component\Layout\BlockTypeHelperInterface;
+use Oro\Component\Layout\DataAccessor;
 use Oro\Component\Layout\LayoutContext;
 use Oro\Component\Layout\LayoutManipulatorInterface;
+use Oro\Component\Layout\LayoutRegistryInterface;
 use Oro\Component\Layout\RawLayout;
 
 class BlockBuilderTest extends \PHPUnit_Framework_TestCase
@@ -25,17 +27,27 @@ class BlockBuilderTest extends \PHPUnit_Framework_TestCase
     /** @var BlockBuilder */
     protected $blockBuilder;
 
+    /** @var DataAccessor */
+    protected $dataAccessor;
+
+    /** @var LayoutRegistryInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $registry;
+
     protected function setUp()
     {
         $this->rawLayout         = new RawLayout();
         $this->typeHelper        = $this->getMock('Oro\Component\Layout\BlockTypeHelperInterface');
         $this->context           = new LayoutContext();
         $this->layoutManipulator = $this->getMock('Oro\Component\Layout\LayoutManipulatorInterface');
+        $this->registry          = $this->getMock('Oro\Component\Layout\LayoutRegistryInterface');
+        $this->dataAccessor      = new DataAccessor($this->registry, $this->context);
+
         $this->blockBuilder      = new BlockBuilder(
             $this->layoutManipulator,
             $this->rawLayout,
             $this->typeHelper,
-            $this->context
+            $this->context,
+            $this->dataAccessor
         );
     }
 
diff --git a/src/Oro/Component/Layout/Tests/Unit/LayoutFactoryBuilderTest.php b/src/Oro/Component/Layout/Tests/Unit/LayoutFactoryBuilderTest.php
index 801a6f94cb6..39fbf7847d6 100644
--- a/src/Oro/Component/Layout/Tests/Unit/LayoutFactoryBuilderTest.php
+++ b/src/Oro/Component/Layout/Tests/Unit/LayoutFactoryBuilderTest.php
@@ -2,7 +2,15 @@
 
 namespace Oro\Component\Layout\Tests\Unit;
 
+use Oro\Component\Layout\BlockBuilderInterface;
+use Oro\Component\Layout\BlockTypeExtensionInterface;
+use Oro\Component\Layout\BlockTypeInterface;
+use Oro\Component\Layout\Extension\ExtensionInterface;
 use Oro\Component\Layout\LayoutFactoryBuilder;
+use Oro\Component\Layout\LayoutItemInterface;
+use Oro\Component\Layout\LayoutRendererInterface;
+use Oro\Component\Layout\LayoutUpdateInterface;
+use Oro\Component\Layout\DeferredLayoutManipulatorInterface;
 
 class LayoutFactoryBuilderTest extends \PHPUnit_Framework_TestCase
 {
@@ -22,7 +30,9 @@ public function testGetEmptyLayoutFactory()
 
     public function testGetLayoutFactoryWithImplicitSetOfDefaultRenderer()
     {
+        /** @var LayoutRendererInterface $renderer1 */
         $renderer1 = $this->getMock('Oro\Component\Layout\LayoutRendererInterface');
+        /** @var LayoutRendererInterface $renderer2 */
         $renderer2 = $this->getMock('Oro\Component\Layout\LayoutRendererInterface');
         $this->layoutFactoryBuilder
             ->addRenderer('renderer1', $renderer1)
@@ -46,7 +56,9 @@ public function testGetLayoutFactoryWithImplicitSetOfDefaultRenderer()
 
     public function testGetLayoutFactoryWithExplicitSetOfDefaultRenderer()
     {
+        /** @var LayoutRendererInterface $renderer1 */
         $renderer1 = $this->getMock('Oro\Component\Layout\LayoutRendererInterface');
+        /** @var LayoutRendererInterface $renderer2 */
         $renderer2 = $this->getMock('Oro\Component\Layout\LayoutRendererInterface');
         $this->layoutFactoryBuilder
             ->addRenderer('renderer1', $renderer1)
@@ -74,6 +86,7 @@ public function testAddExtension()
         $name = 'test';
         $type = $this->getMock('Oro\Component\Layout\BlockTypeInterface');
 
+        /** @var ExtensionInterface|\PHPUnit_Framework_MockObject_MockObject $extension */
         $extension     = $this->getMock('Oro\Component\Layout\Extension\ExtensionInterface');
         $layoutFactory = $this->layoutFactoryBuilder
             ->addExtension($extension)
@@ -97,6 +110,7 @@ public function testAddExtension()
     public function testAddType()
     {
         $name = 'test';
+        /** @var BlockTypeInterface|\PHPUnit_Framework_MockObject_MockObject $type */
         $type = $this->getMock('Oro\Component\Layout\BlockTypeInterface');
         $type->expects($this->once())
             ->method('getName')
@@ -115,10 +129,12 @@ public function testAddType()
     public function testAddTypeExtension()
     {
         $name          = 'test';
+        /** @var BlockTypeExtensionInterface|\PHPUnit_Framework_MockObject_MockObject $typeExtension */
         $typeExtension = $this->getMock('Oro\Component\Layout\BlockTypeExtensionInterface');
         $typeExtension->expects($this->once())
             ->method('getExtendedType')
             ->will($this->returnValue($name));
+        /** @var BlockBuilderInterface $blockBuilder */
         $blockBuilder = $this->getMock('Oro\Component\Layout\BlockBuilderInterface');
 
         $layoutFactory = $this->layoutFactoryBuilder
@@ -129,14 +145,18 @@ public function testAddTypeExtension()
             ->method('buildBlock')
             ->with($this->identicalTo($blockBuilder), []);
 
-        $layoutFactory->getRegistry()->buildBlock($name, $blockBuilder, []);
+        $options = [];
+        $layoutFactory->getRegistry()->buildBlock($name, $blockBuilder, $options);
     }
 
     public function testAddLayoutUpdate()
     {
         $id                = 'test';
+        /** @var LayoutUpdateInterface|\PHPUnit_Framework_MockObject_MockObject $layoutUpdate */
         $layoutUpdate      = $this->getMock('Oro\Component\Layout\LayoutUpdateInterface');
+        /** @var DeferredLayoutManipulatorInterface $layoutManipulator */
         $layoutManipulator = $this->getMock('Oro\Component\Layout\DeferredLayoutManipulatorInterface');
+        /** @var LayoutItemInterface|\PHPUnit_Framework_MockObject_MockObject $layoutItem */
         $layoutItem        = $this->getMock('Oro\Component\Layout\LayoutItemInterface');
         $layoutItem->expects($this->any())->method('getId')->willReturn($id);
 
diff --git a/src/Oro/Component/Layout/Tests/Unit/LayoutTestCase.php b/src/Oro/Component/Layout/Tests/Unit/LayoutTestCase.php
index 522c5e4a803..cca934ff430 100644
--- a/src/Oro/Component/Layout/Tests/Unit/LayoutTestCase.php
+++ b/src/Oro/Component/Layout/Tests/Unit/LayoutTestCase.php
@@ -45,6 +45,12 @@ protected function completeView(array &$view)
         if (!isset($view['children'])) {
             $view['children'] = [];
         }
+        if (!isset($view['vars']['tag'])) {
+            $view['vars']['tag'] = null;
+        }
+        if (!isset($view['vars']['class_prefix'])) {
+            $view['vars']['class_prefix'] = null;
+        }
         array_walk($view['children'], [$this, 'completeView']);
     }
 

From c4f520f5437b2451e12e5d4f39f6549497f5048d Mon Sep 17 00:00:00 2001
From: Oleksandr Nechyporenko <onechyporenko@magecore.com>
Date: Thu, 3 Dec 2015 17:55:17 +0200
Subject: [PATCH 062/471] BB-1491: Login and Registration Page Layouts  - fix
 whitespace trim after master merge

---
 UPGRADE-1.9.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/UPGRADE-1.9.md b/UPGRADE-1.9.md
index 4f1d18b20f8..94b7b022345 100644
--- a/UPGRADE-1.9.md
+++ b/UPGRADE-1.9.md
@@ -32,13 +32,13 @@ UPGRADE FROM 1.8 to 1.9
 
 ####DataGridBundle
 - Services with tag `oro_datagrid.extension.formatter.property` was marked as private
-- JS collection models format changed to maintain compatibility with Backbone collections: now it is always list of models, and additional parameters are passed through the options
+- JS collection models format changed to maintain compatibility with Backbone collections: now it is always list of models, and additional parameters are passed through the options 
 
 ####EmailBundle
 - Method `setFolder` of `Oro\Bundle\EmailBundle\Entity\EmailUser` marked as deprecated. Use the method `addFolder` instead.
 - `oro_email.emailtemplate.variable_provider.entity` service was marked as private
 - `oro_email.emailtemplate.variable_provider.system` service was marked as private
-- `oro_email.emailtemplate.variable_provider.user` service was marked as private
+- `oro_email.emailtemplate.variable_provider.user` service was marked as private 
 
 ####EmbeddedFormBundle
 - Bundle now contains configuration of security firewall `embedded_form`
@@ -112,14 +112,14 @@ UPGRADE FROM 1.8 to 1.9
 
 ####SecurityBundle
 - `Oro\Bundle\SecurityBundle\Owner\OwnerTreeInterface` is changed. New method `buildTree` added (due to performance issues). It should be called once after all `addDeepEntity` calls. See [OwnerTreeProvider](./src/Oro/Bundle/SecurityBundle/Owner/OwnerTreeProvider.php) method `fillTree`. Implementation example [OwnerTree](./src/Oro/Bundle/SecurityBundle/Owner/OwnerTree.php).
-- Bundle now contains part of Symfony security configuration (ACL configuration and access decision manager strategy)
+- Bundle now contains part of Symfony security configuration (ACL configuration and access decision manager strategy) 
 - `Oro\Bundle\SecurityBundle\Http\Firewall\ContextListener` added to the class cache and constructor have container as performance improvement
 
 ####SidebarBundle
 - `Oro\Bundle\SidebarBundle\EventListener\RequestHandler` added to the class cache as performance improvement
 
 ####SoapBundle
-- Bundle now contains configuration of security firewall `wsse_secured`
+- Bundle now contains configuration of security firewall `wsse_secured` 
 - `Oro\Bundle\SoapBundle\EventListener\LocaleListener` added to the class cache and constructor have container as performance improvement
 
 ####TrackingBundle
@@ -144,8 +144,8 @@ UPGRADE FROM 1.8 to 1.9
 - Constructor of `Oro\Bundle\WorkflowBundle\Model\ProcessFactory` changed. New argument: `ConditionFactory $conditionFactory`
 - Added new process definition option `pre_conditions`
 - Class `Oro\Bundle\WorkflowBundle\Model\WorkflowManager` now has method `massTransit` to perform several transitions in one transaction, can be used to improve workflow performance
-- Services with tag `oro_workflow.condition` was marked as private
-- Services with tag `oro_workflow.action` was marked as private
+- Services with tag `oro_workflow.condition` was marked as private 
+- Services with tag `oro_workflow.action` was marked as private 
 - Route `oro_workflow_api_rest_process_activate` marked as deprecated. Use the route `oro_api_process_activate` instead.
 - Route `oro_workflow_api_rest_process_deactivate` marked as deprecated. Use the route `oro_api_process_deactivate` instead.
 - Route `oro_workflow_api_rest_workflowdefinition_get` marked as deprecated. Use the route `oro_api_workflow_definition_get` instead.

From cccfe3d75d4a06520662704ff7b352261ecb19e0 Mon Sep 17 00:00:00 2001
From: Oleksandr Nechyporenko <onechyporenko@magecore.com>
Date: Thu, 3 Dec 2015 17:56:10 +0200
Subject: [PATCH 063/471] BB-1491: Login and Registration Page Layouts  - fix
 whitespace trim after master merge

---
 UPGRADE-1.9.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UPGRADE-1.9.md b/UPGRADE-1.9.md
index 94b7b022345..fbf5fe7478d 100644
--- a/UPGRADE-1.9.md
+++ b/UPGRADE-1.9.md
@@ -33,7 +33,7 @@ UPGRADE FROM 1.8 to 1.9
 ####DataGridBundle
 - Services with tag `oro_datagrid.extension.formatter.property` was marked as private
 - JS collection models format changed to maintain compatibility with Backbone collections: now it is always list of models, and additional parameters are passed through the options 
-
+ 
 ####EmailBundle
 - Method `setFolder` of `Oro\Bundle\EmailBundle\Entity\EmailUser` marked as deprecated. Use the method `addFolder` instead.
 - `oro_email.emailtemplate.variable_provider.entity` service was marked as private

From c1271586ec34dbb40d8456d13a33da0cb90bd86e Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Fri, 4 Dec 2015 11:02:39 +0100
Subject: [PATCH 064/471] BAP-9430: Report builder filters does not contain
 aggregation columns

- basic functionality
---
 .../GroupingOrmFilterDatasourceAdapter.php    |   8 +-
 .../QueryDesigner/AbstractQueryConverter.php  |   3 +-
 .../Resources/config/requirejs.yml            |   1 +
 .../public/js/aggregated-field-condition.js   | 111 ++++++++++++++++++
 .../Resources/translations/messages.en.yml    |   1 +
 ...GroupingOrmFilterDatasourceAdapterTest.php |  40 +++++++
 .../Resources/config/requirejs.yml            |   1 +
 .../aggregated-field-condition-extension.js   |  58 +++++++++
 .../Resources/views/macros.html.twig          |  29 ++++-
 9 files changed, 248 insertions(+), 4 deletions(-)
 create mode 100644 src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js
 create mode 100644 src/Oro/Bundle/SegmentBundle/Resources/public/js/app/components/aggregated-field-condition-extension.js

diff --git a/src/Oro/Bundle/QueryDesignerBundle/Grid/Extension/GroupingOrmFilterDatasourceAdapter.php b/src/Oro/Bundle/QueryDesignerBundle/Grid/Extension/GroupingOrmFilterDatasourceAdapter.php
index d80687f54f6..43f9c4e5efd 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Grid/Extension/GroupingOrmFilterDatasourceAdapter.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/Grid/Extension/GroupingOrmFilterDatasourceAdapter.php
@@ -50,7 +50,13 @@ public function __construct(QueryBuilder $qb)
     public function addRestriction($restriction, $condition, $isComputed = false)
     {
         if ($isComputed) {
-            throw new \LogicException('The HAVING restrictions is not supported yet.');
+            if ($condition === FilterUtility::CONDITION_OR) {
+                $this->qb->orHaving($restriction);
+            } else {
+                $this->qb->andHaving($restriction);
+            }
+
+            return;
         }
 
         if ($this->currentExpr === null) {
diff --git a/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/AbstractQueryConverter.php b/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/AbstractQueryConverter.php
index 198f592ef15..539cb46536f 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/AbstractQueryConverter.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/AbstractQueryConverter.php
@@ -676,7 +676,8 @@ protected function processFilter($filter)
             $this->buildColumnExpression($columnName, $tableAlias, $fieldName),
             $this->getColumnAlias($columnAliasKey),
             $filter['criterion']['filter'],
-            $filter['criterion']['data']
+            $filter['criterion']['data'],
+            $functionExpr
         );
     }
 
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Resources/config/requirejs.yml b/src/Oro/Bundle/QueryDesignerBundle/Resources/config/requirejs.yml
index a9517905e07..9c997dc7b5c 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Resources/config/requirejs.yml
+++ b/src/Oro/Bundle/QueryDesignerBundle/Resources/config/requirejs.yml
@@ -2,6 +2,7 @@ config:
     paths:
         'oroquerydesigner/js/condition-builder': 'bundles/oroquerydesigner/js/condition-builder.js'
         'oroquerydesigner/js/field-condition': 'bundles/oroquerydesigner/js/field-condition.js'
+        'oroquerydesigner/js/aggregated-field-condition': 'bundles/oroquerydesigner/js/aggregated-field-condition.js'
         'oroquerydesigner/js/function-choice': 'bundles/oroquerydesigner/js/function-choice.js'
         'oroquerydesigner/js/items-manager/grouping-model': 'bundles/oroquerydesigner/js/items-manager/grouping-model.js'
         'oroquerydesigner/js/items-manager/column-model': 'bundles/oroquerydesigner/js/items-manager/column-model.js'
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js
new file mode 100644
index 00000000000..ab467a2ec3b
--- /dev/null
+++ b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js
@@ -0,0 +1,111 @@
+define([
+    'jquery',
+    'underscore',
+    'oroquerydesigner/js/field-condition'
+], function ($, _) {
+    $.widget('oroauditquerydesigner.aggregatedFieldCondition', $.oroquerydesigner.fieldCondition, {
+        options: {
+            columnsCollection: null
+        },
+
+        _create: function() {
+            var data = this.element.data('value');
+
+            this.$fieldChoice = $('<input>').addClass(this.options.fieldChoiceClass);
+            this.$filterContainer = $('<span>').addClass(this.options.filterContainerClass);
+            this.element.append(this.$fieldChoice, this.$filterContainer);
+
+            this.$fieldChoice.fieldChoice(this.options.fieldChoice);
+
+            this._updateFieldChoice();
+            if (data && data.columnName) {
+                this.selectField(data.columnName);
+                this._renderFilter(data.columnName);
+            }
+
+            this._on(this.$fieldChoice, {
+                changed: function(e, fieldId) {
+                    $(':focus').blur();
+                    // reset current value on field change
+                    this.element.data('value', {});
+                    this._renderFilter(fieldId);
+                    e.stopPropagation();
+                }
+            });
+
+            this._on(this.$filterContainer, {
+                change: function() {
+                    if (this.filter) {
+                        this.filter.applyValue();
+                    }
+                }
+            });
+        },
+
+        _updateFieldChoice: function() {
+            var self = this;
+            var fieldChoice = this.$fieldChoice.fieldChoice().data('oroentity-fieldChoice');
+            var originalSelect2Data = fieldChoice._select2Data;
+
+            fieldChoice._select2Data = function(path) {
+                originalSelect2Data.apply(this, arguments);
+
+                return self._getAggregatedSelectData();
+            };
+        },
+
+        _getAggregatedSelectData: function() {
+            return _.map(
+                this._getAggregatedColumns(),
+                function (model) {
+                    return {
+                        id: model.get('name'),
+                        text: model.get('label')
+                    };
+                }
+            );
+        },
+
+        _getAggregatedColumns: function() {
+            return _.filter(
+                this.options.columnsCollection.models,
+                _.compose(_.negate(_.isEmpty), _.property('func'), _.property('attributes'))
+            );
+        },
+
+        _onUpdate: function() {
+            var value;
+            var columnName = this.element.find('input.select').select2('val');
+            var columnFunc = this._getColumnFunc(columnName);
+
+            if (this.filter && !this.filter.isEmptyValue() && !_.isEmpty(columnFunc)) {
+                value = {
+                    columnName: columnName,
+                    criterion: this._getFilterCriterion(),
+                    func: columnFunc
+                };
+            } else {
+                value = {};
+            }
+
+            this.element.data('value', value);
+            this.element.trigger('changed');
+        },
+
+        _getColumnFunc: function(columnName) {
+            var column = this.options.columnsCollection.findWhere({name: columnName});
+            if (_.isEmpty(column)) {
+                return;
+            }
+
+            return column.get('func');
+        },
+
+        _getFilterCriterion: function() {
+            var criterion = this._superApply(arguments);
+            $.extend(true, criterion, {'data': {'params': {'filter_by_having': true}}});
+
+            return criterion;
+        }
+    });
+});
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Resources/translations/messages.en.yml b/src/Oro/Bundle/QueryDesignerBundle/Resources/translations/messages.en.yml
index 1197fd0a151..37c3fc4ced7 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Resources/translations/messages.en.yml
+++ b/src/Oro/Bundle/QueryDesignerBundle/Resources/translations/messages.en.yml
@@ -34,6 +34,7 @@ oro:
             criteria:
                 drag_hint: drag to select
                 field_condition:   Field Condition
+                aggregated_field_condition:   Aggregation column
                 conditions_group:  Conditions Group
             choose_entity_field: Choose a field...
         validation:
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/GroupingOrmFilterDatasourceAdapterTest.php b/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/GroupingOrmFilterDatasourceAdapterTest.php
index dd510acb10d..651983a0520 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/GroupingOrmFilterDatasourceAdapterTest.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/GroupingOrmFilterDatasourceAdapterTest.php
@@ -45,6 +45,25 @@ public function testOneRestriction()
         );
     }
 
+    public function testOneComputedRestriction()
+    {
+        $qb = new QueryBuilder($this->getTestEntityManager());
+        $qb->select(['u.status, COUNT(u.id)'])
+            ->from('Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser', 'u')
+            ->groupBy('u.status');
+        $ds = new GroupingOrmFilterDatasourceAdapter($qb);
+
+        $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '1'), FilterUtility::CONDITION_AND, true);
+        $ds->applyRestrictions();
+
+        $this->assertEquals(
+            'SELECT u.status, COUNT(u.id) FROM Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser u '
+            . 'GROUP BY u.status '
+            . 'HAVING COUNT(u.id) = 1',
+            $qb->getDQL()
+        );
+    }
+
     public function testSeveralRestrictions()
     {
         $qb = new QueryBuilder($this->getTestEntityManager());
@@ -66,6 +85,27 @@ public function testSeveralRestrictions()
         );
     }
 
+    public function testSeveralComputedRestrictions()
+    {
+        $qb = new QueryBuilder($this->getTestEntityManager());
+        $qb->select(['u.status, COUNT(u.id)'])
+            ->from('Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser', 'u')
+            ->groupBy('u.status');
+        $ds = new GroupingOrmFilterDatasourceAdapter($qb);
+
+        $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '1'), FilterUtility::CONDITION_AND, true);
+        $ds->addRestriction($qb->expr()->eq('MIN(u.id)', '2'), FilterUtility::CONDITION_OR, true);
+        $ds->addRestriction($qb->expr()->eq('MAX(u.id)', '3'), FilterUtility::CONDITION_AND, true);
+        $ds->applyRestrictions();
+
+        $this->assertEquals(
+            'SELECT u.status, COUNT(u.id) FROM Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser u '
+            . 'GROUP BY u.status '
+            . 'HAVING (COUNT(u.id) = 1 OR MIN(u.id) = 2) AND MAX(u.id) = 3',
+            $qb->getDQL()
+        );
+    }
+
     public function testEmptyGroup()
     {
         $qb = new QueryBuilder($this->getTestEntityManager());
diff --git a/src/Oro/Bundle/SegmentBundle/Resources/config/requirejs.yml b/src/Oro/Bundle/SegmentBundle/Resources/config/requirejs.yml
index b3f24523396..81115c25ea1 100644
--- a/src/Oro/Bundle/SegmentBundle/Resources/config/requirejs.yml
+++ b/src/Oro/Bundle/SegmentBundle/Resources/config/requirejs.yml
@@ -2,3 +2,4 @@ config:
     paths:
         'orosegment/js/app/components/refresh-button': 'bundles/orosegment/js/app/components/refresh-button.js'
         'orosegment/js/app/components/segment-component': 'bundles/orosegment/js/app/components/segment-component.js'
+        'orosegment/js/app/components/aggregated-field-condition-extension': 'bundles/orosegment/js/app/components/aggregated-field-condition-extension.js'
diff --git a/src/Oro/Bundle/SegmentBundle/Resources/public/js/app/components/aggregated-field-condition-extension.js b/src/Oro/Bundle/SegmentBundle/Resources/public/js/app/components/aggregated-field-condition-extension.js
new file mode 100644
index 00000000000..6d9d37d93fb
--- /dev/null
+++ b/src/Oro/Bundle/SegmentBundle/Resources/public/js/app/components/aggregated-field-condition-extension.js
@@ -0,0 +1,58 @@
+define([
+    'jquery',
+    'underscore'
+], function($, _) {
+    'use strict';
+
+    return {
+        load: function(segment) {
+            segment.defaults = $.extend(true, segment.defaults, {
+                defaults: {
+                    aggregatedFieldsLoader: {
+                        loadingMaskParent: '',
+                        router: null,
+                        routingParams: {},
+                        fieldsData: [],
+                        confirmMessage: '',
+                        loadEvent: 'aggregatedFieldsLoaded'
+                    }
+                }
+            });
+
+            segment.configureFilters = _.wrap(segment.configureFilters, function(original) {
+                var $criteria = $(this.options.filters.criteriaList);
+
+                var aggregatedFieldCondition = $criteria.find('[data-criteria=aggregated-condition-item]');
+                if (!_.isEmpty(aggregatedFieldCondition)) {
+                    var $itemContainer = $(this.options.column.itemContainer);
+                    var columnsCollection = $itemContainer.data('oroui-itemsManagerTable').options.collection;
+
+                    $.extend(true, aggregatedFieldCondition.data('options'), {
+                        fieldChoice: this.options.fieldChoiceOptions,
+                        filters: this.options.metadata.filters,
+                        hierarchy: this.options.metadata.hierarchy,
+                        columnsCollection: columnsCollection
+                    });
+                }
+
+                original.apply(this, _.rest(arguments));
+            });
+
+            segment.initFieldsLoader = _.wrap(segment.initFieldsLoader, function(original) {
+                this.$aggregatedFieldsLoader = original.call(this, this.options.aggregatedFieldsLoader);
+
+                return original.apply(this, _.rest(arguments));
+            });
+
+            segment.initEntityChangeEvents = _.wrap(segment.initEntityChangeEvents, function(original) {
+                this.trigger(
+                    this.options.aggregatedFieldsLoader.loadEvent,
+                    this.$aggregatedFieldsLoader.val(),
+                    this.$aggregatedFieldsLoader.fieldsLoader('getFieldsData')
+                );
+
+                return original.apply(this, _.rest(arguments));
+            });
+        }
+    };
+});
diff --git a/src/Oro/Bundle/SegmentBundle/Resources/views/macros.html.twig b/src/Oro/Bundle/SegmentBundle/Resources/views/macros.html.twig
index 6eff3740499..8e23e674fad 100644
--- a/src/Oro/Bundle/SegmentBundle/Resources/views/macros.html.twig
+++ b/src/Oro/Bundle/SegmentBundle/Resources/views/macros.html.twig
@@ -7,6 +7,14 @@
             fieldsLoaderSelector: '[data-ftid=' ~ params.entity_choice_id ~ 'oro_api_querydesigner_fields_entity]'
         }
     } %}
+    {% set aggregatedFieldConditionOptions = {
+        fieldChoice: {
+            select2: {
+                placeholder: 'oro.query_designer.condition_builder.choose_entity_field'|trans
+            },
+            fieldsLoaderSelector: '#' ~ params.entity_choice_id ~ 'oro_api_querydesigner_aggregated_fields',
+        }
+    } %}
     {% set segmentConditionOptions = {
         segmentChoice: {
             select2: {
@@ -25,7 +33,7 @@
         criteriaListSelector: '#' ~ params.criteria_list_id,
         entityChoiceSelector: '[data-ftid=' ~ params.entity_choice_id ~ ']',
         onFieldsUpdate: {
-            toggleCriteria: ['condition-item', 'condition-segment', 'conditions-group']
+            toggleCriteria: ['condition-item', 'condition-segment', 'conditions-group', 'aggregated-condition-item']
         }
     } %}
     {% set conditionBuilderOptions = update_segment_condition_builder_options(conditionBuilderOptions) %}
@@ -41,6 +49,12 @@
                         data-options="{{ fieldConditionOptions|json_encode }}">
                         {{ 'oro.query_designer.condition_builder.criteria.field_condition'|trans }}
                     </li>
+                    <li class="option" data-criteria="aggregated-condition-item"
+                        data-module="oroquerydesigner/js/aggregated-field-condition"
+                        data-widget="aggregatedFieldCondition"
+                        data-options="{{ aggregatedFieldConditionOptions|json_encode }}">
+                        {{ 'oro.query_designer.condition_builder.criteria.aggregated_field_condition'|trans }}
+                    </li>
                     <li class="option" data-criteria="condition-segment"
                         data-module="orosegment/js/segment-condition"
                         data-widget="segmentCondition"
@@ -148,11 +162,22 @@
             itemContainer: '#' ~ type ~ '-column-list .item-container',
             itemTemplate:  '#' ~ type ~ '-column-row'
         },
+        aggregatedFieldsLoader: {
+            entityChoice:      '[data-ftid=' ~ type ~ '_form_entity]',
+            loadingMaskParent: '#' ~ form.vars.id,
+            router:            'oro_api_querydesigner_aggregated_fields',
+            routingParams:     entityFieldsRouteParams,
+            fieldsData:        fieldsData,
+            confirmMessage:    type|replace('_', '.') ~ '.change_entity_confirmation',
+        },
         columnFieldChoiceOptions:     {},
         select2FieldChoiceTemplate:   '#column-chain-template',
         select2SegmentChoiceTemplate: '#segment-template',
         entities:                     entities,
-        metadata:                     metadata
+        metadata:                     metadata,
+        extensions: [
+            'orosegment/js/app/components/aggregated-field-condition-extension',
+        ],
     } %}
 
     {% if type == 'oro_report' %}

From 13c193da4c59c5afe74a6406cd62be3acd1d4667 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Fri, 4 Dec 2015 12:15:48 +0100
Subject: [PATCH 065/471] BAP-9430: Report builder filters does not contain
 aggregation columns

- include aggregation column filter via extension
---
 .../EventListener/SegmentSubscriber.php       | 69 +++++++++++++++++++
 .../Resources/config/placeholders.yml         |  9 +++
 .../Resources/config/services.yml             |  6 ++
 .../aggregated_field_condition.html.twig      | 15 ++++
 .../Event/WidgetOptionsLoadEvent.php          | 15 +++-
 .../Resources/views/macros.html.twig          | 31 +--------
 .../SegmentBundle/Twig/SegmentExtension.php   |  5 +-
 .../Placeholder/PlaceholderFilter.php         | 11 +++
 .../Config/Resolver/SystemAwareResolver.php   | 49 ++++++++++---
 9 files changed, 170 insertions(+), 40 deletions(-)
 create mode 100644 src/Oro/Bundle/ReportBundle/EventListener/SegmentSubscriber.php
 create mode 100644 src/Oro/Bundle/ReportBundle/Resources/config/placeholders.yml
 create mode 100644 src/Oro/Bundle/ReportBundle/Resources/views/Segment/aggregated_field_condition.html.twig

diff --git a/src/Oro/Bundle/ReportBundle/EventListener/SegmentSubscriber.php b/src/Oro/Bundle/ReportBundle/EventListener/SegmentSubscriber.php
new file mode 100644
index 00000000000..ab727b29a60
--- /dev/null
+++ b/src/Oro/Bundle/ReportBundle/EventListener/SegmentSubscriber.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Oro\Bundle\ReportBundle\EventListener;
+
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+use Oro\Bundle\SegmentBundle\Event\ConditionBuilderOptionsLoadEvent;
+use Oro\Bundle\SegmentBundle\Event\WidgetOptionsLoadEvent;
+
+class SegmentSubscriber implements EventSubscriberInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function getSubscribedEvents()
+    {
+        return [
+            WidgetOptionsLoadEvent::EVENT_NAME => 'loadAggregatedFieldsWidgetOptions',
+            ConditionBuilderOptionsLoadEvent::EVENT_NAME => 'loadAggregatedFieldsBuilderOptions',
+        ];
+    }
+
+    /**
+     * @param WidgetOptionsLoadEvent $event
+     */
+    public function loadAggregatedFieldsWidgetOptions(WidgetOptionsLoadEvent $event)
+    {
+        if ($event->getWidgetType() !== 'oro_report') {
+            return;
+        }
+
+        $widgetOptions = $event->getWidgetOptions();
+        $fieldsLoader = $widgetOptions['fieldsLoader'];
+
+        $event->setWidgetOptions(array_merge_recursive(
+            $widgetOptions,
+            [
+                'aggregatedFieldsLoader' => [
+                    'entityChoice'      => $fieldsLoader['entityChoice'],
+                    'loadingMaskParent' => $fieldsLoader['loadingMaskParent'],
+                    'router'            => 'oro_api_querydesigner_aggregated_fields',
+                    'routingParams'     => [],
+                    'fieldsData'        => $fieldsLoader['fieldsData'],
+                    'confirmMessage'    => $fieldsLoader['confirmMessage'],
+                ],
+                'extensions' => [
+                    'orosegment/js/app/components/aggregated-field-condition-extension',
+                ],
+            ]
+        ));
+    }
+
+    /**
+     * @param ConditionBuilderOptionsLoadEvent $event
+     */
+    public function loadAggregatedFieldsBuilderOptions(ConditionBuilderOptionsLoadEvent $event)
+    {
+        $event->setOptions(array_merge_recursive(
+            $event->getOptions(),
+            [
+                'onFieldsUpdate' => [
+                    'toggleCriteria' => [
+                        'aggregated-condition-item',
+                    ],
+                ],
+            ]
+        ));
+    }
+}
diff --git a/src/Oro/Bundle/ReportBundle/Resources/config/placeholders.yml b/src/Oro/Bundle/ReportBundle/Resources/config/placeholders.yml
new file mode 100644
index 00000000000..f5863f42487
--- /dev/null
+++ b/src/Oro/Bundle/ReportBundle/Resources/config/placeholders.yml
@@ -0,0 +1,9 @@
+placeholders:
+    segment_criteria_list:
+        items:
+            aggregated_field_condition: ~
+
+items:
+    aggregated_field_condition:
+        template: OroReportBundle:Segment:aggregated_field_condition.html.twig
+        applicable: @oro_ui.placeholder.filter->isSame($params.id$, oro_report-condition-builder)
diff --git a/src/Oro/Bundle/ReportBundle/Resources/config/services.yml b/src/Oro/Bundle/ReportBundle/Resources/config/services.yml
index e034476d3f4..0ea72443c82 100644
--- a/src/Oro/Bundle/ReportBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/ReportBundle/Resources/config/services.yml
@@ -4,6 +4,7 @@ parameters:
     oro_report.listener.navigation_listener.class:     Oro\Bundle\ReportBundle\EventListener\NavigationListener
     oro_report.report_manager.class:                   Oro\Bundle\ReportBundle\Entity\Manager\ReportManager
     oro_report.grid.base_configuration_builder.class:  Oro\Bundle\ReportBundle\Grid\BaseReportConfigurationBuilder
+    oro_report.listener.segment_subscriber.class:      Oro\Bundle\ReportBundle\EventListener\SegmentSubscriber
 
     oro_report.grid.datagrid_configuration_builder.class: Oro\Bundle\ReportBundle\Grid\ReportDatagridConfigurationBuilder
 services:
@@ -42,3 +43,8 @@ services:
     oro_report.grid.datagrid_configuration_builder:
         class: %oro_report.grid.datagrid_configuration_builder.class%
         parent: oro_report.grid.base_configuration_builder
+
+    oro_report.listener.segment_subscriber:
+        class: %oro_report.listener.segment_subscriber.class%
+        tags:
+            - { name: kernel.event_subscriber }
diff --git a/src/Oro/Bundle/ReportBundle/Resources/views/Segment/aggregated_field_condition.html.twig b/src/Oro/Bundle/ReportBundle/Resources/views/Segment/aggregated_field_condition.html.twig
new file mode 100644
index 00000000000..540efb11502
--- /dev/null
+++ b/src/Oro/Bundle/ReportBundle/Resources/views/Segment/aggregated_field_condition.html.twig
@@ -0,0 +1,15 @@
+{% set aggregatedFieldConditionOptions = {
+    fieldChoice: {
+        select2: {
+            placeholder: 'oro.query_designer.condition_builder.choose_entity_field'|trans
+        },
+        fieldsLoaderSelector: '#' ~ params.entity_choice_id ~ 'oro_api_querydesigner_aggregated_fields',
+    }
+} %}
+
+<li class="option" data-criteria="aggregated-condition-item"
+    data-module="oroquerydesigner/js/aggregated-field-condition"
+    data-widget="aggregatedFieldCondition"
+    data-options="{{ aggregatedFieldConditionOptions|json_encode }}">
+    {{ 'oro.query_designer.condition_builder.criteria.aggregated_field_condition'|trans }}
+</li>
diff --git a/src/Oro/Bundle/SegmentBundle/Event/WidgetOptionsLoadEvent.php b/src/Oro/Bundle/SegmentBundle/Event/WidgetOptionsLoadEvent.php
index 511b33e6e5f..ea9cbfda306 100644
--- a/src/Oro/Bundle/SegmentBundle/Event/WidgetOptionsLoadEvent.php
+++ b/src/Oro/Bundle/SegmentBundle/Event/WidgetOptionsLoadEvent.php
@@ -11,12 +11,17 @@ class WidgetOptionsLoadEvent extends Event
     /** @var array */
     protected $widgetOptions;
 
+    /** @var string|null */
+    protected $type;
+
     /**
      * @param array $widgetOptions
+     * @param string|null $type
      */
-    public function __construct(array $widgetOptions)
+    public function __construct(array $widgetOptions, $type = null)
     {
         $this->widgetOptions = $widgetOptions;
+        $this->type = $type;
     }
 
     /**
@@ -34,4 +39,12 @@ public function setWidgetOptions(array $widgetOptions)
     {
         $this->widgetOptions = $widgetOptions;
     }
+
+    /**
+     * @return string|null
+     */
+    public function getWidgetType()
+    {
+        return $this->type;
+    }
 }
diff --git a/src/Oro/Bundle/SegmentBundle/Resources/views/macros.html.twig b/src/Oro/Bundle/SegmentBundle/Resources/views/macros.html.twig
index 8e23e674fad..3dd8ec2a38b 100644
--- a/src/Oro/Bundle/SegmentBundle/Resources/views/macros.html.twig
+++ b/src/Oro/Bundle/SegmentBundle/Resources/views/macros.html.twig
@@ -7,14 +7,6 @@
             fieldsLoaderSelector: '[data-ftid=' ~ params.entity_choice_id ~ 'oro_api_querydesigner_fields_entity]'
         }
     } %}
-    {% set aggregatedFieldConditionOptions = {
-        fieldChoice: {
-            select2: {
-                placeholder: 'oro.query_designer.condition_builder.choose_entity_field'|trans
-            },
-            fieldsLoaderSelector: '#' ~ params.entity_choice_id ~ 'oro_api_querydesigner_aggregated_fields',
-        }
-    } %}
     {% set segmentConditionOptions = {
         segmentChoice: {
             select2: {
@@ -33,7 +25,7 @@
         criteriaListSelector: '#' ~ params.criteria_list_id,
         entityChoiceSelector: '[data-ftid=' ~ params.entity_choice_id ~ ']',
         onFieldsUpdate: {
-            toggleCriteria: ['condition-item', 'condition-segment', 'conditions-group', 'aggregated-condition-item']
+            toggleCriteria: ['condition-item', 'condition-segment', 'conditions-group']
         }
     } %}
     {% set conditionBuilderOptions = update_segment_condition_builder_options(conditionBuilderOptions) %}
@@ -49,12 +41,6 @@
                         data-options="{{ fieldConditionOptions|json_encode }}">
                         {{ 'oro.query_designer.condition_builder.criteria.field_condition'|trans }}
                     </li>
-                    <li class="option" data-criteria="aggregated-condition-item"
-                        data-module="oroquerydesigner/js/aggregated-field-condition"
-                        data-widget="aggregatedFieldCondition"
-                        data-options="{{ aggregatedFieldConditionOptions|json_encode }}">
-                        {{ 'oro.query_designer.condition_builder.criteria.aggregated_field_condition'|trans }}
-                    </li>
                     <li class="option" data-criteria="condition-segment"
                         data-module="orosegment/js/segment-condition"
                         data-widget="segmentCondition"
@@ -162,22 +148,11 @@
             itemContainer: '#' ~ type ~ '-column-list .item-container',
             itemTemplate:  '#' ~ type ~ '-column-row'
         },
-        aggregatedFieldsLoader: {
-            entityChoice:      '[data-ftid=' ~ type ~ '_form_entity]',
-            loadingMaskParent: '#' ~ form.vars.id,
-            router:            'oro_api_querydesigner_aggregated_fields',
-            routingParams:     entityFieldsRouteParams,
-            fieldsData:        fieldsData,
-            confirmMessage:    type|replace('_', '.') ~ '.change_entity_confirmation',
-        },
         columnFieldChoiceOptions:     {},
         select2FieldChoiceTemplate:   '#column-chain-template',
         select2SegmentChoiceTemplate: '#segment-template',
         entities:                     entities,
-        metadata:                     metadata,
-        extensions: [
-            'orosegment/js/app/components/aggregated-field-condition-extension',
-        ],
+        metadata:                     metadata
     } %}
 
     {% if type == 'oro_report' %}
@@ -195,7 +170,7 @@
         {% set widgetOptions = widgetOptions|merge({'columnFieldChoiceOptions': {exclude: ['relation_type']} }) %}
     {% endif %}
 
-    {% set widgetOptions = update_segment_widget_options(widgetOptions) %}
+    {% set widgetOptions = update_segment_widget_options(widgetOptions, type) %}
 
     <div data-page-component-module="orosegment/js/app/components/segment-component"
          data-page-component-options="{{ widgetOptions|json_encode }}"></div>
diff --git a/src/Oro/Bundle/SegmentBundle/Twig/SegmentExtension.php b/src/Oro/Bundle/SegmentBundle/Twig/SegmentExtension.php
index ed15ca4c5e5..37ed62dfa28 100644
--- a/src/Oro/Bundle/SegmentBundle/Twig/SegmentExtension.php
+++ b/src/Oro/Bundle/SegmentBundle/Twig/SegmentExtension.php
@@ -41,16 +41,17 @@ public function getFunctions()
 
     /**
      * @param array $widgetOptions
+     * @param string|null $type
      *
      * @return array
      */
-    public function updateSegmentWidgetOptions(array $widgetOptions)
+    public function updateSegmentWidgetOptions(array $widgetOptions, $type = null)
     {
         if (!$this->dispatcher->hasListeners(WidgetOptionsLoadEvent::EVENT_NAME)) {
             return $widgetOptions;
         }
 
-        $event = new WidgetOptionsLoadEvent($widgetOptions);
+        $event = new WidgetOptionsLoadEvent($widgetOptions, $type);
         $this->dispatcher->dispatch(WidgetOptionsLoadEvent::EVENT_NAME, $event);
 
         return $event->getWidgetOptions();
diff --git a/src/Oro/Bundle/UIBundle/Placeholder/PlaceholderFilter.php b/src/Oro/Bundle/UIBundle/Placeholder/PlaceholderFilter.php
index 203d1ca6c14..b897b6814ca 100644
--- a/src/Oro/Bundle/UIBundle/Placeholder/PlaceholderFilter.php
+++ b/src/Oro/Bundle/UIBundle/Placeholder/PlaceholderFilter.php
@@ -4,6 +4,17 @@
 
 class PlaceholderFilter
 {
+    /**
+     * @param mixed $param1
+     * @param mixed $param2
+     *
+     * @return bool
+     */
+    public function isSame($param1, $param2)
+    {
+        return $param1 === $param2;
+    }
+
     /**
      * Checks the object is an instance of a given class.
      *
diff --git a/src/Oro/Component/Config/Resolver/SystemAwareResolver.php b/src/Oro/Component/Config/Resolver/SystemAwareResolver.php
index e7aed5297de..3c7972561fa 100644
--- a/src/Oro/Component/Config/Resolver/SystemAwareResolver.php
+++ b/src/Oro/Component/Config/Resolver/SystemAwareResolver.php
@@ -4,22 +4,24 @@
 
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
+
+use Oro\Component\PropertyAccess\PropertyAccessor;
 
 class SystemAwareResolver implements ResolverInterface, ContainerAwareInterface
 {
     const PARENT_NODE = 'parent_node';
     const NODE_KEY    = 'node_key';
 
-    /**
-     * @var ContainerInterface
-     */
+    /** @var ContainerInterface */
     protected $container;
 
-    /**
-     * @var array
-     */
+    /** @var array */
     protected $context;
 
+    /** @var PropertyAccessorInterface|null */
+    protected $propertyAccessor;
+
     /**
      * @param ContainerInterface $container
      */
@@ -121,9 +123,14 @@ protected function getMethodCallParameters($declaration)
 
             if ($this->startsWith($item, '$') && $this->endsWith($item, '$')) {
                 $name = substr($item, 1, -1);
-                $item = (isset($this->context[$name]) || array_key_exists($name, $this->context))
-                    ? $this->context[$name]
-                    : null;
+                $dot = strpos($name, '.');
+                $objectName = $dot ? substr($name, 0, $dot) : $name;
+                $item = $this->getContextValue($objectName);
+
+                if ($dot) {
+                    $propertyPath = substr($name, $dot + 1);
+                    $item = $this->getPropertyAccessor()->getValue($item, $propertyPath);
+                }
             } elseif ($this->startsWith($item, '%') && $this->endsWith($item, '%')) {
                 $name = substr($item, 1, -1);
                 $item = $this->getParameter($name);
@@ -135,6 +142,18 @@ protected function getMethodCallParameters($declaration)
         return $result;
     }
 
+    /**
+     * @param string $name
+     *
+     * @return mixed
+     */
+    protected function getContextValue($name)
+    {
+        return (isset($this->context[$name]) || array_key_exists($name, $this->context))
+            ? $this->context[$name]
+            : null;
+    }
+
     /**
      * @param string $name
      * @return mixed
@@ -281,4 +300,16 @@ protected function resolveService($val)
 
         return $val;
     }
+
+    /**
+     * @return PropertyAccessorInterface
+     */
+    protected function getPropertyAccessor()
+    {
+        if (!$this->propertyAccessor) {
+            $this->propertyAccessor = new PropertyAccessor();
+        }
+
+        return $this->propertyAccessor;
+    }
 }

From 40436716260e70be7e0124cc9aeac63a867c422a Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Fri, 4 Dec 2015 12:21:23 +0100
Subject: [PATCH 066/471] BAP-9430: Report builder filters does not contain
 aggregation columns

- cs fixes
---
 .../QueryDesigner/GroupingOrmQueryConverter.php  | 16 ++++++++--------
 .../public/js/aggregated-field-condition.js      |  6 ++++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/GroupingOrmQueryConverter.php b/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/GroupingOrmQueryConverter.php
index 4d5e64167e6..344b8c20f20 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/GroupingOrmQueryConverter.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/GroupingOrmQueryConverter.php
@@ -100,14 +100,14 @@ protected function addWhereCondition(
                 $tableAlias,
                 $fieldName,
                 $functionExpr
-                    ? $this->prepareFunctionExpression(
-                        $functionExpr,
-                        $tableAlias,
-                        $fieldName,
-                        $columnExpr,
-                        $columnAlias
-                    )
-                    : $columnExpr
+                ? $this->prepareFunctionExpression(
+                    $functionExpr,
+                    $tableAlias,
+                    $fieldName,
+                    $columnExpr,
+                    $columnAlias
+                )
+                : $columnExpr
             ),
             'filter'     => $filterName,
             'filterData' => $filterData
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js
index ab467a2ec3b..ace264b3f88 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js
+++ b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js
@@ -2,7 +2,9 @@ define([
     'jquery',
     'underscore',
     'oroquerydesigner/js/field-condition'
-], function ($, _) {
+], function($, _) {
+    'use strict';
+
     $.widget('oroauditquerydesigner.aggregatedFieldCondition', $.oroquerydesigner.fieldCondition, {
         options: {
             columnsCollection: null
@@ -57,7 +59,7 @@ define([
         _getAggregatedSelectData: function() {
             return _.map(
                 this._getAggregatedColumns(),
-                function (model) {
+                function(model) {
                     return {
                         id: model.get('name'),
                         text: model.get('label')

From 5ef58b687eea2405faa63292eeccb5aa6d222545 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Fri, 4 Dec 2015 13:26:54 +0200
Subject: [PATCH 067/471] BAP-9304 Date have border around similar values

---
 .../Resources/public/js/jquery-ui-datepicker-l10n.js     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/jquery-ui-datepicker-l10n.js b/src/Oro/Bundle/UIBundle/Resources/public/js/jquery-ui-datepicker-l10n.js
index 80971a5437b..3c1b354cd67 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/js/jquery-ui-datepicker-l10n.js
+++ b/src/Oro/Bundle/UIBundle/Resources/public/js/jquery-ui-datepicker-l10n.js
@@ -76,10 +76,13 @@ define(function(require) {
                 .find('a').removeClass('ui-state-highlight');
 
             if (inst.drawYear === today.year() && inst.drawMonth === today.month()) {
-                // highlighted today date in system tumezone
+                // highlighted today date in system timezone
                 inst.dpDiv
-                    .find('td > a.ui-state-default:contains("' + today.date() + '")').addClass('ui-state-highlight')
-                    .parent().addClass('ui-datepicker-today');
+                    .find('td > a.ui-state-default').each(function() {
+                    if (today.date().toString() === this.innerHTML) {
+                        $(this).addClass('ui-state-highlight').parent().addClass('ui-datepicker-today');
+                    }
+                });
             }
         };
     })();

From 31c1a2f6487b60f53c6aef75deff98d441d931ea Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Fri, 4 Dec 2015 12:31:00 +0100
Subject: [PATCH 068/471] BAP-9430: Report builder filters does not contain
 aggregation columns

- correct order of filters
---
 .../Resources/config/placeholders.yml             |  3 ++-
 .../Resources/config/placeholders.yml             |  8 ++++++++
 .../views/Segment/field_condition.html.twig       | 15 +++++++++++++++
 .../Resources/views/macros.html.twig              | 14 --------------
 4 files changed, 25 insertions(+), 15 deletions(-)
 create mode 100644 src/Oro/Bundle/SegmentBundle/Resources/config/placeholders.yml
 create mode 100644 src/Oro/Bundle/SegmentBundle/Resources/views/Segment/field_condition.html.twig

diff --git a/src/Oro/Bundle/ReportBundle/Resources/config/placeholders.yml b/src/Oro/Bundle/ReportBundle/Resources/config/placeholders.yml
index f5863f42487..f07a4d54a81 100644
--- a/src/Oro/Bundle/ReportBundle/Resources/config/placeholders.yml
+++ b/src/Oro/Bundle/ReportBundle/Resources/config/placeholders.yml
@@ -1,7 +1,8 @@
 placeholders:
     segment_criteria_list:
         items:
-            aggregated_field_condition: ~
+            aggregated_field_condition:
+                order: 10
 
 items:
     aggregated_field_condition:
diff --git a/src/Oro/Bundle/SegmentBundle/Resources/config/placeholders.yml b/src/Oro/Bundle/SegmentBundle/Resources/config/placeholders.yml
new file mode 100644
index 00000000000..6ee0b46990a
--- /dev/null
+++ b/src/Oro/Bundle/SegmentBundle/Resources/config/placeholders.yml
@@ -0,0 +1,8 @@
+placeholders:
+    segment_criteria_list:
+        items:
+            field_condition: ~
+
+items:
+    field_condition:
+        template: OroSegmentBundle:Segment:field_condition.html.twig
diff --git a/src/Oro/Bundle/SegmentBundle/Resources/views/Segment/field_condition.html.twig b/src/Oro/Bundle/SegmentBundle/Resources/views/Segment/field_condition.html.twig
new file mode 100644
index 00000000000..26aebb9bc61
--- /dev/null
+++ b/src/Oro/Bundle/SegmentBundle/Resources/views/Segment/field_condition.html.twig
@@ -0,0 +1,15 @@
+{% set fieldConditionOptions = {
+    fieldChoice: {
+        select2: {
+            placeholder: 'oro.query_designer.condition_builder.choose_entity_field'|trans
+        },
+        fieldsLoaderSelector: '[data-ftid=' ~ params.entity_choice_id ~ 'oro_api_querydesigner_fields_entity]'
+    }
+} %}
+
+<li class="option" data-criteria="condition-item"
+    data-module="oroquerydesigner/js/field-condition"
+    data-widget="fieldCondition"
+    data-options="{{ fieldConditionOptions|json_encode }}">
+    {{ 'oro.query_designer.condition_builder.criteria.field_condition'|trans }}
+</li>
diff --git a/src/Oro/Bundle/SegmentBundle/Resources/views/macros.html.twig b/src/Oro/Bundle/SegmentBundle/Resources/views/macros.html.twig
index 3dd8ec2a38b..c3096497062 100644
--- a/src/Oro/Bundle/SegmentBundle/Resources/views/macros.html.twig
+++ b/src/Oro/Bundle/SegmentBundle/Resources/views/macros.html.twig
@@ -1,12 +1,4 @@
 {% macro query_designer_condition_builder(params) %}
-    {% set fieldConditionOptions = {
-        fieldChoice: {
-            select2: {
-                placeholder: 'oro.query_designer.condition_builder.choose_entity_field'|trans
-            },
-            fieldsLoaderSelector: '[data-ftid=' ~ params.entity_choice_id ~ 'oro_api_querydesigner_fields_entity]'
-        }
-    } %}
     {% set segmentConditionOptions = {
         segmentChoice: {
             select2: {
@@ -35,12 +27,6 @@
                 <div class="hint">{{ 'oro.query_designer.condition_builder.criteria.drag_hint'|trans }}</div>
                 <ul class="criteria-list" id="{{ params.criteria_list_id }}">
                     {% placeholder segment_criteria_list with {params: params} %}
-                    <li class="option" data-criteria="condition-item"
-                        data-module="oroquerydesigner/js/field-condition"
-                        data-widget="fieldCondition"
-                        data-options="{{ fieldConditionOptions|json_encode }}">
-                        {{ 'oro.query_designer.condition_builder.criteria.field_condition'|trans }}
-                    </li>
                     <li class="option" data-criteria="condition-segment"
                         data-module="orosegment/js/segment-condition"
                         data-widget="segmentCondition"

From 4c2e7eccc565df584c7ae878042c1098609533d6 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Fri, 4 Dec 2015 12:57:31 +0100
Subject: [PATCH 069/471] BAP-9430: Report builder filters does not contain
 aggregation columns

- remove aggregated field condition when aggregated column is removed
---
 .../Resources/public/js/aggregated-field-condition.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js
index ace264b3f88..3330d8ee565 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js
+++ b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js
@@ -20,6 +20,11 @@ define([
             this.$fieldChoice.fieldChoice(this.options.fieldChoice);
 
             this._updateFieldChoice();
+            this.options.columnsCollection.on('remove', function(model) {
+                if (model.get('name') === this._getColumnName()) {
+                    this.element.closest('.condition').find('.close').click();
+                }
+            }, this);
             if (data && data.columnName) {
                 this.selectField(data.columnName);
                 this._renderFilter(data.columnName);
@@ -77,7 +82,7 @@ define([
 
         _onUpdate: function() {
             var value;
-            var columnName = this.element.find('input.select').select2('val');
+            var columnName = this._getColumnName();
             var columnFunc = this._getColumnFunc(columnName);
 
             if (this.filter && !this.filter.isEmptyValue() && !_.isEmpty(columnFunc)) {
@@ -94,6 +99,10 @@ define([
             this.element.trigger('changed');
         },
 
+        _getColumnName: function() {
+            return this.element.find('input.select').select2('val');
+        },
+
         _getColumnFunc: function(columnName) {
             var column = this.options.columnsCollection.findWhere({name: columnName});
             if (_.isEmpty(column)) {

From a69139b682e6b3078837922a17cc64feb2b82f7f Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Fri, 4 Dec 2015 13:03:32 +0100
Subject: [PATCH 070/471] BAP-9430: Report builder filters does not contain
 aggregation columns

- remove aggregated field condition when aggregated column removed function
---
 .../Resources/public/js/aggregated-field-condition.js        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js
index 3330d8ee565..a77eda64262 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js
+++ b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js
@@ -25,6 +25,11 @@ define([
                     this.element.closest('.condition').find('.close').click();
                 }
             }, this);
+            this.options.columnsCollection.on('change:func', function(model) {
+                if (model.get('name') === this._getColumnName() && _.isEmpty(model.get('func'))) {
+                    this.element.closest('.condition').find('.close').click();
+                }
+            }, this);
             if (data && data.columnName) {
                 this.selectField(data.columnName);
                 this._renderFilter(data.columnName);

From 5ed8a95e29e33e3d15d9d353ba482327a2a6b3c2 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Fri, 4 Dec 2015 13:56:05 +0100
Subject: [PATCH 071/471] BAP-9430: Report builder filters does not contain
 aggregation columns

- fixed condition builder css
---
 .../Resources/public/css/less/condition-builder.less       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/css/less/condition-builder.less b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/css/less/condition-builder.less
index da8c1fc785b..6a392cbd42a 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/css/less/condition-builder.less
+++ b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/css/less/condition-builder.less
@@ -29,7 +29,6 @@
   list-style: none;
   margin: 0;
   padding: 0;
-  min-height: 199px;
   box-sizing: border-box;
   &:before, &:after {
     content: "";
@@ -249,13 +248,15 @@
   border: 1px solid #c9c9c9;
   min-width: 582px;/* @TODO temporary solution, will be fixed in CRM-2025 */
   background-color: #eff2f5;
+
+  & > div {
+    display: flex;
+  }
   .left-area {
     width: 150px;
-    float: left;
   }
   .right-area {
     width: calc(~"100% - 150px");
-    float: left;
     padding: 0 10px;
     border-left: 1px solid #c9c9c9;
     background-color: white;

From 10fd1ad8a266577a649bcc027e857152d07cacf4 Mon Sep 17 00:00:00 2001
From: Oleksandr Nechyporenko <onechyporenko@magecore.com>
Date: Fri, 4 Dec 2015 19:56:06 +0200
Subject: [PATCH 072/471] BB-1491: Login and Registration Page Layouts  - cover
 Layout with tests

---
 .../Unit/Layout/Block/Type/FormTypeTest.php   |  2 +-
 ...cyInjectionFormContextConfiguratorTest.php | 51 +++++++++++++++
 .../DependencyInjectionFormAccessorTest.php   | 63 ++++++++++++++++++-
 .../Layout/Tests/Unit/BlockBuilderTest.php    |  5 ++
 .../Layout/Tests/Unit/RawLayoutTest.php       | 20 ++++++
 5 files changed, 139 insertions(+), 2 deletions(-)
 create mode 100644 src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Extension/DependencyInjectionFormContextConfiguratorTest.php

diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/FormTypeTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/FormTypeTest.php
index d8e2e4d4acf..f621c6e509c 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/FormTypeTest.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/FormTypeTest.php
@@ -168,7 +168,7 @@ public function testBuildView()
 
         $view         = new BlockView();
         $block        = $this->getMock('Oro\Component\Layout\BlockInterface');
-        $formAccessor = $this->getMock('Oro\Bundle\LayoutBundle\Layout\Form\FormAccessorInterface');
+        $formAccessor = $this->getMock('Oro\Bundle\LayoutBundle\Layout\Form\ConfigurableFormAccessorInterface');
         $context      = new LayoutContext();
         $formView     = new FormView();
 
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Extension/DependencyInjectionFormContextConfiguratorTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Extension/DependencyInjectionFormContextConfiguratorTest.php
new file mode 100644
index 00000000000..5fafa2065aa
--- /dev/null
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Extension/DependencyInjectionFormContextConfiguratorTest.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Oro\Bundle\LayoutBundle\Tests\Unit\Layout\Extension;
+
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+use Oro\Component\Layout\LayoutContext;
+
+use Oro\Bundle\LayoutBundle\Layout\Extension\DependencyInjectionFormContextConfigurator;
+
+class DependencyInjectionFormContextConfiguratorTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var ContainerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $container;
+
+    /** @var DependencyInjectionFormContextConfigurator */
+    protected $contextConfigurator;
+
+    protected function setUp()
+    {
+        $this->container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+
+        $this->contextConfigurator = new DependencyInjectionFormContextConfigurator($this->container);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage formServiceId should be specified.
+     */
+    public function testConfigureContextWithoutForm()
+    {
+        $context = new LayoutContext();
+        $this->contextConfigurator->configureContext($context);
+    }
+
+    public function testConfigureContext()
+    {
+        $serviceId = 'test_service_id';
+        $contextOptionName = 'test_context_form';
+        $this->contextConfigurator->setFormServiceId($serviceId);
+        $this->contextConfigurator->setContextOptionName($contextOptionName);
+
+        $context = new LayoutContext();
+        $this->contextConfigurator->configureContext($context);
+        $context->resolve();
+
+        $formAccessor = $context->get($contextOptionName);
+        $this->assertInstanceOf('Oro\Bundle\LayoutBundle\Layout\Form\DependencyInjectionFormAccessor', $formAccessor);
+        $this->assertAttributeEquals($serviceId, 'formServiceId', $formAccessor);
+    }
+}
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Form/DependencyInjectionFormAccessorTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Form/DependencyInjectionFormAccessorTest.php
index 9fc5fccee61..2e239f0441f 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Form/DependencyInjectionFormAccessorTest.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Form/DependencyInjectionFormAccessorTest.php
@@ -2,6 +2,7 @@
 
 namespace Oro\Bundle\LayoutBundle\Tests\Unit\Layout\Form;
 
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Form\FormView;
 
 use Oro\Bundle\LayoutBundle\Layout\Form\DependencyInjectionFormAccessor;
@@ -11,7 +12,7 @@ class DependencyInjectionFormAccessorTest extends \PHPUnit_Framework_TestCase
 {
     const FORM_SERVICE_ID = 'test_service_id';
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject */
+    /** @var ContainerInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $container;
 
     protected function setUp()
@@ -22,6 +23,8 @@ protected function setUp()
     public function testGetForm()
     {
         $form = $this->getMock('Symfony\Component\Form\Test\FormInterface');
+        $form->expects($this->once())->method('getName')->willReturn('form_name');
+
         $this->container->expects($this->once())
             ->method('get')
             ->with(self::FORM_SERVICE_ID)
@@ -29,6 +32,7 @@ public function testGetForm()
 
         $formAccessor = new DependencyInjectionFormAccessor($this->container, self::FORM_SERVICE_ID);
         $this->assertSame($form, $formAccessor->getForm());
+        $this->assertEquals('form_name', $formAccessor->getName());
     }
 
     public function testToString()
@@ -130,6 +134,7 @@ public function testGetView()
         //   field1
         //     field2
         $formView                       = new FormView();
+        $formView->vars['id']           = self::FORM_SERVICE_ID;
         $field1View                     = new FormView($formView);
         $formView->children['field1']   = $field1View;
         $field2View                     = new FormView($field1View);
@@ -148,6 +153,7 @@ public function testGetView()
         $this->assertSame($formView, $formAccessor->getView());
         $this->assertSame($field1View, $formAccessor->getView('field1'));
         $this->assertSame($field2View, $formAccessor->getView('field1.field2'));
+        $this->assertSame($formView->vars['id'], $formAccessor->getId());
     }
 
     public function testProcessedFields()
@@ -160,4 +166,59 @@ public function testProcessedFields()
         $formAccessor->setProcessedFields($processedFields);
         $this->assertSame($processedFields, $formAccessor->getProcessedFields());
     }
+
+    public function testSetFormData()
+    {
+        $data = ['test'];
+
+        $form = $this->getMock('Symfony\Component\Form\Test\FormInterface');
+        $form->expects($this->once())->method('setData')->with($data);
+        $form->expects($this->at(2))->method('getData')->willReturn($data);
+
+        $this->container->expects($this->once())
+            ->method('get')
+            ->with(self::FORM_SERVICE_ID)
+            ->will($this->returnValue($form));
+
+        $formAccessor = new DependencyInjectionFormAccessor($this->container, self::FORM_SERVICE_ID);
+
+        $this->assertNull($formAccessor->getForm()->getData());
+        $formAccessor->setFormData($data);
+        $this->assertEquals($data, $formAccessor->getForm()->getData());
+    }
+
+    public function testSetters()
+    {
+        $formConfig = $this->getMock('Symfony\Component\Form\FormConfigInterface');
+        $formView = new FormView();
+        $formView->vars['multipart'] = true;
+
+        $form = $this->getMock('Symfony\Component\Form\Test\FormInterface');
+        $form->expects($this->any())
+            ->method('getConfig')
+            ->will($this->returnValue($formConfig));
+        $form->expects($this->once())
+            ->method('createView')
+            ->will($this->returnValue($formView));
+
+        $this->container->expects($this->once())
+            ->method('get')
+            ->with(self::FORM_SERVICE_ID)
+            ->will($this->returnValue($form));
+
+        $formAccessor = new DependencyInjectionFormAccessor($this->container, self::FORM_SERVICE_ID);
+
+        $action = FormAction::createByRoute('test_route', ['foo' => 'bar']);
+        $formAccessor->setAction($action);
+        $this->assertEquals($action, $formAccessor->getAction());
+
+        $formAccessor->setActionRoute('test_route', []);
+        $this->assertEquals(FormAction::createByRoute('test_route', []), $formAccessor->getAction());
+
+        $formAccessor->setMethod('post');
+        $this->assertEquals('post', $formAccessor->getMethod());
+
+        $formAccessor->setEnctype('multipart/form-data');
+        $this->assertEquals('multipart/form-data', $formAccessor->getEnctype());
+    }
 }
diff --git a/src/Oro/Component/Layout/Tests/Unit/BlockBuilderTest.php b/src/Oro/Component/Layout/Tests/Unit/BlockBuilderTest.php
index 8c3b6842578..83f7d7f6382 100644
--- a/src/Oro/Component/Layout/Tests/Unit/BlockBuilderTest.php
+++ b/src/Oro/Component/Layout/Tests/Unit/BlockBuilderTest.php
@@ -61,6 +61,11 @@ public function testGetContext()
         $this->assertSame($this->context, $this->blockBuilder->getContext());
     }
 
+    public function testGetDataAccessor()
+    {
+        $this->assertSame($this->dataAccessor, $this->blockBuilder->getDataAccessor());
+    }
+
     public function testGetLayoutManipulator()
     {
         $this->assertSame($this->layoutManipulator, $this->blockBuilder->getLayoutManipulator());
diff --git a/src/Oro/Component/Layout/Tests/Unit/RawLayoutTest.php b/src/Oro/Component/Layout/Tests/Unit/RawLayoutTest.php
index bfc6994d5a7..e16ab2b80a4 100644
--- a/src/Oro/Component/Layout/Tests/Unit/RawLayoutTest.php
+++ b/src/Oro/Component/Layout/Tests/Unit/RawLayoutTest.php
@@ -1007,6 +1007,26 @@ public function testSetBlockThemeWithInvalidThemeType()
         $this->rawLayout->setBlockTheme('root', 123);
     }
 
+    /**
+     * @expectedException \Oro\Component\Layout\Exception\InvalidArgumentException
+     * @expectedExceptionMessage The theme must not be empty.
+     */
+    public function testSetFormThemeWithEmptyThemes()
+    {
+        $this->rawLayout->add('root', null, 'root');
+        $this->rawLayout->setFormTheme([]);
+    }
+
+    /**
+     * @expectedException \Oro\Component\Layout\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Invalid "themes" argument type. Expected "string or array of strings", "integer" given.
+     */
+    public function testSetFormThemeWithInvalidThemeType()
+    {
+        $this->rawLayout->add('root', null, 'root');
+        $this->rawLayout->setFormTheme(123);
+    }
+
     public function testSetFormTheme()
     {
         // prepare test data

From 41cee3dad5aaec1c1ac88f12f23830c8385325ac Mon Sep 17 00:00:00 2001
From: rodolfo <contato@rodolfobandeira.com>
Date: Fri, 4 Dec 2015 14:04:42 -0500
Subject: [PATCH 073/471] read() must return $item to work

---
 .../Resources/doc/reference/additional-capabilities.md          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Oro/Bundle/IntegrationBundle/Resources/doc/reference/additional-capabilities.md b/src/Oro/Bundle/IntegrationBundle/Resources/doc/reference/additional-capabilities.md
index b0e971a2536..d64e238d0ed 100644
--- a/src/Oro/Bundle/IntegrationBundle/Resources/doc/reference/additional-capabilities.md
+++ b/src/Oro/Bundle/IntegrationBundle/Resources/doc/reference/additional-capabilities.md
@@ -29,6 +29,8 @@ and then methods `addStatusData` and `getStatusData` will be available.
         if (null !== $item && !$this->getSourceIterator()->valid()) {
             $this->addStatusData('lastItemUpdatedAt', $item['updated_at']);
         }
+        
+        return $item;
     }
     // ...
 

From a1ab9d50c758d6b7858980d056c8bde63413ed51 Mon Sep 17 00:00:00 2001
From: ReenExe <ipourri@gmail.com>
Date: Sun, 6 Dec 2015 02:39:07 +0200
Subject: [PATCH 074/471] clear code

---
 .../EntityBundle/Provider/AbstractChainProvider.php       | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Oro/Bundle/EntityBundle/Provider/AbstractChainProvider.php b/src/Oro/Bundle/EntityBundle/Provider/AbstractChainProvider.php
index 49b7de6d41a..bc2589cd307 100644
--- a/src/Oro/Bundle/EntityBundle/Provider/AbstractChainProvider.php
+++ b/src/Oro/Bundle/EntityBundle/Provider/AbstractChainProvider.php
@@ -36,11 +36,9 @@ protected function getProviders()
         if (null === $this->sorted) {
             ksort($this->providers);
 
-            if (empty($this->providers)) {
-                $this->sorted = [];
-            } else {
-                $this->sorted = call_user_func_array('array_merge', $this->providers);
-            }
+            $this->sorted = $this->providers
+                ? call_user_func_array('array_merge', $this->providers)
+                : [];
         }
 
         return $this->sorted;

From 9974fe910b27db05ae6dce742683c15c80519da8 Mon Sep 17 00:00:00 2001
From: ReenExe <ipourri@gmail.com>
Date: Sun, 6 Dec 2015 02:48:37 +0200
Subject: [PATCH 075/471] clear code

---
 src/Oro/Bundle/UserBundle/Entity/AbstractRole.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Oro/Bundle/UserBundle/Entity/AbstractRole.php b/src/Oro/Bundle/UserBundle/Entity/AbstractRole.php
index 6a75577e5d3..516de5d658d 100644
--- a/src/Oro/Bundle/UserBundle/Entity/AbstractRole.php
+++ b/src/Oro/Bundle/UserBundle/Entity/AbstractRole.php
@@ -25,11 +25,9 @@ abstract public function getPrefix();
      */
     public function setRole($role, $generateUnique = true)
     {
-        if ($generateUnique) {
-            $this->role = $this->generateUniqueRole($role);
-        } else {
-            $this->role = $this->addPrefix($this->normalize($role));
-        }
+        $this->role = $generateUnique
+            ? $this->generateUniqueRole($role)
+            : $this->addPrefix($this->normalize($role));
 
         return $this;
     }

From 9ef3ff7ae0ab1170838acea0b4fe2848f6d0cf84 Mon Sep 17 00:00:00 2001
From: ReenExe <ipourri@gmail.com>
Date: Sun, 6 Dec 2015 02:55:00 +0200
Subject: [PATCH 076/471] clear code

---
 src/Oro/Bundle/UserBundle/Entity/Group.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Oro/Bundle/UserBundle/Entity/Group.php b/src/Oro/Bundle/UserBundle/Entity/Group.php
index d49d067a01c..23b10c7343c 100644
--- a/src/Oro/Bundle/UserBundle/Entity/Group.php
+++ b/src/Oro/Bundle/UserBundle/Entity/Group.php
@@ -243,11 +243,7 @@ public function removeRole($role)
     public function setRoles($roles)
     {
         if ($roles instanceof Collection) {
-            $this->roles->clear();
-
-            foreach ($roles as $role) {
-                $this->addRole($role);
-            }
+            $this->roles = new ArrayCollection($roles->toArray());
         } elseif (is_array($roles)) {
             $this->roles = new ArrayCollection($roles);
         } else {

From 87880164600bbee65af841755356fb6a2ebc04f8 Mon Sep 17 00:00:00 2001
From: ReenExe <ipourri@gmail.com>
Date: Sun, 6 Dec 2015 03:01:53 +0200
Subject: [PATCH 077/471] clear code

---
 .../Api/Rest/CalendarConnectionController.php        | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Oro/Bundle/CalendarBundle/Controller/Api/Rest/CalendarConnectionController.php b/src/Oro/Bundle/CalendarBundle/Controller/Api/Rest/CalendarConnectionController.php
index 65c5b9c383b..1b251e4d4ec 100644
--- a/src/Oro/Bundle/CalendarBundle/Controller/Api/Rest/CalendarConnectionController.php
+++ b/src/Oro/Bundle/CalendarBundle/Controller/Api/Rest/CalendarConnectionController.php
@@ -138,11 +138,13 @@ protected function fixFormData(array &$data, $entity)
     {
         parent::fixFormData($data, $entity);
 
-        unset($data['calendarName']);
-        unset($data['removable']);
-        unset($data['canAddEvent']);
-        unset($data['canEditEvent']);
-        unset($data['canDeleteEvent']);
+        unset(
+            $data['calendarName'],
+            $data['removable'],
+            $data['canAddEvent'],
+            $data['canEditEvent'],
+            $data['canDeleteEvent']
+        );
 
         return true;
     }

From 9e07b7e54f7d36869d55e7765eb8448d71154b8c Mon Sep 17 00:00:00 2001
From: ReenExe <ipourri@gmail.com>
Date: Sun, 6 Dec 2015 03:11:46 +0200
Subject: [PATCH 078/471] clear code

---
 .../Bundle/CalendarBundle/Provider/CalendarPropertyProvider.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/CalendarBundle/Provider/CalendarPropertyProvider.php b/src/Oro/Bundle/CalendarBundle/Provider/CalendarPropertyProvider.php
index 7c17251ec04..6dd8ae65240 100644
--- a/src/Oro/Bundle/CalendarBundle/Provider/CalendarPropertyProvider.php
+++ b/src/Oro/Bundle/CalendarBundle/Provider/CalendarPropertyProvider.php
@@ -91,7 +91,7 @@ public function getItems($calendarId)
         $result = $qb->getQuery()->getArrayResult();
 
         // normalize integer foreign keys due Doctrine IDENTITY function always returns a string
-        if (!empty($intCasts)) {
+        if ($intCasts) {
             foreach ($result as &$item) {
                 foreach ($intCasts as $fieldName) {
                     if (isset($item[$fieldName]) && is_string($item[$fieldName])) {

From 2ad636d15925a8ee65ccbae4bb2214a3cfa7711e Mon Sep 17 00:00:00 2001
From: ReenExe <ipourri@gmail.com>
Date: Sun, 6 Dec 2015 03:13:51 +0200
Subject: [PATCH 079/471] clear code

---
 .../CalendarBundle/Provider/PublicCalendarProvider.php   | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/Oro/Bundle/CalendarBundle/Provider/PublicCalendarProvider.php b/src/Oro/Bundle/CalendarBundle/Provider/PublicCalendarProvider.php
index d87d043afa2..ac39b9f876c 100644
--- a/src/Oro/Bundle/CalendarBundle/Provider/PublicCalendarProvider.php
+++ b/src/Oro/Bundle/CalendarBundle/Provider/PublicCalendarProvider.php
@@ -48,16 +48,11 @@ public function __construct(
      */
     public function getCalendarDefaultValues($organizationId, $userId, $calendarId, array $calendarIds)
     {
-        $result = [];
-
         if (!$this->calendarConfig->isPublicCalendarEnabled()) {
-            foreach ($calendarIds as $id) {
-                $result[$id] = null;
-            }
-
-            return $result;
+            return array_fill_keys($calendarIds, null);
         }
 
+        $result = [];
         /** @var SystemCalendarRepository $repo */
         $repo = $this->doctrineHelper->getEntityRepository('OroCalendarBundle:SystemCalendar');
         $qb = $repo->getPublicCalendarsQueryBuilder();

From 56af71049485d2aa9346b5e214727a1320908572 Mon Sep 17 00:00:00 2001
From: ReenExe <ipourri@gmail.com>
Date: Sun, 6 Dec 2015 03:17:08 +0200
Subject: [PATCH 080/471] clear code

---
 .../Provider/SystemCalendarProvider.php               | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/Oro/Bundle/CalendarBundle/Provider/SystemCalendarProvider.php b/src/Oro/Bundle/CalendarBundle/Provider/SystemCalendarProvider.php
index cd903d52194..6d617db77fa 100644
--- a/src/Oro/Bundle/CalendarBundle/Provider/SystemCalendarProvider.php
+++ b/src/Oro/Bundle/CalendarBundle/Provider/SystemCalendarProvider.php
@@ -48,18 +48,13 @@ public function __construct(
      */
     public function getCalendarDefaultValues($organizationId, $userId, $calendarId, array $calendarIds)
     {
-        $result = [];
-
         if (!$this->calendarConfig->isSystemCalendarEnabled()
             || !$this->securityFacade->isGranted('oro_system_calendar_view')
         ) {
-            foreach ($calendarIds as $id) {
-                $result[$id] = null;
-            }
-
-            return $result;
+            return array_fill_keys($calendarIds, null);
         }
 
+        $result = [];
         /** @var SystemCalendarRepository $repo */
         $repo = $this->doctrineHelper->getEntityRepository('OroCalendarBundle:SystemCalendar');
 
@@ -133,7 +128,7 @@ public function getCalendarEvents(
                 $invisibleIds[] = $id;
             }
         }
-        if (!empty($invisibleIds)) {
+        if ($invisibleIds) {
             $qb
                 ->andWhere('c.id NOT IN (:invisibleIds)')
                 ->setParameter('invisibleIds', $invisibleIds);

From e755bd6df1d81aea3b49fc963b11583994ab1768 Mon Sep 17 00:00:00 2001
From: ReenExe <ipourri@gmail.com>
Date: Sun, 6 Dec 2015 03:19:28 +0200
Subject: [PATCH 081/471] clear code

---
 .../CalendarBundle/Provider/UserCalendarEventNormalizer.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/CalendarBundle/Provider/UserCalendarEventNormalizer.php b/src/Oro/Bundle/CalendarBundle/Provider/UserCalendarEventNormalizer.php
index 7d1b819164b..7cb882c1170 100644
--- a/src/Oro/Bundle/CalendarBundle/Provider/UserCalendarEventNormalizer.php
+++ b/src/Oro/Bundle/CalendarBundle/Provider/UserCalendarEventNormalizer.php
@@ -83,7 +83,7 @@ protected function serializeCalendarEvent(CalendarEvent $event)
     protected function applyAdditionalData(&$items, $calendarId)
     {
         $parentEventIds = $this->getParentEventIds($items);
-        if (!empty($parentEventIds)) {
+        if ($parentEventIds) {
             /** @var CalendarEventRepository $repo */
             $repo     = $this->doctrineHelper->getEntityRepository('OroCalendarBundle:CalendarEvent');
             $invitees = $repo->getInvitedUsersByParentsQueryBuilder($parentEventIds)

From 816f59f3bd79bb047979e5b5f0aacbc146a38dd8 Mon Sep 17 00:00:00 2001
From: ReenExe <ipourri@gmail.com>
Date: Sun, 6 Dec 2015 03:26:24 +0200
Subject: [PATCH 082/471] clear code

---
 src/Oro/Bundle/CalendarBundle/Provider/UserCalendarProvider.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Oro/Bundle/CalendarBundle/Provider/UserCalendarProvider.php b/src/Oro/Bundle/CalendarBundle/Provider/UserCalendarProvider.php
index 829e410dd1e..55c333fadf4 100644
--- a/src/Oro/Bundle/CalendarBundle/Provider/UserCalendarProvider.php
+++ b/src/Oro/Bundle/CalendarBundle/Provider/UserCalendarProvider.php
@@ -60,8 +60,6 @@ public function getCalendarDefaultValues($organizationId, $userId, $calendarId,
             // prohibit to remove the current calendar from the list of connected calendars
             if ($calendar->getId() === $calendarId) {
                 $resultItem['removable'] = false;
-            }
-            if ($calendarId === $calendar->getId()) {
                 $resultItem['canAddEvent']    = true;
                 $resultItem['canEditEvent']   = true;
                 $resultItem['canDeleteEvent'] = true;

From d3e62ee18270a02ba84c3bb902a6911ba26cdb60 Mon Sep 17 00:00:00 2001
From: ReenExe <ipourri@gmail.com>
Date: Sun, 6 Dec 2015 03:29:24 +0200
Subject: [PATCH 083/471] clear code

---
 .../CalendarBundle/Provider/UserCalendarProvider.php     | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/Oro/Bundle/CalendarBundle/Provider/UserCalendarProvider.php b/src/Oro/Bundle/CalendarBundle/Provider/UserCalendarProvider.php
index 55c333fadf4..cd410b89b2c 100644
--- a/src/Oro/Bundle/CalendarBundle/Provider/UserCalendarProvider.php
+++ b/src/Oro/Bundle/CalendarBundle/Provider/UserCalendarProvider.php
@@ -92,7 +92,7 @@ public function getCalendarEvents(
                 $visibleIds[] = $id;
             }
         }
-        if (!empty($visibleIds)) {
+        if ($visibleIds) {
             $qb
                 ->andWhere('c.id IN (:visibleIds)')
                 ->setParameter('visibleIds', $visibleIds);
@@ -111,11 +111,6 @@ public function getCalendarEvents(
      */
     protected function buildCalendarName(Calendar $calendar)
     {
-        $name = $calendar->getName();
-        if (!$name) {
-            $name = $this->entityNameResolver->getName($calendar->getOwner());
-        }
-
-        return $name;
+        return $calendar->getName() ?: $this->entityNameResolver->getName($calendar->getOwner());
     }
 }

From 3574990d63a9cf1a0e3f4bdce384982546eb81ed Mon Sep 17 00:00:00 2001
From: ReenExe <ipourri@gmail.com>
Date: Sun, 6 Dec 2015 03:32:40 +0200
Subject: [PATCH 084/471] clear code

---
 .../Datagrid/EntityPaginationExtension.php                     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/EntityPaginationBundle/Datagrid/EntityPaginationExtension.php b/src/Oro/Bundle/EntityPaginationBundle/Datagrid/EntityPaginationExtension.php
index 075a86b3371..54619668131 100644
--- a/src/Oro/Bundle/EntityPaginationBundle/Datagrid/EntityPaginationExtension.php
+++ b/src/Oro/Bundle/EntityPaginationBundle/Datagrid/EntityPaginationExtension.php
@@ -36,7 +36,6 @@ public function processConfigs(DatagridConfiguration $config)
             throw new \LogicException('Entity pagination is not boolean');
         }
 
-        $pagination = $pagination ? true : false;
-        $config->offsetSetByPath(self::ENTITY_PAGINATION_PATH, $pagination);
+        $config->offsetSetByPath(self::ENTITY_PAGINATION_PATH, (bool)$pagination);
     }
 }

From 0cd65546cba0004db82553c1efcd5827c2bafbdb Mon Sep 17 00:00:00 2001
From: ReenExe <ipourri@gmail.com>
Date: Sun, 6 Dec 2015 04:02:50 +0200
Subject: [PATCH 085/471] clear code

---
 .../Manager/EntityPaginationManager.php                | 10 +++-------
 .../EntityPaginationBundle/Manager/MessageManager.php  | 10 +++-------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/Oro/Bundle/EntityPaginationBundle/Manager/EntityPaginationManager.php b/src/Oro/Bundle/EntityPaginationBundle/Manager/EntityPaginationManager.php
index 12050a065cb..4b1fcee5575 100644
--- a/src/Oro/Bundle/EntityPaginationBundle/Manager/EntityPaginationManager.php
+++ b/src/Oro/Bundle/EntityPaginationBundle/Manager/EntityPaginationManager.php
@@ -58,15 +58,11 @@ public static function getPermission($scope)
     {
         switch ($scope) {
             case self::VIEW_SCOPE:
-                $permission = 'VIEW';
-                break;
+                return 'VIEW';
             case self::EDIT_SCOPE:
-                $permission = 'EDIT';
-                break;
-            default:
-                throw new \LogicException(sprintf('Scope "%s" is not available.', $scope));
+                return 'EDIT';
         }
 
-        return $permission;
+        throw new \LogicException(sprintf('Scope "%s" is not available.', $scope));
     }
 }
diff --git a/src/Oro/Bundle/EntityPaginationBundle/Manager/MessageManager.php b/src/Oro/Bundle/EntityPaginationBundle/Manager/MessageManager.php
index 67c1ec9e014..5e5ec38d5a7 100644
--- a/src/Oro/Bundle/EntityPaginationBundle/Manager/MessageManager.php
+++ b/src/Oro/Bundle/EntityPaginationBundle/Manager/MessageManager.php
@@ -150,19 +150,15 @@ protected function getStatsMessage($scope)
     {
         switch ($scope) {
             case EntityPaginationManager::VIEW_SCOPE:
-                $message =
+                return
                     'oro.entity_pagination.message.' .
                     'stats_number_view_%count%_record|stats_number_view_%count%_records';
-                break;
             case EntityPaginationManager::EDIT_SCOPE:
-                $message =
+                return
                     'oro.entity_pagination.message.' .
                     'stats_number_edit_%count%_record|stats_number_edit_%count%_records';
-                break;
-            default:
-                throw new \LogicException(sprintf('Scope "%s" is not available.', $scope));
         }
 
-        return $message;
+        throw new \LogicException(sprintf('Scope "%s" is not available.', $scope));
     }
 }

From 7d8f98d24ff2a0c9fdd3de26711eb630018c4979 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Mon, 7 Dec 2015 10:23:31 +0100
Subject: [PATCH 086/471] BAP-9454: having support pro
 GroupingOrmFilterDatasourceAdapter

- add having support
---
 .../GroupingOrmFilterDatasourceAdapter.php    |  93 ++--------
 .../Model/ExpressionBuilder.php               | 120 +++++++++++++
 .../QueryDesignerBundle/Model/GroupNode.php   |  97 ++++++++++
 .../QueryDesignerBundle/Model/Restriction.php |  51 ++++++
 ...GroupingOrmFilterDatasourceAdapterTest.php | 167 ++++++++++++++++++
 src/Oro/Component/PhpUtils/ArrayUtil.php      |  19 ++
 6 files changed, 464 insertions(+), 83 deletions(-)
 create mode 100644 src/Oro/Bundle/QueryDesignerBundle/Model/ExpressionBuilder.php
 create mode 100644 src/Oro/Bundle/QueryDesignerBundle/Model/GroupNode.php
 create mode 100644 src/Oro/Bundle/QueryDesignerBundle/Model/Restriction.php

diff --git a/src/Oro/Bundle/QueryDesignerBundle/Grid/Extension/GroupingOrmFilterDatasourceAdapter.php b/src/Oro/Bundle/QueryDesignerBundle/Grid/Extension/GroupingOrmFilterDatasourceAdapter.php
index 43f9c4e5efd..23bd47ebd27 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Grid/Extension/GroupingOrmFilterDatasourceAdapter.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/Grid/Extension/GroupingOrmFilterDatasourceAdapter.php
@@ -3,9 +3,10 @@
 namespace Oro\Bundle\QueryDesignerBundle\Grid\Extension;
 
 use Doctrine\ORM\QueryBuilder;
-use Doctrine\ORM\Query\Expr;
+
 use Oro\Bundle\FilterBundle\Datasource\Orm\OrmFilterDatasourceAdapter;
-use Oro\Bundle\FilterBundle\Filter\FilterUtility;
+use Oro\Bundle\QueryDesignerBundle\Model\ExpressionBuilder;
+use Oro\Bundle\QueryDesignerBundle\Model\Restriction;
 
 /**
  * Represents ORM data source adapter which allows to combine restrictions in groups,
@@ -13,25 +14,8 @@
  */
 class GroupingOrmFilterDatasourceAdapter extends OrmFilterDatasourceAdapter
 {
-    /**
-     * @var Expr\Composite[]
-     */
-    protected $exprStack;
-
-    /**
-     * @var string[]
-     */
-    protected $conditionStack;
-
-    /**
-     * @var Expr\Composite
-     */
-    protected $currentExpr = null;
-
-    /**
-     * @var string
-     */
-    protected $currentCondition = null;
+    /** @var ExpressionBuilder */
+    protected $expressionBuilder;
 
     /**
      * Constructor
@@ -41,7 +25,7 @@ class GroupingOrmFilterDatasourceAdapter extends OrmFilterDatasourceAdapter
     public function __construct(QueryBuilder $qb)
     {
         parent::__construct($qb);
-        $this->resetState();
+        $this->expressionBuilder = new ExpressionBuilder();
     }
 
     /**
@@ -49,54 +33,17 @@ public function __construct(QueryBuilder $qb)
      */
     public function addRestriction($restriction, $condition, $isComputed = false)
     {
-        if ($isComputed) {
-            if ($condition === FilterUtility::CONDITION_OR) {
-                $this->qb->orHaving($restriction);
-            } else {
-                $this->qb->andHaving($restriction);
-            }
-
-            return;
-        }
-
-        if ($this->currentExpr === null) {
-            // this is the first item in a group
-            $this->currentExpr = $restriction;
-        } else {
-            // other items
-            if ($condition === FilterUtility::CONDITION_OR) {
-                if ($this->currentExpr instanceof Expr\Orx) {
-                    $this->currentExpr->add($restriction);
-                } else {
-                    $this->currentExpr = $this->qb->expr()->orX($this->currentExpr, $restriction);
-                }
-            } else {
-                if ($this->currentExpr instanceof Expr\Andx) {
-                    $this->currentExpr->add($restriction);
-                } else {
-                    $this->currentExpr = $this->qb->expr()->andX($this->currentExpr, $restriction);
-                }
-            }
-        }
+        $this->expressionBuilder->addRestriction(new Restriction($restriction, $condition, $isComputed));
     }
 
     public function beginRestrictionGroup($condition)
     {
-        array_push($this->exprStack, $this->currentExpr);
-        array_push($this->conditionStack, $this->currentCondition);
-
-        $this->currentExpr      = null;
-        $this->currentCondition = $condition;
+        $this->expressionBuilder->beginGroup($condition);
     }
 
     public function endRestrictionGroup()
     {
-        $tmpExpr                = $this->currentExpr;
-        $tmpCondition           = $this->currentCondition;
-        $this->currentExpr      = array_pop($this->exprStack);
-        $this->currentCondition = array_pop($this->conditionStack);
-
-        $this->addRestriction($tmpExpr, $tmpCondition);
+        $this->expressionBuilder->endGroup();
     }
 
     /**
@@ -104,26 +51,6 @@ public function endRestrictionGroup()
      */
     public function applyRestrictions()
     {
-        if ($this->currentExpr === null && empty($this->exprStack)) {
-            return;
-        }
-
-        if ($this->currentExpr === null) {
-            $this->currentExpr = array_pop($this->exprStack);
-        }
-
-        $this->qb->andWhere($this->currentExpr);
-        $this->resetState();
-    }
-
-    /**
-     * Resets all 'state' variables of this adapter
-     */
-    protected function resetState()
-    {
-        $this->exprStack        = [];
-        $this->conditionStack   = [];
-        $this->currentExpr      = null;
-        $this->currentCondition = null;
+        $this->expressionBuilder->applyRestrictions($this->qb);
     }
 }
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Model/ExpressionBuilder.php b/src/Oro/Bundle/QueryDesignerBundle/Model/ExpressionBuilder.php
new file mode 100644
index 00000000000..87eb34adf49
--- /dev/null
+++ b/src/Oro/Bundle/QueryDesignerBundle/Model/ExpressionBuilder.php
@@ -0,0 +1,120 @@
+<?php
+
+namespace Oro\Bundle\QueryDesignerBundle\Model;
+
+use Doctrine\ORM\Query\Expr;
+use Doctrine\ORM\QueryBuilder;
+
+use Oro\Bundle\FilterBundle\Filter\FilterUtility;
+
+class ExpressionBuilder
+{
+    /** @var GroupNode */
+    protected $groupNode;
+
+    /** @var GroupNode */
+    protected $currentGroupNode;
+
+    /**
+     * @param string $condition
+     */
+    public function beginGroup($condition)
+    {
+        $groupNode = new GroupNode($condition);
+        if ($this->currentGroupNode) {
+            $this->currentGroupNode->addNode($groupNode);
+            $this->currentGroupNode = $groupNode;
+        } else {
+            $this->groupNode = $groupNode;
+            $this->currentGroupNode = $this->groupNode;
+        }
+    }
+
+    /**
+     * @param Restriction $restriction
+     */
+    public function addRestriction(Restriction $restriction)
+    {
+        if (!$this->groupNode) {
+            $this->groupNode = new GroupNode(FilterUtility::CONDITION_AND);
+            $this->currentGroupNode = $this->groupNode;
+        }
+
+        $this->currentGroupNode->addNode($restriction);
+    }
+
+    public function endGroup()
+    {
+        $this->currentGroupNode = $this->currentGroupNode->getParent();
+    }
+
+    /**
+     * @param QueryBuilder $qb
+     */
+    public function applyRestrictions(QueryBuilder $qb)
+    {
+        if (!$this->groupNode) {
+            return;
+        }
+
+        $expr = $this->resolveGroupNode($this->groupNode);
+        if ($this->groupNode->isComputed()) {
+            $qb->andHaving($expr);
+        } else {
+            $qb->andWhere($expr);
+        }
+    }
+
+    /**
+     * @param GroupNode $gNode
+     *
+     * @return mixed Expr
+     */
+    protected function resolveGroupNode(GroupNode $gNode)
+    {
+        $restrictions = [];
+        foreach ($gNode->getChildren() as $node) {
+            if ($node instanceof Restriction) {
+                $restrictions[] = $node;
+            } else {
+                $expr = $this->resolveGroupNode($node);
+                $restrictions[] = new Restriction($expr, $node->getCondition(), $node->isComputed());
+            }
+        }
+
+        return $this->createExprFromRestrictions($restrictions);
+    }
+
+    /**
+     * @param Restriction[] $restrictions
+     *
+     * @return mixed Expr
+     */
+    protected function createExprFromRestrictions(array $restrictions)
+    {
+        return array_reduce(
+            $restrictions,
+            function ($expr = null, Restriction $restriction) {
+                if ($expr === null) {
+                    return $restriction->getRestriction();
+                }
+
+                if ($restriction->getCondition() === FilterUtility::CONDITION_OR) {
+                    if ($expr instanceof Expr\Orx) {
+                        $expr->add($restriction->getRestriction());
+                    } else {
+                        $expr = new Expr\Orx([$expr, $restriction->getRestriction()]);
+                    }
+                } else {
+                    if ($expr instanceof Expr\Andx) {
+                        $expr->add($restriction->getRestriction());
+                    } else {
+                        $expr = new Expr\Andx([$expr, $restriction->getRestriction()]);
+                    }
+                }
+
+                return $expr;
+            }
+        );
+    }
+}
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Model/GroupNode.php b/src/Oro/Bundle/QueryDesignerBundle/Model/GroupNode.php
new file mode 100644
index 00000000000..c2a49065b64
--- /dev/null
+++ b/src/Oro/Bundle/QueryDesignerBundle/Model/GroupNode.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace Oro\Bundle\QueryDesignerBundle\Model;
+
+use LogicException;
+use Oro\Component\PhpUtils\ArrayUtil;
+
+class GroupNode
+{
+    /** @var string*/
+    protected $condition;
+
+    /** @var GroupNode[]|Restriction[] */
+    protected $nodes = [];
+
+    /** @var GroupNode|null */
+    protected $parentNode;
+
+    /**
+     * @param string $condition
+     */
+    public function __construct($condition)
+    {
+        $this->condition = $condition;
+    }
+
+    /**
+     * @param GroupNode|Restriction $node
+     */
+    public function addNode($node)
+    {
+        $this->nodes[] = $node;
+        if ($node instanceof GroupNode) {
+            $node->setParent($this);
+        }
+    }
+
+    /**
+     * @param GroupNode $node
+     */
+    public function setParent(GroupNode $node)
+    {
+        $this->parentNode = $node;
+    }
+
+    /**
+     * @return GroupNode|null
+     */
+    public function getParent()
+    {
+        return $this->parentNode;
+    }
+
+    /**
+     * @param GroupNode[]|Restriction[] $node
+     */
+    public function getChildren()
+    {
+        return $this->nodes;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCondition()
+    {
+        return $this->condition;
+    }
+
+    /**
+     * @return bool
+     *
+     * @throws LogicException If computed restrictions are mixed with uncomputed
+     */
+    public function isComputed()
+    {
+        $computed = ArrayUtil::some(
+            function ($node) {
+                return $node->isComputed();
+            },
+            $this->nodes
+        );
+
+        $unComputed = ArrayUtil::some(
+            function ($node) {
+                return !$node->isComputed();
+            },
+            $this->nodes
+        );
+
+        if ($computed && $unComputed) {
+            throw new LogicException('Mixing ofcomputed nodes with uncomputed is not implemented');
+        }
+
+        return $computed;
+    }
+}
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Model/Restriction.php b/src/Oro/Bundle/QueryDesignerBundle/Model/Restriction.php
new file mode 100644
index 00000000000..72161890ef0
--- /dev/null
+++ b/src/Oro/Bundle/QueryDesignerBundle/Model/Restriction.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Oro\Bundle\QueryDesignerBundle\Model;
+
+class Restriction
+{
+    /** @var mixed Expr */
+    protected $restriction;
+
+    /** @var string */
+    protected $condition;
+
+    /** bool */
+    protected $computed;
+
+    /**
+     * @param mixed $restriction Expr
+     * @param string $condition
+     * @param bool $computed
+     */
+    public function __construct($restriction, $condition, $computed)
+    {
+        $this->restriction = $restriction;
+        $this->condition = $condition;
+        $this->computed = $computed;
+    }
+
+    /**
+     * @return mixed Expr
+     */
+    public function getRestriction()
+    {
+        return $this->restriction;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCondition()
+    {
+        return $this->condition;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isComputed()
+    {
+        return $this->computed;
+    }
+}
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/GroupingOrmFilterDatasourceAdapterTest.php b/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/GroupingOrmFilterDatasourceAdapterTest.php
index 651983a0520..4039e653645 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/GroupingOrmFilterDatasourceAdapterTest.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/GroupingOrmFilterDatasourceAdapterTest.php
@@ -145,6 +145,27 @@ public function testOneRestrictionInGroup()
         );
     }
 
+    public function testOneComputedRestrictionInGroup()
+    {
+        $qb = new QueryBuilder($this->getTestEntityManager());
+        $qb->select(['u.status, COUNT(u.id)'])
+            ->from('Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser', 'u')
+            ->groupBy('u.status');
+        $ds = new GroupingOrmFilterDatasourceAdapter($qb);
+
+        $ds->beginRestrictionGroup(FilterUtility::CONDITION_AND);
+        $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '1'), FilterUtility::CONDITION_AND, true);
+        $ds->endRestrictionGroup();
+        $ds->applyRestrictions();
+
+        $this->assertEquals(
+            'SELECT u.status, COUNT(u.id) FROM Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser u '
+            . 'GROUP BY u.status '
+            . 'HAVING COUNT(u.id) = 1',
+            $qb->getDQL()
+        );
+    }
+
     public function testSeveralRestrictionsInGroup()
     {
         $qb = new QueryBuilder($this->getTestEntityManager());
@@ -168,6 +189,29 @@ public function testSeveralRestrictionsInGroup()
         );
     }
 
+    public function testSeveralComputedRestrictionsInGroup()
+    {
+        $qb = new QueryBuilder($this->getTestEntityManager());
+        $qb->select(['u.status, COUNT(u.id)'])
+            ->from('Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser', 'u')
+            ->groupBy('u.status');
+        $ds = new GroupingOrmFilterDatasourceAdapter($qb);
+
+        $ds->beginRestrictionGroup(FilterUtility::CONDITION_AND);
+        $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '1'), FilterUtility::CONDITION_AND, true);
+        $ds->addRestriction($qb->expr()->eq('MIN(u.id)', '2'), FilterUtility::CONDITION_OR, true);
+        $ds->addRestriction($qb->expr()->eq('MAX(u.id)', '3'), FilterUtility::CONDITION_AND, true);
+        $ds->endRestrictionGroup();
+        $ds->applyRestrictions();
+
+        $this->assertEquals(
+            'SELECT u.status, COUNT(u.id) FROM Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser u '
+            . 'GROUP BY u.status '
+            . 'HAVING (COUNT(u.id) = 1 OR MIN(u.id) = 2) AND MAX(u.id) = 3',
+            $qb->getDQL()
+        );
+    }
+
     public function testNestedGroupsWithOneRestrictionInNestedGroup()
     {
         $qb = new QueryBuilder($this->getTestEntityManager());
@@ -194,6 +238,33 @@ public function testNestedGroupsWithOneRestrictionInNestedGroup()
         );
     }
 
+    public function testNestedGroupsWithOneComputedRestrictionInNestedGroup()
+    {
+        $qb = new QueryBuilder($this->getTestEntityManager());
+        $qb->select(['u.status, COUNT(u.id)'])
+            ->from('Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser', 'u')
+            ->groupBy('u.status')
+            ->andHaving('MAX(u.id) > 0');
+        $ds = new GroupingOrmFilterDatasourceAdapter($qb);
+
+        //  src: (1 OR (2))
+        // dest: (1 OR 2)
+        $ds->beginRestrictionGroup(FilterUtility::CONDITION_AND);
+        $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '1'), FilterUtility::CONDITION_AND, true);
+        $ds->beginRestrictionGroup(FilterUtility::CONDITION_OR);
+        $ds->addRestriction($qb->expr()->eq('MIN(u.id)', '2'), FilterUtility::CONDITION_AND, true);
+        $ds->endRestrictionGroup();
+        $ds->endRestrictionGroup();
+        $ds->applyRestrictions();
+
+        $this->assertEquals(
+            'SELECT u.status, COUNT(u.id) FROM Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser u '
+            . 'GROUP BY u.status '
+            . 'HAVING MAX(u.id) > 0 AND (COUNT(u.id) = 1 OR MIN(u.id) = 2)',
+            $qb->getDQL()
+        );
+    }
+
     public function testNestedGroupsWithSameCondition()
     {
         $qb = new QueryBuilder($this->getTestEntityManager());
@@ -221,6 +292,33 @@ public function testNestedGroupsWithSameCondition()
         );
     }
 
+    public function testNestedComputedGroupsWithSameCondition()
+    {
+        $qb = new QueryBuilder($this->getTestEntityManager());
+        $qb->select(['u.status, COUNT(u.id)'])
+            ->from('Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser', 'u')
+            ->groupBy('u.status');
+        $ds = new GroupingOrmFilterDatasourceAdapter($qb);
+
+        //  src: (1 OR (2 OR 3))
+        // dest: (1 OR (2 OR 3))
+        $ds->beginRestrictionGroup(FilterUtility::CONDITION_AND);
+        $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '1'), FilterUtility::CONDITION_AND, true);
+        $ds->beginRestrictionGroup(FilterUtility::CONDITION_OR);
+        $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '2'), FilterUtility::CONDITION_AND, true);
+        $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '3'), FilterUtility::CONDITION_OR, true);
+        $ds->endRestrictionGroup();
+        $ds->endRestrictionGroup();
+        $ds->applyRestrictions();
+
+        $this->assertEquals(
+            'SELECT u.status, COUNT(u.id) FROM Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser u '
+            . 'GROUP BY u.status '
+            . 'HAVING COUNT(u.id) = 1 OR (COUNT(u.id) = 2 OR COUNT(u.id) = 3)',
+            $qb->getDQL()
+        );
+    }
+
     public function testNestedGroupsWithDifferentConditions()
     {
         $qb = new QueryBuilder($this->getTestEntityManager());
@@ -248,6 +346,33 @@ public function testNestedGroupsWithDifferentConditions()
         );
     }
 
+    public function testNestedComputedGroupsWithDifferentConditions()
+    {
+        $qb = new QueryBuilder($this->getTestEntityManager());
+        $qb->select(['u.status, COUNT(u.id)'])
+            ->from('Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser', 'u')
+            ->groupBy('u.status');
+        $ds = new GroupingOrmFilterDatasourceAdapter($qb);
+
+        //  src: (1 OR (2 AND 3))
+        // dest: (1 OR (2 AND 3))
+        $ds->beginRestrictionGroup(FilterUtility::CONDITION_AND);
+        $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '1'), FilterUtility::CONDITION_AND, true);
+        $ds->beginRestrictionGroup(FilterUtility::CONDITION_OR);
+        $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '2'), FilterUtility::CONDITION_AND, true);
+        $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '3'), FilterUtility::CONDITION_AND, true);
+        $ds->endRestrictionGroup();
+        $ds->endRestrictionGroup();
+        $ds->applyRestrictions();
+
+        $this->assertEquals(
+            'SELECT u.status, COUNT(u.id) FROM Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser u '
+            . 'GROUP BY u.status '
+            . 'HAVING COUNT(u.id) = 1 OR (COUNT(u.id) = 2 AND COUNT(u.id) = 3)',
+            $qb->getDQL()
+        );
+    }
+
     public function testComplexExpr()
     {
         $qb = new QueryBuilder($this->getTestEntityManager());
@@ -287,4 +412,46 @@ public function testComplexExpr()
             $qb->getDQL()
         );
     }
+
+    public function testComplexComputedExpr()
+    {
+        $qb = new QueryBuilder($this->getTestEntityManager());
+        $qb->select(['u.status, COUNT(u.id)'])
+            ->from('Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser', 'u')
+            ->groupBy('u.status')
+            ->having('COUNT(u.id) = 0');
+        $ds = new GroupingOrmFilterDatasourceAdapter($qb);
+
+        //  src: (1 AND ((2 AND (3 OR 4)) OR (5) OR (6 AND 7)) AND 8)
+        // dest: (1 AND ((2 AND (3 OR 4)) OR 5 OR (6 AND 7)) AND 8)
+        $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '1'), FilterUtility::CONDITION_AND, true);
+        $ds->beginRestrictionGroup(FilterUtility::CONDITION_AND);
+        $ds->beginRestrictionGroup(FilterUtility::CONDITION_AND);
+        $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '2'), FilterUtility::CONDITION_AND, true);
+        $ds->beginRestrictionGroup(FilterUtility::CONDITION_AND);
+        $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '3'), FilterUtility::CONDITION_AND, true);
+        $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '4'), FilterUtility::CONDITION_OR, true);
+        $ds->endRestrictionGroup();
+        $ds->endRestrictionGroup();
+        $ds->beginRestrictionGroup(FilterUtility::CONDITION_OR);
+        $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '5'), FilterUtility::CONDITION_AND, true);
+        $ds->endRestrictionGroup();
+        $ds->beginRestrictionGroup(FilterUtility::CONDITION_OR);
+        $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '6'), FilterUtility::CONDITION_AND, true);
+        $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '7'), FilterUtility::CONDITION_AND, true);
+        $ds->endRestrictionGroup();
+        $ds->endRestrictionGroup();
+        $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '8'), FilterUtility::CONDITION_AND, true);
+        $ds->applyRestrictions();
+
+        $this->assertEquals(
+            'SELECT u.status, COUNT(u.id) FROM Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser u '
+            . 'GROUP BY u.status '
+            . 'HAVING COUNT(u.id) = 0 AND '
+            . '(COUNT(u.id) = 1 AND '
+            . '((COUNT(u.id) = 2 AND (COUNT(u.id) = 3 OR COUNT(u.id) = 4)) OR COUNT(u.id) = 5 OR (COUNT(u.id) = 6 AND COUNT(u.id) = 7)) AND '
+            . 'COUNT(u.id) = 8)',
+            $qb->getDQL()
+        );
+    }
 }
diff --git a/src/Oro/Component/PhpUtils/ArrayUtil.php b/src/Oro/Component/PhpUtils/ArrayUtil.php
index f6c0e24245c..6318d1585cf 100644
--- a/src/Oro/Component/PhpUtils/ArrayUtil.php
+++ b/src/Oro/Component/PhpUtils/ArrayUtil.php
@@ -192,4 +192,23 @@ public static function createOrderedComparator(array $order)
             return $order[$a] - $order[$b];
         };
     }
+
+    /**
+     * Return true if callback on any element returns truthy value, false otherwise
+     *
+     * @param callable $callback
+     * @param array $array
+     *
+     * @return boolean
+     */
+    public static function some(callable $callback, array $array)
+    {
+        foreach ($array as $item) {
+            if (call_user_func($callback, $item)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }

From 2af9c5ae7b8283ca09d3a265cabd5e2ccf164853 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Mon, 7 Dec 2015 11:18:29 +0100
Subject: [PATCH 087/471] BAP-9430: Report builder filters does not contain
 aggregation columns

- distinguish aggregation column filter from field condition filter in ui
---
 src/Oro/Bundle/QueryDesignerBundle/Model/GroupNode.php        | 1 +
 .../Resources/public/js/aggregated-field-condition.js         | 4 +++-
 .../Resources/translations/jsmessages.en.yml                  | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/QueryDesignerBundle/Model/GroupNode.php b/src/Oro/Bundle/QueryDesignerBundle/Model/GroupNode.php
index c2a49065b64..a667a8ac105 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Model/GroupNode.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/Model/GroupNode.php
@@ -3,6 +3,7 @@
 namespace Oro\Bundle\QueryDesignerBundle\Model;
 
 use LogicException;
+
 use Oro\Component\PhpUtils\ArrayUtil;
 
 class GroupNode
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js
index a77eda64262..abe5981a336 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js
+++ b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js
@@ -1,8 +1,9 @@
 define([
     'jquery',
     'underscore',
+    'orotranslation/js/translator',
     'oroquerydesigner/js/field-condition'
-], function($, _) {
+], function($, _, __) {
     'use strict';
 
     $.widget('oroauditquerydesigner.aggregatedFieldCondition', $.oroquerydesigner.fieldCondition, {
@@ -13,6 +14,7 @@ define([
         _create: function() {
             var data = this.element.data('value');
 
+            this.element.append('<h5>').text(__('oro.querydesigner.aggregated_field_condition.label'));
             this.$fieldChoice = $('<input>').addClass(this.options.fieldChoiceClass);
             this.$filterContainer = $('<span>').addClass(this.options.filterContainerClass);
             this.element.append(this.$fieldChoice, this.$filterContainer);
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Resources/translations/jsmessages.en.yml b/src/Oro/Bundle/QueryDesignerBundle/Resources/translations/jsmessages.en.yml
index f3fb0d0d6a3..51df1e7cecf 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Resources/translations/jsmessages.en.yml
+++ b/src/Oro/Bundle/QueryDesignerBundle/Resources/translations/jsmessages.en.yml
@@ -8,3 +8,4 @@ oro:
         field_condition:
             filter_not_supported: "This filter is not supported."
             lifetimevalue_filter_not_supported: "The filtering by the LifetimeValue is not supported yet."
+        aggregated_field_condition.label: "Aggregation column"

From 358763ff5897d6141c37e6950561e94a445ae17c Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Mon, 7 Dec 2015 11:22:36 +0100
Subject: [PATCH 088/471] BAP-9430: Report builder filters does not contain
 aggregation columns

- fix phpcs
---
 .../Grid/Extension/GroupingOrmFilterDatasourceAdapterTest.php  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/GroupingOrmFilterDatasourceAdapterTest.php b/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/GroupingOrmFilterDatasourceAdapterTest.php
index 4039e653645..a0c5e62e6f3 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/GroupingOrmFilterDatasourceAdapterTest.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/GroupingOrmFilterDatasourceAdapterTest.php
@@ -449,7 +449,8 @@ public function testComplexComputedExpr()
             . 'GROUP BY u.status '
             . 'HAVING COUNT(u.id) = 0 AND '
             . '(COUNT(u.id) = 1 AND '
-            . '((COUNT(u.id) = 2 AND (COUNT(u.id) = 3 OR COUNT(u.id) = 4)) OR COUNT(u.id) = 5 OR (COUNT(u.id) = 6 AND COUNT(u.id) = 7)) AND '
+            . '((COUNT(u.id) = 2 AND (COUNT(u.id) = 3 OR COUNT(u.id) = 4)) '
+            . 'OR COUNT(u.id) = 5 OR (COUNT(u.id) = 6 AND COUNT(u.id) = 7)) AND '
             . 'COUNT(u.id) = 8)',
             $qb->getDQL()
         );

From 1bb0c869e495f47ef984e1965079eb1f41f35fa1 Mon Sep 17 00:00:00 2001
From: Sergey Zhuravel <zhuravel.sergey@gmail.com>
Date: Mon, 7 Dec 2015 12:40:48 +0200
Subject: [PATCH 089/471] BB-1385: Add listener to add both backend and
 frontend audits to backend grid - update docs

---
 UPGRADE-1.9.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/UPGRADE-1.9.md b/UPGRADE-1.9.md
index d37048ea11d..06dbfab9059 100644
--- a/UPGRADE-1.9.md
+++ b/UPGRADE-1.9.md
@@ -29,6 +29,34 @@ UPGRADE FROM 1.8 to 1.9
 
 ####DataAuditBundle
 - `Oro\Bundle\DataauditBundle\EventListener\KernelListener` added to the class cache and constructor have container as performance improvement
+- Grid merge uses distinct policy
+
+```
+grid-name:
+    source:
+        value: 1
+grid-name:
+    source:
+        value: 2
+```
+
+will result
+
+```
+grid-name:
+    source:
+        value: 2
+```
+
+instead of
+
+```
+grid-name:
+    source:
+        value:
+            - 1
+            - 2
+```
 
 ####DataGridBundle
 - Services with tag `oro_datagrid.extension.formatter.property` was marked as private

From 9b330f7f3495cdce3301e23f72d9ee56d5895874 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Mon, 7 Dec 2015 11:49:01 +0100
Subject: [PATCH 090/471] BAP-9454: having support pro
 GroupingOrmFilterDatasourceAdapter

- fix tests
---
 .../Bundle/QueryDesignerBundle/Model/ExpressionBuilder.php   | 5 +++++
 .../Tests/Unit/Grid/Extension/OrmDatasourceExtensionTest.php | 5 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Oro/Bundle/QueryDesignerBundle/Model/ExpressionBuilder.php b/src/Oro/Bundle/QueryDesignerBundle/Model/ExpressionBuilder.php
index 87eb34adf49..55b56a71fb2 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Model/ExpressionBuilder.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/Model/ExpressionBuilder.php
@@ -21,6 +21,11 @@ class ExpressionBuilder
     public function beginGroup($condition)
     {
         $groupNode = new GroupNode($condition);
+        if (!$this->currentGroupNode && $this->groupNode) {
+            $this->groupNode = $groupNode->addNode($this->groupNode);
+            $this->currentGroupNode = $this->groupNode;
+        }
+
         if ($this->currentGroupNode) {
             $this->currentGroupNode->addNode($groupNode);
             $this->currentGroupNode = $groupNode;
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/OrmDatasourceExtensionTest.php b/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/OrmDatasourceExtensionTest.php
index e9c48f4c291..9cf29548b33 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/OrmDatasourceExtensionTest.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/OrmDatasourceExtensionTest.php
@@ -188,10 +188,9 @@ function ($matches) use (&$counter) {
             . 'FROM Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser user '
             . 'INNER JOIN user.address address '
             //. 'WHERE (user_name IS NULL OR NOT(user_name LIKE :string1)) AND ('
-            . 'WHERE user_name NOT LIKE :string1 AND ('
+            . 'WHERE user_name NOT LIKE :string1 AND '
             . '(user_status < :datetime2 OR user_status > :datetime3) AND '
-            . '(address.country LIKE :string4 OR address.city LIKE :string5 OR address.zip LIKE :string6)'
-            . ')',
+            . '(address.country LIKE :string4 OR address.city LIKE :string5 OR address.zip LIKE :string6)',
             $result
         );
     }

From 3b0e8c6850a3a3ef4269f63b38511ef3535503b3 Mon Sep 17 00:00:00 2001
From: Sergey Zhuravel <zhuravel.sergey@gmail.com>
Date: Mon, 7 Dec 2015 13:13:11 +0200
Subject: [PATCH 091/471] BB-1385: Add listener to add both backend and
 frontend audits to backend grid - fix test

---
 .../Bundle/DataAuditBundle/Tests/Functional/ControllersTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/DataAuditBundle/Tests/Functional/ControllersTest.php b/src/Oro/Bundle/DataAuditBundle/Tests/Functional/ControllersTest.php
index 005886c106f..a0bf586b3f6 100644
--- a/src/Oro/Bundle/DataAuditBundle/Tests/Functional/ControllersTest.php
+++ b/src/Oro/Bundle/DataAuditBundle/Tests/Functional/ControllersTest.php
@@ -129,7 +129,7 @@ public function testAuditHistory($result)
             $this->assertEquals($this->userData[$key], $value);
         }
 
-        $this->assertEquals('John Doe  - admin@example.com', $result['author']);
+        $this->assertEquals('John Doe - admin@example.com', $result['author']);
     }
 
     protected function clearResult($result)

From fbcbfdfcac593db59c5195bb52924e9646d60d99 Mon Sep 17 00:00:00 2001
From: Oleksandr Nechyporenko <onechyporenko@magecore.com>
Date: Mon, 7 Dec 2015 16:45:09 +0200
Subject: [PATCH 092/471] BB-1536: Create register page based on new layout  -
 fix using non-initialize property

---
 .../Layout/Form/DependencyInjectionFormAccessor.php             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/LayoutBundle/Layout/Form/DependencyInjectionFormAccessor.php b/src/Oro/Bundle/LayoutBundle/Layout/Form/DependencyInjectionFormAccessor.php
index 94590bbb0fc..272a3813bde 100644
--- a/src/Oro/Bundle/LayoutBundle/Layout/Form/DependencyInjectionFormAccessor.php
+++ b/src/Oro/Bundle/LayoutBundle/Layout/Form/DependencyInjectionFormAccessor.php
@@ -67,7 +67,7 @@ public function toString()
      */
     public function setFormData($formData)
     {
-        if (!$this->form->isSubmitted()) {
+        if (!$this->getForm()->isSubmitted()) {
             $this->getForm()->setData($formData);
         }
     }

From 11b304cbe7400a6e01f9d6a7150f9abc9c2c99c3 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Tue, 8 Dec 2015 10:43:07 +0100
Subject: [PATCH 093/471] BAP-9454: having support pro
 GroupingOrmFilterDatasourceAdapter

- make ui work correctly with aggregated-field-condition
---
 .../Resources/public/js/condition-builder.js  | 65 +++++++++++++++++--
 1 file changed, 60 insertions(+), 5 deletions(-)

diff --git a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/condition-builder.js b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/condition-builder.js
index 64e4426f2d9..5de4cc0b5fd 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/condition-builder.js
+++ b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/condition-builder.js
@@ -82,6 +82,7 @@ define(['jquery', 'underscore', 'orotranslation/js/translator', 'jquery-ui',
             opts.criteriaList = $.extend({}, opts.sortable, opts.criteriaList);
             opts.criteriaList.start = $.proxy(this._onCriteriaGrab, this);
             opts.criteriaList.stop = $.proxy(this._onCriteriaDrop, this);
+            opts.criteriaList.change = $.proxy(this._onCriteriaChange, this);
 
             opts.conditionsGroup.start = $.proxy(this._onConditionsGroupGrab, this);
             opts.conditionsGroup.stop = $.proxy(this._onConditionsGroupDrop, this);
@@ -133,6 +134,9 @@ define(['jquery', 'underscore', 'orotranslation/js/translator', 'jquery-ui',
         _initControl: function() {
             var $content = this._createConditionContent(this.$rootCondition, this.$rootCondition.data('value'));
             this._initConditionsGroup($content);
+            this._updateRootAggregatedCondition(
+                this.$rootCondition.find('>[data-criteria]').has('[data-criteria=aggregated-condition-item]')
+            );
             this._updateOperators();
             this.$rootCondition.data('initialized', true);
         },
@@ -229,12 +233,46 @@ define(['jquery', 'underscore', 'orotranslation/js/translator', 'jquery-ui',
             this.$rootCondition.find('.hide-operator').removeClass('hide-operator');
         },
 
-        syncDropAreaOver: function() {
+        _onCriteriaChange: function(e, ui) {
+            if (this._isPlaceholderInValidPosition(e, ui)) {
+                this.element.find('.sortable-placeholder').removeClass('hide');
+            } else {
+                this.element.find('.sortable-placeholder').addClass('hide');
+            }
+        },
+
+        syncDropAreaOver: function(e, ui) {
             this.$rootCondition
                 .parent()
                 .toggleClass('drop-area-over', this.$rootCondition.find('.sortable-placeholder').length !== 0);
         },
 
+        _isPlaceholderInValidPosition: function(e, ui) {
+            if (ui.item.data('criteria') === 'aggregated-condition-item') {
+                if (
+                    ui.placeholder.closest('[condition-type=aggregated-condition-item]').length ||
+                    (ui.placeholder.is(':last-child') &&
+                        !this.element.find('[condition-type=aggregated-condition-item]').length)
+                ) {
+                    return true;
+                }
+
+                return false;
+            } else if (ui.item.data('criteria') !== 'conditions-group' &&
+                ui.placeholder.closest('[condition-type=aggregated-condition-item]').length
+            ) {
+                return false;
+            }
+
+            return !ui.placeholder.prev('[condition-type=aggregated-condition-item]').length;
+        },
+
+        _updateRootAggregatedCondition: function($condition) {
+            $condition
+                .attr('condition-type', 'aggregated-condition-item')
+                .find('>.operator [data-value=OR]').parent('li').remove();
+        },
+
         _getCriteriaOrigin: function(criteria) {
             var $criteria = this.$criteriaList.find('[data-criteria="' + criteria + '"]');
             return $criteria.data('origin') || $criteria;
@@ -329,8 +367,23 @@ define(['jquery', 'underscore', 'orotranslation/js/translator', 'jquery-ui',
             var $condition;
             // new condition
             if (ui.sender && ui.sender.is(this.$criteriaList)) {
-                $condition = this._createCondition(ui.item.data('criteria'));
-                $condition.insertBefore(ui.item);
+                if (ui.placeholder.hasClass('hide')) {
+                    return;
+                }
+
+                var criteria = ui.item.data('criteria');
+                if (criteria === 'aggregated-condition-item' &&
+                    !this.element.find('[condition-type=aggregated-condition-item]').length
+                ) {
+                    var $conditionsGroup = this._createCondition('conditions-group');
+                    this._updateRootAggregatedCondition($conditionsGroup);
+                    $conditionsGroup.insertBefore(ui.item);
+                    $condition = this._createCondition(ui.item.data('criteria'));
+                    $conditionsGroup.find('.conditions-group').append($condition);
+                } else {
+                    $condition = this._createCondition(criteria);
+                    $condition.insertBefore(ui.item);
+                }
             } else {
                 $condition = ui.item;
             }
@@ -353,7 +406,7 @@ define(['jquery', 'underscore', 'orotranslation/js/translator', 'jquery-ui',
             // add operators to proper conditions
             $conditions.filter(':not(:first-child)').not(':has(>.operator)')
                 .each(function() {
-                    self._initConditionOperation(this);
+                    self._initConditionOperation($(this));
                 }).trigger('changed');
         },
 
@@ -365,7 +418,9 @@ define(['jquery', 'underscore', 'orotranslation/js/translator', 'jquery-ui',
                 .prependTo($condition)
                 .dropdownSelect({
                     buttonClass: 'btn btn-mini',
-                    options: this.options.operations,
+                    options: $condition.is('[condition-type=aggregated-condition-item]')
+                        ? [operation]
+                        : this.options.operations,
                     selected: operation
                 });
         },

From ac8e986a05f386cda38fac556b9fd48d4c854b74 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Tue, 8 Dec 2015 11:20:55 +0100
Subject: [PATCH 094/471] BAP-9454: having support pro
 GroupingOrmFilterDatasourceAdapter

- implement mixing of computed restrictions with uncomputed in some cases
---
 .../Model/ExpressionBuilder.php               | 35 +++++++++++++------
 .../QueryDesignerBundle/Model/GroupNode.php   |  2 +-
 ...GroupingOrmFilterDatasourceAdapterTest.php | 23 ++++++++++++
 3 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/src/Oro/Bundle/QueryDesignerBundle/Model/ExpressionBuilder.php b/src/Oro/Bundle/QueryDesignerBundle/Model/ExpressionBuilder.php
index 55b56a71fb2..5d653c09c75 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Model/ExpressionBuilder.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/Model/ExpressionBuilder.php
@@ -62,11 +62,12 @@ public function applyRestrictions(QueryBuilder $qb)
             return;
         }
 
-        $expr = $this->resolveGroupNode($this->groupNode);
-        if ($this->groupNode->isComputed()) {
-            $qb->andHaving($expr);
-        } else {
-            $qb->andWhere($expr);
+        list($uncomputedExpr, $computedExpr) = $this->resolveGroupNode($this->groupNode);
+        if ($computedExpr) {
+            $qb->andHaving($computedExpr);
+        }
+        if ($uncomputedExpr) {
+            $qb->andWhere($uncomputedExpr);
         }
     }
 
@@ -77,17 +78,31 @@ public function applyRestrictions(QueryBuilder $qb)
      */
     protected function resolveGroupNode(GroupNode $gNode)
     {
-        $restrictions = [];
+        $uncomputedRestrictions = [];
+        $computedRestrictions = [];
+
         foreach ($gNode->getChildren() as $node) {
             if ($node instanceof Restriction) {
-                $restrictions[] = $node;
+                if ($node->isComputed()) {
+                    $computedRestrictions[] = $node;
+                } else {
+                    $uncomputedRestrictions[] = $node;
+                }
             } else {
-                $expr = $this->resolveGroupNode($node);
-                $restrictions[] = new Restriction($expr, $node->getCondition(), $node->isComputed());
+                list($uncomputedExpr, $computedExpr) = $this->resolveGroupNode($node);
+                if ($uncomputedExpr) {
+                    $uncomputedRestrictions[] = new Restriction($uncomputedExpr, $node->getCondition(), $node->isComputed());
+                }
+                if ($computedExpr) {
+                    $computedRestrictions[] = new Restriction($computedExpr, $node->getCondition(), $node->isComputed());
+                }
             }
         }
 
-        return $this->createExprFromRestrictions($restrictions);
+        return [
+            $this->createExprFromRestrictions($uncomputedRestrictions),
+            $this->createExprFromRestrictions($computedRestrictions),
+        ];
     }
 
     /**
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Model/GroupNode.php b/src/Oro/Bundle/QueryDesignerBundle/Model/GroupNode.php
index a667a8ac105..03c2213aa26 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Model/GroupNode.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/Model/GroupNode.php
@@ -90,7 +90,7 @@ function ($node) {
         );
 
         if ($computed && $unComputed) {
-            throw new LogicException('Mixing ofcomputed nodes with uncomputed is not implemented');
+            throw new LogicException('Mixing of computed nodes with uncomputed is not implemented');
         }
 
         return $computed;
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/GroupingOrmFilterDatasourceAdapterTest.php b/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/GroupingOrmFilterDatasourceAdapterTest.php
index a0c5e62e6f3..f29b3118b4d 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/GroupingOrmFilterDatasourceAdapterTest.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/GroupingOrmFilterDatasourceAdapterTest.php
@@ -455,4 +455,27 @@ public function testComplexComputedExpr()
             $qb->getDQL()
         );
     }
+
+    public function testComputedWithUnComputedRestrictionsTogether()
+    {
+        $qb = new QueryBuilder($this->getTestEntityManager());
+        $qb->select(['u.status, COUNT(u.id)'])
+            ->from('Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser', 'u')
+            ->groupBy('u.status');
+        $ds = new GroupingOrmFilterDatasourceAdapter($qb);
+
+        $ds->addRestriction($qb->expr()->eq('u.id', '1'), FilterUtility::CONDITION_AND);
+        $ds->addRestriction($qb->expr()->eq('u.id', '2'), FilterUtility::CONDITION_AND);
+        $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '3'), FilterUtility::CONDITION_AND, true);
+        $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '4'), FilterUtility::CONDITION_OR, true);
+        $ds->applyRestrictions();
+
+        $this->assertEquals(
+            'SELECT u.status, COUNT(u.id) FROM Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser u '
+            . 'WHERE u.id = 1 AND u.id = 2 '
+            . 'GROUP BY u.status '
+            . 'HAVING COUNT(u.id) = 3 OR COUNT(u.id) = 4',
+            $qb->getDQL()
+        );
+    }
 }

From 1e94bdf4c3c5d4b8695bc4d2c0814ac05c4be384 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Tue, 8 Dec 2015 12:05:24 +0100
Subject: [PATCH 095/471] BAP-9454: having support for
 GroupingOrmFilterDatasourceAdapter

- fix aggregated condition in ui
---
 .../Resources/public/js/condition-builder.js               | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/condition-builder.js b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/condition-builder.js
index 5de4cc0b5fd..c5e6319768c 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/condition-builder.js
+++ b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/condition-builder.js
@@ -134,9 +134,6 @@ define(['jquery', 'underscore', 'orotranslation/js/translator', 'jquery-ui',
         _initControl: function() {
             var $content = this._createConditionContent(this.$rootCondition, this.$rootCondition.data('value'));
             this._initConditionsGroup($content);
-            this._updateRootAggregatedCondition(
-                this.$rootCondition.find('>[data-criteria]').has('[data-criteria=aggregated-condition-item]')
-            );
             this._updateOperators();
             this.$rootCondition.data('initialized', true);
         },
@@ -376,7 +373,6 @@ define(['jquery', 'underscore', 'orotranslation/js/translator', 'jquery-ui',
                     !this.element.find('[condition-type=aggregated-condition-item]').length
                 ) {
                     var $conditionsGroup = this._createCondition('conditions-group');
-                    this._updateRootAggregatedCondition($conditionsGroup);
                     $conditionsGroup.insertBefore(ui.item);
                     $condition = this._createCondition(ui.item.data('criteria'));
                     $conditionsGroup.find('.conditions-group').append($condition);
@@ -442,6 +438,9 @@ define(['jquery', 'underscore', 'orotranslation/js/translator', 'jquery-ui',
 
         _onChanged: function() {
             this._setSourceValue(this.$rootCondition.data('value'));
+            this._updateRootAggregatedCondition(
+                this.$rootCondition.find('>[data-criteria]').has('[data-criteria=aggregated-condition-item]')
+            );
         },
 
         _setSourceValue: function(value) {

From a657ef16e589d85fec8a5e89821acf09d26df0e9 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Tue, 8 Dec 2015 14:54:26 +0100
Subject: [PATCH 096/471] BAP-9454: having support for
 GroupingOrmFilterDatasourceAdapter

- add validation of GroupNode
---
 .../Model/ExpressionBuilder.php               |  23 +++-
 .../QueryDesignerBundle/Model/GroupNode.php   |  47 +++++--
 ...GroupingOrmFilterDatasourceAdapterTest.php |  27 +++-
 .../Unit/Validator/GroupNodeValidatorTest.php | 117 ++++++++++++++++++
 .../Constraints/GroupNodeConstraint.php       |  19 +++
 .../Validator/GroupNodeValidator.php          |  62 ++++++++++
 src/Oro/Component/PhpUtils/ArrayUtil.php      |  18 +++
 .../PhpUtils/Tests/Unit/ArrayUtilTest.php     |  84 +++++++++++++
 8 files changed, 386 insertions(+), 11 deletions(-)
 create mode 100644 src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Validator/GroupNodeValidatorTest.php
 create mode 100644 src/Oro/Bundle/QueryDesignerBundle/Validator/Constraints/GroupNodeConstraint.php
 create mode 100644 src/Oro/Bundle/QueryDesignerBundle/Validator/GroupNodeValidator.php

diff --git a/src/Oro/Bundle/QueryDesignerBundle/Model/ExpressionBuilder.php b/src/Oro/Bundle/QueryDesignerBundle/Model/ExpressionBuilder.php
index 5d653c09c75..1cb379edf93 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Model/ExpressionBuilder.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/Model/ExpressionBuilder.php
@@ -2,19 +2,33 @@
 
 namespace Oro\Bundle\QueryDesignerBundle\Model;
 
+use LogicException;
+
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 
+use Symfony\Component\Validator\Validation;
+use Symfony\Component\Validator\ValidatorInterface;
+
 use Oro\Bundle\FilterBundle\Filter\FilterUtility;
+use Oro\Bundle\QueryDesignerBundle\Validator\Constraints\GroupNodeConstraint;
 
 class ExpressionBuilder
 {
+    /** @var ValidatorInterface */
+    protected $validator;
+
     /** @var GroupNode */
     protected $groupNode;
 
     /** @var GroupNode */
     protected $currentGroupNode;
 
+    public function __construct()
+    {
+        $this->validator = Validation::createValidator();
+    }
+
     /**
      * @param string $condition
      */
@@ -62,6 +76,11 @@ public function applyRestrictions(QueryBuilder $qb)
             return;
         }
 
+        $violationList = $this->validator->validate($this->groupNode, new GroupNodeConstraint());
+        foreach ($violationList as $violation) {
+            throw new LogicException($violation->getMessage());
+        }
+
         list($uncomputedExpr, $computedExpr) = $this->resolveGroupNode($this->groupNode);
         if ($computedExpr) {
             $qb->andHaving($computedExpr);
@@ -91,10 +110,10 @@ protected function resolveGroupNode(GroupNode $gNode)
             } else {
                 list($uncomputedExpr, $computedExpr) = $this->resolveGroupNode($node);
                 if ($uncomputedExpr) {
-                    $uncomputedRestrictions[] = new Restriction($uncomputedExpr, $node->getCondition(), $node->isComputed());
+                    $uncomputedRestrictions[] = new Restriction($uncomputedExpr, $node->getCondition(), false);
                 }
                 if ($computedExpr) {
-                    $computedRestrictions[] = new Restriction($computedExpr, $node->getCondition(), $node->isComputed());
+                    $computedRestrictions[] = new Restriction($computedExpr, $node->getCondition(), true);
                 }
             }
         }
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Model/GroupNode.php b/src/Oro/Bundle/QueryDesignerBundle/Model/GroupNode.php
index 03c2213aa26..5483c7d53ae 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Model/GroupNode.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/Model/GroupNode.php
@@ -2,12 +2,14 @@
 
 namespace Oro\Bundle\QueryDesignerBundle\Model;
 
-use LogicException;
-
 use Oro\Component\PhpUtils\ArrayUtil;
 
 class GroupNode
 {
+    const TYPE_COMPUTED = 'computed';
+    const TYPE_UNCOMPUTED = 'uncomputed';
+    const TYPE_MIXED = 'mixed';
+
     /** @var string*/
     protected $condition;
 
@@ -27,6 +29,8 @@ public function __construct($condition)
 
     /**
      * @param GroupNode|Restriction $node
+     *
+     * @return $this
      */
     public function addNode($node)
     {
@@ -34,14 +38,20 @@ public function addNode($node)
         if ($node instanceof GroupNode) {
             $node->setParent($this);
         }
+
+        return $this;
     }
 
     /**
      * @param GroupNode $node
+     *
+     * @return $this
      */
     public function setParent(GroupNode $node)
     {
         $this->parentNode = $node;
+
+        return $this;
     }
 
     /**
@@ -69,14 +79,31 @@ public function getCondition()
     }
 
     /**
-     * @return bool
-     *
-     * @throws LogicException If computed restrictions are mixed with uncomputed
+     * @return string
      */
-    public function isComputed()
+    public function getType()
     {
+        $mixed = ArrayUtil::some(
+            function ($node) {
+                if ($node instanceof GroupNode) {
+                    return $node->getType() === GroupNode::TYPE_MIXED;
+                }
+
+                return false;
+            },
+            $this->nodes
+        );
+
+        if ($mixed) {
+            return GroupNode::TYPE_MIXED;
+        }
+
         $computed = ArrayUtil::some(
             function ($node) {
+                if ($node instanceof GroupNode) {
+                    return $node->getType() === GroupNode::TYPE_COMPUTED;
+                }
+
                 return $node->isComputed();
             },
             $this->nodes
@@ -84,15 +111,19 @@ function ($node) {
 
         $unComputed = ArrayUtil::some(
             function ($node) {
+                if ($node instanceof GroupNode) {
+                    return $node->getType() === GroupNode::TYPE_UNCOMPUTED;
+                }
+
                 return !$node->isComputed();
             },
             $this->nodes
         );
 
         if ($computed && $unComputed) {
-            throw new LogicException('Mixing of computed nodes with uncomputed is not implemented');
+            return static::TYPE_MIXED;
         }
 
-        return $computed;
+        return $computed ? static::TYPE_COMPUTED : static::TYPE_UNCOMPUTED;
     }
 }
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/GroupingOrmFilterDatasourceAdapterTest.php b/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/GroupingOrmFilterDatasourceAdapterTest.php
index f29b3118b4d..26c58c75af7 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/GroupingOrmFilterDatasourceAdapterTest.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/GroupingOrmFilterDatasourceAdapterTest.php
@@ -5,7 +5,6 @@
 use Doctrine\ORM\QueryBuilder;
 
 use Oro\Bundle\TestFrameworkBundle\Test\Doctrine\ORM\OrmTestCase;
-
 use Oro\Bundle\FilterBundle\Filter\FilterUtility;
 use Oro\Bundle\QueryDesignerBundle\Grid\Extension\GroupingOrmFilterDatasourceAdapter;
 
@@ -478,4 +477,30 @@ public function testComputedWithUnComputedRestrictionsTogether()
             $qb->getDQL()
         );
     }
+
+    /**
+     * @expectedException LogicException
+     * @expectedExceptionMessage Computed conditions cannot be mixed with uncomputed.
+     */
+    public function testComputedWithUnComputedRestrictionsTogetherShouldReturnExceptionWhenRestrictionsAreMixed()
+    {
+        $qb = new QueryBuilder($this->getTestEntityManager());
+        $qb->select(['u.status, COUNT(u.id)'])
+            ->from('Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser', 'u')
+            ->groupBy('u.status');
+        $ds = new GroupingOrmFilterDatasourceAdapter($qb);
+
+        $ds->addRestriction($qb->expr()->eq('u.id', '1'), FilterUtility::CONDITION_AND);
+        $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '2'), FilterUtility::CONDITION_AND, true);
+        $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '3'), FilterUtility::CONDITION_OR);
+        $ds->applyRestrictions();
+
+        $this->assertEquals(
+            'SELECT u.status, COUNT(u.id) FROM Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser u '
+            . 'WHERE u.id = 1 AND u.id = 2 '
+            . 'GROUP BY u.status '
+            . 'HAVING COUNT(u.id) = 3 OR COUNT(u.id) = 4',
+            $qb->getDQL()
+        );
+    }
 }
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Validator/GroupNodeValidatorTest.php b/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Validator/GroupNodeValidatorTest.php
new file mode 100644
index 00000000000..4ee1aab9b5f
--- /dev/null
+++ b/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Validator/GroupNodeValidatorTest.php
@@ -0,0 +1,117 @@
+<?php
+
+namespace Oro\Bundle\QueryDesignerBundle\Tests\Unit\Validator;
+
+use Oro\Bundle\FilterBundle\Filter\FilterUtility;
+use Oro\Bundle\QueryDesignerBundle\Model\GroupNode;
+use Oro\Bundle\QueryDesignerBundle\Model\Restriction;
+use Oro\Bundle\QueryDesignerBundle\Validator\Constraints\GroupNodeConstraint;
+use Oro\Bundle\QueryDesignerBundle\Validator\GroupNodeValidator;
+
+class GroupNodeValidatorTest extends \PHPUnit_Framework_TestCase
+{
+    protected $executionContext;
+    protected $validator;
+
+    protected $constraint;
+
+    public function setUp()
+    {
+        $this->executionContext = $this->getMock('\Symfony\Component\Validator\ExecutionContextInterface');
+
+        $this->validator = new GroupNodeValidator();
+        $this->validator->initialize($this->executionContext);
+
+        $this->constraint = new GroupNodeConstraint();
+    }
+
+    /**
+     * @dataProvider validGroupNodesProvider
+     */
+    public function testValidGroupNodes(GroupNode $node)
+    {
+        $this->executionContext->expects($this->never())
+            ->method('addViolation');
+
+        $this->validator->validate($node, $this->constraint);
+    }
+
+    public function validGroupNodesProvider()
+    {
+        return [
+            [new GroupNode(FilterUtility::CONDITION_AND)],
+            [
+                (new GroupNode(FilterUtility::CONDITION_AND))
+                    ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, false))
+            ],
+            [
+                (new GroupNode(FilterUtility::CONDITION_AND))
+                    ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, true))
+            ],
+            [
+                (new GroupNode(FilterUtility::CONDITION_AND))
+                    ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, false))
+                    ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, true))
+            ],
+            [
+                (new GroupNode(FilterUtility::CONDITION_AND))
+                    ->addNode(
+                        (new GroupNode(FilterUtility::CONDITION_AND))
+                            ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, false))
+                    )
+                    ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, false))
+                    ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, true))
+            ],
+            [
+                (new GroupNode(FilterUtility::CONDITION_AND))
+                    ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, false))
+                    ->addNode(
+                        (new GroupNode(FilterUtility::CONDITION_AND))
+                            ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, true))
+                    )
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider invalidGroupNodesProvider
+     */
+    public function testInvalidGroupNodes(GroupNode $node)
+    {
+        $this->executionContext->expects($this->once())
+            ->method('addViolation')
+            ->with($this->constraint->mixedConditionsMessage);
+
+        $this->validator->validate($node, $this->constraint);
+    }
+
+    public function invalidGroupNodesProvider()
+    {
+        return [
+            [
+                (new GroupNode(FilterUtility::CONDITION_AND))
+                    ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, true))
+                    ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, false))
+            ],
+            [
+                (new GroupNode(FilterUtility::CONDITION_AND))
+                    ->addNode(
+                        (new GroupNode(FilterUtility::CONDITION_AND))
+                            ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, true))
+                    )
+                    ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, false))
+                    ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, true))
+            ],
+            [
+                (new GroupNode(FilterUtility::CONDITION_AND))
+                    ->addNode(
+                        (new GroupNode(FilterUtility::CONDITION_AND))
+                            ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, false))
+                            ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, true))
+                    )
+                    ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, false))
+                    ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, false))
+            ],
+        ];
+    }
+}
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Validator/Constraints/GroupNodeConstraint.php b/src/Oro/Bundle/QueryDesignerBundle/Validator/Constraints/GroupNodeConstraint.php
new file mode 100644
index 00000000000..fc41c512826
--- /dev/null
+++ b/src/Oro/Bundle/QueryDesignerBundle/Validator/Constraints/GroupNodeConstraint.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Oro\Bundle\QueryDesignerBundle\Validator\Constraints;
+
+use Symfony\Component\Validator\Constraint;
+
+class GroupNodeConstraint extends Constraint
+{
+    /** @var string */
+    public $mixedConditionsMessage = 'Computed conditions cannot be mixed with uncomputed.';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function validatedBy()
+    {
+        return 'Oro\Bundle\QueryDesignerBundle\Validator\GroupNodeValidator';
+    }
+}
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Validator/GroupNodeValidator.php b/src/Oro/Bundle/QueryDesignerBundle/Validator/GroupNodeValidator.php
new file mode 100644
index 00000000000..0478f5eba16
--- /dev/null
+++ b/src/Oro/Bundle/QueryDesignerBundle/Validator/GroupNodeValidator.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Oro\Bundle\QueryDesignerBundle\Validator;
+
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+
+use Oro\Bundle\QueryDesignerBundle\Model\GroupNode;
+use Oro\Component\PhpUtils\ArrayUtil;
+
+class GroupNodeValidator extends ConstraintValidator
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function validate($value, Constraint $constraint)
+    {
+        if ($value === null) {
+            return;
+        }
+
+        if (!$this->isValid($value)) {
+            $this->context->addViolation($constraint->mixedConditionsMessage);
+        }
+    }
+
+    /**
+     * @param GroupNode $rootNode
+     *
+     * @return boolean
+     */
+    protected function isValid(GroupNode $rootNode)
+    {
+        if ($rootNode->getType() !== GroupNode::TYPE_MIXED) {
+            return true;
+        }
+
+        $types = array_map(
+            function ($node) {
+                if ($node instanceof GroupNode) {
+                    return $node->getType();
+                }
+
+                return $node->isComputed() ? GroupNode::TYPE_COMPUTED : GroupNode::TYPE_UNCOMPUTED;
+            },
+            $rootNode->getChildren()
+        );
+
+        if (in_array(GroupNode::TYPE_MIXED, $types)) {
+            return false;
+        }
+
+        $computedTypes = ArrayUtil::dropWhile(
+            function($type) {
+                return $type === GroupNode::TYPE_UNCOMPUTED;
+            },
+            $types
+        );
+
+        return !in_array(GroupNode::TYPE_UNCOMPUTED, $computedTypes);
+    }
+}
diff --git a/src/Oro/Component/PhpUtils/ArrayUtil.php b/src/Oro/Component/PhpUtils/ArrayUtil.php
index 6318d1585cf..49e19fa9e61 100644
--- a/src/Oro/Component/PhpUtils/ArrayUtil.php
+++ b/src/Oro/Component/PhpUtils/ArrayUtil.php
@@ -211,4 +211,22 @@ public static function some(callable $callback, array $array)
 
         return false;
     }
+
+    /**
+     * Return copy of the array starting with item for which callback returns falsity value
+     *
+     * @param callable $callback
+     *
+     * @param array $array
+     */
+    public static function dropWhile(callable $callback, array $array)
+    {
+        foreach ($array as $key => $value) {
+            if (!call_user_func($callback, $value)) {
+                return array_slice($array, $key);
+            }
+        }
+
+        return [];
+    }
 }
diff --git a/src/Oro/Component/PhpUtils/Tests/Unit/ArrayUtilTest.php b/src/Oro/Component/PhpUtils/Tests/Unit/ArrayUtilTest.php
index dad84748f03..7d842f5873d 100644
--- a/src/Oro/Component/PhpUtils/Tests/Unit/ArrayUtilTest.php
+++ b/src/Oro/Component/PhpUtils/Tests/Unit/ArrayUtilTest.php
@@ -455,6 +455,90 @@ public function testSortByCallable()
         );
     }
 
+    /**
+     * @dataProvider someProvider
+     */
+    public function testSome(callable $callback, array $array, $expectedResult)
+    {
+        $this->assertSame($expectedResult, ArrayUtil::some($callback, $array));
+    }
+
+    public function someProvider()
+    {
+        return [
+            [
+                function ($item) {
+                    return $item === 1;
+                },
+                [0, 1, 2, 3, 4],
+                true,
+            ],
+            [
+                function ($item) {
+                    return $item === 0;
+                },
+                [0, 1, 2, 3, 4],
+                true,
+            ],
+            [
+                function ($item) {
+                    return $item === 4;
+                },
+                [0, 1, 2, 3, 4],
+                true,
+            ],
+            [
+                function ($item) {
+                    return $item === 5;
+                },
+                [0, 1, 2, 3, 4],
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider dropWhileProvider
+     */
+    public function testDropWhile(callable $callback, array $array, $expectedResult)
+    {
+        $this->assertEquals($expectedResult, ArrayUtil::dropWhile($callback, $array));
+    }
+
+    public function dropWhileProvider()
+    {
+        return [
+            [
+                function ($item) {
+                    return $item !== 2;
+                },
+                [],
+                [],
+            ],
+            [
+                function ($item) {
+                    return $item !== 2;
+                },
+                [0, 1, 2, 3, 4, 5],
+                [2, 3, 4, 5],
+            ],
+            [
+                function ($item) {
+                    return $item !== 0;
+                },
+                [0, 1, 2, 3, 4, 5],
+                [0, 1, 2, 3, 4, 5],
+            ],
+            [
+                function ($item) {
+                    return $item !== 6;
+                },
+                [0, 1, 2, 3, 4, 5],
+                [],
+            ],
+        ];
+    }
+
     /**
      * @param object $obj
      *

From 2893b51c3a97c1b0e3289e372d9fed63dbc90364 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Tue, 8 Dec 2015 15:01:54 +0100
Subject: [PATCH 097/471] BAP-9454: having support for
 GroupingOrmFilterDatasourceAdapter

- fix cs issues
---
 .../Resources/public/js/condition-builder.js                 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/condition-builder.js b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/condition-builder.js
index c5e6319768c..4a59b722fb3 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/condition-builder.js
+++ b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/condition-builder.js
@@ -414,9 +414,8 @@ define(['jquery', 'underscore', 'orotranslation/js/translator', 'jquery-ui',
                 .prependTo($condition)
                 .dropdownSelect({
                     buttonClass: 'btn btn-mini',
-                    options: $condition.is('[condition-type=aggregated-condition-item]')
-                        ? [operation]
-                        : this.options.operations,
+                    options: $condition.is('[condition-type=aggregated-condition-item]') ?
+                        [operation] : this.options.operations,
                     selected: operation
                 });
         },

From 25907ca972a00216e89204610a9c976c913389ef Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Tue, 8 Dec 2015 15:38:38 +0100
Subject: [PATCH 098/471] BAP-9454: having support for
 GroupingOrmFilterDatasourceAdapter

---
 .../QueryDesignerBundle/Model/ExpressionBuilder.php    | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/Oro/Bundle/QueryDesignerBundle/Model/ExpressionBuilder.php b/src/Oro/Bundle/QueryDesignerBundle/Model/ExpressionBuilder.php
index 1cb379edf93..3ffb79640dc 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Model/ExpressionBuilder.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/Model/ExpressionBuilder.php
@@ -35,17 +35,13 @@ public function __construct()
     public function beginGroup($condition)
     {
         $groupNode = new GroupNode($condition);
-        if (!$this->currentGroupNode && $this->groupNode) {
-            $this->groupNode = $groupNode->addNode($this->groupNode);
-            $this->currentGroupNode = $this->groupNode;
-        }
-
         if ($this->currentGroupNode) {
             $this->currentGroupNode->addNode($groupNode);
             $this->currentGroupNode = $groupNode;
+        } elseif ($this->groupNode) {
+            $this->currentGroupNode = $this->groupNode = $groupNode->addNode($this->groupNode);
         } else {
-            $this->groupNode = $groupNode;
-            $this->currentGroupNode = $this->groupNode;
+            $this->currentGroupNode = $this->groupNode = $groupNode;
         }
     }
 

From fcc4ea545eb66c5880615bf70f8b90a9f166c129 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Tue, 8 Dec 2015 15:51:03 +0100
Subject: [PATCH 099/471] BAP-9454: having support for
 GroupingOrmFilterDatasourceAdapter

- fix js tests
---
 .../Resources/public/js/condition-builder.js                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/condition-builder.js b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/condition-builder.js
index 4a59b722fb3..d41793c134d 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/condition-builder.js
+++ b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/condition-builder.js
@@ -364,7 +364,7 @@ define(['jquery', 'underscore', 'orotranslation/js/translator', 'jquery-ui',
             var $condition;
             // new condition
             if (ui.sender && ui.sender.is(this.$criteriaList)) {
-                if (ui.placeholder.hasClass('hide')) {
+                if (ui.placeholder && ui.placeholder.hasClass('hide')) {
                     return;
                 }
 

From bd559d06a60d8b92dbfeef4bcd4100249942ab96 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Tue, 8 Dec 2015 15:54:43 +0100
Subject: [PATCH 100/471] BAP-9454: having support for
 GroupingOrmFilterDatasourceAdapter

- fix phpcs
---
 .../Bundle/QueryDesignerBundle/Validator/GroupNodeValidator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/QueryDesignerBundle/Validator/GroupNodeValidator.php b/src/Oro/Bundle/QueryDesignerBundle/Validator/GroupNodeValidator.php
index 0478f5eba16..70e64e0e931 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Validator/GroupNodeValidator.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/Validator/GroupNodeValidator.php
@@ -51,7 +51,7 @@ function ($node) {
         }
 
         $computedTypes = ArrayUtil::dropWhile(
-            function($type) {
+            function ($type) {
                 return $type === GroupNode::TYPE_UNCOMPUTED;
             },
             $types

From f45598014d01917b07e577fba33acbc38d457a3b Mon Sep 17 00:00:00 2001
From: Oleksandr Nechyporenko <onechyporenko@magecore.com>
Date: Tue, 8 Dec 2015 17:10:45 +0200
Subject: [PATCH 101/471] BB-1661: Fix tests  - fix unit tests

---
 .../Unit/Layout/Form/DependencyInjectionFormAccessorTest.php   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Form/DependencyInjectionFormAccessorTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Form/DependencyInjectionFormAccessorTest.php
index 2e239f0441f..4cd777658ed 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Form/DependencyInjectionFormAccessorTest.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Form/DependencyInjectionFormAccessorTest.php
@@ -173,7 +173,7 @@ public function testSetFormData()
 
         $form = $this->getMock('Symfony\Component\Form\Test\FormInterface');
         $form->expects($this->once())->method('setData')->with($data);
-        $form->expects($this->at(2))->method('getData')->willReturn($data);
+        $form->expects($this->once())->method('getData')->willReturn($data);
 
         $this->container->expects($this->once())
             ->method('get')
@@ -182,7 +182,6 @@ public function testSetFormData()
 
         $formAccessor = new DependencyInjectionFormAccessor($this->container, self::FORM_SERVICE_ID);
 
-        $this->assertNull($formAccessor->getForm()->getData());
         $formAccessor->setFormData($data);
         $this->assertEquals($data, $formAccessor->getForm()->getData());
     }

From 4bf864a3a3e0e0d7b2c3bb96bb651c55a4f18c91 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Tue, 8 Dec 2015 17:37:17 +0100
Subject: [PATCH 102/471] BAP-9454: having support for
 GroupingOrmFilterDatasourceAdapter

- refactoring, small fixes
---
 .../Model/ExpressionBuilder.php               |  2 +-
 .../QueryDesigner/AbstractQueryConverter.php  | 10 +++----
 .../public/js/aggregated-field-condition.js   |  9 +-----
 .../EventListener/SegmentSubscriber.php       | 13 +--------
 .../aggregated_field_condition.html.twig      |  2 +-
 .../aggregated-field-condition-extension.js   | 29 -------------------
 .../Unit/Resolver/SystemAwareResolverTest.php | 13 ++++++++-
 7 files changed, 21 insertions(+), 57 deletions(-)

diff --git a/src/Oro/Bundle/QueryDesignerBundle/Model/ExpressionBuilder.php b/src/Oro/Bundle/QueryDesignerBundle/Model/ExpressionBuilder.php
index 3ffb79640dc..a9a3f4c9f95 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Model/ExpressionBuilder.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/Model/ExpressionBuilder.php
@@ -89,7 +89,7 @@ public function applyRestrictions(QueryBuilder $qb)
     /**
      * @param GroupNode $gNode
      *
-     * @return mixed Expr
+     * @return mixed Expr[] Where first item  is uncomputed expr and 2nd one is computed
      */
     protected function resolveGroupNode(GroupNode $gNode)
     {
diff --git a/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/AbstractQueryConverter.php b/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/AbstractQueryConverter.php
index 539cb46536f..6a9e075c421 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/AbstractQueryConverter.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/AbstractQueryConverter.php
@@ -445,15 +445,15 @@ protected function prepareColumnAliases()
      *
      * @return array Where array has elements: string|FunctionInterface|null, string|null
      */
-    protected function createColumnFuncion(array $column)
+    protected function createColumnFunction(array $column)
     {
         if (!empty($column['func'])) {
-            $function           = $this->functionProvider->getFunction(
+            $function = $this->functionProvider->getFunction(
                 $column['func']['name'],
                 $column['func']['group_name'],
                 $column['func']['group_type']
             );
-            $functionExpr       = $function['expr'];
+            $functionExpr = $function['expr'];
             if (isset($function['return_type'])) {
                 $functionReturnType = $function['return_type'];
             } else {
@@ -474,7 +474,7 @@ protected function addSelectStatement()
         foreach ($this->definition['columns'] as $column) {
             $columnName         = $column['name'];
             $fieldName          = $this->getFieldName($columnName);
-            list($functionExpr, $functionReturnType) = $this->createColumnFuncion($column);
+            list($functionExpr, $functionReturnType) = $this->createColumnFunction($column);
             $isDistinct = !empty($column['distinct']);
             $tableAlias = $this->getTableAliasForColumn($columnName);
             if (isset($column['label'])) {
@@ -667,7 +667,7 @@ protected function processFilter($filter)
         if (isset($filter['func'])) {
             $column['func'] = $filter['func'];
         }
-        list($functionExpr) = $this->createColumnFuncion($column);
+        list($functionExpr) = $this->createColumnFunction($column);
 
         $this->addWhereCondition(
             $this->getEntityClassName($columnName),
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js
index abe5981a336..ba7a7d8db85 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js
+++ b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js
@@ -57,15 +57,8 @@ define([
         },
 
         _updateFieldChoice: function() {
-            var self = this;
             var fieldChoice = this.$fieldChoice.fieldChoice().data('oroentity-fieldChoice');
-            var originalSelect2Data = fieldChoice._select2Data;
-
-            fieldChoice._select2Data = function(path) {
-                originalSelect2Data.apply(this, arguments);
-
-                return self._getAggregatedSelectData();
-            };
+            fieldChoice._select2Data = _.bind(this._getAggregatedSelectData, this);
         },
 
         _getAggregatedSelectData: function() {
diff --git a/src/Oro/Bundle/ReportBundle/EventListener/SegmentSubscriber.php b/src/Oro/Bundle/ReportBundle/EventListener/SegmentSubscriber.php
index ab727b29a60..1021b8b5d45 100644
--- a/src/Oro/Bundle/ReportBundle/EventListener/SegmentSubscriber.php
+++ b/src/Oro/Bundle/ReportBundle/EventListener/SegmentSubscriber.php
@@ -29,20 +29,9 @@ public function loadAggregatedFieldsWidgetOptions(WidgetOptionsLoadEvent $event)
             return;
         }
 
-        $widgetOptions = $event->getWidgetOptions();
-        $fieldsLoader = $widgetOptions['fieldsLoader'];
-
         $event->setWidgetOptions(array_merge_recursive(
-            $widgetOptions,
+            $event->getWidgetOptions(),
             [
-                'aggregatedFieldsLoader' => [
-                    'entityChoice'      => $fieldsLoader['entityChoice'],
-                    'loadingMaskParent' => $fieldsLoader['loadingMaskParent'],
-                    'router'            => 'oro_api_querydesigner_aggregated_fields',
-                    'routingParams'     => [],
-                    'fieldsData'        => $fieldsLoader['fieldsData'],
-                    'confirmMessage'    => $fieldsLoader['confirmMessage'],
-                ],
                 'extensions' => [
                     'orosegment/js/app/components/aggregated-field-condition-extension',
                 ],
diff --git a/src/Oro/Bundle/ReportBundle/Resources/views/Segment/aggregated_field_condition.html.twig b/src/Oro/Bundle/ReportBundle/Resources/views/Segment/aggregated_field_condition.html.twig
index 540efb11502..1b16c9e4fa3 100644
--- a/src/Oro/Bundle/ReportBundle/Resources/views/Segment/aggregated_field_condition.html.twig
+++ b/src/Oro/Bundle/ReportBundle/Resources/views/Segment/aggregated_field_condition.html.twig
@@ -3,7 +3,7 @@
         select2: {
             placeholder: 'oro.query_designer.condition_builder.choose_entity_field'|trans
         },
-        fieldsLoaderSelector: '#' ~ params.entity_choice_id ~ 'oro_api_querydesigner_aggregated_fields',
+        fieldsLoaderSelector: '[data-ftid=' ~ params.entity_choice_id ~ 'oro_api_querydesigner_fields_entity]'
     }
 } %}
 
diff --git a/src/Oro/Bundle/SegmentBundle/Resources/public/js/app/components/aggregated-field-condition-extension.js b/src/Oro/Bundle/SegmentBundle/Resources/public/js/app/components/aggregated-field-condition-extension.js
index 6d9d37d93fb..18d58297d42 100644
--- a/src/Oro/Bundle/SegmentBundle/Resources/public/js/app/components/aggregated-field-condition-extension.js
+++ b/src/Oro/Bundle/SegmentBundle/Resources/public/js/app/components/aggregated-field-condition-extension.js
@@ -6,19 +6,6 @@ define([
 
     return {
         load: function(segment) {
-            segment.defaults = $.extend(true, segment.defaults, {
-                defaults: {
-                    aggregatedFieldsLoader: {
-                        loadingMaskParent: '',
-                        router: null,
-                        routingParams: {},
-                        fieldsData: [],
-                        confirmMessage: '',
-                        loadEvent: 'aggregatedFieldsLoaded'
-                    }
-                }
-            });
-
             segment.configureFilters = _.wrap(segment.configureFilters, function(original) {
                 var $criteria = $(this.options.filters.criteriaList);
 
@@ -37,22 +24,6 @@ define([
 
                 original.apply(this, _.rest(arguments));
             });
-
-            segment.initFieldsLoader = _.wrap(segment.initFieldsLoader, function(original) {
-                this.$aggregatedFieldsLoader = original.call(this, this.options.aggregatedFieldsLoader);
-
-                return original.apply(this, _.rest(arguments));
-            });
-
-            segment.initEntityChangeEvents = _.wrap(segment.initEntityChangeEvents, function(original) {
-                this.trigger(
-                    this.options.aggregatedFieldsLoader.loadEvent,
-                    this.$aggregatedFieldsLoader.val(),
-                    this.$aggregatedFieldsLoader.fieldsLoader('getFieldsData')
-                );
-
-                return original.apply(this, _.rest(arguments));
-            });
         }
     };
 });
diff --git a/src/Oro/Component/Config/Tests/Unit/Resolver/SystemAwareResolverTest.php b/src/Oro/Component/Config/Tests/Unit/Resolver/SystemAwareResolverTest.php
index c66a01894e6..5fcd54133ec 100644
--- a/src/Oro/Component/Config/Tests/Unit/Resolver/SystemAwareResolverTest.php
+++ b/src/Oro/Component/Config/Tests/Unit/Resolver/SystemAwareResolverTest.php
@@ -82,7 +82,10 @@ public static function otherFunc()
      */
     public function testResolve($config, $expected)
     {
-        $result = $this->resolver->resolve($config, array('testVar' => 'test context var'));
+        $result = $this->resolver->resolve($config, array(
+            'testVar' => 'test context var',
+            'testArray' => ['param' => 'param from array'],
+        ));
         $this->assertEquals($expected, $result);
     }
 
@@ -205,6 +208,14 @@ public function resolveProvider()
                 ),
                 array('root' => array('node' => 'func3 + test context var + const1')),
             ),
+            'service call with two parameters ($testArray.param$ and const)' => array(
+                array(
+                    'root' => array(
+                        'node' => '@test.service1->func3($testArray.param$, ' . self::STATIC_CLASS . '::CONST1)'
+                    )
+                ),
+                array('root' => array('node' => 'func3 + param from array + const1')),
+            ),
             'service call with two parameters (const and const the same)' => array(
                 array(
                     'root' => array(

From 5b79307a772b022aae7617dc2869a263fa2580e4 Mon Sep 17 00:00:00 2001
From: Ramunas <ieskok@ramuno.lt>
Date: Tue, 8 Dec 2015 23:48:25 +0200
Subject: [PATCH 103/471] disable xdebug and increase memory limit in travis
 config

---
 .travis.yml    | 1 +
 travis.php.ini | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1d0261e2a5c..d34f4fd4717 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ env:
   - SYMFONY_VERSION=2.7.*
 
 before_script:
+  - phpenv config-rm xdebug.ini
   - composer self-update
   - phpenv config-add travis.php.ini
   - travis_wait composer require symfony/symfony:${SYMFONY_VERSION} --prefer-source --update-no-dev
diff --git a/travis.php.ini b/travis.php.ini
index 5e5483e2d6a..2a30f41864f 100644
--- a/travis.php.ini
+++ b/travis.php.ini
@@ -1 +1 @@
-memory_limit = 1024M
+memory_limit = 2G

From 0489e964f453e176e04c3214cdc4a8f337f2d98d Mon Sep 17 00:00:00 2001
From: Ramunas <ieskok@ramuno.lt>
Date: Tue, 8 Dec 2015 23:53:48 +0200
Subject: [PATCH 104/471] enable travis cache for composer

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index d34f4fd4717..066b99df524 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,10 @@ php:
 env:
   - SYMFONY_VERSION=2.7.*
 
+cache:
+  directories:
+    - $HOME/.composer/cache/files
+
 before_script:
   - phpenv config-rm xdebug.ini
   - composer self-update

From 71c591660e4c074ef3214a050bd27e3811200c38 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Wed, 9 Dec 2015 11:14:09 +0100
Subject: [PATCH 105/471] BAP-9454: having support for
 GroupingOrmFilterDatasourceAdapter

- fix css
---
 .../Resources/public/css/less/condition-builder.less          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/css/less/condition-builder.less b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/css/less/condition-builder.less
index 6a392cbd42a..09372a86b1d 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/css/less/condition-builder.less
+++ b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/css/less/condition-builder.less
@@ -26,6 +26,7 @@
   display: none;
 }
 .conditions-group {
+  width: 100%;
   list-style: none;
   margin: 0;
   padding: 0;
@@ -256,12 +257,15 @@
     width: 150px;
   }
   .right-area {
+    display: flex;
     width: calc(~"100% - 150px");
     padding: 0 10px;
     border-left: 1px solid #c9c9c9;
     background-color: white;
     > div {
       position: relative;
+      display: flex;
+      width: 100%;
     }
   }
 }

From 3e3fd82afb004438e68d7bbff732a8287e9962da Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Wed, 9 Dec 2015 12:35:55 +0100
Subject: [PATCH 106/471] BAP-9454: having support for
 GroupingOrmFilterDatasourceAdapter

- fixed case when multiple columns with the same name are used with aggregated functions
---
 .../public/js/aggregated-field-condition.js   | 49 ++++++++++++++++---
 1 file changed, 43 insertions(+), 6 deletions(-)

diff --git a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js
index ba7a7d8db85..a7397360b0c 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js
+++ b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js
@@ -32,9 +32,12 @@ define([
                     this.element.closest('.condition').find('.close').click();
                 }
             }, this);
-            if (data && data.columnName) {
-                this.selectField(data.columnName);
-                this._renderFilter(data.columnName);
+            if (data && data.columnName && data.func) {
+                var column = this._getColumnByNameAndFunc(data.columnName, data.func);
+                if (column) {
+                    this.$fieldChoice.fieldChoice('setData', {id: column.get('name'), text: column.get('label')});
+                    this._renderFilter(column.get('name'));
+                }
             }
 
             this._on(this.$fieldChoice, {
@@ -59,6 +62,24 @@ define([
         _updateFieldChoice: function() {
             var fieldChoice = this.$fieldChoice.fieldChoice().data('oroentity-fieldChoice');
             fieldChoice._select2Data = _.bind(this._getAggregatedSelectData, this);
+
+            fieldChoice.setData = function(data) {
+                this.element.select2('data', data, true);
+            };
+
+            var self = this;
+            fieldChoice.getApplicableConditions = _.wrap(
+                fieldChoice.getApplicableConditions,
+                function(original) {
+                    var conditions = original.apply(this, _.rest(arguments));
+                    var func = self._getCurrentFunc();
+                    if (func && func.name === 'Count') {
+                        conditions.type = 'integer';
+                    }
+
+                    return conditions;
+                }
+            );
         },
 
         _getAggregatedSelectData: function() {
@@ -83,7 +104,7 @@ define([
         _onUpdate: function() {
             var value;
             var columnName = this._getColumnName();
-            var columnFunc = this._getColumnFunc(columnName);
+            var columnFunc = this._getCurrentFunc();
 
             if (this.filter && !this.filter.isEmptyValue() && !_.isEmpty(columnFunc)) {
                 value = {
@@ -103,8 +124,14 @@ define([
             return this.element.find('input.select').select2('val');
         },
 
-        _getColumnFunc: function(columnName) {
-            var column = this.options.columnsCollection.findWhere({name: columnName});
+        _getColumnLabel: function() {
+            var obj = this.element.find('input.select').select2('data');
+
+            return obj ? obj.text : undefined;
+        },
+
+        _getCurrentFunc: function() {
+            var column = this.options.columnsCollection.findWhere({label: this._getColumnLabel()});
             if (_.isEmpty(column)) {
                 return;
             }
@@ -112,6 +139,16 @@ define([
             return column.get('func');
         },
 
+        _getColumnByNameAndFunc: function(name, func) {
+            if (!func) {
+                return;
+            }
+
+            return _.find(this.options.columnsCollection.where({name: name}), function(column) {
+                return column.get('func') && column.get('func').name === func.name;
+            });
+        },
+
         _getFilterCriterion: function() {
             var criterion = this._superApply(arguments);
             $.extend(true, criterion, {'data': {'params': {'filter_by_having': true}}});

From 7363697d1adef6cf079a3452e98e1df53a637997 Mon Sep 17 00:00:00 2001
From: Ievgenii Myshusta <imyshusta@magecore.com>
Date: Wed, 9 Dec 2015 13:47:00 +0200
Subject: [PATCH 107/471] BAP-9073: Change cron strategy to prevent overflow
 jobs queue

---
 .../Bundle/CronBundle/Command/CronCommand.php | 16 +++++++++++-
 .../CronBundle/Entity/Manager/JobManager.php  | 25 +++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/CronBundle/Command/CronCommand.php b/src/Oro/Bundle/CronBundle/Command/CronCommand.php
index 93800edd336..30a8f586e77 100644
--- a/src/Oro/Bundle/CronBundle/Command/CronCommand.php
+++ b/src/Oro/Bundle/CronBundle/Command/CronCommand.php
@@ -2,6 +2,7 @@
 
 namespace Oro\Bundle\CronBundle\Command;
 
+use Oro\Bundle\CronBundle\Entity\Manager\JobManager;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -98,7 +99,7 @@ function ($element) use ($name) {
             /**
              * @todo Add "Oro timezone" setting as parameter to isDue method
              */
-            if ($cron->isDue()) {
+            if ($cron->isDue() && !$this->hasJobInQueue($name)) {
                 $job = new Job($name);
 
                 $em->persist($job);
@@ -114,4 +115,17 @@ function ($element) use ($name) {
         $output->writeln('');
         $output->writeln('All commands finished');
     }
+
+    /**
+     * @param string $name
+     *
+     * @return bool
+     */
+    protected function hasJobInQueue($name)
+    {
+        /** @var JobManager $jobManager */
+        $jobManager = $this->getContainer()->get('oro_cron.job_manager');
+
+        return $jobManager->hasJobInQueue($name, '[]');
+    }
 }
diff --git a/src/Oro/Bundle/CronBundle/Entity/Manager/JobManager.php b/src/Oro/Bundle/CronBundle/Entity/Manager/JobManager.php
index 2312761e7f4..2d601584fb1 100644
--- a/src/Oro/Bundle/CronBundle/Entity/Manager/JobManager.php
+++ b/src/Oro/Bundle/CronBundle/Entity/Manager/JobManager.php
@@ -121,4 +121,29 @@ public function getRunningJobsCount($commandName)
             ->getQuery()
             ->getSingleScalarResult();
     }
+
+    /**
+     * @param string      $name
+     * @param null|string $args
+     *
+     * @return bool
+     */
+    public function hasJobInQueue($name, $args = null)
+    {
+        $qb = $this->em->getRepository('JMSJobQueueBundle:Job')
+            ->createQueryBuilder('j');
+
+        $qb->select('count(j.id)')
+            ->andWhere('j.command=:command')
+            ->andWhere('j.state in (:stateName)')
+            ->setParameter('command', $name)
+            ->setParameter('stateName', [Job::STATE_RUNNING, Job::STATE_PENDING]);
+
+        if ($args) {
+            $qb->andWhere($qb->expr()->like('cast(j.args as text)', ':args'));
+            $qb->setParameter('args', $args);
+        }
+
+        return $qb->getQuery()->getSingleScalarResult() > 0;
+    }
 }

From a5f646cdd1426beac141434fe59edf9e12df61b1 Mon Sep 17 00:00:00 2001
From: Ilya Antipenko <iantipenko@grossum.com>
Date: Wed, 9 Dec 2015 14:25:14 +0200
Subject: [PATCH 108/471] BB-1385: Add listener to add both backend and
 frontend audits to backend grid  - Use full class name for mapping

---
 src/Oro/Bundle/DataAuditBundle/Entity/AuditField.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/DataAuditBundle/Entity/AuditField.php b/src/Oro/Bundle/DataAuditBundle/Entity/AuditField.php
index 02fc5b05b8a..d0caae079fe 100644
--- a/src/Oro/Bundle/DataAuditBundle/Entity/AuditField.php
+++ b/src/Oro/Bundle/DataAuditBundle/Entity/AuditField.php
@@ -17,7 +17,11 @@ class AuditField extends ExtendAuditField
     /**
      * @var Audit
      *
-     * @ORM\ManyToOne(targetEntity="AbstractAudit", inversedBy="fields", cascade={"persist"})
+     * @ORM\ManyToOne(
+     *      targetEntity="Oro\Bundle\DataAuditBundle\Entity\AbstractAudit",
+     *      inversedBy="fields",
+     *      cascade={"persist"}
+     * )
      * @ORM\JoinColumn(name="audit_id", referencedColumnName="id", nullable=false, onDelete="CASCADE")
      */
     protected $audit;

From c7220e9afccbf7edaed851f9dbd02608b960b127 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Wed, 9 Dec 2015 14:32:17 +0100
Subject: [PATCH 109/471] BAP-9454: having support for
 GroupingOrmFilterDatasourceAdapter

- use return_type property to determine type of the filter
---
 .../Bundle/QueryDesignerBundle/QueryDesigner/Manager.php | 7 ++++++-
 .../Resources/public/js/aggregated-field-condition.js    | 4 ++--
 .../Resources/public/js/function-choice.js               | 9 +++++----
 .../public/js/app/components/segment-component.js        | 5 +++++
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/Manager.php b/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/Manager.php
index 0d7a5938564..5f9dba7714d 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/Manager.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/Manager.php
@@ -217,11 +217,16 @@ protected function getMetadataForFunctions($groupType, $queryType)
                     $hintText    = empty($function['hint_label'])
                         ? null // if a label is empty it means that this function should inherit a label
                         : $this->translator->trans($function['hint_label']);
-                    $functions[] = [
+                    $func = [
                         'name'  => $function['name'],
                         'label' => $nameText,
                         'title' => $hintText,
                     ];
+                    if (isset($function['return_type'])) {
+                        $func['return_type'] = $function['return_type'];
+                    }
+
+                    $functions[] = $func;
                 }
                 $attr['functions'] = $functions;
                 $result[$name]     = $attr;
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js
index a7397360b0c..760f2b0e6d8 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js
+++ b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js
@@ -73,8 +73,8 @@ define([
                 function(original) {
                     var conditions = original.apply(this, _.rest(arguments));
                     var func = self._getCurrentFunc();
-                    if (func && func.name === 'Count') {
-                        conditions.type = 'integer';
+                    if (func && func.return_type) {
+                        conditions.type = func.return_type;
                     }
 
                     return conditions;
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/function-choice.js b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/function-choice.js
index 60f30e496b9..477c60c8137 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/function-choice.js
+++ b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/function-choice.js
@@ -7,9 +7,10 @@ define(['jquery', 'underscore', 'jquery-ui'], function($, _) {
     $.widget('oroquerydesigner.functionChoice', {
         options: {
             fieldChoiceSelector: '',
-            optionTemplate: _.template('<option value="<%- name %>" title="<%- title %>" ' +
-                    'data-group_name="<%- group_name %>" data-group_type="<%- group_type %>">' +
-                    '<%- label %>' +
+            optionTemplate: _.template('<option value="<%- data.name %>" title="<%- data.title %>" ' +
+                    'data-group_name="<%- data.group_name %>" data-group_type="<%- data.group_type %>" ' +
+                    'data-return_type="<%- data.return_type %>">' +
+                    '<%- data.label %>' +
                 '</option>'),
             converters: [],
             aggregates: []
@@ -90,7 +91,7 @@ define(['jquery', 'underscore', 'jquery-ui'], function($, _) {
                 });
 
                 _.each(functions, function(func) {
-                    content += options.optionTemplate(func);
+                    content += options.optionTemplate({data: func});
                 });
 
                 if (content !== '') {
diff --git a/src/Oro/Bundle/SegmentBundle/Resources/public/js/app/components/segment-component.js b/src/Oro/Bundle/SegmentBundle/Resources/public/js/app/components/segment-component.js
index f06bccc07f8..d014cdc385d 100644
--- a/src/Oro/Bundle/SegmentBundle/Resources/public/js/app/components/segment-component.js
+++ b/src/Oro/Bundle/SegmentBundle/Resources/public/js/app/components/segment-component.js
@@ -492,6 +492,11 @@ define(function(require) {
                             group_type: $el.find(':selected').data('group_type'),
                             group_name: $el.find(':selected').data('group_name')
                         };
+
+                        var returnType = $el.find(':selected').data('return_type');
+                        if (value && returnType) {
+                            value.return_type = returnType;
+                        }
                     }
                     return value;
                 }

From 880f52c4f99f681f3287d87d281cf993d623bfde Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Wed, 9 Dec 2015 15:54:06 +0100
Subject: [PATCH 110/471] BAP-9454: having support for
 GroupingOrmFilterDatasourceAdapter

- fix trifles
---
 .../public/js/aggregated-field-condition.js    | 18 ++++++++++++++----
 .../Resources/translations/jsmessages.en.yml   |  1 -
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js
index 760f2b0e6d8..207956267cd 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js
+++ b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js
@@ -14,7 +14,6 @@ define([
         _create: function() {
             var data = this.element.data('value');
 
-            this.element.append('<h5>').text(__('oro.querydesigner.aggregated_field_condition.label'));
             this.$fieldChoice = $('<input>').addClass(this.options.fieldChoiceClass);
             this.$filterContainer = $('<span>').addClass(this.options.filterContainerClass);
             this.element.append(this.$fieldChoice, this.$filterContainer);
@@ -23,12 +22,12 @@ define([
 
             this._updateFieldChoice();
             this.options.columnsCollection.on('remove', function(model) {
-                if (model.get('name') === this._getColumnName()) {
+                if (model.get('label') === this._getColumnLabel()) {
                     this.element.closest('.condition').find('.close').click();
                 }
             }, this);
-            this.options.columnsCollection.on('change:func', function(model) {
-                if (model.get('name') === this._getColumnName() && _.isEmpty(model.get('func'))) {
+            this.options.columnsCollection.on('change:func change:label', function(model) {
+                if (model._previousAttributes.label === this._getColumnLabel()) {
                     this.element.closest('.condition').find('.close').click();
                 }
             }, this);
@@ -68,6 +67,17 @@ define([
             };
 
             var self = this;
+
+            fieldChoice.formatChoice = _.wrap(fieldChoice.formatChoice, function(original) {
+                var formatted = original.apply(this, _.rest(arguments));
+                var func = self._getCurrentFunc();
+                if (func && func.name) {
+                    formatted += ' (' + func.name + ')';
+                }
+
+                return formatted;
+            });
+
             fieldChoice.getApplicableConditions = _.wrap(
                 fieldChoice.getApplicableConditions,
                 function(original) {
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Resources/translations/jsmessages.en.yml b/src/Oro/Bundle/QueryDesignerBundle/Resources/translations/jsmessages.en.yml
index 51df1e7cecf..f3fb0d0d6a3 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Resources/translations/jsmessages.en.yml
+++ b/src/Oro/Bundle/QueryDesignerBundle/Resources/translations/jsmessages.en.yml
@@ -8,4 +8,3 @@ oro:
         field_condition:
             filter_not_supported: "This filter is not supported."
             lifetimevalue_filter_not_supported: "The filtering by the LifetimeValue is not supported yet."
-        aggregated_field_condition.label: "Aggregation column"

From 8dcdce95f221da255f4fdfd60db18699678236eb Mon Sep 17 00:00:00 2001
From: Sergey Zhuravel <zhuravel.sergey@gmail.com>
Date: Thu, 10 Dec 2015 20:44:43 +0200
Subject: [PATCH 111/471] BB-1292: Enable Data Audit for Commerce Entities -
 update doc

---
 UPGRADE-1.9.md | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/UPGRADE-1.9.md b/UPGRADE-1.9.md
index ff7c5b9d41d..698a3000a4a 100644
--- a/UPGRADE-1.9.md
+++ b/UPGRADE-1.9.md
@@ -28,7 +28,13 @@ UPGRADE FROM 1.8 to 1.9
 - Removed class `Oro\Bundle\ConfigBundle\Manager\UserConfigManager` and service `oro_config.user_config_manager`. Use `oro_config.user` service instead.
 
 ####DataAuditBundle
-- `Oro\Bundle\DataauditBundle\EventListener\KernelListener` added to the class cache and constructor have container as performance improvement
+- `Oro\Bundle\DataAuditBundle\EventListener\KernelListener` added to the class cache and constructor have container as performance improvement
+- `Oro\Bundle\DataAuditBundle\Entity\AbstractAudit` has `@InheritanceType("SINGLE_TABLE")`
+- `audit-grid` and `audit-history-grid` based on `Oro\Bundle\DataAuditBundle\Entity\AbstractAudit` now. Make join to get your entity on grid
+
+####DataGridBundle
+- Services with tag `oro_datagrid.extension.formatter.property` was marked as private
+- JS collection models format changed to maintain compatibility with Backbone collections: now it is always list of models, and additional parameters are passed through the options 
 - Grid merge uses distinct policy
 
 ```
@@ -57,12 +63,7 @@ grid-name:
             - 1
             - 2
 ```
-- `Oro\Bundle\DataAuditBundle\EventListener\KernelListener` added to the class cache and constructor have container as performance improvement
 
-####DataGridBundle
-- Services with tag `oro_datagrid.extension.formatter.property` was marked as private
-- JS collection models format changed to maintain compatibility with Backbone collections: now it is always list of models, and additional parameters are passed through the options 
- 
 ####DistributionBundle:
 - Fix `priority` attribute handling for `routing.options_resolver` tag to be conform Symfony standards. New behaviour: the higher the priority, the sooner the resolver gets executed.
 

From 85221c99b2e7237faa7e121840a2ee958ae14d73 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Fri, 11 Dec 2015 15:19:50 +0100
Subject: [PATCH 112/471] CRM-3997: Make all mailboxes available under System
 organization

- revert some modifications due to their usage in other places
---
 .../Entity/Repository/MailboxRepository.php   | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/src/Oro/Bundle/EmailBundle/Entity/Repository/MailboxRepository.php b/src/Oro/Bundle/EmailBundle/Entity/Repository/MailboxRepository.php
index ca907664fac..2d20aef9060 100644
--- a/src/Oro/Bundle/EmailBundle/Entity/Repository/MailboxRepository.php
+++ b/src/Oro/Bundle/EmailBundle/Entity/Repository/MailboxRepository.php
@@ -33,6 +33,41 @@ public function findOneByEmail($email)
         return $this->findOneBy(['email' => $email]);
     }
 
+    /**
+     * Returns a list of mailboxes available to user.
+     *
+     * @param User|integer $user User or user id
+     * @param Organization $organization
+     *
+     * @return Collection|Mailbox[] Array or collection of Mailboxes
+     */
+    public function findAvailableMailboxes($user, $organization)
+    {
+        $qb = $this->createAvailableMailboxesQuery($user, $organization);
+
+        return $qb->getQuery()->getResult();
+    }
+
+        /**
+     * Returns a list of ids of mailboxes available to user.
+     *
+     * @param User|integer $user User or user id
+     * @param Organization $organization
+     *
+     * @return array Array of ids
+     */
+    public function findAvailableMailboxIds($user, $organization)
+    {
+        $mailboxes = $this->findAvailableMailboxes($user, $organization);
+
+        $ids = [];
+        foreach ($mailboxes as $mailbox) {
+            $ids[] = $mailbox->getId();
+        }
+
+        return $ids;
+    }
+
     /**
      * Creates query for mailboxes available to user logged under organization.
      * If no organization is provided, does not filter by it (useful when looking for mailboxes across organizations).

From c98955fa6936eec825c31868b47fc8d753c74bc3 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Fri, 11 Dec 2015 15:21:49 +0100
Subject: [PATCH 113/471] CRM-3997: Make all mailboxes available under System
 organization

- cs
---
 .../Bundle/EmailBundle/Entity/Repository/MailboxRepository.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/EmailBundle/Entity/Repository/MailboxRepository.php b/src/Oro/Bundle/EmailBundle/Entity/Repository/MailboxRepository.php
index 2d20aef9060..9acd4277551 100644
--- a/src/Oro/Bundle/EmailBundle/Entity/Repository/MailboxRepository.php
+++ b/src/Oro/Bundle/EmailBundle/Entity/Repository/MailboxRepository.php
@@ -48,7 +48,7 @@ public function findAvailableMailboxes($user, $organization)
         return $qb->getQuery()->getResult();
     }
 
-        /**
+    /**
      * Returns a list of ids of mailboxes available to user.
      *
      * @param User|integer $user User or user id

From c08e0300ff858bc8ff12627f32ea9c8f63283327 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Fri, 11 Dec 2015 16:13:24 +0100
Subject: [PATCH 114/471] CRM-3997: Make all mailboxes available under System
 organization

- fix unit tests
---
 .../Unit/Builder/Helper/EmailModelBuilderHelperTest.php    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Builder/Helper/EmailModelBuilderHelperTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Builder/Helper/EmailModelBuilderHelperTest.php
index 0a066d5d4ab..9e80c7ffbf9 100644
--- a/src/Oro/Bundle/EmailBundle/Tests/Unit/Builder/Helper/EmailModelBuilderHelperTest.php
+++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/Builder/Helper/EmailModelBuilderHelperTest.php
@@ -95,6 +95,10 @@ protected function setUp()
 
         $this->templating = $this->getMock('Symfony\Component\Templating\EngineInterface');
 
+        $mailboxManager = $this->getMockBuilder('Oro\Bundle\EmailBundle\Entity\Manager\MailboxManager')
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->helper = new EmailModelBuilderHelper(
             $this->entityRoutingHelper,
             $this->emailAddressHelper,
@@ -103,7 +107,8 @@ protected function setUp()
             $this->emailAddressManager,
             $this->entityManager,
             $this->emailCacheManager,
-            $this->templating
+            $this->templating,
+            $mailboxManager
         );
     }
 

From ffb2723e2f925cfc50ff4fa97774c6930a027534 Mon Sep 17 00:00:00 2001
From: Ilya Antipenko <iantipenko@grossum.com>
Date: Mon, 14 Dec 2015 11:05:19 +0200
Subject: [PATCH 115/471] BB-1656: CRUD Tax Jurisdiction  - Move country/region
 validation from AbstractAddress to ValidRegion constraint

---
 UPGRADE-1.9.md                                |   1 +
 .../AddressBundle/Entity/AbstractAddress.php  |   4 +
 .../Resources/config/services.yml             |   7 +
 .../Resources/config/validation.yml           |   3 +-
 .../Constraints/ValidRegionValidatorTest.php  | 125 ++++++++++++++++++
 .../Validator/Constraints/ValidRegion.php     |  26 ++++
 .../Constraints/ValidRegionValidator.php      |  32 +++++
 7 files changed, 196 insertions(+), 2 deletions(-)
 create mode 100644 src/Oro/Bundle/AddressBundle/Tests/Unit/Validator/Constraints/ValidRegionValidatorTest.php
 create mode 100644 src/Oro/Bundle/AddressBundle/Validator/Constraints/ValidRegion.php
 create mode 100644 src/Oro/Bundle/AddressBundle/Validator/Constraints/ValidRegionValidator.php

diff --git a/UPGRADE-1.9.md b/UPGRADE-1.9.md
index 6dd26054a16..cb478620ef2 100644
--- a/UPGRADE-1.9.md
+++ b/UPGRADE-1.9.md
@@ -13,6 +13,7 @@ UPGRADE FROM 1.8 to 1.9
 
 ####AddressBundle
 - `oro_address.address.manager` service was marked as private
+- Validation `AbstractAddress::isRegionValid` was moved to `Oro\Bundle\AddressBundle\Validator\Constraints\ValidRegion` constraint
 
 ####CalendarBundle
 - `oro_calendar.calendar_provider.user` service was marked as private
diff --git a/src/Oro/Bundle/AddressBundle/Entity/AbstractAddress.php b/src/Oro/Bundle/AddressBundle/Entity/AbstractAddress.php
index 71a6375a1a7..2afc8763f49 100644
--- a/src/Oro/Bundle/AddressBundle/Entity/AbstractAddress.php
+++ b/src/Oro/Bundle/AddressBundle/Entity/AbstractAddress.php
@@ -764,6 +764,10 @@ public function beforeSave()
         $this->updated = new \DateTime('now', new \DateTimeZone('UTC'));
     }
 
+    /**
+     * @param ExecutionContextInterface $context
+     * @deprecated Use \Oro\Bundle\AddressBundle\Validator\Constraints\ValidRegionValidator instead
+     */
     public function isRegionValid(ExecutionContextInterface $context)
     {
         if ($this->getCountry() && $this->getCountry()->hasRegions() && !$this->region && !$this->regionText) {
diff --git a/src/Oro/Bundle/AddressBundle/Resources/config/services.yml b/src/Oro/Bundle/AddressBundle/Resources/config/services.yml
index 2bf7a1373b3..229d0463416 100644
--- a/src/Oro/Bundle/AddressBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/AddressBundle/Resources/config/services.yml
@@ -4,6 +4,8 @@ parameters:
     oro_address.address.manager.class:      Oro\Bundle\AddressBundle\Entity\Manager\AddressManager
     oro_address.provider.address.class:     Oro\Bundle\AddressBundle\Provider\AddressProvider
     oro_address.provider.phone.class:       Oro\Bundle\AddressBundle\Provider\PhoneProvider
+    oro_address.validator.valid_region.class: Oro\Bundle\AddressBundle\Validator\Constraints\ValidRegionValidator
+
 
 services:
     oro_address.address.manager:
@@ -22,3 +24,8 @@ services:
         class: %oro_address.provider.phone.class%
         arguments:
             - @oro_entity_config.provider.extend
+
+    oro_address.validator.valid_region:
+        class: %oro_address.validator.valid_region.class%
+        tags:
+            - { name: validator.constraint_validator, alias: oro_address_valid_region }
diff --git a/src/Oro/Bundle/AddressBundle/Resources/config/validation.yml b/src/Oro/Bundle/AddressBundle/Resources/config/validation.yml
index c73577ce9c4..f02c6b1a9b7 100644
--- a/src/Oro/Bundle/AddressBundle/Resources/config/validation.yml
+++ b/src/Oro/Bundle/AddressBundle/Resources/config/validation.yml
@@ -57,8 +57,7 @@ Oro\Bundle\AddressBundle\Entity\Address:
         postalCode:
             - NotBlank: ~
     constraints:
-        - Callback:
-            methods: [isRegionValid]
+        - Oro\Bundle\AddressBundle\Validator\Constraints\ValidRegion: ~
 
 Oro\Bundle\AddressBundle\Entity\AbstractEmail:
     properties:
diff --git a/src/Oro/Bundle/AddressBundle/Tests/Unit/Validator/Constraints/ValidRegionValidatorTest.php b/src/Oro/Bundle/AddressBundle/Tests/Unit/Validator/Constraints/ValidRegionValidatorTest.php
new file mode 100644
index 00000000000..874dc5075ed
--- /dev/null
+++ b/src/Oro/Bundle/AddressBundle/Tests/Unit/Validator/Constraints/ValidRegionValidatorTest.php
@@ -0,0 +1,125 @@
+<?php
+
+namespace Oro\Bundle\AddressBundle\Tests\Unit\Validator\Constraints;
+
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
+
+use Oro\Bundle\AddressBundle\Validator\Constraints\ValidRegionValidator;
+use Oro\Bundle\AddressBundle\Entity\AbstractAddress;
+use Oro\Bundle\AddressBundle\Entity\Country;
+use Oro\Bundle\AddressBundle\Validator\Constraints\ValidRegion;
+
+class ValidRegionValidatorTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var ValidRegion
+     */
+    protected $constraint;
+
+    /**
+     * @var ExecutionContextInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $context;
+
+    /**
+     * @var ValidRegionValidator
+     */
+    protected $validator;
+
+    public function setUp()
+    {
+        $this->constraint = new ValidRegion();
+        $this->context = $this->getMock('Symfony\Component\Validator\Context\ExecutionContextInterface');
+        $this->validator = new ValidRegionValidator();
+        $this->validator->initialize($this->context);
+    }
+
+    public function tearDown()
+    {
+        unset($this->constraint, $this->context);
+    }
+
+    public function testConfiguration()
+    {
+        $this->assertEquals('oro_address_valid_region', $this->constraint->validatedBy());
+        $this->assertEquals(Constraint::CLASS_CONSTRAINT, $this->constraint->getTargets());
+    }
+
+    public function testGetDefaultOption()
+    {
+        $this->assertNull($this->constraint->getDefaultOption());
+    }
+
+    public function testIsRegionValidNoCountry()
+    {
+        $this->context->expects($this->never())
+            ->method('addViolationAt');
+
+        $address = $this->createAddress();
+        $this->validator->validate($address, $this->constraint);
+    }
+
+    public function testIsRegionValidNoRegion()
+    {
+        /** @var \PHPUnit_Framework_MockObject_MockObject|Country $country */
+        $country = $this->getMockBuilder('Oro\Bundle\AddressBundle\Entity\Country')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $country->expects($this->once())
+            ->method('hasRegions')
+            ->will($this->returnValue(false));
+
+        $this->context->expects($this->never())
+            ->method('addViolationAt');
+
+        $address = $this->createAddress();
+        $address->setCountry($country);
+        $this->validator->validate($address, $this->constraint);
+    }
+
+    public function testIsRegionValid()
+    {
+        /** @var \PHPUnit_Framework_MockObject_MockObject|Country $country */
+        $country = $this->getMockBuilder('Oro\Bundle\AddressBundle\Entity\Country')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $country->expects($this->once())
+            ->method('hasRegions')
+            ->will($this->returnValue(true));
+        $country->expects($this->once())
+            ->method('getName')
+            ->will($this->returnValue('Country'));
+
+        $this->context->expects($this->once())
+            ->method('getPropertyPath')
+            ->will($this->returnValue('test'));
+        $this->context->expects($this->once())
+            ->method('addViolationAt')
+            ->with(
+                'test.region',
+                $this->constraint->message,
+                ['{{ country }}' => 'Country']
+            );
+
+        $address = $this->createAddress();
+        $address->setCountry($country);
+        $this->validator->validate($address, $this->constraint);
+    }
+
+    /**
+     * @param int|null $id
+     * @return AbstractAddress|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected function createAddress($id = null)
+    {
+        /** @var AbstractAddress $result */
+        $result = $this->getMockForAbstractClass('Oro\Bundle\AddressBundle\Entity\AbstractAddress');
+
+        if (null !== $id) {
+            $result->setId($id);
+        }
+
+        return $result;
+    }
+}
diff --git a/src/Oro/Bundle/AddressBundle/Validator/Constraints/ValidRegion.php b/src/Oro/Bundle/AddressBundle/Validator/Constraints/ValidRegion.php
new file mode 100644
index 00000000000..ca4bdf8ee88
--- /dev/null
+++ b/src/Oro/Bundle/AddressBundle/Validator/Constraints/ValidRegion.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Oro\Bundle\AddressBundle\Validator\Constraints;
+
+use Symfony\Component\Validator\Constraint;
+
+class ValidRegion extends Constraint
+{
+    public $message = 'State is required for country {{ country }}';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTargets()
+    {
+        return self::CLASS_CONSTRAINT;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function validatedBy()
+    {
+        return ValidRegionValidator::ALIAS;
+    }
+}
diff --git a/src/Oro/Bundle/AddressBundle/Validator/Constraints/ValidRegionValidator.php b/src/Oro/Bundle/AddressBundle/Validator/Constraints/ValidRegionValidator.php
new file mode 100644
index 00000000000..8435c1a02ce
--- /dev/null
+++ b/src/Oro/Bundle/AddressBundle/Validator/Constraints/ValidRegionValidator.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Oro\Bundle\AddressBundle\Validator\Constraints;
+
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+
+class ValidRegionValidator extends ConstraintValidator
+{
+    const ALIAS = 'oro_address_valid_region';
+
+    /**
+     * {@inheritdoc}
+     * @param ValidRegion $constraint
+     */
+    public function validate($entity, Constraint $constraint)
+    {
+        if ($entity->getCountry() && $entity->getCountry()->hasRegions() &&
+            !$entity->getRegion() && !$entity->getRegionText()
+        ) {
+            // do not allow saving text region in case when region was checked from list
+            // except when in base data region text existed
+            // another way region_text field will be null, logic are placed in form listener
+            $propertyPath = $this->context->getPropertyPath() . '.region';
+            $this->context->addViolationAt(
+                $propertyPath,
+                $constraint->message,
+                ['{{ country }}' => $entity->getCountry()->getName()]
+            );
+        }
+    }
+}

From a68fd286dd1c79f582c8744d2ea33b29c5e83a68 Mon Sep 17 00:00:00 2001
From: Ilya Antipenko <iantipenko@grossum.com>
Date: Mon, 14 Dec 2015 11:07:07 +0200
Subject: [PATCH 116/471] BB-1656: CRUD Tax Jurisdiction  - Use validator
 instead of duplicate code

---
 .../AddressBundle/Entity/AbstractAddress.php   | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/Oro/Bundle/AddressBundle/Entity/AbstractAddress.php b/src/Oro/Bundle/AddressBundle/Entity/AbstractAddress.php
index 2afc8763f49..19c575706ee 100644
--- a/src/Oro/Bundle/AddressBundle/Entity/AbstractAddress.php
+++ b/src/Oro/Bundle/AddressBundle/Entity/AbstractAddress.php
@@ -9,6 +9,8 @@
 
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
+use Oro\Bundle\AddressBundle\Validator\Constraints\ValidRegion;
+use Oro\Bundle\AddressBundle\Validator\Constraints\ValidRegionValidator;
 use Oro\Bundle\EntityConfigBundle\Metadata\Annotation\ConfigField;
 use Oro\Bundle\FormBundle\Entity\EmptyItem;
 use Oro\Bundle\LocaleBundle\Model\AddressInterface;
@@ -770,17 +772,11 @@ public function beforeSave()
      */
     public function isRegionValid(ExecutionContextInterface $context)
     {
-        if ($this->getCountry() && $this->getCountry()->hasRegions() && !$this->region && !$this->regionText) {
-            // do not allow saving text region in case when region was checked from list
-            // except when in base data region text existed
-            // another way region_text field will be null, logic are placed in form listener
-            $propertyPath = $context->getPropertyPath() . '.region';
-            $context->addViolationAt(
-                $propertyPath,
-                'State is required for country {{ country }}',
-                ['{{ country }}' => $this->getCountry()->getName()]
-            );
-        }
+        // Use validator instead of duplicate code
+        $constraint = new ValidRegion();
+        $validator = new ValidRegionValidator();
+        $validator->initialize($context);
+        $validator->validate($this, $constraint);
     }
 
     /**

From 88642c9989bdb98ab06a57ff6f3e4a59067e096c Mon Sep 17 00:00:00 2001
From: Sergey Zhuravel <zhuravel.sergey@gmail.com>
Date: Mon, 14 Dec 2015 11:36:08 +0200
Subject: [PATCH 117/471] BB-1539: 500 error on frontend
 api/rest/latest/windows request - decouple to managers

---
 .../Controller/Api/WindowsStateController.php | 107 +++-------
 .../Entity/AbstractWindowsState.php           | 196 ++++++++++++++++++
 .../AbstractWindowsStateRepository.php        |  67 ++++++
 .../Repository/WindowsStateRepository.php     |   7 +
 .../WindowsBundle/Entity/WindowsState.php     | 182 +---------------
 .../Manager/WindowsStateManager.php           | 121 +++++++++++
 .../Manager/WindowsStateRequestManager.php    |  99 +++++++++
 .../Schema/OroWindowsBundleInstaller.php      |   5 +-
 .../Schema/v1_1/OroWindowsBundle.php          |  21 ++
 .../Resources/config/services.yml             |  28 ++-
 .../WindowsBundle/Twig/WindowsExtension.php   | 163 ++++-----------
 11 files changed, 608 insertions(+), 388 deletions(-)
 create mode 100644 src/Oro/Bundle/WindowsBundle/Entity/AbstractWindowsState.php
 create mode 100644 src/Oro/Bundle/WindowsBundle/Entity/Repository/AbstractWindowsStateRepository.php
 create mode 100644 src/Oro/Bundle/WindowsBundle/Entity/Repository/WindowsStateRepository.php
 create mode 100644 src/Oro/Bundle/WindowsBundle/Manager/WindowsStateManager.php
 create mode 100644 src/Oro/Bundle/WindowsBundle/Manager/WindowsStateRequestManager.php
 create mode 100644 src/Oro/Bundle/WindowsBundle/Migrations/Schema/v1_1/OroWindowsBundle.php

diff --git a/src/Oro/Bundle/WindowsBundle/Controller/Api/WindowsStateController.php b/src/Oro/Bundle/WindowsBundle/Controller/Api/WindowsStateController.php
index 57e3d4db915..f35779899bf 100644
--- a/src/Oro/Bundle/WindowsBundle/Controller/Api/WindowsStateController.php
+++ b/src/Oro/Bundle/WindowsBundle/Controller/Api/WindowsStateController.php
@@ -10,9 +10,8 @@
 
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\Security\Core\User\UserInterface;
 
-use Oro\Bundle\WindowsBundle\Entity\WindowsState;
+use Oro\Bundle\WindowsBundle\Manager\WindowsStateManager;
 
 /**
  * @RouteResource("windows")
@@ -31,11 +30,10 @@ class WindowsStateController extends FOSRestController
      */
     public function cgetAction()
     {
-        $items = $this->getDoctrine()->getRepository('OroWindowsBundle:WindowsState')
-            ->findBy(['user' => $this->getUser()]);
+        $items = $this->getWindowsStatesManager()->getWindowsStates();
 
         return $this->handleView(
-            $this->view($items, is_array($items) ? Codes::HTTP_OK : Codes::HTTP_NOT_FOUND)
+            $this->view($items, $items ? Codes::HTTP_OK : Codes::HTTP_NOT_FOUND)
         );
     }
 
@@ -50,23 +48,14 @@ public function cgetAction()
      */
     public function postAction()
     {
-        $postArray = $this->getPost();
-
-        /** @var $user UserInterface */
-        $user = $this->getUser();
-        $postArray['user'] = $user;
-
-        /** @var $entity \Oro\Bundle\WindowsBundle\Entity\WindowsState */
-        $entity = new WindowsState();
-        $entity->setData($postArray['data']);
-        $entity->setUser($user);
-
-        $manager = $this->getManager();
-        $manager->persist($entity);
-        $manager->flush();
+        try {
+            $id = $this->getWindowsStatesManager()->createWindowsState();
+        } catch (\InvalidArgumentException $e) {
+            throw new HttpException(Codes::HTTP_BAD_REQUEST, 'Wrong JSON inside POST body');
+        }
 
         return $this->handleView(
-            $this->view(['id' => $entity->getId()], Codes::HTTP_CREATED)
+            $this->view(['id' => $id], Codes::HTTP_CREATED)
         );
     }
 
@@ -74,32 +63,22 @@ public function postAction()
      * REST PUT
      *
      * @param int $windowId Window state id
-     *
+     * @return Response
      * @ApiDoc(
      *  description="Update Windows state item",
      *  resource=true
      * )
-     * @return Response
      */
     public function putAction($windowId)
     {
-        $postArray = $this->getPost();
-
-        /** @var $entity \Oro\Bundle\WindowsBundle\Entity\WindowsState */
-        $entity = $this->getManager()->find('OroWindowsBundle:WindowsState', (int)$windowId);
-        if (!$entity) {
-            return $this->handleView($this->view([], Codes::HTTP_NOT_FOUND));
-        }
-        if (!$this->validatePermissions($entity->getUser())) {
-            return $this->handleView($this->view([], Codes::HTTP_FORBIDDEN));
+        try {
+            if (!$this->getWindowsStatesManager()->updateWindowsState($windowId)) {
+                return $this->handleView($this->view([], Codes::HTTP_NOT_FOUND));
+            }
+        } catch (\InvalidArgumentException $e) {
+            throw new HttpException(Codes::HTTP_BAD_REQUEST, 'Wrong JSON inside POST body');
         }
 
-        $entity->setData($postArray['data']);
-
-        $em = $this->getManager();
-        $em->persist($entity);
-        $em->flush();
-
         return $this->handleView($this->view([], Codes::HTTP_OK));
     }
 
@@ -116,60 +95,22 @@ public function putAction($windowId)
      */
     public function deleteAction($windowId)
     {
-        /** @var $entity \Oro\Bundle\WindowsBundle\Entity\WindowsState */
-        $entity = $this->getManager()->find('OroWindowsBundle:WindowsState', (int)$windowId);
-        if (!$entity) {
-            return $this->handleView($this->view([], Codes::HTTP_NOT_FOUND));
-        }
-        if (!$this->validatePermissions($entity->getUser())) {
-            return $this->handleView($this->view([], Codes::HTTP_FORBIDDEN));
-        }
-
-        $em = $this->getManager();
-        $em->remove($entity);
-        $em->flush();
-
-        return $this->handleView($this->view([], Codes::HTTP_NO_CONTENT));
-    }
-
-    /**
-     * @throws \Symfony\Component\HttpKernel\Exception\HttpException
-     * @return array
-     */
-    protected function getPost()
-    {
-        $postArray = $this->getRequest()->request->all();
-        if (is_array($postArray) && array_key_exists('data', $postArray)) {
-            if (array_key_exists('url', $postArray['data'])) {
-                $postArray['data']['cleanUrl']
-                    = str_replace($this->getRequest()->server->get('SCRIPT_NAME'), '', $postArray['data']['url']);
+        try {
+            if (!$this->getWindowsStatesManager()->deleteWindowsState($windowId)) {
+                return $this->handleView($this->view([], Codes::HTTP_NOT_FOUND));
             }
-        } else {
+        } catch (\InvalidArgumentException $e) {
             throw new HttpException(Codes::HTTP_BAD_REQUEST, 'Wrong JSON inside POST body');
         }
-        return $postArray;
-    }
 
-    /**
-     * Validate permissions
-     *
-     * TODO: refactor this to use Symfony2 ACL
-     *
-     * @param UserInterface $user
-     * @return bool
-     */
-    protected function validatePermissions(UserInterface $user)
-    {
-        return $user->getUsername() == $this->getUser()->getUsername();
+        return $this->handleView($this->view([], Codes::HTTP_NO_CONTENT));
     }
 
     /**
-     * Get entity Manager
-     *
-     * @return \Doctrine\Common\Persistence\ObjectManager
+     * @retrun WindowsStateManager
      */
-    protected function getManager()
+    protected function getWindowsStatesManager()
     {
-        return $this->getDoctrine()->getManagerForClass('OroWindowsBundle:WindowsState');
+        return $this->get('oro_windows.manager.windows_state');
     }
 }
diff --git a/src/Oro/Bundle/WindowsBundle/Entity/AbstractWindowsState.php b/src/Oro/Bundle/WindowsBundle/Entity/AbstractWindowsState.php
new file mode 100644
index 00000000000..1ce3d84abec
--- /dev/null
+++ b/src/Oro/Bundle/WindowsBundle/Entity/AbstractWindowsState.php
@@ -0,0 +1,196 @@
+<?php
+
+namespace Oro\Bundle\WindowsBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+use Symfony\Component\Security\Core\User\UserInterface;
+
+/**
+ * Window state container Entity
+ *
+ * @ORM\MappedSuperclass
+ * @ORM\HasLifecycleCallbacks
+ */
+abstract class AbstractWindowsState
+{
+    /**
+     * @var integer $id
+     *
+     * @ORM\Id
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected $id;
+
+    /**
+     * @var string $data
+     *
+     * @ORM\Column(name="data", type="json_array", nullable=false)
+     */
+    protected $data;
+
+    /**
+     * @var \DateTime
+     *
+     * @ORM\Column(name="created_at", type="datetime")
+     */
+    protected $createdAt;
+
+    /**
+     * @var \DateTime
+     *
+     * @ORM\Column(name="updated_at", type="datetime")
+     */
+    protected $updatedAt;
+
+    /**
+     * @var boolean
+     */
+    protected $renderedSuccessfully = false;
+
+    /**
+     * Get id
+     *
+     * @return integer
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Set data
+     *
+     * @param mixed $data
+     * @return $this
+     */
+    public function setData($data)
+    {
+        $this->data = $data;
+
+        return $this;
+    }
+
+    /**
+     * Get data
+     *
+     * @return mixed
+     */
+    public function getData()
+    {
+        return json_decode($this->data, true);
+    }
+
+    /**
+     * Get JSON data
+     *
+     * @return string
+     */
+    public function getJsonData()
+    {
+        return $this->data;
+    }
+
+    /**
+     * Set createdAt
+     *
+     * @param \DateTime $createdAt
+     * @return $this
+     */
+    public function setCreatedAt($createdAt)
+    {
+        $this->createdAt = $createdAt;
+
+        return $this;
+    }
+
+    /**
+     * Get createdAt
+     *
+     * @return \DateTime
+     */
+    public function getCreatedAt()
+    {
+        return $this->createdAt;
+    }
+
+    /**
+     * Set updatedAt
+     *
+     * @param \DateTime $updatedAt
+     * @return $this
+     */
+    public function setUpdatedAt($updatedAt)
+    {
+        $this->updatedAt = $updatedAt;
+
+        return $this;
+    }
+
+    /**
+     * Get updatedAt
+     *
+     * @return \DateTime
+     */
+    public function getUpdatedAt()
+    {
+        return $this->updatedAt;
+    }
+
+    /**
+     * Pre persist event handler
+     *
+     * @ORM\PrePersist
+     */
+    public function doPrePersist()
+    {
+        $this->createdAt = new \DateTime('now', new \DateTimeZone('UTC'));
+        $this->updatedAt = $this->createdAt;
+    }
+
+    /**
+     * Pre update event handler
+     *
+     * @ORM\PreUpdate
+     */
+    public function doPreUpdate()
+    {
+        $this->updatedAt = new \DateTime('now', new \DateTimeZone('UTC'));
+    }
+
+    /**
+     * Returns flag that window was rendered successfully
+     *
+     * @return bool
+     */
+    public function isRenderedSuccessfully()
+    {
+        return $this->renderedSuccessfully;
+    }
+
+    /**
+     * Sets flag that window was rendered successfully
+     *
+     * @param bool $renderedSuccessfully
+     */
+    public function setRenderedSuccessfully($renderedSuccessfully)
+    {
+        $this->renderedSuccessfully = (bool)$renderedSuccessfully;
+    }
+
+    /**
+     * Set user
+     *
+     * @param UserInterface $user
+     * @return $this
+     */
+    abstract public function setUser(UserInterface $user);
+
+    /**
+     * Get user
+     *
+     * @return UserInterface
+     */
+    abstract public function getUser();
+}
diff --git a/src/Oro/Bundle/WindowsBundle/Entity/Repository/AbstractWindowsStateRepository.php b/src/Oro/Bundle/WindowsBundle/Entity/Repository/AbstractWindowsStateRepository.php
new file mode 100644
index 00000000000..0c8bab91649
--- /dev/null
+++ b/src/Oro/Bundle/WindowsBundle/Entity/Repository/AbstractWindowsStateRepository.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Oro\Bundle\WindowsBundle\Entity\Repository;
+
+use Doctrine\DBAL\Types\Type;
+use Doctrine\ORM\EntityRepository;
+
+use Symfony\Component\Security\Core\User\UserInterface;
+
+abstract class AbstractWindowsStateRepository extends EntityRepository
+{
+    /**
+     * @param UserInterface $user
+     * @param int $windowId
+     * @return mixed
+     */
+    public function delete(UserInterface $user, $windowId)
+    {
+        $qb = $this->createQueryBuilder('w');
+
+        return $qb
+            ->delete()
+            ->where(
+                $qb->expr()->andX(
+                    $qb->expr()->eq('w.user', ':user'),
+                    $qb->expr()->eq('w.id', ':id')
+                )
+            )
+            ->setParameter('id', $windowId)
+            ->setParameter('user', $user)
+            ->getQuery()
+            ->execute();
+    }
+
+    /**
+     * @param UserInterface $user
+     * @param int $windowId
+     * @param array $data
+     * @return mixed
+     */
+    public function update(UserInterface $user, $windowId, array $data)
+    {
+        $connection = $this->getEntityManager()->getConnection();
+
+        $qb = $this->createQueryBuilder('w');
+
+        return $qb
+            ->update()
+            ->set('w.data', ':data')
+            ->set('w.updatedAt', ':updatedAt')
+            ->where(
+                $qb->expr()->andX(
+                    $qb->expr()->eq('w.user', ':user'),
+                    $qb->expr()->eq('w.id', ':id')
+                )
+            )
+            ->setParameter('data', $connection->convertToDatabaseValue($data, Type::JSON_ARRAY))
+            ->setParameter(
+                'updatedAt',
+                $connection->convertToDatabaseValue(new \DateTime('now', new \DateTimeZone('UTC')), Type::DATETIME)
+            )
+            ->setParameter('id', $windowId)
+            ->setParameter('user', $user)
+            ->getQuery()
+            ->execute();
+    }
+}
diff --git a/src/Oro/Bundle/WindowsBundle/Entity/Repository/WindowsStateRepository.php b/src/Oro/Bundle/WindowsBundle/Entity/Repository/WindowsStateRepository.php
new file mode 100644
index 00000000000..7d2c2281fe2
--- /dev/null
+++ b/src/Oro/Bundle/WindowsBundle/Entity/Repository/WindowsStateRepository.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Oro\Bundle\WindowsBundle\Entity\Repository;
+
+class WindowsStateRepository extends AbstractWindowsStateRepository
+{
+}
diff --git a/src/Oro/Bundle/WindowsBundle/Entity/WindowsState.php b/src/Oro/Bundle/WindowsBundle/Entity/WindowsState.php
index e33b40450b6..5b2876f8a85 100644
--- a/src/Oro/Bundle/WindowsBundle/Entity/WindowsState.php
+++ b/src/Oro/Bundle/WindowsBundle/Entity/WindowsState.php
@@ -3,27 +3,18 @@
 namespace Oro\Bundle\WindowsBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+
 use Symfony\Component\Security\Core\User\UserInterface;
 
 /**
  * Window state container Entity
  *
- * @ORM\Entity
- * @ORM\HasLifecycleCallbacks
+ * @ORM\Entity(repositoryClass="Oro\Bundle\WindowsBundle\Entity\Repository\WindowsStateRepository")
  * @ORM\Table(name="oro_windows_state",
  *      indexes={@ORM\Index(name="windows_user_idx", columns={"user_id"})})
  */
-class WindowsState
+class WindowsState extends AbstractWindowsState
 {
-    /**
-     * @var integer $id
-     *
-     * @ORM\Id
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    protected $id;
-
     /**
      * @var UserInterface $user
      *
@@ -33,127 +24,9 @@ class WindowsState
     protected $user;
 
     /**
-     * @var string $data
-     *
-     * @ORM\Column(name="data", type="text", nullable=false)
-     */
-    protected $data;
-
-    /**
-     * @var \DateTime
-     *
-     * @ORM\Column(name="created_at", type="datetime")
-     */
-    protected $createdAt;
-
-    /**
-     * @var \DateTime
-     *
-     * @ORM\Column(name="updated_at", type="datetime")
-     */
-    protected $updatedAt;
-
-    /**
-     * @var boolean
-     */
-    protected $renderedSuccessfully = false;
-
-    /**
-     * Get id
-     *
-     * @return integer
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set data
-     *
-     * @param mixed $data
-     * @return \Oro\Bundle\WindowsBundle\Entity\WindowsState
-     */
-    public function setData($data)
-    {
-        $this->data = json_encode($data);
-
-        return $this;
-    }
-
-    /**
-     * Get data
-     *
-     * @return mixed
-     */
-    public function getData()
-    {
-        return json_decode($this->data, true);
-    }
-
-    /**
-     * Get JSON data
-     *
-     * @return string
-     */
-    public function getJsonData()
-    {
-        return $this->data;
-    }
-
-    /**
-     * Set createdAt
-     *
-     * @param \DateTime $createdAt
-     * @return \Oro\Bundle\WindowsBundle\Entity\WindowsState
-     */
-    public function setCreatedAt($createdAt)
-    {
-        $this->createdAt = $createdAt;
-
-        return $this;
-    }
-
-    /**
-     * Get createdAt
-     *
-     * @return \DateTime
-     */
-    public function getCreatedAt()
-    {
-        return $this->createdAt;
-    }
-
-    /**
-     * Set updatedAt
-     *
-     * @param \DateTime $updatedAt
-     * @return \Oro\Bundle\WindowsBundle\Entity\WindowsState
-     */
-    public function setUpdatedAt($updatedAt)
-    {
-        $this->updatedAt = $updatedAt;
-
-        return $this;
-    }
-
-    /**
-     * Get updatedAt
-     *
-     * @return \DateTime
-     */
-    public function getUpdatedAt()
-    {
-        return $this->updatedAt;
-    }
-
-    /**
-     * Set user
-     *
-     * @param UserInterface $user
-     * @return \Oro\Bundle\WindowsBundle\Entity\WindowsState
+     * {@inheritdoc}
      */
-    public function setUser(UserInterface $user = null)
+    public function setUser(UserInterface $user)
     {
         $this->user = $user;
 
@@ -161,53 +34,10 @@ public function setUser(UserInterface $user = null)
     }
 
     /**
-     * Get user
-     *
-     * @return UserInterface
+     * {@inheritdoc}
      */
     public function getUser()
     {
         return $this->user;
     }
-
-    /**
-     * Pre persist event handler
-     *
-     * @ORM\PrePersist
-     */
-    public function doPrePersist()
-    {
-        $this->createdAt = new \DateTime('now', new \DateTimeZone('UTC'));
-        $this->updatedAt = $this->createdAt;
-    }
-
-    /**
-     * Pre update event handler
-     *
-     * @ORM\PreUpdate
-     */
-    public function doPreUpdate()
-    {
-        $this->updatedAt = new \DateTime('now', new \DateTimeZone('UTC'));
-    }
-
-    /**
-     * Returns flag that window was rendered successfully
-     *
-     * @return bool
-     */
-    public function isRenderedSuccessfully()
-    {
-        return $this->renderedSuccessfully;
-    }
-
-    /**
-     * Sets flag that window was rendered successfully
-     *
-     * @param bool $renderedSuccessfully
-     */
-    public function setRenderedSuccessfully($renderedSuccessfully)
-    {
-        $this->renderedSuccessfully = (bool)$renderedSuccessfully;
-    }
 }
diff --git a/src/Oro/Bundle/WindowsBundle/Manager/WindowsStateManager.php b/src/Oro/Bundle/WindowsBundle/Manager/WindowsStateManager.php
new file mode 100644
index 00000000000..ecbe93923c6
--- /dev/null
+++ b/src/Oro/Bundle/WindowsBundle/Manager/WindowsStateManager.php
@@ -0,0 +1,121 @@
+<?php
+
+namespace Oro\Bundle\WindowsBundle\Manager;
+
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\User\UserInterface;
+
+use Oro\Bundle\EntityBundle\ORM\DoctrineHelper;
+use Oro\Bundle\WindowsBundle\Entity\AbstractWindowsState;
+use Oro\Bundle\WindowsBundle\Entity\Repository\AbstractWindowsStateRepository;
+
+class WindowsStateManager
+{
+    /** @var TokenStorageInterface */
+    protected $tokenStorage;
+
+    /** @var DoctrineHelper */
+    protected $doctrineHelper;
+
+    /** @var WindowsStateRequestManager */
+    protected $requestStateManager;
+
+    /** @var string */
+    protected $className;
+
+    /**
+     * @param TokenStorageInterface $tokenStorage
+     * @param DoctrineHelper $doctrineHelper
+     * @param WindowsStateRequestManager $requestStateManager
+     * @param string $className
+     */
+    public function __construct(
+        TokenStorageInterface $tokenStorage,
+        DoctrineHelper $doctrineHelper,
+        WindowsStateRequestManager $requestStateManager,
+        $className
+    ) {
+        $this->tokenStorage = $tokenStorage;
+        $this->doctrineHelper = $doctrineHelper;
+        $this->className = $className;
+        $this->requestStateManager = $requestStateManager;
+    }
+
+    /**
+     * @return int
+     */
+    public function createWindowsState()
+    {
+        /** @var AbstractWindowsState $state */
+        $state = $this->doctrineHelper->createEntityInstance($this->className);
+        $state->setData($this->requestStateManager->getData());
+        $state->setUser($this->getUser());
+
+        $em = $this->doctrineHelper->getEntityManagerForClass($this->className);
+        $em->persist($state);
+        $em->flush($state);
+
+        return $state->getId();
+    }
+
+    /**
+     * @param int $windowId
+     * @return bool
+     */
+    public function updateWindowsState($windowId)
+    {
+        return (bool)$this->getRepository()->update($this->getUser(), $windowId, $this->requestStateManager->getData());
+    }
+
+    /**
+     * @param int $windowId
+     * @return bool
+     */
+    public function deleteWindowsState($windowId)
+    {
+        return (bool)$this->getRepository()->delete($this->getUser(), $windowId);
+    }
+
+    /**
+     * @return AbstractWindowsState[]
+     */
+    public function getWindowsStates()
+    {
+        return $this->getRepository()->findBy(['user' => $this->getUser()]);
+    }
+
+    /**
+     * @param int $windowId
+     * @return AbstractWindowsState
+     */
+    public function getWindowsState($windowId)
+    {
+        return $this->getRepository()->findBy(['user' => $this->getUser(), 'id' => (int)$windowId]);
+    }
+
+    /**
+     * @return AbstractWindowsStateRepository
+     */
+    protected function getRepository()
+    {
+        return $this->doctrineHelper->getEntityRepository($this->className);
+    }
+
+    /**
+     * @return UserInterface
+     *
+     * @see TokenInterface::getUser()
+     */
+    public function getUser()
+    {
+        if (null === $token = $this->tokenStorage->getToken()) {
+            return null;
+        }
+
+        if (!is_object($user = $token->getUser())) {
+            return null;
+        }
+
+        return $user;
+    }
+}
diff --git a/src/Oro/Bundle/WindowsBundle/Manager/WindowsStateRequestManager.php b/src/Oro/Bundle/WindowsBundle/Manager/WindowsStateRequestManager.php
new file mode 100644
index 00000000000..bf77f329504
--- /dev/null
+++ b/src/Oro/Bundle/WindowsBundle/Manager/WindowsStateRequestManager.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace Oro\Bundle\WindowsBundle\Manager;
+
+use Symfony\Component\HttpFoundation\RequestStack;
+
+class WindowsStateRequestManager
+{
+    /** @var RequestStack */
+    protected $requestStack;
+
+    /**
+     * @param RequestStack $requestStack
+     */
+    public function __construct(RequestStack $requestStack)
+    {
+        $this->requestStack = $requestStack;
+    }
+
+    /**
+     * @return array
+     */
+    public function getData()
+    {
+        $request = $this->requestStack->getCurrentRequest();
+        $data = $request->request->all();
+
+        if (!array_key_exists('data', $data)) {
+            throw new \InvalidArgumentException();
+        }
+
+        if (!array_key_exists('url', $data['data'])) {
+            throw new \InvalidArgumentException();
+        }
+
+        $cleanUrl = str_replace($request->server->get('SCRIPT_NAME'), '', $data['data']['url']);
+        if (!$cleanUrl) {
+            throw new \InvalidArgumentException();
+        }
+
+        $data['data']['cleanUrl'] = $cleanUrl;
+
+        return $data['data'];
+    }
+
+    /**
+     * @param array $data
+     * @return string
+     */
+    public function getUri(array $data)
+    {
+        if (isset($data['cleanUrl'])) {
+            if (isset($data['type'])) {
+                $wid = isset($data['wid']) ? $data['wid'] : $this->getUniqueIdentifier();
+                $uri = $this->getUrlWithContainer($data['cleanUrl'], $data['type'], $wid);
+            } else {
+                $uri = $data['cleanUrl'];
+            }
+        }
+
+        if (!$uri) {
+            throw new \InvalidArgumentException();
+        }
+
+        return $uri;
+    }
+
+    /**
+     * @param string $url
+     * @param string $container
+     * @param string $wid
+     *
+     * @return string
+     */
+    protected function getUrlWithContainer($url, $container, $wid)
+    {
+        if (strpos($url, '_widgetContainer=') === false) {
+            $parts = parse_url($url);
+            $widgetPart = '_widgetContainer=' . $container . '&_wid=' . $wid;
+            if (array_key_exists('query', $parts)) {
+                $separator = $parts['query'] ? '&' : '';
+                $newQuery = $parts['query'] . $separator . $widgetPart;
+                $url = str_replace($parts['query'], $newQuery, $url);
+            } else {
+                $url .= '?' . $widgetPart;
+            }
+        }
+
+        return $url;
+    }
+
+    /**
+     * @return string
+     */
+    protected function getUniqueIdentifier()
+    {
+        return str_replace('.', '-', uniqid('windows_state', true));
+    }
+}
diff --git a/src/Oro/Bundle/WindowsBundle/Migrations/Schema/OroWindowsBundleInstaller.php b/src/Oro/Bundle/WindowsBundle/Migrations/Schema/OroWindowsBundleInstaller.php
index 86338116977..7e7548e4a46 100644
--- a/src/Oro/Bundle/WindowsBundle/Migrations/Schema/OroWindowsBundleInstaller.php
+++ b/src/Oro/Bundle/WindowsBundle/Migrations/Schema/OroWindowsBundleInstaller.php
@@ -3,6 +3,7 @@
 namespace Oro\Bundle\WindowsBundle\Migrations\Schema;
 
 use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Types\Type;
 
 use Oro\Bundle\MigrationBundle\Migration\Installation;
 use Oro\Bundle\MigrationBundle\Migration\QueryBag;
@@ -14,7 +15,7 @@ class OroWindowsBundleInstaller implements Installation
      */
     public function getMigrationVersion()
     {
-        return 'v1_0';
+        return 'v1_1';
     }
 
     /**
@@ -39,7 +40,7 @@ protected function createOroWindowsStateTable(Schema $schema)
         $table = $schema->createTable('oro_windows_state');
         $table->addColumn('id', 'integer', ['autoincrement' => true]);
         $table->addColumn('user_id', 'integer', []);
-        $table->addColumn('data', 'text', []);
+        $table->addColumn('data', Type::JSON_ARRAY, []);
         $table->addColumn('created_at', 'datetime', []);
         $table->addColumn('updated_at', 'datetime', []);
         $table->setPrimaryKey(['id']);
diff --git a/src/Oro/Bundle/WindowsBundle/Migrations/Schema/v1_1/OroWindowsBundle.php b/src/Oro/Bundle/WindowsBundle/Migrations/Schema/v1_1/OroWindowsBundle.php
new file mode 100644
index 00000000000..914b4fb51af
--- /dev/null
+++ b/src/Oro/Bundle/WindowsBundle/Migrations/Schema/v1_1/OroWindowsBundle.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Oro\Bundle\WindowsBundle\Migrations\Schema\v1_1;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Types\Type;
+
+use Oro\Bundle\MigrationBundle\Migration\Migration;
+use Oro\Bundle\MigrationBundle\Migration\QueryBag;
+
+class OroWindowsBundle implements Migration
+{
+    /**
+     * @inheritdoc
+     */
+    public function up(Schema $schema, QueryBag $queries)
+    {
+        $table = $schema->getTable('oro_windows_state');
+        $table->getColumn('data')->setType(Type::getType(Type::JSON_ARRAY));
+    }
+}
diff --git a/src/Oro/Bundle/WindowsBundle/Resources/config/services.yml b/src/Oro/Bundle/WindowsBundle/Resources/config/services.yml
index b0c1452c3d0..7017b40a8a7 100644
--- a/src/Oro/Bundle/WindowsBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/WindowsBundle/Resources/config/services.yml
@@ -1,11 +1,33 @@
 parameters:
+    oro_windows.entity.windows_state.class: Oro\Bundle\WindowsBundle\Entity\WindowsState
     oro_windows.twig.extension.class: Oro\Bundle\WindowsBundle\Twig\WindowsExtension
+    oro_windows.manager.windows_state.class: Oro\Bundle\WindowsBundle\Manager\WindowsStateManager
+    oro_windows.manager.windows_state_request.class: Oro\Bundle\WindowsBundle\Manager\WindowsStateRequestManager
 
 services:
     oro_windows.twig.extension:
         class: %oro_windows.twig.extension.class%
         arguments:
-            - @security.context
-            - @doctrine.orm.entity_manager
+            - @oro_windows.manager.windows_state
+            - @oro_windows.manager.windows_state_request
         tags:
-            - { name: twig.extension }
\ No newline at end of file
+            - { name: twig.extension }
+
+    oro_windows.manager.windows_state.abstract:
+        class: %oro_windows.manager.windows_state.class%
+        abstract: true
+        private: true
+        arguments:
+            - @security.token_storage
+            - @oro_entity.doctrine_helper
+            - @oro_windows.manager.windows_state_request
+
+    oro_windows.manager.windows_state:
+        parent: oro_windows.manager.windows_state.abstract
+        arguments:
+            - %oro_windows.entity.windows_state.class%
+
+    oro_windows.manager.windows_state_request:
+        class: %oro_windows.manager.windows_state_request.class%
+        arguments:
+            - @request_stack
diff --git a/src/Oro/Bundle/WindowsBundle/Twig/WindowsExtension.php b/src/Oro/Bundle/WindowsBundle/Twig/WindowsExtension.php
index 470c67e0b5e..b4a66818b62 100644
--- a/src/Oro/Bundle/WindowsBundle/Twig/WindowsExtension.php
+++ b/src/Oro/Bundle/WindowsBundle/Twig/WindowsExtension.php
@@ -2,29 +2,17 @@
 
 namespace Oro\Bundle\WindowsBundle\Twig;
 
-use Doctrine\ORM\EntityManager;
-
 use Symfony\Bridge\Twig\Extension\HttpKernelExtension;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Symfony\Component\Security\Core\SecurityContextInterface;
-use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
-use Oro\Bundle\WindowsBundle\Entity\WindowsState;
+use Oro\Bundle\WindowsBundle\Entity\AbstractWindowsState;
+use Oro\Bundle\WindowsBundle\Manager\WindowsStateManager;
+use Oro\Bundle\WindowsBundle\Manager\WindowsStateRequestManager;
 
 class WindowsExtension extends \Twig_Extension
 {
     const EXTENSION_NAME = 'oro_windows';
 
-    /**
-     * @var SecurityContextInterface
-     */
-    protected $securityContext;
-
-    /**
-     * @var EntityManager
-     */
-    protected $em;
-
     /**
      * Protect extension from infinite loop
      *
@@ -32,16 +20,22 @@ class WindowsExtension extends \Twig_Extension
      */
     protected $rendered = false;
 
+    /** @var WindowsStateManager */
+    protected $windowsStateManager;
+
+    /** @var WindowsStateRequestManager */
+    protected $windowsStateRequestManager;
+
     /**
-     * @param SecurityContextInterface $securityContext
-     * @param EntityManager $em
+     * @param WindowsStateManager $windowsStateManager
+     * @param WindowsStateRequestManager $windowsStateRequestManager
      */
     public function __construct(
-        SecurityContextInterface $securityContext,
-        EntityManager $em
+        WindowsStateManager $windowsStateManager,
+        WindowsStateRequestManager $windowsStateRequestManager
     ) {
-        $this->securityContext = $securityContext;
-        $this->em = $em;
+        $this->windowsStateManager = $windowsStateManager;
+        $this->windowsStateRequestManager = $windowsStateRequestManager;
     }
 
     /**
@@ -51,24 +45,24 @@ public function __construct(
      */
     public function getFunctions()
     {
-        return array(
+        return [
             'oro_windows_restore' => new \Twig_Function_Method(
                 $this,
                 'render',
-                array(
-                    'is_safe' => array('html'),
-                    'needs_environment' => true
-                )
+                [
+                    'is_safe' => ['html'],
+                    'needs_environment' => true,
+                ]
             ),
             'oro_window_render_fragment' => new \Twig_Function_Method(
                 $this,
                 'renderFragment',
-                array(
-                    'is_safe' => array('html'),
-                    'needs_environment' => true
-                )
-            )
-        );
+                [
+                    'is_safe' => ['html'],
+                    'needs_environment' => true,
+                ]
+            ),
+        ];
     }
 
     /**
@@ -80,32 +74,15 @@ public function getFunctions()
      */
     public function render(\Twig_Environment $environment)
     {
-        if (!($user = $this->getUser()) || $this->rendered) {
+        if ($this->rendered) {
             return '';
         }
-        $this->rendered = true;
-
-        $windowStates = array();
-        $removeWindowStates = array();
-        $userWindowStates = $this->em->getRepository('OroWindowsBundle:WindowsState')->findBy(array('user' => $user));
-        /** @var WindowsState $windowState */
-        foreach ($userWindowStates as $windowState) {
-            $data = $windowState->getData();
-            if (empty($data) || !isset($data['cleanUrl'])) {
-                $this->em->remove($windowState);
-                $removeWindowStates[] = $windowState;
-            } else {
-                $windowStates[] = $windowState;
-            }
-        }
 
-        if ($removeWindowStates) {
-            $this->em->flush($removeWindowStates);
-        }
+        $this->rendered = true;
 
         return $environment->render(
             'OroWindowsBundle::states.html.twig',
-            array('windowStates' => $windowStates)
+            ['windowStates' => $this->windowsStateManager->getWindowsStates()]
         );
     }
 
@@ -113,83 +90,29 @@ public function render(\Twig_Environment $environment)
      * Renders fragment by window state.
      *
      * @param \Twig_Environment $environment
-     * @param WindowsState $windowState
+     * @param AbstractWindowsState $windowState
      *
      * @return string
      */
-    public function renderFragment(\Twig_Environment $environment, WindowsState $windowState)
+    public function renderFragment(\Twig_Environment $environment, AbstractWindowsState $windowState)
     {
-        $result = '';
         $windowState->setRenderedSuccessfully(false);
-        $data = $windowState->getData();
-
-        if (isset($data['cleanUrl'])) {
-            if (isset($data['type'])) {
-                $wid = isset($data['wid']) ? $data['wid'] : $this->getUniqueIdentifier();
-                $uri = $this->getUrlWithContainer($data['cleanUrl'], $data['type'], $wid);
-            } else {
-                $uri = $data['cleanUrl'];
-            }
-        } else {
-            return $result;
-        }
 
         try {
+            $uri = $this->windowsStateRequestManager->getUri($windowState->getData());
+
             /** @var HttpKernelExtension $httpKernelExtension */
             $httpKernelExtension = $environment->getExtension('http_kernel');
-            $result = $httpKernelExtension->renderFragment($uri);
             $windowState->setRenderedSuccessfully(true);
-            return $result;
-        } catch (NotFoundHttpException $e) {
-            $this->em->remove($windowState);
-            $this->em->flush($windowState);
-        }
-
-        return $result;
-    }
 
-    /**
-     * Get a user from the Security Context
-     *
-     * @return null|mixed
-     * @throws \LogicException If SecurityBundle is not available
-     * @see Symfony\Component\Security\Core\Authentication\Token\TokenInterface::getUser()
-     */
-    public function getUser()
-    {
-        /** @var TokenInterface $token */
-        if (null === $token = $this->securityContext->getToken()) {
-            return null;
-        }
-
-        if (!is_object($user = $token->getUser())) {
-            return null;
+            return $httpKernelExtension->renderFragment($uri);
+        } catch (NotFoundHttpException $e) {
+            $this->windowsStateManager->deleteWindowsState($windowState->getId());
+        } catch (\InvalidArgumentException $e) {
+            $this->windowsStateManager->deleteWindowsState($windowState->getId());
         }
 
-        return $user;
-    }
-
-    /**
-     * @param string $url
-     * @param string $container
-     * @param string $wid
-     *
-     * @return string
-     */
-    protected function getUrlWithContainer($url, $container, $wid)
-    {
-        if (strpos($url, '_widgetContainer=') === false) {
-            $parts = parse_url($url);
-            $widgetPart = '_widgetContainer=' . $container. '&_wid=' . $wid;
-            if (array_key_exists('query', $parts)) {
-                $separator = $parts['query'] ? '&' : '';
-                $newQuery = $parts['query'] . $separator . $widgetPart;
-                $url = str_replace($parts['query'], $newQuery, $url);
-            } else {
-                $url .= '?' . $widgetPart;
-            }
-        }
-        return $url;
+        return '';
     }
 
     /**
@@ -201,12 +124,4 @@ public function getName()
     {
         return self::EXTENSION_NAME;
     }
-
-    /**
-     * @return string
-     */
-    protected function getUniqueIdentifier()
-    {
-        return str_replace('.', '-', uniqid('', true));
-    }
 }

From f409656585946e0c47ce56c06f23848cb56af2da Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Mon, 14 Dec 2015 11:51:02 +0100
Subject: [PATCH 118/471] CRM-3997: Make all mailboxes available under System
 organization

- fix tests
---
 .../Tests/Unit/Provider/EmailActivityListProviderTest.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Provider/EmailActivityListProviderTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Provider/EmailActivityListProviderTest.php
index 00ed47953f5..07a03c39c92 100644
--- a/src/Oro/Bundle/EmailBundle/Tests/Unit/Provider/EmailActivityListProviderTest.php
+++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/Provider/EmailActivityListProviderTest.php
@@ -27,7 +27,7 @@ class EmailActivityListProviderTest extends \PHPUnit_Framework_TestCase
     protected $doctrineRegistryLink;
 
     /** @var \PHPUnit_Framework_MockObject_MockObject */
-    protected $mailboxProcessStorage;
+    protected $mailboxProcessStorageLink;
 
     protected function setUp()
     {
@@ -65,8 +65,8 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->mailboxProcessStorage = $this->getMockBuilder(
-            'Oro\Bundle\EmailBundle\Mailbox\MailboxProcessStorage'
+        $this->mailboxProcessStorageLink = $this->getMockBuilder(
+            'Oro\Bundle\EntityConfigBundle\DependencyInjection\Utils\ServiceLink'
         )
             ->disableOriginalConstructor()
             ->getMock();
@@ -80,7 +80,7 @@ protected function setUp()
             $emailThreadProvider,
             $htmlTagHelper,
             $this->securityFacadeLink,
-            $this->mailboxProcessStorage
+            $this->mailboxProcessStorageLink
         );
         $this->emailActivityListProvider->setSecurityContextLink($this->securityContextLink);
     }

From f27d931ebd4ed0e68561c2e0696fc06b0e0a45e9 Mon Sep 17 00:00:00 2001
From: Yurii Muratov <yurio@ua.fm>
Date: Mon, 14 Dec 2015 15:03:44 +0200
Subject: [PATCH 119/471] OEE-720: Fix save role with custom fields

---
 .../Resources/public/js/views/role-view.js    | 48 +++++++++++++------
 .../Resources/views/Role/update.html.twig     |  9 +++-
 2 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/src/Oro/Bundle/UserBundle/Resources/public/js/views/role-view.js b/src/Oro/Bundle/UserBundle/Resources/public/js/views/role-view.js
index f28cb06a1d8..5c3cc374b85 100644
--- a/src/Oro/Bundle/UserBundle/Resources/public/js/views/role-view.js
+++ b/src/Oro/Bundle/UserBundle/Resources/public/js/views/role-view.js
@@ -16,20 +16,18 @@ define([
             elSelector: '',
             formName: '',
             formSelector: '',
-            labelSelector: '',
             privilegesSelector: '',
             appendUsersSelector: '',
             removeUsersSelector: '',
-            tokenSelector: ''
+            fields: ''
         },
         privileges: null,
 
         $form: null,
-        $label: null,
         $privileges: null,
         $appendUsers: null,
         $removeUsers: null,
-        $token: null,
+        $fields: null,
 
         events: {
             'click': 'onSubmit'
@@ -48,12 +46,19 @@ define([
             this.options = _.defaults(options || {}, this.options);
             this.$el = $(this.options.elSelector);
             this.$form = $(this.options.formSelector);
-            this.$label = $(this.options.labelSelector);
             this.$privileges = $(this.options.privilegesSelector);
             this.$appendUsers = $(this.options.appendUsersSelector);
             this.$removeUsers = $(this.options.removeUsersSelector);
-            this.$token = $(this.options.tokenSelector);
             this.privileges = JSON.parse(this.$privileges.val());
+
+            var fields = {};
+            _.each(
+                this.options.fields,
+                function(selector, name) {
+                    fields[name] = $(selector);
+                }
+            );
+            this.$fields = fields;
         },
 
         /**
@@ -65,12 +70,11 @@ define([
             }
 
             delete this.$form;
-            delete this.$label;
             delete this.$privileges;
             delete this.$appendUsers;
             delete this.$removeUsers;
-            delete this.$token;
             delete this.privileges;
+            delete this.$fields;
 
             RoleView.__super__.dispose.call(this);
         },
@@ -79,7 +83,16 @@ define([
          * onSubmit event listener
          */
         onSubmit: function(event) {
-            if (this.$label.hasClass('error')) {
+            var hasErrors = false;
+            _.each(
+                this.$fields,
+                function(element) {
+                    if (element.hasClass('error')) {
+                        hasErrors = true;
+                    }
+                }
+            );
+            if (hasErrors) {
                 return;
             }
             var $form = this.$form;
@@ -122,11 +135,18 @@ define([
         getData: function() {
             var data = {};
 
-            data[this.options.formName + '[label]'] = this.$label.val();
-            data[this.options.formName + '[privileges]'] = JSON.stringify(this.privileges);
-            data[this.options.formName + '[appendUsers]'] = this.$appendUsers.val();
-            data[this.options.formName + '[removeUsers]'] = this.$removeUsers.val();
-            data[this.options.formName + '[_token]'] = this.$token.val();
+            var formName = this.options.formName;
+            _.each(
+                this.$fields,
+                function(element, name) {
+                    debugger;
+                    data[formName+ '[' + name +']'] = element.val();
+                }
+            );
+
+            data[formName + '[privileges]'] = JSON.stringify(this.privileges);
+            data[formName + '[appendUsers]'] = this.$appendUsers.val();
+            data[formName + '[removeUsers]'] = this.$removeUsers.val();
 
             return data;
         },
diff --git a/src/Oro/Bundle/UserBundle/Resources/views/Role/update.html.twig b/src/Oro/Bundle/UserBundle/Resources/views/Role/update.html.twig
index 1130106d760..db2de6e7e9b 100644
--- a/src/Oro/Bundle/UserBundle/Resources/views/Role/update.html.twig
+++ b/src/Oro/Bundle/UserBundle/Resources/views/Role/update.html.twig
@@ -34,15 +34,20 @@
         }) %}
     {% endif %}
     {{ UI.dropdownSaveButton({'html': html}) }}
+    {% set fields = [] %}
+    {% for name, child in form %}
+        {% if name not in ['appendUsers', 'removeUsers', 'entity', 'privileges', 'action'] %}
+            {% set fields = fields|merge({(name): '#' ~ child.vars.id}) %}
+        {% endif %}
+    {% endfor %}
     {% set options = {
         elSelector: '.btn-success.role-submit',
         formName: form.vars.name,
         formSelector: '#' ~ form.vars.id,
-        labelSelector: '#' ~ form.label.vars.id,
         privilegesSelector: '#' ~ form.privileges.vars.id,
         appendUsersSelector: '#roleAppendUsers',
         removeUsersSelector: '#roleRemoveUsers',
-        tokenSelector: '#' ~ form._token.vars.id
+        fields : fields
     } %}
     <div data-page-component-module="orouser/js/views/role-view"
          data-page-component-options="{{ options|json_encode }}">

From d5c8adeba72df96c8fa9cf204b5a932692254d3c Mon Sep 17 00:00:00 2001
From: Sergey Zhuravel <zhuravel.sergey@gmail.com>
Date: Mon, 14 Dec 2015 18:39:00 +0200
Subject: [PATCH 120/471] BB-1539: 500 error on frontend
 api/rest/latest/windows request - add tests

---
 .../Entity/AbstractWindowsState.php           |   5 +-
 .../Manager/WindowsStateManager.php           |  29 ++-
 .../Manager/WindowsStateRequestManager.php    |  19 +-
 .../WindowsStateController.php}               |  69 +++---
 .../DataFixtures/LoadWindowsStateData.php     |  31 +++
 .../Repository/WindowsStateRepositoryTest.php |  91 +++++++
 .../Unit/Manager/WindowsStateManagerTest.php  | 223 +++++++++++++++++
 .../WindowsStateRequestManagerTest.php        | 118 +++++++++
 .../Tests/Unit/Twig/WindowsExtensionTest.php  | 224 ++++++------------
 .../WindowsBundle/Twig/WindowsExtension.php   |  36 ++-
 10 files changed, 634 insertions(+), 211 deletions(-)
 rename src/Oro/Bundle/WindowsBundle/Tests/Functional/{API/RestApiTest.php => Api/WindowsStateController.php} (76%)
 create mode 100644 src/Oro/Bundle/WindowsBundle/Tests/Functional/DataFixtures/LoadWindowsStateData.php
 create mode 100644 src/Oro/Bundle/WindowsBundle/Tests/Functional/Entity/Repository/WindowsStateRepositoryTest.php
 create mode 100644 src/Oro/Bundle/WindowsBundle/Tests/Unit/Manager/WindowsStateManagerTest.php
 create mode 100644 src/Oro/Bundle/WindowsBundle/Tests/Unit/Manager/WindowsStateRequestManagerTest.php

diff --git a/src/Oro/Bundle/WindowsBundle/Entity/AbstractWindowsState.php b/src/Oro/Bundle/WindowsBundle/Entity/AbstractWindowsState.php
index 1ce3d84abec..1eff9acbf44 100644
--- a/src/Oro/Bundle/WindowsBundle/Entity/AbstractWindowsState.php
+++ b/src/Oro/Bundle/WindowsBundle/Entity/AbstractWindowsState.php
@@ -79,17 +79,18 @@ public function setData($data)
      */
     public function getData()
     {
-        return json_decode($this->data, true);
+        return $this->data;
     }
 
     /**
      * Get JSON data
      *
      * @return string
+     * @deprecated use getData method instead
      */
     public function getJsonData()
     {
-        return $this->data;
+        return json_encode($this->data);
     }
 
     /**
diff --git a/src/Oro/Bundle/WindowsBundle/Manager/WindowsStateManager.php b/src/Oro/Bundle/WindowsBundle/Manager/WindowsStateManager.php
index ecbe93923c6..a10e67d58ad 100644
--- a/src/Oro/Bundle/WindowsBundle/Manager/WindowsStateManager.php
+++ b/src/Oro/Bundle/WindowsBundle/Manager/WindowsStateManager.php
@@ -3,6 +3,7 @@
 namespace Oro\Bundle\WindowsBundle\Manager;
 
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Security\Core\User\UserInterface;
 
 use Oro\Bundle\EntityBundle\ORM\DoctrineHelper;
@@ -64,7 +65,11 @@ public function createWindowsState()
      */
     public function updateWindowsState($windowId)
     {
-        return (bool)$this->getRepository()->update($this->getUser(), $windowId, $this->requestStateManager->getData());
+        return (bool)$this->getRepository()->update(
+            $this->getUser(),
+            $this->filterId($windowId),
+            $this->requestStateManager->getData()
+        );
     }
 
     /**
@@ -73,7 +78,7 @@ public function updateWindowsState($windowId)
      */
     public function deleteWindowsState($windowId)
     {
-        return (bool)$this->getRepository()->delete($this->getUser(), $windowId);
+        return (bool)$this->getRepository()->delete($this->getUser(), $this->filterId($windowId));
     }
 
     /**
@@ -90,7 +95,7 @@ public function getWindowsStates()
      */
     public function getWindowsState($windowId)
     {
-        return $this->getRepository()->findBy(['user' => $this->getUser(), 'id' => (int)$windowId]);
+        return $this->getRepository()->findBy(['user' => $this->getUser(), 'id' => $this->filterId($windowId)]);
     }
 
     /**
@@ -101,6 +106,20 @@ protected function getRepository()
         return $this->doctrineHelper->getEntityRepository($this->className);
     }
 
+    /**
+     * @param mixed $windowId
+     * @return int
+     */
+    protected function filterId($windowId)
+    {
+        $windowId = filter_var($windowId, FILTER_VALIDATE_INT);
+        if (false === $windowId) {
+            throw new \InvalidArgumentException('Wrong $windowId type');
+        }
+
+        return $windowId;
+    }
+
     /**
      * @return UserInterface
      *
@@ -109,11 +128,11 @@ protected function getRepository()
     public function getUser()
     {
         if (null === $token = $this->tokenStorage->getToken()) {
-            return null;
+            throw new AccessDeniedException();
         }
 
         if (!is_object($user = $token->getUser())) {
-            return null;
+            throw new AccessDeniedException();
         }
 
         return $user;
diff --git a/src/Oro/Bundle/WindowsBundle/Manager/WindowsStateRequestManager.php b/src/Oro/Bundle/WindowsBundle/Manager/WindowsStateRequestManager.php
index bf77f329504..2b6d8dcb265 100644
--- a/src/Oro/Bundle/WindowsBundle/Manager/WindowsStateRequestManager.php
+++ b/src/Oro/Bundle/WindowsBundle/Manager/WindowsStateRequestManager.php
@@ -23,19 +23,23 @@ public function __construct(RequestStack $requestStack)
     public function getData()
     {
         $request = $this->requestStack->getCurrentRequest();
+        if (!$request) {
+            throw new \InvalidArgumentException('Missing $request');
+        }
+
         $data = $request->request->all();
 
         if (!array_key_exists('data', $data)) {
-            throw new \InvalidArgumentException();
+            throw new \InvalidArgumentException('Missing data in $request');
         }
 
         if (!array_key_exists('url', $data['data'])) {
-            throw new \InvalidArgumentException();
+            throw new \InvalidArgumentException('Missing url in $data');
         }
 
-        $cleanUrl = str_replace($request->server->get('SCRIPT_NAME'), '', $data['data']['url']);
+        $cleanUrl = str_replace($request->getScriptName(), '', $data['data']['url']);
         if (!$cleanUrl) {
-            throw new \InvalidArgumentException();
+            throw new \InvalidArgumentException('$cleanUrl is empty');
         }
 
         $data['data']['cleanUrl'] = $cleanUrl;
@@ -49,6 +53,7 @@ public function getData()
      */
     public function getUri(array $data)
     {
+        $uri = null;
         if (isset($data['cleanUrl'])) {
             if (isset($data['type'])) {
                 $wid = isset($data['wid']) ? $data['wid'] : $this->getUniqueIdentifier();
@@ -58,8 +63,8 @@ public function getUri(array $data)
             }
         }
 
-        if (!$uri) {
-            throw new \InvalidArgumentException();
+        if (null === $uri) {
+            throw new \InvalidArgumentException('cleanUrl is missing');
         }
 
         return $uri;
@@ -94,6 +99,6 @@ protected function getUrlWithContainer($url, $container, $wid)
      */
     protected function getUniqueIdentifier()
     {
-        return str_replace('.', '-', uniqid('windows_state', true));
+        return str_replace('.', '-', uniqid('', true));
     }
 }
diff --git a/src/Oro/Bundle/WindowsBundle/Tests/Functional/API/RestApiTest.php b/src/Oro/Bundle/WindowsBundle/Tests/Functional/Api/WindowsStateController.php
similarity index 76%
rename from src/Oro/Bundle/WindowsBundle/Tests/Functional/API/RestApiTest.php
rename to src/Oro/Bundle/WindowsBundle/Tests/Functional/Api/WindowsStateController.php
index 34239b9f714..860d7e89b76 100644
--- a/src/Oro/Bundle/WindowsBundle/Tests/Functional/API/RestApiTest.php
+++ b/src/Oro/Bundle/WindowsBundle/Tests/Functional/Api/WindowsStateController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Oro\Bundle\WindowsBundle\Tests\Functional\API;
+namespace Oro\Bundle\WindowsBundle\Tests\Functional\Api;
 
 use Symfony\Component\HttpFoundation\Response;
 
@@ -9,7 +9,7 @@
 /**
  * @dbIsolation
  */
-class RestApiTest extends WebTestCase
+class WindowsStateController extends WebTestCase
 {
     /**
      * @var array
@@ -26,18 +26,19 @@ protected function setUp()
      */
     public function testPost()
     {
-        self::$entity = array(
-            'data' => array(
+        self::$entity = [
+            'data' => [
                 'position' => '0',
-                'title' => 'Some title'
-            )
-        );
+                'title' => 'Some title',
+                'url' => '/path'
+            ],
+        ];
 
         $this->client->request(
             'POST',
             $this->getUrl('oro_api_post_windows'),
             self::$entity,
-            array(),
+            [],
             $this->generateWsseAuthHeader()
         );
 
@@ -48,10 +49,10 @@ public function testPost()
 
         $resultJson = json_decode($result->getContent(), true);
 
-        $this->assertArrayHasKey("id", $resultJson);
-        $this->assertGreaterThan(0, $resultJson["id"]);
+        $this->assertArrayHasKey('id', $resultJson);
+        $this->assertGreaterThan(0, $resultJson['id']);
 
-        self::$entity['id'] = $resultJson["id"];
+        self::$entity['id'] = $resultJson['id'];
     }
 
     /**
@@ -67,9 +68,9 @@ public function testPut()
 
         $this->client->request(
             'PUT',
-            $this->getUrl('oro_api_put_windows', array('windowId' => self::$entity['id'])),
+            $this->getUrl('oro_api_put_windows', ['windowId' => self::$entity['id']]),
             self::$entity,
-            array(),
+            [],
             $this->generateWsseAuthHeader()
         );
 
@@ -95,8 +96,8 @@ public function testGet()
         $this->client->request(
             'GET',
             $this->getUrl('oro_api_get_windows'),
-            array(),
-            array(),
+            [],
+            [],
             $this->generateWsseAuthHeader()
         );
 
@@ -122,9 +123,9 @@ public function testDelete($itemType)
 
         $this->client->request(
             'DELETE',
-            $this->getUrl('oro_api_delete_windows', array('windowId' => self::$entity['id'])),
-            array(),
-            array(),
+            $this->getUrl('oro_api_delete_windows', ['windowId' => self::$entity['id']]),
+            [],
+            [],
             $this->generateWsseAuthHeader()
         );
 
@@ -145,9 +146,9 @@ public function testNotFound()
 
         $this->client->request(
             'PUT',
-            $this->getUrl('oro_api_put_windows', array('windowId' => self::$entity['id'])),
+            $this->getUrl('oro_api_put_windows', ['windowId' => self::$entity['id']]),
             self::$entity,
-            array(),
+            [],
             $this->generateWsseAuthHeader()
         );
 
@@ -159,9 +160,9 @@ public function testNotFound()
 
         $this->client->request(
             'DELETE',
-            $this->getUrl('oro_api_delete_windows', array('windowId' => self::$entity['id'])),
-            array(),
-            array(),
+            $this->getUrl('oro_api_delete_windows', ['windowId' => self::$entity['id']]),
+            [],
+            [],
             $this->generateWsseAuthHeader()
         );
 
@@ -180,12 +181,12 @@ public function testUnauthorized()
     {
         $this->assertNotEmpty(self::$entity);
 
-        $requests = array(
-            'GET'    => $this->getUrl('oro_api_get_windows'),
-            'POST'   => $this->getUrl('oro_api_post_windows'),
-            'PUT'    => $this->getUrl('oro_api_put_windows', array('windowId' => self::$entity['id'])),
-            'DELETE' => $this->getUrl('oro_api_delete_windows', array('windowId' => self::$entity['id'])),
-        );
+        $requests = [
+            'GET' => $this->getUrl('oro_api_get_windows'),
+            'POST' => $this->getUrl('oro_api_post_windows'),
+            'PUT' => $this->getUrl('oro_api_put_windows', ['windowId' => self::$entity['id']]),
+            'DELETE' => $this->getUrl('oro_api_delete_windows', ['windowId' => self::$entity['id']]),
+        ];
 
         foreach ($requests as $requestType => $url) {
             $this->client->request($requestType, $url);
@@ -208,17 +209,17 @@ public function testEmptyBody()
     {
         $this->assertNotEmpty(self::$entity);
 
-        $requests = array(
+        $requests = [
             'POST' => $this->getUrl('oro_api_post_windows'),
-            'PUT'  => $this->getUrl('oro_api_put_windows', array('windowId' => self::$entity['id'])),
-        );
+            'PUT' => $this->getUrl('oro_api_put_windows', ['windowId' => self::$entity['id']]),
+        ];
 
         foreach ($requests as $requestType => $url) {
             $this->client->request(
                 $requestType,
                 $url,
-                array(),
-                array(),
+                [],
+                [],
                 $this->generateWsseAuthHeader()
             );
 
diff --git a/src/Oro/Bundle/WindowsBundle/Tests/Functional/DataFixtures/LoadWindowsStateData.php b/src/Oro/Bundle/WindowsBundle/Tests/Functional/DataFixtures/LoadWindowsStateData.php
new file mode 100644
index 00000000000..83b472da28b
--- /dev/null
+++ b/src/Oro/Bundle/WindowsBundle/Tests/Functional/DataFixtures/LoadWindowsStateData.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Oro\Bundle\WindowsBundle\Tests\Functional\DataFixtures;
+
+use Doctrine\Common\DataFixtures\AbstractFixture;
+use Doctrine\Common\Persistence\ObjectManager;
+
+use Oro\Bundle\WindowsBundle\Entity\WindowsState;
+
+class LoadWindowsStateData extends AbstractFixture
+{
+    /** {@inheritdoc} */
+    public function load(ObjectManager $manager)
+    {
+        $user = $manager->getRepository('OroUserBundle:User')->findOneBy(['username' => 'admin']);
+
+        $state = new WindowsState();
+        $state
+            ->setUser($user)
+            ->setData(
+                [
+                    'cleanUrl' => '/path',
+                ]
+            );
+
+        $manager->persist($state);
+        $manager->flush();
+
+        $this->setReference('windows_state.admin', $state);
+    }
+}
diff --git a/src/Oro/Bundle/WindowsBundle/Tests/Functional/Entity/Repository/WindowsStateRepositoryTest.php b/src/Oro/Bundle/WindowsBundle/Tests/Functional/Entity/Repository/WindowsStateRepositoryTest.php
new file mode 100644
index 00000000000..789555e9dce
--- /dev/null
+++ b/src/Oro/Bundle/WindowsBundle/Tests/Functional/Entity/Repository/WindowsStateRepositoryTest.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace Oro\Bundle\WindowsBundle\Tests\Functional\Entity\Repository;
+
+use Oro\Bundle\TestFrameworkBundle\Test\WebTestCase;
+use Oro\Bundle\UserBundle\Entity\User;
+use Oro\Bundle\WindowsBundle\Entity\Repository\WindowsStateRepository;
+use Oro\Bundle\WindowsBundle\Entity\WindowsState;
+
+/**
+ * @dbIsolation
+ */
+class WindowsStateRepositoryTest extends WebTestCase
+{
+    protected function setUp()
+    {
+        $this->initClient();
+
+        $this->loadFixtures(
+            [
+                'Oro\Bundle\WindowsBundle\Tests\Functional\DataFixtures\LoadWindowsStateData',
+                'Oro\Bundle\UserBundle\Tests\Functional\DataFixtures\LoadUserData',
+            ]
+        );
+    }
+
+    public function testUpdate()
+    {
+        /** @var WindowsState $state */
+        $state = $this->getReference('windows_state.admin');
+
+        $registry = $this->getContainer()->get('doctrine');
+
+        /** @var WindowsStateRepository $repo */
+        $repo = $registry->getRepository('OroWindowsBundle:WindowsState');
+
+        $this->assertEquals(true, $repo->update($state->getUser(), $state->getId(), ['cleanUrl' => '/path?a=1']));
+
+        $registry->getManager()->clear();
+
+        /** @var WindowsState $updatedState */
+        $updatedState = $repo->find($state->getId());
+
+        $this->assertNotEquals($state->getData(), $updatedState->getData());
+    }
+
+    public function testUpdateAnotherUser()
+    {
+        /** @var WindowsState $state */
+        $state = $this->getReference('windows_state.admin');
+        /** @var User $user */
+        $user = $this->getReference('simple_user');
+        $registry = $this->getContainer()->get('doctrine');
+
+        /** @var WindowsStateRepository $repo */
+        $repo = $registry->getRepository('OroWindowsBundle:WindowsState');
+
+        $this->assertEquals(false, $repo->update($user, $state->getId(), ['cleanUrl' => '/path?a=1']));
+    }
+
+    public function testDelete()
+    {
+        /** @var WindowsState $state */
+        $state = $this->getReference('windows_state.admin');
+
+        $registry = $this->getContainer()->get('doctrine');
+
+        /** @var WindowsStateRepository $repo */
+        $repo = $registry->getRepository('OroWindowsBundle:WindowsState');
+
+        $this->assertEquals(true, $repo->delete($state->getUser(), $state->getId()));
+
+        $registry->getManager()->clear();
+
+        $this->assertNull($repo->find($state->getId()));
+    }
+
+    public function testDeleteAnotherUser()
+    {
+        /** @var WindowsState $state */
+        $state = $this->getReference('windows_state.admin');
+        /** @var User $user */
+        $user = $this->getReference('simple_user');
+        $registry = $this->getContainer()->get('doctrine');
+
+        /** @var WindowsStateRepository $repo */
+        $repo = $registry->getRepository('OroWindowsBundle:WindowsState');
+
+        $this->assertEquals(false, $repo->delete($user, $state->getId()));
+    }
+}
diff --git a/src/Oro/Bundle/WindowsBundle/Tests/Unit/Manager/WindowsStateManagerTest.php b/src/Oro/Bundle/WindowsBundle/Tests/Unit/Manager/WindowsStateManagerTest.php
new file mode 100644
index 00000000000..b89ba105a55
--- /dev/null
+++ b/src/Oro/Bundle/WindowsBundle/Tests/Unit/Manager/WindowsStateManagerTest.php
@@ -0,0 +1,223 @@
+<?php
+
+namespace Oro\Bundle\WindowsBundle\Tests\Manager;
+
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+
+use Oro\Bundle\EntityBundle\ORM\DoctrineHelper;
+use Oro\Bundle\UserBundle\Entity\User;
+use Oro\Bundle\WindowsBundle\Entity\WindowsState;
+use Oro\Bundle\WindowsBundle\Manager\WindowsStateManager;
+use Oro\Bundle\WindowsBundle\Manager\WindowsStateRequestManager;
+
+class WindowsStateManagerTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var \PHPUnit_Framework_MockObject_MockObject|TokenStorageInterface */
+    protected $tokenStorage;
+    /** @var \PHPUnit_Framework_MockObject_MockObject|DoctrineHelper */
+    protected $doctrineHelper;
+
+    /** @var \PHPUnit_Framework_MockObject_MockObject|WindowsStateRequestManager */
+    protected $requestStateManager;
+
+    /** @var WindowsStateManager */
+    protected $manager;
+
+    protected function setUp()
+    {
+        $this->tokenStorage = $this
+            ->getMock('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface');
+
+        $this->doctrineHelper = $this->getMockBuilder('Oro\Bundle\EntityBundle\ORM\DoctrineHelper')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->requestStateManager = $this
+            ->getMockBuilder('Oro\Bundle\WindowsBundle\Manager\WindowsStateRequestManager')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->manager = new WindowsStateManager(
+            $this->tokenStorage,
+            $this->doctrineHelper,
+            $this->requestStateManager,
+            'Oro\Bundle\WindowsBundle\Entity\WindowsState'
+        );
+    }
+
+    public function testCreateWindowsState()
+    {
+        $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+        $token->expects($this->once())->method('getUser')->willReturn(new User());
+        $this->tokenStorage->expects($this->once())->method('getToken')->willReturn($token);
+
+        $em = $this->getMock('Doctrine\ORM\EntityManagerInterface');
+
+        $state = new WindowsState();
+        $this->doctrineHelper->expects($this->once())->method('createEntityInstance')->willReturn($state);
+        $this->doctrineHelper->expects($this->once())->method('getEntityManagerForClass')->willReturn($em);
+
+        $em->expects($this->once())->method('persist')->with($state);
+        $em->expects($this->once())->method('flush')->with($state);
+
+        $this->requestStateManager->expects($this->once())->method('getData')->willReturn([]);
+        $this->manager->createWindowsState();
+    }
+
+    public function testUpdateWindowState()
+    {
+        $windowId = 42;
+        $user = new User();
+        $data = ['url' => '/test'];
+
+        $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+        $token->expects($this->once())->method('getUser')->willReturn($user);
+        $this->tokenStorage->expects($this->once())->method('getToken')->willReturn($token);
+
+        $repo = $this->getMockBuilder('Oro\Bundle\WindowsBundle\Entity\Repository\WindowsStateRepository')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->doctrineHelper->expects($this->once())->method('getEntityRepository')->willReturn($repo);
+        $this->requestStateManager->expects($this->once())->method('getData')->willReturn($data);
+
+        $repo->expects($this->once())->method('update')->with($user, $windowId, $data);
+
+        $this->manager->updateWindowsState($windowId);
+    }
+
+    public function testDeleteWindowsState()
+    {
+        $user = new User();
+        $windowId = 42;
+
+        $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+        $token->expects($this->once())->method('getUser')->willReturn($user);
+        $this->tokenStorage->expects($this->once())->method('getToken')->willReturn($token);
+
+        $repo = $this->getMockBuilder('Oro\Bundle\WindowsBundle\Entity\Repository\WindowsStateRepository')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->doctrineHelper->expects($this->once())->method('getEntityRepository')->willReturn($repo);
+
+        $repo->expects($this->once())->method('delete')->with($user, $windowId);
+
+        $this->requestStateManager->expects($this->never())->method($this->anything());
+        $this->manager->deleteWindowsState($windowId);
+    }
+
+    public function testGetWindowsStates()
+    {
+        $user = new User();
+
+        $windowStateFoo = $this->createWindowState(['cleanUrl' => 'foo']);
+        $windowStateBar = $this->createWindowState(['cleanUrl' => 'foo']);
+
+        $windowStates = [$windowStateFoo, $windowStateBar];
+
+        $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+        $token->expects($this->once())->method('getUser')->willReturn($user);
+        $this->tokenStorage->expects($this->once())->method('getToken')->willReturn($token);
+
+        $repo = $this->getMockBuilder('Oro\Bundle\WindowsBundle\Entity\Repository\WindowsStateRepository')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->doctrineHelper->expects($this->once())->method('getEntityRepository')->willReturn($repo);
+
+        $repo->expects($this->once())->method('findBy')->with(['user' => $user])->willReturn($windowStates);
+
+        $this->requestStateManager->expects($this->never())->method($this->anything());
+        $this->assertSame($windowStates, $this->manager->getWindowsStates());
+    }
+
+    public function testGetWindowsState()
+    {
+        $user = new User();
+        $windowStateId = 42;
+
+        $windowState = $this->createWindowState(['cleanUrl' => 'foo']);
+
+        $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+        $token->expects($this->once())->method('getUser')->willReturn($user);
+        $this->tokenStorage->expects($this->once())->method('getToken')->willReturn($token);
+
+        $repo = $this->getMockBuilder('Oro\Bundle\WindowsBundle\Entity\Repository\WindowsStateRepository')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->doctrineHelper->expects($this->once())->method('getEntityRepository')->willReturn($repo);
+
+        $repo->expects($this->once())->method('findBy')->with(['user' => $user, 'id' => $windowStateId])
+            ->willReturn($windowState);
+
+        $this->requestStateManager->expects($this->never())->method($this->anything());
+        $this->assertSame($windowState, $this->manager->getWindowsState($windowStateId));
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Wrong $windowId type
+     */
+    public function testFilterId()
+    {
+        $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+        $token->expects($this->once())->method('getUser')->willReturn(new User());
+        $this->tokenStorage->expects($this->once())->method('getToken')->willReturn($token);
+
+        $repo = $this->getMockBuilder('Oro\Bundle\WindowsBundle\Entity\Repository\WindowsStateRepository')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->doctrineHelper->expects($this->once())->method('getEntityRepository')->willReturn($repo);
+
+        $this->manager->getWindowsState('bbb');
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Security\Core\Exception\AccessDeniedException
+     */
+    public function testUserEmptyToken()
+    {
+        $this->tokenStorage->expects($this->once())->method('getToken')->willReturn(null);
+
+        $repo = $this->getMockBuilder('Oro\Bundle\WindowsBundle\Entity\Repository\WindowsStateRepository')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->doctrineHelper->expects($this->once())->method('getEntityRepository')->willReturn($repo);
+
+        $this->manager->getWindowsState(42);
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Security\Core\Exception\AccessDeniedException
+     */
+    public function testUserEmptyUser()
+    {
+        $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+        $token->expects($this->once())->method('getUser')->willReturn(null);
+        $this->tokenStorage->expects($this->once())->method('getToken')->willReturn($token);
+
+        $repo = $this->getMockBuilder('Oro\Bundle\WindowsBundle\Entity\Repository\WindowsStateRepository')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->doctrineHelper->expects($this->once())->method('getEntityRepository')->willReturn($repo);
+
+        $this->manager->getWindowsState(42);
+    }
+
+    /**
+     * @param array $data
+     * @return WindowsState
+     */
+    protected function createWindowState(array $data = [])
+    {
+        $state = new WindowsState();
+        $state->setData($data);
+
+        return $state;
+    }
+}
diff --git a/src/Oro/Bundle/WindowsBundle/Tests/Unit/Manager/WindowsStateRequestManagerTest.php b/src/Oro/Bundle/WindowsBundle/Tests/Unit/Manager/WindowsStateRequestManagerTest.php
new file mode 100644
index 00000000000..3088edb3882
--- /dev/null
+++ b/src/Oro/Bundle/WindowsBundle/Tests/Unit/Manager/WindowsStateRequestManagerTest.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace Oro\Bundle\WindowsBundle\Tests\Manager;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+use Oro\Bundle\WindowsBundle\Manager\WindowsStateRequestManager;
+
+class WindowsStateRequestManagerTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var WindowsStateRequestManager */
+    protected $manager;
+
+    /** @var \PHPUnit_Framework_MockObject_MockObject|RequestStack */
+    protected $requestStack;
+
+    protected function setUp()
+    {
+        $this->requestStack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->manager = new WindowsStateRequestManager($this->requestStack);
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Missing $request
+     */
+    public function testGetDataMissingRequest()
+    {
+        $this->requestStack->expects($this->once())->method('getCurrentRequest')->willReturn(null);
+        $this->manager->getData();
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Missing data in $request
+     */
+    public function testGetDataMissingData()
+    {
+        $request = new Request();
+        $this->requestStack->expects($this->once())->method('getCurrentRequest')->willReturn($request);
+        $this->manager->getData();
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Missing url in $data
+     */
+    public function testGetDataMissingUrl()
+    {
+        $request = new Request([], ['data' => []]);
+        $this->requestStack->expects($this->once())->method('getCurrentRequest')->willReturn($request);
+        $this->manager->getData();
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage $cleanUrl is empty
+     */
+    public function testCleanUrlIsEmpty()
+    {
+        $request = new Request([], ['data' => ['url' => 'localhost']], [], [], [], ['SCRIPT_NAME' => 'localhost']);
+        $this->requestStack->expects($this->once())->method('getCurrentRequest')->willReturn($request);
+        $this->manager->getData();
+    }
+
+    public function testGetData()
+    {
+        $request = new Request([], ['data' => ['url' => 'localhost/path']], [], [], [], ['SCRIPT_NAME' => 'localhost']);
+        $this->requestStack->expects($this->once())->method('getCurrentRequest')->willReturn($request);
+        $this->assertEquals(['url' => 'localhost/path', 'cleanUrl' => '/path'], $this->manager->getData());
+    }
+
+    /**
+     * @dataProvider uriDataProvider
+     * @param string $expected
+     * @param array $data
+     */
+    public function testGetUri($expected, array $data)
+    {
+        $this->assertStringStartsWith($expected, $this->manager->getUri($data));
+    }
+
+    /**
+     * @return array
+     */
+    public function uriDataProvider()
+    {
+        return [
+            'simple path' => ['/path', ['cleanUrl' => '/path']],
+            'autogenerated wid' => ['/path?_widgetContainer=form&_wid=', ['cleanUrl' => '/path', 'type' => 'form']],
+            'predefined wid' => [
+                '/path?_widgetContainer=form&_wid=123456',
+                ['cleanUrl' => '/path', 'type' => 'form', 'wid' => '123456'],
+            ],
+            'url contains container' => [
+                '/path?_widgetContainer=container',
+                ['cleanUrl' => '/path?_widgetContainer=container', 'type' => 'form', 'wid' => '123456'],
+            ],
+            'query' => [
+                '/path?param=value&_widgetContainer=form&_wid=123456',
+                ['cleanUrl' => '/path?param=value', 'type' => 'form', 'wid' => '123456'],
+            ],
+        ];
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage cleanUrl is missing
+     */
+    public function testDataEmpty()
+    {
+        $this->manager->getUri([]);
+    }
+}
diff --git a/src/Oro/Bundle/WindowsBundle/Tests/Unit/Twig/WindowsExtensionTest.php b/src/Oro/Bundle/WindowsBundle/Tests/Unit/Twig/WindowsExtensionTest.php
index 176ae1f1a24..54fc69817ca 100644
--- a/src/Oro/Bundle/WindowsBundle/Tests/Unit/Twig/WindowsExtensionTest.php
+++ b/src/Oro/Bundle/WindowsBundle/Tests/Unit/Twig/WindowsExtensionTest.php
@@ -2,8 +2,12 @@
 
 namespace Oro\Bundle\WindowsBundle\Tests\Twig;
 
+use Symfony\Bridge\Twig\Extension\HttpKernelExtension;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 
+use Oro\Bundle\WindowsBundle\Manager\WindowsStateManager;
+use Oro\Bundle\WindowsBundle\Manager\WindowsStateRequestManager;
 use Oro\Bundle\WindowsBundle\Entity\WindowsState;
 use Oro\Bundle\WindowsBundle\Twig\WindowsExtension;
 
@@ -15,31 +19,34 @@ class WindowsExtensionTest extends \PHPUnit_Framework_TestCase
     protected $extension;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject $environment
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Twig_Environment
      */
     protected $environment;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject|WindowsStateManager
      */
-    protected $securityContext;
+    protected $stateManager;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject|WindowsStateRequestManager
      */
-    protected $entityManager;
+    protected $requestStateManager;
 
     protected function setUp()
     {
         $this->environment = $this->getMockBuilder('Twig_Environment')
             ->disableOriginalConstructor()
             ->getMock();
-        $this->securityContext = $this->getMockBuilder('Symfony\Component\Security\Core\SecurityContextInterface')
+        $this->stateManager = $this->getMockBuilder('Oro\Bundle\WindowsBundle\Manager\WindowsStateManager')
+            ->disableOriginalConstructor()
             ->getMock();
-        $this->entityManager = $this->getMockBuilder('Doctrine\ORM\EntityManager')
+        $this->requestStateManager = $this
+            ->getMockBuilder('Oro\Bundle\WindowsBundle\Manager\WindowsStateRequestManager')
+            ->setMethods(['getData'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->extension = new WindowsExtension($this->securityContext, $this->entityManager);
+        $this->extension = new WindowsExtension($this->stateManager, $this->requestStateManager);
     }
 
     public function testGetFunctions()
@@ -57,136 +64,35 @@ public function testGetName()
 
     public function testRenderNoUser()
     {
+        $this->stateManager->expects($this->once())->method('getWindowsStates')
+            ->willThrowException(new AccessDeniedException());
+
         $this->assertEmpty($this->extension->render($this->environment));
     }
 
     public function testRender()
     {
-        $token = $this->getMockBuilder('stdClass')
-            ->setMethods(array('getUser'))
-            ->getMock();
-
-        $this->securityContext->expects($this->once())
-            ->method('getToken')
-            ->will($this->returnValue($token));
-
-        $user = $this->getMock('stdClass');
-
-        $token->expects($this->once())
-            ->method('getUser')
-            ->will($this->returnValue($user));
-
-        $windowStateFoo = $this->createWindowState(array('cleanUrl' => 'foo'));
-        $windowStateBar = $this->createWindowState(array('cleanUrl' => 'foo'));
-
-        $userWindowStates = array($windowStateFoo, $windowStateBar);
-
-        $repository = $this->getMock('Doctrine\Common\Persistence\ObjectRepository');
-        $repository->expects($this->once())
-            ->method('findBy')
-            ->with(array('user' => $user))
-            ->will($this->returnValue($userWindowStates));
-
-        $this->entityManager->expects($this->once())
-            ->method('getRepository')
-            ->with('OroWindowsBundle:WindowsState')
-            ->will($this->returnValue($repository));
-
-        $this->entityManager->expects($this->never())->method('remove');
-        $this->entityManager->expects($this->never())->method('flush');
-
-        $expectedOutput = 'RENDERED';
-        $this->environment->expects($this->once())
-            ->method('render')
-            ->with(
-                'OroWindowsBundle::states.html.twig',
-                array('windowStates' => array($windowStateFoo, $windowStateBar))
-            )
-            ->will($this->returnValue($expectedOutput));
-
-        $this->assertEquals($expectedOutput, $this->extension->render($this->environment));
-    }
-
-    public function testRenderWithRemoveInvalidStates()
-    {
-        $token = $this->getMockBuilder('stdClass')
-            ->setMethods(array('getUser'))
-            ->getMock();
-
-        $this->securityContext->expects($this->once())
-            ->method('getToken')
-            ->will($this->returnValue($token));
-
-        $user = $this->getMock('stdClass');
-
-        $token->expects($this->once())
-            ->method('getUser')
-            ->will($this->returnValue($user));
-
-        $normalWindowState = $this->createWindowState(array('cleanUrl' => 'foo'));
-        $badWindowState = $this->createWindowState(array('url' => 'foo'));
-        $emptyWindowState = $this->createWindowState();
-
-        $userWindowStates = array($normalWindowState, $badWindowState, $emptyWindowState);
-
-        $repository = $this->getMock('Doctrine\Common\Persistence\ObjectRepository');
-        $repository->expects($this->once())
-            ->method('findBy')
-            ->with(array('user' => $user))
-            ->will($this->returnValue($userWindowStates));
+        $windowStateFoo = $this->createWindowState(['cleanUrl' => 'foo']);
+        $windowStateBar = $this->createWindowState(['cleanUrl' => 'foo']);
 
-        $this->entityManager->expects($this->at(0))
-            ->method('getRepository')
-            ->with('OroWindowsBundle:WindowsState')
-            ->will($this->returnValue($repository));
+        $windowStates = [$windowStateFoo, $windowStateBar];
 
-        $this->entityManager->expects($this->at(1))
-            ->method('remove')
-            ->with($badWindowState);
-
-        $this->entityManager->expects($this->at(2))
-            ->method('remove')
-            ->with($emptyWindowState);
-
-        $this->entityManager->expects($this->at(3))
-            ->method('flush')
-            ->with(array($badWindowState, $emptyWindowState));
+        $this->stateManager->expects($this->once())
+            ->method('getWindowsStates')
+            ->will($this->returnValue($windowStates));
 
         $expectedOutput = 'RENDERED';
         $this->environment->expects($this->once())
             ->method('render')
             ->with(
                 'OroWindowsBundle::states.html.twig',
-                array('windowStates' => array($normalWindowState))
+                ['windowStates' => [$windowStateFoo, $windowStateBar]]
             )
             ->will($this->returnValue($expectedOutput));
 
         $this->assertEquals($expectedOutput, $this->extension->render($this->environment));
-    }
-
-    public function testRenderWithoutUser()
-    {
-        $token = $this->getMockBuilder('stdClass')
-            ->setMethods(array('getUser'))
-            ->getMock();
-
-        $this->securityContext->expects($this->once())
-            ->method('getToken')
-            ->will($this->returnValue($token));
-
-        $this->entityManager->expects($this->never())->method($this->anything());
-
-        $this->assertEquals('', $this->extension->render($this->environment));
-    }
-
-    public function testRenderWithoutToken()
-    {
-        $this->securityContext->expects($this->once())
-            ->method('getToken')
-            ->will($this->returnValue(null));
-
-        $this->entityManager->expects($this->never())->method($this->anything());
 
+        // no need to render twice
         $this->assertEquals('', $this->extension->render($this->environment));
     }
 
@@ -198,7 +104,7 @@ public function testRenderWithoutToken()
      */
     public function testRenderFragment($cleanUrl, $type, $expectedUrl)
     {
-        $windowState = $this->createWindowState(array('cleanUrl' => $cleanUrl, 'type' => $type));
+        $windowState = $this->createWindowState(['cleanUrl' => $cleanUrl, 'type' => $type]);
 
         $httpKernelExtension = $this->getHttpKernelExtensionMock();
 
@@ -216,14 +122,12 @@ function ($url) use ($expectedUrl) {
                         $count = 0;
                         $cleanUrl = preg_replace('/&_wid=([a-z0-9]*)-([a-z0-9]*)/', '', $url, -1, $count);
 
-                        return ($count === 1 && $cleanUrl == $expectedUrl);
+                        return ($count === 1 && $cleanUrl === $expectedUrl);
                     }
                 )
             )
             ->will($this->returnValue($expectedOutput));
 
-        $this->entityManager->expects($this->never())->method($this->anything());
-
         $this->assertEquals($expectedOutput, $this->extension->renderFragment($this->environment, $windowState));
         $this->assertTrue($windowState->isRenderedSuccessfully());
     }
@@ -233,29 +137,29 @@ function ($url) use ($expectedUrl) {
      */
     public function renderFragmentDataProvider()
     {
-        return array(
-            'url_without_parameters' => array(
-                'widgetUrl'         => '/user/create',
-                'widgetType'        => 'test',
-                'expectedWidgetUrl' => '/user/create?_widgetContainer=test'
-            ),
-            'url_with_parameters' => array(
-                'widgetUrl'         => '/user/create?id=1',
-                'widgetType'        => 'test',
-                'expectedWidgetUrl' => '/user/create?id=1&_widgetContainer=test'
-            ),
-            'url_with_parameters_and_fragment' => array(
-                'widgetUrl'         => '/user/create?id=1#group=date',
-                'widgetType'        => 'test',
-                'expectedWidgetUrl' => '/user/create?id=1&_widgetContainer=test#group=date'
-            ),
-        );
+        return [
+            'url_without_parameters' => [
+                'widgetUrl' => '/user/create',
+                'widgetType' => 'test',
+                'expectedWidgetUrl' => '/user/create?_widgetContainer=test',
+            ],
+            'url_with_parameters' => [
+                'widgetUrl' => '/user/create?id=1',
+                'widgetType' => 'test',
+                'expectedWidgetUrl' => '/user/create?id=1&_widgetContainer=test',
+            ],
+            'url_with_parameters_and_fragment' => [
+                'widgetUrl' => '/user/create?id=1#group=date',
+                'widgetType' => 'test',
+                'expectedWidgetUrl' => '/user/create?id=1&_widgetContainer=test#group=date',
+            ],
+        ];
     }
 
     public function testRenderFragmentWithNotFoundHttpException()
     {
         $cleanUrl = '/foo/bar';
-        $windowState = $this->createWindowState(array('cleanUrl' => $cleanUrl));
+        $windowState = $this->createWindowState(['cleanUrl' => $cleanUrl]);
 
         $httpKernelExtension = $this->getHttpKernelExtensionMock();
 
@@ -269,13 +173,9 @@ public function testRenderFragmentWithNotFoundHttpException()
             ->with($cleanUrl)
             ->will($this->throwException(new NotFoundHttpException()));
 
-        $this->entityManager->expects($this->at(0))
-            ->method('remove')
-            ->with($windowState);
-
-        $this->entityManager->expects($this->at(1))
-            ->method('flush')
-            ->with($windowState);
+        $this->stateManager->expects($this->once())
+            ->method('deleteWindowsState')
+            ->with($windowState->getId());
 
         $this->assertEquals('', $this->extension->renderFragment($this->environment, $windowState));
         $this->assertFalse($windowState->isRenderedSuccessfully());
@@ -288,7 +188,7 @@ public function testRenderFragmentWithNotFoundHttpException()
     public function testRenderFragmentWithGenericException()
     {
         $cleanUrl = '/foo/bar';
-        $windowState = $this->createWindowState(array('cleanUrl' => $cleanUrl));
+        $windowState = $this->createWindowState(['cleanUrl' => $cleanUrl]);
 
         $httpKernelExtension = $this->getHttpKernelExtensionMock();
 
@@ -310,19 +210,39 @@ public function testRenderFragmentWithEmptyCleanUrl()
         $windowState = $this->createWindowState();
 
         $this->environment->expects($this->never())->method($this->anything());
-        $this->entityManager->expects($this->never())->method($this->anything());
 
         $this->assertEquals('', $this->extension->renderFragment($this->environment, $windowState));
         $this->assertFalse($windowState->isRenderedSuccessfully());
     }
 
-    protected function createWindowState($data = null)
+    public function testRenderFragmentWithoutUser()
+    {
+        $windowState = $this->createWindowState();
+
+        $this->environment->expects($this->never())->method($this->anything());
+
+        $this->stateManager->expects($this->once())->method('deleteWindowsState')
+            ->willThrowException(new AccessDeniedException());
+
+        $this->assertEquals('', $this->extension->renderFragment($this->environment, $windowState));
+        $this->assertFalse($windowState->isRenderedSuccessfully());
+    }
+
+    /**
+     * @param array $data
+     * @return WindowsState
+     */
+    protected function createWindowState(array $data = [])
     {
         $state = new WindowsState();
         $state->setData($data);
+
         return $state;
     }
 
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject|HttpKernelExtension
+     */
     protected function getHttpKernelExtensionMock()
     {
         return $this->getMockBuilder('Symfony\Bridge\Twig\Extension\HttpKernelExtension')
diff --git a/src/Oro/Bundle/WindowsBundle/Twig/WindowsExtension.php b/src/Oro/Bundle/WindowsBundle/Twig/WindowsExtension.php
index b4a66818b62..f3abe0babd1 100644
--- a/src/Oro/Bundle/WindowsBundle/Twig/WindowsExtension.php
+++ b/src/Oro/Bundle/WindowsBundle/Twig/WindowsExtension.php
@@ -4,6 +4,7 @@
 
 use Symfony\Bridge\Twig\Extension\HttpKernelExtension;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 
 use Oro\Bundle\WindowsBundle\Entity\AbstractWindowsState;
 use Oro\Bundle\WindowsBundle\Manager\WindowsStateManager;
@@ -39,9 +40,7 @@ public function __construct(
     }
 
     /**
-     * Returns a list of functions to add to the existing list.
-     *
-     * @return array An array of functions
+     * {@inheritdoc}
      */
     public function getFunctions()
     {
@@ -80,9 +79,15 @@ public function render(\Twig_Environment $environment)
 
         $this->rendered = true;
 
+        try {
+            $windowsStates = $this->windowsStateManager->getWindowsStates();
+        } catch (AccessDeniedException $e) {
+            $windowsStates = [];
+        }
+
         return $environment->render(
             'OroWindowsBundle::states.html.twig',
-            ['windowStates' => $this->windowsStateManager->getWindowsStates()]
+            ['windowStates' => $windowsStates]
         );
     }
 
@@ -96,6 +101,8 @@ public function render(\Twig_Environment $environment)
      */
     public function renderFragment(\Twig_Environment $environment, AbstractWindowsState $windowState)
     {
+        $result = '';
+        $scheduleDelete = false;
         $windowState->setRenderedSuccessfully(false);
 
         try {
@@ -103,22 +110,29 @@ public function renderFragment(\Twig_Environment $environment, AbstractWindowsSt
 
             /** @var HttpKernelExtension $httpKernelExtension */
             $httpKernelExtension = $environment->getExtension('http_kernel');
+            $result = $httpKernelExtension->renderFragment($uri);
             $windowState->setRenderedSuccessfully(true);
 
-            return $httpKernelExtension->renderFragment($uri);
+            return $result;
         } catch (NotFoundHttpException $e) {
-            $this->windowsStateManager->deleteWindowsState($windowState->getId());
+            $scheduleDelete = true;
         } catch (\InvalidArgumentException $e) {
-            $this->windowsStateManager->deleteWindowsState($windowState->getId());
+            $scheduleDelete = true;
         }
 
-        return '';
+        if ($scheduleDelete) {
+            try {
+                $this->windowsStateManager->deleteWindowsState($windowState->getId());
+            } catch (AccessDeniedException $e) {
+                return $result;
+            }
+        }
+
+        return $result;
     }
 
     /**
-     * Returns the name of the extension.
-     *
-     * @return string The extension name
+     * {@inheritdoc}
      */
     public function getName()
     {

From c81897d279273267a551b152de0c3a9e12c2dae0 Mon Sep 17 00:00:00 2001
From: Sergey Zhuravel <zhuravel.sergey@gmail.com>
Date: Mon, 14 Dec 2015 19:37:18 +0200
Subject: [PATCH 121/471] BB-1539: 500 error on frontend
 api/rest/latest/windows request - fix migrations

---
 .../Schema/OroWindowsBundleInstaller.php      | 65 -------------------
 .../Schema/v1_1/OroWindowsBundle.php          | 26 +++++++-
 2 files changed, 24 insertions(+), 67 deletions(-)
 delete mode 100644 src/Oro/Bundle/WindowsBundle/Migrations/Schema/OroWindowsBundleInstaller.php

diff --git a/src/Oro/Bundle/WindowsBundle/Migrations/Schema/OroWindowsBundleInstaller.php b/src/Oro/Bundle/WindowsBundle/Migrations/Schema/OroWindowsBundleInstaller.php
deleted file mode 100644
index 7e7548e4a46..00000000000
--- a/src/Oro/Bundle/WindowsBundle/Migrations/Schema/OroWindowsBundleInstaller.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-namespace Oro\Bundle\WindowsBundle\Migrations\Schema;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\DBAL\Types\Type;
-
-use Oro\Bundle\MigrationBundle\Migration\Installation;
-use Oro\Bundle\MigrationBundle\Migration\QueryBag;
-
-class OroWindowsBundleInstaller implements Installation
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getMigrationVersion()
-    {
-        return 'v1_1';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function up(Schema $schema, QueryBag $queries)
-    {
-        /** Tables generation **/
-        $this->createOroWindowsStateTable($schema);
-
-        /** Foreign keys generation **/
-        $this->addOroWindowsStateForeignKeys($schema);
-    }
-
-    /**
-     * Create oro_windows_state table
-     *
-     * @param Schema $schema
-     */
-    protected function createOroWindowsStateTable(Schema $schema)
-    {
-        $table = $schema->createTable('oro_windows_state');
-        $table->addColumn('id', 'integer', ['autoincrement' => true]);
-        $table->addColumn('user_id', 'integer', []);
-        $table->addColumn('data', Type::JSON_ARRAY, []);
-        $table->addColumn('created_at', 'datetime', []);
-        $table->addColumn('updated_at', 'datetime', []);
-        $table->setPrimaryKey(['id']);
-        $table->addIndex(['user_id'], 'IDX_8B134CF6A76ED395', []);
-    }
-
-    /**
-     * Add oro_windows_state foreign keys.
-     *
-     * @param Schema $schema
-     */
-    protected function addOroWindowsStateForeignKeys(Schema $schema)
-    {
-        $table = $schema->getTable('oro_windows_state');
-        $table->addForeignKeyConstraint(
-            $schema->getTable('oro_user'),
-            ['user_id'],
-            ['id'],
-            ['onDelete' => 'CASCADE', 'onUpdate' => null]
-        );
-    }
-}
diff --git a/src/Oro/Bundle/WindowsBundle/Migrations/Schema/v1_1/OroWindowsBundle.php b/src/Oro/Bundle/WindowsBundle/Migrations/Schema/v1_1/OroWindowsBundle.php
index 914b4fb51af..4d9554caaf3 100644
--- a/src/Oro/Bundle/WindowsBundle/Migrations/Schema/v1_1/OroWindowsBundle.php
+++ b/src/Oro/Bundle/WindowsBundle/Migrations/Schema/v1_1/OroWindowsBundle.php
@@ -2,20 +2,42 @@
 
 namespace Oro\Bundle\WindowsBundle\Migrations\Schema\v1_1;
 
+use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Platforms\PostgreSqlPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Types\Type;
 
+use Oro\Bundle\MigrationBundle\Migration\Extension\DatabasePlatformAwareInterface;
 use Oro\Bundle\MigrationBundle\Migration\Migration;
 use Oro\Bundle\MigrationBundle\Migration\QueryBag;
 
-class OroWindowsBundle implements Migration
+class OroWindowsBundle implements Migration, DatabasePlatformAwareInterface
 {
+    /** @var AbstractPlatform */
+    protected $platform;
+
+    /** {@inheritdoc} */
+    public function setDatabasePlatform(AbstractPlatform $platform)
+    {
+        $this->platform = $platform;
+    }
+
     /**
      * @inheritdoc
      */
     public function up(Schema $schema, QueryBag $queries)
     {
         $table = $schema->getTable('oro_windows_state');
-        $table->getColumn('data')->setType(Type::getType(Type::JSON_ARRAY));
+        $column = $table->getColumn('data');
+
+        if ($this->platform instanceof PostgreSqlPlatform) {
+            $queries->addPreQuery(
+                'ALTER TABLE oro_windows_state ALTER COLUMN data TYPE JSON USING data::JSON'
+            );
+        } else {
+            $column->setType(Type::getType(Type::JSON_ARRAY));
+        }
+
+        $column->setOptions(['comment' => '(DC2Type:json_array)']);
     }
 }

From 6de2f2cd7d08cbcb508ae030a54ce02e07c919f1 Mon Sep 17 00:00:00 2001
From: AlexandrDmitriev <admitriev@magecore.com>
Date: Tue, 15 Dec 2015 16:07:17 +0200
Subject: [PATCH 122/471] CBORO-225: Dotmailer watchdog import status break
 export - fix tag extension exception during marketing list segment build: add
 disable param for extension

---
 .../Bundle/TagBundle/Grid/TagsExtension.php   | 37 +++++++++++++++----
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/Oro/Bundle/TagBundle/Grid/TagsExtension.php b/src/Oro/Bundle/TagBundle/Grid/TagsExtension.php
index 3a9b488a0b7..be1eae3b1a4 100644
--- a/src/Oro/Bundle/TagBundle/Grid/TagsExtension.php
+++ b/src/Oro/Bundle/TagBundle/Grid/TagsExtension.php
@@ -12,6 +12,9 @@
 
 class TagsExtension extends AbstractTagsExtension
 {
+    const ROOT_PARAM = '_tags';
+    const DISABLED_PARAM   = '_disabled';
+
     /** @var TaggableHelper */
     protected $taggableHelper;
 
@@ -47,15 +50,33 @@ public function __construct(
      */
     public function isApplicable(DatagridConfiguration $config)
     {
-        $className = $this->getEntityClassName($config);
+        $tagParameters = $this->getParameters()->get(self::ROOT_PARAM);
+        $isDisabled = $tagParameters && !empty($tagParameters[self::DISABLED_PARAM]);
+
+        return !$isDisabled
+            && !$this->isReportOrSegmentGrid($config)
+            && $this->isGridRootEntityTaggable($config)
+            && null !== $config->offsetGetByPath(self::PROPERTY_ID_PATH)
+            && $this->isAccessGranted();
+    }
 
-        return
-            !$this->isReportOrSegmentGrid($config) &&
-            $className &&
-            $this->taggableHelper->isTaggable($className) &&
-            null !== $config->offsetGetByPath(self::PROPERTY_ID_PATH) &&
-            null !== $this->securityFacade->getToken() &&
-            $this->securityFacade->isGranted('oro_tag_view');
+    /**
+     * @param DatagridConfiguration $configuration
+     *
+     * @return bool
+     */
+    protected function isGridRootEntityTaggable(DatagridConfiguration $configuration)
+    {
+        $className = $this->getEntityClassName($configuration);
+        return $className && $this->taggableHelper->isTaggable($className);
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isAccessGranted()
+    {
+        return null !== $this->securityFacade->getToken() && $this->securityFacade->isGranted('oro_tag_view');
     }
 
     /**

From e95fcece8c8b3383c6306649bcd51e9c21060605 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Tue, 15 Dec 2015 17:01:12 +0200
Subject: [PATCH 123/471] CBORO-225: Dotmailer watchdog import status break
 export - fix tag extension exception during marketing list segment build: add
 disable param for extension

---
 .../Bundle/TagBundle/Grid/TagsExtension.php   | 35 +++++++++++++------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/Oro/Bundle/TagBundle/Grid/TagsExtension.php b/src/Oro/Bundle/TagBundle/Grid/TagsExtension.php
index be1eae3b1a4..741cd60c784 100644
--- a/src/Oro/Bundle/TagBundle/Grid/TagsExtension.php
+++ b/src/Oro/Bundle/TagBundle/Grid/TagsExtension.php
@@ -12,8 +12,8 @@
 
 class TagsExtension extends AbstractTagsExtension
 {
-    const ROOT_PARAM = '_tags';
-    const DISABLED_PARAM   = '_disabled';
+    const TAGS_ROOT_PARAM = '_tags';
+    const DISABLED_PARAM  = '_disabled';
 
     /** @var TaggableHelper */
     protected $taggableHelper;
@@ -50,14 +50,24 @@ public function __construct(
      */
     public function isApplicable(DatagridConfiguration $config)
     {
-        $tagParameters = $this->getParameters()->get(self::ROOT_PARAM);
-        $isDisabled = $tagParameters && !empty($tagParameters[self::DISABLED_PARAM]);
-
-        return !$isDisabled
-            && !$this->isReportOrSegmentGrid($config)
-            && $this->isGridRootEntityTaggable($config)
-            && null !== $config->offsetGetByPath(self::PROPERTY_ID_PATH)
-            && $this->isAccessGranted();
+        return
+            !$this->isDisabled() &&
+            !$this->isReportOrSegmentGrid($config) &&
+            $this->isGridRootEntityTaggable($config) &&
+            null !== $config->offsetGetByPath(self::PROPERTY_ID_PATH) &&
+            $this->isAccessGranted();
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isDisabled()
+    {
+        $tagParameters = $this->getParameters()->get(self::TAGS_ROOT_PARAM);
+
+        return
+            $tagParameters &&
+            !empty($tagParameters[self::DISABLED_PARAM]);
     }
 
     /**
@@ -68,6 +78,7 @@ public function isApplicable(DatagridConfiguration $config)
     protected function isGridRootEntityTaggable(DatagridConfiguration $configuration)
     {
         $className = $this->getEntityClassName($configuration);
+
         return $className && $this->taggableHelper->isTaggable($className);
     }
 
@@ -76,7 +87,9 @@ protected function isGridRootEntityTaggable(DatagridConfiguration $configuration
      */
     protected function isAccessGranted()
     {
-        return null !== $this->securityFacade->getToken() && $this->securityFacade->isGranted('oro_tag_view');
+        return
+            null !== $this->securityFacade->getToken() &&
+            $this->securityFacade->isGranted('oro_tag_view');
     }
 
     /**

From 571837ab9071d9890ae0f2b007ebf27ba6478126 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Tue, 15 Dec 2015 16:52:41 +0100
Subject: [PATCH 124/471] BAP-9424: LDAP sync of two different users with the
 same fields error during import job

---
 .../ImportExportBundle/Event/StrategyEvent.php | 18 +++++++++++++++++-
 .../Strategy/Import/AbstractImportStrategy.php |  4 ++--
 .../Tests/Unit/Event/StrategyEventTest.php     |  3 ++-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/Oro/Bundle/ImportExportBundle/Event/StrategyEvent.php b/src/Oro/Bundle/ImportExportBundle/Event/StrategyEvent.php
index 4c0652c8d18..c7a141db527 100644
--- a/src/Oro/Bundle/ImportExportBundle/Event/StrategyEvent.php
+++ b/src/Oro/Bundle/ImportExportBundle/Event/StrategyEvent.php
@@ -4,6 +4,7 @@
 
 use Symfony\Component\EventDispatcher\Event;
 
+use Oro\Bundle\ImportExportBundle\Context\ContextInterface;
 use Oro\Bundle\ImportExportBundle\Strategy\StrategyInterface;
 
 class StrategyEvent extends Event
@@ -21,14 +22,21 @@ class StrategyEvent extends Event
      */
     protected $entity;
 
+    /**
+     * @var ContextInterface
+     */
+    protected $context;
+
     /**
      * @param StrategyInterface $strategy
      * @param $entity
+     * @param ContextInterface $context
      */
-    public function __construct(StrategyInterface $strategy, $entity)
+    public function __construct(StrategyInterface $strategy, $entity, ContextInterface $context)
     {
         $this->entity = $entity;
         $this->strategy = $strategy;
+        $this->context = $context;
     }
 
     /**
@@ -54,4 +62,12 @@ public function setEntity($entity)
     {
         $this->entity = $entity;
     }
+
+    /**
+     * @return ContextInterface
+     */
+    public function getContext()
+    {
+        return $this->context;
+    }
 }
diff --git a/src/Oro/Bundle/ImportExportBundle/Strategy/Import/AbstractImportStrategy.php b/src/Oro/Bundle/ImportExportBundle/Strategy/Import/AbstractImportStrategy.php
index c30b8e0bcce..d75d2a4c2a2 100644
--- a/src/Oro/Bundle/ImportExportBundle/Strategy/Import/AbstractImportStrategy.php
+++ b/src/Oro/Bundle/ImportExportBundle/Strategy/Import/AbstractImportStrategy.php
@@ -88,7 +88,7 @@ public function setImportExportContext(ContextInterface $context)
      */
     protected function beforeProcessEntity($entity)
     {
-        $event = new StrategyEvent($this, $entity);
+        $event = new StrategyEvent($this, $entity, $this->context);
         $this->eventDispatcher->dispatch(StrategyEvent::PROCESS_BEFORE, $event);
         return $event->getEntity();
     }
@@ -99,7 +99,7 @@ protected function beforeProcessEntity($entity)
      */
     protected function afterProcessEntity($entity)
     {
-        $event = new StrategyEvent($this, $entity);
+        $event = new StrategyEvent($this, $entity, $this->context);
         $this->eventDispatcher->dispatch(StrategyEvent::PROCESS_AFTER, $event);
         return $event->getEntity();
     }
diff --git a/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Event/StrategyEventTest.php b/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Event/StrategyEventTest.php
index 2f5d6e50a7b..41151c98493 100644
--- a/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Event/StrategyEventTest.php
+++ b/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Event/StrategyEventTest.php
@@ -25,11 +25,12 @@ class StrategyEventTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->strategy = $this->getMock('Oro\Bundle\ImportExportBundle\Strategy\StrategyInterface');
+        $context = $this->getMock('Oro\Bundle\ImportExportBundle\Context\ContextInterface');
 
         $this->entity = new \stdClass();
         $this->entity->id = 1;
 
-        $this->event = new StrategyEvent($this->strategy, $this->entity);
+        $this->event = new StrategyEvent($this->strategy, $this->entity, $context);
     }
 
     public function testGetStrategy()

From 6d17a02e868848a2f45ffd4ea3bf1d903f596c33 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Tue, 15 Dec 2015 21:35:24 +0200
Subject: [PATCH 125/471] BAP-9503: Tags links are broken after editing

---
 .../Api/Rest/TaggableController.php           | 28 +++++++++++++++++--
 .../Api/Rest/TaggableController.php           |  5 +++-
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/Oro/Bundle/TagBundle/Controller/Api/Rest/TaggableController.php b/src/Oro/Bundle/TagBundle/Controller/Api/Rest/TaggableController.php
index 86bf165b8e9..0295e199886 100644
--- a/src/Oro/Bundle/TagBundle/Controller/Api/Rest/TaggableController.php
+++ b/src/Oro/Bundle/TagBundle/Controller/Api/Rest/TaggableController.php
@@ -9,6 +9,7 @@
 use FOS\RestBundle\Controller\Annotations\NamePrefix;
 use FOS\RestBundle\Controller\Annotations\RouteResource;
 use FOS\RestBundle\Controller\Annotations\Post;
+use FOS\RestBundle\Util\Codes;
 
 use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController;
 
@@ -19,7 +20,7 @@
 class TaggableController extends RestController
 {
     /**
-     * Sets tags to the target entity.
+     * Sets tags to the target entity and return them.
      *
      * @param string $entity   The type of the target entity.
      * @param int    $entityId The id of the target entity.
@@ -27,7 +28,7 @@ class TaggableController extends RestController
      * @Post("/tags/{entity}/{entityId}")
      *
      * @ApiDoc(
-     *      description="Sets tags to the target entity",
+     *      description="Sets tags to the target entity and return them",
      *      resource=true
      * )
      *
@@ -38,7 +39,28 @@ public function postAction($entity, $entityId)
         $manager = $this->getManager();
         $manager->setClass($manager->resolveEntityClass($entity));
 
-        return $this->handleUpdateRequest($entityId);
+        $entity = $this->getManager()->find($entityId);
+
+        if ($entity) {
+            $entity = $this->processForm($entity);
+            if ($entity) {
+                $result = $this->get('oro_tag.tag.manager')->getPreparedArray($entity);
+
+                // Returns tags for the updated entity.
+                return $this->buildResponse(
+                    $result,
+                    self::ACTION_READ,
+                    ['result' => $result],
+                    Codes::HTTP_OK
+                );
+            } else {
+                $view = $this->view($this->getForm(), Codes::HTTP_BAD_REQUEST);
+            }
+        } else {
+            $view = $this->view(null, Codes::HTTP_NOT_FOUND);
+        }
+
+        return $this->buildResponse($view, self::ACTION_UPDATE, ['id' => $entityId, 'entity' => $entity]);
     }
 
     /**
diff --git a/src/Oro/Bundle/TagBundle/Tests/Functional/Controller/Api/Rest/TaggableController.php b/src/Oro/Bundle/TagBundle/Tests/Functional/Controller/Api/Rest/TaggableController.php
index f9ca38b1f82..4009f86ab7b 100644
--- a/src/Oro/Bundle/TagBundle/Tests/Functional/Controller/Api/Rest/TaggableController.php
+++ b/src/Oro/Bundle/TagBundle/Tests/Functional/Controller/Api/Rest/TaggableController.php
@@ -30,6 +30,9 @@ public function testPostAction()
                 ]
             ]
         );
-        $this->assertEmptyResponseStatusCodeEquals($this->client->getResponse(), 204);
+
+        $result = $this->getJsonResponseContent($this->client->getResponse(), 200);
+        $this->assertNotEmpty($result);
+        $this->assertCount(2, $result, 'Result should contains information about 2 tags.');
     }
 }

From 86e4902b509305626bf67d099d93ffe23e0e9fe6 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Tue, 15 Dec 2015 21:37:13 +0200
Subject: [PATCH 126/471] BAP-9503: Tags links are broken after editing

---
 .../Rest/{TaggableController.php => TaggableControllerTest.php}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/Oro/Bundle/TagBundle/Tests/Functional/Controller/Api/Rest/{TaggableController.php => TaggableControllerTest.php} (100%)

diff --git a/src/Oro/Bundle/TagBundle/Tests/Functional/Controller/Api/Rest/TaggableController.php b/src/Oro/Bundle/TagBundle/Tests/Functional/Controller/Api/Rest/TaggableControllerTest.php
similarity index 100%
rename from src/Oro/Bundle/TagBundle/Tests/Functional/Controller/Api/Rest/TaggableController.php
rename to src/Oro/Bundle/TagBundle/Tests/Functional/Controller/Api/Rest/TaggableControllerTest.php

From eeff54e7192edc7e8f54458aa780e5ba122dd392 Mon Sep 17 00:00:00 2001
From: Olga Syzova <osizova@magecore.com>
Date: Tue, 15 Dec 2015 22:10:20 +0200
Subject: [PATCH 127/471] BAP-9515: Oro:platform:update migration fails with
 not nullable value in OroDataGridBundle

---
 src/Oro/Bundle/DataGridBundle/Entity/GridView.php    |  8 ++++++--
 .../DataGridBundle/Extension/GridViews/View.php      |  4 ++++
 .../Migrations/Schema/OroDataGridBundleInstaller.php |  2 +-
 .../Migrations/Schema/v1_1/OroDataGridBundle.php     | 12 +++++++++++-
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Entity/GridView.php b/src/Oro/Bundle/DataGridBundle/Entity/GridView.php
index 3d90134dd3e..a7c23ac2649 100644
--- a/src/Oro/Bundle/DataGridBundle/Entity/GridView.php
+++ b/src/Oro/Bundle/DataGridBundle/Entity/GridView.php
@@ -90,7 +90,7 @@ class GridView
     /**
      * @var array
      *
-     * @ORM\Column(type="array")
+     * @ORM\Column(type="array", nullable=true)
      */
     protected $columnsData = [];
 
@@ -240,6 +240,10 @@ public function setSortersData(array $sortersData = [])
      */
     public function getColumnsData()
     {
+        if ($this->columnsData === null) {
+            $this->columnsData = [];
+        }
+
         return $this->columnsData;
     }
 
@@ -280,7 +284,7 @@ public function setOwner(User $owner = null)
      */
     public function createView()
     {
-        $view = new View($this->id, $this->filtersData, $this->sortersData, $this->type, $this->columnsData);
+        $view = new View($this->id, $this->filtersData, $this->sortersData, $this->type, $this->getColumnsData());
         $view->setLabel($this->name);
 
         return $view;
diff --git a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/View.php b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/View.php
index ccd78efe42f..292a5c750e6 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/View.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/View.php
@@ -179,6 +179,10 @@ public function setDeletable($deletable = true)
      */
     public function getColumnsData()
     {
+        if ($this->columnsData === null) {
+            $this->columnsData = [];
+        }
+
         return $this->columnsData;
     }
 
diff --git a/src/Oro/Bundle/DataGridBundle/Migrations/Schema/OroDataGridBundleInstaller.php b/src/Oro/Bundle/DataGridBundle/Migrations/Schema/OroDataGridBundleInstaller.php
index 1c82bb136df..354bec81c06 100644
--- a/src/Oro/Bundle/DataGridBundle/Migrations/Schema/OroDataGridBundleInstaller.php
+++ b/src/Oro/Bundle/DataGridBundle/Migrations/Schema/OroDataGridBundleInstaller.php
@@ -38,7 +38,7 @@ protected function createOroGridViewTable(Schema $schema)
         $table->addColumn('type', 'string', ['length' => 255]);
         $table->addColumn('filtersData', 'array', ['comment' => '(DC2Type:array)']);
         $table->addColumn('sortersData', 'array', ['comment' => '(DC2Type:array)']);
-        $table->addColumn('columnsData', 'array', ['comment' => '(DC2Type:array)']);
+        $table->addColumn('columnsData', 'array', ['comment' => '(DC2Type:array)', 'notnull' => false]);
         $table->addColumn('gridName', 'string', ['length' => 255]);
         $table->setPrimaryKey(['id']);
         $table->addIndex(['user_owner_id'], 'IDX_5B73FBCB9EB185F9', []);
diff --git a/src/Oro/Bundle/DataGridBundle/Migrations/Schema/v1_1/OroDataGridBundle.php b/src/Oro/Bundle/DataGridBundle/Migrations/Schema/v1_1/OroDataGridBundle.php
index 39ba41f404c..be132815da8 100644
--- a/src/Oro/Bundle/DataGridBundle/Migrations/Schema/v1_1/OroDataGridBundle.php
+++ b/src/Oro/Bundle/DataGridBundle/Migrations/Schema/v1_1/OroDataGridBundle.php
@@ -6,6 +6,7 @@
 
 use Oro\Bundle\MigrationBundle\Migration\Migration;
 use Oro\Bundle\MigrationBundle\Migration\QueryBag;
+use Oro\Bundle\MigrationBundle\Migration\ParametrizedSqlMigrationQuery;
 
 class OroDataGridBundle implements Migration
 {
@@ -16,6 +17,15 @@ public function up(Schema $schema, QueryBag $queries)
     {
         $table = $schema->getTable('oro_grid_view');
 
-        $table->addColumn('columnsData', 'array', ['comment' => '(DC2Type:array)']);
+        $table->addColumn('columnsData', 'array', ['comment' => '(DC2Type:array)', 'notnull' => false]);
+
+        if ($table->hasColumn('columnsData')) {
+            $queries->addPostQuery(
+                new ParametrizedSqlMigrationQuery(
+                    'UPDATE oro_grid_view SET columnsData = :columnsData WHERE columnsData is NULL; ',
+                    ['columnsData' => serialize([])]
+                )
+            );
+        }
     }
 }

From 95128d110002bf6314891122529f803db37c07f1 Mon Sep 17 00:00:00 2001
From: Ilya Antipenko <iantipenko@grossum.com>
Date: Wed, 16 Dec 2015 12:36:55 +0200
Subject: [PATCH 128/471] BB-1738: Use collection for Zip Codes (in Tax
 Jurisdiction) instead of text field  - Region not always required

---
 .../AddressBundle/Resources/public/js/region/view.js  |  9 +++++++--
 .../Resources/views/Include/fields.html.twig          | 11 +++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/Oro/Bundle/AddressBundle/Resources/public/js/region/view.js b/src/Oro/Bundle/AddressBundle/Resources/public/js/region/view.js
index 9ff0c7ec1cb..d082c0afa3f 100644
--- a/src/Oro/Bundle/AddressBundle/Resources/public/js/region/view.js
+++ b/src/Oro/Bundle/AddressBundle/Resources/public/js/region/view.js
@@ -32,6 +32,7 @@ define([
             this.$simpleEl.attr('type', 'text');
 
             this.showSelect = options.showSelect;
+            this.regionRequired = options.regionRequired;
 
             this.template = _.template($('#region-chooser-template').html());
 
@@ -50,11 +51,15 @@ define([
          */
         displaySelect2: function(display) {
             if (display) {
-                this.addRequiredFlag(this.$simpleEl);
+                if (this.regionRequired) {
+                    this.addRequiredFlag(this.$simpleEl);
+                }
                 this.target.select2('container').show();
             } else {
                 this.target.select2('container').hide();
-                this.removeRequiredFlag(this.$simpleEl);
+                if (this.regionRequired) {
+                    this.removeRequiredFlag(this.$simpleEl);
+                }
                 this.target.validate().hideElementErrors(this.target);
             }
         },
diff --git a/src/Oro/Bundle/AddressBundle/Resources/views/Include/fields.html.twig b/src/Oro/Bundle/AddressBundle/Resources/views/Include/fields.html.twig
index 61512ac33a2..805b50c8926 100644
--- a/src/Oro/Bundle/AddressBundle/Resources/views/Include/fields.html.twig
+++ b/src/Oro/Bundle/AddressBundle/Resources/views/Include/fields.html.twig
@@ -16,7 +16,13 @@
     {% endif %}
     {% set region_text_field = form.parent[region_text_field] %}
 
-    {{ form_widget(form, {'attr': {'data-validation': { NotBlank: null}|json_encode} }) }}
+    {% set attr = {} %}
+
+    {% if required %}
+        {% set attr = attr|merge({'attr': {'data-validation': { NotBlank: null}|json_encode} }) %}
+    {% endif %}
+
+    {{ form_widget(form, attr) }}
     {% set showSelect = (choices is not empty and region_text_field.vars.value is empty) %}
 
     <script type="text/javascript">
@@ -31,7 +37,8 @@
                     collection: new RegionCollection([], {
                         route: {{ form.parent.vars.region_route|default('oro_api_country_get_regions')|json_encode|raw }}
                     }),
-                    showSelect: {{ showSelect|json_encode|raw }}
+                    showSelect: {{ showSelect|json_encode|raw }},
+                    regionRequired: {{ required|json_encode|raw }}
                 });
             });
         });

From b22a50da698e75adab33f176a2b841aa2cfb539b Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Wed, 16 Dec 2015 11:53:24 +0100
Subject: [PATCH 129/471] CRM-3997: Make all mailboxes available under System
 organization

- fix css
---
 src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less
index 09ef6c83988..8c5fec2bc65 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less
@@ -292,6 +292,9 @@ i.color {
     max-width: 100%;
     .controls {
       margin-left: 240px;
+      div.control-label {
+        text-align: left;
+      }
     }
     div.control-label,
     label.control-label {

From f112a4f2f8364a302eae41338f866148afce6092 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Wed, 16 Dec 2015 12:11:31 +0100
Subject: [PATCH 130/471] CRM-3997: Make all mailboxes available under System
 organization

- fix css
---
 .../Bundle/EmailBundle/Resources/public/css/less/style.less  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less b/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less
index 180ef92fbc1..3c0fc246a9c 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less
+++ b/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less
@@ -708,3 +708,8 @@ a.sync-btn span.dots {
 .check-connection-messages .alert {
   margin-top: 10px;
 }
+
+#oro_email_mailbox_origin_check_connection,
+.check-connection-messages {
+    width: 294px;
+}

From 00a1ee00dcd5123f19144a5896cbf06c554e861e Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Wed, 16 Dec 2015 13:49:31 +0200
Subject: [PATCH 131/471] CRM-4341 Troubles with double click and popover

---
 .../app/plugins/grid/inline-editing-plugin.js  | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
index da71dde22a1..3c60872c728 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
@@ -55,17 +55,16 @@ define(function(require) {
 
         constructor: function() {
             this.onKeyDown = _.bind(this.onKeyDown, this);
-            this.hidePopover = _.bind(this.hidePopover, this);
             InlineEditingPlugin.__super__.constructor.apply(this, arguments);
         },
 
         enable: function() {
             this.listenTo(this.main, {
                 afterMakeCell: this.onAfterMakeCell,
-                shown: this.onGridShown,
-                rowClicked: this.onGridRowClicked
+                shown: this.onGridShown
             });
             this.listenTo(mediator, 'page:beforeChange', function() {
+                this.hidePopover();
                 if (this.editModeEnabled) {
                     this.exitEditMode(true);
                 }
@@ -84,8 +83,8 @@ define(function(require) {
             if (this.editModeEnabled) {
                 this.exitEditMode(true);
             }
-            this.hidePopover();
             this.main.body.refresh();
+            this.destroyPopover();
             InlineEditingPlugin.__super__.disable.call(this);
         },
 
@@ -93,7 +92,6 @@ define(function(require) {
             if (this.disposed) {
                 return;
             }
-            this.destroyPopover();
             return InlineEditingPlugin.__super__.dispose.call(this);
         },
 
@@ -115,7 +113,6 @@ define(function(require) {
                     this.$el.append('<i class="icon-edit hide-text">Edit</i>');
                     this.events = _.extend(Object.create(this.events), {
                         'dblclick': enterEditModeIfNeeded,
-                        'mouseleave': _this.hidePopover,
                         'mousedown .icon-edit': enterEditModeIfNeeded,
                         'click': _.noop
                     });
@@ -130,15 +127,10 @@ define(function(require) {
             this.initPopover();
         },
 
-        onGridRowClicked: function(grid, row) {
-            row.$('.editable').removeClass('editable');
-            this.hidePopover();
-        },
-
         initPopover: function() {
             this.main.$el.popover({
                 content: __('oro.form.inlineEditing.helpMessage'),
-                container: document.body,
+                container: this.main.$el,
                 selector: 'td.editable',
                 placement: 'bottom',
                 delay: {show: 1400, hide: 0},
@@ -155,6 +147,7 @@ define(function(require) {
 
         destroyPopover: function() {
             if (this.main.$el.data('popover')) {
+                this.hidePopover();
                 this.main.$el.popover('destroy');
             }
         },
@@ -242,6 +235,7 @@ define(function(require) {
                 this.exitEditMode(false);
             } else {
                 if (backdropManager.isReleased(this.backdropId)) {
+                    this.hidePopover(); // before adding backdrop
                     this.backdropId = backdropManager.hold();
                     $(document).on('keydown', this.onKeyDown);
                 }

From 460ede5ead74b6f97394a9fcb0b5536ec9bee5e7 Mon Sep 17 00:00:00 2001
From: Hryhorii Hrebiniuk <hhrebiniuk@magecore.com>
Date: Wed, 16 Dec 2015 15:11:15 +0200
Subject: [PATCH 132/471] CRM-4480: The width of the Owner/Business Unit filter
 is too big

---
 .../Resources/public/css/less/oro.filter.less | 19 +++++++++----
 .../views/Js/default_templates.js.twig        | 28 ++++++++-----------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/css/less/oro.filter.less b/src/Oro/Bundle/FilterBundle/Resources/public/css/less/oro.filter.less
index 10790938465..bb6ab7f1a02 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/css/less/oro.filter.less
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/css/less/oro.filter.less
@@ -351,9 +351,14 @@ button.ui-multiselect.select-filter-widget.ui-state-hover{
     vertical-align: middle;
   }
 }
-.filter-item.filter-business-unit {
+.filter-item.choice-tree-filter {
   margin-right: 0;
   margin-bottom: 0;
+  max-width: 300px;
+  min-width: 180px;
+  .choice-tree-filter-search{
+    width: calc(~"100% - 14px");
+  }
   .buttons {
     margin-bottom: 5px;
     span {
@@ -366,7 +371,6 @@ button.ui-multiselect.select-filter-widget.ui-state-hover{
     }
   }
   .list {
-    height: 200px;
     max-height: 200px;
     overflow: auto;
     margin-bottom: 10px;
@@ -375,14 +379,17 @@ button.ui-multiselect.select-filter-widget.ui-state-hover{
     }
     ul {
       list-style-type: none;
-      margin-right: 25px;
       input {
         margin-right: 5px;
         margin-top: 0;
+        margin-left: -18px;
       }
-      label.search-result {
-        color: #000000;
-        font-weight: bold;
+      label{
+        padding-left: 20px;
+        .search-result {
+          color: #000000;
+          font-weight: bold;
+        }
       }
     }
   }
diff --git a/src/Oro/Bundle/FilterBundle/Resources/views/Js/default_templates.js.twig b/src/Oro/Bundle/FilterBundle/Resources/views/Js/default_templates.js.twig
index 39354e87ac0..5daea6038da 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/views/Js/default_templates.js.twig
+++ b/src/Oro/Bundle/FilterBundle/Resources/views/Js/default_templates.js.twig
@@ -189,22 +189,18 @@
     <input type="hidden" name="select-values-autocomplete" class="select-values-autocomplete hide" value="" />
 </script>
 <script type="text/template" id="choice-tree-template">
-    <div class="filter-item oro-drop filter-business-unit">
-        <div class="">
-            <div>
-                <input type="text" name="search" value=""/>
-            </div>
-            <div class="buttons">
-                <span class="button-all active" data-mode="all'"><%- _.__("oro.filter.choice-tree.all") %></span> |
-                <span class="button-selected" data-mode="selected"><%- _.__("oro.filter.choice-tree.selected") %></span>
-            </div>
-            <div class="list"></div>
-            <input type="hidden" name="value">
-            <input type="hidden" name="type">
-            <div class="oro-action">
-                <div class="btn-group">
-                    <button class="btn btn-primary filter-update" type="button"><%- _.__("Update") %></button>
-                </div>
+    <div class="filter-item oro-drop choice-tree-filter">
+        <input type="text" name="search" value="" class="choice-tree-filter-search"/>
+        <div class="buttons">
+            <span class="button-all active" data-mode="all'"><%- _.__("oro.filter.choice-tree.all") %></span> |
+            <span class="button-selected" data-mode="selected"><%- _.__("oro.filter.choice-tree.selected") %></span>
+        </div>
+        <div class="list"></div>
+        <input type="hidden" name="value">
+        <input type="hidden" name="type">
+        <div class="oro-action">
+            <div class="btn-group">
+                <button class="btn btn-primary filter-update" type="button"><%- _.__("Update") %></button>
             </div>
         </div>
     </div>

From 8f719b021e9d1f106ec981587f819e94c28fa123 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Wed, 16 Dec 2015 14:17:21 +0100
Subject: [PATCH 133/471] CRM-3997: Make all mailboxes available under System
 organization

- add separate method for url params, so it can be easilly overwritten
---
 src/Oro/Bundle/ImapBundle/Resources/config/requirejs.yml    | 1 +
 .../Resources/public/js/app/views/check-connection-view.js  | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/ImapBundle/Resources/config/requirejs.yml b/src/Oro/Bundle/ImapBundle/Resources/config/requirejs.yml
index 43e7a1be1fc..7defd17cda1 100644
--- a/src/Oro/Bundle/ImapBundle/Resources/config/requirejs.yml
+++ b/src/Oro/Bundle/ImapBundle/Resources/config/requirejs.yml
@@ -2,3 +2,4 @@ config:
     paths:
         'oroimap/js/app/components/check-connection-component': 'bundles/oroimap/js/app/components/check-connection-component.js'
         'oroimap/js/app/components/check-config-settings': 'bundles/oroimap/js/app/components/check-config-settings.js'
+        'oroimap/js/app/views/check-connection-view': 'bundles/oroimap/js/app/views/check-connection-view.js'
diff --git a/src/Oro/Bundle/ImapBundle/Resources/public/js/app/views/check-connection-view.js b/src/Oro/Bundle/ImapBundle/Resources/public/js/app/views/check-connection-view.js
index 45ddd09f1ca..b564dd2305a 100644
--- a/src/Oro/Bundle/ImapBundle/Resources/public/js/app/views/check-connection-view.js
+++ b/src/Oro/Bundle/ImapBundle/Resources/public/js/app/views/check-connection-view.js
@@ -108,6 +108,10 @@ define(function(require) {
         },
 
         getUrl: function() {
+            return routing.generate(this.route, this._getUrlParams());
+        },
+
+        _getUrlParams: function() {
             var params = {
                 'for_entity': this.entity,
                 'organization': this.organization
@@ -116,7 +120,7 @@ define(function(require) {
                 params.id = this.entityId;
             }
 
-            return routing.generate(this.route, params);
+            return params;
         },
 
         clear: function() {

From 6fcefccbaffcaa73bcfcb556b7f63b9689463d7f Mon Sep 17 00:00:00 2001
From: Dmitry Khrysev <x86demon@gmail.com>
Date: Wed, 16 Dec 2015 15:27:54 +0200
Subject: [PATCH 134/471] BB-1539: 500 error on frontend
 api/rest/latest/windows request - code style fixes

---
 .../WindowsBundle/Controller/Api/WindowsStateController.php     | 2 +-
 .../Tests/Unit/Manager/WindowsStateManagerTest.php              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/WindowsBundle/Controller/Api/WindowsStateController.php b/src/Oro/Bundle/WindowsBundle/Controller/Api/WindowsStateController.php
index f35779899bf..3de651d4df2 100644
--- a/src/Oro/Bundle/WindowsBundle/Controller/Api/WindowsStateController.php
+++ b/src/Oro/Bundle/WindowsBundle/Controller/Api/WindowsStateController.php
@@ -107,7 +107,7 @@ public function deleteAction($windowId)
     }
 
     /**
-     * @retrun WindowsStateManager
+     * @return WindowsStateManager
      */
     protected function getWindowsStatesManager()
     {
diff --git a/src/Oro/Bundle/WindowsBundle/Tests/Unit/Manager/WindowsStateManagerTest.php b/src/Oro/Bundle/WindowsBundle/Tests/Unit/Manager/WindowsStateManagerTest.php
index b89ba105a55..5394c6c790e 100644
--- a/src/Oro/Bundle/WindowsBundle/Tests/Unit/Manager/WindowsStateManagerTest.php
+++ b/src/Oro/Bundle/WindowsBundle/Tests/Unit/Manager/WindowsStateManagerTest.php
@@ -14,6 +14,7 @@ class WindowsStateManagerTest extends \PHPUnit_Framework_TestCase
 {
     /** @var \PHPUnit_Framework_MockObject_MockObject|TokenStorageInterface */
     protected $tokenStorage;
+
     /** @var \PHPUnit_Framework_MockObject_MockObject|DoctrineHelper */
     protected $doctrineHelper;
 

From 17ddef143d3c07cfea3e740caf7986ced18c80fd Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Wed, 16 Dec 2015 16:06:32 +0200
Subject: [PATCH 135/471] BAP-9523: Add notification for Tags

---
 src/Oro/Bundle/TagBundle/Resources/config/assets.yml     | 1 +
 .../Bundle/TagBundle/Resources/config/entity_config.yml  | 2 +-
 src/Oro/Bundle/TagBundle/Resources/config/oro/twig.yml   | 2 ++
 .../Bundle/TagBundle/Resources/public/css/config.less    | 5 +++++
 .../TagBundle/Resources/translations/messages.en.yml     | 5 ++++-
 .../Resources/views/Form/Include/fields.html.twig        | 9 +++++++++
 6 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 src/Oro/Bundle/TagBundle/Resources/config/oro/twig.yml
 create mode 100644 src/Oro/Bundle/TagBundle/Resources/public/css/config.less
 create mode 100644 src/Oro/Bundle/TagBundle/Resources/views/Form/Include/fields.html.twig

diff --git a/src/Oro/Bundle/TagBundle/Resources/config/assets.yml b/src/Oro/Bundle/TagBundle/Resources/config/assets.yml
index 04869b0550e..a77b75dfb22 100644
--- a/src/Oro/Bundle/TagBundle/Resources/config/assets.yml
+++ b/src/Oro/Bundle/TagBundle/Resources/config/assets.yml
@@ -3,3 +3,4 @@ css:
       - 'bundles/orotag/css/tag-grid.less'
       - 'bundles/orotag/css/tags-container.less'
       - 'bundles/orotag/css/form.less'
+      - 'bundles/orotag/css/config.less'
diff --git a/src/Oro/Bundle/TagBundle/Resources/config/entity_config.yml b/src/Oro/Bundle/TagBundle/Resources/config/entity_config.yml
index a3b8c2a5dfa..468c8880fcd 100644
--- a/src/Oro/Bundle/TagBundle/Resources/config/entity_config.yml
+++ b/src/Oro/Bundle/TagBundle/Resources/config/entity_config.yml
@@ -13,7 +13,7 @@ oro_entity_config:
                         options:
                             block:          other
                             required:       true
-                            label:          oro.tag.enabled
+                            label:          oro.tag.config.enabled
 
                 # this attribute can be used to prohibit changing the tag state (no matter whether it is enabled or not)
                 # for the entity if TRUE than the current state cannot be changed
diff --git a/src/Oro/Bundle/TagBundle/Resources/config/oro/twig.yml b/src/Oro/Bundle/TagBundle/Resources/config/oro/twig.yml
new file mode 100644
index 00000000000..d6ed08cb502
--- /dev/null
+++ b/src/Oro/Bundle/TagBundle/Resources/config/oro/twig.yml
@@ -0,0 +1,2 @@
+bundles:
+    - OroTagBundle:Form/Include:fields.html.twig
diff --git a/src/Oro/Bundle/TagBundle/Resources/public/css/config.less b/src/Oro/Bundle/TagBundle/Resources/public/css/config.less
new file mode 100644
index 00000000000..ffb60da6c33
--- /dev/null
+++ b/src/Oro/Bundle/TagBundle/Resources/public/css/config.less
@@ -0,0 +1,5 @@
+.alert-danger.tags-config {
+  width: 294px;
+  margin: 10px 0;
+  float: none;
+}
diff --git a/src/Oro/Bundle/TagBundle/Resources/translations/messages.en.yml b/src/Oro/Bundle/TagBundle/Resources/translations/messages.en.yml
index 0f4ba231b4f..d4aa6a9708f 100644
--- a/src/Oro/Bundle/TagBundle/Resources/translations/messages.en.yml
+++ b/src/Oro/Bundle/TagBundle/Resources/translations/messages.en.yml
@@ -45,4 +45,7 @@ oro:
 
         tags_label: Tags
 
-        enabled: Enable tags
+        config:
+            enabled: Enable tags
+            disable.alert: Disabling Tags will irreversibly erase all existing tags
+
diff --git a/src/Oro/Bundle/TagBundle/Resources/views/Form/Include/fields.html.twig b/src/Oro/Bundle/TagBundle/Resources/views/Form/Include/fields.html.twig
new file mode 100644
index 00000000000..cfd058af7bf
--- /dev/null
+++ b/src/Oro/Bundle/TagBundle/Resources/views/Form/Include/fields.html.twig
@@ -0,0 +1,9 @@
+{% block oro_tag_config_choice_widget %}
+    {{ block('choice_widget') }}
+
+    {% if(value) %}
+        <div class="alert alert-danger tags-config">
+            {{ 'oro.tag.config.disable.alert'|trans }}
+        </div>
+    {% endif %}
+{% endblock %}

From bf4d50c347da9b6cfae519d0b1dc048da59da0bc Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Wed, 16 Dec 2015 16:13:08 +0200
Subject: [PATCH 136/471] BAP-9503: Tags links are broken after editing

---
 .../Bundle/TagBundle/Controller/Api/Rest/TaggableController.php | 2 +-
 .../Functional/Controller/Api/Rest/TaggableControllerTest.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/TagBundle/Controller/Api/Rest/TaggableController.php b/src/Oro/Bundle/TagBundle/Controller/Api/Rest/TaggableController.php
index 0295e199886..794e82d027a 100644
--- a/src/Oro/Bundle/TagBundle/Controller/Api/Rest/TaggableController.php
+++ b/src/Oro/Bundle/TagBundle/Controller/Api/Rest/TaggableController.php
@@ -48,7 +48,7 @@ public function postAction($entity, $entityId)
 
                 // Returns tags for the updated entity.
                 return $this->buildResponse(
-                    $result,
+                    ['tags' => $result],
                     self::ACTION_READ,
                     ['result' => $result],
                     Codes::HTTP_OK
diff --git a/src/Oro/Bundle/TagBundle/Tests/Functional/Controller/Api/Rest/TaggableControllerTest.php b/src/Oro/Bundle/TagBundle/Tests/Functional/Controller/Api/Rest/TaggableControllerTest.php
index 4009f86ab7b..f354ca5eeff 100644
--- a/src/Oro/Bundle/TagBundle/Tests/Functional/Controller/Api/Rest/TaggableControllerTest.php
+++ b/src/Oro/Bundle/TagBundle/Tests/Functional/Controller/Api/Rest/TaggableControllerTest.php
@@ -33,6 +33,6 @@ public function testPostAction()
 
         $result = $this->getJsonResponseContent($this->client->getResponse(), 200);
         $this->assertNotEmpty($result);
-        $this->assertCount(2, $result, 'Result should contains information about 2 tags.');
+        $this->assertCount(2, $result['tags'], 'Result should contains information about 2 tags.');
     }
 }

From 9111d807c29978b68ade38830760d1f34a58e6fe Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Wed, 16 Dec 2015 16:44:07 +0200
Subject: [PATCH 137/471] BAP-9503: Tags links are broken after editing

---
 src/Oro/Bundle/TagBundle/Entity/Tag.php     | 10 ++++++++++
 src/Oro/Bundle/TagBundle/Entity/Tagging.php |  1 +
 2 files changed, 11 insertions(+)

diff --git a/src/Oro/Bundle/TagBundle/Entity/Tag.php b/src/Oro/Bundle/TagBundle/Entity/Tag.php
index 51d2cfac3f7..b62c95d7baf 100644
--- a/src/Oro/Bundle/TagBundle/Entity/Tag.php
+++ b/src/Oro/Bundle/TagBundle/Entity/Tag.php
@@ -227,6 +227,16 @@ public function getTagging()
         return $this->tagging;
     }
 
+    /**
+     * @param Tagging $tagging
+     */
+    public function addTagging(Tagging $tagging)
+    {
+        if (!$this->tagging->contains($tagging)) {
+            $this->tagging->add($tagging);
+        }
+    }
+
     /**
      * To string
      *
diff --git a/src/Oro/Bundle/TagBundle/Entity/Tagging.php b/src/Oro/Bundle/TagBundle/Entity/Tagging.php
index b41d3ddbf7c..62cc4fd5fce 100644
--- a/src/Oro/Bundle/TagBundle/Entity/Tagging.php
+++ b/src/Oro/Bundle/TagBundle/Entity/Tagging.php
@@ -136,6 +136,7 @@ public function getId()
     public function setTag(Tag $tag)
     {
         $this->tag = $tag;
+        $this->tag->addTagging($this);
     }
 
     /**

From 494ca4843cbb90d38845dabbc2c2cd195703fe8b Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Wed, 16 Dec 2015 16:45:35 +0200
Subject: [PATCH 138/471] BAP-9503: implement update model after saving data on
 server

---
 .../js/app/plugins/grid/inline-editing-plugin.js     | 12 +++++++-----
 .../app/components/inline-editable-view-component.js | 12 ++++++++++--
 .../public/js/app/views/viewer/tags-view.js          | 10 ++--------
 .../Resources/public/js/datagrid/cell/tags-cell.js   |  2 ++
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
index da71dde22a1..9f691b40afe 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
@@ -571,13 +571,15 @@ define(function(require) {
         }
     }, {
         onSaveSuccess: function(response) {
+            var propName;
             if (!this.cell.disposed && this.cell.$el) {
                 if (response) {
-                    var routeParametersRenameMap
-                        = this.cell.column.get('metadata').inline_editing.save_api_accessor.routeParametersRenameMap;
-                    for (var i in routeParametersRenameMap) {
-                        if (typeof response[routeParametersRenameMap[i]] !== 'undefined') {
-                            this.cell.model.set(i, response[routeParametersRenameMap[i]]);
+                    var routeParametersRenameMap = _.invert(this.cell.column.get('metadata').inline_editing.
+                        save_api_accessor.routeParametersRenameMap);
+                    for (var i in response) {
+                        propName = routeParametersRenameMap.hasOwnProperty(i) ? routeParametersRenameMap[i] : i;
+                        if (this.cell.model.has(propName)) {
+                            this.cell.model.set(propName, response[i]);
                         }
                     }
                 }
diff --git a/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js b/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js
index f9e7c1ba245..91252574ec5 100644
--- a/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js
+++ b/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js
@@ -226,7 +226,7 @@ define(function(require) {
                     processingMessage: __('oro.form.inlineEditing.saving_progress'),
                     preventWindowUnload: __('oro.form.inlineEditing.inline_edits')
                 })
-                .done(_.bind(InlineEditableViewComponent.onSaveSuccess, ctx))
+                .done(_.bind(InlineEditableViewComponent.onSaveSuccess, this))
                 .fail(_.bind(InlineEditableViewComponent.onSaveError, ctx))
                 .always(function() {
                     wrapper.$el.removeClass('loading');
@@ -259,10 +259,18 @@ define(function(require) {
             });
         }
     }, {
-        onSaveSuccess: function() {
+        onSaveSuccess: function(response) {
             if (!this.wrapper.disposed && this.wrapper.$el) {
                 var _this = this;
                 this.wrapper.$el.addClass('save-success');
+                if (response) {
+                    for (var i in response) {
+                        if (this.model.has(i)) {
+                            this.model.set(i, response[i]);
+                        }
+                    }
+                }
+
                 _.delay(function() {
                     _this.wrapper.$el.removeClass('save-success');
                 }, 2000);
diff --git a/src/Oro/Bundle/TagBundle/Resources/public/js/app/views/viewer/tags-view.js b/src/Oro/Bundle/TagBundle/Resources/public/js/app/views/viewer/tags-view.js
index 006ce0d5307..8f32a48cf80 100644
--- a/src/Oro/Bundle/TagBundle/Resources/public/js/app/views/viewer/tags-view.js
+++ b/src/Oro/Bundle/TagBundle/Resources/public/js/app/views/viewer/tags-view.js
@@ -3,7 +3,6 @@ define(function(require) {
     'use strict';
     var BaseView = require('oroui/js/app/views/base/view');
     var _ = require('underscore');
-    var routing = require('routing');
 
     /**
      * Tags view, able to handle tags array in model.
@@ -28,6 +27,7 @@ define(function(require) {
      * @exports TagsView
      */
     var TagsView = BaseView.extend(/** @exports TagsView.prototype */{
+        showDefault: true,
         template: require('tpl!orotag/templates/viewer/tags-view.html'),
         listen: {
             'change model': 'render'
@@ -38,16 +38,10 @@ define(function(require) {
         },
         getTemplateData: function() {
             var tags = this.model.get(this.fieldName);
-            tags = _.map(tags, function(tag) {
-                tag.url = routing.generate('oro_tag_search', {
-                    id: tag.id
-                });
-                return tag;
-            });
             tags = _.sortBy(tags, this.tagSortCallback);
             return {
                 tags: tags,
-                showDefault: true
+                showDefault: this.showDefault
             };
         },
         tagSortCallback: function(a, b) {
diff --git a/src/Oro/Bundle/TagBundle/Resources/public/js/datagrid/cell/tags-cell.js b/src/Oro/Bundle/TagBundle/Resources/public/js/datagrid/cell/tags-cell.js
index e02c79dc40c..5ab7f738fc5 100644
--- a/src/Oro/Bundle/TagBundle/Resources/public/js/datagrid/cell/tags-cell.js
+++ b/src/Oro/Bundle/TagBundle/Resources/public/js/datagrid/cell/tags-cell.js
@@ -27,6 +27,8 @@ define(function(require) {
             'getTemplateData',
             'render'
         ]), {
+
+            showDefault: false,
             /**
              * @property {string}
              */

From 293dc70799d09154827d6c0a8566557eb9c891e3 Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Wed, 16 Dec 2015 17:16:19 +0200
Subject: [PATCH 139/471] BAP-9503: fix codestyle

---
 .../public/js/app/plugins/grid/inline-editing-plugin.js  | 9 ++++-----
 .../js/app/components/inline-editable-view-component.js  | 6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
index 9f691b40afe..4dd595a2155 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
@@ -571,17 +571,16 @@ define(function(require) {
         }
     }, {
         onSaveSuccess: function(response) {
-            var propName;
             if (!this.cell.disposed && this.cell.$el) {
                 if (response) {
                     var routeParametersRenameMap = _.invert(this.cell.column.get('metadata').inline_editing.
                         save_api_accessor.routeParametersRenameMap);
-                    for (var i in response) {
-                        propName = routeParametersRenameMap.hasOwnProperty(i) ? routeParametersRenameMap[i] : i;
+                    _.each(response, function(item, i) {
+                        var propName = routeParametersRenameMap.hasOwnProperty(i) ? routeParametersRenameMap[i] : i;
                         if (this.cell.model.has(propName)) {
-                            this.cell.model.set(propName, response[i]);
+                            this.cell.model.set(propName, item);
                         }
-                    }
+                    }, this);
                 }
 
                 var _this = this;
diff --git a/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js b/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js
index 91252574ec5..a3639499e4a 100644
--- a/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js
+++ b/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js
@@ -264,11 +264,11 @@ define(function(require) {
                 var _this = this;
                 this.wrapper.$el.addClass('save-success');
                 if (response) {
-                    for (var i in response) {
+                    _.each(response, function(item, i) {
                         if (this.model.has(i)) {
-                            this.model.set(i, response[i]);
+                            this.model.set(i, item);
                         }
-                    }
+                    }, this);
                 }
 
                 _.delay(function() {

From e2baaee8b78f3373156064d6423beb97d68c1e7c Mon Sep 17 00:00:00 2001
From: Olga Syzova <osizova@magecore.com>
Date: Wed, 16 Dec 2015 17:45:29 +0200
Subject: [PATCH 140/471] BAP-9515: Oro:platform:update migration fails with
 not nullable value in OroDataGridBundle

---
 .../Migrations/Schema/v1_1/OroDataGridBundle.php   | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Migrations/Schema/v1_1/OroDataGridBundle.php b/src/Oro/Bundle/DataGridBundle/Migrations/Schema/v1_1/OroDataGridBundle.php
index be132815da8..126cdcab418 100644
--- a/src/Oro/Bundle/DataGridBundle/Migrations/Schema/v1_1/OroDataGridBundle.php
+++ b/src/Oro/Bundle/DataGridBundle/Migrations/Schema/v1_1/OroDataGridBundle.php
@@ -19,13 +19,11 @@ public function up(Schema $schema, QueryBag $queries)
 
         $table->addColumn('columnsData', 'array', ['comment' => '(DC2Type:array)', 'notnull' => false]);
 
-        if ($table->hasColumn('columnsData')) {
-            $queries->addPostQuery(
-                new ParametrizedSqlMigrationQuery(
-                    'UPDATE oro_grid_view SET columnsData = :columnsData WHERE columnsData is NULL; ',
-                    ['columnsData' => serialize([])]
-                )
-            );
-        }
+        $queries->addPostQuery(
+            new ParametrizedSqlMigrationQuery(
+                'UPDATE oro_grid_view SET columnsData = :columnsData WHERE columnsData is NULL; ',
+                ['columnsData' => serialize([])]
+            )
+        );
     }
 }

From 7fb24d726ef8e4c89da51451013f7a9b67e66744 Mon Sep 17 00:00:00 2001
From: Sergey Zhuravel <zhuravel.sergey@gmail.com>
Date: Wed, 16 Dec 2015 18:58:29 +0200
Subject: [PATCH 141/471] BB-1539: 500 error on frontend
 api/rest/latest/windows request - cr fixes

---
 .../Entity/AbstractWindowsState.php           | 93 ++-----------------
 .../Repository/WindowsStateRepositoryTest.php |  8 +-
 .../Tests/Unit/Entity/WindowsStateTest.php    | 33 ++-----
 3 files changed, 24 insertions(+), 110 deletions(-)

diff --git a/src/Oro/Bundle/WindowsBundle/Entity/AbstractWindowsState.php b/src/Oro/Bundle/WindowsBundle/Entity/AbstractWindowsState.php
index 1eff9acbf44..1720c9afb82 100644
--- a/src/Oro/Bundle/WindowsBundle/Entity/AbstractWindowsState.php
+++ b/src/Oro/Bundle/WindowsBundle/Entity/AbstractWindowsState.php
@@ -6,14 +6,22 @@
 
 use Symfony\Component\Security\Core\User\UserInterface;
 
+use Oro\Bundle\EntityBundle\EntityProperty\CreatedAtAwareTrait;
+use Oro\Bundle\EntityBundle\EntityProperty\UpdatedAtAwareTrait;
+
+use Oro\Bundle\EntityBundle\EntityProperty\CreatedAtAwareInterface;
+use Oro\Bundle\EntityBundle\EntityProperty\UpdatedAtAwareInterface;
+
 /**
  * Window state container Entity
  *
  * @ORM\MappedSuperclass
- * @ORM\HasLifecycleCallbacks
  */
-abstract class AbstractWindowsState
+abstract class AbstractWindowsState implements CreatedAtAwareInterface, UpdatedAtAwareInterface
 {
+    use CreatedAtAwareTrait;
+    use UpdatedAtAwareTrait;
+
     /**
      * @var integer $id
      *
@@ -30,20 +38,6 @@ abstract class AbstractWindowsState
      */
     protected $data;
 
-    /**
-     * @var \DateTime
-     *
-     * @ORM\Column(name="created_at", type="datetime")
-     */
-    protected $createdAt;
-
-    /**
-     * @var \DateTime
-     *
-     * @ORM\Column(name="updated_at", type="datetime")
-     */
-    protected $updatedAt;
-
     /**
      * @var boolean
      */
@@ -93,73 +87,6 @@ public function getJsonData()
         return json_encode($this->data);
     }
 
-    /**
-     * Set createdAt
-     *
-     * @param \DateTime $createdAt
-     * @return $this
-     */
-    public function setCreatedAt($createdAt)
-    {
-        $this->createdAt = $createdAt;
-
-        return $this;
-    }
-
-    /**
-     * Get createdAt
-     *
-     * @return \DateTime
-     */
-    public function getCreatedAt()
-    {
-        return $this->createdAt;
-    }
-
-    /**
-     * Set updatedAt
-     *
-     * @param \DateTime $updatedAt
-     * @return $this
-     */
-    public function setUpdatedAt($updatedAt)
-    {
-        $this->updatedAt = $updatedAt;
-
-        return $this;
-    }
-
-    /**
-     * Get updatedAt
-     *
-     * @return \DateTime
-     */
-    public function getUpdatedAt()
-    {
-        return $this->updatedAt;
-    }
-
-    /**
-     * Pre persist event handler
-     *
-     * @ORM\PrePersist
-     */
-    public function doPrePersist()
-    {
-        $this->createdAt = new \DateTime('now', new \DateTimeZone('UTC'));
-        $this->updatedAt = $this->createdAt;
-    }
-
-    /**
-     * Pre update event handler
-     *
-     * @ORM\PreUpdate
-     */
-    public function doPreUpdate()
-    {
-        $this->updatedAt = new \DateTime('now', new \DateTimeZone('UTC'));
-    }
-
     /**
      * Returns flag that window was rendered successfully
      *
diff --git a/src/Oro/Bundle/WindowsBundle/Tests/Functional/Entity/Repository/WindowsStateRepositoryTest.php b/src/Oro/Bundle/WindowsBundle/Tests/Functional/Entity/Repository/WindowsStateRepositoryTest.php
index 789555e9dce..ca75b62f4d3 100644
--- a/src/Oro/Bundle/WindowsBundle/Tests/Functional/Entity/Repository/WindowsStateRepositoryTest.php
+++ b/src/Oro/Bundle/WindowsBundle/Tests/Functional/Entity/Repository/WindowsStateRepositoryTest.php
@@ -34,7 +34,7 @@ public function testUpdate()
         /** @var WindowsStateRepository $repo */
         $repo = $registry->getRepository('OroWindowsBundle:WindowsState');
 
-        $this->assertEquals(true, $repo->update($state->getUser(), $state->getId(), ['cleanUrl' => '/path?a=1']));
+        $this->assertEquals(1, $repo->update($state->getUser(), $state->getId(), ['cleanUrl' => '/path?a=1']));
 
         $registry->getManager()->clear();
 
@@ -55,7 +55,7 @@ public function testUpdateAnotherUser()
         /** @var WindowsStateRepository $repo */
         $repo = $registry->getRepository('OroWindowsBundle:WindowsState');
 
-        $this->assertEquals(false, $repo->update($user, $state->getId(), ['cleanUrl' => '/path?a=1']));
+        $this->assertEquals(0, $repo->update($user, $state->getId(), ['cleanUrl' => '/path?a=1']));
     }
 
     public function testDelete()
@@ -68,7 +68,7 @@ public function testDelete()
         /** @var WindowsStateRepository $repo */
         $repo = $registry->getRepository('OroWindowsBundle:WindowsState');
 
-        $this->assertEquals(true, $repo->delete($state->getUser(), $state->getId()));
+        $this->assertEquals(1, $repo->delete($state->getUser(), $state->getId()));
 
         $registry->getManager()->clear();
 
@@ -86,6 +86,6 @@ public function testDeleteAnotherUser()
         /** @var WindowsStateRepository $repo */
         $repo = $registry->getRepository('OroWindowsBundle:WindowsState');
 
-        $this->assertEquals(false, $repo->delete($user, $state->getId()));
+        $this->assertEquals(0, $repo->delete($user, $state->getId()));
     }
 }
diff --git a/src/Oro/Bundle/WindowsBundle/Tests/Unit/Entity/WindowsStateTest.php b/src/Oro/Bundle/WindowsBundle/Tests/Unit/Entity/WindowsStateTest.php
index 5603f49a06e..49564aaba6c 100644
--- a/src/Oro/Bundle/WindowsBundle/Tests/Unit/Entity/WindowsStateTest.php
+++ b/src/Oro/Bundle/WindowsBundle/Tests/Unit/Entity/WindowsStateTest.php
@@ -38,40 +38,27 @@ public function testIsRenderedSuccessfully()
         $this->assertTrue($this->windowState->isRenderedSuccessfully());
     }
 
+    /**
+     * @return array
+     */
     public function propertiesDataProvider()
     {
         $userMock = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')
             ->disableOriginalConstructor()
             ->getMock();
-        return array(
-            'user' => array('user', $userMock),
-            'data' => array('data', array('test' => true)),
-            'createdAt' => array('createdAt', '2022-02-22 22:22:22'),
-            'updatedAt' => array('updatedAt', '2022-02-22 22:22:22'),
-        );
+        return [
+            'user' => ['user', $userMock],
+            'data' => ['data', ['test' => true]],
+            'createdAt' => ['createdAt', new \DateTime('2022-02-22 22:22:22')],
+            'updatedAt' => ['updatedAt', new \DateTime('2022-02-22 22:22:22')],
+        ];
     }
 
     public function testGetJsonData()
     {
-        $data = array('test' => true);
+        $data = ['test' => true];
         $this->windowState->setData($data);
         $this->assertEquals($data, $this->windowState->getData());
         $this->assertEquals(json_encode($data), $this->windowState->getJsonData());
     }
-
-    public function testDoPrePersist()
-    {
-        $this->windowState->doPrePersist();
-
-        $this->assertInstanceOf('DateTime', $this->windowState->getCreatedAt());
-        $this->assertInstanceOf('DateTime', $this->windowState->getUpdatedAt());
-        $this->assertEquals($this->windowState->getCreatedAt(), $this->windowState->getUpdatedAt());
-    }
-
-    public function testDoPreUpdate()
-    {
-        $this->windowState->doPreUpdate();
-
-        $this->assertInstanceOf('DateTime', $this->windowState->getUpdatedAt());
-    }
 }

From 37e997012d0c90c504d51850c715cf54aa466f64 Mon Sep 17 00:00:00 2001
From: Vova Soroka <vsoroka@magecore.com>
Date: Mon, 14 Dec 2015 17:14:46 +0200
Subject: [PATCH 142/471] CRM-4744: Optimize performance of the Magento sync
 for one day period

---
 src/Oro/Bundle/BatchBundle/Step/ItemStep.php  | 14 +++++++++++++
 .../Step/StepExecutionRestoreInterface.php    | 17 ++++++++++++++++
 .../Writer/PersistentBatchWriter.php          | 20 ++++++++++++++++++-
 3 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 src/Oro/Bundle/BatchBundle/Step/StepExecutionRestoreInterface.php

diff --git a/src/Oro/Bundle/BatchBundle/Step/ItemStep.php b/src/Oro/Bundle/BatchBundle/Step/ItemStep.php
index a9d4a585ee4..1b920831119 100644
--- a/src/Oro/Bundle/BatchBundle/Step/ItemStep.php
+++ b/src/Oro/Bundle/BatchBundle/Step/ItemStep.php
@@ -32,6 +32,8 @@ public function doExecute(StepExecution $stepExecution)
 
         $stepExecutor->execute($this);
         $this->flushStepElements();
+
+        $this->restoreStepElements();
     }
 
     /**
@@ -70,4 +72,16 @@ public function flushStepElements()
             }
         }
     }
+
+    /**
+     * Restores step elements to a state that was before a job execution.
+     */
+    protected function restoreStepElements()
+    {
+        foreach ($this->getConfigurableStepElements() as $element) {
+            if ($element instanceof StepExecutionRestoreInterface) {
+                $element->restoreStepExecution();
+            }
+        }
+    }
 }
diff --git a/src/Oro/Bundle/BatchBundle/Step/StepExecutionRestoreInterface.php b/src/Oro/Bundle/BatchBundle/Step/StepExecutionRestoreInterface.php
new file mode 100644
index 00000000000..46289724399
--- /dev/null
+++ b/src/Oro/Bundle/BatchBundle/Step/StepExecutionRestoreInterface.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Oro\Bundle\BatchBundle\Step;
+
+/**
+ * An interface which should be implemented by readers, writers or processors,
+ * that can be reused in child jobs and as result a step execution context can be overridden
+ * during an execution of a child job and need to be restored before such objects can be used
+ * by a parent job again.
+ */
+interface StepExecutionRestoreInterface
+{
+    /**
+     * Restores the previous instance of the StepExecution
+     */
+    public function restoreStepExecution();
+}
diff --git a/src/Oro/Bundle/IntegrationBundle/ImportExport/Writer/PersistentBatchWriter.php b/src/Oro/Bundle/IntegrationBundle/ImportExport/Writer/PersistentBatchWriter.php
index bdd25883385..b16ca1303b8 100644
--- a/src/Oro/Bundle/IntegrationBundle/ImportExport/Writer/PersistentBatchWriter.php
+++ b/src/Oro/Bundle/IntegrationBundle/ImportExport/Writer/PersistentBatchWriter.php
@@ -9,6 +9,8 @@
 
 use Doctrine\ORM\EntityManager;
 
+use Oro\Bundle\BatchBundle\Step\StepExecutionRestoreInterface;
+
 use Oro\Bundle\ImportExportBundle\Context\ContextRegistry;
 use Oro\Bundle\IntegrationBundle\Event\WriterErrorEvent;
 use Oro\Bundle\IntegrationBundle\Event\WriterAfterFlushEvent;
@@ -19,7 +21,10 @@
 use Akeneo\Bundle\BatchBundle\Item\InvalidItemException;
 use Akeneo\Bundle\BatchBundle\Step\StepExecutionAwareInterface;
 
-class PersistentBatchWriter implements ItemWriterInterface, StepExecutionAwareInterface
+class PersistentBatchWriter implements
+    ItemWriterInterface,
+    StepExecutionAwareInterface,
+    StepExecutionRestoreInterface
 {
     /** @var RegistryInterface */
     protected $registry;
@@ -36,6 +41,9 @@ class PersistentBatchWriter implements ItemWriterInterface, StepExecutionAwareIn
     /** @var LoggerInterface */
     protected $logger;
 
+    /** @var StepExecution|null */
+    protected $previousStepExecution;
+
     /**
      * @param RegistryInterface        $registry
      * @param EventDispatcherInterface $eventDispatcher
@@ -124,6 +132,16 @@ public function write(array $items)
      */
     public function setStepExecution(StepExecution $stepExecution)
     {
+        $this->previousStepExecution = $this->stepExecution;
+
         $this->stepExecution = $stepExecution;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function restoreStepExecution()
+    {
+        $this->stepExecution = $this->previousStepExecution;
+    }
 }

From 2b6963ab0fb11802a9434b1832da73547ec319d9 Mon Sep 17 00:00:00 2001
From: Sergey Zhuravel <zhuravel.sergey@gmail.com>
Date: Wed, 16 Dec 2015 21:16:58 +0200
Subject: [PATCH 143/471] BB-1539: 500 error on frontend
 api/rest/latest/windows request - add manager registry

---
 .../Manager/WindowsStateManager.php           | 22 +++++++--
 .../Manager/WindowsStateManagerRegistry.php   | 42 +++++++++++++++++
 .../Resources/config/services.yml             |  9 +++-
 .../WindowsStateManagerRegistryTest.php       | 46 +++++++++++++++++++
 .../Unit/Manager/WindowsStateManagerTest.php  | 21 ++++++++-
 .../Tests/Unit/Twig/WindowsExtensionTest.php  | 13 +++++-
 .../WindowsBundle/Twig/WindowsExtension.php   | 16 +++----
 7 files changed, 155 insertions(+), 14 deletions(-)
 create mode 100644 src/Oro/Bundle/WindowsBundle/Manager/WindowsStateManagerRegistry.php
 create mode 100644 src/Oro/Bundle/WindowsBundle/Tests/Unit/Manager/WindowsStateManagerRegistryTest.php

diff --git a/src/Oro/Bundle/WindowsBundle/Manager/WindowsStateManager.php b/src/Oro/Bundle/WindowsBundle/Manager/WindowsStateManager.php
index a10e67d58ad..6c9a54e5e2c 100644
--- a/src/Oro/Bundle/WindowsBundle/Manager/WindowsStateManager.php
+++ b/src/Oro/Bundle/WindowsBundle/Manager/WindowsStateManager.php
@@ -24,22 +24,28 @@ class WindowsStateManager
     /** @var string */
     protected $className;
 
+    /** @var string */
+    protected $userClassName;
+
     /**
      * @param TokenStorageInterface $tokenStorage
      * @param DoctrineHelper $doctrineHelper
      * @param WindowsStateRequestManager $requestStateManager
      * @param string $className
+     * @param string $userClassName
      */
     public function __construct(
         TokenStorageInterface $tokenStorage,
         DoctrineHelper $doctrineHelper,
         WindowsStateRequestManager $requestStateManager,
-        $className
+        $className,
+        $userClassName
     ) {
         $this->tokenStorage = $tokenStorage;
         $this->doctrineHelper = $doctrineHelper;
-        $this->className = $className;
         $this->requestStateManager = $requestStateManager;
+        $this->className = $className;
+        $this->userClassName = $userClassName;
     }
 
     /**
@@ -125,7 +131,7 @@ protected function filterId($windowId)
      *
      * @see TokenInterface::getUser()
      */
-    public function getUser()
+    protected function getUser()
     {
         if (null === $token = $this->tokenStorage->getToken()) {
             throw new AccessDeniedException();
@@ -137,4 +143,14 @@ public function getUser()
 
         return $user;
     }
+
+    /** @return bool */
+    public function isApplicable()
+    {
+        try {
+            return is_a($this->getUser(), $this->userClassName);
+        } catch (AccessDeniedException $e) {
+            return false;
+        }
+    }
 }
diff --git a/src/Oro/Bundle/WindowsBundle/Manager/WindowsStateManagerRegistry.php b/src/Oro/Bundle/WindowsBundle/Manager/WindowsStateManagerRegistry.php
new file mode 100644
index 00000000000..f841e3ee6e8
--- /dev/null
+++ b/src/Oro/Bundle/WindowsBundle/Manager/WindowsStateManagerRegistry.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Oro\Bundle\WindowsBundle\Manager;
+
+class WindowsStateManagerRegistry
+{
+    /**  @var WindowsStateManager[] */
+    protected $managers = [];
+
+    /** @var WindowsStateManager */
+    private $defaultManager;
+
+    /**
+     * @param WindowsStateManager $defaultManager
+     */
+    public function __construct(WindowsStateManager $defaultManager)
+    {
+        $this->defaultManager = $defaultManager;
+    }
+
+    /**
+     * @param WindowsStateManager $manager
+     */
+    public function addManager(WindowsStateManager $manager)
+    {
+        $this->managers[] = $manager;
+    }
+
+    /**
+     * @return WindowsStateManager
+     */
+    public function getManager()
+    {
+        foreach ($this->managers as $manager) {
+            if ($manager->isApplicable()) {
+                return $manager;
+            }
+        }
+
+        return $this->defaultManager;
+    }
+}
diff --git a/src/Oro/Bundle/WindowsBundle/Resources/config/services.yml b/src/Oro/Bundle/WindowsBundle/Resources/config/services.yml
index 7017b40a8a7..8842fc736bb 100644
--- a/src/Oro/Bundle/WindowsBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/WindowsBundle/Resources/config/services.yml
@@ -2,17 +2,23 @@ parameters:
     oro_windows.entity.windows_state.class: Oro\Bundle\WindowsBundle\Entity\WindowsState
     oro_windows.twig.extension.class: Oro\Bundle\WindowsBundle\Twig\WindowsExtension
     oro_windows.manager.windows_state.class: Oro\Bundle\WindowsBundle\Manager\WindowsStateManager
+    oro_windows.manager.windows_state_registry.class: Oro\Bundle\WindowsBundle\Manager\WindowsStateManagerRegistry
     oro_windows.manager.windows_state_request.class: Oro\Bundle\WindowsBundle\Manager\WindowsStateRequestManager
 
 services:
     oro_windows.twig.extension:
         class: %oro_windows.twig.extension.class%
         arguments:
-            - @oro_windows.manager.windows_state
+            - @oro_windows.manager.windows_state_registry
             - @oro_windows.manager.windows_state_request
         tags:
             - { name: twig.extension }
 
+    oro_windows.manager.windows_state_registry:
+        class: %oro_windows.manager.windows_state_registry.class%
+        arguments:
+            - @oro_windows.manager.windows_state
+
     oro_windows.manager.windows_state.abstract:
         class: %oro_windows.manager.windows_state.class%
         abstract: true
@@ -26,6 +32,7 @@ services:
         parent: oro_windows.manager.windows_state.abstract
         arguments:
             - %oro_windows.entity.windows_state.class%
+            - %oro_user.entity.class%
 
     oro_windows.manager.windows_state_request:
         class: %oro_windows.manager.windows_state_request.class%
diff --git a/src/Oro/Bundle/WindowsBundle/Tests/Unit/Manager/WindowsStateManagerRegistryTest.php b/src/Oro/Bundle/WindowsBundle/Tests/Unit/Manager/WindowsStateManagerRegistryTest.php
new file mode 100644
index 00000000000..542bab3fa84
--- /dev/null
+++ b/src/Oro/Bundle/WindowsBundle/Tests/Unit/Manager/WindowsStateManagerRegistryTest.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Oro\Bundle\WindowsBundle\Tests\Manager;
+
+use Oro\Bundle\WindowsBundle\Manager\WindowsStateManager;
+use Oro\Bundle\WindowsBundle\Manager\WindowsStateManagerRegistry;
+
+class WindowsStateManagerRegistryTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var WindowsStateManagerRegistry */
+    protected $registry;
+
+    /** @var \PHPUnit_Framework_MockObject_MockObject|WindowsStateManager */
+    protected $defaultManager;
+
+    protected function setUp()
+    {
+        $this->defaultManager = $this->getMockBuilder('Oro\Bundle\WindowsBundle\Manager\WindowsStateManager')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->registry = new WindowsStateManagerRegistry($this->defaultManager);
+    }
+
+    public function testGetDefaultManager()
+    {
+        $this->defaultManager->expects($this->once())->method('isApplicable')->willReturn(true);
+
+        $this->assertTrue($this->registry->getManager()->isApplicable());
+    }
+
+    public function testGetManager()
+    {
+        /** @var \PHPUnit_Framework_MockObject_MockObject|WindowsStateManager $manager */
+        $manager = $this->getMockBuilder('Oro\Bundle\WindowsBundle\Manager\WindowsStateManager')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->registry->addManager($manager);
+
+        $this->defaultManager->expects($this->never())->method($this->anything());
+        $manager->expects($this->once())->method('isApplicable')->willReturn(true);
+
+        $this->assertTrue($this->registry->getManager()->isApplicable());
+    }
+}
diff --git a/src/Oro/Bundle/WindowsBundle/Tests/Unit/Manager/WindowsStateManagerTest.php b/src/Oro/Bundle/WindowsBundle/Tests/Unit/Manager/WindowsStateManagerTest.php
index 5394c6c790e..39e5d046471 100644
--- a/src/Oro/Bundle/WindowsBundle/Tests/Unit/Manager/WindowsStateManagerTest.php
+++ b/src/Oro/Bundle/WindowsBundle/Tests/Unit/Manager/WindowsStateManagerTest.php
@@ -42,7 +42,8 @@ protected function setUp()
             $this->tokenStorage,
             $this->doctrineHelper,
             $this->requestStateManager,
-            'Oro\Bundle\WindowsBundle\Entity\WindowsState'
+            'Oro\Bundle\WindowsBundle\Entity\WindowsState',
+            'Oro\Bundle\UserBundle\Entity\User'
         );
     }
 
@@ -221,4 +222,22 @@ protected function createWindowState(array $data = [])
 
         return $state;
     }
+
+    public function testIsApplicableWithoutUser()
+    {
+        $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+        $token->expects($this->once())->method('getUser')->willReturn(null);
+        $this->tokenStorage->expects($this->once())->method('getToken')->willReturn($token);
+
+        $this->assertFalse($this->manager->isApplicable());
+    }
+
+    public function testIsApplicable()
+    {
+        $token = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+        $token->expects($this->once())->method('getUser')->willReturn(new User());
+        $this->tokenStorage->expects($this->once())->method('getToken')->willReturn($token);
+
+        $this->assertTrue($this->manager->isApplicable());
+    }
 }
diff --git a/src/Oro/Bundle/WindowsBundle/Tests/Unit/Twig/WindowsExtensionTest.php b/src/Oro/Bundle/WindowsBundle/Tests/Unit/Twig/WindowsExtensionTest.php
index 54fc69817ca..9567a85fbc4 100644
--- a/src/Oro/Bundle/WindowsBundle/Tests/Unit/Twig/WindowsExtensionTest.php
+++ b/src/Oro/Bundle/WindowsBundle/Tests/Unit/Twig/WindowsExtensionTest.php
@@ -7,6 +7,7 @@
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 
 use Oro\Bundle\WindowsBundle\Manager\WindowsStateManager;
+use Oro\Bundle\WindowsBundle\Manager\WindowsStateManagerRegistry;
 use Oro\Bundle\WindowsBundle\Manager\WindowsStateRequestManager;
 use Oro\Bundle\WindowsBundle\Entity\WindowsState;
 use Oro\Bundle\WindowsBundle\Twig\WindowsExtension;
@@ -28,6 +29,11 @@ class WindowsExtensionTest extends \PHPUnit_Framework_TestCase
      */
     protected $stateManager;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|WindowsStateManagerRegistry
+     */
+    protected $stateManagerRegistry;
+
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|WindowsStateRequestManager
      */
@@ -41,12 +47,17 @@ protected function setUp()
         $this->stateManager = $this->getMockBuilder('Oro\Bundle\WindowsBundle\Manager\WindowsStateManager')
             ->disableOriginalConstructor()
             ->getMock();
+        $this->stateManagerRegistry = $this
+            ->getMockBuilder('Oro\Bundle\WindowsBundle\Manager\WindowsStateManagerRegistry')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->stateManagerRegistry->expects($this->any())->method('getManager')->willReturn($this->stateManager);
         $this->requestStateManager = $this
             ->getMockBuilder('Oro\Bundle\WindowsBundle\Manager\WindowsStateRequestManager')
             ->setMethods(['getData'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->extension = new WindowsExtension($this->stateManager, $this->requestStateManager);
+        $this->extension = new WindowsExtension($this->stateManagerRegistry, $this->requestStateManager);
     }
 
     public function testGetFunctions()
diff --git a/src/Oro/Bundle/WindowsBundle/Twig/WindowsExtension.php b/src/Oro/Bundle/WindowsBundle/Twig/WindowsExtension.php
index f3abe0babd1..e6ea915f809 100644
--- a/src/Oro/Bundle/WindowsBundle/Twig/WindowsExtension.php
+++ b/src/Oro/Bundle/WindowsBundle/Twig/WindowsExtension.php
@@ -7,7 +7,7 @@
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 
 use Oro\Bundle\WindowsBundle\Entity\AbstractWindowsState;
-use Oro\Bundle\WindowsBundle\Manager\WindowsStateManager;
+use Oro\Bundle\WindowsBundle\Manager\WindowsStateManagerRegistry;
 use Oro\Bundle\WindowsBundle\Manager\WindowsStateRequestManager;
 
 class WindowsExtension extends \Twig_Extension
@@ -21,21 +21,21 @@ class WindowsExtension extends \Twig_Extension
      */
     protected $rendered = false;
 
-    /** @var WindowsStateManager */
-    protected $windowsStateManager;
+    /** @var WindowsStateManagerRegistry */
+    protected $windowsStateManagerRegistry;
 
     /** @var WindowsStateRequestManager */
     protected $windowsStateRequestManager;
 
     /**
-     * @param WindowsStateManager $windowsStateManager
+     * @param WindowsStateManagerRegistry $windowsStateManagerRegistry
      * @param WindowsStateRequestManager $windowsStateRequestManager
      */
     public function __construct(
-        WindowsStateManager $windowsStateManager,
+        WindowsStateManagerRegistry $windowsStateManagerRegistry,
         WindowsStateRequestManager $windowsStateRequestManager
     ) {
-        $this->windowsStateManager = $windowsStateManager;
+        $this->windowsStateManagerRegistry = $windowsStateManagerRegistry;
         $this->windowsStateRequestManager = $windowsStateRequestManager;
     }
 
@@ -80,7 +80,7 @@ public function render(\Twig_Environment $environment)
         $this->rendered = true;
 
         try {
-            $windowsStates = $this->windowsStateManager->getWindowsStates();
+            $windowsStates = $this->windowsStateManagerRegistry->getManager()->getWindowsStates();
         } catch (AccessDeniedException $e) {
             $windowsStates = [];
         }
@@ -122,7 +122,7 @@ public function renderFragment(\Twig_Environment $environment, AbstractWindowsSt
 
         if ($scheduleDelete) {
             try {
-                $this->windowsStateManager->deleteWindowsState($windowState->getId());
+                $this->windowsStateManagerRegistry->getManager()->deleteWindowsState($windowState->getId());
             } catch (AccessDeniedException $e) {
                 return $result;
             }

From 797ac9c9023015ecc3928e67f238f6cbecfa6a74 Mon Sep 17 00:00:00 2001
From: Sergey Zhuravel <zhuravel.sergey@gmail.com>
Date: Wed, 16 Dec 2015 21:17:40 +0200
Subject: [PATCH 144/471] BB-1539: 500 error on frontend
 api/rest/latest/windows request - add manager registry

---
 .../Tests/Unit/Manager/WindowsStateManagerRegistryTest.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/WindowsBundle/Tests/Unit/Manager/WindowsStateManagerRegistryTest.php b/src/Oro/Bundle/WindowsBundle/Tests/Unit/Manager/WindowsStateManagerRegistryTest.php
index 542bab3fa84..7b863d8bf1d 100644
--- a/src/Oro/Bundle/WindowsBundle/Tests/Unit/Manager/WindowsStateManagerRegistryTest.php
+++ b/src/Oro/Bundle/WindowsBundle/Tests/Unit/Manager/WindowsStateManagerRegistryTest.php
@@ -39,7 +39,7 @@ public function testGetManager()
         $this->registry->addManager($manager);
 
         $this->defaultManager->expects($this->never())->method($this->anything());
-        $manager->expects($this->once())->method('isApplicable')->willReturn(true);
+        $manager->expects($this->exactly(2))->method('isApplicable')->willReturn(true);
 
         $this->assertTrue($this->registry->getManager()->isApplicable());
     }

From d6995a240f88465f3977154783f21b37fc9a70ee Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Thu, 17 Dec 2015 12:48:03 +0200
Subject: [PATCH 145/471] CRM-4784: show empty tags cell on grid instead N/A
 label

---
 .../Resources/public/js/app/views/viewer/tags-view.js          | 3 ++-
 .../TagBundle/Resources/public/js/datagrid/cell/tags-cell.js   | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/TagBundle/Resources/public/js/app/views/viewer/tags-view.js b/src/Oro/Bundle/TagBundle/Resources/public/js/app/views/viewer/tags-view.js
index 006ce0d5307..ea7322abd37 100644
--- a/src/Oro/Bundle/TagBundle/Resources/public/js/app/views/viewer/tags-view.js
+++ b/src/Oro/Bundle/TagBundle/Resources/public/js/app/views/viewer/tags-view.js
@@ -28,6 +28,7 @@ define(function(require) {
      * @exports TagsView
      */
     var TagsView = BaseView.extend(/** @exports TagsView.prototype */{
+        showDefault: true,
         template: require('tpl!orotag/templates/viewer/tags-view.html'),
         listen: {
             'change model': 'render'
@@ -47,7 +48,7 @@ define(function(require) {
             tags = _.sortBy(tags, this.tagSortCallback);
             return {
                 tags: tags,
-                showDefault: true
+                showDefault: this.showDefault
             };
         },
         tagSortCallback: function(a, b) {
diff --git a/src/Oro/Bundle/TagBundle/Resources/public/js/datagrid/cell/tags-cell.js b/src/Oro/Bundle/TagBundle/Resources/public/js/datagrid/cell/tags-cell.js
index e02c79dc40c..5ab7f738fc5 100644
--- a/src/Oro/Bundle/TagBundle/Resources/public/js/datagrid/cell/tags-cell.js
+++ b/src/Oro/Bundle/TagBundle/Resources/public/js/datagrid/cell/tags-cell.js
@@ -27,6 +27,8 @@ define(function(require) {
             'getTemplateData',
             'render'
         ]), {
+
+            showDefault: false,
             /**
              * @property {string}
              */

From 10cc390653dfa15c2778703f9a3f57ed59cdc1ac Mon Sep 17 00:00:00 2001
From: Andrey Yatsenco <yatsenco@gmail.com>
Date: Thu, 17 Dec 2015 13:50:12 +0200
Subject: [PATCH 146/471] BB-1735: Fix issues after review - removed $resource
 instanceof LayoutResource check at LayoutFormula loader, because all
 resources already has this type - removed HtmlType block and added escape
 option to TextType - removed tag attrubute from block - removed DataAccessor
 from blockBuilder - added "expressions_evaluate_deferred" to context, that
 allows to evaluate expressions at different steps - at blockTypeExtensions
 options will not be passed by reference anymore, instead of that I added 
 normalizeOptions() method for modifying options after resolution and before
 build block.

---
 .../Assetic/LayoutFormulaLoader.php           |  3 +-
 .../Extension/ConfigExpressionExtension.php   | 47 ++++++++++++++++---
 .../Layout/Block/Type/HtmlType.php            | 26 ----------
 .../Layout/Block/Type/InputType.php           |  1 -
 .../Layout/Block/Type/TextType.php            |  3 ++
 .../ConfigExpressionContextConfigurator.php   |  8 +++-
 .../Resources/config/block_types.yml          |  5 --
 .../Resources/config/services.yml             | 13 +++--
 .../views/Layout/div_layout.html.twig         | 15 +++---
 .../Unit/Assetic/LayoutFormulaLoaderTest.php  |  4 --
 .../Unit/Layout/Block/Type/HtmlTypeTest.php   | 24 ----------
 .../Unit/Layout/Block/Type/InputTypeTest.php  |  3 +-
 .../Layout/AbstractBlockTypeExtension.php     | 10 +++-
 src/Oro/Component/Layout/BlockBuilder.php     | 18 +------
 .../Layout/BlockBuilderInterface.php          |  6 ---
 src/Oro/Component/Layout/BlockFactory.php     |  4 +-
 .../Layout/BlockTypeExtensionInterface.php    | 10 +++-
 src/Oro/Component/Layout/LayoutRegistry.php   | 19 +++++++-
 .../Layout/LayoutRegistryInterface.php        | 17 ++++++-
 19 files changed, 119 insertions(+), 117 deletions(-)
 delete mode 100644 src/Oro/Bundle/LayoutBundle/Layout/Block/Type/HtmlType.php
 delete mode 100644 src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/HtmlTypeTest.php

diff --git a/src/Oro/Bundle/LayoutBundle/Assetic/LayoutFormulaLoader.php b/src/Oro/Bundle/LayoutBundle/Assetic/LayoutFormulaLoader.php
index 546a425f5d7..c39c83a4b32 100644
--- a/src/Oro/Bundle/LayoutBundle/Assetic/LayoutFormulaLoader.php
+++ b/src/Oro/Bundle/LayoutBundle/Assetic/LayoutFormulaLoader.php
@@ -4,7 +4,6 @@
 
 use Assetic\Factory\Loader\FormulaLoaderInterface;
 use Assetic\Factory\Resource\ResourceInterface;
-use Symfony\Bundle\AsseticBundle\Factory\Resource\ConfigurationResource;
 
 class LayoutFormulaLoader implements FormulaLoaderInterface
 {
@@ -13,6 +12,6 @@ class LayoutFormulaLoader implements FormulaLoaderInterface
      */
     public function load(ResourceInterface $resource)
     {
-        return $resource instanceof LayoutResource ? $resource->getContent() : [];
+        return $resource->getContent();
     }
 }
diff --git a/src/Oro/Bundle/LayoutBundle/Layout/Block/Extension/ConfigExpressionExtension.php b/src/Oro/Bundle/LayoutBundle/Layout/Block/Extension/ConfigExpressionExtension.php
index cc87bef29c2..cb0d3392bf7 100644
--- a/src/Oro/Bundle/LayoutBundle/Layout/Block/Extension/ConfigExpressionExtension.php
+++ b/src/Oro/Bundle/LayoutBundle/Layout/Block/Extension/ConfigExpressionExtension.php
@@ -6,7 +6,8 @@
 use Oro\Component\ConfigExpression\ExpressionInterface;
 use Oro\Component\Layout\AbstractBlockTypeExtension;
 use Oro\Component\Layout\Block\Type\BaseType;
-use Oro\Component\Layout\BlockBuilderInterface;
+use Oro\Component\Layout\BlockInterface;
+use Oro\Component\Layout\BlockView;
 use Oro\Component\Layout\ContextInterface;
 use Oro\Component\Layout\DataAccessorInterface;
 use Oro\Component\Layout\OptionValueBag;
@@ -39,13 +40,28 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function buildBlock(BlockBuilderInterface $builder, array &$options)
+    public function normalizeOptions($name, array &$options, ContextInterface $context, DataAccessorInterface $data)
     {
-        $context = $builder->getContext();
-        $evaluate = $context->getOr('expressions_evaluate');
-        $encoding = $context->getOr('expressions_encoding');
-        if ($evaluate || $encoding !== null) {
-            $data = $builder->getDataAccessor();
+        if ($this->shouldBeProcessed($context, false)) {
+            $evaluate = $context->getOr('expressions_evaluate');
+            $encoding = $context->getOr('expressions_encoding');
+
+            $this->processExpressions($options, $context, $data, $evaluate, $encoding);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function finishView(BlockView $view, BlockInterface $block, array $options)
+    {
+        $context = $block->getContext();
+
+        if ($this->shouldBeProcessed($context, true)) {
+            $evaluate = $context->getOr('expressions_evaluate');
+            $encoding = $context->getOr('expressions_encoding');
+
+            $data = $block->getData();
             $this->processExpressions($options, $context, $data, $evaluate, $encoding);
         }
     }
@@ -58,6 +74,23 @@ public function getExtendedType()
         return BaseType::NAME;
     }
 
+    /**
+     * @param ContextInterface $context
+     * @param bool $isDeferred
+     * @return bool
+     */
+    protected function shouldBeProcessed(ContextInterface $context, $isDeferred)
+    {
+        $evaluateDeferred = $context->getOr('expressions_evaluate_deferred');
+        if ($evaluateDeferred === $isDeferred) {
+            $evaluate = $context->getOr('expressions_evaluate');
+            $encoding = $context->getOr('expressions_encoding');
+
+            return $evaluate || $encoding !== null;
+        }
+        return false;
+    }
+
     /**
      * @param array                 $values
      * @param ContextInterface      $context
diff --git a/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/HtmlType.php b/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/HtmlType.php
deleted file mode 100644
index 37cfa544b2c..00000000000
--- a/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/HtmlType.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace Oro\Bundle\LayoutBundle\Layout\Block\Type;
-
-use Oro\Component\Layout\Block\Type\AbstractType;
-
-class HtmlType extends AbstractType
-{
-    const NAME = 'html';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return self::NAME;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getParent()
-    {
-        return TextType::NAME;
-    }
-}
diff --git a/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/InputType.php b/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/InputType.php
index e7806ca8193..d7c44fe7f94 100644
--- a/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/InputType.php
+++ b/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/InputType.php
@@ -20,7 +20,6 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
         $resolver
             ->setDefaults(
                 [
-                    'tag' => 'input',
                     'type' => 'text',
                     'id' => null,
                     'name' => null,
diff --git a/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/TextType.php b/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/TextType.php
index 28e557b1a58..dd3c463e84c 100644
--- a/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/TextType.php
+++ b/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/TextType.php
@@ -17,7 +17,9 @@ class TextType extends AbstractType
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
+        $resolver->setDefaults(['escape' => true]);
         $resolver->setRequired(['text']);
+        $resolver->setAllowedTypes(['escape'=> 'bool']);
     }
 
     /**
@@ -26,6 +28,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
     public function buildView(BlockView $view, BlockInterface $block, array $options)
     {
         $view->vars['text'] = $options['text'];
+        $view->vars['escape'] = $options['escape'];
     }
 
     /**
diff --git a/src/Oro/Bundle/LayoutBundle/Layout/Extension/ConfigExpressionContextConfigurator.php b/src/Oro/Bundle/LayoutBundle/Layout/Extension/ConfigExpressionContextConfigurator.php
index 8344c56e114..4b940fe0dc5 100644
--- a/src/Oro/Bundle/LayoutBundle/Layout/Extension/ConfigExpressionContextConfigurator.php
+++ b/src/Oro/Bundle/LayoutBundle/Layout/Extension/ConfigExpressionContextConfigurator.php
@@ -13,11 +13,17 @@ class ConfigExpressionContextConfigurator implements ContextConfiguratorInterfac
     public function configureContext(ContextInterface $context)
     {
         $context->getResolver()
-            ->setDefaults(['expressions_evaluate' => true])
+            ->setDefaults(
+                [
+                    'expressions_evaluate' => true,
+                    'expressions_evaluate_deferred' => false
+                ]
+            )
             ->setOptional(['expressions_encoding'])
             ->setAllowedTypes(
                 [
                     'expressions_evaluate' => 'bool',
+                    'expressions_evaluate_deferred' => 'bool',
                     'expressions_encoding' => ['string', 'null']
                 ]
             );
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/config/block_types.yml b/src/Oro/Bundle/LayoutBundle/Resources/config/block_types.yml
index 299c49aa3a9..e3e8907af41 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/config/block_types.yml
+++ b/src/Oro/Bundle/LayoutBundle/Resources/config/block_types.yml
@@ -76,11 +76,6 @@ services:
         tags:
              - { name: layout.block_type, alias: text }
 
-    oro_layout.block_type.html:
-        class: Oro\Bundle\LayoutBundle\Layout\Block\Type\HtmlType
-        tags:
-             - { name: layout.block_type, alias: html }
-
     oro_layout.block_type.link:
         class: Oro\Bundle\LayoutBundle\Layout\Block\Type\LinkType
         tags:
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/config/services.yml b/src/Oro/Bundle/LayoutBundle/Resources/config/services.yml
index f630b91b536..d432835b7ee 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/LayoutBundle/Resources/config/services.yml
@@ -1,9 +1,7 @@
 parameters:
-    oro_layout.layout_factory_builder.class:            Oro\Component\Layout\LayoutFactoryBuilder
-    oro_layout.layout_manager.class:                    Oro\Component\Layout\LayoutManager
-    oro_layout.form_layout_builder.class:               Oro\Bundle\LayoutBundle\Layout\Form\GroupingFormLayoutBuilder
-    oro_layout.assetic.layout_formula_loader.class:     Oro\Bundle\LayoutBundle\Assetic\LayoutFormulaLoader
-    oro_layout.assetic.layout_resource.class:           Oro\Bundle\LayoutBundle\Assetic\LayoutResource
+    oro_layout.layout_factory_builder.class:    Oro\Component\Layout\LayoutFactoryBuilder
+    oro_layout.layout_manager.class:            Oro\Component\Layout\LayoutManager
+    oro_layout.form_layout_builder.class:       Oro\Bundle\LayoutBundle\Layout\Form\GroupingFormLayoutBuilder
 
 services:
     oro_layout.extension:
@@ -16,6 +14,7 @@ services:
             - {} # layout updates
             - {} # context configurators
             - {} # data providers
+            - {} # option normalizers
 
     oro_layout.layout_factory_builder:
         public: false
@@ -138,13 +137,13 @@ services:
 
     oro_layout.assetic.layout_formula_loader:
         public: false
-        class: %oro_layout.assetic.layout_formula_loader.class%
+        class: Oro\Bundle\LayoutBundle\Assetic\LayoutFormulaLoader
         tags:
             - { name: assetic.formula_loader, alias: layout }
 
     oro_layout.assetic.layout_resource:
         public: false
-        class: %oro_layout.assetic.layout_resource.class%
+        class: Oro\Bundle\LayoutBundle\Assetic\LayoutResource
         arguments:
             - @oro_layout.theme_manager
         tags:
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
index d68b3144dad..be317734331 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
+++ b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
@@ -1,8 +1,5 @@
 {% block block_widget -%}
-    {% if tag %}
-        <{{ tag }}{{ block('block_attributes') }}>
-        </{{ tag }}>
-    {% endif %}
+    {{ block('block_attributes') }}>
 {%- endblock %}
 
 {% block block_label -%}
@@ -131,11 +128,11 @@
 {% endblock %}
 
 {% block text_widget -%}
-    {{ text|block_text(translation_domain) }}
-{%- endblock %}
-
-{% block html_widget -%}
-    {{ text|block_text(translation_domain)|raw }}
+    {% if escape %}
+        {{ text|block_text(translation_domain) }}
+    {% else %}
+        {{ text|block_text(translation_domain)|raw }}
+    {% endif %}
 {%- endblock %}
 
 {% block link_widget -%}
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Assetic/LayoutFormulaLoaderTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Assetic/LayoutFormulaLoaderTest.php
index 5c9b874b99f..c6841f4874a 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Assetic/LayoutFormulaLoaderTest.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Assetic/LayoutFormulaLoaderTest.php
@@ -13,9 +13,6 @@ public function testLoad()
         $formulae = [1, 2, 3];
         $loader = new LayoutFormulaLoader();
 
-        /** @var ResourceInterface|\PHPUnit_Framework_MockObject_MockObject $resource */
-        $resource = $this->getMock('Assetic\Factory\Resource\ResourceInterface');
-
         /** @var ResourceInterface|\PHPUnit_Framework_MockObject_MockObject $layoutResource */
         $layoutResource = $this->getMockBuilder('Oro\Bundle\LayoutBundle\Assetic\LayoutResource')
             ->disableOriginalConstructor()
@@ -24,7 +21,6 @@ public function testLoad()
             ->method('getContent')
             ->willReturn($formulae);
 
-        $this->assertEquals([], $loader->load($resource));
         $this->assertEquals($formulae, $loader->load($layoutResource));
     }
 }
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/HtmlTypeTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/HtmlTypeTest.php
deleted file mode 100644
index 692e0c52986..00000000000
--- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/HtmlTypeTest.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Oro\Bundle\LayoutBundle\Tests\Unit\Layout\Block\Type;
-
-use Oro\Bundle\LayoutBundle\Layout\Block\Type\HtmlType;
-use Oro\Bundle\LayoutBundle\Layout\Block\Type\TextType;
-use Oro\Bundle\LayoutBundle\Tests\Unit\BlockTypeTestCase;
-
-class HtmlTypeTest extends BlockTypeTestCase
-{
-    public function testGetName()
-    {
-        $type = $this->getBlockType(HtmlType::NAME);
-
-        $this->assertSame(HtmlType::NAME, $type->getName());
-    }
-
-    public function testGetParent()
-    {
-        $type = $this->getBlockType(HtmlType::NAME);
-
-        $this->assertSame(TextType::NAME, $type->getParent());
-    }
-}
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/InputTypeTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/InputTypeTest.php
index 75d18b0c27f..8fb3adf2904 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/InputTypeTest.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/InputTypeTest.php
@@ -27,7 +27,6 @@ public function testSetDefaultOptions()
     {
         $this->assertEquals(
             [
-                'tag' => 'input',
                 'type' => 'text',
                 'id' => null,
                 'name' => null,
@@ -44,7 +43,7 @@ public function testSetDefaultOptions()
             'value' => '***',
             'placeholder' => 'Enter password',
         ];
-        $this->assertEquals(['tag' => 'input'] + $options, $this->resolveOptions(InputType::NAME, $options));
+        $this->assertEquals($options, $this->resolveOptions(InputType::NAME, $options));
     }
 
     public function testBuildViewPassword()
diff --git a/src/Oro/Component/Layout/AbstractBlockTypeExtension.php b/src/Oro/Component/Layout/AbstractBlockTypeExtension.php
index 7aff9cb0e8c..3bd4bee4fe2 100644
--- a/src/Oro/Component/Layout/AbstractBlockTypeExtension.php
+++ b/src/Oro/Component/Layout/AbstractBlockTypeExtension.php
@@ -9,7 +9,7 @@ abstract class AbstractBlockTypeExtension implements BlockTypeExtensionInterface
     /**
      * {@inheritdoc}
      */
-    public function buildBlock(BlockBuilderInterface $builder, array &$options)
+    public function buildBlock(BlockBuilderInterface $builder, array $options)
     {
     }
 
@@ -33,4 +33,12 @@ public function finishView(BlockView $view, BlockInterface $block, array $option
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function normalizeOptions($name, array &$options, ContextInterface $context, DataAccessorInterface $data)
+    {
+
+    }
 }
diff --git a/src/Oro/Component/Layout/BlockBuilder.php b/src/Oro/Component/Layout/BlockBuilder.php
index 52d72a70d9d..6ee743d894b 100644
--- a/src/Oro/Component/Layout/BlockBuilder.php
+++ b/src/Oro/Component/Layout/BlockBuilder.php
@@ -19,30 +19,22 @@ final class BlockBuilder implements BlockBuilderInterface
     /** @var string */
     private $id;
 
-    /**
-     * @var DataAccessorInterface
-     */
-    private $dataAccessor;
-
     /**
      * @param LayoutManipulatorInterface $layoutManipulator
      * @param RawLayout                $rawLayout
      * @param BlockTypeHelperInterface $typeHelper
      * @param ContextInterface         $context
-     * @param DataAccessorInterface    $dataAccessor
      */
     public function __construct(
         LayoutManipulatorInterface $layoutManipulator,
         RawLayout $rawLayout,
         BlockTypeHelperInterface $typeHelper,
-        ContextInterface $context,
-        DataAccessorInterface $dataAccessor
+        ContextInterface $context
     ) {
         $this->layoutManipulator = $layoutManipulator;
         $this->rawLayout         = $rawLayout;
         $this->typeHelper        = $typeHelper;
         $this->context           = $context;
-        $this->dataAccessor      = $dataAccessor;
     }
 
     /**
@@ -98,12 +90,4 @@ public function getContext()
     {
         return $this->context;
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getDataAccessor()
-    {
-        return $this->dataAccessor;
-    }
 }
diff --git a/src/Oro/Component/Layout/BlockBuilderInterface.php b/src/Oro/Component/Layout/BlockBuilderInterface.php
index f87d9bfff71..f359cd5502c 100644
--- a/src/Oro/Component/Layout/BlockBuilderInterface.php
+++ b/src/Oro/Component/Layout/BlockBuilderInterface.php
@@ -38,10 +38,4 @@ public function getTypeHelper();
      * @return ContextInterface
      */
     public function getContext();
-
-    /**
-     * Returns the layout data
-     * @return DataAccessorInterface
-     */
-    public function getDataAccessor();
 }
diff --git a/src/Oro/Component/Layout/BlockFactory.php b/src/Oro/Component/Layout/BlockFactory.php
index 26918b2adb1..0042f31f865 100644
--- a/src/Oro/Component/Layout/BlockFactory.php
+++ b/src/Oro/Component/Layout/BlockFactory.php
@@ -87,8 +87,7 @@ protected function initializeState(RawLayout $rawLayout, ContextInterface $conte
             $this->layoutManipulator,
             $this->rawLayout,
             $this->typeHelper,
-            $this->context,
-            $this->dataAccessor
+            $this->context
         );
         $this->block           = new Block(
             $this->rawLayout,
@@ -210,6 +209,7 @@ protected function buildBlock($id)
         $this->blockBuilder->initialize($id);
         // iterate from parent to current
         foreach ($types as $type) {
+            $this->registry->normalizeOptions($type->getName(), $resolvedOptions, $this->context, $this->dataAccessor);
             $type->buildBlock($this->blockBuilder, $resolvedOptions);
             $this->registry->buildBlock($type->getName(), $this->blockBuilder, $resolvedOptions);
         }
diff --git a/src/Oro/Component/Layout/BlockTypeExtensionInterface.php b/src/Oro/Component/Layout/BlockTypeExtensionInterface.php
index 808b8f8decd..6c543394c6f 100644
--- a/src/Oro/Component/Layout/BlockTypeExtensionInterface.php
+++ b/src/Oro/Component/Layout/BlockTypeExtensionInterface.php
@@ -17,7 +17,7 @@ interface BlockTypeExtensionInterface
      * @param BlockBuilderInterface $builder
      * @param array                 $options
      */
-    public function buildBlock(BlockBuilderInterface $builder, array &$options);
+    public function buildBlock(BlockBuilderInterface $builder, array $options);
 
     /**
      * Builds the block view.
@@ -54,6 +54,14 @@ public function finishView(BlockView $view, BlockInterface $block, array $option
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver);
 
+    /**
+     * @param $name
+     * @param array $options
+     * @param ContextInterface $context
+     * @param DataAccessorInterface $data
+     */
+    public function normalizeOptions($name, array &$options, ContextInterface $context, DataAccessorInterface $data);
+
     /**
      * Returns the name of the block type being extended.
      *
diff --git a/src/Oro/Component/Layout/LayoutRegistry.php b/src/Oro/Component/Layout/LayoutRegistry.php
index f9bff164fb1..892048e48b5 100644
--- a/src/Oro/Component/Layout/LayoutRegistry.php
+++ b/src/Oro/Component/Layout/LayoutRegistry.php
@@ -124,7 +124,24 @@ public function setDefaultOptions($name, OptionsResolverInterface $resolver)
     /**
      * {@inheritdoc}
      */
-    public function buildBlock($name, BlockBuilderInterface $builder, array &$options)
+    public function normalizeOptions(
+        $name,
+        array &$options,
+        ContextInterface $context,
+        DataAccessorInterface $data
+    ) {
+        $extensions = isset($this->typeExtensions[$name])
+            ? $this->typeExtensions[$name]
+            : $this->loadTypeExtensions($name);
+        foreach ($extensions as $extension) {
+            $extension->normalizeOptions($name, $options, $context, $data);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function buildBlock($name, BlockBuilderInterface $builder, array $options)
     {
         $extensions = isset($this->typeExtensions[$name])
             ? $this->typeExtensions[$name]
diff --git a/src/Oro/Component/Layout/LayoutRegistryInterface.php b/src/Oro/Component/Layout/LayoutRegistryInterface.php
index f7bad529f26..ad5dbaa7147 100644
--- a/src/Oro/Component/Layout/LayoutRegistryInterface.php
+++ b/src/Oro/Component/Layout/LayoutRegistryInterface.php
@@ -68,7 +68,7 @@ public function setDefaultOptions($name, OptionsResolverInterface $resolver);
      * @param BlockBuilderInterface $builder The block builder
      * @param array                 $options The options
      */
-    public function buildBlock($name, BlockBuilderInterface $builder, array &$options);
+    public function buildBlock($name, BlockBuilderInterface $builder, array $options);
 
     /**
      * Builds the block view.
@@ -117,4 +117,19 @@ public function updateLayout($id, LayoutManipulatorInterface $layoutManipulator,
      * @param ContextInterface $context The context
      */
     public function configureContext(ContextInterface $context);
+
+    /**
+     * Update block options after they way resolved.
+     *
+     * @param  string $name
+     * @param array $options
+     * @param ContextInterface $context
+     * @param DataAccessorInterface $data
+     */
+    public function normalizeOptions(
+        $name,
+        array &$options,
+        ContextInterface $context,
+        DataAccessorInterface $data
+    );
 }

From 19353f93dc412e5eaa53aa97f780e08c239326f3 Mon Sep 17 00:00:00 2001
From: Andrey Yatsenco <yatsenco@gmail.com>
Date: Thu, 17 Dec 2015 13:55:48 +0200
Subject: [PATCH 147/471] BB-1735: Fix issues after review - fixed bug

---
 src/Oro/Bundle/LayoutBundle/Resources/config/services.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Oro/Bundle/LayoutBundle/Resources/config/services.yml b/src/Oro/Bundle/LayoutBundle/Resources/config/services.yml
index d432835b7ee..47b89b78277 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/LayoutBundle/Resources/config/services.yml
@@ -14,7 +14,6 @@ services:
             - {} # layout updates
             - {} # context configurators
             - {} # data providers
-            - {} # option normalizers
 
     oro_layout.layout_factory_builder:
         public: false

From bbc91b0011662dd05daf708a92dd2ef225f1ce03 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Thu, 17 Dec 2015 14:39:08 +0200
Subject: [PATCH 148/471] CRM-4769 Existing tag displayed as new

---
 .../app/plugins/grid/inline-editing-plugin.js | 16 ++++++++----
 .../inline-editable-view-component.js         | 14 ++++++----
 .../js/app/views/editor/tags-editor-view.js   | 26 ++++++++++++++++---
 .../Resources/public/js/tools/api-accessor.js |  7 +++++
 4 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
index da71dde22a1..ba79d0ea702 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
@@ -348,11 +348,17 @@ define(function(require) {
                 newData[this.editor.save_api_accessor.initialOptions.field_name] = serverUpdateData[keys[0]];
                 serverUpdateData = newData;
             }
-            this.editor.save_api_accessor.send(cell.model.toJSON(), serverUpdateData, {}, {
-                    processingMessage: __('oro.form.inlineEditing.saving_progress'),
-                    preventWindowUnload: __('oro.form.inlineEditing.inline_edits')
-                })
-                .done(_.bind(InlineEditingPlugin.onSaveSuccess, ctx))
+            var savePromise = this.editor.save_api_accessor.send(cell.model.toJSON(), serverUpdateData, {}, {
+                processingMessage: __('oro.form.inlineEditing.saving_progress'),
+                preventWindowUnload: __('oro.form.inlineEditing.inline_edits')
+            });
+            if (this.editor.component.processSavePromise) {
+                savePromise = this.editor.component.processSavePromise(savePromise, cell.column.get('metadata'));
+            }
+            if (this.editor.view.processSavePromise) {
+                savePromise = this.editor.view.processSavePromise(savePromise, cell.column.get('metadata'));
+            }
+            savePromise.done(_.bind(InlineEditingPlugin.onSaveSuccess, ctx))
                 .fail(_.bind(InlineEditingPlugin.onSaveError, ctx))
                 .always(function() {
                     cell.$el.removeClass('loading');
diff --git a/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js b/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js
index f9e7c1ba245..954510ba9d8 100644
--- a/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js
+++ b/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js
@@ -222,11 +222,15 @@ define(function(require) {
                 newData[this.saveApiAccessor.initialOptions.field_name] = serverUpdateData[keys[0]];
                 serverUpdateData = newData;
             }
-            this.saveApiAccessor.send(this.model.toJSON(), serverUpdateData, {}, {
-                    processingMessage: __('oro.form.inlineEditing.saving_progress'),
-                    preventWindowUnload: __('oro.form.inlineEditing.inline_edits')
-                })
-                .done(_.bind(InlineEditableViewComponent.onSaveSuccess, ctx))
+            var savePromise = this.saveApiAccessor.send(this.model.toJSON(), serverUpdateData, {}, {
+                processingMessage: __('oro.form.inlineEditing.saving_progress'),
+                preventWindowUnload: __('oro.form.inlineEditing.inline_edits')
+            });
+
+            if (this.classes.editor.processSavePromise) {
+                savePromise = this.classes.editor.component.processSavePromise(savePromise, this.metadata);
+            }
+            savePromise.done(_.bind(InlineEditableViewComponent.onSaveSuccess, ctx))
                 .fail(_.bind(InlineEditableViewComponent.onSaveError, ctx))
                 .always(function() {
                     wrapper.$el.removeClass('loading');
diff --git a/src/Oro/Bundle/TagBundle/Resources/public/js/app/views/editor/tags-editor-view.js b/src/Oro/Bundle/TagBundle/Resources/public/js/app/views/editor/tags-editor-view.js
index 4525883f115..20b08b52e6c 100644
--- a/src/Oro/Bundle/TagBundle/Resources/public/js/app/views/editor/tags-editor-view.js
+++ b/src/Oro/Bundle/TagBundle/Resources/public/js/app/views/editor/tags-editor-view.js
@@ -197,10 +197,11 @@ define(function(require) {
             var data;
             if (this.currentPage === 1) {
                 data = $.extend({}, this.firstPageData);
-                data.results = this.filterTermFromResults(this.currentTerm, data.results);
                 if (this.currentPage === 1) {
                     if (this.permissions.oro_tag_create && this.isValidTerm(this.currentTerm)) {
-                        if (this.firstPageData.term === this.currentTerm) {
+                        if (this.firstPageData.term === this.currentTerm &&
+                            -1 === this.indexOfTermInResults(this.currentTerm, data.results)) {
+                            data.results = this.filterTermFromResults(this.currentTerm, data.results);
                             data.results.unshift({
                                 id: this.currentTerm,
                                 label: this.currentTerm,
@@ -223,6 +224,16 @@ define(function(require) {
             this.currentCallback(data);
         },
 
+        indexOfTermInResults: function(term, results) {
+            for (var i = 0; i < results.length; i++) {
+                var result = results[i];
+                if (result.label === term) {
+                    return i;
+                }
+            }
+            return -1;
+        },
+
         filterTermFromResults: function(term, results) {
             results = _.clone(results);
             for (var i = 0; i < results.length; i++) {
@@ -236,7 +247,8 @@ define(function(require) {
         },
 
         tagSortCallback: function(a, b) {
-            return this.getTermSimilarity(a.label) - this.getTermSimilarity(b.label);
+            var firstCondition = this.getTermSimilarity(a.label) - this.getTermSimilarity(b.label);
+            return firstCondition !== 0 ? firstCondition : a.label.length - b.label.length;
         },
 
         getTermSimilarity: function(term) {
@@ -301,7 +313,13 @@ define(function(require) {
             return data;
         }
     }, {
-        processMetadata: AbstractRelationEditorView.processMetadata
+        processMetadata: AbstractRelationEditorView.processMetadata,
+        processSavePromise: function(promise, metadata) {
+            promise.done(function() {
+                metadata.inline_editing.autocomplete_api_accessor.instance.clearCache();
+            });
+            return promise;
+        }
     });
 
     return TagsEditorView;
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/tools/api-accessor.js b/src/Oro/Bundle/UIBundle/Resources/public/js/tools/api-accessor.js
index 98637525204..e9b4dd7b33f 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/js/tools/api-accessor.js
+++ b/src/Oro/Bundle/UIBundle/Resources/public/js/tools/api-accessor.js
@@ -114,6 +114,13 @@ define(function(require) {
             return this.httpMethod === 'GET' || this.httpMethod === 'OPTIONS' || this.httpMethod === 'HEAD';
         },
 
+        /**
+         * Clears response cache
+         */
+        clearCache: function() {
+            this.cache = {};
+        },
+
         /**
          * Validates url parameters
          *

From e1587ea8bb29d767533c78226b835bf3a0fd3fd3 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Thu, 17 Dec 2015 14:40:46 +0200
Subject: [PATCH 149/471] CRM-4769 Existing tag displayed as new

---
 .../public/js/app/components/inline-editable-view-component.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js b/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js
index 954510ba9d8..3c53926d032 100644
--- a/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js
+++ b/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js
@@ -228,7 +228,7 @@ define(function(require) {
             });
 
             if (this.classes.editor.processSavePromise) {
-                savePromise = this.classes.editor.component.processSavePromise(savePromise, this.metadata);
+                savePromise = this.classes.editor.processSavePromise(savePromise, this.metadata);
             }
             savePromise.done(_.bind(InlineEditableViewComponent.onSaveSuccess, ctx))
                 .fail(_.bind(InlineEditableViewComponent.onSaveError, ctx))

From 1c29ece25d298bc90432631b7767ad3ea6741921 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Thu, 17 Dec 2015 14:41:49 +0200
Subject: [PATCH 150/471] CRM-4769 Existing tag displayed as new

---
 .../Resources/doc/reference/client-side/api-accessor.md     | 6 ++++++
 .../doc/reference/client-side/hidden-initialization-view.md | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/UIBundle/Resources/doc/reference/client-side/api-accessor.md b/src/Oro/Bundle/UIBundle/Resources/doc/reference/client-side/api-accessor.md
index fba4db84455..6a6acf91966 100644
--- a/src/Oro/Bundle/UIBundle/Resources/doc/reference/client-side/api-accessor.md
+++ b/src/Oro/Bundle/UIBundle/Resources/doc/reference/client-side/api-accessor.md
@@ -44,6 +44,7 @@ and will put response to console after completion
 * [ApiAccessor](#module_ApiAccessor) ⇐ <code>[BaseClass](./base-class.md)</code>
   * [.initialize(options)](#module_ApiAccessor#initialize)
   * [.isCacheAllowed()](#module_ApiAccessor#isCacheAllowed) ⇒ <code>boolean</code>
+  * [.clearCache()](#module_ApiAccessor#clearCache)
   * [.validateUrlParameters(urlParameters)](#module_ApiAccessor#validateUrlParameters) ⇒ <code>boolean</code>
   * [.send(urlParameters, body, headers, options)](#module_ApiAccessor#send) ⇒ <code>$.Promise</code>
   * [._makeAjaxRequest(options)](#module_ApiAccessor#_makeAjaxRequest)
@@ -67,6 +68,11 @@ and will put response to console after completion
 ### apiAccessor.isCacheAllowed() ⇒ <code>boolean</code>
 Returns true if selected HTTP_METHOD allows caching
 
+**Kind**: instance method of <code>[ApiAccessor](#module_ApiAccessor)</code>  
+<a name="module_ApiAccessor#clearCache"></a>
+### apiAccessor.clearCache()
+Clears response cache
+
 **Kind**: instance method of <code>[ApiAccessor](#module_ApiAccessor)</code>  
 <a name="module_ApiAccessor#validateUrlParameters"></a>
 ### apiAccessor.validateUrlParameters(urlParameters) ⇒ <code>boolean</code>
diff --git a/src/Oro/Bundle/UIBundle/Resources/doc/reference/client-side/hidden-initialization-view.md b/src/Oro/Bundle/UIBundle/Resources/doc/reference/client-side/hidden-initialization-view.md
index 272254786c6..80af34b06b0 100644
--- a/src/Oro/Bundle/UIBundle/Resources/doc/reference/client-side/hidden-initialization-view.md
+++ b/src/Oro/Bundle/UIBundle/Resources/doc/reference/client-side/hidden-initialization-view.md
@@ -1,7 +1,7 @@
 <a name="HiddenInitializationView"></a>
 ## HiddenInitializationView ⇐ <code>BaseView</code>
-**Kind**: global class  
 **Extends:** <code>BaseView</code>  
+**Kind**: global class  
 <a name="new_HiddenInitializationView_new"></a>
 ### new HiddenInitializationView()
 View allows hide part of DOM tree till all page components will be initialized

From c9431565203ce50f7ea3ea1cd3b8cdb05ae283b2 Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Thu, 17 Dec 2015 15:29:38 +0200
Subject: [PATCH 151/471] BAP-9503: improve request handlers implementation and
 add urls in init cell

---
 .../app/plugins/grid/inline-editing-plugin.js |  7 ++-
 .../inline-editable-view-component.js         | 47 +++++++++----------
 .../public/js/datagrid/cell/tags-cell.js      | 12 +++++
 3 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
index 4dd595a2155..b7fa563cad1 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
@@ -583,11 +583,10 @@ define(function(require) {
                     }, this);
                 }
 
-                var _this = this;
                 this.cell.$el.addClass('save-success');
-                _.delay(function() {
-                    _this.cell.$el.removeClass('save-success');
-                }, 2000);
+                _.delay(_.bind(function() {
+                    this.cell.$el.removeClass('save-success');
+                }, this), 2000);
             }
             mediator.execute('showFlashMessage', 'success', __('oro.form.inlineEditing.successMessage'));
         },
diff --git a/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js b/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js
index a3639499e4a..ee32445e49b 100644
--- a/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js
+++ b/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js
@@ -209,7 +209,8 @@ define(function(require) {
             var modelUpdateData = this.editorView.getModelUpdateData();
             wrapper.$el.addClass('loading');
             var ctx = {
-                wrapper: wrapper,
+                view: wrapper,
+                model: this.model,
                 oldState: _.pick(this.model.toJSON(), _.keys(modelUpdateData))
             };
             this.updateModel(this.model, this.editorView, modelUpdateData);
@@ -226,7 +227,7 @@ define(function(require) {
                     processingMessage: __('oro.form.inlineEditing.saving_progress'),
                     preventWindowUnload: __('oro.form.inlineEditing.inline_edits')
                 })
-                .done(_.bind(InlineEditableViewComponent.onSaveSuccess, this))
+                .done(_.bind(InlineEditableViewComponent.onSaveSuccess, ctx))
                 .fail(_.bind(InlineEditableViewComponent.onSaveError, ctx))
                 .always(function() {
                     wrapper.$el.removeClass('loading');
@@ -260,35 +261,33 @@ define(function(require) {
         }
     }, {
         onSaveSuccess: function(response) {
-            if (!this.wrapper.disposed && this.wrapper.$el) {
-                var _this = this;
-                this.wrapper.$el.addClass('save-success');
-                if (response) {
-                    _.each(response, function(item, i) {
-                        if (this.model.has(i)) {
-                            this.model.set(i, item);
-                        }
-                    }, this);
-                }
-
-                _.delay(function() {
-                    _this.wrapper.$el.removeClass('save-success');
-                }, 2000);
+            if (!this.view.disposed && this.view.$el) {
+                this.view.$el.addClass('save-success');
+                _.delay(_.bind(function() {
+                    this.view.$el.removeClass('save-success');
+                }, this), 2000);
+            }
+            if (response && !this.model.disposed) {
+                _.each(response, function(item, i) {
+                    if (this.model.has(i)) {
+                        this.model.set(i, item);
+                    }
+                }, this);
             }
             mediator.execute('showFlashMessage', 'success', __('oro.form.inlineEditing.successMessage'));
         },
 
         onSaveError: function(jqXHR) {
             var errorCode = 'responseJSON' in jqXHR ? jqXHR.responseJSON.code : jqXHR.status;
-            if (!this.wrapper.disposed && this.wrapper.$el) {
-                var _this = this;
-                this.wrapper.$el.addClass('save-fail');
-                _.delay(function() {
-                    _this.wrapper.$el.removeClass('save-fail');
-                }, 2000);
+            if (!this.view.disposed && this.view.$el) {
+                this.view.$el.addClass('save-fail');
+                _.delay(_.bind(function() {
+                    this.view.$el.removeClass('save-fail');
+                }, this), 2000);
+            }
+            if (!this.model.disposed) {
+                this.model.set(this.oldState);
             }
-            this.wrapper.model.set(this.oldState);
-            this.main.trigger('content:update');
 
             var errors = [];
             switch (errorCode) {
diff --git a/src/Oro/Bundle/TagBundle/Resources/public/js/datagrid/cell/tags-cell.js b/src/Oro/Bundle/TagBundle/Resources/public/js/datagrid/cell/tags-cell.js
index 5ab7f738fc5..3c2360c0e69 100644
--- a/src/Oro/Bundle/TagBundle/Resources/public/js/datagrid/cell/tags-cell.js
+++ b/src/Oro/Bundle/TagBundle/Resources/public/js/datagrid/cell/tags-cell.js
@@ -4,6 +4,7 @@ define(function(require) {
     var TagsCell;
     var Backgrid = require('backgrid');
     var _ = require('underscore');
+    var routing = require('routing');
     var TagsView = require('orotag/js/app/views/viewer/tags-view');
 
     /**
@@ -42,6 +43,17 @@ define(function(require) {
             initialize: function() {
                 Backgrid.StringCell.__super__.initialize.apply(this, arguments);
                 this.fieldName = this.column.get('name');
+                //TODO move url generation to server side
+                var tags = this.model.get(this.fieldName);
+                tags = _.map(tags, function(tag) {
+                    if (!tag.hasOwnProperty('url')) {
+                        tag.url = routing.generate('oro_tag_search', {
+                            id: tag.id
+                        });
+                    }
+                    return tag;
+                });
+                this.model.set(this.fieldName, tags);
             }
         })
     );

From b2fa69d8f41a4051990aef29886a71f3ecafb5f1 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Thu, 17 Dec 2015 16:30:46 +0200
Subject: [PATCH 152/471] CRM-4341 remove dispose method as it is not needed

---
 .../public/js/app/plugins/grid/inline-editing-plugin.js    | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
index 3c60872c728..33c95cf20cb 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
@@ -88,13 +88,6 @@ define(function(require) {
             InlineEditingPlugin.__super__.disable.call(this);
         },
 
-        dispose: function() {
-            if (this.disposed) {
-                return;
-            }
-            return InlineEditingPlugin.__super__.dispose.call(this);
-        },
-
         onAfterMakeCell: function(row, cell) {
             var _this = this;
             function enterEditModeIfNeeded(e) {

From 161978ef99b1dc14074a28bb80477956d8981d3c Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Thu, 17 Dec 2015 15:40:04 +0100
Subject: [PATCH 153/471] CRM-4630: Counters of Last Contacted doesn't
 recalculated after deleting context

---
 .../Entity/Manager/ActivityEntityDeleteHandler.php | 14 +++++++++++++-
 .../ActivityBundle/Resources/config/services.yml   |  1 +
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/ActivityBundle/Entity/Manager/ActivityEntityDeleteHandler.php b/src/Oro/Bundle/ActivityBundle/Entity/Manager/ActivityEntityDeleteHandler.php
index 67e4c648540..b6fa0385a09 100644
--- a/src/Oro/Bundle/ActivityBundle/Entity/Manager/ActivityEntityDeleteHandler.php
+++ b/src/Oro/Bundle/ActivityBundle/Entity/Manager/ActivityEntityDeleteHandler.php
@@ -4,6 +4,7 @@
 
 use Doctrine\ORM\EntityNotFoundException;
 
+use Oro\Bundle\ActivityBundle\Manager\ActivityManager;
 use Oro\Bundle\ActivityBundle\Model\ActivityInterface;
 use Oro\Bundle\SecurityBundle\Exception\ForbiddenException;
 use Oro\Bundle\SecurityBundle\SecurityFacade;
@@ -16,6 +17,9 @@ class ActivityEntityDeleteHandler extends DeleteHandler
     /** @var SecurityFacade */
     protected $securityFacade;
 
+    /** @var ActivityManager */
+    protected $activityManager;
+
     /**
      * @param SecurityFacade $securityFacade
      */
@@ -24,6 +28,14 @@ public function setSecurityFacade(SecurityFacade $securityFacade)
         $this->securityFacade = $securityFacade;
     }
 
+    /**
+     * @param ActivityManager $activityManager
+     */
+    public function setActivityManager(ActivityManager $activityManager)
+    {
+        $this->activityManager = $activityManager;
+    }
+
     /**
      * Handle delete entity object.
      *
@@ -54,7 +66,7 @@ public function handleDelete($id, ApiEntityManager $manager)
             throw new ForbiddenException('has no view permissions for related entity');
         }
 
-        $entity->removeActivityTarget($targetEntity);
+        $this->activityManager->removeActivityTarget($entity, $targetEntity);
 
         $em->flush();
     }
diff --git a/src/Oro/Bundle/ActivityBundle/Resources/config/services.yml b/src/Oro/Bundle/ActivityBundle/Resources/config/services.yml
index a621ac871c2..04535a94663 100644
--- a/src/Oro/Bundle/ActivityBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/ActivityBundle/Resources/config/services.yml
@@ -113,6 +113,7 @@ services:
         parent: oro_soap.handler.delete.abstract
         calls:
             - [setSecurityFacade, [@oro_security.security_facade]]
+            - [setSecurityManager, [@oro_activity.manager]]
 
     oro_activity.form.handler.autocomplete:
         class: Oro\Bundle\ActivityBundle\Autocomplete\ContextSearchHandler

From 43ac589591edec300ffb60a43f45b74f58326787 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Thu, 17 Dec 2015 16:49:19 +0200
Subject: [PATCH 154/471] CRM-4769 fix code issue

---
 .../js/app/views/editor/tags-editor-view.js   | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/Oro/Bundle/TagBundle/Resources/public/js/app/views/editor/tags-editor-view.js b/src/Oro/Bundle/TagBundle/Resources/public/js/app/views/editor/tags-editor-view.js
index 20b08b52e6c..08821a50078 100644
--- a/src/Oro/Bundle/TagBundle/Resources/public/js/app/views/editor/tags-editor-view.js
+++ b/src/Oro/Bundle/TagBundle/Resources/public/js/app/views/editor/tags-editor-view.js
@@ -197,23 +197,21 @@ define(function(require) {
             var data;
             if (this.currentPage === 1) {
                 data = $.extend({}, this.firstPageData);
-                if (this.currentPage === 1) {
-                    if (this.permissions.oro_tag_create && this.isValidTerm(this.currentTerm)) {
-                        if (this.firstPageData.term === this.currentTerm &&
-                            -1 === this.indexOfTermInResults(this.currentTerm, data.results)) {
-                            data.results = this.filterTermFromResults(this.currentTerm, data.results);
-                            data.results.unshift({
-                                id: this.currentTerm,
-                                label: this.currentTerm,
-                                isNew: true,
-                                owner: true
-                            });
-                        }
-                    } else {
-                        if (this.firstPageData.isDummy) {
-                            // do not update list until choices will be loaded
-                            return;
-                        }
+                if (this.permissions.oro_tag_create && this.isValidTerm(this.currentTerm)) {
+                    if (this.firstPageData.term === this.currentTerm &&
+                        -1 === this.indexOfTermInResults(this.currentTerm, data.results)) {
+                        data.results = this.filterTermFromResults(this.currentTerm, data.results);
+                        data.results.unshift({
+                            id: this.currentTerm,
+                            label: this.currentTerm,
+                            isNew: true,
+                            owner: true
+                        });
+                    }
+                } else {
+                    if (this.firstPageData.isDummy) {
+                        // do not update list until choices will be loaded
+                        return;
                     }
                 }
                 data.results.sort(_.bind(this.tagSortCallback, this));

From b169e2ee3197f76095e943f2d85bc8cf454cea10 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Thu, 17 Dec 2015 16:50:13 +0200
Subject: [PATCH 155/471] CRM-4769 fix code issue

---
 .../Resources/public/js/app/views/editor/tags-editor-view.js     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Oro/Bundle/TagBundle/Resources/public/js/app/views/editor/tags-editor-view.js b/src/Oro/Bundle/TagBundle/Resources/public/js/app/views/editor/tags-editor-view.js
index 08821a50078..aee3f766532 100644
--- a/src/Oro/Bundle/TagBundle/Resources/public/js/app/views/editor/tags-editor-view.js
+++ b/src/Oro/Bundle/TagBundle/Resources/public/js/app/views/editor/tags-editor-view.js
@@ -200,7 +200,6 @@ define(function(require) {
                 if (this.permissions.oro_tag_create && this.isValidTerm(this.currentTerm)) {
                     if (this.firstPageData.term === this.currentTerm &&
                         -1 === this.indexOfTermInResults(this.currentTerm, data.results)) {
-                        data.results = this.filterTermFromResults(this.currentTerm, data.results);
                         data.results.unshift({
                             id: this.currentTerm,
                             label: this.currentTerm,

From 4ccf0f1f58b5f9e7a942b16739104a2777bb061d Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Thu, 17 Dec 2015 15:58:06 +0100
Subject: [PATCH 156/471] CRM-4630: Counters of Last Contacted doesn't
 recalculated after deleting context

- fix typo
---
 src/Oro/Bundle/ActivityBundle/Resources/config/services.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/ActivityBundle/Resources/config/services.yml b/src/Oro/Bundle/ActivityBundle/Resources/config/services.yml
index 04535a94663..af8b51bb7cf 100644
--- a/src/Oro/Bundle/ActivityBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/ActivityBundle/Resources/config/services.yml
@@ -113,7 +113,7 @@ services:
         parent: oro_soap.handler.delete.abstract
         calls:
             - [setSecurityFacade, [@oro_security.security_facade]]
-            - [setSecurityManager, [@oro_activity.manager]]
+            - [setActivityManager, [@oro_activity.manager]]
 
     oro_activity.form.handler.autocomplete:
         class: Oro\Bundle\ActivityBundle\Autocomplete\ContextSearchHandler

From 46b7d0f1b86017f4f978cbfac02433d2ea1fd60b Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Thu, 17 Dec 2015 17:33:55 +0200
Subject: [PATCH 157/471] CRM-4769 fix code issue

---
 .../js/app/views/editor/tags-editor-view.js   | 46 +++++++++++++------
 .../Resources/public/js/tools/api-accessor.js |  1 +
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/Oro/Bundle/TagBundle/Resources/public/js/app/views/editor/tags-editor-view.js b/src/Oro/Bundle/TagBundle/Resources/public/js/app/views/editor/tags-editor-view.js
index aee3f766532..d1544859a6e 100644
--- a/src/Oro/Bundle/TagBundle/Resources/public/js/app/views/editor/tags-editor-view.js
+++ b/src/Oro/Bundle/TagBundle/Resources/public/js/app/views/editor/tags-editor-view.js
@@ -84,6 +84,7 @@ define(function(require) {
 
         initialize: function(options) {
             TagsEditorView.__super__.initialize.apply(this, arguments);
+            this.listenTo(this.autocompleteApiAccessor, 'cache:clear', this.onCacheClear);
             this.permissions = options.permissions || {};
         },
 
@@ -139,8 +140,8 @@ define(function(require) {
                     return _this.isLoading ?
                         __('oro.tag.inline_editing.loading') :
                         (_this.isCurrentTagSelected() ?
-                            __('oro.tag.inline_editing.existing_tag') :
-                            __('oro.tag.inline_editing.no_matches')
+                                __('oro.tag.inline_editing.existing_tag') :
+                                __('oro.tag.inline_editing.no_matches')
                         );
                 },
                 initSelection: function(element, callback) {
@@ -155,23 +156,12 @@ define(function(require) {
                         // immediately show first item
                         _this.showResults();
                     }
-                    options.callback = function(data) {
-                        _this.currentData = data;
-                        if (data.page === 1) {
-                            _this.firstPageData = data;
-                        }
-                        _this.isLoading = false;
-                        _this.showResults();
-                    };
+                    options.callback = _.bind(_this.commonDataCallback, _this);
                     if (_this.currentRequest && _this.currentRequest.term !== '' &&
                         _this.currentRequest.state() !== 'resolved') {
                         _this.currentRequest.abort();
                     }
-                    var autoCompleteUrlParameters = _.extend(_this.model.toJSON(), {
-                        term: options.term,
-                        page: options.page,
-                        per_page: _this.perPage
-                    });
+                    var autoCompleteUrlParameters = _this.buildAutoCompleteUrlParameters();
                     if (options.term !== '' &&
                         !_this.autocompleteApiAccessor.isCacheExistsFor(autoCompleteUrlParameters)) {
                         _this.debouncedMakeRequest(options, autoCompleteUrlParameters);
@@ -182,6 +172,32 @@ define(function(require) {
             };
         },
 
+        buildAutoCompleteUrlParameters: function() {
+            return _.extend(this.model.toJSON(), {
+                term: this.currentTerm,
+                page: this.currentPage,
+                per_page: this.perPage
+            });
+        },
+
+        commonDataCallback: function(data) {
+            this.currentData = data;
+            if (data.page === 1) {
+                this.firstPageData = data;
+            }
+            this.isLoading = false;
+            this.showResults();
+        },
+
+        onCacheClear: function() {
+            this.makeRequest({
+                callback: _.bind(this.commonDataCallback, this),
+                term: this.currentTerm,
+                page: this.currentPage,
+                per_page: this.perPage
+            }, this.buildAutoCompleteUrlParameters());
+        },
+
         isCurrentTagSelected: function() {
             var select2Data = this.$('.select2-container').select2('data');
             for (var i = 0; i < select2Data.length; i++) {
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/tools/api-accessor.js b/src/Oro/Bundle/UIBundle/Resources/public/js/tools/api-accessor.js
index e9b4dd7b33f..30970ea36f3 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/js/tools/api-accessor.js
+++ b/src/Oro/Bundle/UIBundle/Resources/public/js/tools/api-accessor.js
@@ -119,6 +119,7 @@ define(function(require) {
          */
         clearCache: function() {
             this.cache = {};
+            this.trigger('cache:clear');
         },
 
         /**

From acef72d69477c5007b64ec7acf73ec8065996f5f Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Thu, 17 Dec 2015 17:38:10 +0200
Subject: [PATCH 158/471] BAP-9503: add jquery helper to add class temporarily

---
 .../js/app/plugins/grid/inline-editing-plugin.js   |  6 +-----
 .../components/inline-editable-view-component.js   |  5 +----
 .../UIBundle/Resources/public/js/extend/jquery.js  | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
index b7fa563cad1..79d7f157aa5 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
@@ -582,11 +582,7 @@ define(function(require) {
                         }
                     }, this);
                 }
-
-                this.cell.$el.addClass('save-success');
-                _.delay(_.bind(function() {
-                    this.cell.$el.removeClass('save-success');
-                }, this), 2000);
+                this.cell.$el.addClassTemporarily('save-success', 2000);
             }
             mediator.execute('showFlashMessage', 'success', __('oro.form.inlineEditing.successMessage'));
         },
diff --git a/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js b/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js
index ee32445e49b..73f1d6454ce 100644
--- a/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js
+++ b/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js
@@ -262,10 +262,7 @@ define(function(require) {
     }, {
         onSaveSuccess: function(response) {
             if (!this.view.disposed && this.view.$el) {
-                this.view.$el.addClass('save-success');
-                _.delay(_.bind(function() {
-                    this.view.$el.removeClass('save-success');
-                }, this), 2000);
+                this.view.$el.addClassTemporarily('save-success', 2000);
             }
             if (response && !this.model.disposed) {
                 _.each(response, function(item, i) {
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/extend/jquery.js b/src/Oro/Bundle/UIBundle/Resources/public/js/extend/jquery.js
index 9001e46d220..3329a42dce6 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/js/extend/jquery.js
+++ b/src/Oro/Bundle/UIBundle/Resources/public/js/extend/jquery.js
@@ -137,6 +137,20 @@ define(['jquery'], function($) {
                 var newEvent = typeEvents.pop();
                 typeEvents.unshift(newEvent);
             });
+        },
+
+        /**
+         * Temporarily adds class to element
+         */
+        addClassTemporarily: function(className, delay) {
+            delay = delay || 0;
+            return this.each(function() {
+                var $el = $(this);
+                $el.addClass(className);
+                setTimeout(function() {
+                    $el.removeClass(className);
+                }, delay);
+            });
         }
     });
 

From 772ef9ffba7bc7afcd5e97f758c59c6391080b94 Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Thu, 17 Dec 2015 17:49:35 +0200
Subject: [PATCH 159/471] BAP-9503: use addClassTemporarily plugin

---
 .../public/js/app/plugins/grid/inline-editing-plugin.js     | 6 +-----
 .../js/app/components/inline-editable-view-component.js     | 5 +----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
index 79d7f157aa5..43ac157feef 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
@@ -590,11 +590,7 @@ define(function(require) {
         onSaveError: function(jqXHR) {
             var errorCode = 'responseJSON' in jqXHR ? jqXHR.responseJSON.code : jqXHR.status;
             if (!this.cell.disposed && this.cell.$el) {
-                var _this = this;
-                this.cell.$el.addClass('save-fail');
-                _.delay(function() {
-                    _this.cell.$el.removeClass('save-fail');
-                }, 2000);
+                this.cell.$el.addClassTemporarily('save-fail', 2000);
             }
             this.cell.model.set(this.oldState);
             this.main.trigger('content:update');
diff --git a/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js b/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js
index 73f1d6454ce..ddc530f9019 100644
--- a/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js
+++ b/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js
@@ -277,10 +277,7 @@ define(function(require) {
         onSaveError: function(jqXHR) {
             var errorCode = 'responseJSON' in jqXHR ? jqXHR.responseJSON.code : jqXHR.status;
             if (!this.view.disposed && this.view.$el) {
-                this.view.$el.addClass('save-fail');
-                _.delay(_.bind(function() {
-                    this.view.$el.removeClass('save-fail');
-                }, this), 2000);
+                this.view.$el.addClassTemporarily('save-fail', 2000);
             }
             if (!this.model.disposed) {
                 this.model.set(this.oldState);

From d253a8ec3a16a387eb38d1e04711edb5209aff60 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Thu, 17 Dec 2015 17:55:43 +0200
Subject: [PATCH 160/471] BAP-5408 pinbar message is incorrect

---
 .../Resources/translations/messages.en.yml                | 3 +--
 .../Resources/views/Pinbar/help.html.twig                 | 8 +++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Oro/Bundle/NavigationBundle/Resources/translations/messages.en.yml b/src/Oro/Bundle/NavigationBundle/Resources/translations/messages.en.yml
index b2b654e9b8f..d214e595db6 100644
--- a/src/Oro/Bundle/NavigationBundle/Resources/translations/messages.en.yml
+++ b/src/Oro/Bundle/NavigationBundle/Resources/translations/messages.en.yml
@@ -2,8 +2,7 @@ oro:
     navigation:
         help:
             title: How To Use Pinbar
-            save: Use the Pin Bar to “pin” documents and pages you want to continuously work on by clicking on the minimize button while on a specific page.
-            restore: To restore a page simply click on the title of the page you want to work on so that it is maximized back to your working area.
+            message: Use pin icon on the right top corner of page to create fast access link in the pinbar.
         menu:
             pinbar.label: Pinbar
             history.label: History
diff --git a/src/Oro/Bundle/NavigationBundle/Resources/views/Pinbar/help.html.twig b/src/Oro/Bundle/NavigationBundle/Resources/views/Pinbar/help.html.twig
index fcf952c682d..5a1fe633356 100644
--- a/src/Oro/Bundle/NavigationBundle/Resources/views/Pinbar/help.html.twig
+++ b/src/Oro/Bundle/NavigationBundle/Resources/views/Pinbar/help.html.twig
@@ -6,9 +6,11 @@
     <div class="clearfix">
         <h3>{{ 'oro.navigation.help.title'|trans }}</h3>
         <p>
-            {{ 'oro.navigation.help.save'|trans }}
-            <br />
-            {{ 'oro.navigation.help.restore'|trans }}
+            {{ 'oro.navigation.help.message'|trans }}
+        </p>
+        <p>
+            <img src="/bundles/oronavigation/images/pinbar-location.jpg"
+                 style="box-shadow: 1px 0px 12px rgba(0,0,0,0.5)">
         </p>
     </div>
 </div>

From edc2bc582bbaaa025e2ea751ffae3c8da031e156 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Thu, 17 Dec 2015 17:55:49 +0200
Subject: [PATCH 161/471] BAP-5408 pinbar message is incorrect

---
 .../Resources/public/images/pinbar-location.jpg | Bin 0 -> 19086 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/Oro/Bundle/NavigationBundle/Resources/public/images/pinbar-location.jpg

diff --git a/src/Oro/Bundle/NavigationBundle/Resources/public/images/pinbar-location.jpg b/src/Oro/Bundle/NavigationBundle/Resources/public/images/pinbar-location.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f7796c9b918c309fbb8d310debfe017cbab276ef
GIT binary patch
literal 19086
zcmeIa2UOF~wm%vK1*ItnND+{#(gf)(BGN>p_YxJ55<=*N8XH|eQ9wY76cHgHy(dal
zY0`U1=p~R)1BB$o-#PcRch3Lad)K{ht@qX$@?Gou{btXey+1RvXV0D;$YbO=!1=q{
zdfEUgDk{JO${&D?2C!?v+#Uk}1_prZ004lFa#0F-190JvzauyZKn0+oJRAKcrM~6r
z=jWv?CFSWW`Opda$XU`63Xy_6^pcX6ydecp1;V@@I)a`3_#ZjDxOu7xY&D_;_}!e;
z1T5tYZWwrJI=i~*2KzXh2H!Vx3<f(YISByO8PBQ0lwlArh_l~Aei+2V(^na$Ch!M$
zWy<~U*HQxfe~|cr)dVztH_LBjV8pKp^>OBxla!Zml$Ms}S5T6amQ%bbBPY%;b3<BA
z>V}e(^bLs{(#p~|lx1%4|G5ZInmeoN<MdeB<c{{ATcbRw3H({Fz`#Jsz?+g#9~UWU
zB_$=P8!}QdG7=OD3Ev=3zlSghPhY`5c>IaU9cN!hA2%;QH>fB7Z>A3)LH+&I1SsPE
zNe_tEUpW6$#QuiRz~KK(3W5Aa;SaXHekRU;75Ses_B9Lga+Wf2_J#WUI670v1%Fre
zQr7fwe&`4FF@r)q{sT%QSEwJ<*A?o;uc`S5bo^H>-8`M3fxg%NsAFKDtmo<L_t4YP
zS?`XT0ELUBo12reg1qJ(S<O2N8nSofq@}gwG;S!~(Nw&nrFln5Lrzgi=0ED*fjas_
zoIU;iqps6m>ni@sy1#qr>{(SxTa?!CIQzH-I6G<kKq35psIKhxujP^ZmpuPm*Xdu&
zBmXb!O8p^_s?_g3{+mAkV=(>kk}{eo52{js8Ogt&{xTb!J)P7<14V)A<Vk=g;1m_r
z@6VqL^=azg<qQoC^=aBOw6wo3y0i3W>FCbU(bAq{Ja>+sfl_GCGBGnUF#W#&&E$9W
z-?b<o20B{0-xU9~LjDT4KnEzMdP+?t062AliuwW-xedSv08pK#n1<ih;m?KY6gAE1
zGZc}|(NhSj&r`&wranax_B0K}EKr3}z6a1;IL&fJTH_3>@k3ex?~5`|Uw@zzyj}i{
z&7>bEbn}tVv$N;eIWBQ>35$qcy>?wzPF_J#Nm=ubmbQ+r-d$5Oa|=r=Ya2%==f^It
zZtlK*{sDoopy1~(A|j)rV`7uuyiHC?eV3M=o0nhkvG7yT=Zeaz>YCcR`i7R)w)T$B
z?>~MH3=R#CjE;>@pfU3ci%ZKZt84h}o!!0t1H$3aZ@s7h)PGXzFPi;>UKc2Oouc#s
z4ef8es7?h^F6s+3r>{t#VbL(Aedx_9AoG;&;_cTT%D<fzylH}Cd*su9j$KF=EsX!I
z+8>(z=M;PP-_q<aiv3lu2>=5%6{Yj2F93i50!JA48uCbCv<~JRzYG0*yfS->U7;UY
zyp<OQu$t9ADnrKaQaS#K=-280uaK~T!Y)#Q!noIW4M|r*Px4SJt^`ps;5pWi3`nkm
zw@GDJ1)ebS(U1YSup%;GyQXq~=s1(NBP_AEXBS%54<tnF>?e=`AM)n1NzBzil0`om
za2^@nKf5a%%1Q=&+b<*oeom-WtD`qu#)umfpiU^Sqd`E|ts^e=vt+>Bu_+m_2;sxi
zFJmv00h&7BfJ8obI1!OIX}bCEhW-uRzX!v==h6SDWzY(HN(L|~5Jt%W4QRwHL7|xp
zSh#+bV%QSL`pQoPjkVb3v));VeCmNCs*Ckyy);hUy<>7|Li@4z4;mgoW@7MUX`pGw
z54>|{b3X8hXNXE_Ukydv9|GbY0?7aloxgi>uswFO56Z5PYO6jBhcbc~_>SiGmTWp(
zkD<>%r$eEb7<GE$1>EkDOQd8$q=6Ji2Qj+hLEXzSn>X}Ncc`xP-3z3(49~{FzazD$
zSdI<KPAK*{iO5W`tL0cSV7cZ4#avVDD4_xP56?LLzJ%EeQXdIv>QRNR3Mt_XjkSZa
z$5*RXmz$Ea=#>`hAhq;M;?jL$^sry5ji-u>{g)=^U0x#j3B~Bdu_p5m9eBdPy8f^Q
zBfZI>&8FO-=zASsM_(Cz&u>%$N?hi`IcfK4Q*?_PgMn|VvoXkH&&&#w1Emu<UG0$^
z89;5iN(O9%zz?yX;Bzf-lH_N%20xz}_j3naPpv%J&W9nxsbZMa$$(;3(~~d3!xEC~
zko|%k|9Z-T@X9eK7ZPqS+A<+LQc&d1I_7p1YM|EMcJ#KtoyPs_<HwQ!07DX30o@tb
zbQACUt;XRBZl+qKGI#B|!_3;Gac0u3vovAEXP3@vaMC^pF~GlpR3Vs*#29r3TxYCg
zwG<PPe%SL0X?WQ0UDILdV+MVpRzc6N)Yl(8?|LdI(td0>2Z|&L&w*Y9GiA)VZV2M?
z<zpv&t-lM!x{i6W(9&#)-^a8qr2JTl4JTeURFO(Kz=mhpL>LBmKU*s$1M~xHO@n8;
zdWWP2v0RbgADe0HkJp_M5(*;&EaZUuHe^6wM;;mQbcYPU`}4jLO$#dunJOd2Bs4Ma
zzrsmO!E0#0mR&H!7<gia2<e->gLk@(S4Yx*?VZ|zn6c<dUj?|?Ka;$Debc99M2~j-
zZKDWj(RYP;qnZrJj@O}Jzf1;TR!Ci-L&6Xor%nMMDTceB&7Og${szB*Ma)B^9fSyl
zm_%mxT7ras$j7$y3LR%ryzKdchzubotS0*$)guEkU@Y}k1ui>L{VX`x&NaQW9T<6V
z)c4Z!?PjW7v!35-(%M3TQ?gJ~y;k54^S3#Nx2Oi~$bhoqmj#9XuFWBn8bfwT-s@#k
z`Ir;A`;*iD>a7*k+eA$UZOlntNRVBz!(HvU{wG16-{M8%Lv3?Hl?IZI?S_FB8w+WW
z5!<+NHvRHB=8UoI2l-j2fq|(QFlA`mAB3+MTgn~ZaaCu-TegIm@Nueoxqc~pKg!^>
z-%E84|DF{kdJdpc3;EV7rkvzv=bd=7d|Jna245^xD_%lHWB*-)_5-cIrf><ksP$6P
zy5pS<oe8HkP5?>D7o<Y*S=5@$F`2e4T=4}5+5TwyvkW#8dt=+1LPl*DsU_Z0Pho*q
zg~DcY7BWa8zp{^<MM*D`OXgiZymy+RxJl|-eP1+B*2{?WsboNG-o|+{Ab6b&IJHRW
zkk22ByvYET$;6|D*`u?iqG<X0ljp~>umGH%3uhH>mnEw4U8`rr0~3bCXXY|W{5(v<
z+44zY2*NBe)@HJo3@ALzdcIEwZ}z7Q9UscjF$;Ufw`C8XvqKThVVzM(B|@=DRGa*l
zNt?CN3D0b|Fn7GGWkX<>ctTQk<rFYYG2W=*&;$8+I&R0*7Q+{<YL0;2uw74gmm$Q4
zi1o9l1-ZJIS0)*~u{98Ay2k+&OQkt9p-y}?V9*G+o!l9$1;-wNjwZ-}*I2%XamS+|
z0tdw!v6;HD-i(<Ka8peSIHRU}z2xTZbZpsvdTJ}Sz6`!zM+Wq}-Rj{I`w4fYK%y>)
z(>i!c1fu2pAx)a|J>FICr1nCrJvVk25(Y5a);4sDF&`hLw6oFlZy(n_yqld#6f7mY
z+0Qzu3TOX;X~Ri$htpT#%>vn>Ir{$e?#iCU&W}g;6NP*EUw@0i2s?q{vmG`TkQLK|
zr4Q=|!T~4jGo|080#y6DwjlY)fbf`L5Oz&$2}QUHda@;lVE%eE343E#Jy-?hfjx+4
zAI^>adGvS$!P-*?iL^ddOe~MGY7N~e`F8Fwu_KIk)Rgc6FNitaCMKE?N{<J&q;o_;
zr<T_5eM$3+NEu-repF|F`=DD315$X8wYvz14UqOwT<&B*m{y^4^X^%<1N-3h!lXgV
z*@9}gw=sx`c(We?A&JANF+yHB_=8xa1R=ZCrZ?~Xw1b<sWXbDs-EjOfwl5V<FNvS}
zX#wnyg8L>-Ta~3^;U0#OU%;rdeH~(oL_y41?O5@u;!4k!Exl6<B6+IPp*e4VmcwUo
z`JQb>pw!-j?J6ab`vl1FYmxTgTRy|iSuf(?p>6$MH5)Fw1(XQFQC1R{E{N&ZiF@kY
z{o!J;eavjDvcL*Q!!nV7WZiYZZn7(XbwPhQXy4LfBxSRhAyudn&10EM5ZuovWa3jm
zX9ysjfnDfnLaW(eHN?~ug_nx-zXBF#SMVP1*xzT-2m4-Xa7%J#)oZv!G7%P%vrL+;
z1x2NubZyn73a^&bkOA2DmNUam4VxK9S+R%kc^#}2UgcYA`1Qnl)ws)<qb+0rjST_S
zHge!?@1RrCB{k7CKHe+*WKsa}cC0Stn$P2VZSwLPv**Ld;O7g5ngadvThUkj5Wuzx
z;PX(G(@Uv7JKWQEC6u)q8<RaR2Hl7o?Y_oR6=8g*{QW{g#bQDkaUmCl6WKr>IDgWg
zwoJ(kU&tq|RL!CTKkOy5;SD2*A$UzRC|X_4UXv*f0gGu0E0_c;*CeAuPVSBxRw%Q*
z=6Jn&ek$Wf?;UAb<NF(trXtoCBEqg6%ZJ{tBmBU*=!|Y|RoQE=t@JP)aG5vvAS!=c
z?4u9IELwyF$-ILJceNb<s>Dv&na}q&QY^VhZ0dAb>hdESn-h3Xaqw!Gvh~LB$+_68
z`80ty5hW6WnZ;Zwjw{OPg*jm3_5D+@QE0bWkrIC*soKXu@r~)1?5?cUh3X6y=?I$O
z^MF<BES`F#{_wL7iv+#ITj8b&3x0FPmo-*`BiI<<%6xO<>JiPno|uN?@IGR??ha@l
zY4Qetn8^srt9LPCGCrepAY>j--R1?0y~cZK$^7M$&~|F2-EVSTur2GzWs{_f;ypat
z?DH?TXh>EFU}QtSj2p!DQcT`sA7(E@<2wP=pK@cbQlpQq<~~uM%gs49%ih^iSjr}v
z^SQqvg)I>WDHbB<?D`x0J=9~ovBY)^!srUH&HVi<^^A5u)L&^nNum>tqq^z_d)k6}
z$JrG?rDt=PSUbYG2a#7``X;}sqt(X?-1qz30%_m%AC@a8J5S}yEbut%%4SL8O4H{1
z&aCnB4MRx7`R+Ak&i=ITek`@DnWy@^YQ66LO5>oki*x~@Kzd?<A}})(D0^DEkqk26
zmKcag8%1=bnHa6zJK}Zw9Lj+!t<GB?;ZO#pK``LDtv!I`N6RFPA|^p8&kLRFXC*Mv
z&vyO$rHAz;>+o^Zw}1wN<lNPRg)#S5yI5>>Tqi2zS0qqbKkr(W=3=&Z%;l%|u5jOC
zThGSDyP<YZQI_+sFnC8ILAz@9h>GGh%&7wBwI_qZ*=whrp;}`W12ZVf?)y2o{~geS
z3~>LvdSDBcs$W<9ZF22(h=MlI6958^<K@HW{jEa3ZblH2=Pom24xaAuF~JfIYlr>9
zOa$55t6Hyg8hw4q_Q1>h>37xV>3sw~T$IL17Kw8e$$}fQWIs}W%X7Q({-Cb)c;>tE
zHGOH-2f+Zb0Th~xvMiqllL1d~WI#OM--#blfE|UuQiFtNgmxP;)uxH$gn8<aViR)k
z3a!(89X3l(i`*^XZq2ynb$2eOEO6m?p{sDMRKyjKw83@sH$HjqS9B}?#}=M!ld4sh
zwNBoJGNWhX4jfb}`<>(3Qhf|=>iW~CR>!&}DK2HHXuq1&QjK9L?&1LpzKnFNuLu=8
zd8f*ZvuqE}szo<**<RK(*NK@hxV^L_W|b9~iLQxt<5kg3w+!OC$}TJM%yQ8#Sm9q|
zT2<X3CM7%`6hu98uwE?VnbC!3qr^-KgHXFyi&-(9Et$;omXVl&>J^c!UhcOI8axQj
znfl8*k4iMifRNEMjf#Gk)v32#YgQ-47&MQDvd05ZyJr(gC+#Fzo8zbP`C}6+%J$9i
zZ!b(t*mRU@GTgeZo%7%-^%Fp$o&xb+E^xPp3`n;??c0}~oN^=sP~Px(zQ5t25M~9*
zz3Jqf#>t)RW%e>F3gN>A{YnNft_I&r5A_DKtX9}mzpkho+47VKO|dVyV{-R9z~Kys
z*d*Hu@Nf9Qohc5$FA?DJ0SDn1hboEr881hq%A&l2DKhV(x1FK)r>Q>GIBw6Ehh>6_
zPM+q^&w$W^Y^p%IP!-1Hrc(p!^0loddXq+V;5@I3h3^JAWa`HP9=?l5NljxKvo{(+
zM>L&eKsbgB-~v`);VZ0sC&zI_*U6(D)ZP;N!0gBf#rs+Pkh!0T0O1;gUfF$DvV8w4
z%<D7r8l%dw<S6N>G#M~khw3QN5!1P3UY%^N4d4dw-FKx<Cm?XpRtjGtkSPNrre7TG
zv6*x<5Tbt^ufExVraqlQ9~YS53IZ#q#1AD0nr@fVs(b}iMm-Pb1g!)ri@X#sZBlUz
zDzxezHPz>j+=OjPzKocDIiN2q{e8QuLEEF;qtd1RpW3tnHV6tKap<<1qZUYNpg5U(
z(xD-^9UVeup6%+<^oQoEYE<>md}1$b-_E8t^}M>#vw$ux`Lo|9pV56Ubp)NHhSFnD
zFWJLYko``nZ7C3%V*Vk?yy|o-nqrzk8}Vl|Zn-RV3D%A-_u@<BOVwzxCh)$d*>pI?
zNBnGfc#yGUNV=Xr=y`C6h1&{U=GsJTV^<e~_G6AEVH~ZXOP)<Z&beKDF{SzG0k76L
z48a!%b$EOY+46KDxmkB&*p?FHUUz6pPmQlhh4ZdVB(@o-w3}LQj#g!G$IFkb_joVb
zPN~Y=%eeVvGX$1!H%Z>>mZ%Ewul73cukuJpc&1AUgRMg|9G=d0@5Dp*^>KXBK(v6H
zY)Ds-s_|#dQim?b;u)(SY(!T<j({zOPa~BTjAg?0@%c1S5^vHQW;dX?V_RHGTyCbQ
zS$R||!fS*h*t7YQ+r-<)b1C%_Ay8$zAIs&lQfXpArPRnJ!04xwzkrZftw#o^?}WRN
z0qthnr4A11ZYw3o1;lEO{mcox4?eVA#unZ-%Mkhynm0KEbJ^Grme1ggXZ)D`X?o0N
z+Ddyesdw#?u<j<d)hXJO{m#ikwp8!o^eFH#8E~2qcN_mWH7HkTL|wiq(RhRv%PMAP
z*Lm@RmaGSlEQ@x{$RZa@1Q-8$)M0VmKOHEa0|Of=`-r&4<B7(dN=Afd_QyD!YSQdJ
z7r_OBKAxoW3wtC#Bxki(Uws-c@=*>{D@5-pX+iOv_}umGi7i$N<up`APS;n?5akJu
zxuF6$NMRIF#rY(=U_907<<A}6&CLNlp(I@!J)uCCz$9&#fJfc!F>=lOMZo15Xb+I^
zS$$ZPc-(VXNb&4-^n=6Cb#3YiFTAonA~l0%j^Fef{dGVUPxX0?3<TZyUNN`fGVzm1
zQRvJM-tnThC1rJ<8zy+E2=2DjUmO`-wGsDk9k;!i{4!@A0;iHpE1sOTx%adD##EAT
zr{?qBG7h{8_QJd&GdR^IY`|?KkiFD6Sz>4NhSmFLN@wbivnND5IF$G%mgIKzVX1qQ
z*&`^{PS|1V*xjVO>*nusC%{S9dsJi(KT^7~uPX0reS~XK(d`~d#L5Y)dPy!)vw_fx
zDem4Ht=1qdbO29i*)sg+)gJAVD7*1tkv{ta$=MMk{K9TRmnH6oZ)!;{O49LHA$mrb
z=%3rn3SS6w#z-;PPOny8f;>9bJpV2E494f|iP+sfoyx(5S;i)5rAxwQ)QNY|Br3vP
ziWhv2y)N=Ga;V%_MVb?k_&P`l9m2aX8u(X)Pu2xHEjs3|J;GmXep|>UN<ZDPwyNNa
zK!nK#2W8X0%sVHyeD{6*Tl+Gw!>q!#=)Z83%8VA(MSlBJo9D!y<C?<H;5*(OGzh6*
z91)-Q<?efwa&RFJaMt8I-FF%ub9j^jiJH)irZ+qfbDwN&=tvAL$Z4ppdRaX8O5?PK
z1<iwEfW};`^5oIz12vY|B_R4VWhp-a_$3lg#SyQP0WUZxrgN8S0Ejy$h09^e`X3@$
z4y8Rc_M^n+w!F>wEX^}jJWJL2dg@=E0g4Bo8<1(>GT0`D`xpl0uPT3viFIb?s!F<d
z39IT9J(><!zgp@@IuBx|tVguE6kq8os->P$6Qj_g#(M;|ZFWKTAbJ|#rd%r%PtqOp
zGArVLrp5>eu4Y?4VjuzV=7^>vD_nTN>8TzX7MqiFr*tjuG_z988xFcWPi=v?X9PIu
ziLwrfN{e)nYOvp~lgN+cBLi}nUQ^s0V|WDL|0Bg?SZ7Pa{nu#wyW3s&zEm_-)Ffff
zV&`=8<NNhboqG}-3)uXWTL+~jSn7?aUi&!Xu$rP!o0`%;Wgyqy&?S_xb}7k<bqJ?o
zMC+^N`*+Q;MdYkyGZD>84GUI%U{WSS2u)6egu{p%=G>UdYoD%XUOtMlL9}TrZ!IaS
zA)Qnd8L&c~51+dTLhJm48UVlD|1}yD0@La8H&#_IJgO^^XK8{k!md|*Xmh4Eyti&$
zW@G!YcH~^zJl_}%#iE;@4Rp}PUVE$RKA?BQu?n9g=->__XoONis<$o+k^z8RGT<Cw
zb>;uo<B9*9MC&T{qYzbvLj9mH@5|Lqf)YYefRK>vhYsF&vGy!_f-kl9gk)k+k)s&+
za=ta^iXB!(XC3Q6kAYtJfq@uoI?VL;8`3kD&@*@^-U4tQy-z1bB{tc2!NT<EBda|O
zw+lDhDX{?rs--&2BeSpMJIs(ZvDzkUQGF|L1!doSKX1OQEfa__j1kB-taLRQz6WxJ
zr|7?apP)k3t3sSQvSig_Bid#zUwS`!+4M&H<b+vZfS%-p@Itc#wzlY4o|e||>}|zh
z%f*Dzz=!tmud`I}mXP^lD`)$W0Qf40(u%om3t#bru$y)fVT?F2v_tks0y}r6sX=99
z(~#i=^8~*&gR9Q>JTJxX3uHhu2!hr*O9nt)c2|cj^Ymx4ALs5So-~VzG=j=8-WG0q
zJTwIyTV2y2wb>uM)mlCSFzQ=LGI?49^Fm&DTOrS^wOcfNUSPwoqe*M(=lVA#FXyLY
zIyi+MuWcCXiLM#I!}wls4H;_zLV;QrjcA_}&z{7Q#7I*}<~n>$9$tMNy%n`3<@rYU
z*KU`adY?y;n6|k@UJBg@qo0<7;*)_2qH<e&INjNC!#2K3XlrJ`F$gbc=#Q|kl3B4B
zb@K)nbkVZ~yee`&))NGu_PA<<NI6EnLBpS;E;d~#XwFK;(|-++PxO}Sj|Ea2)^?|B
zr)UG#TsU7(e^ETFE1jK7Y_(QDPY~W+&otjdXzw4bo1&06=>6;J>e3cpr`)j8&d4~|
zm_X}mZm<nXy)$4xy-VC{47XS_(El+5>Vaz^P+CxjsASSuJcdyaQ=L#=s)xT8&f1AS
zL`X^!FBJ7bf^yuYZitYU!~(6IBlzu}*EroSYY=SAvg`m=)yAlb9pBR^hN*8uqj@>1
z3ED^jS2;%Ss!8yWeySskU6J>uzra-^)wg`or(ZEx)`l7r*uzD@915=p%bhcqI3~cW
zmMQ64#5281BBBxtQ>`+cl4p56H2C=12g)IENB9}H+74Ux;VJ?gO%FY#13uky>A_&v
zO(^&4cReXU6=~XrH$9K)-%4B_y$O<&D@&e&j7$I{Zd(3aEbU7nS-h2kniYh{uMg*?
z5y~hI5hG>Y;QMC7RG&wH8V+MdLa!sm<ZErlBX@82r_p#%+S*P{$+HPbsFt^TW@ta|
zy}dz+5!OtP#;ae2xoG_gm3EO#E``ZYc5(z~6%<#07~F7vm6sFq;MI@orI#3gmcYcD
z4ZvGtz?NFBu;zm77*+3ln?(9an2J%t&+T#T%0i7-F-oqNiqBhHqosM2cpf)^qJR~%
zQR>{VM(q(Sw7T)QnYG1;AS2YA!YPo_aZR<|?NmoWf#@@hb2_-?^bw1u`hdpj<B)w+
z>bGU^e&bJt#k;oSpb;Dj-A4$PWSvVSUPRp?w9ogQbIW$Zom6Kh6f{KLWzQ0dJhrHW
z)yg^=m7AG@m$ehRYV^FuEINEa`X`^8;?Ra0U4@~Sn+Grhp_cPeIMOpoj=Q+siI?Dy
zR%hQQ)g=g}pp95QNjksf_egwqhBsqBalZ&@D+aeOTV5?(+e7UUf*{DoR3hDs^Hwx-
zX)fwWA8KCqcpG`eo%hJUj1*sAq|PJ1T0Kt&7_*T91K{Ao(jSYVx0{wZ2NCdHNRMte
z8Ss*;ss>0$G*@M5x~Z9O-{cv^@RHx>(uH5o9r)&E8Hv&a{bPQDAZS>fj{vtqHvAH&
zVNXHwMQ)M-mW?6iaLF6ztCEzM+Oj6c6R6}iX9Nb&c%7)Ns;=CnQRCXAkq3p0<wHf^
zHoU;g*&N~RBq@Ans~Y{chT6nXsn0NYE2HPcqbY*Pn#w1xX$G%G18C80>tQCD&pBBE
zBLU%i4cqIhJ@9X<)0;NnY1Dm)S`g$AJX$_CTLEpI4&2`$Oodv1b{h#lPY6Nl4>$Mo
z56pA<;q8T*#akkrV`?s@=zwO}=D|<C{5~{0eGcz{$g>R<s~!}^>!g;zFasU?UAKm9
z?==n0xw=RI(jG@~NAm@naekW;`%Iw6i5#OPtBc%&Yw8QvMpFaWgAJ;bA1BBbUsmrO
z`so;}7&?AG(C~^lXb|wIT3s=eevqVMO9;U>bkyhC!)z_%YzIqsKi0Bz`f^ni3BU@p
zjd<R(A@Wn}Pgl61fI;%p2M~#BZ0VBmlBZ7!R<@~mQc7QbZ?-f;QhR5fKD-Zk;g^T(
z>}f)es?I$8{KwY?tGwd)hp5+6oz2T3WmU895CgJ4x1BaYdvN(RJc^MB#nS|P)=NcK
z^KnRw5~VW2n7G4$Z3vce?Jg#XrjB^xB!Bx3oz+1k8Ia;4(0tqus<h)($6+HrHqRS!
zu1%!G6>B2gl-r))e|D@}7kys!17q&(HS;uU=h$1Cd>)ThQC}#td3Tz#WY!w*yskH|
z8yY0s-ZRB4d-U?*jr{1_he99kK4Ctv)&`^pn=PgKANZQW!}5SF6HK{H61;s|)mjJk
z9Wx1(qmZ%A`RtcSd27P<db>sX<tj=zd&>{Z{Kc*^+1980-OnohuU{Wt36QiW>9%|-
zGs7>AY*DWZj&wjz*oQkqg$SaBp`61_2I{XrgITNzdFC0`8TadN$W><!^`zObl#Ay`
zcUb6n$rJ0A)i~ly6<`XMoa@e%c-~OhyMqeU=ev}EOCvWSf260TnR^gNDhU?$cA##U
zoC~`YY(?>Mb4MC&c2G1^5S-_$n*%@jPN-a|`%sX0OPfI=HTs}G)Br*7)StbuI$_?m
zio6vx*HEYHMAOBJeNb{Yxr13$O$@VM+;^5h-NGJ>db$VXTL~A!kz$1R;{sOmK0VFQ
zI`$k-R}oHfmPVyajx8cR>*NkNuyVKqD?%o2zjyXFJF9#8{mR1i^WQ?eMsU+7>1YvY
zPPWT=Q=e}^5YH!?Xxl**d@)T1Xzpf#R&?rfBG5bVf!}w3*7?b<zAslQ*sl=ZJj%UY
zGk-~3Ca5>)Qz6H3FLre>cfGoHchph08k@6-6D}*0%@~A7cK({>@weA$0hKSul}hY|
z-8HbhkBi?ZcYmzGhE9{X{9-bXj@_U&z}S*DhYd5LF3?P%rMP0WZ8b<CJY>2o!7<Jd
zFHwppby&mMmo#|SD_pOY`LWRCbH`R1a@zXaB@8keU-k^58ipISz}0+^`)LKX@tCmh
zPFWCdQF`P${_2Y}16vHI$<47*=DF-~9UWXvGrIW1w9Vl<J{kvkGqz$e(O<zn@u*4v
ztg}AYHMDa(wTtmu=o!U@rBch~w|T=IGjZwb%YG={=;b_)jfb3@Zw#9!;xmcqP!iAl
z?<}Kl`n!fN)m3pH)Am8klh&{${ZD=$TrgJ9YOs8queKb$u$Da1!*!$4DU~t8!$q!z
z)R$cwied!1%tk3ct}R+^K*fgI2O@s@^RW{$j%9vMOib*fH4TCU?j0v?&c~nP!K!|8
z2pdJ~{9)Cb{+U%5@7A-^VbS;cbk>YR=I42Noo;FdD06rli4*4%6)NhMvyK$+mjj+Q
z2op&~*c!SXbX{I=N<FVD{B$l!-i78&l+T7i2@^&KT1f`bBAUu7!z7lf2Md}8w<j!j
zYCeyyBcoVz!)GUE+YO_$>6~!G2~lonIJ-u%VQIn4hX!!q7n9m^Nu3v?@txUnoYKpX
zTQ<VI{^4|gM#td~bPOrz5Y}ud=(u5YDd;Htfesr59lyV#GdUC9Wuvw9VJ_qV&-YSj
zxQR~EWY)O8IhNuL=_ea|r5gBNd^&QguI-`xnHCR9W-}myuTnA-7qFwBsE4;q;A@?r
ztFsqt9dws2O)HFfmn6-jC()84Y-HDU_0~Aw4TkITOQR6DJQ*M+JYE=5?BE=3384hP
zt>OE#V*YA@ShFk|sLVkd?Wi&6M7Z`dAH`>IM}#Uu2Em=ATrn~re`HVi!b}fkwHs2~
zT?d_T`&u|PsN4FEjRZ7`CgacTymz@ziLLk7%A(w+y!0RJm8@(1WD*Oxu@>${6ecXr
zPxg&PwM{@e<C`7^Vbpw%Mor6y3Wk?Mj`cyiKSXptPA>_Z9`IDO;88hBKLXD6Vf`_B
z$V&vN)^u9RP7AGw*UrT47~<6%gNoPVAHC2!_d-KDHZWz$!kT;8%+6=P316P`$4N6i
zdRj`e>bVKtu^oNFZS-qyM~YwFLm}IBR_Mtcwt|;--GUDQM$1>~5qhXcvrOY|N6IT%
zg80-(sogS$PBf<+qs-En-CD4pJB{0ol(T{}g~HA;f?js$CttaK8qO}R4LVr7%uOvg
z<X$hHM!0P^#55<90^iymPNqqY*#A_&aMH}&&Ky0%H9(X=7lY$jZE<hIWg3U&49rVF
zhE)oT3`Gm#EQd)S?mf9A#uLAGqf_j^?(x`D0=8s;Gm4g|fZxw9bFDeB(7cOlA>5t3
z&muN1oYei8Cel<;*DABS*LTV#{lDrPU91lxQhIZsfO7mW*;KRByy>##bGUl2T}-5$
zKa1HGWgbIdy+`(}E$V0b_j)v2k5FxlK4Kz6;*wl5YaJb@6%>4R1YZ5T<Bk0e+#aY0
zoeKX&5_?X`0FjN?{lOQ5ko^wvw_SbAs;~OJkv@`UG20W<wk#fAy#i+eKBmOA9}$Xj
z31#gTaNH|B^f6~iNfqMuB}u<3nTpi+E%+qoLjYqVKx(>At|iow5R5!G`f}vw?D%Mj
zgX9?j&jQ5_VASLa7;ngRQ<V&m`Vm%RDrw`By5)paMC7^o#f_#RJO_}=6JFumRM8#V
zkA@eL77ZUCB#&BFSPt|D*t`!Nl-;gMx~V6~(%tQ&r=};0xM-<0ClzrNl_*Jl8|6}N
z8ddMTeH_8#2{i0L#rrfBa;IVPUVI(&zpl5EQr1&jVQ(9b$o}%E+{~*g(`LXpc8!w6
zQ7>`tvU&@|;)pv0M%kkUO!BzO^ajr{=k$0rjA8{p5TLERoI?_RabXU?OBzKPD)EkX
ziLEu#YHvH(U)tS^XT9HD`ZK9YFM`wK3)>zIu+lIJLi9%iFX(s|Ykq>=nO3EHb2SoQ
zDzN>oyWlLOI5WdKU{k5rzz1?nNATf`kk6v8z{A@lZfZnM9QCfzhux*-En-~glPyv;
zx%DfFb4omh>-&dtB&tM_<7*T98G6>N0-ItGEwM3vvwB_hGi0L6R@ABQ=MGXHVSlX3
zh~`Fw586|XPyN^Wm-sliJNTH0v=~O)7Io?jjAb+>uzyknL4T5ytq60MyV{|+DX;q>
zUFI&<a>}bXNy`)djp9Pi<pNpZb9sCWd(2$0$~p1u(?pRZxtc`D4;Tv+a>Q9%OiZHE
z+V&m#c0p(dH0|x@BEXj;TMZm36CI{LFnYf_VT7Jrx8#BOLMM%W^q{EF6Ey?SvCgsi
zk-{k)J9FeU%Yukhg{q9?nKgP{EsEK6*edqy>|M6Tdh`q?J9}CcI9G4fXZMiKa`Cwr
zA$iDvA8Nng8<(LJmnEelyq`1-4ppM0hlNm#%b4;k8K5N*hDK+Y{bfHr1j3c78dK72
z*`JdE&y?VYl8FRM-m8=Z-Z;u3)Hfa!G1Y$WA{FISsHG0CbHZT5OroQ>YYPoPv>hyu
z6e&Sj`DrMbC)@UcLq@dJ6gObLoo`p#6-W@Iq`M@oP(=2|BpzL=;v-(@qDbdIYkZ4`
znJAWc5&o;4BGg<0h@_uKV(W|rt~~k$$LUCs0m7qUT7X9|zLo)k<=rHexbiT6-)mVx
zDN@($_dny(AUW4Rbr=}qv!9k#_c*9vrA%tR)JfBcaIimKQZm+O`)VzCT_bSW`*>Qc
zDEEmX-#_Z3^AD|;9>oIY;Qy!&-#_BgxOSDAVzmBV9Y6R#z_Rrzhl%zd)ERtCur6~i
zUI4+K>w`JNt><e7c&`a*elx;)p?ws42OXYj0oaz;ah3LiI^!Fm8U>w>99^gER;6Ui
z3vU&Sps62tXXZAa`d^l^{~!Bq9r@o!&o7)7SA}F7$WOp*fb8vlx@0-W{j?1G+$3V_
zdhWCI8(TjkT8VieH3*#E6gc5f0D0*3==?oN@t$s<+!V1V720OcwtD9e8Z0dT-|noD
zKuSs=ct&EtsRB7#r4V_K=VRRUhS$HI@8>-ySQhr%5xOt)n4d+LUod$wXrPuJEO)?V
zj8HZ;zt$+bnVq(C5D9eZF~HcyP3ss|Q+C4qA(r(z#$Sa>%3o*I{W#byCC#E!V<aA0
zVMd$Oc)Xu{F8*-$)YD&%So0M#%RU_H%%UAI>Ii9Vm~#AM{aSDrTr1a}MP)~Po-MHm
zD=mX^u5gGua`{h9G>}nH)PIWb77tA}W2m7F8<fTMGvb@{N(C+TNs^~7?HXf1gL*1&
zOuo%{YqrP$TZDp7z$btUj?Fz5a5Xm;KnRb$n!{Z8`}SX5V%>1p**HpiYa<`iDkVTQ
z2vvPJA7**Xt-}?kSYG8#Q_C{dD|k4g_~Dt(_VC;9ldQp>GssK_mt#$$;4o6q1_rgl
z4R2;UW45T*vL}@_Q1LUp*q)}5?MZ_#TULv)K^)yi9r9zxLX+hmEgF!cmb(q8tjS4R
zhlw$;3uFVk?gEv-A~SdE+iI~Yi10qX3!{|dO@BkiDVw!)yN2FWj0C-I!<U+C3?n#0
zh+1)<-^%yV8{b8&V=o3yl}E<`g949@30$4FBUR&aeY;ysYy0W!AI^>2sb~cHefp&>
z%{jwq$Flm?PJYQAk*G#Fi+-GVF}z=ygeV~zJ#V!E5>1s8BmCm|ZVi1La;(wci?(;r
z3zBGVtU@f_iQ#IYc_cGA_2b2SI2-93N#++ZXf8gmEq&zqCj%F^z)!HuhgmKh6F(rg
zCVtSl4qeK#H(6l!Dm(rZZqZ@ke9b4Q;9y;(2}w6eG>IqulDj+#PwJNf#Y`V+TMVX<
z>TzBBa|B0xuziD6jIjK&4*a~9|0g%gbZ10wR)%WVJD2)c#e#&J0x=98Gu9sJgY7!B
z*mhhm^prbN;Eml-$?gd|W?*7l3`=cXiHt8DHyMt||02=ad9$I!N8Fib^IRv`u`7?V
za=_PZwpxHR1Wl9Sst|4nH(I0scVJpyA#=AYFd#iR25oU?mL<d5YV&HRkM|ETom(d_
zRE>ks$3Lo7fXu5Ci@gYR+T|sDO*5vju5w^cwmCyVIlBAdw^uq)o-5`RHkQoC&Gn9b
zU15^R#QFtFAo0m3ROX(|wP5X&kkDN0K|Q!8W%^^7CYq0zvY8V}`pM|dX7#WRIKibh
z^M2CVU`^Vai{&eijH4f9yUqgBlrp=I!NDVtBB9#2t@u#4IlgoDFiZ2;LH*jH>Szy1
zPi(efb={7&@LP`V%DYcrQN8Fi(%TQ=j=yW*c_<0-csMw}P3n}jgb0mt+M&`o<L|&c
z&y0q(zNszn1~HJ>+|?QI*=^X{YhZ<_j`XSE<fOLlo{Qj*;}fq%%m6dajqk5LtSVFb
ze)%2e!?$47yU^(alYr1E+<4V!YtJC~J?zt{XHpJ!E2O8m)WO=bv<f9<zu^O9MnRyA
ziO+z{O&aqCw<Q!T@BvR<5cUO;nf~4`h50{tUDD>Q*+(Y3!*Xq-%nogr53QoYe*tR(
zqHvw9>N1I14IB>qIDH%WPm;1-9fKPzZiuHWb}y^~4;83}X&MuSPO+6Q+C&jqXWL#A
zG+XxdMcx$KNj>$W1k2XF6ymB8>>bqZ!e_iMC#Lw*joIC0V0{PEsJXMlcljWm3~<^y
zzsARmlyD1{7>&YiH9<<<8d4Gt7^Nd;#Pq|IB`VQ@C+kYO=8wNW+&Oh$J>AMK=25bi
z{CxLx>01bv9|2bK`K08q>T9z)cDM$6iT<_kd5&1*(3ei?sX5Z#bQ2nF9ahO}tUf_B
z(fgvgdmj2<wou$%AKM+@5cvf~54U%JF1x5{=z4lmC6CtVOXiOhP9xo7MEJNmU_e&w
z%#oVD`49>%Qd{3JDB;&bZ!{#i$v*vBl3Ig?SscpRkRKx;rajI;Wzm^TSl(B}7q-WP
z&G4o5l;bi|HfB|>8E919Uj=1#muD}7xViYc3WQnATq@0b-M-kCG5<Wih?6NI-XC~|
z0>rdFdg~=ou=rlO#QR`}WDH$39sf|-o)Y_(NmKQEnJEYMl)2BX{7EjZU6oGSPisVl
z@0~F?7dkU=-)8!nroTZ~%6{Mhme-ksJu{^t)2zHcf9cH&$j4F{(DqKsJ~Hmj%px?S
zOgr%wB@;_o>sTX{>Q|^g<l~H+SgBi4u*W7kUB1>Q?K;EjjsbpE@z@V`4^#P{gOo$B
zognx6IAEq<8yZ9J5x6n-;C2ONI}Y_T0}{Nmb`hnE2}+LEOoh@cwlVrO$6j<1Pq%mK
z!=Id_QNrU<XwU{4-A7A^rtGdK9C!vD2UzTt*YxJ<VudbrN;<{LTQ~#Www_i!<5|7v
zz;=>}yyiX&P-VrHwb@v<VpUp6Jf!al$F_q+y`Yc~+2GJG-5<GKzC;)=hWOj1^`-E9
znYl$9%Hy;0Ncw`iWOh}2+11tiJ4@g+1qmg;h>yFK_m<n6LcdgTLChACv7B(0{>6qk
zJ#bG+8PjUsz#eo`3{6U%=gwx%G_=Stqx@d6+?470Cw({HKq$?dE;q)3uMbktCQ3IM
zJO?~)KMjnp{!YAlf~=zC7fvL$hA0wmV(8Bz1qcr7ZFB>xsY{pD&^MTczK?uQ<di{e
zbqPFlRE@!iW;UL@L5jfg=8=gQi4g07E%9C8#cB6-znN>pP8{-vm%HWnR|`CBxvlwQ
zolFG|6R&AMTCuMz#=-a9@dvHd1fBhMTxic6ka3ovV{(2i6^N`(-3T|B5}IV_B1J3Q
zo-~7EEIO}S@uXjrO_iMr?y=TS`Z%JmBju7e?1B9(d$i;xu2moOpnzD0-hX@07`*Mf
ze);n5=-U-_KGH<^<*2#B))RQgD1J2<6<0-X;EolS?P`p(R}!{5Fi_F1px1vWh-H~l
zF8nzQ{5f_Y2buGI6+~m%$@Slu^n4C(HjmttotsM@hzFF5>z?tt2mma+`4uRNF9WK6
zNYyBsbDEVc^e;$4H99w7OOFvu-B~rt4oi~PgfFclwtkj{C)#2^*EHq~Ik|3m+%Bgo
zyz)d%=j}4zyECQ3YNjM0CCiZjJi30j-hpb9mzuVNFP873Uo*U&m#Q3BGQsq;*nTx2
zn7zR5#!!>NzF6clbkYv?Li=N<B&ED)J%-i;*Nv~b7Ag*$CzXCMb!k{@i^J7Szl==L
zHu+%njK$Sana)e~6_qJhf>a;QJzc1)OS;+}&-LBZ9qR08=AnK*)Pi8`f{~&pa2<bp
zO$Y=Hd+w<L?S?izfmKa1P*0&Ow8i&Zc!!N7JzjyG7Im+Z0#iv!s_{=G|Ii%1qO_o(
zPa!50ngdIrkC{%<srf?c+Ii9FNagJ4EN!k)xqRPJ6gsNS>GyGU#M^A*E|cV-UT;=K
zfAOcCn(XFqa7a^O*HD(a^m1Mgmi3KW@wW*%B{To~J=?-A#HN|O-T}Ue`L7CmtQ;+3
zB@S?~9$Y<{Cq8ecG+S*!TD4+Qcr|LHOh!Q6(OUo1%epDL&nRXfggFw$n*Vs9N$dI~
z#Y}aT6%3Qo0t;>ItlBGkv#xClBwRBQ6o`?(8RUenc^|tyIXe!-1jeeXxRQiM<>Doe
zMsMTIM@mx-F$m+4wIB2KkrUIhWfC3`r^su0e+>8dcMYi?!+6k!OIRVP56RWPhqdWw
zHNd5|G+VZ$w~u5pwoes#%LWJ;(p<X~G;iuA#@5p4X>@T@k=^#q#07unfaHzA%Eb)N
zp9*f(G<o@{a#;<cdsD+hsS<KOGpYv-N?r5IdYlgJGLo9?OOtE&P|TzWIFqU#xLA*=
zHq3p3H!HnhK{+x8UN|LO6<=|U{Tf<Nh^4mcl9uBYG&R>c=~AfOFOu|%sk<^`Pus8Y
zspiZfj)0qE_T$~}Brc8|(7m~RY;7eTonM^CP<$#}4M%!j5<Y`e#Uq9&q5Dn83S8-P
zs0$o@*=K3TAZdTnG=*^M=$RJ7ub&-4Q{~r^rbXkwJr)Gs4evsohK8SCIoh2lh)>D>
z42v`7c+*K6y$8IY_agGDX%BLUF2!Y%kJ~ZEJm9Lugnebt_Dd$Fw|PCn*0$50lB34K
zRk_oHZyGEtDyQkidZgcdE_c%!fV+v5<uz9)Sp?WLdtxh9QEfn+36K$HJEzblp>Kpw
zZ3Qz&^Rm^CVm)N(GcB$bW^R;vKB}^;aeL7{P-4t-F@ABoj>fWB|M(sZ-cr+m?Wji3
zmu+BeCUx1BA4i0!ZCJ{TxB5s}Tzyet|J}H|G3TDR3j;7<%Z_r|Uun@Sx{-+I{wn65
zPX>6vkRTSd_Z`;iJ(q?&OFusER#9LqR;HamJmdD<Jo}w82x>9<#e7`N&DjzDMRK!j
z*5De8Q5(d5s;sx>N1O4KSkkcSvDj-N8JQnkT@5lu^WBe9uLo&a-#v#v$m(&gFDd}H
z3n6-kXASJjd`!AmCqNwS{j2#C%>_Z=pH=pLmX-GRGmaf$fo<8GsvKwt@1(^LLe(XI
zcFkywl0Ea;MlBzIdt~R@^9zcB$xbX)5c;-HYg}e$meP)0hzi3H|G4N-O&J^4VE^7S
zxt@;XpwrF6nT?RFr2(C2i3Q`N4_Ra1^MZYMBw<@o*_GLC%;yN%=-#4YFqZ>LKB{m%
zSi8z|&$dWX0s`H9kahYQMmJr*w$|1!DwJe;S3Teg(q<kCf0P)_D@xF(eZD7Fc4lIN
z0Q{O>_FNSh2oCbv1~UgT+|cn2h&;{yxqR}2>pVEV=ZXqaYid4qVIV2)(}1PrlFjk3
zT&-lob@v~_ZoVFw(eu7q#m@r48_jAHfwj%KsH*V&;$)H10k!#WsH)oMp&`yCQ`YX5
zzdCcQL=fR}m#=Rbz)BW&YV06&u`>M%<BL~*oxknGb0Mp-HJra14~;63vsc#>Dj!1R
zHP*Tb!0hw<ney|V{Ji@*`2pR^ExDa+tj65BAqUX|$Nbzc4y$ksZkzB(=ZKXZTb#au
zTXC*S3XJwCPptu)1yK2h&#{Et9Qj;Lp&Pz%JNF5I8gLH3!@$dxtZ1GG566mZ4&0xp
zO5Pl-tf;UUIZ)$4u|*dvnU<v1gR8QzqG0>+b~V%HEsl?El$?(s(b7L<eN0`n(AlT_
z62Q;+gtA^wU!*G2a)LvE2U>iSh9~{ExOV^j_5UC&Qu{lfPkP3%@8Nd=gpuDn{IY+w
zyZ@hhf5`NwX3E~e(FLKDqaBSh;+yA`{|k^u;<D_R-Q}W$4i$lfSin(3?4i!zzXSe#
zjU49UPyc4~XT1K6&Htaq&Byj*eZqKt=l-Y{aK4wBB=AK2OD^(084#I@uRS?~+P+VD
eS6FkB7wY08kF0zZCc)45<0`fM@3}=D|Gxm7|5q~r

literal 0
HcmV?d00001


From a69c3fd0b850ff7ab302e12d56649256a7914a0f Mon Sep 17 00:00:00 2001
From: Alexander Nezdoiminoga <alex@magecore.com>
Date: Thu, 17 Dec 2015 18:07:00 +0200
Subject: [PATCH 162/471] BAP-8910: Rest API - suppress MD warnings in Unit
 tests

---
 .../ApiBundle/Tests/Unit/Request/ValueNormalizerTest.php     | 5 +++++
 .../EntityBundle/Tests/Unit/ORM/DoctrineHelperTest.php       | 1 +
 .../Tests/Unit/SimpleEntitySerializerTest.php                | 3 +++
 .../Tests/Unit/ToOneEntitySerializerTest.php                 | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/src/Oro/Bundle/ApiBundle/Tests/Unit/Request/ValueNormalizerTest.php b/src/Oro/Bundle/ApiBundle/Tests/Unit/Request/ValueNormalizerTest.php
index 1a4a9396c58..0b9ccf6f24c 100644
--- a/src/Oro/Bundle/ApiBundle/Tests/Unit/Request/ValueNormalizerTest.php
+++ b/src/Oro/Bundle/ApiBundle/Tests/Unit/Request/ValueNormalizerTest.php
@@ -164,6 +164,11 @@ public function testNormalizeValue($expectedValue, $value, $dataType, $requestTy
         }
     }
 
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     *
+     * @return array
+     */
     public function normalizeValueProvider()
     {
         return [
diff --git a/src/Oro/Bundle/EntityBundle/Tests/Unit/ORM/DoctrineHelperTest.php b/src/Oro/Bundle/EntityBundle/Tests/Unit/ORM/DoctrineHelperTest.php
index 5564d464b1d..f970eb842ce 100644
--- a/src/Oro/Bundle/EntityBundle/Tests/Unit/ORM/DoctrineHelperTest.php
+++ b/src/Oro/Bundle/EntityBundle/Tests/Unit/ORM/DoctrineHelperTest.php
@@ -13,6 +13,7 @@
  * @SuppressWarnings(PHPMD.TooManyMethods)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
+ * @SuppressWarnings(PHPMD.ExcessiveClassLength)
  */
 class DoctrineHelperTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/src/Oro/Component/EntitySerializer/Tests/Unit/SimpleEntitySerializerTest.php b/src/Oro/Component/EntitySerializer/Tests/Unit/SimpleEntitySerializerTest.php
index 2adeb4d8f90..f0cf654ce24 100644
--- a/src/Oro/Component/EntitySerializer/Tests/Unit/SimpleEntitySerializerTest.php
+++ b/src/Oro/Component/EntitySerializer/Tests/Unit/SimpleEntitySerializerTest.php
@@ -2,6 +2,9 @@
 
 namespace Oro\Component\EntitySerializer\Tests\Unit;
 
+/**
+ * @SuppressWarnings(PHPMD.ExcessiveClassLength)
+ */
 class SimpleEntitySerializerTest extends EntitySerializerTestCase
 {
     public function testReuseExistingJoin()
diff --git a/src/Oro/Component/EntitySerializer/Tests/Unit/ToOneEntitySerializerTest.php b/src/Oro/Component/EntitySerializer/Tests/Unit/ToOneEntitySerializerTest.php
index 1c057fe3b4a..19e3cadc5b6 100644
--- a/src/Oro/Component/EntitySerializer/Tests/Unit/ToOneEntitySerializerTest.php
+++ b/src/Oro/Component/EntitySerializer/Tests/Unit/ToOneEntitySerializerTest.php
@@ -414,6 +414,9 @@ public function testManyToOneBidirectionalWithManyToManyIds()
         );
     }
 
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
     public function testManyToOneBidirectionalWithManyToMany()
     {
         $qb = $this->em->getRepository('Test:Product')->createQueryBuilder('e')

From 14a9c0670e6096e3a41bb40722c13588680bb736 Mon Sep 17 00:00:00 2001
From: AlexandrDmitriev <admitriev@magecore.com>
Date: Thu, 17 Dec 2015 17:47:36 +0200
Subject: [PATCH 163/471] CRM-4812: Integration connectors sorting should be
 same as in services.yml - fix sorting

---
 .../Provider/SyncProcessor.php                | 27 +++-------
 .../Tests/Unit/Provider/SyncProcessorTest.php | 52 ++++++++++++++++++-
 .../Tests/Unit/Stub/TestConnector.php         |  2 +-
 3 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php b/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php
index 2376a1b7a18..5bd10bbf4dc 100644
--- a/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php
+++ b/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php
@@ -4,6 +4,7 @@
 
 use Doctrine\Common\Persistence\ManagerRegistry;
 
+use Oro\Component\PhpUtils\ArrayUtil;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 use Oro\Bundle\ImportExportBundle\Context\ContextInterface;
@@ -99,11 +100,6 @@ protected function processConnectors(Integration $integration, array $parameters
                 }
                 $status = $this->processIntegrationConnector($integration, $connector, $parameters);
 
-                /**
-                 * Moved from ChannelRepository::addStatus method contract
-                 */
-                $this->doctrineRegistry->getManager()->flush();
-
                 $isSuccess = $isSuccess && $this->isIntegrationConnectorProcessSuccess($status);
                 $processedConnectorStatuses[$connector->getType()] = $status;
             } catch (\Exception $exception) {
@@ -168,21 +164,12 @@ protected function getTypesOfConnectorsToProcess(Integration $integration, calla
      */
     protected function getSortedConnectors(array $connectors)
     {
-        usort($connectors, function ($firstConnector, $secondConnector) {
-            $firstConnectorOrder = $secondConnectorOrder = OrderedConnectorInterface::DEFAULT_ORDER;
-            if ($firstConnector instanceof OrderedConnectorInterface) {
-                $firstConnectorOrder = $firstConnector->getOrder();
-            }
-            if ($secondConnector instanceof OrderedConnectorInterface) {
-                $secondConnectorOrder = $firstConnector->getOrder();
-            }
-
-            if ($firstConnectorOrder == $secondConnectorOrder) {
-                return 0;
-            }
-
-            return ($firstConnectorOrder < $secondConnectorOrder) ? -1 : 1;
-        });
+        $sortCallback = function ($connector) {
+            return $connector instanceof OrderedConnectorInterface
+                ? $connector->getOrder()
+                : OrderedConnectorInterface::DEFAULT_ORDER;
+        };
+        ArrayUtil::sortBy($connectors, false, $sortCallback);
 
         return $connectors;
     }
diff --git a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/SyncProcessorTest.php b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/SyncProcessorTest.php
index d1204ef2b9b..6de889d50f0 100644
--- a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/SyncProcessorTest.php
+++ b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/SyncProcessorTest.php
@@ -103,7 +103,7 @@ public function testProcess($data, $expected)
         $jobResult = new JobResult();
         $jobResult->setContext(new TestContext());
         $jobResult->setSuccessful(true);
-        $mocker = $this->jobExecutor->expects($this->any())
+        $mocker = $this->jobExecutor->expects($this->exactly(count($expected)))
             ->method('executeJob');
         call_user_func_array([$mocker, 'withConsecutive'], $expected);
         $mocker->willReturn($jobResult);
@@ -164,6 +164,8 @@ public function testProcessDataProvider()
                         $firstTestConnector = 'firstTestConnector',
                         $secondTestConnector = 'secondTestConnector',
                         $thirdTestConnector = 'thirdTestConnector',
+                        $fourthTestConnector = 'fourthTestConnector',
+                        $fifthTestConnector = 'fifthTestConnector',
                     ],
                     'integrationType'       => $integrationType = 'testChannelType',
                     'channel'               => $channel = 'testChannel',
@@ -197,14 +199,60 @@ public function testProcessDataProvider()
                             $this->prepareConnectorStub(
                                 $thirdTestConnector,
                                 $thirdTestConnectorJob = 'third test job',
-                                $firstTestConnectorEntity = 'thirdTestEntity',
+                                $thirdTestConnectorEntity = 'thirdTestEntity',
                                 false,
                                 50
                             )
+                        ],
+                        [
+                            $integrationType,
+                            $fourthTestConnector,
+                            $this->prepareConnectorStub(
+                                $fourthTestConnector,
+                                $fourthTestConnectorJob = 'fourth test job',
+                                $fourthTestConnectorEntity = 'fourthTestEntity',
+                                true,
+                                50
+                            )
+                        ],
+                        [
+                            $integrationType,
+                            $fifthTestConnector,
+                            $this->prepareConnectorStub(
+                                $fifthTestConnector,
+                                $fifthTestConnectorJob = 'fifth test job',
+                                $fifthTestConnectorEntity = 'fifthTestEntity',
+                                true,
+                                50
+                            )
                         ]
                     ]
                 ],
                 'expected' => [
+                    [
+                        'import',
+                        $fourthTestConnectorJob,
+                        [
+                            'import' => [
+                                'processorAlias' => false,
+                                'entityName'     => $fourthTestConnectorEntity,
+                                'channel'        => $channel,
+                                'channelType'    => $integrationType
+                            ]
+                        ]
+                    ],
+                    [
+                        'import',
+                        $fifthTestConnectorJob,
+                        [
+                            'import' => [
+                                'processorAlias' => false,
+                                'entityName'     => $fifthTestConnectorEntity,
+                                'channel'        => $channel,
+                                'channelType'    => $integrationType
+                            ]
+                        ]
+                    ],
                     [
                         'import',
                         $secondTestConnectorJob,
diff --git a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Stub/TestConnector.php b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Stub/TestConnector.php
index bcc34e53ea3..a7549883d7a 100644
--- a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Stub/TestConnector.php
+++ b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Stub/TestConnector.php
@@ -75,7 +75,7 @@ protected function getConnectorSource()
      */
     public function isAllowed(Channel $integration, array $processedConnectorsStatuses)
     {
-        $this->allowed;
+        return $this->allowed;
     }
 
     /**

From a8fcc5fa35550ed3b0c420b567739d554ede499f Mon Sep 17 00:00:00 2001
From: AlexandrDmitriev <admitriev@magecore.com>
Date: Thu, 17 Dec 2015 19:05:57 +0200
Subject: [PATCH 164/471] CRM-4812: Integration connectors sorting should be
 same as in services.yml - fix code style

---
 src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php b/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php
index 5bd10bbf4dc..26eb1fd6d72 100644
--- a/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php
+++ b/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php
@@ -4,9 +4,9 @@
 
 use Doctrine\Common\Persistence\ManagerRegistry;
 
-use Oro\Component\PhpUtils\ArrayUtil;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
+use Oro\Component\PhpUtils\ArrayUtil;
 use Oro\Bundle\ImportExportBundle\Context\ContextInterface;
 use Oro\Bundle\ImportExportBundle\Processor\ProcessorRegistry;
 use Oro\Bundle\IntegrationBundle\Entity\Channel as Integration;

From a94dc855a5fe869522496a880003531de766692c Mon Sep 17 00:00:00 2001
From: Dmytro Krushelnytskyi <dkrushelnytskyi@magecore.com>
Date: Thu, 17 Dec 2015 19:11:11 +0200
Subject: [PATCH 165/471] BAP-9073: Change cron strategy to prevent overflow
 jobs queue - refactoring cron command - added tests - added options
 skipCheckDaemon, using in tests

---
 .../Bundle/CronBundle/Command/CronCommand.php | 168 ++++++++++++-----
 .../Bundle/CronBundle/Helper/CronHelper.php   |  17 ++
 .../CronBundle/Resources/config/services.yml  |   3 +
 .../Tests/Unit/Command/CronCommandTest.php    | 170 ++++++++++++++++++
 4 files changed, 313 insertions(+), 45 deletions(-)
 create mode 100644 src/Oro/Bundle/CronBundle/Helper/CronHelper.php
 create mode 100644 src/Oro/Bundle/CronBundle/Tests/Unit/Command/CronCommandTest.php

diff --git a/src/Oro/Bundle/CronBundle/Command/CronCommand.php b/src/Oro/Bundle/CronBundle/Command/CronCommand.php
index 30a8f586e77..b5ec3ff3c98 100644
--- a/src/Oro/Bundle/CronBundle/Command/CronCommand.php
+++ b/src/Oro/Bundle/CronBundle/Command/CronCommand.php
@@ -2,23 +2,32 @@
 
 namespace Oro\Bundle\CronBundle\Command;
 
-use Oro\Bundle\CronBundle\Entity\Manager\JobManager;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputOption;
 
 use JMS\JobQueueBundle\Entity\Job;
 
+use Oro\Bundle\CronBundle\Entity\Manager\JobManager;
 use Oro\Bundle\CronBundle\Command\CronCommandInterface;
 use Oro\Bundle\CronBundle\Entity\Schedule;
 
 class CronCommand extends ContainerAwareCommand
 {
+    const NAME = 'oro:cron';
+
     protected function configure()
     {
         $this
-            ->setName('oro:cron')
-            ->setDescription('Cron commands launcher');
+            ->setName(self::NAME)
+            ->setDescription('Cron commands launcher')
+            ->addOption(
+                'skipCheckDaemon',
+                null,
+                InputOption::VALUE_NONE,
+                'Skipping check daemon is running'
+            );
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
@@ -31,13 +40,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
             return;
         }
 
-        $commands   = $this->getApplication()->all('oro:cron');
-        $em         = $this->getContainer()->get('doctrine.orm.entity_manager');
-        $daemon     = $this->getContainer()->get('oro_cron.job_daemon');
-        $schedules  = $em->getRepository('OroCronBundle:Schedule')->findAll();
+        $commands = $this->getApplication()->all('oro:cron');
+        $em = $this->getContainer()->get('doctrine.orm.entity_manager');
+        $daemon = $this->getContainer()->get('oro_cron.job_daemon');
+        $schedules = $em->getRepository('OroCronBundle:Schedule')->findAll();
+        $skipCheckDaemon = $input->getOption('skipCheckDaemon');
 
         // check if daemon is running
-        if (!$daemon->getPid()) {
+        if (!$skipCheckDaemon && !$daemon->getPid()) {
             $output->writeln('');
             $output->write('Daemon process not found, running.. ');
 
@@ -53,67 +63,135 @@ protected function execute(InputInterface $input, OutputInterface $output)
         foreach ($commands as $name => $command) {
             $output->write(sprintf('Processing command "<info>%s</info>": ', $name));
 
-            if (!$command instanceof CronCommandInterface) {
-                $output->writeln(
-                    '<error>Unable to setup, command must be instance of CronCommandInterface</error>'
-                );
+            if ($this->skipCommand($command, $output)) {
+                continue;
+            }
 
+            if (empty($schedule = $this->getSchedule($schedules, $name))) {
+                $schedule = $this->createSchedule($command, $name, $output);
+                $em->persist($schedule);
                 continue;
             }
 
-            if (!$command->getDefaultDefinition()) {
-                $output->writeln('<error>no cron definition found, check command</error>');
+            $schedule = current($schedule);
+            $this->checkDefinition($command, $schedule);
+            $job = $this->createJob($output, $schedule, $name);
 
-                continue;
+            if ($job) {
+                $em->persist($job);
             }
+        }
 
-            $schedule = array_filter(
-                $schedules,
-                function ($element) use ($name) {
-                    return $element->getCommand() == $name;
-                }
+        $em->flush();
+
+        $output->writeln('');
+        $output->writeln('All commands finished');
+    }
+
+    /**
+     * @param $command
+     * @param OutputInterface $output
+     *
+     * @return bool
+     */
+    protected function skipCommand($command, OutputInterface $output)
+    {
+        if (!$command instanceof CronCommandInterface) {
+            $output->writeln(
+                '<error>Unable to setup, command must be instance of CronCommandInterface</error>'
             );
 
-            if (empty($schedule)) {
-                $output->writeln('<comment>new command found, setting up schedule..</comment>');
+            return true;
+        }
 
-                $schedule = new Schedule();
-                $schedule
-                    ->setCommand($name)
-                    ->setDefinition($command->getDefaultDefinition());
+        if (!$command->getDefaultDefinition()) {
+            $output->writeln('<error>no cron definition found, check command</error>');
 
-                $em->persist($schedule);
+            return true;
+        }
 
-                continue;
+        return false;
+    }
+
+    /**
+     * @param Schedule[] $schedules
+     * @param $name
+     *
+     * @return array
+     */
+    protected function getSchedule($schedules, $name)
+    {
+        $schedule = array_filter(
+            $schedules,
+            function ($element) use ($name) {
+                /** @var Schedule $element */
+                return $element->getCommand() == $name;
             }
+        );
 
-            $schedule = current($schedule);
+        return $schedule;
+    }
 
-            $defaultDefinition = $command->getDefaultDefinition();
-            if ($schedule->getDefinition() != $defaultDefinition) {
-                $schedule->setDefinition($defaultDefinition);
-            }
+    /**
+     * @param CronCommandInterface $command
+     * @param $name
+     * @param OutputInterface $output
+     *
+     * @return Schedule
+     */
+    protected function createSchedule(CronCommandInterface $command, $name, OutputInterface $output)
+    {
+        $output->writeln('<comment>new command found, setting up schedule..</comment>');
 
-            $cron = \Cron\CronExpression::factory($schedule->getDefinition());
+        $schedule = new Schedule();
+        $schedule
+            ->setCommand($name)
+            ->setDefinition($command->getDefaultDefinition());
 
-            /**
-             * @todo Add "Oro timezone" setting as parameter to isDue method
-             */
-            if ($cron->isDue() && !$this->hasJobInQueue($name)) {
-                $job = new Job($name);
+        return $schedule;
+    }
 
-                $em->persist($job);
+    /**
+     * @param \Oro\Bundle\CronBundle\Command\CronCommandInterface $command
+     * @param Schedule $schedule
+     */
+    protected function checkDefinition(CronCommandInterface $command, Schedule $schedule)
+    {
+        $defaultDefinition = $command->getDefaultDefinition();
+        if ($schedule->getDefinition() != $defaultDefinition) {
+            $schedule->setDefinition($defaultDefinition);
+        }
+    }
+
+    /**
+     * @param OutputInterface $output
+     * @param Schedule $schedule
+     * @param $name
+     *
+     * @return bool|Job
+     */
+    protected function createJob(OutputInterface $output, Schedule $schedule, $name)
+    {
+        $cronHelper = $this->getContainer()->get('oro_cron.helper.cron');
+        $cron = $cronHelper->createCron($schedule->getDefinition());
+        /**
+         * @todo Add "Oro timezone" setting as parameter to isDue method
+         */
+        if ($cron->isDue()) {
+            if (!$this->hasJobInQueue($name)) {
+                $job = new Job($name);
 
                 $output->writeln('<comment>added to job queue</comment>');
+
+                return $job;
             } else {
-                $output->writeln('<comment>skipped</comment>');
+                $output->writeln('<comment>already exists in job queue</comment>');
             }
+        } else {
+            $output->writeln('<comment>skipped</comment>');
         }
 
-        $em->flush();
-
-        $output->writeln('');
-        $output->writeln('All commands finished');
+        return false;
     }
 
     /**
diff --git a/src/Oro/Bundle/CronBundle/Helper/CronHelper.php b/src/Oro/Bundle/CronBundle/Helper/CronHelper.php
new file mode 100644
index 00000000000..27a9654ea4a
--- /dev/null
+++ b/src/Oro/Bundle/CronBundle/Helper/CronHelper.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Oro\Bundle\CronBundle\Helper;
+
+class CronHelper
+{
+    /**
+     * @param $definition
+     * @return \Cron\CronExpression
+     */
+    public function createCron($definition)
+    {
+        $cron = \Cron\CronExpression::factory($definition);
+
+        return $cron;
+    }
+}
\ No newline at end of file
diff --git a/src/Oro/Bundle/CronBundle/Resources/config/services.yml b/src/Oro/Bundle/CronBundle/Resources/config/services.yml
index 6533f4e57ec..b2d0e71e61c 100644
--- a/src/Oro/Bundle/CronBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/CronBundle/Resources/config/services.yml
@@ -39,3 +39,6 @@ services:
             - @oro_cron.command_args_tokenizer
         tags:
             - { name: oro_filter.extension.orm_filter.filter, type: command_with_args }
+
+    oro_cron.helper.cron:
+        class: Oro\Bundle\CronBundle\Helper\CronHelper
\ No newline at end of file
diff --git a/src/Oro/Bundle/CronBundle/Tests/Unit/Command/CronCommandTest.php b/src/Oro/Bundle/CronBundle/Tests/Unit/Command/CronCommandTest.php
new file mode 100644
index 00000000000..e993b7fecbb
--- /dev/null
+++ b/src/Oro/Bundle/CronBundle/Tests/Unit/Command/CronCommandTest.php
@@ -0,0 +1,170 @@
+<?php
+
+namespace Oro\Bundle\CronBundle\Tests\Unit\Command;
+
+use Doctrine\ORM\EntityManager;
+
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\Console\Tester\CommandTester;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+
+use Oro\Bundle\CronBundle\Command\CronCommand;
+use Oro\Bundle\TestFrameworkBundle\Test\WebTestCase;
+
+/**
+ * @dbIsolation
+ */
+class CronCommandTest extends WebTestCase
+{
+    /** @var CronCommand */
+    protected $command;
+//
+    /** @var ContainerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $container;
+//
+    /** @var EntityManager|\PHPUnit_Framework_MockObject_MockObject */
+    protected $emMock;
+
+
+    protected function setUp()
+    {
+        $this->initClient();
+    }
+
+    protected function tearDown()
+    {
+        unset($this->container, $this->command, $this->emMock);
+    }
+
+    public function testCheckRunDuplicateJob()
+    {
+        $kernel = self::getContainer()->get('kernel');
+
+        $this->mockCronHelper(true);
+        $application = new Application($kernel);
+        $application->add(new CronCommand());
+
+        $command = $application->find('oro:cron');
+        $commandTester = new CommandTester($command);
+        $commandTester->execute(array(
+            'command'      => $command->getName(),
+            '--skipCheckDaemon' => true,
+        ));
+
+        $result = $this->runCommand(CronCommand::NAME, []);
+        $this->assertNotEmpty($result);
+
+        $this->checkMessage('AllJobAdded', $result);
+
+        $result = $this->runCommand(CronCommand::NAME, []);
+        $this->assertContains('Processing command "oro:cron:cleanup": already exists in job queue', $result);
+
+        $this->checkMessage('AllJobAlreadyExist', $result);
+    }
+
+    public function testSkipAllJob()
+    {
+        $kernel = self::getContainer()->get('kernel');
+        $this->mockCronHelper();
+        $application = new Application($kernel);
+        $application->add(new CronCommand());
+
+        $command = $application->find('oro:cron');
+        $commandTester = new CommandTester($command);
+        $commandTester->execute(array(
+            'command'      => $command->getName(),
+            '--skipCheckDaemon' => true,
+        ));
+
+        $result = $this->runCommand(CronCommand::NAME, []);
+        $this->assertNotEmpty($result);
+
+        $this->checkMessage('AllJobSkip', $result);
+    }
+
+    protected function checkMessage($key, $result)
+    {
+        $messages = [
+            'AllJobAlreadyExist' => [
+                'Processing command "oro:cron:enterprise:license": already exists in job queue',
+                'Processing command "oro:cron:cleanup": already exists in job queue',
+                'Processing command "oro:cron:daemon": already exists in job queue',
+                'Processing command "oro:cron:integration:sync": already exists in job queue',
+                'Processing command "oro:cron:batch:cleanup": already exists in job queue',
+                'Processing command "oro:cron:imap-sync": already exists in job queue',
+                'Processing command "oro:cron:ews-sync": already exists in job queue',
+                'Processing command "oro:cron:import-tracking": already exists in job queue',
+                'Processing command "oro:cron:tracking:parse": already exists in job queue',
+                'Processing command "oro:cron:send-reminders": already exists in job queue',
+                'Processing command "oro:cron:calculate-tracking-event-summary": already exists in job queue',
+                'Processing command "oro:cron:send-email-campaigns": already exists in job queue',
+                'Processing command "oro:cron:lifetime-average:aggregate": already exists in job queue',
+                'Processing command "oro:cron:analytic:calculate": already exists in job queue',
+                'Processing command "oro:cron:magento:cart:expiration": already exists in job queue',
+                'Processing command "oro:cron:mailchimp:export": already exists in job queue',
+                'Processing command "oro:cron:dotmailer:export-status:update": already exists in job queue'
+            ],
+            'AllJobAdded' => [
+                'Processing command "oro:cron:enterprise:license": added to job queue',
+                'Processing command "oro:cron:cleanup": added to job queue',
+                'Processing command "oro:cron:daemon": added to job queue',
+                'Processing command "oro:cron:integration:sync": added to job queue',
+                'Processing command "oro:cron:batch:cleanup": added to job queue',
+                'Processing command "oro:cron:imap-sync": added to job queue',
+                'Processing command "oro:cron:ews-sync": added to job queue',
+                'Processing command "oro:cron:import-tracking": added to job queue',
+                'Processing command "oro:cron:tracking:parse": added to job queue',
+                'Processing command "oro:cron:send-reminders": added to job queue',
+                'Processing command "oro:cron:calculate-tracking-event-summary": added to job queue',
+                'Processing command "oro:cron:send-email-campaigns": added to job queue',
+                'Processing command "oro:cron:lifetime-average:aggregate": added to job queue',
+                'Processing command "oro:cron:analytic:calculate": added to job queue',
+                'Processing command "oro:cron:magento:cart:expiration": added to job queue',
+                'Processing command "oro:cron:mailchimp:export": added to job queue',
+                'Processing command "oro:cron:dotmailer:export-status:update": added to job queue'
+            ],
+            'AllJobSkip' => [
+                'Processing command "oro:cron:enterprise:license": skipped',
+                'Processing command "oro:cron:cleanup": skipped',
+                'Processing command "oro:cron:daemon": skipped',
+                'Processing command "oro:cron:integration:sync": skipped',
+                'Processing command "oro:cron:batch:cleanup": skipped',
+                'Processing command "oro:cron:imap-sync": skipped',
+                'Processing command "oro:cron:ews-sync": skipped',
+                'Processing command "oro:cron:import-tracking": skipped',
+                'Processing command "oro:cron:tracking:parse": skipped',
+                'Processing command "oro:cron:send-reminders": skipped',
+                'Processing command "oro:cron:calculate-tracking-event-summary": skipped',
+                'Processing command "oro:cron:send-email-campaigns": skipped',
+                'Processing command "oro:cron:lifetime-average:aggregate": skipped',
+                'Processing command "oro:cron:analytic:calculate": skipped',
+                'Processing command "oro:cron:magento:cart:expiration": skipped',
+                'Processing command "oro:cron:mailchimp:export": skipped',
+                'Processing command "oro:cron:dotmailer:export-status:update": skipped'
+            ]
+        ];
+
+        foreach ($messages[$key] as $message) {
+            $this->assertContains($message, $result);
+        }
+    }
+
+    /**
+     * @param bool|false $isDue
+     */
+    protected function mockCronHelper($isDue = false)
+    {
+        $mockCronHelper = $this->getMockBuilder('Oro\Bundle\CronBundle\Helper\CronHelper')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $cronExpression = $this->getMockBuilder('Cron\CronExpression')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $cronExpression->expects($this->any())->method('isDue')->willReturn($isDue);
+
+        $mockCronHelper->expects($this->any())->method('createCron')->willReturn($cronExpression);
+
+        $this->getContainer()->set('oro_cron.helper.cron', $mockCronHelper);
+    }
+}

From 3b2f2b00e02fc796352f2cf8676543a0b9ba0649 Mon Sep 17 00:00:00 2001
From: Dmytro Krushelnytskyi <dkrushelnytskyi@magecore.com>
Date: Thu, 17 Dec 2015 19:13:30 +0200
Subject: [PATCH 166/471] BAP-9073: Change cron strategy to prevent overflow
 jobs queue

---
 src/Oro/Bundle/CronBundle/Helper/CronHelper.php         | 2 +-
 src/Oro/Bundle/CronBundle/Resources/config/services.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/CronBundle/Helper/CronHelper.php b/src/Oro/Bundle/CronBundle/Helper/CronHelper.php
index 27a9654ea4a..b140203eb7f 100644
--- a/src/Oro/Bundle/CronBundle/Helper/CronHelper.php
+++ b/src/Oro/Bundle/CronBundle/Helper/CronHelper.php
@@ -14,4 +14,4 @@ public function createCron($definition)
 
         return $cron;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Oro/Bundle/CronBundle/Resources/config/services.yml b/src/Oro/Bundle/CronBundle/Resources/config/services.yml
index b2d0e71e61c..c4dbdc99982 100644
--- a/src/Oro/Bundle/CronBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/CronBundle/Resources/config/services.yml
@@ -41,4 +41,4 @@ services:
             - { name: oro_filter.extension.orm_filter.filter, type: command_with_args }
 
     oro_cron.helper.cron:
-        class: Oro\Bundle\CronBundle\Helper\CronHelper
\ No newline at end of file
+        class: Oro\Bundle\CronBundle\Helper\CronHelper

From 90dd77227c88e2c33f97360d9aa916151c834502 Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Thu, 17 Dec 2015 19:21:55 +0200
Subject: [PATCH 167/471] CRM-4789: render multiselect filter dropdown in grid
 container instead body

---
 .../Resources/public/js/datafilter-builder.js        |  3 ++-
 .../Resources/public/js/filter/select-filter.js      | 12 ++++++++++--
 .../UIBundle/Resources/public/css/less/oro.less      |  3 +++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/datafilter-builder.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/datafilter-builder.js
index 06a9c37e4c2..21e86e72fd0 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/js/datafilter-builder.js
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/datafilter-builder.js
@@ -64,6 +64,7 @@ define([
             var filters = {};
             var modules = this.modules;
             var collection = this.collection;
+            var container = this.$el;
             _.each(this.metadata.filters, function(options) {
                 if (_.has(options, 'name') && _.has(options, 'type')) {
                     // @TODO pass collection only for specific filters
@@ -71,7 +72,7 @@ define([
                         options.collection = collection;
                     }
                     var Filter = modules[options.type].extend(options);
-                    filters[options.name] = new Filter();
+                    filters[options.name] = new Filter({container: container});
                 }
             });
             return {filters: filters};
diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/select-filter.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/select-filter.js
index 8b98faddf57..cdd1aa1dfc0 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/select-filter.js
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/select-filter.js
@@ -83,6 +83,13 @@ define([
             classes: 'select-filter-widget'
         },
 
+        /**
+         * Selector, jQuery object or HTML element that will be target for append multiselect dropdown menu
+         *
+         * @property
+         */
+        container: 'body',
+
         /**
          * Select widget menu opened flag
          *
@@ -114,7 +121,7 @@ define([
          * @param {Object} options
          */
         initialize: function(options) {
-            var opts = _.pick(options || {}, 'choices');
+            var opts = _.pick(options || {}, ['choices', 'container']);
             _.extend(this, opts);
 
             // init filter content options if it was not initialized so far
@@ -208,7 +215,8 @@ define([
                         setTimeout(_.bind(function() {
                             this.selectDropdownOpened = false;
                         }, this), 100);
-                    }, this)
+                    }, this),
+                    appendTo: this.container
                 }, this.widgetOptions),
                 contextSearch: this.contextSearch
             });
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less
index 09ef6c83988..43370befa19 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less
@@ -83,6 +83,9 @@ h1, h2, h3, h4, h5, h6 {
       min-width: 17px;
     }
   }
+  &.ui-multiselect-menu {
+    z-index: 10000;
+  }
 }
 .dark {
   background-color: #f6f5f5;

From a651d49401a1330ef3a5bfb1a1c5fb9e03fac801 Mon Sep 17 00:00:00 2001
From: Yurii Muratov <yurio@ua.fm>
Date: Thu, 17 Dec 2015 19:26:39 +0200
Subject: [PATCH 168/471] OEE-768: Fix JS code standarts

---
 .../Bundle/UserBundle/Resources/public/js/views/role-view.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/UserBundle/Resources/public/js/views/role-view.js b/src/Oro/Bundle/UserBundle/Resources/public/js/views/role-view.js
index 5c3cc374b85..5083f97f70f 100644
--- a/src/Oro/Bundle/UserBundle/Resources/public/js/views/role-view.js
+++ b/src/Oro/Bundle/UserBundle/Resources/public/js/views/role-view.js
@@ -140,7 +140,7 @@ define([
                 this.$fields,
                 function(element, name) {
                     debugger;
-                    data[formName+ '[' + name +']'] = element.val();
+                    data[formName + '[' + name + ']'] = element.val();
                 }
             );
 

From b5308e486ef313b527168e5e1611f8a3b03aee6f Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Thu, 17 Dec 2015 19:39:49 +0200
Subject: [PATCH 169/471] CRM-4789 Impossible to scroll popup windows

---
 .../EmailBundle/Resources/public/css/less/style.less       | 1 +
 .../UIBundle/Resources/public/css/less/oro/select2.less    | 2 +-
 .../Resources/public/js/widget/dialog-widget.js            | 7 +++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less b/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less
index 180ef92fbc1..f1af8b650e0 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less
+++ b/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less
@@ -233,6 +233,7 @@
   position: relative;
   ul.select2-choices {
     padding-right: 60px;
+    min-height: 29px;
   }
 }
 
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/select2.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/select2.less
index 1402c016812..b00869f2ec4 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/select2.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/select2.less
@@ -426,7 +426,7 @@ disabled look for disabled choices in the results dropdown
   height: 1%;
   margin: 0;
   padding: 0;
-  min-height: 26px;
+  min-height: 29px;
   position: relative;
   cursor: text;
   overflow: hidden;
diff --git a/src/Oro/Bundle/WindowsBundle/Resources/public/js/widget/dialog-widget.js b/src/Oro/Bundle/WindowsBundle/Resources/public/js/widget/dialog-widget.js
index 637fda42fcf..5e18ccb3a73 100644
--- a/src/Oro/Bundle/WindowsBundle/Resources/public/js/widget/dialog-widget.js
+++ b/src/Oro/Bundle/WindowsBundle/Resources/public/js/widget/dialog-widget.js
@@ -452,6 +452,13 @@ define(function(require) {
                     dialog.css('min-height', containerEl.clientHeight - top);
                 }
             }
+            if (!tools.isMobile()) {
+                // freeze width and height for proper layout
+                dialog.css({
+                    width: dialog.outerWidth(),
+                    height: dialog.outerHeight()
+                });
+            }
         },
 
         /**

From 0c507991e0b024e7e7574c43349b0d60e7f329be Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Thu, 17 Dec 2015 19:41:05 +0200
Subject: [PATCH 170/471] CRM-4789 Impossible to scroll popup windows

---
 src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less b/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less
index f1af8b650e0..180ef92fbc1 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less
+++ b/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less
@@ -233,7 +233,6 @@
   position: relative;
   ul.select2-choices {
     padding-right: 60px;
-    min-height: 29px;
   }
 }
 

From d097afaf56e3feff41c69589eb481952cbcd87d9 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Thu, 17 Dec 2015 21:31:01 +0200
Subject: [PATCH 171/471] BAP-9112: Add mass delete actions for every entity
 grid where regular delete action is available

---
 .../Action/Actions/AbstractAction.php         |   2 +-
 .../Action/MassDeleteActionExtension.php      | 162 ++++++++++++++++++
 .../MassAction/MassActionExtension.php        |   9 +-
 .../Resources/config/extensions.yml           |   8 +
 .../Resources/config/services.yml             |   5 +
 .../Tools/GridConfigurationHelperTest.php     |  82 +++++++++
 .../Tools/GridConfigurationHelper.php         |  55 ++++++
 .../EmailBundle/Resources/config/datagrid.yml |   8 -
 8 files changed, 317 insertions(+), 14 deletions(-)
 create mode 100644 src/Oro/Bundle/DataGridBundle/Extension/Action/MassDeleteActionExtension.php
 create mode 100644 src/Oro/Bundle/DataGridBundle/Tests/Unit/Tools/GridConfigurationHelperTest.php
 create mode 100644 src/Oro/Bundle/DataGridBundle/Tools/GridConfigurationHelper.php

diff --git a/src/Oro/Bundle/DataGridBundle/Extension/Action/Actions/AbstractAction.php b/src/Oro/Bundle/DataGridBundle/Extension/Action/Actions/AbstractAction.php
index 8a3bcbc836f..e1babb5aea7 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/Action/Actions/AbstractAction.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/Action/Actions/AbstractAction.php
@@ -59,7 +59,7 @@ public function setOptions(ActionConfiguration $options)
     }
 
     /**
-     * Accert required options array
+     * Assert required options array
      */
     protected function assertHasRequiredOptions()
     {
diff --git a/src/Oro/Bundle/DataGridBundle/Extension/Action/MassDeleteActionExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/Action/MassDeleteActionExtension.php
new file mode 100644
index 00000000000..e937745d3d8
--- /dev/null
+++ b/src/Oro/Bundle/DataGridBundle/Extension/Action/MassDeleteActionExtension.php
@@ -0,0 +1,162 @@
+<?php
+
+namespace Oro\Bundle\DataGridBundle\Extension\Action;
+
+use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
+use Oro\Bundle\DataGridBundle\Extension\AbstractExtension;
+use Oro\Bundle\DataGridBundle\Extension\Action\Actions\ActionInterface;
+use Oro\Bundle\DataGridBundle\Tools\GridConfigurationHelper;
+use Oro\Bundle\EntityBundle\ORM\DoctrineHelper;
+
+class MassDeleteActionExtension extends AbstractExtension
+{
+    const ACTION_KEY         = 'actions';
+    const MASS_ACTION_KEY    = 'mass_actions';
+    const ACTION_TYPE_KEY    = 'type';
+    const ACTION_TYPE_DELETE = 'delete';
+
+    /** @var DoctrineHelper */
+    protected $doctrineHelper;
+
+    /** @var GridConfigurationHelper */
+    protected $gridConfigurationHelper;
+
+    /** @var array */
+    protected $actions = [];
+
+    /** @var string|null */
+    protected $entityClassName;
+
+    /** @var array */
+    protected static $excludeParams = [ActionInterface::ACL_KEY];
+
+    /**
+     * @param DoctrineHelper          $doctrineHelper
+     * @param GridConfigurationHelper $gridConfigurationHelper
+     */
+    public function __construct(DoctrineHelper $doctrineHelper, GridConfigurationHelper $gridConfigurationHelper)
+    {
+        $this->doctrineHelper          = $doctrineHelper;
+        $this->gridConfigurationHelper = $gridConfigurationHelper;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isApplicable(DatagridConfiguration $config)
+    {
+        return
+            // Checks if mass delete action does not exists
+            !$this->isDeleteActionExists($config, static::MASS_ACTION_KEY) &&
+            // Checks if delete action exists
+            $this->isDeleteActionExists($config, static::ACTION_KEY) &&
+            $this->isApplicableForEntity($config);
+    }
+
+    /**
+     * Checks if we can apply mass delete action for the entity:
+     *  - extract entity class
+     *  - extract entity single identifier
+     *  - extract alias for this entity
+     *
+     * @param DatagridConfiguration $config
+     *
+     * @return bool
+     */
+    protected function isApplicableForEntity(DatagridConfiguration $config)
+    {
+        $entity = $this->getEntity($config);
+
+        return
+            $entity &&
+            $this->doctrineHelper->getSingleEntityIdentifierFieldName($entity, false) &&
+            $this->gridConfigurationHelper->getEntityRootAlias($config);
+    }
+
+    /**
+     * @param DatagridConfiguration $config
+     * @param string                $key
+     *
+     * @return bool
+     */
+    protected function isDeleteActionExists(DatagridConfiguration $config, $key)
+    {
+        $actions = $config->offsetGetOr($key, []);
+        foreach ($actions as $action) {
+            if ($action[static::ACTION_TYPE_KEY] == static::ACTION_TYPE_DELETE) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function processConfigs(DatagridConfiguration $config)
+    {
+        $actions = $config->offsetGetOr(static::MASS_ACTION_KEY, []);
+
+        $actions[] = $this->getMassDeleteActionConfig($config);
+
+        $config->offsetSet(static::MASS_ACTION_KEY, $actions);
+    }
+
+    /**
+     * @param DatagridConfiguration $config
+     *
+     * @return array
+     */
+    protected function getMassDeleteActionConfig(DatagridConfiguration $config)
+    {
+        $entity = $this->getEntity($config);
+
+        return [
+            'type'            => 'delete',
+            'icon'            => 'trash',
+            'label'           => 'oro.grid.action.delete',
+            'entity_name'     => $entity,
+            'data_identifier' => $this->getDataIdentifier($config),
+            'acl_resource'    => sprintf('DELETE;entity:%s', $entity),
+        ];
+    }
+
+    /**
+     * @param DatagridConfiguration $config
+     *
+     * @return string|null
+     */
+    protected function getEntity(DatagridConfiguration $config)
+    {
+        if ($this->entityClassName === null) {
+            $this->entityClassName = $this->gridConfigurationHelper->getEntity($config);
+        }
+
+        return $this->entityClassName;
+    }
+
+    /**
+     * @param DatagridConfiguration $config
+     *
+     * @return string
+     */
+    protected function getDataIdentifier(DatagridConfiguration $config)
+    {
+        $entity     = $this->getEntity($config);
+        $identifier = $this->doctrineHelper->getSingleEntityIdentifierFieldName($entity);
+        $rootAlias  = $this->gridConfigurationHelper->getEntityRootAlias($config);
+
+        return sprintf('%s.%s', $rootAlias, $identifier);
+    }
+
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getPriority()
+    {
+        // should be applied before mass action extension
+        return 210;
+    }
+}
diff --git a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassActionExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassActionExtension.php
index 95c6f78aa90..594eac195a3 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassActionExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassActionExtension.php
@@ -16,17 +16,16 @@ class MassActionExtension extends ActionExtension
     protected $actions = [];
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function isApplicable(DatagridConfiguration $config)
     {
-        $massActions = $config->offsetGetOr(static::ACTION_KEY, []);
-
-        return !empty($massActions);
+        // Applicable due to the possibility of dynamically add mass action
+        return true;
     }
 
     /**
-     * Get grid massaction by name
+     * Get grid mass action by name
      *
      * @param string           $name
      * @param DatagridInterface $datagrid
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/config/extensions.yml b/src/Oro/Bundle/DataGridBundle/Resources/config/extensions.yml
index 1647a0e069d..c3d4c84324c 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/config/extensions.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/config/extensions.yml
@@ -59,6 +59,14 @@ services:
         tags:
             - { name: oro_datagrid.extension }
 
+    oro_datagrid.extension.mass_delete_action:
+        class: Oro\Bundle\DataGridBundle\Extension\Action\MassDeleteActionExtension
+        arguments:
+            - @oro_entity.doctrine_helper
+            - @oro_datagrid.grid_configuration.helper
+        tags:
+            - { name: oro_datagrid.extension }
+
     oro_datagrid.extension.mass_action:
         class: %oro_datagrid.extension.mass_action.class%
         arguments:
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/config/services.yml b/src/Oro/Bundle/DataGridBundle/Resources/config/services.yml
index 06667c8eae1..be74f20415d 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/config/services.yml
@@ -217,3 +217,8 @@ services:
 
     oro_datagrid.columns.helper:
         class: %oro_datagrid.columns.helper.class%
+
+    oro_datagrid.grid_configuration.helper:
+        class: Oro\Bundle\DataGridBundle\Tools\GridConfigurationHelper
+        arguments:
+            - @oro_entity.orm.entity_class_resolver
diff --git a/src/Oro/Bundle/DataGridBundle/Tests/Unit/Tools/GridConfigurationHelperTest.php b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Tools/GridConfigurationHelperTest.php
new file mode 100644
index 00000000000..097d4e5fc18
--- /dev/null
+++ b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Tools/GridConfigurationHelperTest.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace Oro\Bundle\DataGridBundle\Tests\Unit\Tools;
+
+use Oro\Bundle\DataGridBundle\Tools\GridConfigurationHelper;
+use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
+
+class GridConfigurationHelperTest extends \PHPUnit_Framework_TestCase
+{
+    const ENTITY_CLASS = 'Oro\Bundle\DatagridBundle\Tests\Unit\Stub\SomeEntity';
+    const ENTITY_ALIAS = 'c';
+
+    /** @var GridConfigurationHelper */
+    protected $gridConfigurationHelper;
+
+    /** @var \PHPUnit_Framework_MockObject_MockObject */
+    protected $entityClassResolver;
+
+    protected function setUp()
+    {
+        $this->entityClassResolver = $this->getMockBuilder('Oro\Bundle\EntityBundle\ORM\EntityClassResolver')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->entityClassResolver->expects($this->any())
+            ->method('getEntityClass')
+            ->with(self::ENTITY_CLASS)
+            ->willReturn(self::ENTITY_CLASS);
+
+        $this->gridConfigurationHelper = new GridConfigurationHelper($this->entityClassResolver);
+    }
+
+    /**
+     * @dataProvider getDatagridConfigurationDataProvider
+     *
+     * @param array $param
+     */
+    public function testGetEntity($param)
+    {
+        $config = DatagridConfiguration::create($param);
+        $this->assertEquals(self::ENTITY_CLASS, $this->gridConfigurationHelper->getEntity($config));
+    }
+
+    /**
+     * @dataProvider getDatagridConfigurationDataProvider
+     *
+     * @param array $param
+     */
+    public function testGetRootAlias($param)
+    {
+        $config = DatagridConfiguration::create($param);
+        $this->assertEquals(self::ENTITY_ALIAS, $this->gridConfigurationHelper->getEntityRootAlias($config));
+    }
+
+    public function getDatagridConfigurationDataProvider()
+    {
+        $source = [
+            'query' => [
+                'from' => [
+                    [
+                        'table' => self::ENTITY_CLASS,
+                        'alias' => self::ENTITY_ALIAS
+                    ]
+                ]
+            ]
+
+        ];
+
+        return [
+            'with extended entity name'    => [
+                [
+                    'extended_entity_name' => self::ENTITY_CLASS,
+                    'source'               => $source
+                ]
+            ],
+            'without extended entity name' => [
+                [
+                    'source' => $source
+                ]
+            ],
+        ];
+    }
+}
diff --git a/src/Oro/Bundle/DataGridBundle/Tools/GridConfigurationHelper.php b/src/Oro/Bundle/DataGridBundle/Tools/GridConfigurationHelper.php
new file mode 100644
index 00000000000..72e2a692e59
--- /dev/null
+++ b/src/Oro/Bundle/DataGridBundle/Tools/GridConfigurationHelper.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Oro\Bundle\DataGridBundle\Tools;
+
+use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
+use Oro\Bundle\EntityBundle\ORM\EntityClassResolver;
+
+class GridConfigurationHelper
+{
+    /** @var EntityClassResolver */
+    protected $entityClassResolver;
+
+    /**
+     * @param EntityClassResolver $entityClassResolver
+     */
+    public function __construct(EntityClassResolver $entityClassResolver)
+    {
+        $this->entityClassResolver = $entityClassResolver;
+    }
+
+    /**
+     * @param DatagridConfiguration $config
+     *
+     * @return string|null
+     */
+    public function getEntity(DatagridConfiguration $config)
+    {
+        $entityClassName = $config->offsetGetByPath('[extended_entity_name]');
+        if ($entityClassName) {
+            return $entityClassName;
+        }
+
+        $from = $config->offsetGetByPath('[source][query][from]');
+        if (!$from) {
+            return null;
+        }
+
+        return $this->entityClassResolver->getEntityClass($from[0]['table']);
+    }
+
+    /**
+     * @param DatagridConfiguration $config
+     *
+     * @return null
+     */
+    public function getEntityRootAlias(DatagridConfiguration $config)
+    {
+        $from = $config->offsetGetByPath('[source][query][from]');
+        if ($from) {
+            return $from[0]['alias'];
+        }
+
+        return null;
+    }
+}
diff --git a/src/Oro/Bundle/EmailBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/EmailBundle/Resources/config/datagrid.yml
index 0b3a8d95a29..8f5c8053855 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/EmailBundle/Resources/config/datagrid.yml
@@ -68,14 +68,6 @@ datagrid:
                 label:        oro.grid.action.delete
                 icon:         trash
                 link:         delete_link
-        mass_actions:
-            delete:
-                type: delete
-                entity_name: %oro_email.autoresponserule.entity.class%
-                data_identifier: r.id
-                acl_resource: oro_email_autoresponserule_update
-                label: oro.grid.action.delete
-                icon: trash
         options:
             toolbarOptions:
                 hide: true

From cfd1981c6a48c686b35c1dc89d461c3751ad93e9 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Thu, 17 Dec 2015 21:41:19 +0200
Subject: [PATCH 172/471] BAP-9112: Add mass delete actions for every entity
 grid where regular delete action is available

---
 .../Extension/Action/MassDeleteActionExtension.php            | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Extension/Action/MassDeleteActionExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/Action/MassDeleteActionExtension.php
index e937745d3d8..4edd2b2b295 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/Action/MassDeleteActionExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/Action/MassDeleteActionExtension.php
@@ -4,7 +4,6 @@
 
 use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
 use Oro\Bundle\DataGridBundle\Extension\AbstractExtension;
-use Oro\Bundle\DataGridBundle\Extension\Action\Actions\ActionInterface;
 use Oro\Bundle\DataGridBundle\Tools\GridConfigurationHelper;
 use Oro\Bundle\EntityBundle\ORM\DoctrineHelper;
 
@@ -27,9 +26,6 @@ class MassDeleteActionExtension extends AbstractExtension
     /** @var string|null */
     protected $entityClassName;
 
-    /** @var array */
-    protected static $excludeParams = [ActionInterface::ACL_KEY];
-
     /**
      * @param DoctrineHelper          $doctrineHelper
      * @param GridConfigurationHelper $gridConfigurationHelper

From 04f06de45ed7cb55cdab2cf83ed2c6ef40553ca8 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Thu, 17 Dec 2015 21:41:55 +0200
Subject: [PATCH 173/471] BAP-9112: Add mass delete actions for every entity
 grid where regular delete action is available

---
 .../{Action => MassAction}/MassDeleteActionExtension.php          | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/Oro/Bundle/DataGridBundle/Extension/{Action => MassAction}/MassDeleteActionExtension.php (100%)

diff --git a/src/Oro/Bundle/DataGridBundle/Extension/Action/MassDeleteActionExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassDeleteActionExtension.php
similarity index 100%
rename from src/Oro/Bundle/DataGridBundle/Extension/Action/MassDeleteActionExtension.php
rename to src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassDeleteActionExtension.php

From 6117e2094b737c2ad0cf3d3509d2de593c7fca9f Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Thu, 17 Dec 2015 21:43:27 +0200
Subject: [PATCH 174/471] BAP-9112: Add mass delete actions for every entity
 grid where regular delete action is available

---
 .../Extension/MassAction/MassDeleteActionExtension.php          | 2 +-
 src/Oro/Bundle/DataGridBundle/Resources/config/extensions.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassDeleteActionExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassDeleteActionExtension.php
index 4edd2b2b295..7d23d54b83c 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassDeleteActionExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassDeleteActionExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Oro\Bundle\DataGridBundle\Extension\Action;
+namespace Oro\Bundle\DataGridBundle\Extension\MassAction;
 
 use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
 use Oro\Bundle\DataGridBundle\Extension\AbstractExtension;
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/config/extensions.yml b/src/Oro/Bundle/DataGridBundle/Resources/config/extensions.yml
index c3d4c84324c..fb0879ac3c0 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/config/extensions.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/config/extensions.yml
@@ -60,7 +60,7 @@ services:
             - { name: oro_datagrid.extension }
 
     oro_datagrid.extension.mass_delete_action:
-        class: Oro\Bundle\DataGridBundle\Extension\Action\MassDeleteActionExtension
+        class: Oro\Bundle\DataGridBundle\Extension\MassAction\MassDeleteActionExtension
         arguments:
             - @oro_entity.doctrine_helper
             - @oro_datagrid.grid_configuration.helper

From 9cfc30e5be9fe2cdd64f4b4df1c3c5ce7293099e Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Thu, 17 Dec 2015 22:00:20 +0200
Subject: [PATCH 175/471] BAP-9112: Add mass delete actions for every entity
 grid where regular delete action is available

---
 .../TagBundle/Grid/AbstractTagsExtension.php  | 38 +++++++++----------
 .../Bundle/TagBundle/Grid/TagsExtension.php   | 28 +++++++-------
 .../TagBundle/Grid/TagsReportExtension.php    | 16 ++++----
 .../TagBundle/Resources/config/services.yml   |  4 +-
 4 files changed, 42 insertions(+), 44 deletions(-)

diff --git a/src/Oro/Bundle/TagBundle/Grid/AbstractTagsExtension.php b/src/Oro/Bundle/TagBundle/Grid/AbstractTagsExtension.php
index 8839cbae99a..65ff7ba82f8 100644
--- a/src/Oro/Bundle/TagBundle/Grid/AbstractTagsExtension.php
+++ b/src/Oro/Bundle/TagBundle/Grid/AbstractTagsExtension.php
@@ -5,12 +5,11 @@
 use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
 use Oro\Bundle\DataGridBundle\Datasource\ResultRecord;
 use Oro\Bundle\DataGridBundle\Extension\AbstractExtension;
-use Oro\Bundle\EntityBundle\ORM\EntityClassResolver;
+use Oro\Bundle\DataGridBundle\Tools\GridConfigurationHelper;
 use Oro\Bundle\TagBundle\Entity\TagManager;
 
 abstract class AbstractTagsExtension extends AbstractExtension
 {
-    const GRID_EXTEND_ENTITY_PATH = '[extended_entity_name]';
     const GRID_FROM_PATH          = '[source][query][from]';
     const GRID_COLUMN_ALIAS_PATH  = '[source][query_config][column_aliases]';
     const GRID_FILTERS_PATH       = '[filters][columns]';
@@ -22,17 +21,22 @@ abstract class AbstractTagsExtension extends AbstractExtension
     /** @var TagManager */
     protected $tagManager;
 
-    /** @var EntityClassResolver */
-    protected $entityClassResolver;
+    /** @var GridConfigurationHelper */
+    protected $gridConfigurationHelper;
+
+    /** @var string|null */
+    protected $entityClassName;
 
     /**
-     * @param TagManager          $tagManager
-     * @param EntityClassResolver $entityClassResolver
+     * @param TagManager              $tagManager
+     * @param GridConfigurationHelper $gridConfigurationHelper
      */
-    public function __construct(TagManager $tagManager, EntityClassResolver $entityClassResolver)
-    {
-        $this->tagManager          = $tagManager;
-        $this->entityClassResolver = $entityClassResolver;
+    public function __construct(
+        TagManager $tagManager,
+        GridConfigurationHelper $gridConfigurationHelper
+    ) {
+        $this->tagManager              = $tagManager;
+        $this->gridConfigurationHelper = $gridConfigurationHelper;
     }
 
     /**
@@ -56,19 +60,13 @@ protected function isReportOrSegmentGrid(DatagridConfiguration $config)
      *
      * @return string|null
      */
-    protected function getEntityClassName(DatagridConfiguration $config)
+    protected function getEntity(DatagridConfiguration $config)
     {
-        $entityClassName = $config->offsetGetByPath(self::GRID_EXTEND_ENTITY_PATH);
-        if (!$entityClassName) {
-            $from = $config->offsetGetByPath(self::GRID_FROM_PATH);
-            if (!$from) {
-                return null;
-            }
-
-            $entityClassName = $this->entityClassResolver->getEntityClass($from[0]['table']);
+        if ($this->entityClassName === null) {
+            $this->entityClassName = $this->gridConfigurationHelper->getEntity($config);
         }
 
-        return $entityClassName;
+        return $this->entityClassName;
     }
 
     protected function getTagsForEntityClass($entityClass, array $ids)
diff --git a/src/Oro/Bundle/TagBundle/Grid/TagsExtension.php b/src/Oro/Bundle/TagBundle/Grid/TagsExtension.php
index 63ba80abc5d..affa1eb31ce 100644
--- a/src/Oro/Bundle/TagBundle/Grid/TagsExtension.php
+++ b/src/Oro/Bundle/TagBundle/Grid/TagsExtension.php
@@ -5,7 +5,7 @@
 use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
 use Oro\Bundle\DataGridBundle\Datagrid\Common\ResultsObject;
 use Oro\Bundle\DataGridBundle\Datasource\ResultRecordInterface;
-use Oro\Bundle\EntityBundle\ORM\EntityClassResolver;
+use Oro\Bundle\DataGridBundle\Tools\GridConfigurationHelper;
 use Oro\Bundle\EntityBundle\Tools\EntityRoutingHelper;
 use Oro\Bundle\TagBundle\Entity\TagManager;
 use Oro\Bundle\TagBundle\Helper\TaggableHelper;
@@ -28,20 +28,20 @@ class TagsExtension extends AbstractTagsExtension
     protected $securityFacade;
 
     /**
-     * @param TagManager          $tagManager
-     * @param EntityClassResolver $resolver
-     * @param TaggableHelper      $helper
-     * @param EntityRoutingHelper $entityRoutingHelper
-     * @param SecurityFacade      $securityFacade
+     * @param TagManager              $tagManager
+     * @param GridConfigurationHelper $gridConfigurationHelper
+     * @param TaggableHelper          $helper
+     * @param EntityRoutingHelper     $entityRoutingHelper
+     * @param SecurityFacade          $securityFacade
      */
     public function __construct(
         TagManager $tagManager,
-        EntityClassResolver $resolver,
+        GridConfigurationHelper $gridConfigurationHelper,
         TaggableHelper $helper,
         EntityRoutingHelper $entityRoutingHelper,
         SecurityFacade $securityFacade
     ) {
-        parent::__construct($tagManager, $resolver);
+        parent::__construct($tagManager, $gridConfigurationHelper);
 
         $this->taggableHelper      = $helper;
         $this->entityRoutingHelper = $entityRoutingHelper;
@@ -88,7 +88,7 @@ protected function isDisabled()
      */
     protected function isGridRootEntityTaggable(DatagridConfiguration $configuration)
     {
-        $className = $this->getEntityClassName($configuration);
+        $className = $this->getEntity($configuration);
 
         return $className && $this->taggableHelper->isTaggable($className);
     }
@@ -129,7 +129,7 @@ public function processConfigs(DatagridConfiguration $config)
      */
     protected function getColumnDefinition(DatagridConfiguration $config)
     {
-        $className        = $this->getEntityClassName($config);
+        $className        = $this->getEntity($config);
         $urlSafeClassName = $this->entityRoutingHelper->getUrlSafeClassName($className);
 
         $permissions = [
@@ -185,12 +185,12 @@ protected function getColumnDefinition(DatagridConfiguration $config)
      */
     protected function getColumnFilterDefinition(DatagridConfiguration $config)
     {
-        $className = $this->getEntityClassName($config);
-        $from = $config->offsetGetByPath(self::GRID_FROM_PATH);
+        $className = $this->getEntity($config);
+        $alias     = $this->gridConfigurationHelper->getEntityRootAlias($config);
 
         return [
             'type'      => 'tag',
-            'data_name' => $from[0]['alias'] .'.id',
+            'data_name' => sprintf('%s.%s', $alias, 'id'),
             'label'     => 'oro.tag.entity_plural_label',
             'enabled'   => $this->taggableHelper->isEnableGridFilter($className),
             'options'   => [
@@ -209,7 +209,7 @@ public function visitResult(DatagridConfiguration $config, ResultsObject $result
         $rows    = (array)$result->offsetGetOr('data', []);
         $idField = 'id';
         $tags    = $this->getTagsForEntityClass(
-            $this->getEntityClassName($config),
+            $this->getEntity($config),
             $this->extractEntityIds($rows, $idField)
         );
 
diff --git a/src/Oro/Bundle/TagBundle/Grid/TagsReportExtension.php b/src/Oro/Bundle/TagBundle/Grid/TagsReportExtension.php
index 218c5eab7b3..7c92e0fc15a 100644
--- a/src/Oro/Bundle/TagBundle/Grid/TagsReportExtension.php
+++ b/src/Oro/Bundle/TagBundle/Grid/TagsReportExtension.php
@@ -5,7 +5,7 @@
 use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
 use Oro\Bundle\DataGridBundle\Datagrid\Common\ResultsObject;
 use Oro\Bundle\DataGridBundle\Datasource\ResultRecordInterface;
-use Oro\Bundle\EntityBundle\ORM\EntityClassResolver;
+use Oro\Bundle\DataGridBundle\Tools\GridConfigurationHelper;
 use Oro\Bundle\EntityBundle\Tools\EntityRoutingHelper;
 use Oro\Bundle\QueryDesignerBundle\QueryDesigner\JoinIdentifierHelper;
 use Oro\Bundle\TagBundle\Entity\TagManager;
@@ -24,18 +24,18 @@ class TagsReportExtension extends AbstractTagsExtension
     protected $joinIdentifierHelper;
 
     /**
-     * @param TagManager          $tagManager
-     * @param EntityClassResolver $resolver
-     * @param TaggableHelper      $helper
-     * @param EntityRoutingHelper $entityRoutingHelper
+     * @param TagManager              $tagManager
+     * @param GridConfigurationHelper $gridConfigurationHelper
+     * @param TaggableHelper          $helper
+     * @param EntityRoutingHelper     $entityRoutingHelper
      */
     public function __construct(
         TagManager $tagManager,
-        EntityClassResolver $resolver,
+        GridConfigurationHelper $gridConfigurationHelper,
         TaggableHelper $helper,
         EntityRoutingHelper $entityRoutingHelper
     ) {
-        parent::__construct($tagManager, $resolver);
+        parent::__construct($tagManager, $gridConfigurationHelper);
 
         $this->taggableHelper      = $helper;
         $this->entityRoutingHelper = $entityRoutingHelper;
@@ -172,7 +172,7 @@ protected function getTagColumnDefinitions(DatagridConfiguration $config)
             $field = $joinIdentifierHelper->getFieldName($key);
             if ($field === TagVirtualFieldProvider::TAG_FIELD) {
                 // get entity class from relations aliases if tag_field configured for relations
-                $entityClassName = $joinIdentifierHelper->getEntityClassName($key)?:parent::getEntityClassName($config);
+                $entityClassName = $joinIdentifierHelper->getEntityClassName($key) ?: parent::getEntity($config);
                 $tagColumns[]    = [
                     'idAlias' => $alias,
                     'entityClass' => $entityClassName
diff --git a/src/Oro/Bundle/TagBundle/Resources/config/services.yml b/src/Oro/Bundle/TagBundle/Resources/config/services.yml
index ce1f78d0a27..f2052d28a6f 100644
--- a/src/Oro/Bundle/TagBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/TagBundle/Resources/config/services.yml
@@ -120,7 +120,7 @@ services:
         class: Oro\Bundle\TagBundle\Grid\TagsExtension
         arguments:
             - @oro_tag.tag.manager
-            - @oro_entity.orm.entity_class_resolver
+            - @oro_datagrid.grid_configuration.helper
             - @oro_tag.helper.taggable_helper
             - @oro_entity.routing_helper
             - @oro_security.security_facade
@@ -131,7 +131,7 @@ services:
         class: Oro\Bundle\TagBundle\Grid\TagsReportExtension
         arguments:
             - @oro_tag.tag.manager
-            - @oro_entity.orm.entity_class_resolver
+            - @oro_datagrid.grid_configuration.helper
             - @oro_tag.helper.taggable_helper
             - @oro_entity.routing_helper
         tags:

From 7f5e4fc30986b4610a1b83bcf68c3a7618739a14 Mon Sep 17 00:00:00 2001
From: Yurii Muratov <yurio@ua.fm>
Date: Thu, 17 Dec 2015 22:30:04 +0200
Subject: [PATCH 176/471] OEE-768: Fix JS code standarts

---
 src/Oro/Bundle/UserBundle/Resources/public/js/views/role-view.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Oro/Bundle/UserBundle/Resources/public/js/views/role-view.js b/src/Oro/Bundle/UserBundle/Resources/public/js/views/role-view.js
index 5083f97f70f..4984445b65f 100644
--- a/src/Oro/Bundle/UserBundle/Resources/public/js/views/role-view.js
+++ b/src/Oro/Bundle/UserBundle/Resources/public/js/views/role-view.js
@@ -139,7 +139,6 @@ define([
             _.each(
                 this.$fields,
                 function(element, name) {
-                    debugger;
                     data[formName + '[' + name + ']'] = element.val();
                 }
             );

From b407fd78ec9c2b693e4798f8bc360cb5921b07c1 Mon Sep 17 00:00:00 2001
From: zebimax <zebimax@gmail.com>
Date: Thu, 17 Dec 2015 23:08:55 +0200
Subject: [PATCH 177/471] BAP-9111: Add restriction for mass delete actions  -
 add mass delete action limitation  - add limitation messages on confirmation

---
 .../Ajax/MassDelete/MassDeleteLimitResult.php |  59 ++++++
 .../Ajax/MassDelete/MassDeleteLimiter.php     |  87 +++++++++
 .../MassAction/DeleteMassActionHandler.php    | 176 ++++++++++++------
 .../Resources/config/mass_actions.yml         |   8 +
 .../js/datagrid/action/abstract-action.js     |  25 ++-
 .../js/datagrid/action/delete-mass-action.js  |  68 ++++++-
 .../public/js/datagrid/action/mass-action.js  |  11 +-
 .../Resources/translations/jsmessages.en.yml  |  12 ++
 .../Ajax/MassAction/MassDeleteLimiterTest.php | 154 +++++++++++++++
 9 files changed, 539 insertions(+), 61 deletions(-)
 create mode 100644 src/Oro/Bundle/DataGridBundle/Extension/MassAction/Actions/Ajax/MassDelete/MassDeleteLimitResult.php
 create mode 100644 src/Oro/Bundle/DataGridBundle/Extension/MassAction/Actions/Ajax/MassDelete/MassDeleteLimiter.php
 create mode 100644 src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/MassAction/Actions/Ajax/MassAction/MassDeleteLimiterTest.php

diff --git a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/Actions/Ajax/MassDelete/MassDeleteLimitResult.php b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/Actions/Ajax/MassDelete/MassDeleteLimitResult.php
new file mode 100644
index 00000000000..05b785fe9f4
--- /dev/null
+++ b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/Actions/Ajax/MassDelete/MassDeleteLimitResult.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Oro\Bundle\DataGridBundle\Extension\MassAction\Actions\Ajax\MassDelete;
+
+class MassDeleteLimitResult
+{
+    /** @var int */
+    protected $maxLimit = MassDeleteLimiter::MAX_DELETE_RECORDS;
+
+    /** @var int|null */
+    protected $selected;
+
+    /** @var int|null */
+    protected $deletable;
+
+    /**
+     * MassDeleteLimitResult constructor.
+     *
+     * @param int $selected
+     * @param int $deletable
+     * @param int $maxLimit
+     */
+    public function __construct($selected, $deletable, $maxLimit = MassDeleteLimiter::MAX_DELETE_RECORDS)
+    {
+        $this->selected  = (int)$selected;
+        $this->deletable = (int)$deletable;
+        $this->maxLimit  = (int)$maxLimit;
+    }
+
+    /**
+     * Returns max amount of records which can be remove at once.
+     *
+     * @return int
+     */
+    public function getMaxLimit()
+    {
+        return $this->maxLimit;
+    }
+
+    /**
+     * Returns amount of selected records.
+     *
+     * @return int
+     */
+    public function getSelected()
+    {
+        return $this->selected;
+    }
+
+    /**
+     * Returns amount of records which current user able to remove.
+     *
+     * @return int
+     */
+    public function getDeletable()
+    {
+        return $this->deletable;
+    }
+}
diff --git a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/Actions/Ajax/MassDelete/MassDeleteLimiter.php b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/Actions/Ajax/MassDelete/MassDeleteLimiter.php
new file mode 100644
index 00000000000..23de25a5cd9
--- /dev/null
+++ b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/Actions/Ajax/MassDelete/MassDeleteLimiter.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace Oro\Bundle\DataGridBundle\Extension\MassAction\Actions\Ajax\MassDelete;
+
+use Oro\Bundle\DataGridBundle\Datasource\Orm\DeletionIterableResult;
+use Oro\Bundle\DataGridBundle\Extension\MassAction\MassActionHandlerArgs;
+use Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper;
+
+class MassDeleteLimiter
+{
+    const NO_LIMIT                 = 1;
+    const LIMIT_ACCESS             = 2;
+    const LIMIT_MAX_RECORDS        = 3;
+    const LIMIT_ACCESS_MAX_RECORDS = 4;
+    const MAX_DELETE_RECORDS       = 1000;
+
+    /** @var AclHelper */
+    protected $aclHelper;
+
+    /**
+     * MassDeleteLimiter constructor.
+     *
+     * @param AclHelper $helper
+     */
+    public function __construct(AclHelper $helper)
+    {
+        $this->aclHelper = $helper;
+    }
+
+    /**
+     * Returns limitation code from MassDeleteLimitResult parameters.
+     *
+     * @param MassDeleteLimitResult $result
+     *
+     * @return int
+     */
+    public function getLimitationCode(MassDeleteLimitResult $result)
+    {
+        $selected  = $result->getSelected();
+        $deletable = $result->getDeletable();
+        $maxLimit  = $result->getMaxLimit();
+
+        if ($deletable <= $maxLimit) {
+            return $selected === $deletable
+                ? self::NO_LIMIT
+                : self::LIMIT_ACCESS;
+        } else {
+            return $selected === $deletable
+                ? self::LIMIT_MAX_RECORDS
+                : self::LIMIT_ACCESS_MAX_RECORDS;
+        }
+    }
+
+    /**
+     * Limits query for deletion with access and/or performance restrictions.
+     *
+     * @param MassDeleteLimitResult $result
+     * @param MassActionHandlerArgs $args
+     */
+    public function limitQuery(MassDeleteLimitResult $result, MassActionHandlerArgs $args)
+    {
+        $code         = $this->getLimitationCode($result);
+        $queryBuilder = $args->getResults()->getSource();
+        if (in_array($code, [self::LIMIT_ACCESS, self::LIMIT_ACCESS_MAX_RECORDS])) {
+            $this->aclHelper->apply($queryBuilder, 'DELETE');
+        }
+        if (in_array($code, [self::LIMIT_MAX_RECORDS, self::LIMIT_ACCESS_MAX_RECORDS])) {
+            $queryBuilder->setMaxResults($result->getMaxLimit());
+        }
+    }
+
+    /**
+     * @param MassActionHandlerArgs $args
+     *
+     * @return MassDeleteLimitResult
+     */
+    public function getLimitResult(MassActionHandlerArgs $args)
+    {
+        $queryBuilder       = $args->getResults()->getSource();
+        $resultsForSelected = new DeletionIterableResult($queryBuilder);
+        $deletableQuery     = clone $queryBuilder;
+        $accessLimitedQuery = $this->aclHelper->apply($deletableQuery, 'DELETE');
+        $resultsForDelete   = new DeletionIterableResult($accessLimitedQuery);
+
+        return new MassDeleteLimitResult($resultsForSelected->count(), $resultsForDelete->count());
+    }
+}
diff --git a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/DeleteMassActionHandler.php b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/DeleteMassActionHandler.php
index 68a46faf313..e093a82338c 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/DeleteMassActionHandler.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/DeleteMassActionHandler.php
@@ -4,30 +4,36 @@
 
 use Doctrine\ORM\EntityManager;
 
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Translation\TranslatorInterface;
 
+use Oro\Bundle\DataGridBundle\Extension\MassAction\Actions\Ajax\MassDelete\MassDeleteLimiter;
+use Oro\Bundle\DataGridBundle\Extension\MassAction\Actions\Ajax\MassDelete\MassDeleteLimitResult;
 use Oro\Bundle\DataGridBundle\Exception\LogicException;
 use Oro\Bundle\DataGridBundle\Datasource\ResultRecordInterface;
 use Oro\Bundle\DataGridBundle\Datasource\Orm\DeletionIterableResult;
+
 use Oro\Bundle\SecurityBundle\SecurityFacade;
 
 class DeleteMassActionHandler implements MassActionHandlerInterface
 {
     const FLUSH_BATCH_SIZE = 100;
 
-    /**
-     * @var EntityManager
-     */
+    /** @var EntityManager */
     protected $entityManager;
 
-    /**
-     * @var TranslatorInterface
-     */
+    /** @var TranslatorInterface */
     protected $translator;
 
     /** @var SecurityFacade */
     protected $securityFacade;
 
+    /** @var MassDeleteLimiter */
+    protected $limiter;
+
+    /** @var RequestStack */
+    protected $requestStack;
+
     /**
      * @var string
      */
@@ -37,15 +43,21 @@ class DeleteMassActionHandler implements MassActionHandlerInterface
      * @param EntityManager       $entityManager
      * @param TranslatorInterface $translator
      * @param SecurityFacade      $securityFacade
+     * @param MassDeleteLimiter   $limiter
+     * @param RequestStack        $requestStack
      */
     public function __construct(
         EntityManager $entityManager,
         TranslatorInterface $translator,
-        SecurityFacade $securityFacade
+        SecurityFacade $securityFacade,
+        MassDeleteLimiter $limiter,
+        RequestStack $requestStack
     ) {
         $this->entityManager  = $entityManager;
         $this->translator     = $translator;
         $this->securityFacade = $securityFacade;
+        $this->limiter        = $limiter;
+        $this->requestStack   = $requestStack;
     }
 
     /**
@@ -53,56 +65,18 @@ public function __construct(
      */
     public function handle(MassActionHandlerArgs $args)
     {
-        $iteration             = 0;
-        $entityName            = null;
-        $entityIdentifiedField = null;
-
-        $results = new DeletionIterableResult($args->getResults()->getSource());
-        $results->setBufferSize(self::FLUSH_BATCH_SIZE);
-
-        // batch remove should be processed in transaction
-        $this->entityManager->beginTransaction();
-        try {
-            // if huge amount data must be deleted
-            set_time_limit(0);
-
-            foreach ($results as $result) {
-                /** @var $result ResultRecordInterface */
-                $entity = $result->getRootEntity();
-                if (!$entity) {
-                    // no entity in result record, it should be extracted from DB
-                    if (!$entityName) {
-                        $entityName = $this->getEntityName($args);
-                    }
-                    if (!$entityIdentifiedField) {
-                        $entityIdentifiedField = $this->getEntityIdentifierField($args);
-                    }
-                    $entity = $this->getEntity($entityName, $result->getValue($entityIdentifiedField));
-                }
-
-                if ($entity) {
-                    if ($this->securityFacade->isGranted('DELETE', $entity)) {
-                        $this->entityManager->remove($entity);
-                        $iteration++;
-                    }
-
-                    if ($iteration % self::FLUSH_BATCH_SIZE == 0) {
-                        $this->finishBatch();
-                    }
-                }
-            }
-
-            if ($iteration % self::FLUSH_BATCH_SIZE > 0) {
-                $this->finishBatch();
-            }
-
-            $this->entityManager->commit();
-        } catch (\Exception $e) {
-            $this->entityManager->rollback();
-            throw $e;
+        $limitResult = $this->limiter->getLimitResult($args);
+        $method      = $this->requestStack->getMasterRequest()->getMethod();
+        if ($method === 'POST') {
+            $result = $this->getPostResponse($limitResult);
+        } elseif ($method === 'DELETE') {
+            $this->limiter->limitQuery($limitResult, $args);
+            $result = $this->doDelete($args);
+        } else {
+            $result = $this->getNotSupportedResponse($method);
         }
 
-        return $this->getResponse($args, $iteration);
+        return $result;
     }
 
     /**
@@ -122,7 +96,7 @@ protected function finishBatch()
      *
      * @return MassActionResponse
      */
-    protected function getResponse(MassActionHandlerArgs $args, $entitiesCount = 0)
+    protected function getDeleteResponse(MassActionHandlerArgs $args, $entitiesCount = 0)
     {
         $massAction      = $args->getMassAction();
         $responseMessage = $massAction->getOptions()->offsetGetByPath('[messages][success]', $this->responseMessage);
@@ -141,6 +115,37 @@ protected function getResponse(MassActionHandlerArgs $args, $entitiesCount = 0)
         );
     }
 
+    /**
+     * @param MassDeleteLimitResult $limitResult
+     *
+     * @return MassActionResponse
+     */
+    protected function getPostResponse(MassDeleteLimitResult $limitResult)
+    {
+        return new MassActionResponse(
+            true,
+            'OK',
+            [
+                'selected'  => $limitResult->getSelected(),
+                'deletable' => $limitResult->getDeletable(),
+                'max_limit' => $limitResult->getMaxLimit()
+            ]
+        );
+    }
+
+    /**
+     * @param $method
+     *
+     * @return MassActionResponse
+     */
+    protected function getNotSupportedResponse($method)
+    {
+        return new MassActionResponse(
+            false,
+            sprintf('Method "%s" is not supported', $method)
+        );
+    }
+
     /**
      * @param MassActionHandlerArgs $args
      *
@@ -192,4 +197,63 @@ protected function getEntity($entityName, $identifierValue)
     {
         return $this->entityManager->getReference($entityName, $identifierValue);
     }
+
+    /**
+     * @param MassActionHandlerArgs $args
+     *
+     * @return MassActionResponse
+     * @throws \Exception
+     */
+    protected function doDelete(MassActionHandlerArgs $args)
+    {
+        $iteration             = 0;
+        $entityName            = null;
+        $entityIdentifiedField = null;
+        $queryBuilder          = $args->getResults()->getSource();
+
+        $results = new DeletionIterableResult($queryBuilder);
+        $results->setBufferSize(self::FLUSH_BATCH_SIZE);
+
+        // batch remove should be processed in transaction
+        $this->entityManager->beginTransaction();
+        try {
+            // if huge amount data must be deleted
+            set_time_limit(0);
+
+            foreach ($results as $result) {
+                /** @var $result ResultRecordInterface */
+                $entity = $result->getRootEntity();
+                if (!$entity) {
+                    // no entity in result record, it should be extracted from DB
+                    if (!$entityName) {
+                        $entityName = $this->getEntityName($args);
+                    }
+                    if (!$entityIdentifiedField) {
+                        $entityIdentifiedField = $this->getEntityIdentifierField($args);
+                    }
+                    $entity = $this->getEntity($entityName, $result->getValue($entityIdentifiedField));
+                }
+
+                if ($entity) {
+                    //$this->entityManager->remove($entity);
+                    $iteration++;
+
+                    if ($iteration % self::FLUSH_BATCH_SIZE == 0) {
+                        $this->finishBatch();
+                    }
+                }
+            }
+
+            if ($iteration % self::FLUSH_BATCH_SIZE > 0) {
+                $this->finishBatch();
+            }
+
+            $this->entityManager->commit();
+        } catch (\Exception $e) {
+            $this->entityManager->rollback();
+            throw $e;
+        }
+
+        return $this->getDeleteResponse($args, $iteration);
+    }
 }
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/config/mass_actions.yml b/src/Oro/Bundle/DataGridBundle/Resources/config/mass_actions.yml
index debe802e43c..983f087034e 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/config/mass_actions.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/config/mass_actions.yml
@@ -5,6 +5,7 @@ parameters:
 
     oro_datagrid.extension.mass_action.type.ajax.class:       Oro\Bundle\DataGridBundle\Extension\MassAction\Actions\Ajax\AjaxMassAction
     oro_datagrid.extension.mass_action.type.delete.class:     Oro\Bundle\DataGridBundle\Extension\MassAction\Actions\Ajax\DeleteMassAction
+
     oro_datagrid.extension.mass_action.type.redirect.class:   Oro\Bundle\DataGridBundle\Extension\MassAction\Actions\Redirect\RedirectMassAction
     oro_datagrid.extension.mass_action.type.widget.class:     Oro\Bundle\DataGridBundle\Extension\MassAction\Actions\Widget\WidgetMassAction
     oro_datagrid.extension.mass_action.type.window.class:     Oro\Bundle\DataGridBundle\Extension\MassAction\Actions\Widget\WindowMassAction
@@ -16,6 +17,8 @@ services:
             - @doctrine.orm.entity_manager
             - @translator
             - @oro_security.security_facade
+            - @oro_datagrid.extension.mass_action.actions.ajax.mass_delete_limiter
+            - @request_stack
 
     oro_datagrid.mass_action.parameters_parser:
         class: %oro_datagrid.mass_action.parameters_parser.class%
@@ -62,3 +65,8 @@ services:
         scope: prototype
         tags:
             - { name:  oro_datagrid.extension.mass_action.type, type: frontend }
+
+    oro_datagrid.extension.mass_action.actions.ajax.mass_delete_limiter:
+        class: Oro\Bundle\DataGridBundle\Extension\MassAction\Actions\Ajax\MassDelete\MassDeleteLimiter
+        arguments:
+            - @oro_security.acl_helper
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/action/abstract-action.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/action/abstract-action.js
index e6a4993ea4e..d3cfac04bc9 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/action/abstract-action.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/action/abstract-action.js
@@ -71,6 +71,9 @@ define([
         /** @property {Object} */
         launcherOptions: null,
 
+        /** @property {String} */
+        requestType: 'GET',
+
         /** @property {Object} */
         defaultMessages: {
             confirm_title: 'Execution Confirmation',
@@ -228,6 +231,7 @@ define([
                 data: this.getActionParameters(),
                 context: this,
                 dataType: 'json',
+                type: this.requestType,
                 error: this._onAjaxError,
                 success: this._onAjaxSuccess
             });
@@ -303,7 +307,7 @@ define([
             if (!this.confirmModal) {
                 this.confirmModal = (new this.confirmModalConstructor({
                     title: __(this.messages.confirm_title),
-                    content: __(this.messages.confirm_content),
+                    content: this.getConfirmContentMessage(),
                     okText: __(this.messages.confirm_ok),
                     cancelText: __(this.messages.confirm_cancel)
                 }));
@@ -312,7 +316,26 @@ define([
                 this.subviews.push(this.confirmModal);
             }
             return this.confirmModal;
+        },
+
+        /**
+         * Get confirm content message
+         *
+         * @return {String}
+         */
+        getConfirmContentMessage: function() {
+            return __(this.messages.confirm_content);
+        },
+
+        /**
+         * Get ajax request type
+         *
+         * @return {String}
+         */
+        getRequestType: function() {
+            return this.requestType;
         }
+
     });
 
     return AbstractAction;
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 6cca0a491b7..97f932f45e7 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
@@ -1,7 +1,10 @@
 define([
     'oroui/js/delete-confirmation',
+    'routing',
+    'orotranslation/js/translator',
+    'underscore',
     './mass-action'
-], function(DeleteConfirmation, MassAction) {
+], function(DeleteConfirmation, routing, __, _, MassAction) {
     'use strict';
 
     var DeleteMassAction;
@@ -20,12 +23,73 @@ define([
         /** @property {Object} */
         defaultMessages: {
             confirm_title: 'Delete Confirmation',
-            confirm_content: 'Are you sure you want to do remove selected items?',
+            confirm_content: 'Are you sure you want to do remove these items?',
             confirm_ok: 'Yes, Delete',
             confirm_cancel: 'Cancel',
             success: 'Selected items were removed.',
             error: 'Selected items were not removed.',
             empty_selection: 'Please, select items to remove.'
+        },
+
+        /** @property {Object} */
+        confirmMessages: {
+            selected_message: 'oro.datagrid.mass_action.delete.selected_message',
+            max_limit_message: 'oro.datagrid.mass_action.delete.max_limit_message',
+            restricted_access_message: 'oro.datagrid.mass_action.delete.restricted_access_message'
+        },
+
+        /** @property {String} */
+        confirmMessage: null,
+
+        initialize: function(options) {
+            DeleteMassAction.__super__.initialize.apply(this, arguments);
+            this.confirmMessage = __(this.defaultMessages.confirm_content);
+            this.confirmation = false;
+        },
+
+        _onAjaxSuccess: function(data, textStatus, jqXHR) {
+            if (this.requestType === 'POST') {
+                this.requestType = 'DELETE';
+                this.setConfirmMessage(data);
+                if (this.reloadData) {
+                    this.datagrid.hideLoading();
+                }
+                this.confirmation = true;
+                return DeleteMassAction.__super__.execute.call(this);
+            } else {
+                MassAction.__super__._onAjaxSuccess.apply(this, arguments);
+            }
+        },
+
+        execute: function() {
+            this.requestType = 'POST';
+            this.confirmModal = null;
+            if (this.checkSelectionState()) {
+                DeleteMassAction.__super__.executeConfiguredAction.call(this);
+            }
+        },
+
+        getConfirmContentMessage: function() {
+            return this.confirmMessage;
+        },
+
+        setConfirmMessage: function(data) {
+            if (this.isDefined(data.selected) && this.isDefined(data.deletable) && this.isDefined(data.max_limit)) {
+                if (data.deletable <= data.max_limit) {
+                    if (data.deletable >= data.selected) {
+                        this.confirmMessage = __(this.confirmMessages.selected_message, {selected: data.selected});
+                    } else {
+                        this.confirmMessage = __(this.confirmMessages.restricted_access_message, {deletable: data.deletable});
+                    }
+                } else {
+                    this.confirmMessage = __(this.confirmMessages.max_limit_message, {max_limit: data.max_limit});
+                }
+
+            }
+        },
+
+        isDefined: function(value) {
+            return !_.isUndefined(value);
         }
     });
 
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/action/mass-action.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/action/mass-action.js
index f446387b39a..b93ee382b9c 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/action/mass-action.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/action/mass-action.js
@@ -44,12 +44,19 @@ define([
          * Ask a confirmation and execute mass action.
          */
         execute: function() {
+            if (this.checkSelectionState()) {
+                MassAction.__super__.execute.call(this);
+            }
+        },
+
+        checkSelectionState: function() {
             var selectionState = this.datagrid.getSelectionState();
             if (_.isEmpty(selectionState.selectedModels) && selectionState.inset) {
                 messenger.notificationFlashMessage('warning', __(this.messages.empty_selection));
-            } else {
-                MassAction.__super__.execute.call(this);
+                return false;
             }
+
+            return true;
         },
 
         /**
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml b/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
index 2b934e7c14d..b745412de02 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
@@ -2,6 +2,7 @@
 "Are you sure you want to delete this item?": "Are you sure you want to delete this item?"
 "Delete Error": "Delete Error"
 "Are you sure you want to do remove selected items?": "Are you sure you want to do remove selected items?"
+"Are you sure you want to do remove these items?": "Are you sure you want to do remove these items?"
 "Are you sure you want to remove this item?": "Are you sure you want to remove this item?"
 "Selected items were removed.": "Selected items were removed."
 "Selected items were not removed.": "Selected items were removed."
@@ -82,3 +83,14 @@ oro:
             close_tooltip: "Close Column Manager"
             empty_list: "No columns found"
         not_number: Not a number
+        mass_action:
+            delete:
+                selected_message: >
+                    You have selected {{ selected }} record(s).<br/>
+                    Are you sure you want to delete {{ selected }} record(s)?
+                max_limit_message: >
+                    Due to perfomance max amount of records to delete at once is {{ max_limit }}.<br/>
+                    Are you sure you want to delete {{ max_limit }} records?
+                restricted_access_message: >
+                    Due to your access settings you are able to delete {{ deletable }} record(s).<br/>
+                    Are you sure you want to delete {{ deletable }} record(s)?
diff --git a/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/MassAction/Actions/Ajax/MassAction/MassDeleteLimiterTest.php b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/MassAction/Actions/Ajax/MassAction/MassDeleteLimiterTest.php
new file mode 100644
index 00000000000..542af95c17f
--- /dev/null
+++ b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/MassAction/Actions/Ajax/MassAction/MassDeleteLimiterTest.php
@@ -0,0 +1,154 @@
+<?php
+
+namespace Oro\Bundle\DataGridBundle\Tests\Unit\Extension\MassAction\Actions\Ajax\MassDelete;
+
+use Doctrine\ORM\QueryBuilder;
+
+use Oro\Bundle\DataGridBundle\Datasource\Orm\DeletionIterableResult;
+use Oro\Bundle\DataGridBundle\Extension\MassAction\Actions\Ajax\MassDelete\MassDeleteLimiter;
+use Oro\Bundle\DataGridBundle\Extension\MassAction\Actions\Ajax\MassDelete\MassDeleteLimitResult;
+use Oro\Bundle\DataGridBundle\Extension\MassAction\MassActionHandlerArgs;
+
+use Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper;
+
+class MassDeleteLimiterTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var MassDeleteLimiter */
+    protected $limiter;
+
+    /** @var \PHPUnit_Framework_MockObject_MockObject|AclHelper */
+    protected $helper;
+
+    public function setUp()
+    {
+        $this->helper = $this
+            ->getMockBuilder('Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->limiter = new MassDeleteLimiter($this->helper);
+    }
+
+    /**
+     * @dataProvider getLimitationCodeDataProvider
+     *
+     * @param MassDeleteLimitResult $limitResult
+     * @param int                   $result
+     */
+    public function testGetLimitationCode(MassDeleteLimitResult $limitResult, $result)
+    {
+        $this->assertEquals($result, $this->limiter->getLimitationCode($limitResult));
+    }
+
+    /**
+     * @dataProvider getLimitQueryDataProvider
+     *
+     * @param MassDeleteLimitResult $limitResult
+     * @param bool                  $accessRestriction
+     * @param bool                  $maxLimitRestriction
+     *
+     * @internal     param $MassDeleteLimitResult $
+     */
+    public function testLimitQuery(
+        MassDeleteLimitResult $limitResult,
+        $accessRestriction = false,
+        $maxLimitRestriction = false
+    ) {
+        /** @var QueryBuilder|\PHPUnit_Framework_MockObject_MockObject $queryBuilder */
+        $queryBuilder = $this
+            ->getMockBuilder('Doctrine\ORM\QueryBuilder')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        /** @var MassActionHandlerArgs|\PHPUnit_Framework_MockObject_MockObject $args */
+        $args = $this
+            ->getMockBuilder('Oro\Bundle\DataGridBundle\Extension\MassAction\MassActionHandlerArgs')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $args
+            ->expects($this->once())
+            ->method('getResults')
+            ->willReturn(new DeletionIterableResult($queryBuilder));
+
+        if ($accessRestriction) {
+            $this->helper
+                ->expects($this->once())
+                ->method('apply')
+                ->with($queryBuilder, 'DELETE');
+        }
+
+        if ($maxLimitRestriction) {
+            $queryBuilder
+                ->expects($this->once())
+                ->method('setMaxResults')
+                ->with($limitResult->getMaxLimit());
+        }
+
+        $this->limiter->limitQuery($limitResult, $args);
+    }
+
+    public function getLimitQueryDataProvider()
+    {
+        return [
+            'no limits' => [
+                $this->getMassDeleteResult(MassDeleteLimiter::NO_LIMIT)
+            ],
+            'limit by access' => [
+                $this->getMassDeleteResult(MassDeleteLimiter::LIMIT_ACCESS),
+                true
+            ],
+            'limit by max records' => [
+                $this->getMassDeleteResult(MassDeleteLimiter::LIMIT_MAX_RECORDS),
+                false,
+                true
+            ],
+            'limit by access and max records' => [
+                $this->getMassDeleteResult(MassDeleteLimiter::LIMIT_ACCESS_MAX_RECORDS),
+                true,
+                true
+            ],
+        ];
+    }
+
+    public function getLimitationCodeDataProvider()
+    {
+        return [
+            'no limits code' => [
+                $this->getMassDeleteResult(MassDeleteLimiter::NO_LIMIT),
+                MassDeleteLimiter::NO_LIMIT
+            ],
+            'limit by access code' => [
+                $this->getMassDeleteResult(MassDeleteLimiter::LIMIT_ACCESS),
+                MassDeleteLimiter::LIMIT_ACCESS
+            ],
+            'limit by max records code' => [
+                $this->getMassDeleteResult(MassDeleteLimiter::LIMIT_MAX_RECORDS),
+                MassDeleteLimiter::LIMIT_MAX_RECORDS
+            ],
+            'limit by access and max records code' => [
+                $this->getMassDeleteResult(MassDeleteLimiter::LIMIT_ACCESS_MAX_RECORDS),
+                MassDeleteLimiter::LIMIT_ACCESS_MAX_RECORDS
+            ],
+        ];
+    }
+
+    protected function getMassDeleteResult($code)
+    {
+        switch ($code) {
+            case MassDeleteLimiter::LIMIT_ACCESS:
+                $result = new MassDeleteLimitResult(100, 50, 1000);
+                break;
+            case MassDeleteLimiter::LIMIT_MAX_RECORDS:
+                $result = new MassDeleteLimitResult(2000, 2000, 1000);
+                break;
+            case MassDeleteLimiter::LIMIT_ACCESS_MAX_RECORDS:
+                $result = new MassDeleteLimitResult(2000, 1500, 1000);
+                break;
+            default:
+                $result = new MassDeleteLimitResult(100, 100, 1000);
+                break;
+        }
+
+        return $result;
+    }
+}

From af9a064c25769865cb7bc243db0b0325efcc4879 Mon Sep 17 00:00:00 2001
From: Sergey Zhuravel <zhuravel.sergey@gmail.com>
Date: Fri, 18 Dec 2015 02:22:20 +0200
Subject: [PATCH 178/471] CRM-4744: Optimize performance of the Magento sync
 for one day period - fix clear

---
 .../Job/Step/PostProcessStepExecutor.php      | 19 ++-----------------
 .../Job/Step/PostProcessStepExecutorTest.php  |  4 ++--
 .../Writer/PersistentBatchWriter.php          |  7 +------
 .../Writer/PersistentBatchWriterTest.php      |  5 +----
 4 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/src/Oro/Bundle/ImportExportBundle/Job/Step/PostProcessStepExecutor.php b/src/Oro/Bundle/ImportExportBundle/Job/Step/PostProcessStepExecutor.php
index 764c552eac5..19889cce717 100644
--- a/src/Oro/Bundle/ImportExportBundle/Job/Step/PostProcessStepExecutor.php
+++ b/src/Oro/Bundle/ImportExportBundle/Job/Step/PostProcessStepExecutor.php
@@ -137,7 +137,8 @@ public function execute(StepExecutionWarningHandlerInterface $warningHandler = n
                 }
 
                 if ($this->checkPostProcessingJobsBatch()) {
-                    $this->writeWithoutClear($itemsToWrite, $warningHandler);
+                    $this->write($itemsToWrite, $warningHandler);
+                    $itemsToWrite = [];
                     $this->runPostProcessingJobs();
                 }
             }
@@ -157,22 +158,6 @@ public function execute(StepExecutionWarningHandlerInterface $warningHandler = n
         }
     }
 
-    /**
-     * @param array                                $itemsToWrite
-     * @param StepExecutionWarningHandlerInterface $warningHandler
-     */
-    protected function writeWithoutClear(array $itemsToWrite, $warningHandler)
-    {
-        if (!$itemsToWrite) {
-            return;
-        }
-
-        $clearSkipped = $this->getJobContext()->get(EntityWriter::SKIP_CLEAR);
-        $this->getJobContext()->put(EntityWriter::SKIP_CLEAR, true);
-        $this->write($itemsToWrite, $warningHandler);
-        $this->getJobContext()->put(EntityWriter::SKIP_CLEAR, $clearSkipped);
-    }
-
     /**
      * @return bool
      */
diff --git a/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Job/Step/PostProcessStepExecutorTest.php b/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Job/Step/PostProcessStepExecutorTest.php
index 0959f408cb8..58dd693e466 100644
--- a/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Job/Step/PostProcessStepExecutorTest.php
+++ b/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Job/Step/PostProcessStepExecutorTest.php
@@ -144,7 +144,7 @@ public function executeDataProvider()
                 ['jobType', 'jobName'],
                 true,
                 1,
-                ['another-key', 'writer_skip_clear']
+                ['another-key']
             ],
             'defined key with post process job but its failed' => [
                 ['some-key'],
@@ -152,7 +152,7 @@ public function executeDataProvider()
                 ['jobType', 'jobName'],
                 false,
                 1,
-                ['another-key', 'writer_skip_clear']
+                ['another-key']
             ]
         ];
     }
diff --git a/src/Oro/Bundle/IntegrationBundle/ImportExport/Writer/PersistentBatchWriter.php b/src/Oro/Bundle/IntegrationBundle/ImportExport/Writer/PersistentBatchWriter.php
index b16ca1303b8..667d115a4ec 100644
--- a/src/Oro/Bundle/IntegrationBundle/ImportExport/Writer/PersistentBatchWriter.php
+++ b/src/Oro/Bundle/IntegrationBundle/ImportExport/Writer/PersistentBatchWriter.php
@@ -84,12 +84,7 @@ public function write(array $items)
                 ->getByStepExecution($this->stepExecution)
                 ->getConfiguration();
 
-            $contextSkipClear = $this->stepExecution
-                ->getJobExecution()
-                ->getExecutionContext()
-                ->get(EntityWriter::SKIP_CLEAR);
-
-            if (empty($configuration[EntityWriter::SKIP_CLEAR]) && !$contextSkipClear) {
+            if (empty($configuration[EntityWriter::SKIP_CLEAR])) {
                 $em->clear();
             }
         } catch (\Exception $exception) {
diff --git a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/ImportExport/Writer/PersistentBatchWriterTest.php b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/ImportExport/Writer/PersistentBatchWriterTest.php
index 7ae4e056ae1..215140f9d22 100644
--- a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/ImportExport/Writer/PersistentBatchWriterTest.php
+++ b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/ImportExport/Writer/PersistentBatchWriterTest.php
@@ -191,10 +191,7 @@ protected function expectGetJobName($stepExecution)
         $jobExecution = new JobExecution();
         $jobExecution->setJobInstance($jobInstance);
 
-        $executionContext = new ExecutionContext();
-        $jobExecution->setExecutionContext($executionContext);
-
-        $stepExecution->expects($this->once())
+        $stepExecution->expects($this->any())
             ->method('getJobExecution')
             ->will($this->returnValue($jobExecution));
     }

From c0b5847a6f8b9f0fbbb83c58d1ceee1bcaf2b559 Mon Sep 17 00:00:00 2001
From: Ievgenii Myshusta <imyshusta@magecore.com>
Date: Fri, 18 Dec 2015 11:30:06 +0200
Subject: [PATCH 179/471] CRM-4807: Can't merge Account with relation to custom
 Entity

---
 .../Bundle/EntityMergeBundle/Metadata/MetadataBuilder.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/EntityMergeBundle/Metadata/MetadataBuilder.php b/src/Oro/Bundle/EntityMergeBundle/Metadata/MetadataBuilder.php
index 158fd4240bb..de37a7c260d 100644
--- a/src/Oro/Bundle/EntityMergeBundle/Metadata/MetadataBuilder.php
+++ b/src/Oro/Bundle/EntityMergeBundle/Metadata/MetadataBuilder.php
@@ -136,10 +136,16 @@ protected function addDoctrineInverseAssociations(
 
                 $associationMapping['mappedBySourceEntity'] = false;
 
+                $mergeModes = [MergeModes::UNITE];
+                if ($associationMapping['type'] === ClassMetadataInfo::ONE_TO_ONE) {
+                    //for fields with ONE_TO_ONE relation Unite strategy is impossible, so Replace is used
+                    $mergeModes = [MergeModes::REPLACE];
+                }
+
                 $fieldMetadata = $this->metadataFactory->createFieldMetadata(
                     array(
                         'field_name' => $this->createInverseAssociationFieldName($currentClassName, $fieldName),
-                        'merge_modes' => array(MergeModes::UNITE),
+                        'merge_modes' => $mergeModes,
                         'source_field_name' => $fieldName,
                         'source_class_name' => $currentClassName,
                     ),

From dea705652a502496baa4859da468979dea70cd07 Mon Sep 17 00:00:00 2001
From: Dmytro Krushelnytskyi <dkrushelnytskyi@magecore.com>
Date: Fri, 18 Dec 2015 11:47:19 +0200
Subject: [PATCH 180/471] BAP-9073: Change cron strategy to prevent overflow
 jobs queue

---
 .../Command/CronCommandTest.php               | 20 +------------------
 1 file changed, 1 insertion(+), 19 deletions(-)
 rename src/Oro/Bundle/CronBundle/Tests/{Unit => Functional}/Command/CronCommandTest.php (93%)

diff --git a/src/Oro/Bundle/CronBundle/Tests/Unit/Command/CronCommandTest.php b/src/Oro/Bundle/CronBundle/Tests/Functional/Command/CronCommandTest.php
similarity index 93%
rename from src/Oro/Bundle/CronBundle/Tests/Unit/Command/CronCommandTest.php
rename to src/Oro/Bundle/CronBundle/Tests/Functional/Command/CronCommandTest.php
index e993b7fecbb..fd115488e81 100644
--- a/src/Oro/Bundle/CronBundle/Tests/Unit/Command/CronCommandTest.php
+++ b/src/Oro/Bundle/CronBundle/Tests/Functional/Command/CronCommandTest.php
@@ -1,10 +1,7 @@
 <?php
 
-namespace Oro\Bundle\CronBundle\Tests\Unit\Command;
+namespace Oro\Bundle\CronBundle\Tests\Functinal\Command;
 
-use Doctrine\ORM\EntityManager;
-
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 
@@ -16,26 +13,11 @@
  */
 class CronCommandTest extends WebTestCase
 {
-    /** @var CronCommand */
-    protected $command;
-//
-    /** @var ContainerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $container;
-//
-    /** @var EntityManager|\PHPUnit_Framework_MockObject_MockObject */
-    protected $emMock;
-
-
     protected function setUp()
     {
         $this->initClient();
     }
 
-    protected function tearDown()
-    {
-        unset($this->container, $this->command, $this->emMock);
-    }
-
     public function testCheckRunDuplicateJob()
     {
         $kernel = self::getContainer()->get('kernel');

From e367a623c7033e3f80fcd74a413ccf02be736138 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Fri, 18 Dec 2015 11:17:39 +0100
Subject: [PATCH 181/471] CRM-3997: Make all mailboxes available under System
 organization

---
 src/Oro/Bundle/ImapBundle/Form/Type/ConfigurationType.php   | 2 +-
 src/Oro/Bundle/ImapBundle/Resources/config/services.yml     | 6 ++++++
 .../public/js/app/components/check-connection-component.js  | 4 ++--
 .../Bundle/ImapBundle/Resources/views/Form/fields.html.twig | 4 ++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/Oro/Bundle/ImapBundle/Form/Type/ConfigurationType.php b/src/Oro/Bundle/ImapBundle/Form/Type/ConfigurationType.php
index b988c93c985..895ab1c9b80 100644
--- a/src/Oro/Bundle/ImapBundle/Form/Type/ConfigurationType.php
+++ b/src/Oro/Bundle/ImapBundle/Form/Type/ConfigurationType.php
@@ -125,7 +125,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'attr' => ['class' => 'check-connection']
             ]);
         if ($options['add_check_button']) {
-            $builder->add('check_connection', new CheckButtonType(), [
+            $builder->add('check_connection', 'oro_imap_configuration_check', [
                 'label' => $this->translator->trans('oro.imap.configuration.connect_and_retrieve_folders')
             ]);
         }
diff --git a/src/Oro/Bundle/ImapBundle/Resources/config/services.yml b/src/Oro/Bundle/ImapBundle/Resources/config/services.yml
index 7acc71e8c81..63cd2e72899 100644
--- a/src/Oro/Bundle/ImapBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/ImapBundle/Resources/config/services.yml
@@ -14,6 +14,7 @@ parameters:
     oro_imap.workflow.action.dependency_job.class:   Oro\Bundle\ImapBundle\Workflow\Action\DependencyJob
 
     oro_imap.form.type.configuration.class:          Oro\Bundle\ImapBundle\Form\Type\ConfigurationType
+    oro_imap.form.type.check_button.class:          Oro\Bundle\ImapBundle\Form\Type\CheckButtonType
     oro_imap.listener.user_email_origin.class:       Oro\Bundle\ImapBundle\EventListener\UserEmailOriginListener
 
 services:
@@ -79,6 +80,11 @@ services:
         tags:
              - { name: form.type, alias: oro_imap_configuration }
 
+    oro_imap.form.type.check_button:
+        class: %oro_imap.form.type.check_button.class%
+        tags:
+            - { name: form.type, alias: oro_imap_configuration_check }
+
     oro_imap.listener.user_email_origin:
         class: %oro_imap.listener.user_email_origin.class%
         arguments:
diff --git a/src/Oro/Bundle/ImapBundle/Resources/public/js/app/components/check-connection-component.js b/src/Oro/Bundle/ImapBundle/Resources/public/js/app/components/check-connection-component.js
index a006c213996..31aabf20248 100644
--- a/src/Oro/Bundle/ImapBundle/Resources/public/js/app/components/check-connection-component.js
+++ b/src/Oro/Bundle/ImapBundle/Resources/public/js/app/components/check-connection-component.js
@@ -16,13 +16,13 @@ define(function(require) {
          */
         initialize: function(options) {
             if (options.elementNamePrototype) {
-                var viewOptions = {
+                var viewOptions = _.extend({
                     'model': new CheckConnectionModel({}),
                     'el': $(options._sourceElement).closest(options.parentElementSelector),
                     'entity': options.forEntity || 'user',
                     'entityId': options.id,
                     'organization': options.organization || ''
-                };
+                }, options.viewOptions || {});
                 if (/^.+\[\w+]$/i.test(options.elementNamePrototype)) {
                     viewOptions.formPrefix = options.elementNamePrototype.match(/(.+)\[\w+]$/i)[1];
                 }
diff --git a/src/Oro/Bundle/ImapBundle/Resources/views/Form/fields.html.twig b/src/Oro/Bundle/ImapBundle/Resources/views/Form/fields.html.twig
index 07a6f1990b8..ea3d9f81481 100644
--- a/src/Oro/Bundle/ImapBundle/Resources/views/Form/fields.html.twig
+++ b/src/Oro/Bundle/ImapBundle/Resources/views/Form/fields.html.twig
@@ -5,13 +5,13 @@
     {% else %}
         {% set forEntity = 'mailbox' %}
     {% endif %}
-    {% set options = {
+    {% set options = form.vars.options|default({})|merge({
         elementNamePrototype: full_name,
         id: form.parent.vars.value and form.parent.vars.value.id is defined ? form.parent.vars.value.id : null,
         forEntity: forEntity,
         organization: data and data.organization is defined and data.organization ? data.organization.id : null,
         parentElementSelector: 'fieldset'
-    } %}
+    }) %}
     {% set attr = attr|merge({
         'data-role': 'check-connection-btn',
         'data-page-component-module':  'oroimap/js/app/components/check-connection-component',

From bda59babf46bcc8d23ad304008714ebb3c9459e4 Mon Sep 17 00:00:00 2001
From: zebimax <zebimax@gmail.com>
Date: Fri, 18 Dec 2015 12:23:21 +0200
Subject: [PATCH 182/471] BAP-9111: Add restriction for mass delete actions  -
 uncomment actually removing

---
 .../Extension/MassAction/DeleteMassActionHandler.php            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/DeleteMassActionHandler.php b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/DeleteMassActionHandler.php
index e093a82338c..ec8d2feb9aa 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/DeleteMassActionHandler.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/DeleteMassActionHandler.php
@@ -235,7 +235,7 @@ protected function doDelete(MassActionHandlerArgs $args)
                 }
 
                 if ($entity) {
-                    //$this->entityManager->remove($entity);
+                    $this->entityManager->remove($entity);
                     $iteration++;
 
                     if ($iteration % self::FLUSH_BATCH_SIZE == 0) {

From 9355ee97e3daf684da741e89ec6650cb5ec89c03 Mon Sep 17 00:00:00 2001
From: Dmytro Krushelnytskyi <dkrushelnytskyi@magecore.com>
Date: Fri, 18 Dec 2015 13:16:43 +0200
Subject: [PATCH 183/471] BAP-9073: Change cron strategy to prevent overflow
 jobs queue

---
 .../Functional/Command/CronCommandTest.php    | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/CronBundle/Tests/Functional/Command/CronCommandTest.php b/src/Oro/Bundle/CronBundle/Tests/Functional/Command/CronCommandTest.php
index fd115488e81..ac63f0b37b8 100644
--- a/src/Oro/Bundle/CronBundle/Tests/Functional/Command/CronCommandTest.php
+++ b/src/Oro/Bundle/CronBundle/Tests/Functional/Command/CronCommandTest.php
@@ -36,11 +36,12 @@ public function testCheckRunDuplicateJob()
         $result = $this->runCommand(CronCommand::NAME, []);
         $this->assertNotEmpty($result);
 
-        $this->checkMessage('AllJobAdded', $result);
+        $this->checkMessage('allCommandNew', $result);
 
         $result = $this->runCommand(CronCommand::NAME, []);
-        $this->assertContains('Processing command "oro:cron:cleanup": already exists in job queue', $result);
+        $this->checkMessage('AllJobAdded', $result);
 
+        $result = $this->runCommand(CronCommand::NAME, []);
         $this->checkMessage('AllJobAlreadyExist', $result);
     }
 
@@ -67,6 +68,25 @@ public function testSkipAllJob()
     protected function checkMessage($key, $result)
     {
         $messages = [
+            'allCommandNew' => [
+                'Processing command "oro:cron:enterprise:license": new command found, setting up schedule..',
+                'Processing command "oro:cron:integration:sync": new command found, setting up schedule..',
+                'Processing command "oro:cron:batch:cleanup": new command found, setting up schedule..',
+                'Processing command "oro:cron:cleanup": new command found, setting up schedule..',
+                'Processing command "oro:cron:daemon": new command found, setting up schedule..',
+                'Processing command "oro:cron:imap-sync": new command found, setting up schedule..',
+                'Processing command "oro:cron:ews-sync": new command found, setting up schedule..',
+                'Processing command "oro:cron:import-tracking": new command found, setting up schedule..',
+                'Processing command "oro:cron:tracking:parse": new command found, setting up schedule..',
+                'Processing command "oro:cron:send-reminders": new command found, setting up schedule..',
+                'Processing command "oro:cron:calculate-tracking-event-summary": new command found, setting up',
+                'Processing command "oro:cron:send-email-campaigns": new command found, setting up schedule..',
+                'Processing command "oro:cron:lifetime-average:aggregate": new command found, setting up schedule..',
+                'Processing command "oro:cron:analytic:calculate": new command found, setting up schedule..',
+                'Processing command "oro:cron:magento:cart:expiration": new command found, setting up schedule..',
+                'Processing command "oro:cron:mailchimp:export": new command found, setting up schedule..',
+                'Processing command "oro:cron:dotmailer:export-status:update": new command found, setting up schedule..'
+            ],
             'AllJobAlreadyExist' => [
                 'Processing command "oro:cron:enterprise:license": already exists in job queue',
                 'Processing command "oro:cron:cleanup": already exists in job queue',

From 24fb9af28fa72b3933c031cffb25ed8e01e8a283 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Fri, 18 Dec 2015 12:45:54 +0100
Subject: [PATCH 184/471] CRM-4388: Email processing is applied again for
 emails that belong to a thread

---
 .../MailboxProcessTriggerListener.php             | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/Oro/Bundle/EmailBundle/EventListener/MailboxProcessTriggerListener.php b/src/Oro/Bundle/EmailBundle/EventListener/MailboxProcessTriggerListener.php
index 5876234d132..b91dd1e9ca3 100644
--- a/src/Oro/Bundle/EmailBundle/EventListener/MailboxProcessTriggerListener.php
+++ b/src/Oro/Bundle/EmailBundle/EventListener/MailboxProcessTriggerListener.php
@@ -4,6 +4,7 @@
 
 use Doctrine\Bundle\DoctrineBundle\Registry;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Event\OnFlushEventArgs;
 use Doctrine\ORM\Event\PostFlushEventArgs;
 
 use Oro\Bundle\EmailBundle\Entity\EmailBody;
@@ -38,6 +39,20 @@ public function __construct(
         $this->doctrine = $doctrine;
     }
 
+    /**
+     * {@inheritdoc} In addition it filters out emails which are part of thread
+     */
+    public function onFlush(OnFlushEventArgs $args)
+    {
+        parent::onFlush($args);
+        $this->emailBodies = array_filter(
+            $this->emailBodies,
+            function (EmailBody $body) {
+                return $body->getEmail() && !$body->getEmail()->getThread();
+            }
+        );
+    }
+
     /**
      * Processes email bodies using processes provided in MailboxProcessProviders.
      * Processes are triggered using this listener instead of normal triggers.

From e89729107c30047da9a44b43fc1abb9c035e8f7e Mon Sep 17 00:00:00 2001
From: Dmytro Krushelnytskyi <dkrushelnytskyi@magecore.com>
Date: Fri, 18 Dec 2015 13:40:26 +0200
Subject: [PATCH 185/471] BAP-9073: Change cron strategy to prevent overflow
 jobs queue

---
 .../CronBundle/Tests/Functional/Command/CronCommandTest.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/CronBundle/Tests/Functional/Command/CronCommandTest.php b/src/Oro/Bundle/CronBundle/Tests/Functional/Command/CronCommandTest.php
index ac63f0b37b8..5102c590d9f 100644
--- a/src/Oro/Bundle/CronBundle/Tests/Functional/Command/CronCommandTest.php
+++ b/src/Oro/Bundle/CronBundle/Tests/Functional/Command/CronCommandTest.php
@@ -36,7 +36,7 @@ public function testCheckRunDuplicateJob()
         $result = $this->runCommand(CronCommand::NAME, []);
         $this->assertNotEmpty($result);
 
-        $this->checkMessage('allCommandNew', $result);
+        $this->checkMessage('allJobNew', $result);
 
         $result = $this->runCommand(CronCommand::NAME, []);
         $this->checkMessage('AllJobAdded', $result);
@@ -68,7 +68,7 @@ public function testSkipAllJob()
     protected function checkMessage($key, $result)
     {
         $messages = [
-            'allCommandNew' => [
+            'allJobNew' => [
                 'Processing command "oro:cron:enterprise:license": new command found, setting up schedule..',
                 'Processing command "oro:cron:integration:sync": new command found, setting up schedule..',
                 'Processing command "oro:cron:batch:cleanup": new command found, setting up schedule..',

From 6876eeb1105025becb9394d1359ce70f946830d7 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Fri, 18 Dec 2015 13:26:32 +0100
Subject: [PATCH 186/471] CRM-3997: Make all mailboxes available under System
 organization

- fix jscs
---
 .../public/js/app/components/check-connection-component.js       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Oro/Bundle/ImapBundle/Resources/public/js/app/components/check-connection-component.js b/src/Oro/Bundle/ImapBundle/Resources/public/js/app/components/check-connection-component.js
index 31aabf20248..e57fa506714 100644
--- a/src/Oro/Bundle/ImapBundle/Resources/public/js/app/components/check-connection-component.js
+++ b/src/Oro/Bundle/ImapBundle/Resources/public/js/app/components/check-connection-component.js
@@ -2,6 +2,7 @@ define(function(require) {
     'use strict';
 
     var $ = require('jquery');
+    var _ = require('underscore');
     var BaseComponent = require('oroui/js/app/components/base/component');
     var CheckConnectionView = require('../views/check-connection-view');
     var CheckConnectionModel = require('../models/check-connection-model');

From 964e33d8890188fa487479ea714f1d0c7a0e1914 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Fri, 18 Dec 2015 13:33:36 +0100
Subject: [PATCH 187/471] CRM-3997: Make all mailboxes available under System
 organization

---
 .../ImapBundle/Tests/Unit/Form/Type/ConfigurationTypeTest.php   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Oro/Bundle/ImapBundle/Tests/Unit/Form/Type/ConfigurationTypeTest.php b/src/Oro/Bundle/ImapBundle/Tests/Unit/Form/Type/ConfigurationTypeTest.php
index f8aa29e6c49..7801e81d1a8 100644
--- a/src/Oro/Bundle/ImapBundle/Tests/Unit/Form/Type/ConfigurationTypeTest.php
+++ b/src/Oro/Bundle/ImapBundle/Tests/Unit/Form/Type/ConfigurationTypeTest.php
@@ -10,6 +10,7 @@
 use Oro\Bundle\EmailBundle\Form\Type\EmailFolderTreeType;
 use Oro\Bundle\FormBundle\Form\Extension\TooltipFormExtension;
 use Oro\Bundle\ImapBundle\Entity\UserEmailOrigin;
+use Oro\Bundle\ImapBundle\Form\Type\CheckButtonType;
 use Oro\Bundle\ImapBundle\Form\Type\ConfigurationType;
 use Oro\Bundle\SecurityBundle\Encoder\Mcrypt;
 use Oro\Bundle\SecurityBundle\SecurityFacade;
@@ -78,6 +79,7 @@ protected function getExtensions()
             [
                 new PreloadedExtension(
                     [
+                        'oro_imap_configuration_check' => new CheckButtonType(),
                         'oro_email_email_folder' => new EmailFolderType(),
                         'oro_email_email_folder_tree' => new EmailFolderTreeType(),
                     ],

From 60ad77395b0ef750f16529febf5a4ba5348cbce3 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Fri, 18 Dec 2015 14:57:47 +0200
Subject: [PATCH 188/471] ticket/BAP-9546 fix scroll height

---
 .../public/css/less/mobile/dialog.less        |  5 +++
 .../Resources/public/css/less/oro.less        | 35 +++++++++++++++----
 .../public/js/widget/dialog-widget.js         | 27 +++++++-------
 3 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/dialog.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/dialog.less
index accf1887067..f2cbee2bfe2 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/dialog.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/dialog.less
@@ -24,6 +24,11 @@
   box-shadow: none !important;
   max-width: 100vw;
   min-width: initial !important;
+  &.ui-resizable:not(.ui-dialog-buttons) {
+    &:after {
+      display: none;
+    }
+  }
   .ui-widget-header {
     .ui-dialog-titlebar-buttonpane [class*='ui-dialog-titlebar-']:first-child:before {
       font-size: 18px;
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less
index 09ef6c83988..e9ba8373a78 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less
@@ -869,14 +869,22 @@ footer {
     cursor: move;
   }
 }
-.ui-dialog:not(.ui-dialog-buttons) .ui-dialog-content{
-  height: calc(~"100% - 32px") !important;
-  border-radius: 0 0 3px 3px;
+.ui-dialog:not(.ui-dialog-buttons){
+  .ui-dialog-content{
+    border-radius: 0 0 3px 3px;
+  }
 }
-.ui-dialog.ui-resizable:not(.ui-dialog-buttons) .ui-dialog-content{
-  height: calc(~"100% - 50px") !important;
-  border-radius: 0 0 3px 3px;
-  border-bottom: 1px solid #e5e5e5;
+.ui-dialog.ui-resizable:not(.ui-dialog-buttons) {
+  &:after{
+    display: block;
+    height: 15px;
+    content: " ";
+    flex: none;
+  }
+  .ui-dialog-content{
+    border-radius: 0 0 3px 3px;
+    border-bottom: 1px solid #e5e5e5;
+  }
 }
 .ui-dialog .widget-actions-section {
   .btn, .action {
@@ -1643,6 +1651,19 @@ footer {
     }
   }
   &.ui-dialog-normal {
+    display: flex !important;
+    flex-direction: column;
+    .ui-dialog-titlebar {
+      min-height: 34px;
+      flex: none;
+    }
+    .ui-dialog-content {
+      flex: 1;
+    }
+    .ui-dialog-buttonpane {
+      height: 49px;
+      flex: none;
+    }
     [class*='ui-dialog-titlebar-'] {
       &:hover:before {
         #gradient > .vertical(darken(#838d98,5%), darken(#46515d,5%));
diff --git a/src/Oro/Bundle/WindowsBundle/Resources/public/js/widget/dialog-widget.js b/src/Oro/Bundle/WindowsBundle/Resources/public/js/widget/dialog-widget.js
index 5e18ccb3a73..adee9c46fce 100644
--- a/src/Oro/Bundle/WindowsBundle/Resources/public/js/widget/dialog-widget.js
+++ b/src/Oro/Bundle/WindowsBundle/Resources/public/js/widget/dialog-widget.js
@@ -313,14 +313,22 @@ define(function(require) {
         _initAdjustHeight: function(content) {
             this.widget.off('.adjust-height-events');
             var scrollableContent = content.find('.scrollable-container');
+            var resizeEvents = [
+                'dialogresize.adjust-height-events',
+                'dialogmaximize.adjust-height-events',
+                'dialogrestore.adjust-height-events'
+            ].join(' ');
+            this.widget.on('dialogresizestart.adjust-height-events', _.bind(function() {
+                var dialog = this.widget.closest('.ui-dialog');
+                var containerEl = $(this.options.dialogOptions.limitTo || document.body)[0];
+                dialog.css({
+                    maxWidth: containerEl.clientWidth,
+                    maxHeight: containerEl.clientHeight
+                });
+            }, this));
             if (scrollableContent.length) {
                 scrollableContent.css('overflow', 'auto');
-                var events = [
-                    'dialogresize.adjust-height-events',
-                    'dialogmaximize.adjust-height-events',
-                    'dialogrestore.adjust-height-events'
-                ];
-                this.widget.on(events.join(''), _.bind(this._fixScrollableHeight, this));
+                this.widget.on(resizeEvents, _.bind(this._fixScrollableHeight, this));
                 this._fixScrollableHeight();
             }
         },
@@ -452,13 +460,6 @@ define(function(require) {
                     dialog.css('min-height', containerEl.clientHeight - top);
                 }
             }
-            if (!tools.isMobile()) {
-                // freeze width and height for proper layout
-                dialog.css({
-                    width: dialog.outerWidth(),
-                    height: dialog.outerHeight()
-                });
-            }
         },
 
         /**

From 4c33ebdf0852844e077dcbea133025f2d54d8c20 Mon Sep 17 00:00:00 2001
From: Andrey Yatsenco <yatsenco@gmail.com>
Date: Fri, 18 Dec 2015 15:17:04 +0200
Subject: [PATCH 189/471] BB-1735: Fix issues after review - fixed tests -
 refactored ConfigExpressionExtension to separate processExpressions logic to
 ConfigExpressionProcessor

---
 .../Extension/ConfigExpressionExtension.php   | 163 ++--------
 .../Processor/ConfigExpressionProcessor.php   | 140 +++++++++
 .../Resources/config/services.yml             |   9 +-
 .../views/Layout/div_layout.html.twig         |   6 +-
 .../Tests/Unit/BlockTypeTestCase.php          |   1 -
 .../ConfigExpressionExtensionTest.php         | 293 ++++--------------
 .../Unit/Layout/Block/Type/TextTypeTest.php   |   2 +-
 ...onfigExpressionContextConfiguratorTest.php |   3 +
 .../ConfigExpressionProcessorTest.php         | 245 +++++++++++++++
 .../Layout/BlockTypeExtensionInterface.php    |   2 +
 .../Layout/Tests/Unit/BlockBuilderTest.php    |  13 +-
 .../Layout/Tests/Unit/BlockFactoryTest.php    |  31 +-
 .../Layout/Tests/Unit/LayoutRegistryTest.php  |  24 ++
 13 files changed, 530 insertions(+), 402 deletions(-)
 create mode 100644 src/Oro/Bundle/LayoutBundle/Layout/Processor/ConfigExpressionProcessor.php
 create mode 100644 src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Processor/ConfigExpressionProcessorTest.php

diff --git a/src/Oro/Bundle/LayoutBundle/Layout/Block/Extension/ConfigExpressionExtension.php b/src/Oro/Bundle/LayoutBundle/Layout/Block/Extension/ConfigExpressionExtension.php
index cb0d3392bf7..49e322892dd 100644
--- a/src/Oro/Bundle/LayoutBundle/Layout/Block/Extension/ConfigExpressionExtension.php
+++ b/src/Oro/Bundle/LayoutBundle/Layout/Block/Extension/ConfigExpressionExtension.php
@@ -2,39 +2,30 @@
 
 namespace Oro\Bundle\LayoutBundle\Layout\Block\Extension;
 
-use Oro\Component\ConfigExpression\AssemblerInterface;
-use Oro\Component\ConfigExpression\ExpressionInterface;
 use Oro\Component\Layout\AbstractBlockTypeExtension;
 use Oro\Component\Layout\Block\Type\BaseType;
 use Oro\Component\Layout\BlockInterface;
 use Oro\Component\Layout\BlockView;
 use Oro\Component\Layout\ContextInterface;
 use Oro\Component\Layout\DataAccessorInterface;
-use Oro\Component\Layout\OptionValueBag;
 
-use Oro\Bundle\LayoutBundle\Layout\Encoder\ConfigExpressionEncoderRegistry;
+use Oro\Bundle\LayoutBundle\Layout\Processor\ConfigExpressionProcessor;
 
 /**
  * Allows to use expressions (see ConfigExpression component) in block type options and attributes.
  */
 class ConfigExpressionExtension extends AbstractBlockTypeExtension
 {
-    /** @var AssemblerInterface */
-    protected $expressionAssembler;
-
-    /** @var ConfigExpressionEncoderRegistry */
-    protected $encoderRegistry;
+    /** @var ConfigExpressionProcessor */
+    protected $processor;
 
     /**
-     * @param AssemblerInterface              $expressionAssembler
-     * @param ConfigExpressionEncoderRegistry $encoderRegistry
+     * @param ConfigExpressionProcessor $processor
      */
     public function __construct(
-        AssemblerInterface $expressionAssembler,
-        ConfigExpressionEncoderRegistry $encoderRegistry
+        ConfigExpressionProcessor $processor
     ) {
-        $this->expressionAssembler = $expressionAssembler;
-        $this->encoderRegistry     = $encoderRegistry;
+        $this->processor = $processor;
     }
 
     /**
@@ -42,12 +33,13 @@ public function __construct(
      */
     public function normalizeOptions($name, array &$options, ContextInterface $context, DataAccessorInterface $data)
     {
-        if ($this->shouldBeProcessed($context, false)) {
-            $evaluate = $context->getOr('expressions_evaluate');
-            $encoding = $context->getOr('expressions_encoding');
-
-            $this->processExpressions($options, $context, $data, $evaluate, $encoding);
+        if (false !== $context->getOr('expressions_evaluate_deferred')) {
+            return;
         }
+        $evaluate = $context->getOr('expressions_evaluate');
+        $encoding = $context->getOr('expressions_encoding');
+
+        $this->processor->processExpressions($options, $context, $data, $evaluate, $encoding);
     }
 
     /**
@@ -56,14 +48,15 @@ public function normalizeOptions($name, array &$options, ContextInterface $conte
     public function finishView(BlockView $view, BlockInterface $block, array $options)
     {
         $context = $block->getContext();
+        $data = $block->getData();
 
-        if ($this->shouldBeProcessed($context, true)) {
-            $evaluate = $context->getOr('expressions_evaluate');
-            $encoding = $context->getOr('expressions_encoding');
-
-            $data = $block->getData();
-            $this->processExpressions($options, $context, $data, $evaluate, $encoding);
+        if (true !== $context->getOr('expressions_evaluate_deferred')) {
+            return;
         }
+        $evaluate = $context->getOr('expressions_evaluate');
+        $encoding = $context->getOr('expressions_encoding');
+
+        $this->processor->processExpressions($view->vars, $context, $data, $evaluate, $encoding);
     }
 
     /**
@@ -73,122 +66,4 @@ public function getExtendedType()
     {
         return BaseType::NAME;
     }
-
-    /**
-     * @param ContextInterface $context
-     * @param bool $isDeferred
-     * @return bool
-     */
-    protected function shouldBeProcessed(ContextInterface $context, $isDeferred)
-    {
-        $evaluateDeferred = $context->getOr('expressions_evaluate_deferred');
-        if ($evaluateDeferred === $isDeferred) {
-            $evaluate = $context->getOr('expressions_evaluate');
-            $encoding = $context->getOr('expressions_encoding');
-
-            return $evaluate || $encoding !== null;
-        }
-        return false;
-    }
-
-    /**
-     * @param array                 $values
-     * @param ContextInterface      $context
-     * @param DataAccessorInterface $data
-     * @param bool                  $evaluate
-     * @param string                $encoding
-     */
-    protected function processExpressions(
-        array &$values,
-        ContextInterface $context,
-        DataAccessorInterface $data,
-        $evaluate,
-        $encoding
-    ) {
-        foreach ($values as $key => &$value) {
-            if (is_array($value)) {
-                if (!empty($value)) {
-                    switch ($this->checkArrayValue($value)) {
-                        case 0:
-                            $this->processExpressions($value, $context, $data, $evaluate, $encoding);
-                            break;
-                        case 1:
-                            $value = $this->processExpression(
-                                $this->expressionAssembler->assemble($value),
-                                $context,
-                                $data,
-                                $evaluate,
-                                $encoding
-                            );
-                            break;
-                        case -1:
-                            // the backslash (\) at the begin of the array key should be removed
-                            $value = [substr(key($value), 1) => reset($value)];
-                            break;
-                    }
-                }
-            } elseif ($value instanceof ExpressionInterface) {
-                $value = $this->processExpression($value, $context, $data, $evaluate, $encoding);
-            } elseif ($value instanceof OptionValueBag) {
-                foreach ($value->all() as $action) {
-                    $args = $action->getArguments();
-                    $this->processExpressions($args, $context, $data, $evaluate, $encoding);
-                    foreach ($args as $index => $arg) {
-                        $action->setArgument($index, $arg);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * @param ExpressionInterface   $expr
-     * @param ContextInterface      $context
-     * @param DataAccessorInterface $data
-     * @param bool                  $evaluate
-     * @param string                $encoding
-     *
-     * @return mixed|string
-     */
-    protected function processExpression(
-        ExpressionInterface $expr,
-        ContextInterface $context,
-        DataAccessorInterface $data,
-        $evaluate,
-        $encoding
-    ) {
-        return $evaluate
-            ? $expr->evaluate(['context' => $context, 'data' => $data])
-            : $this->encoderRegistry->getEncoder($encoding)->encodeExpr($expr);
-    }
-
-    /**
-     * @param array $value
-     *
-     * @return int the checking result
-     *             0  - the value is regular array
-     *             1  - the value is an expression
-     *             -1 - the value is an array with one items and its key starts with "\@"
-     *                  which should be replaces with "@"
-     */
-    protected function checkArrayValue($value)
-    {
-        if (count($value) === 1) {
-            reset($value);
-            $k = key($value);
-            if (is_string($k)) {
-                $pos = strpos($k, '@');
-                if ($pos === 0) {
-                    // expression
-                    return 1;
-                } elseif ($pos === 1 && $k[0] === '\\') {
-                    // the backslash (\) at the begin of the array key should be removed
-                    return -1;
-                }
-            }
-        }
-
-        // regular array
-        return 0;
-    }
 }
diff --git a/src/Oro/Bundle/LayoutBundle/Layout/Processor/ConfigExpressionProcessor.php b/src/Oro/Bundle/LayoutBundle/Layout/Processor/ConfigExpressionProcessor.php
new file mode 100644
index 00000000000..93fc0ebc29c
--- /dev/null
+++ b/src/Oro/Bundle/LayoutBundle/Layout/Processor/ConfigExpressionProcessor.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace Oro\Bundle\LayoutBundle\Layout\Processor;
+
+use Oro\Component\ConfigExpression\AssemblerInterface;
+use Oro\Component\ConfigExpression\ExpressionInterface;
+use Oro\Component\Layout\ContextInterface;
+use Oro\Component\Layout\DataAccessorInterface;
+use Oro\Component\Layout\OptionValueBag;
+
+use Oro\Bundle\LayoutBundle\Layout\Encoder\ConfigExpressionEncoderRegistry;
+
+class ConfigExpressionProcessor
+{
+    const ARRAY_IS_REGULAR = 0;
+    const ARRAY_IS_EXPRESSION = 1;
+    const ARRAY_IS_EXPRESSION_STARTED_WITH_BACKSLASH = -1;
+
+    /** @var AssemblerInterface */
+    protected $expressionAssembler;
+
+    /** @var ConfigExpressionEncoderRegistry */
+    protected $encoderRegistry;
+
+    /**
+     * @param AssemblerInterface              $expressionAssembler
+     * @param ConfigExpressionEncoderRegistry $encoderRegistry
+     */
+    public function __construct(
+        AssemblerInterface $expressionAssembler,
+        ConfigExpressionEncoderRegistry $encoderRegistry
+    ) {
+        $this->expressionAssembler = $expressionAssembler;
+        $this->encoderRegistry     = $encoderRegistry;
+    }
+
+    /**
+     * @param array                 $values
+     * @param ContextInterface      $context
+     * @param DataAccessorInterface $data
+     * @param bool                  $evaluate
+     * @param string                $encoding
+     */
+    public function processExpressions(
+        array &$values,
+        ContextInterface $context,
+        DataAccessorInterface $data,
+        $evaluate,
+        $encoding
+    ) {
+        if (!$evaluate && $encoding === null) {
+            return;
+        }
+        foreach ($values as $key => &$value) {
+            if (is_array($value)) {
+                if (!empty($value)) {
+                    switch ($this->checkArrayValue($value)) {
+                        case self::ARRAY_IS_REGULAR:
+                            $this->processExpressions($value, $context, $data, $evaluate, $encoding);
+                            break;
+                        case self::ARRAY_IS_EXPRESSION:
+                            $value = $this->processExpression(
+                                $this->expressionAssembler->assemble($value),
+                                $context,
+                                $data,
+                                $evaluate,
+                                $encoding
+                            );
+                            break;
+                        case self::ARRAY_IS_EXPRESSION_STARTED_WITH_BACKSLASH:
+                            // the backslash (\) at the begin of the array key should be removed
+                            $value = [substr(key($value), 1) => reset($value)];
+                            break;
+                    }
+                }
+            } elseif ($value instanceof OptionValueBag) {
+                foreach ($value->all() as $action) {
+                    $args = $action->getArguments();
+                    $this->processExpressions($args, $context, $data, $evaluate, $encoding);
+                    foreach ($args as $index => $arg) {
+                        $action->setArgument($index, $arg);
+                    }
+                }
+            } elseif ($value instanceof ExpressionInterface) {
+                $value = $this->processExpression($value, $context, $data, $evaluate, $encoding);
+            }
+        }
+    }
+
+    /**
+     * @param ExpressionInterface   $expr
+     * @param ContextInterface      $context
+     * @param DataAccessorInterface $data
+     * @param bool                  $evaluate
+     * @param string                $encoding
+     *
+     * @return mixed|string
+     */
+    protected function processExpression(
+        ExpressionInterface $expr,
+        ContextInterface $context,
+        DataAccessorInterface $data,
+        $evaluate,
+        $encoding
+    ) {
+        return $evaluate
+            ? $expr->evaluate(['context' => $context, 'data' => $data])
+            : $this->encoderRegistry->getEncoder($encoding)->encodeExpr($expr);
+    }
+
+    /**
+     * @param array $value
+     *
+     * @return int the checking result
+     *             0  - the value is regular array
+     *             1  - the value is an expression
+     *             -1 - the value is an array with one item and its key starts with "\@"
+     *                  which should be replaces with "@"
+     */
+    protected function checkArrayValue($value)
+    {
+        if (count($value) === 1) {
+            reset($value);
+            $k = key($value);
+            if (is_string($k)) {
+                $pos = strpos($k, '@');
+                if ($pos === 0) {
+                    // expression
+                    return self::ARRAY_IS_EXPRESSION;
+                } elseif ($pos === 1 && $k[0] === '\\') {
+                    // the backslash (\) at the begin of the array key should be removed
+                    return self::ARRAY_IS_EXPRESSION_STARTED_WITH_BACKSLASH;
+                }
+            }
+        }
+
+        // regular array
+        return self::ARRAY_IS_REGULAR;
+    }
+}
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/config/services.yml b/src/Oro/Bundle/LayoutBundle/Resources/config/services.yml
index 47b89b78277..6f295347aea 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/LayoutBundle/Resources/config/services.yml
@@ -111,8 +111,7 @@ services:
     oro_layout.block_type_extension.config_expression:
         class: Oro\Bundle\LayoutBundle\Layout\Block\Extension\ConfigExpressionExtension
         arguments:
-            - @oro_layout.expression.assembler
-            - @oro_layout.expression.encoder_registry
+            - @oro_layout.processor.config_expression
         tags:
             - { name: layout.block_type_extension, alias: block, priority: 255 }
 
@@ -147,3 +146,9 @@ services:
             - @oro_layout.theme_manager
         tags:
             - { name: assetic.formula_resource, loader: layout }
+
+    oro_layout.processor.config_expression:
+        class: Oro\Bundle\LayoutBundle\Layout\Processor\ConfigExpressionProcessor
+        arguments:
+            - @oro_layout.expression.assembler
+            - @oro_layout.expression.encoder_registry
\ No newline at end of file
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
index be317734331..62d67a46551 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
+++ b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
@@ -1,5 +1,5 @@
 {% block block_widget -%}
-    {{ block('block_attributes') }}>
+    {{ block('block_attributes') }}
 {%- endblock %}
 
 {% block block_label -%}
@@ -44,9 +44,7 @@
             placeholder: attr.placeholder|block_text(translation_domain)
         }) %}
     {% endif %}
-    {{ block_widget(block, {
-        attr: attr
-    }) }}
+    <input {{ block_widget(block, {attr: attr}) }} />
 {%- endblock %}
 
 {% block container_widget -%}
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/BlockTypeTestCase.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/BlockTypeTestCase.php
index 5c8942fcb6c..c97ab53eeb8 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/BlockTypeTestCase.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/BlockTypeTestCase.php
@@ -46,7 +46,6 @@ protected function initializeLayoutFactoryBuilder(LayoutFactoryBuilderInterface
             ->addType(new Type\ListType())
             ->addType(new Type\OrderedListType())
             ->addType(new Type\ListItemType())
-            ->addType(new Type\HtmlType())
             ->addType(new Type\InputType());
     }
 }
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Extension/ConfigExpressionExtensionTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Extension/ConfigExpressionExtensionTest.php
index 29ce992450d..e552bb8084d 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Extension/ConfigExpressionExtensionTest.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Extension/ConfigExpressionExtensionTest.php
@@ -2,47 +2,31 @@
 
 namespace Oro\Bundle\LayoutBundle\Tests\Unit\Layout\Block\Extension;
 
-use Symfony\Component\PropertyAccess\PropertyPath;
-
-use Oro\Component\ConfigExpression\AssemblerInterface;
 use Oro\Component\ConfigExpression\Condition;
-use Oro\Component\ConfigExpression\ContextAccessor;
 use Oro\Component\ConfigExpression\Func;
 use Oro\Component\Layout\Block\Type\BaseType;
-use Oro\Component\Layout\BlockBuilderInterface;
+use Oro\Component\Layout\DataAccessorInterface;
+use Oro\Component\Layout\BlockView;
 use Oro\Component\Layout\LayoutContext;
-use Oro\Component\Layout\OptionValueBag;
 
+use Oro\Bundle\LayoutBundle\Layout\Processor\ConfigExpressionProcessor;
 use Oro\Bundle\LayoutBundle\Layout\Block\Extension\ConfigExpressionExtension;
-use Oro\Bundle\LayoutBundle\Layout\Encoder\ConfigExpressionEncoderRegistry;
-use Oro\Bundle\LayoutBundle\Layout\Encoder\JsonConfigExpressionEncoder;
 
 class ConfigExpressionExtensionTest extends \PHPUnit_Framework_TestCase
 {
-    /** @var AssemblerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $expressionAssembler;
+    /** @var ConfigExpressionProcessor|\PHPUnit_Framework_MockObject_MockObject */
+    protected $processor;
 
     /** @var ConfigExpressionExtension */
     protected $extension;
 
     protected function setUp()
     {
-        $this->expressionAssembler = $this->getMock('Oro\Component\ConfigExpression\AssemblerInterface');
-
-        /** @var ConfigExpressionEncoderRegistry|\PHPUnit_Framework_MockObject_MockObject $encoderRegistry */
-        $encoderRegistry = $this
-            ->getMockBuilder('Oro\Bundle\LayoutBundle\Layout\Encoder\ConfigExpressionEncoderRegistry')
+        $this->processor = $this->getMockBuilder('Oro\Bundle\LayoutBundle\Layout\Processor\ConfigExpressionProcessor')
             ->disableOriginalConstructor()
             ->getMock();
-        $encoderRegistry->expects($this->any())
-            ->method('getEncoder')
-            ->with('json')
-            ->will($this->returnValue(new JsonConfigExpressionEncoder()));
 
-        $this->extension = new ConfigExpressionExtension(
-            $this->expressionAssembler,
-            $encoderRegistry
-        );
+        $this->extension = new ConfigExpressionExtension($this->processor);
     }
 
     public function testGetExtendedType()
@@ -51,236 +35,79 @@ public function testGetExtendedType()
     }
 
     /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @dataProvider deferredDataProvider
+     * @param bool $deferred
      */
-    public function testBuildBlockEvaluatesAllExpressions()
+    public function testNormalizeOptions($deferred)
     {
-        $context = new LayoutContext();
-        $context->set('css_class', 'test_class');
-        $data  = $this->getMock('Oro\Component\Layout\DataAccessorInterface');
-
-        /** @var BlockBuilderInterface|\PHPUnit_Framework_MockObject_MockObject $block */
-        $block = $this->getMock('Oro\Component\Layout\BlockBuilderInterface');
-        $block->expects($this->once())
-            ->method('getContext')
-            ->will($this->returnValue($context));
-        $block->expects($this->once())
-            ->method('getDataAccessor')
-            ->will($this->returnValue($data));
-
-        $expr = $this->getMock('Oro\Component\ConfigExpression\ExpressionInterface');
-        $expr->expects($this->once())
-            ->method('evaluate')
-            ->with(['context' => $context, 'data' => $data])
-            ->will($this->returnValue(true));
-
-        $classExpr = new Func\GetValue();
-        $classExpr->initialize([new PropertyPath('context.css_class')]);
-        $classExpr->setContextAccessor(new ContextAccessor());
-        $classAttr = new OptionValueBag();
-        $classAttr->add(['@value' => ['$context.css_class']]);
-        $expectedClassAttr = new OptionValueBag();
-        $expectedClassAttr->add('test_class');
-
+        $context = $this->getContextMock($deferred);
+        $data = $this->getDataAccessorMock();
         $options = [];
-        $options['expr_object']           = $expr;
-        $options['expr_array']            = ['@true' => null];
-        $options['not_expr_array']        = ['\@true' => null];
-        $options['scalar']                = 123;
-        $options['attr']['enabled']       = ['@true' => null];
-        $options['attr']['data-scalar']   = 'foo';
-        $options['attr']['data-expr']     = ['@true' => null];
-        $options['attr']['class']         = $classAttr;
-        $options['label_attr']['enabled'] = ['@true' => null];
-        $options['array_with_expr']       = ['item1' => 'val1', 'item2' => ['@true' => null]];
-
-        $this->expressionAssembler->expects($this->exactly(6))
-            ->method('assemble')
-            ->will(
-                $this->returnValueMap(
-                    [
-                        [['@true' => null], new Condition\True()],
-                        [['@value' => ['$context.css_class']], $classExpr]
-                    ]
-                )
-            );
 
-        $context['expressions_evaluate'] = true;
-        $this->extension->buildBlock($block, $options);
+        $this->processor->expects($deferred ? $this->never() : $this->once())
+            ->method('processExpressions')
+            ->with($options, $context, $data, true, 'json');
 
-        $this->assertSame(
-            true,
-            $options['expr_object'],
-            'Failed asserting that an expression is evaluated'
-        );
-        $this->assertSame(
-            true,
-            $options['expr_array'],
-            'Failed asserting that an expression is assembled and evaluated'
-        );
-        $this->assertSame(
-            ['@true' => null],
-            $options['not_expr_array'],
-            'Failed asserting that a backslash at the begin of the array key is removed'
-        );
-        $this->assertSame(
-            123,
-            $options['scalar'],
-            'Failed asserting that a scalar value is not changed'
-        );
-        $this->assertSame(
-            true,
-            $options['attr']['enabled'],
-            'Failed asserting that an expression in "attr" is assembled and evaluated'
-        );
-        $this->assertSame(
-            'foo',
-            $options['attr']['data-scalar'],
-            'Failed asserting that "attr.data-scalar" exists'
-        );
-        $this->assertSame(
-            true,
-            $options['attr']['data-expr'],
-            'Failed asserting that "attr.data-expr" is assembled and evaluated'
-        );
-        $this->assertEquals(
-            $expectedClassAttr,
-            $options['attr']['class'],
-            'Failed asserting that "attr.class" is assembled and evaluated'
-        );
-        $this->assertSame(
-            true,
-            $options['label_attr']['enabled'],
-            'Failed asserting that an expression in "label_attr" is assembled and evaluated'
-        );
-        $this->assertSame(
-            ['item1' => 'val1', 'item2' => true],
-            $options['array_with_expr'],
-            'Failed asserting that an expression is assembled and evaluated in nested array'
-        );
+        $this->extension->normalizeOptions('test', $options, $context, $data);
     }
 
-    public function testBuildBlockDoNothingIfEvaluationOfExpressionsDisabledAndEncodingIsNotSet()
+    /**
+     * @dataProvider deferredDataProvider
+     * @param bool $deferred
+     */
+    public function testFinishView($deferred)
     {
-        $context = new LayoutContext();
+        $context = $this->getContextMock($deferred);
+        $data = $this->getDataAccessorMock();
 
-        /** @var BlockBuilderInterface|\PHPUnit_Framework_MockObject_MockObject $block */
-        $block = $this->getMock('Oro\Component\Layout\BlockBuilderInterface');
+        $block = $this->getMock('Oro\Component\Layout\BlockInterface');
         $block->expects($this->once())
             ->method('getContext')
             ->will($this->returnValue($context));
-        $block->expects($this->never())
-            ->method('getDataAccessor');
-
-        $expr = $this->getMock('Oro\Component\ConfigExpression\ExpressionInterface');
-        $expr->expects($this->never())
-            ->method('evaluate');
-        $expr->expects($this->never())
-            ->method('toArray');
-
-        $options = [];
-        $options['expr_object']           = $expr;
-        $options['expr_array']            = ['@true' => null];
-        $options['not_expr_array']        = ['\@true' => null];
-        $options['scalar']                = 123;
-        $options['attr']['enabled']       = ['@true' => null];
-        $options['label_attr']['enabled'] = ['@true' => null];
-
-        $this->expressionAssembler->expects($this->never())
-            ->method('assemble');
+        $block->expects($this->once())
+            ->method('getData')
+            ->will($this->returnValue($data));
+        $view = new BlockView();
+        $view->vars = ['test'];
 
-        $initialVars = $options;
+        $this->processor->expects($deferred ? $this->once(): $this->never())
+            ->method('processExpressions')
+            ->with($view->vars, $context, $data, true, 'json');
 
-        $context['expressions_evaluate'] = false;
-        $this->extension->buildBlock($block, $options);
+        $this->extension->finishView($view, $block, []);
+    }
 
-        $this->assertSame($initialVars, $options);
+    /**
+     * @return array
+     */
+    public function deferredDataProvider()
+    {
+        return [
+            ['expressions_evaluate_deferred' => true],
+            ['expressions_evaluate_deferred' => false]
+        ];
     }
 
-    public function testBuildBlockEncodesAllExpressions()
+    /**
+     * @param bool $evaluateDeferred
+     * @return LayoutContext
+     */
+    protected function getContextMock($evaluateDeferred)
     {
         $context = new LayoutContext();
-        $data    = $this->getMock('Oro\Component\Layout\DataAccessorInterface');
-
-        /** @var BlockBuilderInterface|\PHPUnit_Framework_MockObject_MockObject $block */
-        $block = $this->getMock('Oro\Component\Layout\BlockBuilderInterface');
-        $block->expects($this->once())
-            ->method('getContext')
-            ->will($this->returnValue($context));
-        $block->expects($this->once())
-            ->method('getDataAccessor')
-            ->will($this->returnValue($data));
-
-        $expr = $this->getMock('Oro\Component\ConfigExpression\ExpressionInterface');
-        $expr->expects($this->once())
-            ->method('toArray')
-            ->will($this->returnValue(['@true' => null]));
-
-        $classExpr = new Func\GetValue();
-        $classExpr->initialize([new PropertyPath('context.css_class')]);
-        $classAttr = new OptionValueBag();
-        $classAttr->add(['@value' => ['$context.css_class']]);
-        $expectedClassAttr = new OptionValueBag();
-        $expectedClassAttr->add('{"@value":{"parameters":["$context.css_class"]}}');
-
-        $options = [];
-        $options['expr_object']           = $expr;
-        $options['expr_array']            = ['@true' => null];
-        $options['not_expr_array']        = ['\@true' => null];
-        $options['scalar']                = 123;
-        $options['attr']['enabled']       = ['@true' => null];
-        $options['attr']['class']         = $classAttr;
-        $options['label_attr']['enabled'] = ['@true' => null];
-
-        $this->expressionAssembler->expects($this->exactly(4))
-            ->method('assemble')
-            ->will(
-                $this->returnValueMap(
-                    [
-                        [['@true' => null], new Condition\True()],
-                        [['@value' => ['$context.css_class']], $classExpr]
-                    ]
-                )
-            );
+        $context->set('expressions_evaluate_deferred', $evaluateDeferred);
+        $context->set('expressions_evaluate', true);
+        $context->set('expressions_encoding', 'json');
 
-        $context['expressions_evaluate'] = false;
-        $context['expressions_encoding'] = 'json';
-        $this->extension->buildBlock($block, $options);
+        return $context;
+    }
 
-        $this->assertSame(
-            '{"@true":null}',
-            $options['expr_object'],
-            'Failed asserting that an expression is encoded'
-        );
-        $this->assertSame(
-            '{"@true":null}',
-            $options['expr_array'],
-            'Failed asserting that an expression is assembled and encoded'
-        );
-        $this->assertSame(
-            ['@true' => null],
-            $options['not_expr_array'],
-            'Failed asserting that a backslash at the begin of the array key is removed'
-        );
-        $this->assertSame(
-            123,
-            $options['scalar'],
-            'Failed asserting that a scalar value is not changed'
-        );
-        $this->assertSame(
-            '{"@true":null}',
-            $options['attr']['enabled'],
-            'Failed asserting that an expression in "attr" is assembled and encoded'
-        );
-        $this->assertEquals(
-            $expectedClassAttr,
-            $options['attr']['class'],
-            'Failed asserting that "attr.class" is assembled and encoded'
-        );
-        $this->assertSame(
-            '{"@true":null}',
-            $options['label_attr']['enabled'],
-            'Failed asserting that an expression in "label_attr" is assembled and encoded'
-        );
+    /**
+     * @return DataAccessorInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected function getDataAccessorMock()
+    {
+        return $this->getMock('Oro\Component\Layout\DataAccessorInterface');
     }
 }
+
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/TextTypeTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/TextTypeTest.php
index 0bfe2c3711d..47ed79343ed 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/TextTypeTest.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/TextTypeTest.php
@@ -32,7 +32,7 @@ public function testBuildView()
     {
         $view = $this->getBlockView(
             TextType::NAME,
-            ['text' => 'test']
+            ['text' => 'test', 'escape'=> false]
         );
 
         $this->assertEquals('test', $view->vars['text']);
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Extension/ConfigExpressionContextConfiguratorTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Extension/ConfigExpressionContextConfiguratorTest.php
index 32db1caeb6c..f11262aa34b 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Extension/ConfigExpressionContextConfiguratorTest.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Extension/ConfigExpressionContextConfiguratorTest.php
@@ -24,6 +24,7 @@ public function testDefaultValuesAfterConfigureContext()
         $context->resolve();
 
         $this->assertTrue($context['expressions_evaluate']);
+        $this->assertFalse($context['expressions_evaluate_deferred']);
         $this->assertFalse(isset($context['expressions_encoding']));
     }
 
@@ -32,12 +33,14 @@ public function testConfigureContext()
         $context = new LayoutContext();
 
         $context['expressions_evaluate'] = false;
+        $context['expressions_evaluate_deferred'] = true;
         $context['expressions_encoding'] = 'json';
 
         $this->contextConfigurator->configureContext($context);
         $context->resolve();
 
         $this->assertFalse($context['expressions_evaluate']);
+        $this->assertTrue($context['expressions_evaluate_deferred']);
         $this->assertEquals('json', $context['expressions_encoding']);
     }
 }
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Processor/ConfigExpressionProcessorTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Processor/ConfigExpressionProcessorTest.php
new file mode 100644
index 00000000000..03cff87cc4f
--- /dev/null
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Processor/ConfigExpressionProcessorTest.php
@@ -0,0 +1,245 @@
+<?php
+
+namespace LayoutBundle\Tests\Unit\Layout\Processor;
+
+use Symfony\Component\PropertyAccess\PropertyPath;
+
+use Oro\Component\ConfigExpression\AssemblerInterface;
+use Oro\Component\ConfigExpression\Condition;
+use Oro\Component\ConfigExpression\ContextAccessor;
+use Oro\Component\ConfigExpression\Func;
+use Oro\Component\Layout\LayoutContext;
+use Oro\Component\Layout\OptionValueBag;
+
+use Oro\Bundle\LayoutBundle\Layout\Processor\ConfigExpressionProcessor;
+use Oro\Bundle\LayoutBundle\Layout\Encoder\JsonConfigExpressionEncoder;
+
+class ConfigExpressionProcessorTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var AssemblerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $expressionAssembler;
+
+    /** @var ConfigExpressionProcessor */
+    protected $processor;
+
+    protected function setUp()
+    {
+        $this->expressionAssembler = $this->getMock('Oro\Component\ConfigExpression\AssemblerInterface');
+
+        $encoderRegistry = $this
+            ->getMockBuilder('Oro\Bundle\LayoutBundle\Layout\Encoder\ConfigExpressionEncoderRegistry')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $encoderRegistry->expects($this->any())
+            ->method('getEncoder')
+            ->with('json')
+            ->will($this->returnValue(new JsonConfigExpressionEncoder()));
+
+        $this->processor = new ConfigExpressionProcessor(
+            $this->expressionAssembler,
+            $encoderRegistry
+        );
+    }
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testProcessExpressionsEvaluatesAllExpressions()
+    {
+        $context = new LayoutContext();
+        $context->set('css_class', 'test_class');
+        $data  = $this->getMock('Oro\Component\Layout\DataAccessorInterface');
+
+        $expr = $this->getMock('Oro\Component\ConfigExpression\ExpressionInterface');
+        $expr->expects($this->once())
+            ->method('evaluate')
+            ->with(['context' => $context, 'data' => $data])
+            ->will($this->returnValue(true));
+
+        $classExpr = new Func\GetValue();
+        $classExpr->initialize([new PropertyPath('context.css_class')]);
+        $classExpr->setContextAccessor(new ContextAccessor());
+        $classAttr = new OptionValueBag();
+        $classAttr->add(['@value' => ['$context.css_class']]);
+        $expectedClassAttr = new OptionValueBag();
+        $expectedClassAttr->add('test_class');
+
+        $values['expr_object']           = $expr;
+        $values['expr_array']            = ['@true' => null];
+        $values['not_expr_array']        = ['\@true' => null];
+        $values['scalar']                = 123;
+        $values['attr']['enabled']       = ['@true' => null];
+        $values['attr']['data-scalar']   = 'foo';
+        $values['attr']['data-expr']     = ['@true' => null];
+        $values['attr']['class']         = $classAttr;
+        $values['label_attr']['enabled'] = ['@true' => null];
+        $values['array_with_expr']       = ['item1' => 'val1', 'item2' => ['@true' => null]];
+
+        $this->expressionAssembler->expects($this->exactly(6))
+            ->method('assemble')
+            ->will(
+                $this->returnValueMap(
+                    [
+                        [['@true' => null], new Condition\True()],
+                        [['@value' => ['$context.css_class']], $classExpr]
+                    ]
+                )
+            );
+
+        $this->processor->processExpressions($values, $context, $data, true, null);
+
+        $this->assertSame(
+            true,
+            $values['expr_object'],
+            'Failed asserting that an expression is evaluated'
+        );
+        $this->assertSame(
+            true,
+            $values['expr_array'],
+            'Failed asserting that an expression is assembled and evaluated'
+        );
+        $this->assertSame(
+            ['@true' => null],
+            $values['not_expr_array'],
+            'Failed asserting that a backslash at the begin of the array key is removed'
+        );
+        $this->assertSame(
+            123,
+            $values['scalar'],
+            'Failed asserting that a scalar value is not changed'
+        );
+        $this->assertSame(
+            true,
+            $values['attr']['enabled'],
+            'Failed asserting that an expression in "attr" is assembled and evaluated'
+        );
+        $this->assertSame(
+            'foo',
+            $values['attr']['data-scalar'],
+            'Failed asserting that "attr.data-scalar" exists'
+        );
+        $this->assertSame(
+            true,
+            $values['attr']['data-expr'],
+            'Failed asserting that "attr.data-expr" is assembled and evaluated'
+        );
+        $this->assertEquals(
+            $expectedClassAttr,
+            $values['attr']['class'],
+            'Failed asserting that "attr.class" is assembled and evaluated'
+        );
+        $this->assertSame(
+            true,
+            $values['label_attr']['enabled'],
+            'Failed asserting that an expression in "label_attr" is assembled and evaluated'
+        );
+        $this->assertSame(
+            ['item1' => 'val1', 'item2' => true],
+            $values['array_with_expr'],
+            'Failed asserting that an expression is assembled and evaluated in nested array'
+        );
+    }
+
+    public function testProcessExpressionsDoNothingIfEvaluationOfExpressionsDisabledAndEncodingIsNotSet()
+    {
+        $context = new LayoutContext();
+        $data  = $this->getMock('Oro\Component\Layout\DataAccessorInterface');
+
+        $expr = $this->getMock('Oro\Component\ConfigExpression\ExpressionInterface');
+        $expr->expects($this->never())
+            ->method('evaluate');
+        $expr->expects($this->never())
+            ->method('toArray');
+
+        $values['expr_object']           = $expr;
+        $values['expr_array']            = ['@true' => null];
+        $values['not_expr_array']        = ['\@true' => null];
+        $values['scalar']                = 123;
+        $values['attr']['enabled']       = ['@true' => null];
+        $values['label_attr']['enabled'] = ['@true' => null];
+
+        $this->expressionAssembler->expects($this->never())
+            ->method('assemble');
+
+        $initialVars = $values;
+
+        $this->processor->processExpressions($values, $context, $data, false, null);
+
+        $this->assertSame($initialVars, $values);
+    }
+
+    public function testProcessExpressionsEncodesAllExpressions()
+    {
+        $context = new LayoutContext();
+        $context->set('expressions_evaluate_deferred', true);
+        $data    = $this->getMock('Oro\Component\Layout\DataAccessorInterface');
+
+        $expr = $this->getMock('Oro\Component\ConfigExpression\ExpressionInterface');
+        $expr->expects($this->once())
+            ->method('toArray')
+            ->will($this->returnValue(['@true' => null]));
+
+        $classExpr = new Func\GetValue();
+        $classExpr->initialize([new PropertyPath('context.css_class')]);
+        $classAttr = new OptionValueBag();
+        $classAttr->add(['@value' => ['$context.css_class']]);
+        $expectedClassAttr = new OptionValueBag();
+        $expectedClassAttr->add('{"@value":{"parameters":["$context.css_class"]}}');
+
+        $values['expr_object']           = $expr;
+        $values['expr_array']            = ['@true' => null];
+        $values['not_expr_array']        = ['\@true' => null];
+        $values['scalar']                = 123;
+        $values['attr']['enabled']       = ['@true' => null];
+        $values['attr']['class']         = $classAttr;
+        $values['label_attr']['enabled'] = ['@true' => null];
+
+        $this->expressionAssembler->expects($this->exactly(4))
+            ->method('assemble')
+            ->will(
+                $this->returnValueMap(
+                    [
+                        [['@true' => null], new Condition\True()],
+                        [['@value' => ['$context.css_class']], $classExpr]
+                    ]
+                )
+            );
+
+        $this->processor->processExpressions($values, $context, $data, false, 'json');
+
+        $this->assertSame(
+            '{"@true":null}',
+            $values['expr_object'],
+            'Failed asserting that an expression is encoded'
+        );
+        $this->assertSame(
+            '{"@true":null}',
+            $values['expr_array'],
+            'Failed asserting that an expression is assembled and encoded'
+        );
+        $this->assertSame(
+            ['@true' => null],
+            $values['not_expr_array'],
+            'Failed asserting that a backslash at the begin of the array key is removed'
+        );
+        $this->assertSame(
+            123,
+            $values['scalar'],
+            'Failed asserting that a scalar value is not changed'
+        );
+        $this->assertSame(
+            '{"@true":null}',
+            $values['attr']['enabled'],
+            'Failed asserting that an expression in "attr" is assembled and encoded'
+        );
+        $this->assertEquals(
+            $expectedClassAttr,
+            $values['attr']['class'],
+            'Failed asserting that "attr.class" is assembled and encoded'
+        );
+        $this->assertSame(
+            '{"@true":null}',
+            $values['label_attr']['enabled'],
+            'Failed asserting that an expression in "label_attr" is assembled and encoded'
+        );
+    }
+}
\ No newline at end of file
diff --git a/src/Oro/Component/Layout/BlockTypeExtensionInterface.php b/src/Oro/Component/Layout/BlockTypeExtensionInterface.php
index 6c543394c6f..cc9bc586179 100644
--- a/src/Oro/Component/Layout/BlockTypeExtensionInterface.php
+++ b/src/Oro/Component/Layout/BlockTypeExtensionInterface.php
@@ -55,6 +55,8 @@ public function finishView(BlockView $view, BlockInterface $block, array $option
     public function setDefaultOptions(OptionsResolverInterface $resolver);
 
     /**
+     * Normalize options after they was resolved.
+     *
      * @param $name
      * @param array $options
      * @param ContextInterface $context
diff --git a/src/Oro/Component/Layout/Tests/Unit/BlockBuilderTest.php b/src/Oro/Component/Layout/Tests/Unit/BlockBuilderTest.php
index 83f7d7f6382..98ea1d53947 100644
--- a/src/Oro/Component/Layout/Tests/Unit/BlockBuilderTest.php
+++ b/src/Oro/Component/Layout/Tests/Unit/BlockBuilderTest.php
@@ -4,7 +4,6 @@
 
 use Oro\Component\Layout\BlockBuilder;
 use Oro\Component\Layout\BlockTypeHelperInterface;
-use Oro\Component\Layout\DataAccessor;
 use Oro\Component\Layout\LayoutContext;
 use Oro\Component\Layout\LayoutManipulatorInterface;
 use Oro\Component\Layout\LayoutRegistryInterface;
@@ -27,9 +26,6 @@ class BlockBuilderTest extends \PHPUnit_Framework_TestCase
     /** @var BlockBuilder */
     protected $blockBuilder;
 
-    /** @var DataAccessor */
-    protected $dataAccessor;
-
     /** @var LayoutRegistryInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $registry;
 
@@ -40,14 +36,12 @@ protected function setUp()
         $this->context           = new LayoutContext();
         $this->layoutManipulator = $this->getMock('Oro\Component\Layout\LayoutManipulatorInterface');
         $this->registry          = $this->getMock('Oro\Component\Layout\LayoutRegistryInterface');
-        $this->dataAccessor      = new DataAccessor($this->registry, $this->context);
 
         $this->blockBuilder      = new BlockBuilder(
             $this->layoutManipulator,
             $this->rawLayout,
             $this->typeHelper,
-            $this->context,
-            $this->dataAccessor
+            $this->context
         );
     }
 
@@ -61,11 +55,6 @@ public function testGetContext()
         $this->assertSame($this->context, $this->blockBuilder->getContext());
     }
 
-    public function testGetDataAccessor()
-    {
-        $this->assertSame($this->dataAccessor, $this->blockBuilder->getDataAccessor());
-    }
-
     public function testGetLayoutManipulator()
     {
         $this->assertSame($this->layoutManipulator, $this->blockBuilder->getLayoutManipulator());
diff --git a/src/Oro/Component/Layout/Tests/Unit/BlockFactoryTest.php b/src/Oro/Component/Layout/Tests/Unit/BlockFactoryTest.php
index 2c5186cffbd..434174927d7 100644
--- a/src/Oro/Component/Layout/Tests/Unit/BlockFactoryTest.php
+++ b/src/Oro/Component/Layout/Tests/Unit/BlockFactoryTest.php
@@ -4,6 +4,9 @@
 
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
+use Oro\Component\Layout\ContextInterface;
+use Oro\Component\Layout\DataAccessor;
+use Oro\Component\Layout\DataAccessorInterface;
 use Oro\Component\Layout\Block\Type\BaseType;
 use Oro\Component\Layout\Block\Type\ContainerType;
 use Oro\Component\Layout\BlockBuilderInterface;
@@ -241,7 +244,23 @@ function (LayoutManipulatorInterface $layoutManipulator, LayoutItemInterface $it
             ->will(
                 $this->returnCallback(
                     function (OptionsResolverInterface $resolver) {
-                        $resolver->setDefaults(['test_option' => '']);
+                        $resolver->setDefaults(
+                            [
+                                'test_option_1' => '',
+                                'test_option_2' => '{BG}:red'
+                            ]
+                        );
+                    }
+                )
+            );
+        $headerBlockTypeExtension->expects($this->once())
+            ->method('normalizeOptions')
+            ->will(
+                $this->returnCallback(
+                    function ($name, array &$options, ContextInterface $context, DataAccessorInterface $data) {
+                        if ($options['test_option_2'] === '{BG}:red') {
+                            $options['test_option_2'] = ['background'=> 'red'];
+                        }
                     }
                 )
             );
@@ -250,7 +269,7 @@ function (OptionsResolverInterface $resolver) {
             ->will(
                 $this->returnCallback(
                     function (BlockBuilderInterface $builder, array $options) {
-                        if ($options['test_option'] === 'move_logo_to_root') {
+                        if ($options['test_option_1'] === 'move_logo_to_root') {
                             $builder->getLayoutManipulator()->move('logo', 'root');
                         }
                     }
@@ -262,9 +281,10 @@ function (BlockBuilderInterface $builder, array $options) {
                 $this->returnCallback(
                     function (BlockView $view, BlockInterface $block, array $options) {
                         $view->vars['attr']['block_id'] = $block->getId();
-                        if ($options['test_option'] === 'move_logo_to_root') {
+                        if ($options['test_option_1'] === 'move_logo_to_root') {
                             $view->vars['attr']['logo_moved'] = true;
                         }
+                        $view->vars['attr']['background'] = $options['test_option_2']['background'];
                     }
                 )
             );
@@ -294,7 +314,7 @@ function (BlockView $view, BlockInterface $block, array $options) {
 
         $this->layoutManipulator
             ->add('root', null, 'root')
-            ->add('header', 'root', 'header', ['test_option' => 'move_logo_to_root'])
+            ->add('header', 'root', 'header', ['test_option_1' => 'move_logo_to_root'])
             ->add('logo', 'header', 'logo', ['title' => 'test']);
 
         $view = $this->getLayoutView();
@@ -308,7 +328,8 @@ function (BlockView $view, BlockInterface $block, array $options) {
                             'id'   => 'header',
                             'attr' => [
                                 'block_id'   => 'header',
-                                'logo_moved' => true
+                                'logo_moved' => true,
+                                'background' => 'red'
                             ]
                         ],
                         'children' => [
diff --git a/src/Oro/Component/Layout/Tests/Unit/LayoutRegistryTest.php b/src/Oro/Component/Layout/Tests/Unit/LayoutRegistryTest.php
index 5323d5a10b4..bf2143f0f94 100644
--- a/src/Oro/Component/Layout/Tests/Unit/LayoutRegistryTest.php
+++ b/src/Oro/Component/Layout/Tests/Unit/LayoutRegistryTest.php
@@ -209,6 +209,30 @@ public function testSetDefaultOptions()
         $this->registry->setDefaultOptions($name, $resolver);
     }
 
+    public function testNormalizeOptions()
+    {
+        $name     = 'test';
+        $options = ['foo'=> 'bar'];
+        $context= $this->getMock('Oro\Component\Layout\ContextInterface');
+        $data = $this->getMock('Oro\Component\Layout\DataAccessorInterface');
+
+        $typeExtension = $this->getMock('Oro\Component\Layout\BlockTypeExtensionInterface');
+
+        $this->extension->expects($this->once())
+            ->method('hasTypeExtensions')
+            ->with($name)
+            ->will($this->returnValue(true));
+        $this->extension->expects($this->once())
+            ->method('getTypeExtensions')
+            ->with($name)
+            ->will($this->returnValue([$typeExtension]));
+        $typeExtension->expects($this->once())
+            ->method('normalizeOptions')
+            ->with($name, $options, $context, $data);
+
+        $this->registry->normalizeOptions($name, $options, $context, $data);
+    }
+
     public function testBuildBlock()
     {
         $name    = 'test';

From 3c82f1100e0484ec333b0c66f8e2ee68cafdeffc Mon Sep 17 00:00:00 2001
From: Andrey Yatsenco <yatsenco@gmail.com>
Date: Fri, 18 Dec 2015 15:46:57 +0200
Subject: [PATCH 190/471] BB-1735: Fix issues after review - removed $name from
 BlockTypeExtension::normalizeOptions

---
 .../Layout/Block/Extension/ConfigExpressionExtension.php       | 2 +-
 .../Layout/Block/Extension/ConfigExpressionExtensionTest.php   | 2 +-
 src/Oro/Component/Layout/AbstractBlockTypeExtension.php        | 2 +-
 src/Oro/Component/Layout/BlockTypeExtensionInterface.php       | 3 +--
 src/Oro/Component/Layout/LayoutRegistry.php                    | 2 +-
 src/Oro/Component/Layout/Tests/Unit/BlockFactoryTest.php       | 2 +-
 src/Oro/Component/Layout/Tests/Unit/LayoutRegistryTest.php     | 2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/Oro/Bundle/LayoutBundle/Layout/Block/Extension/ConfigExpressionExtension.php b/src/Oro/Bundle/LayoutBundle/Layout/Block/Extension/ConfigExpressionExtension.php
index 49e322892dd..0003dcb83fe 100644
--- a/src/Oro/Bundle/LayoutBundle/Layout/Block/Extension/ConfigExpressionExtension.php
+++ b/src/Oro/Bundle/LayoutBundle/Layout/Block/Extension/ConfigExpressionExtension.php
@@ -31,7 +31,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function normalizeOptions($name, array &$options, ContextInterface $context, DataAccessorInterface $data)
+    public function normalizeOptions(array &$options, ContextInterface $context, DataAccessorInterface $data)
     {
         if (false !== $context->getOr('expressions_evaluate_deferred')) {
             return;
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Extension/ConfigExpressionExtensionTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Extension/ConfigExpressionExtensionTest.php
index e552bb8084d..26842db0ed0 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Extension/ConfigExpressionExtensionTest.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Extension/ConfigExpressionExtensionTest.php
@@ -48,7 +48,7 @@ public function testNormalizeOptions($deferred)
             ->method('processExpressions')
             ->with($options, $context, $data, true, 'json');
 
-        $this->extension->normalizeOptions('test', $options, $context, $data);
+        $this->extension->normalizeOptions($options, $context, $data);
     }
 
     /**
diff --git a/src/Oro/Component/Layout/AbstractBlockTypeExtension.php b/src/Oro/Component/Layout/AbstractBlockTypeExtension.php
index 3bd4bee4fe2..1dd59ae4419 100644
--- a/src/Oro/Component/Layout/AbstractBlockTypeExtension.php
+++ b/src/Oro/Component/Layout/AbstractBlockTypeExtension.php
@@ -37,7 +37,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
     /**
      * {@inheritdoc}
      */
-    public function normalizeOptions($name, array &$options, ContextInterface $context, DataAccessorInterface $data)
+    public function normalizeOptions(array &$options, ContextInterface $context, DataAccessorInterface $data)
     {
 
     }
diff --git a/src/Oro/Component/Layout/BlockTypeExtensionInterface.php b/src/Oro/Component/Layout/BlockTypeExtensionInterface.php
index cc9bc586179..84b6b4e6a15 100644
--- a/src/Oro/Component/Layout/BlockTypeExtensionInterface.php
+++ b/src/Oro/Component/Layout/BlockTypeExtensionInterface.php
@@ -57,12 +57,11 @@ public function setDefaultOptions(OptionsResolverInterface $resolver);
     /**
      * Normalize options after they was resolved.
      *
-     * @param $name
      * @param array $options
      * @param ContextInterface $context
      * @param DataAccessorInterface $data
      */
-    public function normalizeOptions($name, array &$options, ContextInterface $context, DataAccessorInterface $data);
+    public function normalizeOptions(array &$options, ContextInterface $context, DataAccessorInterface $data);
 
     /**
      * Returns the name of the block type being extended.
diff --git a/src/Oro/Component/Layout/LayoutRegistry.php b/src/Oro/Component/Layout/LayoutRegistry.php
index 892048e48b5..504402fb38a 100644
--- a/src/Oro/Component/Layout/LayoutRegistry.php
+++ b/src/Oro/Component/Layout/LayoutRegistry.php
@@ -134,7 +134,7 @@ public function normalizeOptions(
             ? $this->typeExtensions[$name]
             : $this->loadTypeExtensions($name);
         foreach ($extensions as $extension) {
-            $extension->normalizeOptions($name, $options, $context, $data);
+            $extension->normalizeOptions($options, $context, $data);
         }
     }
 
diff --git a/src/Oro/Component/Layout/Tests/Unit/BlockFactoryTest.php b/src/Oro/Component/Layout/Tests/Unit/BlockFactoryTest.php
index 434174927d7..75654accc45 100644
--- a/src/Oro/Component/Layout/Tests/Unit/BlockFactoryTest.php
+++ b/src/Oro/Component/Layout/Tests/Unit/BlockFactoryTest.php
@@ -257,7 +257,7 @@ function (OptionsResolverInterface $resolver) {
             ->method('normalizeOptions')
             ->will(
                 $this->returnCallback(
-                    function ($name, array &$options, ContextInterface $context, DataAccessorInterface $data) {
+                    function (array &$options, ContextInterface $context, DataAccessorInterface $data) {
                         if ($options['test_option_2'] === '{BG}:red') {
                             $options['test_option_2'] = ['background'=> 'red'];
                         }
diff --git a/src/Oro/Component/Layout/Tests/Unit/LayoutRegistryTest.php b/src/Oro/Component/Layout/Tests/Unit/LayoutRegistryTest.php
index bf2143f0f94..bb1aa9dcd08 100644
--- a/src/Oro/Component/Layout/Tests/Unit/LayoutRegistryTest.php
+++ b/src/Oro/Component/Layout/Tests/Unit/LayoutRegistryTest.php
@@ -228,7 +228,7 @@ public function testNormalizeOptions()
             ->will($this->returnValue([$typeExtension]));
         $typeExtension->expects($this->once())
             ->method('normalizeOptions')
-            ->with($name, $options, $context, $data);
+            ->with($options, $context, $data);
 
         $this->registry->normalizeOptions($name, $options, $context, $data);
     }

From 6f83f1c7e011b3badfefd48d6da23a6223037f4e Mon Sep 17 00:00:00 2001
From: Andrey Yatsenco <yatsenco@gmail.com>
Date: Fri, 18 Dec 2015 15:52:28 +0200
Subject: [PATCH 191/471] BB-1735: Fix issues after review - fixed indents at
 text field

---
 .../LayoutBundle/Resources/views/Layout/div_layout.html.twig  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
index 62d67a46551..afdb78a125b 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
+++ b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
@@ -127,9 +127,9 @@
 
 {% block text_widget -%}
     {% if escape %}
-        {{ text|block_text(translation_domain) }}
+        {{- text|block_text(translation_domain) -}}
     {% else %}
-        {{ text|block_text(translation_domain)|raw }}
+        {{- text|block_text(translation_domain)|raw -}}
     {% endif %}
 {%- endblock %}
 

From 443a37db08a7ca350077465c5523f5abf03555ae Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Fri, 18 Dec 2015 16:29:15 +0200
Subject: [PATCH 192/471] BAP-9112: Add mass delete actions for every entity
 grid where regular delete action is available  - Fix tests

---
 .../Extension/MassAction/MassDeleteActionExtension.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassDeleteActionExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassDeleteActionExtension.php
index 7d23d54b83c..10d9af4c52f 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassDeleteActionExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassDeleteActionExtension.php
@@ -94,7 +94,7 @@ public function processConfigs(DatagridConfiguration $config)
     {
         $actions = $config->offsetGetOr(static::MASS_ACTION_KEY, []);
 
-        $actions[] = $this->getMassDeleteActionConfig($config);
+        $actions['delete'] = $this->getMassDeleteActionConfig($config);
 
         $config->offsetSet(static::MASS_ACTION_KEY, $actions);
     }

From e87b3db760b7831c199eceeb8ab2cd7b98272647 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Fri, 18 Dec 2015 16:30:00 +0200
Subject: [PATCH 193/471] BAP-9112: Add mass delete actions for every entity
 grid where regular delete action is available

---
 ...assDeleteActionExtension.php => DeleteMassActionExtension.php} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/Oro/Bundle/DataGridBundle/Extension/MassAction/{MassDeleteActionExtension.php => DeleteMassActionExtension.php} (100%)

diff --git a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassDeleteActionExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/DeleteMassActionExtension.php
similarity index 100%
rename from src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassDeleteActionExtension.php
rename to src/Oro/Bundle/DataGridBundle/Extension/MassAction/DeleteMassActionExtension.php

From 20c251eca439de0518b3e63a856b9720a0376e79 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Fri, 18 Dec 2015 16:31:18 +0200
Subject: [PATCH 194/471] BAP-9112: Add mass delete actions for every entity
 grid where regular delete action is available

---
 .../Extension/MassAction/DeleteMassActionExtension.php          | 2 +-
 src/Oro/Bundle/DataGridBundle/Resources/config/extensions.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/DeleteMassActionExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/DeleteMassActionExtension.php
index 10d9af4c52f..49370442719 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/DeleteMassActionExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/DeleteMassActionExtension.php
@@ -7,7 +7,7 @@
 use Oro\Bundle\DataGridBundle\Tools\GridConfigurationHelper;
 use Oro\Bundle\EntityBundle\ORM\DoctrineHelper;
 
-class MassDeleteActionExtension extends AbstractExtension
+class DeleteMassActionExtension extends AbstractExtension
 {
     const ACTION_KEY         = 'actions';
     const MASS_ACTION_KEY    = 'mass_actions';
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/config/extensions.yml b/src/Oro/Bundle/DataGridBundle/Resources/config/extensions.yml
index fb0879ac3c0..bdcc566e962 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/config/extensions.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/config/extensions.yml
@@ -60,7 +60,7 @@ services:
             - { name: oro_datagrid.extension }
 
     oro_datagrid.extension.mass_delete_action:
-        class: Oro\Bundle\DataGridBundle\Extension\MassAction\MassDeleteActionExtension
+        class: Oro\Bundle\DataGridBundle\Extension\MassAction\DeleteMassActionExtension
         arguments:
             - @oro_entity.doctrine_helper
             - @oro_datagrid.grid_configuration.helper

From 53e8c60105a76f51d9dd3f9e277aa6ccf67aa8ea Mon Sep 17 00:00:00 2001
From: Andrey Yatsenco <yatsenco@gmail.com>
Date: Fri, 18 Dec 2015 17:10:37 +0200
Subject: [PATCH 195/471] BB-1735: Fix issues after review - removed
 documentation for HtmlType

---
 src/Oro/Bundle/LayoutBundle/Resources/doc/what_is_layout.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Oro/Bundle/LayoutBundle/Resources/doc/what_is_layout.md b/src/Oro/Bundle/LayoutBundle/Resources/doc/what_is_layout.md
index ca50b736d52..a302ce5a5ed 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/doc/what_is_layout.md
+++ b/src/Oro/Bundle/LayoutBundle/Resources/doc/what_is_layout.md
@@ -58,7 +58,6 @@ The **OroLayoutBundle** introduces a set of block types that allow to easily bui
 | `ordered_list` | [OrderedListType.php](../../Layout/Block/Type/OrderedListType.php) | `<ol>` |
 | `list_item` | [ListItemType.php](../../Layout/Block/Type/ListItemType.php) | `<li>`, this block type can be used if you want to control rendering of `li` tag and its attributes |
 | `text` | [TextType.php](../../Layout/Block/Type/TextType.php) | Text node |
-| `html` | [HtmlType.php](../../Layout/Block/Type/HtmlType.php) | Html node |
 | `input` | [InputType.php](../../Layout/Block/Type/InputType.php) | Input node |
 | `button` | [ButtonType.php](../../Layout/Block/Type/ButtonType.php) | `<button>` or `<input type="submit/reset/button">` |
 | `button_group` | [ButtonGroupType.php](../../Layout/Block/Type/ButtonGroupType.php) | Nothing, this is just a logical grouping of buttons. You can define how to render the button group in your application |

From e715791d4095019677554ed96f961b7dee0e8083 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Fri, 18 Dec 2015 17:34:57 +0200
Subject: [PATCH 196/471] CRM-4809 Pleace inline editing button at left side
 for right aligned cells

---
 .../Resources/public/css/less/inline-editing.less         | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editing.less b/src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editing.less
index 747bff63f83..f431f7591ed 100644
--- a/src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editing.less
+++ b/src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editing.less
@@ -40,6 +40,12 @@
           box-shadow: 0 2px 5px rgba(0,0,0,0.2);
         }
       }
+      &.number-cell:hover, &.integer-cell:hover, &.align-right:hover {
+        > .icon-edit {
+          right: auto;
+          left: 0;
+        }
+      }
     }
     &.loading{
       background: #f5f5f5;
@@ -59,7 +65,7 @@
       &:hover:before {
         background-color: rgba(244, 239, 212, 0.7);;
       }
-      &.number-cell:before, &.percent-cell:before {
+      &.number-cell:before, &.integer-cell:before, &.align-right:before {
         right: auto;
         left: 1px;
       }

From 9aea497e53162ecd78b16f139868d41880623d2d Mon Sep 17 00:00:00 2001
From: zebimax <zebimax@gmail.com>
Date: Fri, 18 Dec 2015 18:27:42 +0200
Subject: [PATCH 197/471] BAP-9111: Add restriction for mass delete actions  -
 fix doc blocks  - fix alerts

---
 .../Ajax/MassDelete/MassDeleteLimitResult.php        |  4 ++--
 .../public/js/datagrid/action/delete-mass-action.js  |  2 +-
 .../Resources/translations/jsmessages.en.yml         | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/Actions/Ajax/MassDelete/MassDeleteLimitResult.php b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/Actions/Ajax/MassDelete/MassDeleteLimitResult.php
index 05b785fe9f4..ac9c94ed759 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/Actions/Ajax/MassDelete/MassDeleteLimitResult.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/Actions/Ajax/MassDelete/MassDeleteLimitResult.php
@@ -7,10 +7,10 @@ class MassDeleteLimitResult
     /** @var int */
     protected $maxLimit = MassDeleteLimiter::MAX_DELETE_RECORDS;
 
-    /** @var int|null */
+    /** @var int */
     protected $selected;
 
-    /** @var int|null */
+    /** @var int */
     protected $deletable;
 
     /**
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 97f932f45e7..8a7101d0ba4 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
@@ -79,7 +79,7 @@ define([
                     if (data.deletable >= data.selected) {
                         this.confirmMessage = __(this.confirmMessages.selected_message, {selected: data.selected});
                     } else {
-                        this.confirmMessage = __(this.confirmMessages.restricted_access_message, {deletable: data.deletable});
+                        this.confirmMessage = __(this.confirmMessages.restricted_access_message, {deletable: data.deletable, selected: data.selected});
                     }
                 } else {
                     this.confirmMessage = __(this.confirmMessages.max_limit_message, {max_limit: data.max_limit});
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml b/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
index b745412de02..95bf6ed2357 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
@@ -86,11 +86,11 @@ oro:
         mass_action:
             delete:
                 selected_message: >
-                    You have selected {{ selected }} record(s).<br/>
-                    Are you sure you want to delete {{ selected }} record(s)?
+                    You have selected {{ selected }} records.<br/>
+                    Are you sure you want to delete {{ selected }} records?
                 max_limit_message: >
-                    Due to perfomance max amount of records to delete at once is {{ max_limit }}.<br/>
-                    Are you sure you want to delete {{ max_limit }} records?
+                    Due to performance limitations the maximum amount of records to be deleted at once is {{ max_limit }}.<br/>
+                    Are you sure you want to delete first {{ max_limit }} records in the selection?
                 restricted_access_message: >
-                    Due to your access settings you are able to delete {{ deletable }} record(s).<br/>
-                    Are you sure you want to delete {{ deletable }} record(s)?
+                    You have permissions to delete {{ deletable }} records out of {{ selected }} selected.<br/>
+                    Are you sure you want to delete {{ deletable }} records?

From 0ae96690a5317fd69db063f2105bbf3252a90486 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Fri, 18 Dec 2015 17:51:53 +0100
Subject: [PATCH 198/471] CRM-3997: Make all mailboxes available under System
 organization

- fix view selector of user's mailboxes
---
 .../EmailBundle/Datagrid/MailboxChoiceList.php | 18 ++++--------------
 .../Entity/Manager/MailboxManager.php          | 17 ++++++++++++++++-
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/Oro/Bundle/EmailBundle/Datagrid/MailboxChoiceList.php b/src/Oro/Bundle/EmailBundle/Datagrid/MailboxChoiceList.php
index 81c134df08d..34e8bd02e05 100644
--- a/src/Oro/Bundle/EmailBundle/Datagrid/MailboxChoiceList.php
+++ b/src/Oro/Bundle/EmailBundle/Datagrid/MailboxChoiceList.php
@@ -45,7 +45,10 @@ public function getChoiceList()
             $this->securityFacade->getLoggedUser(),
             $this->getOrganization()
         );
-        $origins = $this->getOriginsList();
+        $origins = $this->mailboxManager->findAvailableOrigins(
+            $this->securityFacade->getLoggedUser(),
+            $this->getOrganization()
+        );
 
         $choiceList = [];
         foreach ($origins as $origin) {
@@ -70,17 +73,4 @@ protected function getOrganization()
     {
         return $this->securityFacade->getOrganization();
     }
-
-    /**
-     * @return EmailOrigin[]
-     */
-    protected function getOriginsList()
-    {
-        $criteria = [
-            'owner' => $this->securityFacade->getLoggedUser(),
-            'isActive' => true,
-        ];
-
-        return $this->doctrine->getRepository('OroEmailBundle:EmailOrigin')->findBy($criteria);
-    }
 }
diff --git a/src/Oro/Bundle/EmailBundle/Entity/Manager/MailboxManager.php b/src/Oro/Bundle/EmailBundle/Entity/Manager/MailboxManager.php
index 05c7c1d407f..9a596e0df75 100644
--- a/src/Oro/Bundle/EmailBundle/Entity/Manager/MailboxManager.php
+++ b/src/Oro/Bundle/EmailBundle/Entity/Manager/MailboxManager.php
@@ -4,7 +4,7 @@
 
 use Doctrine\Bundle\DoctrineBundle\Registry;
 use Doctrine\Common\Collections\Collection;
-
+use Oro\Bundle\EmailBundle\Entity\EmailOrigin;
 use Oro\Bundle\EmailBundle\Entity\Mailbox;
 use Oro\Bundle\OrganizationBundle\Entity\Organization;
 use Oro\Bundle\UserBundle\Entity\User;
@@ -57,4 +57,19 @@ public function findAvailableMailboxes($user, Organization $organization)
 
         return $qb->getQuery()->getResult();
     }
+
+    /**
+     * @param User $user
+     * @param Organization $organization
+     *
+     * @return EmailOrigin
+     */
+    public function findAvailableOrigins(User $user, Organization $organization)
+    {
+        return $this->registry->getRepository('OroEmailBundle:EmailOrigin')->findBy([
+            'owner' => $user,
+            'organization' => $organization,
+            'isActive' => true,
+        ]);
+    }
 }

From 77e743542e53d58a2cd01ee26b4276b6a1a5a652 Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Fri, 18 Dec 2015 18:55:53 +0200
Subject: [PATCH 199/471] CRM-4810: Move context to the bottom for Calendar
 Event

---
 .../Resources/public/css/less/style.less          | 15 +++++++++++++++
 .../activity-context-activity-component.js        |  5 -----
 .../app/views/activity-context-activity-view.js   | 10 ++++------
 .../Resources/views/templates.html.twig           | 12 +++---------
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/Oro/Bundle/ActivityBundle/Resources/public/css/less/style.less b/src/Oro/Bundle/ActivityBundle/Resources/public/css/less/style.less
index 506f6ce89eb..b5c0819ad79 100644
--- a/src/Oro/Bundle/ActivityBundle/Resources/public/css/less/style.less
+++ b/src/Oro/Bundle/ActivityBundle/Resources/public/css/less/style.less
@@ -6,6 +6,10 @@
   }
 }
 
+.activity-context-activity {
+  display: none;
+}
+
 .activity-context-activity-list {
   margin-bottom: 5px;
 }
@@ -70,3 +74,14 @@
   font-weight: bold;
   color: #666666;
 }
+
+.control-group .controls .activity-context-activity-items {
+  padding-top: 5px;
+  margin-left: 0;
+  .context-item {
+    color: #777;
+    font-size: 13px;
+    line-height: 20px;
+    padding: 0 2px;
+  }
+}
diff --git a/src/Oro/Bundle/ActivityBundle/Resources/public/js/app/components/activity-context-activity-component.js b/src/Oro/Bundle/ActivityBundle/Resources/public/js/app/components/activity-context-activity-component.js
index 910436f147c..babd5d660b0 100644
--- a/src/Oro/Bundle/ActivityBundle/Resources/public/js/app/components/activity-context-activity-component.js
+++ b/src/Oro/Bundle/ActivityBundle/Resources/public/js/app/components/activity-context-activity-component.js
@@ -12,12 +12,7 @@ define(function(require) {
 
         initialize: function(options) {
             this.options = options;
-            this.init();
-        },
-
-        init: function() {
             this.initView();
-            this.contextsView.render();
         },
 
         initView: function() {
diff --git a/src/Oro/Bundle/ActivityBundle/Resources/public/js/app/views/activity-context-activity-view.js b/src/Oro/Bundle/ActivityBundle/Resources/public/js/app/views/activity-context-activity-view.js
index a2f3161e7f3..e9b3eec5fb8 100644
--- a/src/Oro/Bundle/ActivityBundle/Resources/public/js/app/views/activity-context-activity-view.js
+++ b/src/Oro/Bundle/ActivityBundle/Resources/public/js/app/views/activity-context-activity-view.js
@@ -24,7 +24,7 @@ define([
 
             this.template = _.template($('#activity-context-activity-list').html());
             this.$containerContextTargets = $(options.el).find('.activity-context-activity-items');
-            this.collection = new ActivityContextActivityCollection('oro_api_delete_activity_relation');
+            this.collection = new ActivityContextActivityCollection();
             this.editable = options.editable;
             this.initEvents();
 
@@ -74,11 +74,7 @@ define([
         },
 
         render: function() {
-            if (this.collection.length === 0) {
-                this.$el.hide();
-            } else {
-                this.$el.show();
-            }
+            this.$el.toggle(this.collection.length > 0);
         },
 
         initEvents: function() {
@@ -99,6 +95,7 @@ define([
                 self.$containerContextTargets.append($view);
 
                 $view.find('i.icon-remove').click(function() {
+                    $view.fadeOut();
                     model.destroy({
                         success: function(model, response) {
                             messenger.notificationFlashMessage('success', __('oro.activity.contexts.removed'));
@@ -112,6 +109,7 @@ define([
                             }
                         },
                         error: function(model, response) {
+                            $view.show();
                             messenger.showErrorMessage(__('oro.ui.item_delete_error'), response.responseJSON || {});
                         }
                     });
diff --git a/src/Oro/Bundle/CalendarBundle/Resources/views/templates.html.twig b/src/Oro/Bundle/CalendarBundle/Resources/views/templates.html.twig
index b2f1e687584..5eb217a7eaa 100644
--- a/src/Oro/Bundle/CalendarBundle/Resources/views/templates.html.twig
+++ b/src/Oro/Bundle/CalendarBundle/Resources/views/templates.html.twig
@@ -24,20 +24,14 @@
     <div class="widget-content">
         <div class="row-fluid form-horizontal">
             <div class="responsive-block">
-                <!-- Activity contexts container -->
-                <div class="activity-context-activity" data-layout="separate">
-                    <div class="activity-context-activity-label">
-                        {{ 'oro.activity.contexts.label'|trans }}
-                    </div>
-                    <div class="activity-context-activity-items">
-                    </div>
-                </div>
-
                 {{ UI.renderHtmlProperty('oro.calendar.calendarevent.title.label'|trans, '<%= formatter.string(title) %>') }}
                 {{ UI.renderHtmlProperty('oro.calendar.calendarevent.description.label'|trans, '<%= formatter.text(description) %>') }}
                 {{ UI.renderHtmlProperty('oro.calendar.calendarevent.start.label'|trans, '<%= formatter.dateTime(start) %>') }}
                 {{ UI.renderHtmlProperty('oro.calendar.calendarevent.end.label'|trans, '<%= formatter.dateTime(end) %>') }}
                 {{ UI.renderHtmlProperty('oro.calendar.calendarevent.all_day.label'|trans, '<%= formatter.bool(allDay) %>') }}
+                <div class="activity-context-activity">
+                {{ UI.renderAttribute('oro.activity.contexts.label'|trans, '<div class="activity-context-activity-items"></div>') }}
+                </div>
                 {% placeholder calendar_event_widget_view_additional_properties %}
             </div>
             <div class="widget-actions form-actions" style="display: none;">

From a3c0c504a99e885e464eb7bf3a3c12b72f471139 Mon Sep 17 00:00:00 2001
From: Andrey Yatsenco <yatsenco@gmail.com>
Date: Fri, 18 Dec 2015 19:24:16 +0200
Subject: [PATCH 200/471] BB-1735: Fix issues after review - fixed new line

---
 .../Unit/Layout/Processor/ConfigExpressionProcessorTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Processor/ConfigExpressionProcessorTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Processor/ConfigExpressionProcessorTest.php
index 03cff87cc4f..2b05d740d37 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Processor/ConfigExpressionProcessorTest.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Processor/ConfigExpressionProcessorTest.php
@@ -242,4 +242,4 @@ public function testProcessExpressionsEncodesAllExpressions()
             'Failed asserting that an expression in "label_attr" is assembled and encoded'
         );
     }
-}
\ No newline at end of file
+}

From 127a6eb0c5d718e0ba9a1f0dbbe3efa7fde4cfdd Mon Sep 17 00:00:00 2001
From: zebimax <zebimax@gmail.com>
Date: Fri, 18 Dec 2015 19:30:18 +0200
Subject: [PATCH 201/471] BAP-9111: Add restriction for mass delete actions  -
 add comments

---
 .../js/datagrid/action/delete-mass-action.js  | 30 +++++++++++++++++--
 .../public/js/datagrid/action/mass-action.js  |  5 ++++
 2 files changed, 33 insertions(+), 2 deletions(-)

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 8a7101d0ba4..37a5cd342d9 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
@@ -1,10 +1,9 @@
 define([
     'oroui/js/delete-confirmation',
-    'routing',
     'orotranslation/js/translator',
     'underscore',
     './mass-action'
-], function(DeleteConfirmation, routing, __, _, MassAction) {
+], function(DeleteConfirmation, __, _, MassAction) {
     'use strict';
 
     var DeleteMassAction;
@@ -41,12 +40,26 @@ define([
         /** @property {String} */
         confirmMessage: null,
 
+        /**
+         * As in this action we need to send POST request to get data for confirm message
+         * we set this.confirmation = false at initialization to prevent opening confirm window.
+         *
+         * @param options
+         */
         initialize: function(options) {
             DeleteMassAction.__super__.initialize.apply(this, arguments);
             this.confirmMessage = __(this.defaultMessages.confirm_content);
             this.confirmation = false;
         },
 
+        /**
+         * Need to handle POST and DELETE requests differently.
+         *
+         *  - POST request: we prepare confirm message from result data
+         *    and set requestType = DELETE and this.confirmation = true, to prepare actually request for deleting.
+         *  - DELETE request: handled as ordinary mass action request.
+         *
+         */
         _onAjaxSuccess: function(data, textStatus, jqXHR) {
             if (this.requestType === 'POST') {
                 this.requestType = 'DELETE';
@@ -61,6 +74,11 @@ define([
             }
         },
 
+        /**
+         * Sends POST request to prepare confirm message.
+         * Normal action request will be send manually after handling POST request.
+         * Sets this.confirmModal = null to rebuild confirm window after each request.
+         */
         execute: function() {
             this.requestType = 'POST';
             this.confirmModal = null;
@@ -69,10 +87,18 @@ define([
             }
         },
 
+        /**
+         * @inheritDoc
+         */
         getConfirmContentMessage: function() {
             return this.confirmMessage;
         },
 
+        /**
+         * Sets confirm message from received data.
+         *
+         * @param data
+         */
         setConfirmMessage: function(data) {
             if (this.isDefined(data.selected) && this.isDefined(data.deletable) && this.isDefined(data.max_limit)) {
                 if (data.deletable <= data.max_limit) {
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/action/mass-action.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/action/mass-action.js
index b93ee382b9c..9d01b4579c4 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/action/mass-action.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/action/mass-action.js
@@ -49,6 +49,11 @@ define([
             }
         },
 
+        /**
+         * Checks if any records are selected.
+         *
+         * @returns {boolean}
+         */
         checkSelectionState: function() {
             var selectionState = this.datagrid.getSelectionState();
             if (_.isEmpty(selectionState.selectedModels) && selectionState.inset) {

From 443caf76a6d7275fceb95eb7a46dda932d980da5 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Fri, 18 Dec 2015 18:35:49 +0100
Subject: [PATCH 202/471] CRM-3997: Make all mailboxes available under System
 organization

---
 .../Datagrid/EmailQueryFactory.php            | 25 +++++++++++++------
 .../Entity/Manager/MailboxManager.php         |  4 +--
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/Oro/Bundle/EmailBundle/Datagrid/EmailQueryFactory.php b/src/Oro/Bundle/EmailBundle/Datagrid/EmailQueryFactory.php
index 02b84bb545b..e13a92b9baf 100644
--- a/src/Oro/Bundle/EmailBundle/Datagrid/EmailQueryFactory.php
+++ b/src/Oro/Bundle/EmailBundle/Datagrid/EmailQueryFactory.php
@@ -6,8 +6,9 @@
 use Doctrine\ORM\QueryBuilder;
 
 use Oro\Bundle\EmailBundle\Entity\Manager\MailboxManager;
-use Oro\Bundle\EntityBundle\Provider\EntityNameResolver;
 use Oro\Bundle\EmailBundle\Entity\Provider\EmailOwnerProviderStorage;
+use Oro\Bundle\EntityBundle\Provider\EntityNameResolver;
+use Oro\Bundle\OrganizationBundle\Entity\Organization;
 use Oro\Bundle\SecurityBundle\SecurityFacade;
 
 class EmailQueryFactory
@@ -67,13 +68,16 @@ public function prepareQuery(QueryBuilder $qb, $emailFromTableAlias = 'a')
     public function applyAcl(QueryBuilder $qb)
     {
         $user = $this->securityFacade->getLoggedUser();
-        $organization = $this->securityFacade->getOrganization();
+        $organization = $this->getOrganization();
 
         $mailboxIds = $this->mailboxManager->findAvailableMailboxIds($user, $organization);
-        $uoCheck = $qb->expr()->andX(
-            $qb->expr()->eq('eu.owner', ':owner'),
-            $qb->expr()->eq('eu.organization ', ':organization')
-        );
+
+        $exprs = [$qb->expr()->eq('eu.owner', ':owner')];
+        if ($organization) {
+            $exprs[] = $qb->expr()->eq('eu.organization ', ':organization');
+            $qb->setParameter('organization', $organization->getId());
+        }
+        $uoCheck = call_user_func_array([$qb->expr(), 'andX'], $exprs);
 
         if (!empty($mailboxIds)) {
             $qb->andWhere(
@@ -87,7 +91,14 @@ public function applyAcl(QueryBuilder $qb)
             $qb->andWhere($uoCheck);
         }
         $qb->setParameter('owner', $user->getId());
-        $qb->setParameter('organization', $organization->getId());
+    }
+
+    /**
+     * @return Organization|null
+     */
+    protected function getOrganization()
+    {
+        return $this->securityFacade->getOrganization();
     }
 
     /**
diff --git a/src/Oro/Bundle/EmailBundle/Entity/Manager/MailboxManager.php b/src/Oro/Bundle/EmailBundle/Entity/Manager/MailboxManager.php
index 9a596e0df75..43612faae7c 100644
--- a/src/Oro/Bundle/EmailBundle/Entity/Manager/MailboxManager.php
+++ b/src/Oro/Bundle/EmailBundle/Entity/Manager/MailboxManager.php
@@ -46,11 +46,11 @@ public function findAvailableMailboxIds($user, $organization)
      * Returns a list of mailboxes available to user logged under organization.
      *
      * @param User|integer $user User or user id
-     * @param Organization $organization
+     * @param Organization $organization|null
      *
      * @return Collection|Mailbox[] Array or collection of Mailboxes
      */
-    public function findAvailableMailboxes($user, Organization $organization)
+    public function findAvailableMailboxes($user, Organization $organization = null)
     {
         $qb = $this->registry->getRepository('OroEmailBundle:Mailbox')
             ->createAvailableMailboxesQuery($user, $organization);

From d38b7897452abf1b532337c809eb0a7435ea6c8f Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Fri, 18 Dec 2015 19:59:56 +0200
Subject: [PATCH 203/471] BAP-9546 updates, widget position calculation

---
 .../public/js/widget/dialog-widget.js         | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/Oro/Bundle/WindowsBundle/Resources/public/js/widget/dialog-widget.js b/src/Oro/Bundle/WindowsBundle/Resources/public/js/widget/dialog-widget.js
index adee9c46fce..d15b5968a0d 100644
--- a/src/Oro/Bundle/WindowsBundle/Resources/public/js/widget/dialog-widget.js
+++ b/src/Oro/Bundle/WindowsBundle/Resources/public/js/widget/dialog-widget.js
@@ -48,7 +48,7 @@ define(function(require) {
 
         listen: {
             'adoptedFormResetClick': 'remove',
-            'widgetRender': '_initAdjustHeight',
+            'widgetRender': 'onWidgetRender',
             'contentLoad': 'onContentUpdated',
             'page:request mediator': 'onPageChange'
         },
@@ -87,6 +87,11 @@ define(function(require) {
             this.initializeWidget(options);
         },
 
+        onWidgetRender: function(content) {
+            this._initAdjustHeight(content);
+            this._setMaxSize();
+        },
+
         setTitle: function(title) {
             this.widget.dialog('option', 'title', title);
         },
@@ -318,7 +323,15 @@ define(function(require) {
                 'dialogmaximize.adjust-height-events',
                 'dialogrestore.adjust-height-events'
             ].join(' ');
-            this.widget.on('dialogresizestart.adjust-height-events', _.bind(function() {
+            if (scrollableContent.length) {
+                scrollableContent.css('overflow', 'auto');
+                this.widget.on(resizeEvents, _.bind(this._fixScrollableHeight, this));
+                this._fixScrollableHeight();
+            }
+        },
+        _setMaxSize: function() {
+            this.widget.off('.set-max-size-events');
+            this.widget.on('dialogresizestart.set-max-size-events', _.bind(function() {
                 var dialog = this.widget.closest('.ui-dialog');
                 var containerEl = $(this.options.dialogOptions.limitTo || document.body)[0];
                 dialog.css({
@@ -326,11 +339,6 @@ define(function(require) {
                     maxHeight: containerEl.clientHeight
                 });
             }, this));
-            if (scrollableContent.length) {
-                scrollableContent.css('overflow', 'auto');
-                this.widget.on(resizeEvents, _.bind(this._fixScrollableHeight, this));
-                this._fixScrollableHeight();
-            }
         },
 
         _fixDialogMinHeight: function(isEnabled) {
@@ -390,11 +398,6 @@ define(function(require) {
                 throw new Error('this function must be called only after dialog is created');
             }
             var dialog = this.widget.closest('.ui-dialog');
-            var containerEl = $(this.options.dialogOptions.limitTo || document.body)[0];
-            dialog.css({
-                maxWidth: containerEl.clientWidth,
-                maxHeight: containerEl.clientHeight
-            });
             dialog.position(position);
             // must update manually 'cause $.position call gives side effects
             dialog.css({

From 5470df2f24af7c7142dcbd81391e2aa3ddc08440 Mon Sep 17 00:00:00 2001
From: Sergey Zhuravel <zhuravel.sergey@gmail.com>
Date: Fri, 18 Dec 2015 20:29:45 +0200
Subject: [PATCH 204/471] CRM-4744: Optimize performance of the Magento sync
 for one day period - fix context registry

---
 .../BatchBundle/Job/DoctrineJobRepository.php | 58 +++++++++++++++++++
 .../BatchBundle/Resources/config/services.yml |  6 ++
 .../Context/ContextRegistry.php               | 19 ++++--
 .../ImportExportBundle/Job/JobExecutor.php    | 45 +-------------
 .../Job/Step/PostProcessStepExecutor.php      |  7 ---
 .../Unit/Context/ContextRegistryTest.php      | 38 +++++++++++-
 .../Tests/Unit/Job/JobExecutorTest.php        |  7 ---
 .../Unit/Provider/AbstractConnectorTest.php   | 16 ++++-
 8 files changed, 132 insertions(+), 64 deletions(-)
 create mode 100644 src/Oro/Bundle/BatchBundle/Job/DoctrineJobRepository.php

diff --git a/src/Oro/Bundle/BatchBundle/Job/DoctrineJobRepository.php b/src/Oro/Bundle/BatchBundle/Job/DoctrineJobRepository.php
new file mode 100644
index 00000000000..3441febbcf7
--- /dev/null
+++ b/src/Oro/Bundle/BatchBundle/Job/DoctrineJobRepository.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Oro\Bundle\BatchBundle\Job;
+
+use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\Events;
+use Doctrine\ORM\UnitOfWork;
+
+use Akeneo\Bundle\BatchBundle\Entity\JobInstance;
+use Akeneo\Bundle\BatchBundle\Entity\JobExecution;
+use Akeneo\Bundle\BatchBundle\Entity\StepExecution;
+use Akeneo\Bundle\BatchBundle\Job\DoctrineJobRepository as BaseRepository;
+
+use Oro\Bundle\ImportExportBundle\Context\ContextRegistry;
+
+/**
+ * Handle case when job executed inside another job and performs EntityManger::clear
+ * Cascade persist is not possible for JobInstance because of duplicates in database
+ */
+class DoctrineJobRepository extends BaseRepository
+{
+    /** {@inheritdoc} */
+    public function __construct(EntityManager $entityManager, $jobExecutionClass)
+    {
+        parent::__construct($entityManager, $jobExecutionClass);
+
+        $this->jobManager->getConfiguration()->setSQLLogger(null);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function updateJobExecution(JobExecution $jobExecution)
+    {
+        $uow = $this->getJobManager()->getUnitOfWork();
+        $jobInstance = $jobExecution->getJobInstance();
+        if ($jobInstance && UnitOfWork::STATE_DETACHED === $uow->getEntityState($jobInstance)) {
+            /** @var JobInstance $jobInstance */
+            $jobInstance = $uow->merge($jobInstance);
+            $jobExecution->setJobInstance($jobInstance);
+        }
+
+        parent::updateJobExecution($jobExecution);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function updateStepExecution(StepExecution $stepExecution)
+    {
+        $jobExecution = $stepExecution->getJobExecution();
+        if ($jobExecution) {
+            $this->updateJobExecution($jobExecution);
+        }
+
+        parent::updateStepExecution($stepExecution);
+    }
+}
diff --git a/src/Oro/Bundle/BatchBundle/Resources/config/services.yml b/src/Oro/Bundle/BatchBundle/Resources/config/services.yml
index 668571dfd5c..6c7869b8509 100644
--- a/src/Oro/Bundle/BatchBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/BatchBundle/Resources/config/services.yml
@@ -2,9 +2,15 @@ parameters:
     oro_batch.orm.query_builder.count_query_optimizer.class: Oro\Bundle\BatchBundle\ORM\QueryBuilder\CountQueryBuilderOptimizer
     akeneo_batch.logger.batch_log_handler.class:             Oro\Bundle\BatchBundle\Monolog\Handler\BatchLogHandler
 
+    oro_batch.job.repository.class: Oro\Bundle\BatchBundle\Job\DoctrineJobRepository
+
 services:
     oro_batch.orm.query_builder.count_query_optimizer:
         class: %oro_batch.orm.query_builder.count_query_optimizer.class%
         calls:
             - [setEventDispatcher, [@event_dispatcher]]
 
+    oro_batch.job.repository:
+        class: %oro_batch.job.repository.class%
+        parent: akeneo_batch.job_repository
+        decorates: akeneo_batch.job_repository
diff --git a/src/Oro/Bundle/ImportExportBundle/Context/ContextRegistry.php b/src/Oro/Bundle/ImportExportBundle/Context/ContextRegistry.php
index 73586419666..df46f20a39d 100644
--- a/src/Oro/Bundle/ImportExportBundle/Context/ContextRegistry.php
+++ b/src/Oro/Bundle/ImportExportBundle/Context/ContextRegistry.php
@@ -2,6 +2,7 @@
 
 namespace Oro\Bundle\ImportExportBundle\Context;
 
+use Akeneo\Bundle\BatchBundle\Entity\JobInstance;
 use Akeneo\Bundle\BatchBundle\Entity\StepExecution;
 
 class ContextRegistry
@@ -9,7 +10,7 @@ class ContextRegistry
     /**
      * @var array
      */
-    protected $contexts = array();
+    protected $contexts = [];
 
     /**
      * @param StepExecution $stepExecution
@@ -19,11 +20,13 @@ public function getByStepExecution(StepExecution $stepExecution)
     {
         $key = spl_object_hash($stepExecution);
 
-        if (empty($this->contexts[$key])) {
-            $this->contexts[$key] = $this->createByStepExecution($stepExecution);
+        $jobName = $stepExecution->getJobExecution()->getJobInstance()->getAlias();
+
+        if (empty($this->contexts[$jobName][$key])) {
+            $this->contexts[$jobName][$key] = $this->createByStepExecution($stepExecution);
         }
 
-        return $this->contexts[$key];
+        return $this->contexts[$jobName][$key];
     }
 
     /**
@@ -34,4 +37,12 @@ protected function createByStepExecution(StepExecution $stepExecution)
     {
         return new StepExecutionProxyContext($stepExecution);
     }
+
+    /**
+     * @param JobInstance $jobInstance
+     */
+    public function clear(JobInstance $jobInstance)
+    {
+        unset($this->contexts[$jobInstance->getAlias()]);
+    }
 }
diff --git a/src/Oro/Bundle/ImportExportBundle/Job/JobExecutor.php b/src/Oro/Bundle/ImportExportBundle/Job/JobExecutor.php
index dc01fd4d574..d1e90246be4 100644
--- a/src/Oro/Bundle/ImportExportBundle/Job/JobExecutor.php
+++ b/src/Oro/Bundle/ImportExportBundle/Job/JobExecutor.php
@@ -33,7 +33,6 @@ class JobExecutor
     const JOB_EXPORT_TEMPLATE_TO_CSV = 'entity_export_template_to_csv';
     const JOB_IMPORT_FROM_CSV = 'entity_import_from_csv';
     const JOB_VALIDATE_IMPORT_FROM_CSV = 'entity_import_validation_from_csv';
-    const JOB_SKIP_CLEAR = 'jobSkipClear';
     const JOB_CONTEXT_DATA_KEY = 'contextData';
 
     /**
@@ -61,11 +60,6 @@ class JobExecutor
      */
     protected $batchJobRepository;
 
-    /**
-     * @var bool
-     */
-    protected $skipClear = false;
-
     /**
      * @var bool
      */
@@ -139,10 +133,7 @@ protected function doJob(JobInstance $jobInstance, JobExecution $jobExecution)
 
             // trigger save of JobExecution and JobInstance
             $this->batchJobRepository->getJobManager()->flush();
-
-            if (!$this->isClearSkipped($jobExecution)) {
-                $this->batchJobRepository->getJobManager()->clear();
-            }
+            $this->batchJobRepository->getJobManager()->clear();
         } catch (\Exception $exception) {
             if (!$isTransactionRunning) {
                 $this->entityManager->rollback();
@@ -343,6 +334,8 @@ protected function setJobResultData(JobResult $jobResult, JobInstance $jobInstan
                 $jobResult->setContext($context);
             }
         }
+
+        $this->contextRegistry->clear($jobInstance);
     }
 
     /**
@@ -394,38 +387,6 @@ protected function createJobExecution(array $configuration, JobInstance $jobInst
         return $jobExecution;
     }
 
-    /**
-     * @param JobExecution $jobExecution
-     * @return bool
-     */
-    protected function isClearSkipped(JobExecution $jobExecution)
-    {
-        if ($this->skipClear) {
-            return true;
-        }
-
-        return (bool)$jobExecution->getExecutionContext()->get(self::JOB_SKIP_CLEAR);
-    }
-
-    /**
-     * @param bool $skipClear
-     * @return JobExecutor
-     */
-    public function setSkipClear($skipClear)
-    {
-        $this->skipClear = $skipClear;
-
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isSkipClear()
-    {
-        return $this->skipClear;
-    }
-
     /**
      * @param boolean $validationMode
      */
diff --git a/src/Oro/Bundle/ImportExportBundle/Job/Step/PostProcessStepExecutor.php b/src/Oro/Bundle/ImportExportBundle/Job/Step/PostProcessStepExecutor.php
index 19889cce717..2ee95782098 100644
--- a/src/Oro/Bundle/ImportExportBundle/Job/Step/PostProcessStepExecutor.php
+++ b/src/Oro/Bundle/ImportExportBundle/Job/Step/PostProcessStepExecutor.php
@@ -16,7 +16,6 @@
 use Oro\Bundle\ImportExportBundle\Job\ContextHelper;
 use Oro\Bundle\ImportExportBundle\Job\JobExecutor;
 use Oro\Bundle\ImportExportBundle\Job\JobResult;
-use Oro\Bundle\ImportExportBundle\Writer\EntityWriter;
 
 class PostProcessStepExecutor extends StepExecutor implements StepExecutionAwareInterface
 {
@@ -199,10 +198,7 @@ public function checkPostProcessingJobsNotEmpty()
      */
     protected function executePostProcessingJob($jobType, $jobName)
     {
-        $clearSkipped = $this->jobExecutor->isSkipClear();
-        $this->jobExecutor->setSkipClear(true);
         $jobResult = $this->jobExecutor->executeJob($jobType, $jobName, $this->getJobConfiguration());
-        $this->jobExecutor->setSkipClear($clearSkipped);
 
         return $jobResult;
     }
@@ -225,9 +221,6 @@ protected function getJobConfiguration()
             $configuration[JobExecutor::JOB_CONTEXT_DATA_KEY][$key] = $jobContext->get($key);
         }
 
-        // avoid detached entities after post process jobs, clear will be executed each write after post process jobs
-        $configuration[EntityWriter::SKIP_CLEAR] = true;
-
         return $configuration;
     }
 
diff --git a/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Context/ContextRegistryTest.php b/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Context/ContextRegistryTest.php
index 359ca50878d..5691037f19c 100644
--- a/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Context/ContextRegistryTest.php
+++ b/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Context/ContextRegistryTest.php
@@ -2,6 +2,9 @@
 
 namespace Oro\Bundle\ImportExportBundle\Tests\Unit\Reader;
 
+use Akeneo\Bundle\BatchBundle\Entity\JobInstance;
+use Akeneo\Bundle\BatchBundle\Entity\StepExecution;
+
 use Oro\Bundle\ImportExportBundle\Context\ContextRegistry;
 
 class ContextRegistryTest extends \PHPUnit_Framework_TestCase
@@ -24,15 +27,44 @@ public function testGetByStepExecution()
         $this->assertAttributeEquals($fooStepExecution, 'stepExecution', $fooContext);
         $this->assertSame($fooContext, $this->registry->getByStepExecution($fooStepExecution));
 
-        $barStepExecution = $this->createStepExecution();
+        $barStepExecution = $this->createStepExecution('job2');
         $barContext = $this->registry->getByStepExecution($barStepExecution);
         $this->assertNotSame($barContext, $fooContext);
+
+        /** @var \PHPUnit_Framework_MockObject_MockObject|JobInstance $jobInstance */
+        $jobInstance = $this->getMock('Akeneo\Bundle\BatchBundle\Entity\JobInstance');
+        $jobInstance->expects($this->any())
+            ->method('getAlias')
+            ->will($this->returnValue('job2'));
+        $this->registry->clear($jobInstance);
+        $barContext2 = $this->registry->getByStepExecution($barStepExecution);
+        $this->assertNotSame($barContext, $barContext2);
     }
 
-    protected function createStepExecution()
+    /**
+     * @param string $alias
+     * @return \PHPUnit_Framework_MockObject_MockObject|StepExecution
+     */
+    protected function createStepExecution($alias = 'default')
     {
-        return $this->getMockBuilder('Akeneo\Bundle\BatchBundle\Entity\StepExecution')
+        $stepExecution = $this->getMockBuilder('Akeneo\Bundle\BatchBundle\Entity\StepExecution')
             ->disableOriginalConstructor()
             ->getMock();
+
+        $jobExecution = $this->getMock('Akeneo\Bundle\BatchBundle\Entity\JobExecution');
+        $jobInstance = $this->getMock('Akeneo\Bundle\BatchBundle\Entity\JobInstance');
+        $jobExecution->expects($this->any())
+            ->method('getJobInstance')
+            ->will($this->returnValue($jobInstance));
+
+        $stepExecution->expects($this->any())
+            ->method('getJobExecution')
+            ->will($this->returnValue($jobExecution));
+
+        $jobInstance->expects($this->any())
+            ->method('getAlias')
+            ->will($this->returnValue($alias));
+
+        return $stepExecution;
     }
 }
diff --git a/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Job/JobExecutorTest.php b/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Job/JobExecutorTest.php
index 4d88cdad6ad..29cfa677b2a 100644
--- a/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Job/JobExecutorTest.php
+++ b/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Job/JobExecutorTest.php
@@ -460,11 +460,4 @@ public function testGetJobFailureExceptions()
 
         $this->assertEquals(array('Error 1'), $this->executor->getJobFailureExceptions($code));
     }
-
-    public function testSkipClear()
-    {
-        $this->assertFalse($this->executor->isSkipClear());
-        $this->executor->setSkipClear(true);
-        $this->assertTrue($this->executor->isSkipClear());
-    }
 }
diff --git a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/AbstractConnectorTest.php b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/AbstractConnectorTest.php
index cd59fa22637..3594e35d9df 100644
--- a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/AbstractConnectorTest.php
+++ b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/AbstractConnectorTest.php
@@ -31,9 +31,23 @@ class AbstractConnectorTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->stepExecutionMock = $this->getMockBuilder('Akeneo\\Bundle\\BatchBundle\\Entity\\StepExecution')
-            ->setMethods(['getExecutionContext'])
+            ->setMethods(['getExecutionContext', 'getJobExecution'])
             ->disableOriginalConstructor()->getMock();
 
+        $jobExecution = $this->getMock('Akeneo\Bundle\BatchBundle\Entity\JobExecution');
+        $jobInstance = $this->getMock('Akeneo\Bundle\BatchBundle\Entity\JobInstance');
+        $jobExecution->expects($this->any())
+            ->method('getJobInstance')
+            ->will($this->returnValue($jobInstance));
+
+        $this->stepExecutionMock->expects($this->any())
+            ->method('getJobExecution')
+            ->will($this->returnValue($jobExecution));
+
+        $jobInstance->expects($this->any())
+            ->method('getAlias')
+            ->will($this->returnValue('alias'));
+
         $this->transportSettings = $this->getMockForAbstractClass('Oro\\Bundle\\IntegrationBundle\\Entity\\Transport');
         $this->transportMock     = $this->getMock('Oro\\Bundle\\IntegrationBundle\\Provider\\TransportInterface');
         $this->transportMock->expects($this->any())->method('getTest');

From 0006d39db7afbe9958598bdd8d699ed3a461996d Mon Sep 17 00:00:00 2001
From: Sergey Zhuravel <zhuravel.sergey@gmail.com>
Date: Sat, 19 Dec 2015 11:44:36 +0200
Subject: [PATCH 205/471] CRM-4744: Optimize performance of the Magento sync
 for one day period - add bc layer to context registry

---
 .../Context/ContextRegistry.php               | 28 ++++++++++++++-----
 .../Unit/Context/ContextRegistryTest.php      | 26 +++++++++--------
 2 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/src/Oro/Bundle/ImportExportBundle/Context/ContextRegistry.php b/src/Oro/Bundle/ImportExportBundle/Context/ContextRegistry.php
index df46f20a39d..8e0769fe42a 100644
--- a/src/Oro/Bundle/ImportExportBundle/Context/ContextRegistry.php
+++ b/src/Oro/Bundle/ImportExportBundle/Context/ContextRegistry.php
@@ -7,6 +7,8 @@
 
 class ContextRegistry
 {
+    const DEFAULT_ALIAS = 'default';
+
     /**
      * @var array
      */
@@ -20,13 +22,20 @@ public function getByStepExecution(StepExecution $stepExecution)
     {
         $key = spl_object_hash($stepExecution);
 
-        $jobName = $stepExecution->getJobExecution()->getJobInstance()->getAlias();
+        $alias = self::DEFAULT_ALIAS;
+        $jobExecution = $stepExecution->getJobExecution();
+        if ($jobExecution) {
+            $jobInstance = $jobExecution->getJobInstance();
+            if ($jobInstance) {
+                $alias = $jobInstance->getAlias();
+            }
+        }
 
-        if (empty($this->contexts[$jobName][$key])) {
-            $this->contexts[$jobName][$key] = $this->createByStepExecution($stepExecution);
+        if (empty($this->contexts[$alias][$key])) {
+            $this->contexts[$alias][$key] = $this->createByStepExecution($stepExecution);
         }
 
-        return $this->contexts[$jobName][$key];
+        return $this->contexts[$alias][$key];
     }
 
     /**
@@ -39,10 +48,15 @@ protected function createByStepExecution(StepExecution $stepExecution)
     }
 
     /**
-     * @param JobInstance $jobInstance
+     * @param JobInstance|null $jobInstance
      */
-    public function clear(JobInstance $jobInstance)
+    public function clear(JobInstance $jobInstance = null)
     {
-        unset($this->contexts[$jobInstance->getAlias()]);
+        $alias = self::DEFAULT_ALIAS;
+        if ($jobInstance) {
+            $alias = $jobInstance->getAlias();
+        }
+
+        unset($this->contexts[$alias]);
     }
 }
diff --git a/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Context/ContextRegistryTest.php b/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Context/ContextRegistryTest.php
index 5691037f19c..3e4cbb727e4 100644
--- a/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Context/ContextRegistryTest.php
+++ b/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Context/ContextRegistryTest.php
@@ -45,25 +45,27 @@ public function testGetByStepExecution()
      * @param string $alias
      * @return \PHPUnit_Framework_MockObject_MockObject|StepExecution
      */
-    protected function createStepExecution($alias = 'default')
+    protected function createStepExecution($alias = null)
     {
         $stepExecution = $this->getMockBuilder('Akeneo\Bundle\BatchBundle\Entity\StepExecution')
             ->disableOriginalConstructor()
             ->getMock();
 
-        $jobExecution = $this->getMock('Akeneo\Bundle\BatchBundle\Entity\JobExecution');
-        $jobInstance = $this->getMock('Akeneo\Bundle\BatchBundle\Entity\JobInstance');
-        $jobExecution->expects($this->any())
-            ->method('getJobInstance')
-            ->will($this->returnValue($jobInstance));
+        if ($alias) {
+            $jobExecution = $this->getMock('Akeneo\Bundle\BatchBundle\Entity\JobExecution');
+            $jobInstance = $this->getMock('Akeneo\Bundle\BatchBundle\Entity\JobInstance');
+            $jobExecution->expects($this->any())
+                ->method('getJobInstance')
+                ->will($this->returnValue($jobInstance));
 
-        $stepExecution->expects($this->any())
-            ->method('getJobExecution')
-            ->will($this->returnValue($jobExecution));
+            $stepExecution->expects($this->any())
+                ->method('getJobExecution')
+                ->will($this->returnValue($jobExecution));
 
-        $jobInstance->expects($this->any())
-            ->method('getAlias')
-            ->will($this->returnValue($alias));
+            $jobInstance->expects($this->any())
+                ->method('getAlias')
+                ->will($this->returnValue($alias));
+        }
 
         return $stepExecution;
     }

From 8abc7303543da1663b3421135c17ef2fb58e53a1 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevskiy@users.noreply.github.com>
Date: Mon, 21 Dec 2015 11:31:55 +0200
Subject: [PATCH 206/471] =?UTF-8?q?Revert=20"CRM-4809=20Pleace=20inline=20?=
 =?UTF-8?q?editing=20button=20at=20left=20side=20for=20right=20aligned=20?=
 =?UTF-8?q?=E2=80=A6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Resources/public/css/less/inline-editing.less         | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editing.less b/src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editing.less
index f431f7591ed..747bff63f83 100644
--- a/src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editing.less
+++ b/src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editing.less
@@ -40,12 +40,6 @@
           box-shadow: 0 2px 5px rgba(0,0,0,0.2);
         }
       }
-      &.number-cell:hover, &.integer-cell:hover, &.align-right:hover {
-        > .icon-edit {
-          right: auto;
-          left: 0;
-        }
-      }
     }
     &.loading{
       background: #f5f5f5;
@@ -65,7 +59,7 @@
       &:hover:before {
         background-color: rgba(244, 239, 212, 0.7);;
       }
-      &.number-cell:before, &.integer-cell:before, &.align-right:before {
+      &.number-cell:before, &.percent-cell:before {
         right: auto;
         left: 1px;
       }

From d68fc78e67dbeddc0afc2b8bd59ca3bb711b2aef Mon Sep 17 00:00:00 2001
From: Hryhorii Hrebiniuk <hhrebiniuk@magecore.com>
Date: Mon, 21 Dec 2015 15:06:42 +0200
Subject: [PATCH 207/471] CRM-4825: BUG in select2.js MultiSelect2

---
 src/Oro/Bundle/UIBundle/Resources/public/lib/jquery/select2.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jquery/select2.js b/src/Oro/Bundle/UIBundle/Resources/public/lib/jquery/select2.js
index 1d559412421..3824dda15f0 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/lib/jquery/select2.js
+++ b/src/Oro/Bundle/UIBundle/Resources/public/lib/jquery/select2.js
@@ -2944,7 +2944,7 @@ the specific language governing permissions and limitations under the Apache Lic
                     self.updateSelection(data);
                     self.clearSearch();
                     if (triggerChange) {
-                        self.triggerChange(this.buildChangeDetails(oldData, this.data()));
+                        self.triggerChange(self.buildChangeDetails(oldData, self.data()));
                     }
                 });
             }

From 3fd12cccbb6a15731109941e430cfd2516ad2cd5 Mon Sep 17 00:00:00 2001
From: Hryhorii Hrebiniuk <hhrebiniuk@magecore.com>
Date: Mon, 21 Dec 2015 19:10:28 +0200
Subject: [PATCH 208/471] BAP-9139: Data grid scope information is not in use

---
 .../public/js/app/components/datagrid-component.js          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
index 09095977a9b..f20dec3757f 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
@@ -205,7 +205,11 @@ define(function(require) {
          */
         combineCollectionOptions: function() {
             var options = _.extend({
-                inputName: this.inputName,
+                /*
+                 * gridName contains extended information "inputName + scopeName"
+                 * (allows to differentiate grid instances)
+                 */
+                inputName: this.gridName,
                 parse: true,
                 url: '\/user\/json',
                 state: _.extend({

From d2772e95fed8c5975b406c6d78a67570ccc9789c Mon Sep 17 00:00:00 2001
From: Dmytro Krushelnytskyi <dkrushelnytskyi@magecore.com>
Date: Tue, 22 Dec 2015 12:59:32 +0200
Subject: [PATCH 209/471] BAP-9073: Change cron strategy to prevent overflow
 jobs queue - fix code standard

---
 .../Bundle/CronBundle/Command/CronCommand.php | 29 ++++++++++---------
 .../Bundle/CronBundle/Helper/CronHelper.php   |  5 +++-
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/Oro/Bundle/CronBundle/Command/CronCommand.php b/src/Oro/Bundle/CronBundle/Command/CronCommand.php
index b5ec3ff3c98..57278b6660e 100644
--- a/src/Oro/Bundle/CronBundle/Command/CronCommand.php
+++ b/src/Oro/Bundle/CronBundle/Command/CronCommand.php
@@ -9,18 +9,19 @@
 
 use JMS\JobQueueBundle\Entity\Job;
 
-use Oro\Bundle\CronBundle\Entity\Manager\JobManager;
-use Oro\Bundle\CronBundle\Command\CronCommandInterface;
 use Oro\Bundle\CronBundle\Entity\Schedule;
 
 class CronCommand extends ContainerAwareCommand
 {
-    const NAME = 'oro:cron';
+    const COMMAND_NAME = 'oro:cron';
 
+    /**
+     * {@inheritdoc}
+     */
     protected function configure()
     {
         $this
-            ->setName(self::NAME)
+            ->setName(self::COMMAND_NAME)
             ->setDescription('Cron commands launcher')
             ->addOption(
                 'skipCheckDaemon',
@@ -30,6 +31,9 @@ protected function configure()
             );
     }
 
+    /**
+     * {@inheritdoc}
+     */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         // check for maintenance mode - do not run cron jobs if it is switched on
@@ -89,12 +93,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
     }
 
     /**
-     * @param $command
+     * @param CronCommandInterface $command
      * @param OutputInterface $output
      *
      * @return bool
      */
-    protected function skipCommand($command, OutputInterface $output)
+    protected function skipCommand(CronCommandInterface $command, OutputInterface $output)
     {
         if (!$command instanceof CronCommandInterface) {
             $output->writeln(
@@ -115,11 +119,11 @@ protected function skipCommand($command, OutputInterface $output)
 
     /**
      * @param Schedule[] $schedules
-     * @param $name
+     * @param string $name
      *
      * @return array
      */
-    protected function getSchedule($schedules, $name)
+    protected function getSchedule(array $schedules, $name)
     {
         $schedule = array_filter(
             $schedules,
@@ -134,7 +138,7 @@ function ($element) use ($name) {
 
     /**
      * @param CronCommandInterface $command
-     * @param $name
+     * @param string $name
      * @param OutputInterface $output
      *
      * @return Schedule
@@ -152,13 +156,13 @@ protected function createSchedule(CronCommandInterface $command, $name, OutputIn
     }
 
     /**
-     * @param \Oro\Bundle\CronBundle\Command\CronCommandInterface $command
+     * @param CronCommandInterface $command
      * @param Schedule $schedule
      */
     protected function checkDefinition(CronCommandInterface $command, Schedule $schedule)
     {
         $defaultDefinition = $command->getDefaultDefinition();
-        if ($schedule->getDefinition() != $defaultDefinition) {
+        if ($schedule->getDefinition() !== $defaultDefinition) {
             $schedule->setDefinition($defaultDefinition);
         }
     }
@@ -166,7 +170,7 @@ protected function checkDefinition(CronCommandInterface $command, Schedule $sche
     /**
      * @param OutputInterface $output
      * @param Schedule $schedule
-     * @param $name
+     * @param string $name
      *
      * @return bool|Job
      */
@@ -201,7 +205,6 @@ protected function createJob(OutputInterface $output, Schedule $schedule, $name)
      */
     protected function hasJobInQueue($name)
     {
-        /** @var JobManager $jobManager */
         $jobManager = $this->getContainer()->get('oro_cron.job_manager');
 
         return $jobManager->hasJobInQueue($name, '[]');
diff --git a/src/Oro/Bundle/CronBundle/Helper/CronHelper.php b/src/Oro/Bundle/CronBundle/Helper/CronHelper.php
index b140203eb7f..fcd6447b168 100644
--- a/src/Oro/Bundle/CronBundle/Helper/CronHelper.php
+++ b/src/Oro/Bundle/CronBundle/Helper/CronHelper.php
@@ -2,15 +2,18 @@
 
 namespace Oro\Bundle\CronBundle\Helper;
 
+use Cron\CronExpression;
+
 class CronHelper
 {
     /**
      * @param $definition
+     *
      * @return \Cron\CronExpression
      */
     public function createCron($definition)
     {
-        $cron = \Cron\CronExpression::factory($definition);
+        $cron = CronExpression::factory($definition);
 
         return $cron;
     }

From bb9614e81155a273f311b60b0badbeca0f2a1512 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Tue, 22 Dec 2015 13:39:58 +0200
Subject: [PATCH 210/471] CRM-4809 inline-editing button cover cell value

---
 .../app/plugins/grid/inline-editing-plugin.js | 21 +++++++++++--------
 .../public/css/less/inline-editing.less       |  9 ++++----
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
index 7e73e3f12e1..d879b024083 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
@@ -59,6 +59,7 @@ define(function(require) {
         },
 
         enable: function() {
+            this.main.$el.addClass('grid-editable');
             this.listenTo(this.main, {
                 afterMakeCell: this.onAfterMakeCell,
                 shown: this.onGridShown
@@ -83,6 +84,7 @@ define(function(require) {
             if (this.editModeEnabled) {
                 this.exitEditMode(true);
             }
+            this.main.$el.removeClass('grid-editable');
             this.main.body.refresh();
             this.destroyPopover();
             InlineEditingPlugin.__super__.disable.call(this);
@@ -99,20 +101,21 @@ define(function(require) {
             }
             var originalRender = cell.render;
             cell.render = function() {
-                originalRender.apply(this, arguments);
-                var originalEvents = this.events;
-                if (_this.isEditable(this)) {
-                    this.$el.addClass('editable view-mode prevent-text-selection-on-dblclick');
-                    this.$el.append('<i class="icon-edit hide-text">Edit</i>');
-                    this.events = _.extend(Object.create(this.events), {
+                var cell = this;
+                originalRender.apply(cell, arguments);
+                var originalEvents = cell.events;
+                if (_this.isEditable(cell)) {
+                    cell.$el.addClass('editable view-mode prevent-text-selection-on-dblclick');
+                    cell.$el.append('<i class="icon-edit hide-text">Edit</i>');
+                    cell.events = _.extend(Object.create(cell.events), {
                         'dblclick': enterEditModeIfNeeded,
                         'mousedown .icon-edit': enterEditModeIfNeeded,
                         'click': _.noop
                     });
                 }
-                this.delegateEvents();
-                this.events = originalEvents;
-                return this;
+                cell.delegateEvents();
+                cell.events = originalEvents;
+                return cell;
             };
         },
 
diff --git a/src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editing.less b/src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editing.less
index 747bff63f83..b585349a97c 100644
--- a/src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editing.less
+++ b/src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editing.less
@@ -1,5 +1,8 @@
 @import "./multi-checkbox-editor";
-.grid {
+.oro-datagrid.grid-editable .grid {
+  .number-cell, .integer-cell, .align-right {
+    padding-right: 28px;
+  }
   .row-edit-mode {
     background: #FFFCEC;
   }
@@ -59,10 +62,6 @@
       &:hover:before {
         background-color: rgba(244, 239, 212, 0.7);;
       }
-      &.number-cell:before, &.percent-cell:before {
-        right: auto;
-        left: 1px;
-      }
     }
   }
   tr.mouse-down{

From a937afe77b679e1c1f0f7d20ee0d2afa4816737a Mon Sep 17 00:00:00 2001
From: Dmytro Krushelnytskyi <dkrushelnytskyi@magecore.com>
Date: Tue, 22 Dec 2015 14:06:52 +0200
Subject: [PATCH 211/471] BAP-9073: Change cron strategy to prevent overflow
 jobs queue

---
 .../Functional/Command/CronCommandTest.php    | 84 +++++--------------
 1 file changed, 23 insertions(+), 61 deletions(-)

diff --git a/src/Oro/Bundle/CronBundle/Tests/Functional/Command/CronCommandTest.php b/src/Oro/Bundle/CronBundle/Tests/Functional/Command/CronCommandTest.php
index 5102c590d9f..533457bb8b7 100644
--- a/src/Oro/Bundle/CronBundle/Tests/Functional/Command/CronCommandTest.php
+++ b/src/Oro/Bundle/CronBundle/Tests/Functional/Command/CronCommandTest.php
@@ -13,53 +13,51 @@
  */
 class CronCommandTest extends WebTestCase
 {
+    /** @var  Application */
+    protected $application;
+
     protected function setUp()
     {
         $this->initClient();
+
+        $kernel = self::getContainer()->get('kernel');
+        $this->application = new Application($kernel);
+        $this->application->add(new CronCommand());
     }
 
     public function testCheckRunDuplicateJob()
     {
-        $kernel = self::getContainer()->get('kernel');
-
         $this->mockCronHelper(true);
-        $application = new Application($kernel);
-        $application->add(new CronCommand());
-
-        $command = $application->find('oro:cron');
+        $command = $this->application->find('oro:cron');
         $commandTester = new CommandTester($command);
         $commandTester->execute(array(
             'command'      => $command->getName(),
             '--skipCheckDaemon' => true,
         ));
 
-        $result = $this->runCommand(CronCommand::NAME, []);
+        $result = $this->runCommand(CronCommand::COMMAND_NAME, []);
         $this->assertNotEmpty($result);
 
         $this->checkMessage('allJobNew', $result);
 
-        $result = $this->runCommand(CronCommand::NAME, []);
+        $result = $this->runCommand(CronCommand::COMMAND_NAME, []);
         $this->checkMessage('AllJobAdded', $result);
 
-        $result = $this->runCommand(CronCommand::NAME, []);
+        $result = $this->runCommand(CronCommand::COMMAND_NAME, []);
         $this->checkMessage('AllJobAlreadyExist', $result);
     }
 
     public function testSkipAllJob()
     {
-        $kernel = self::getContainer()->get('kernel');
         $this->mockCronHelper();
-        $application = new Application($kernel);
-        $application->add(new CronCommand());
-
-        $command = $application->find('oro:cron');
+        $command = $this->application->find('oro:cron');
         $commandTester = new CommandTester($command);
         $commandTester->execute(array(
             'command'      => $command->getName(),
             '--skipCheckDaemon' => true,
         ));
 
-        $result = $this->runCommand(CronCommand::NAME, []);
+        $result = $this->runCommand(CronCommand::COMMAND_NAME, []);
         $this->assertNotEmpty($result);
 
         $this->checkMessage('AllJobSkip', $result);
@@ -69,80 +67,44 @@ protected function checkMessage($key, $result)
     {
         $messages = [
             'allJobNew' => [
-                'Processing command "oro:cron:enterprise:license": new command found, setting up schedule..',
                 'Processing command "oro:cron:integration:sync": new command found, setting up schedule..',
                 'Processing command "oro:cron:batch:cleanup": new command found, setting up schedule..',
                 'Processing command "oro:cron:cleanup": new command found, setting up schedule..',
                 'Processing command "oro:cron:daemon": new command found, setting up schedule..',
                 'Processing command "oro:cron:imap-sync": new command found, setting up schedule..',
-                'Processing command "oro:cron:ews-sync": new command found, setting up schedule..',
                 'Processing command "oro:cron:import-tracking": new command found, setting up schedule..',
                 'Processing command "oro:cron:tracking:parse": new command found, setting up schedule..',
-                'Processing command "oro:cron:send-reminders": new command found, setting up schedule..',
-                'Processing command "oro:cron:calculate-tracking-event-summary": new command found, setting up',
-                'Processing command "oro:cron:send-email-campaigns": new command found, setting up schedule..',
-                'Processing command "oro:cron:lifetime-average:aggregate": new command found, setting up schedule..',
-                'Processing command "oro:cron:analytic:calculate": new command found, setting up schedule..',
-                'Processing command "oro:cron:magento:cart:expiration": new command found, setting up schedule..',
-                'Processing command "oro:cron:mailchimp:export": new command found, setting up schedule..',
-                'Processing command "oro:cron:dotmailer:export-status:update": new command found, setting up schedule..'
+                'Processing command "oro:cron:send-reminders": new command found, setting up schedule..'
             ],
             'AllJobAlreadyExist' => [
-                'Processing command "oro:cron:enterprise:license": already exists in job queue',
-                'Processing command "oro:cron:cleanup": already exists in job queue',
-                'Processing command "oro:cron:daemon": already exists in job queue',
                 'Processing command "oro:cron:integration:sync": already exists in job queue',
                 'Processing command "oro:cron:batch:cleanup": already exists in job queue',
+                'Processing command "oro:cron:cleanup": already exists in job queue',
+                'Processing command "oro:cron:daemon": already exists in job queue',
                 'Processing command "oro:cron:imap-sync": already exists in job queue',
-                'Processing command "oro:cron:ews-sync": already exists in job queue',
                 'Processing command "oro:cron:import-tracking": already exists in job queue',
                 'Processing command "oro:cron:tracking:parse": already exists in job queue',
-                'Processing command "oro:cron:send-reminders": already exists in job queue',
-                'Processing command "oro:cron:calculate-tracking-event-summary": already exists in job queue',
-                'Processing command "oro:cron:send-email-campaigns": already exists in job queue',
-                'Processing command "oro:cron:lifetime-average:aggregate": already exists in job queue',
-                'Processing command "oro:cron:analytic:calculate": already exists in job queue',
-                'Processing command "oro:cron:magento:cart:expiration": already exists in job queue',
-                'Processing command "oro:cron:mailchimp:export": already exists in job queue',
-                'Processing command "oro:cron:dotmailer:export-status:update": already exists in job queue'
+                'Processing command "oro:cron:send-reminders": already exists in job queue'
             ],
             'AllJobAdded' => [
-                'Processing command "oro:cron:enterprise:license": added to job queue',
-                'Processing command "oro:cron:cleanup": added to job queue',
-                'Processing command "oro:cron:daemon": added to job queue',
                 'Processing command "oro:cron:integration:sync": added to job queue',
                 'Processing command "oro:cron:batch:cleanup": added to job queue',
+                'Processing command "oro:cron:cleanup": added to job queue',
+                'Processing command "oro:cron:daemon": added to job queue',
                 'Processing command "oro:cron:imap-sync": added to job queue',
-                'Processing command "oro:cron:ews-sync": added to job queue',
                 'Processing command "oro:cron:import-tracking": added to job queue',
                 'Processing command "oro:cron:tracking:parse": added to job queue',
-                'Processing command "oro:cron:send-reminders": added to job queue',
-                'Processing command "oro:cron:calculate-tracking-event-summary": added to job queue',
-                'Processing command "oro:cron:send-email-campaigns": added to job queue',
-                'Processing command "oro:cron:lifetime-average:aggregate": added to job queue',
-                'Processing command "oro:cron:analytic:calculate": added to job queue',
-                'Processing command "oro:cron:magento:cart:expiration": added to job queue',
-                'Processing command "oro:cron:mailchimp:export": added to job queue',
-                'Processing command "oro:cron:dotmailer:export-status:update": added to job queue'
+                'Processing command "oro:cron:send-reminders": added to job queue'
             ],
             'AllJobSkip' => [
-                'Processing command "oro:cron:enterprise:license": skipped',
-                'Processing command "oro:cron:cleanup": skipped',
-                'Processing command "oro:cron:daemon": skipped',
                 'Processing command "oro:cron:integration:sync": skipped',
                 'Processing command "oro:cron:batch:cleanup": skipped',
+                'Processing command "oro:cron:cleanup": skipped',
+                'Processing command "oro:cron:daemon": skipped',
                 'Processing command "oro:cron:imap-sync": skipped',
-                'Processing command "oro:cron:ews-sync": skipped',
                 'Processing command "oro:cron:import-tracking": skipped',
                 'Processing command "oro:cron:tracking:parse": skipped',
-                'Processing command "oro:cron:send-reminders": skipped',
-                'Processing command "oro:cron:calculate-tracking-event-summary": skipped',
-                'Processing command "oro:cron:send-email-campaigns": skipped',
-                'Processing command "oro:cron:lifetime-average:aggregate": skipped',
-                'Processing command "oro:cron:analytic:calculate": skipped',
-                'Processing command "oro:cron:magento:cart:expiration": skipped',
-                'Processing command "oro:cron:mailchimp:export": skipped',
-                'Processing command "oro:cron:dotmailer:export-status:update": skipped'
+                'Processing command "oro:cron:send-reminders": skipped'
             ]
         ];
 

From 39344526d3469f2e1c3f2dbc340910931520933b Mon Sep 17 00:00:00 2001
From: Hryhorii Hrebiniuk <hhrebiniuk@magecore.com>
Date: Tue, 22 Dec 2015 14:29:05 +0200
Subject: [PATCH 212/471] CRM-4311: Pin tabs don't cache page content

---
 .../public/js/app/components/datagrid-component.js   |  3 ---
 .../Resources/public/js/content-manager.js           | 12 +++++++++++-
 .../Resources/public/js/content-manager.js           |  7 ++-----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
index f20dec3757f..47b1e30be8b 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
@@ -167,9 +167,6 @@ define(function(require) {
             if (!collection) {
                 // otherwise, create collection from metadata
                 collection = new PageableCollection(collectionModels, collectionOptions);
-            } else if (this.data) {
-                _.extend(collectionOptions, {parse: true});
-                collection.reset(collectionModels, collectionOptions);
             }
 
             // create grid
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/content-manager.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/content-manager.js
index 56bc92c32eb..a27f944ab72 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/content-manager.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/content-manager.js
@@ -15,6 +15,11 @@ define([
     }
 
     contentManager = {
+        /**
+         * Fetches grid collection from page cache storage
+         *
+         * @param {string} gridName
+         */
         get: function(gridName) {
             var hash;
             var isActual;
@@ -29,11 +34,16 @@ define([
             return collection;
         },
 
+        /**
+         * Trace grid collection changes and update it's state in page cache
+         *
+         * @param {PageableCollection} collection
+         */
         trace: function(collection) {
             updateState(collection);
             contentManager.listenTo(collection, {
                 updateState: updateState,
-                beforeReset: updateState
+                reset: updateState
             });
             mediator.once('page:beforeChange', function() {
                 contentManager.stopListening(collection);
diff --git a/src/Oro/Bundle/NavigationBundle/Resources/public/js/content-manager.js b/src/Oro/Bundle/NavigationBundle/Resources/public/js/content-manager.js
index 0ed7e33c6a0..6ef9692e6e5 100644
--- a/src/Oro/Bundle/NavigationBundle/Resources/public/js/content-manager.js
+++ b/src/Oro/Bundle/NavigationBundle/Resources/public/js/content-manager.js
@@ -292,9 +292,6 @@ define([
          */
         add: function() {
             var path;
-            if (current.path[0] !== '/') {
-                current.path = '/' + current.path;
-            }
             path = current.path;
             pagesCache[path] = current;
         },
@@ -327,7 +324,7 @@ define([
          * @param {string=} hash
          */
         saveState: function(key, value, hash) {
-            if (value !== null) {
+            if (value !== null && value !== void 0) {
                 current.state[key] = value;
             } else {
                 delete current.state[key];
@@ -408,7 +405,7 @@ define([
         checkState: function(key, hash) {
             var query;
             query = Chaplin.utils.queryParams.parse(current.query);
-            return query[key] === hash;
+            return query[key] === hash || query[key] === void 0 && hash === null;
         },
 
         /**

From c7ccf38243ff0e6360bf63df41b50446864dab0d Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Tue, 22 Dec 2015 14:37:24 +0200
Subject: [PATCH 213/471] CRM-4809 inline-editing button cover cell value

---
 .../FormBundle/Resources/public/css/less/inline-editing.less    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editing.less b/src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editing.less
index b585349a97c..75df439497c 100644
--- a/src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editing.less
+++ b/src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editing.less
@@ -1,6 +1,6 @@
 @import "./multi-checkbox-editor";
 .oro-datagrid.grid-editable .grid {
-  .number-cell, .integer-cell, .align-right {
+  .number-cell, .integer-cell, .align-right, .editable {
     padding-right: 28px;
   }
   .row-edit-mode {

From 797a2ad818ddefb10a82309602addffe69eb0893 Mon Sep 17 00:00:00 2001
From: Makar Sichevoy <sichevoy@gmail.com>
Date: Tue, 22 Dec 2015 15:59:09 +0200
Subject: [PATCH 214/471] CRM-4807: Can't merge Account with relation to custom
 Entity - fix UT

---
 .../Metadata/MetadataBuilder.php              |  2 +-
 .../Unit/Metadata/MetadataBuilderTest.php     | 90 +++++++++++--------
 2 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/src/Oro/Bundle/EntityMergeBundle/Metadata/MetadataBuilder.php b/src/Oro/Bundle/EntityMergeBundle/Metadata/MetadataBuilder.php
index de37a7c260d..47458ca9e4f 100644
--- a/src/Oro/Bundle/EntityMergeBundle/Metadata/MetadataBuilder.php
+++ b/src/Oro/Bundle/EntityMergeBundle/Metadata/MetadataBuilder.php
@@ -138,7 +138,7 @@ protected function addDoctrineInverseAssociations(
 
                 $mergeModes = [MergeModes::UNITE];
                 if ($associationMapping['type'] === ClassMetadataInfo::ONE_TO_ONE) {
-                    //for fields with ONE_TO_ONE relation Unite strategy is impossible, so Replace is used
+                    // for fields with ONE_TO_ONE relation Unite strategy is impossible, so Replace is used
                     $mergeModes = [MergeModes::REPLACE];
                 }
 
diff --git a/src/Oro/Bundle/EntityMergeBundle/Tests/Unit/Metadata/MetadataBuilderTest.php b/src/Oro/Bundle/EntityMergeBundle/Tests/Unit/Metadata/MetadataBuilderTest.php
index 328ad92988b..00c2b3b51fe 100644
--- a/src/Oro/Bundle/EntityMergeBundle/Tests/Unit/Metadata/MetadataBuilderTest.php
+++ b/src/Oro/Bundle/EntityMergeBundle/Tests/Unit/Metadata/MetadataBuilderTest.php
@@ -79,15 +79,15 @@ public function testCreateEntityMetadataByClass()
         $metadataFactoryCallIndex = 0;
         $this->metadataFactory->expects($this->at($metadataFactoryCallIndex++))
             ->method('createEntityMetadata')
-            ->with(array(), $this->isType('array'))
+            ->with([], $this->isType('array'))
             ->will($this->returnValue($entityMetadata));
 
         // Test adding doctrine fields
-        $doctrineFieldNames = array('id', 'foo_field', 'bar_field');
-        $doctrineFieldNamesWithoutId = array('foo_field', 'bar_field');
+        $doctrineFieldNames = ['id', 'foo_field', 'bar_field'];
+        $doctrineFieldNamesWithoutId = ['foo_field', 'bar_field'];
         $classMetadataCallIndex = 0;
 
-        $idFieldNames = array('id');
+        $idFieldNames = ['id'];
         $this->classMetadata->expects($this->at($classMetadataCallIndex++))
             ->method('getIdentifierFieldNames')
             ->will($this->returnValue($idFieldNames));
@@ -97,7 +97,7 @@ public function testCreateEntityMetadataByClass()
             ->will($this->returnValue($doctrineFieldNames));
 
         foreach ($doctrineFieldNamesWithoutId as $fieldName) {
-            $fieldMapping = array('fieldName' => $fieldName);
+            $fieldMapping = ['fieldName' => $fieldName];
 
             $this->classMetadata->expects($this->at($classMetadataCallIndex++))
                 ->method('getFieldMapping')
@@ -108,7 +108,7 @@ public function testCreateEntityMetadataByClass()
 
             $this->metadataFactory->expects($this->at($metadataFactoryCallIndex++))
                 ->method('createFieldMetadata')
-                ->with(array('field_name' => $fieldName), $fieldMapping)
+                ->with(['field_name' => $fieldName], $fieldMapping)
                 ->will($this->returnValue($fieldMetadata));
 
             $entityMetadata->expects($this->at($entityMetadataCallIndex++))
@@ -117,10 +117,10 @@ public function testCreateEntityMetadataByClass()
         }
 
         // Test adding doctrine associations
-        $associationMappings = array(
-            'foo_association' => array('foo' => 'bar'),
-            'bar_association' => array('bar' => 'baz')
-        );
+        $associationMappings = [
+            'foo_association' => ['foo' => 'bar'],
+            'bar_association' => ['bar' => 'baz']
+        ];
 
         $this->classMetadata->expects($this->at($classMetadataCallIndex++))
             ->method('getAssociationMappings')
@@ -131,7 +131,7 @@ public function testCreateEntityMetadataByClass()
 
             $this->metadataFactory->expects($this->at($metadataFactoryCallIndex++))
                 ->method('createFieldMetadata')
-                ->with(array('field_name' => $fieldName), $associationMapping)
+                ->with(['field_name' => $fieldName], $associationMapping)
                 ->will($this->returnValue($fieldMetadata));
 
             $entityMetadata->expects($this->at($entityMetadataCallIndex++))
@@ -140,42 +140,56 @@ public function testCreateEntityMetadataByClass()
         }
 
         // Test adding doctrine inverse associations
-        $allMetadata = array(
+        $allMetadata = [
             self::CLASS_NAME => $this->classMetadata,
             'Namespace\\FooEntity' => $fooClassMetadata = $this->createClassMetadata(),
             'Namespace\\BarEntity' => $barClassMetadata = $this->createClassMetadata(),
-        );
-
-        $expectedClassesData = array(
-            'Namespace\\FooEntity' => array(
-                'associationMappings' => array(
-                    'foo_association' => array('foo' => 'bar'),
-                ),
-                'expectedFields' => array(
-                    'foo_association' => array(
+            'Namespace\\FooBarEntity' => $fooBarClassMetadata = $this->createClassMetadata(),
+        ];
+
+        $expectedClassesData = [
+            'Namespace\\FooEntity' => [
+                'associationMappings' => [
+                    'foo_association' => ['foo' => 'bar', 'type' => ClassMetadataInfo::ONE_TO_MANY],
+                ],
+                'expectedFields' => [
+                    'foo_association' => [
                         'field_name' => 'Namespace_FooEntity_foo_association',
-                        'merge_modes' => array(MergeModes::UNITE),
+                        'merge_modes' => [MergeModes::UNITE],
                         'source_field_name' => 'foo_association',
                         'source_class_name' => 'Namespace\\FooEntity',
-                    ),
-                )
-            ),
-            'Namespace\\BarEntity' => array(
-                'associationMappings' => array(
-                    'bar_association' => array('bar' => 'baz'),
-                    'skipped_many_to_many' => array('type' => ClassMetadataInfo::MANY_TO_MANY),
-                    'skipped_mapped_by' => array('mappedBy' => self::CLASS_NAME),
-                ),
-                'expectedFields' => array(
-                    'bar_association' => array(
+                    ],
+                ]
+            ],
+            'Namespace\\BarEntity' => [
+                'associationMappings' => [
+                    'bar_association' => ['bar' => 'baz', 'type' => ClassMetadataInfo::ONE_TO_MANY],
+                    'skipped_many_to_many' => ['type' => ClassMetadataInfo::MANY_TO_MANY],
+                    'skipped_mapped_by' => ['mappedBy' => self::CLASS_NAME],
+                ],
+                'expectedFields' => [
+                    'bar_association' => [
                         'field_name' => 'Namespace_BarEntity_bar_association',
-                        'merge_modes' => array(MergeModes::UNITE),
+                        'merge_modes' => [MergeModes::UNITE],
                         'source_field_name' => 'bar_association',
                         'source_class_name' => 'Namespace\\BarEntity',
-                    ),
-                )
-            )
-        );
+                    ],
+                ]
+            ],
+            'Namespace\\FooBarEntity' => [
+                'associationMappings' => [
+                    'bar_association' => ['bar' => 'baz', 'type' => ClassMetadataInfo::ONE_TO_ONE],
+                ],
+                'expectedFields' => [
+                    'bar_association' => [
+                        'field_name' => 'Namespace_FooBarEntity_bar_association',
+                        'merge_modes' => [MergeModes::REPLACE],
+                        'source_field_name' => 'bar_association',
+                        'source_class_name' => 'Namespace\\FooBarEntity',
+                    ],
+                ]
+            ]
+        ];
 
         $this->doctrineHelper->expects($this->once())
             ->method('getAllMetadata')

From 3857db5bcc27038b187cea975faf38b3e119896a Mon Sep 17 00:00:00 2001
From: Hryhorii Hrebiniuk <hhrebiniuk@magecore.com>
Date: Tue, 22 Dec 2015 16:49:35 +0200
Subject: [PATCH 215/471] BAP-8021: Newly created View doesn't appear on pinned
 page before refresh

---
 .../Resources/public/js/content-manager.js    | 37 ++++++--
 .../js/datagrid/grid-views/collection.js      | 74 +++++++++++++--
 .../public/js/datagrid/grid-views/view.js     | 94 +++++++++----------
 .../Resources/public/js/grid-views-builder.js | 21 ++++-
 4 files changed, 161 insertions(+), 65 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/content-manager.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/content-manager.js
index a27f944ab72..37291b20998 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/content-manager.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/content-manager.js
@@ -1,12 +1,12 @@
-define([
-    'underscore',
-    'backbone',
-    'oroui/js/mediator',
-    'orodatagrid/js/pageable-collection'
-], function(_, Backbone, mediator, PageableCollection) {
+define(function(require) {
     'use strict';
 
     var contentManager;
+    var _ = require('underscore');
+    var Backbone = require('backbone');
+    var mediator = require('oroui/js/mediator');
+    var PageableCollection = require('orodatagrid/js/pageable-collection');
+    var GridViewsCollection = require('orodatagrid/js/datagrid/grid-views/collection');
 
     function updateState(collection) {
         var key = collection.stateHashKey();
@@ -48,6 +48,31 @@ define([
             mediator.once('page:beforeChange', function() {
                 contentManager.stopListening(collection);
             });
+        },
+
+        /**
+         * Fetches grid views collection from page cache storage
+         *
+         * @param {string} gridName
+         */
+        getViewsCollection: function(gridName) {
+            var key = GridViewsCollection.stateHashKey(gridName);
+            return mediator.execute('pageCache:state:fetch', key);
+        },
+
+        /**
+         * Trace grid views collection changes and update it's state in page cache
+         *
+         * @param {GridViewsCollection} collection
+         */
+        traceViewsCollection: function(collection) {
+            updateState(collection);
+            contentManager.listenTo(collection, {'reset add remove': function() {
+                updateState(collection);
+            }});
+            mediator.once('page:beforeChange', function() {
+                contentManager.stopListening(collection);
+            });
         }
     };
     _.extend(contentManager, Backbone.Events);
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/collection.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/collection.js
index 84f01da2d59..4ff7f110c59 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/collection.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/collection.js
@@ -1,15 +1,77 @@
-define([
-    'backbone',
-    './model'
-], function(Backbone, GridViewsModel) {
+define(function(require) {
     'use strict';
 
     var GridViewsCollection;
+    var _ = require('underscore');
+    var Backbone = require('backbone');
+    var BaseCollection = require('oroui/js/app/models/base/collection');
+    var GridViewsModel = require('./model');
 
-    GridViewsCollection = Backbone.Collection.extend({
+    GridViewsCollection = BaseCollection.extend({
         /** @property */
-        model: GridViewsModel
+        model: GridViewsModel,
+
+        /** @type {string} */
+        gridName: '',
+
+        /**
+         * @inheritDoc
+         */
+        initialize: function(models, options) {
+            _.extend(this, _.pick(options, ['gridName']));
+            GridViewsCollection.__super__.initialize.call(this, models, options);
+        },
+
+        /**
+         * @inheritDoc
+         */
+        _prepareModel: function(attrs, options) {
+            if (attrs instanceof Backbone.Model) {
+                attrs.set('grid_name', this.gridName, {silent: true});
+            } else {
+                attrs.grid_name = this.gridName;
+            }
+            return GridViewsCollection.__super__._prepareModel.call(this, attrs, options);
+        },
+
+        /**
+         * @inheritDoc
+         */
+        clone: function() {
+            return new this.constructor(this.toJSON(), {gridName: this.gridName});
+        },
+
+        /**
+         * Fetches key for a state hash of GridViewsCollection
+         *
+         * @returns {string}
+         */
+        stateHashKey: function() {
+            return GridViewsCollection.stateHashKey(this.gridName);
+        },
+
+        /**
+         * Fetches value for a state hash of GridViewsCollection
+         *
+         * @param {boolean=} purge If true, clears value from initial state
+         * @returns {string|null}
+         */
+        stateHashValue: function(purge) {
+            // selected grid view is already preserved in URL, no need extra value
+            return null;
+        }
     });
 
+    /**
+     * Generates name of URL parameter for collection state
+     *
+     * @static
+     * @param {string} gridName
+     * @returns {string}
+     */
+    GridViewsCollection.stateHashKey = function(gridName) {
+        return 'gridViews[' + gridName + ']';
+    };
+
     return GridViewsCollection;
 });
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
index a13a47423a1..9bb4ba27415 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
@@ -1,17 +1,15 @@
-define([
-    'backbone',
-    'underscore',
-    'orotranslation/js/translator',
-    './collection',
-    './model',
-    './view-name-modal',
-    'oroui/js/mediator',
-    'oroui/js/delete-confirmation'
-], function(Backbone, _, __, GridViewsCollection, GridViewModel, ViewNameModal, mediator, DeleteConfirmation) {
+define(function(require) {
     'use strict';
 
     var GridViewsView;
+    var Backbone = require('backbone');
     var $ = Backbone.$;
+    var _ = require('underscore');
+    var __ = require('orotranslation/js/translator');
+    var GridViewModel = require('./model');
+    var ViewNameModal = require('./view-name-modal');
+    var mediator = require('oroui/js/mediator');
+    var DeleteConfirmation = require('oroui/js/delete-confirmation');
 
     /**
      * Datagrid views widget
@@ -49,9 +47,6 @@ define([
         /** @property */
         enabled: true,
 
-        /** @property */
-        choices: [],
-
         /** @property */
         permissions: {
             CREATE: false,
@@ -67,8 +62,8 @@ define([
         /** @property */
         gridName: {},
 
-        /** @property */
-        viewsCollection: GridViewsCollection,
+        /** @type {GridViewsCollection} */
+        viewsCollection: null,
 
         /** @property */
         originalTitle: null,
@@ -79,8 +74,8 @@ define([
          * @param {Object} options
          * @param {Backbone.Collection} options.collection
          * @param {Boolean} [options.enable]
-         * @param {Array}   [options.choices]
-         * @param {Array}   [options.views]
+         * @param {string}  [options.title]
+         * @param {GridViewsCollection} [options.viewsCollection]
          */
         initialize: function(options) {
             options = options || {};
@@ -89,37 +84,25 @@ define([
                 throw new TypeError('"collection" is required');
             }
 
+            if (!options.viewsCollection) {
+                throw new TypeError('"viewsCollection" is required');
+            }
+
+            _.extend(this, _.pick(options, ['viewsCollection', 'title']));
+
             this.template = _.template($('#template-datagrid-grid-view').html());
             this.titleTemplate = _.template($('#template-datagrid-grid-view-label').html());
 
-            if (options.choices) {
-                this.choices = _.union(this.choices, options.choices);
-                if (!this._getView(this.DEFAULT_GRID_VIEW_ID).label) {
-                    this._getView(this.DEFAULT_GRID_VIEW_ID).label =
-                        __('oro.datagrid.gridView.all') + (options.title || '');
-                }
-            }
-
             if (options.permissions) {
                 this.permissions = _.extend(this.permissions, options.permissions);
             }
 
-            if (options.title) {
-                this.title = options.title;
-            }
-
             this.originalTitle = $('head title').text();
 
             this.gridName = options.gridName;
             this.collection = options.collection;
             this.enabled = options.enable !== false;
 
-            options.views = options.views || [];
-            _.each(options.views, function(view) {
-                view.grid_name = this.gridName;
-            }, this);
-
-            this.viewsCollection = new this.viewsCollection(options.views);
             if (!this.collection.state.gridView) {
                 this.collection.state.gridView = this.DEFAULT_GRID_VIEW_ID;
             }
@@ -371,16 +354,33 @@ define([
             this.changeView(this.collection.state.gridView);
         },
 
+        /**
+         * Prepares choice items for grid view dropdown
+         *
+         * @return {Array<{label:{string},value:{*}}>}
+         */
+        getViewChoices: function() {
+            var choices = this.viewsCollection.map(function(model) {
+                return {
+                    label: model.get('label'),
+                    value: model.get('name')
+                };
+            });
+
+            var defaultItem = _.findWhere(choices, {value: this.DEFAULT_GRID_VIEW_ID});
+            if (defaultItem.label === this.DEFAULT_GRID_VIEW_ID) {
+                defaultItem.label = __('oro.datagrid.gridView.all') + (this.title || '');
+            }
+
+            return choices;
+        },
+
         /**
          * @private
          *
          * @param {GridViewModel} model
          */
-        _onModelAdd: function(model) {
-            this.choices.push({
-                label: model.get('label'),
-                value: model.get('name')
-            });
+        _onModelAdd: function() {
             this.render();
         },
 
@@ -393,10 +393,6 @@ define([
             var viewId = this.collection.state.gridView;
             viewId = viewId === this.DEFAULT_GRID_VIEW_ID ? viewId : parseInt(viewId, 10);
 
-            this.choices = _.reject(this.choices, function(item) {
-                return item.value === viewId;
-            }, this);
-
             if (model.id === viewId) {
                 this.collection.state.gridView = this.DEFAULT_GRID_VIEW_ID;
                 this.viewDirty = !this._isCurrentStateSynchronized();
@@ -462,7 +458,7 @@ define([
                 title: title,
                 titleLabel: this.title,
                 disabled: !this.enabled,
-                choices: this.choices,
+                choices: this.getViewChoices(),
                 dirty: this.viewDirty,
                 editedLabel: __('oro.datagrid.gridView.data_edited'),
                 actionsLabel: __('oro.datagrid.gridView.actions'),
@@ -599,15 +595,11 @@ define([
         /**
          * @private
          *
-         * @param {String} name
+         * @param {string|number} name
          * @returns {undefined|Object}
          */
         _getView: function(name) {
-            var currentViews =  _.filter(this.choices, function(item) {
-                return item.value === name;
-            }, this);
-
-            return _.first(currentViews);
+            return _.findWhere(this.getViewChoices(), {value: name});
         },
 
         /**
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/grid-views-builder.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/grid-views-builder.js
index 11ea6f1ee60..741ab846e78 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/grid-views-builder.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/grid-views-builder.js
@@ -5,6 +5,8 @@ define(function(require) {
     var _ = require('underscore');
     var mediator = require('oroui/js/mediator');
     var GridViewsView = require('orodatagrid/js/datagrid/grid-views/view');
+    var GridViewsCollection = require('orodatagrid/js/datagrid/grid-views/collection');
+    var gridContentManager = require('orodatagrid/js/content-manager');
     var gridGridViewsSelector = '.page-title > .navbar-extra .pull-left-extra > .pull-left';
     var gridViewsBuilder = {
         /**
@@ -22,7 +24,8 @@ define(function(require) {
         init: function(deferred, options) {
             var self = {
                 metadata: _.defaults(options.metadata, {
-                    gridViews: {}
+                    gridViews: {},
+                    options: {}
                 }),
                 enableViews: options.enableViews,
                 $gridEl: options.$el,
@@ -89,7 +92,21 @@ define(function(require) {
          * @returns {Object}
          */
         combineGridViewsOptions: function() {
-            return this.metadata.gridViews;
+            var options = this.metadata.gridViews;
+            // check is grid views collection is stored in content manager
+            var collection = gridContentManager.getViewsCollection(options.gridName);
+
+            if (!collection) {
+                collection = new GridViewsCollection(options.views, {gridName: options.gridName});
+            }
+
+            if (this.metadata.options.routerEnabled !== false) {
+                // trace grid views collection changes
+                gridContentManager.traceViewsCollection(collection);
+            }
+
+            options.viewsCollection = collection;
+            return _.omit(options, ['choices', 'views']);
         }
     };
 

From c7c3bb33d725863c0bfdb182e353f137b8aab64c Mon Sep 17 00:00:00 2001
From: Dmitry Naydenov <dnaidonov@magecore.com>
Date: Tue, 22 Dec 2015 16:31:37 +0200
Subject: [PATCH 216/471] CRM-4518 [Days] RFM calculation never executes

---
 .../Entity/Repository/ChannelRepository.php   | 72 ++++++++++++++-----
 .../Functional/DataFixtures/LoadJobData.php   | 10 +++
 .../Repository/ChannelRepositoryTest.php      | 34 +++++++++
 3 files changed, 98 insertions(+), 18 deletions(-)

diff --git a/src/Oro/Bundle/IntegrationBundle/Entity/Repository/ChannelRepository.php b/src/Oro/Bundle/IntegrationBundle/Entity/Repository/ChannelRepository.php
index 8bb839938fd..7fab56b0ae7 100644
--- a/src/Oro/Bundle/IntegrationBundle/Entity/Repository/ChannelRepository.php
+++ b/src/Oro/Bundle/IntegrationBundle/Entity/Repository/ChannelRepository.php
@@ -17,11 +17,46 @@ class ChannelRepository extends EntityRepository
     const BUFFER_SIZE = 100;
 
     /**
-     * @param string $commandName
+     * @info Check if task is running
+     *
+     * @param string   $commandName
      * @param int|null $integrationId
+     *
      * @return int
      */
     public function getRunningSyncJobsCount($commandName, $integrationId = null)
+    {
+        $qb = $this->getSyncJobsCountQueryBuilder($commandName, $integrationId);
+        $qb->andWhere('j.state=:stateName');
+        $qb->setParameter('stateName', Job::STATE_RUNNING);
+
+        return (int)$qb->getQuery()->getSingleScalarResult();
+    }
+
+    /**
+     * @info Check if task is pending or running
+     *
+     * @param string   $commandName
+     * @param int|null $integrationId
+     *
+     * @return int
+     */
+    public function getExistingSyncJobsCount($commandName, $integrationId = null)
+    {
+        $qb = $this->getSyncJobsCountQueryBuilder($commandName, $integrationId);
+        $qb->andWhere($qb->expr()->in('j.state', ':states'));
+        $qb->setParameter('states', [Job::STATE_RUNNING, Job::STATE_PENDING]);
+
+        return (int)$qb->getQuery()->getSingleScalarResult();
+    }
+
+    /**
+     * @param string   $commandName
+     * @param int|null $integrationId
+     *
+     * @return QueryBuilder
+     */
+    protected function getSyncJobsCountQueryBuilder($commandName, $integrationId = null)
     {
         /** @var QueryBuilder $qb */
         $qb = $this->getEntityManager()
@@ -29,9 +64,7 @@ public function getRunningSyncJobsCount($commandName, $integrationId = null)
             ->createQueryBuilder('j')
             ->select('count(j.id)')
             ->andWhere('j.command=:commandName')
-            ->andWhere('j.state=:stateName')
-            ->setParameter('commandName', $commandName)
-            ->setParameter('stateName', Job::STATE_RUNNING);
+            ->setParameter('commandName', $commandName);
 
         if ($integrationId) {
             $qb->andWhere(
@@ -50,12 +83,11 @@ public function getRunningSyncJobsCount($commandName, $integrationId = null)
                 ->setParameter('noIntegrationIdType2', '%-i=%');
         }
 
-        return (int)$qb->getQuery()->getSingleScalarResult();
+        return $qb;
     }
 
-
     /**
-     * @param string[]|string $commandName
+     * @param string[]|string      $commandName
      * @param string[]|string|null $arguments
      * @param string[]|string|null $states
      *
@@ -104,7 +136,7 @@ protected function getQBSyncJobs($commandName, $arguments = null, $states = null
     }
 
     /**
-     * @param string[]|string $commandName
+     * @param string[]|string      $commandName
      * @param string[]|string|null $arguments
      * @param string[]|string|null $states
      *
@@ -119,7 +151,7 @@ protected function getQBSyncJobsCount($commandName, $arguments = null, $states =
     }
 
     /**
-     * @param string $commandName
+     * @param string               $commandName
      * @param string[]|string|null $arguments
      * @param string[]|string|null $states
      *
@@ -137,8 +169,9 @@ public function getSyncJobsCount($commandName, $states = null, $arguments = null
      * Returns latest status for integration's connector and code if it exists.
      *
      * @param Integration $integration
-     * @param string $connector
-     * @param int|null $code
+     * @param string      $connector
+     * @param int|null    $code
+     *
      * @return Status|null
      */
     public function getLastStatusForConnector(Integration $integration, $connector, $code = null)
@@ -153,8 +186,9 @@ public function getLastStatusForConnector(Integration $integration, $connector,
 
     /**
      * @param Integration $integration
-     * @param string $connector
-     * @param int|null $code
+     * @param string      $connector
+     * @param int|null    $code
+     *
      * @return Status[]|\Iterator
      */
     public function getConnectorStatuses(Integration $integration, $connector, $code = null)
@@ -169,8 +203,9 @@ public function getConnectorStatuses(Integration $integration, $connector, $code
 
     /**
      * @param Integration $integration
-     * @param string $connector
-     * @param int|null $code
+     * @param string      $connector
+     * @param int|null    $code
+     *
      * @return QueryBuilder
      */
     public function getConnectorStatusesQueryBuilder(Integration $integration, $connector, $code = null)
@@ -215,7 +250,7 @@ public function getConfiguredChannelsForSync($type = null, $isReadOnly = false)
         $integrations = $qb->getQuery()->getResult();
 
         if ($isReadOnly) {
-            $unitOfWork  = $this->getEntityManager()->getUnitOfWork();
+            $unitOfWork = $this->getEntityManager()->getUnitOfWork();
 
             foreach ($integrations as $integration) {
                 $unitOfWork->markReadOnly($integration);
@@ -249,8 +284,9 @@ public function getOrLoadById($id)
      * Adds status to integration, manual persist of newly created statuses and do flush.
      *
      * @deprecated 1.9.0:1.11.0 Use $this->addStatusAndFlush() instead
+     *
      * @param Integration $integration
-     * @param Status  $status
+     * @param Status      $status
      */
     public function addStatus(Integration $integration, Status $status)
     {
@@ -261,7 +297,7 @@ public function addStatus(Integration $integration, Status $status)
      * Adds status to integration, manual persist of newly created statuses and do flush.
      *
      * @param Integration $integration
-     * @param Status  $status
+     * @param Status      $status
      */
     public function addStatusAndFlush(Integration $integration, Status $status)
     {
diff --git a/src/Oro/Bundle/IntegrationBundle/Tests/Functional/DataFixtures/LoadJobData.php b/src/Oro/Bundle/IntegrationBundle/Tests/Functional/DataFixtures/LoadJobData.php
index 2a4b6e81829..ffcb7fbaa49 100644
--- a/src/Oro/Bundle/IntegrationBundle/Tests/Functional/DataFixtures/LoadJobData.php
+++ b/src/Oro/Bundle/IntegrationBundle/Tests/Functional/DataFixtures/LoadJobData.php
@@ -43,6 +43,16 @@ class LoadJobData extends AbstractFixture implements DependentFixtureInterface
             'state' => Job::STATE_RUNNING,
             'reference' => 'oro_integration:third_running_job'
         ],
+        [
+            'command' => 'second_test_command',
+            'state' => Job::STATE_PENDING,
+            'reference' => 'oro_integration:second_pending_job'
+        ],
+        [
+            'command' => 'second_test_command',
+            'state' => Job::STATE_PENDING,
+            'reference' => 'oro_integration:third_pending_job'
+        ],
         [
             'command' => 'third_test_command',
             'state' => Job::STATE_RUNNING,
diff --git a/src/Oro/Bundle/IntegrationBundle/Tests/Functional/Entity/Repository/ChannelRepositoryTest.php b/src/Oro/Bundle/IntegrationBundle/Tests/Functional/Entity/Repository/ChannelRepositoryTest.php
index 9ec9fbb1ffa..377827fd764 100644
--- a/src/Oro/Bundle/IntegrationBundle/Tests/Functional/Entity/Repository/ChannelRepositoryTest.php
+++ b/src/Oro/Bundle/IntegrationBundle/Tests/Functional/Entity/Repository/ChannelRepositoryTest.php
@@ -89,4 +89,38 @@ public function getRunningSyncJobsCountDataProvider()
             ]
         ];
     }
+
+    /**
+     * @dataProvider getExistingSyncJobsCountDataProvider
+     *
+     * @param string      $command
+     * @param int         $expectedCount
+     * @param null|string $integration
+     */
+    public function testGetExistingSyncJobsCount($command, $expectedCount, $integration = null)
+    {
+        $integration = $integration ? $this->getReference($integration)->getId() : null;
+        $actual      = $this->repository->getExistingSyncJobsCount($command, $integration);
+
+        self::assertEquals($expectedCount, $actual);
+    }
+
+    public function getExistingSyncJobsCountDataProvider()
+    {
+        return [
+            [
+                'command'       => 'first_test_command',
+                'expectedCount' => 3
+            ],
+            [
+                'command'       => 'second_test_command',
+                'expectedCount' => 3
+            ],
+            [
+                'command'       => 'third_test_command',
+                'expectedCount' => 2,
+                'integration'   => 'oro_integration:foo_integration',
+            ]
+        ];
+    }
 }

From e5e0aa7536ccbaf3449b528f5b4aa23eba61c659 Mon Sep 17 00:00:00 2001
From: Dmytro Krushelnytskyi <dkrushelnytskyi@magecore.com>
Date: Tue, 22 Dec 2015 18:25:26 +0200
Subject: [PATCH 217/471] BAP-9073: Change cron strategy to prevent overflow
 jobs queue

---
 src/Oro/Bundle/CronBundle/Command/CronCommand.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/CronBundle/Command/CronCommand.php b/src/Oro/Bundle/CronBundle/Command/CronCommand.php
index 57278b6660e..4259bf5fdb1 100644
--- a/src/Oro/Bundle/CronBundle/Command/CronCommand.php
+++ b/src/Oro/Bundle/CronBundle/Command/CronCommand.php
@@ -71,7 +71,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 continue;
             }
 
-            if (empty($schedule = $this->getSchedule($schedules, $name))) {
+            $schedule = $this->getSchedule($schedules, $name);
+            if (empty($schedule)) {
                 $schedule = $this->createSchedule($command, $name, $output);
                 $em->persist($schedule);
                 continue;

From abd183b5fa1ffb05417674aa9f0678e50e743503 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Tue, 22 Dec 2015 19:54:59 +0200
Subject: [PATCH 218/471] BAP-9553 fit dashboard widget header

---
 .../DashboardBundle/Resources/public/css/less/dashboard.less    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
index 096a040559a..957336d3d3f 100644
--- a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
+++ b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
@@ -142,7 +142,6 @@
       padding-left: 0;
       padding-right: 0;
       max-width: ~"calc(100% - 120px)";
-      padding-bottom: 2px;
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
@@ -150,7 +149,6 @@
 
     .row-fluid {
       border-top: 1px solid #ddd;
-      margin-top: 5px;
     }
 
     .dashboard-widget-content {

From 621be304a91cebf477b05e7f07aacae074e5776b Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Tue, 22 Dec 2015 20:01:11 +0200
Subject: [PATCH 219/471] BAP-9553 quick launch - accessible area fix

---
 .../DashboardBundle/Resources/public/css/less/dashboard.less | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
index 957336d3d3f..8b6264dd612 100644
--- a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
+++ b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
@@ -290,8 +290,11 @@
   & > li{
     float: left;
     border-left: 1px solid #eaeaea;
-    padding: 15px 0 25px;
     text-align: center;
+    > a {
+      padding: 15px 0 25px;
+      display: block;
+    }
     /* width: 20%; calculated on backend and depends on a number of items */
     #gradient > .vertical(#ffffff, #f1f1f1);
     &:first-child{

From b77477c67dc64ed3bde1f605d0dc989f3eb0a65a Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Tue, 22 Dec 2015 20:06:10 +0200
Subject: [PATCH 220/471] BAP-9553_3 Dashboard square fix

---
 .../DashboardBundle/Resources/public/css/less/dashboard.less   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
index 096a040559a..28b993c1f27 100644
--- a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
+++ b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
@@ -95,7 +95,8 @@
           margin-right: 8px;
           background-color: #fcfcfc;
           font-size: 12px;
-          line-height: 13px;
+          line-height: 12px;
+          padding: 1px 0 0px 0;
           text-align: center;
           color: #727272;
           #gradient > .horizontal(#fcfcfc, #e9e9e9);

From f241e66a5959f45c67ae871c38c1c827d01c8a31 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Tue, 22 Dec 2015 20:15:16 +0200
Subject: [PATCH 221/471] BAP-9553 Dashboard selector fix

---
 .../DashboardBundle/Resources/public/css/less/dashboard.less   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
index 096a040559a..1fca55baf97 100644
--- a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
+++ b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
@@ -571,3 +571,6 @@
     }
   }
 }
+#dashboard_selector, #uniform-dashboard_selector {
+  height: 28px;
+}

From 49e0bd5c2a4e718bc6e32b5739c5459cefd0a36a Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Tue, 22 Dec 2015 20:17:06 +0200
Subject: [PATCH 222/471] BAP-9553 Breadcrumb fix

---
 src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less
index c53bf83e964..f6a05952015 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less
@@ -2643,7 +2643,7 @@ label.radio.error {
   float: left;
   background: none;
   margin: 0;
-  padding: 6px 15px 0 20px;
+  padding: 6px 15px 6px 20px;
 }
 .breadcrumb > li.active,
 .breadcrumb > li {

From 316dc34fdadb37740368dc480eb889970b03b6f3 Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Tue, 22 Dec 2015 21:03:47 +0200
Subject: [PATCH 223/471] CRM-4828: update popup height after field height was
 changed

---
 .../public/js/app/views/calendar-event-form-view.js       | 8 ++++++++
 .../Resources/public/js/widget/dialog-widget.js           | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/src/Oro/Bundle/CalendarBundle/Resources/public/js/app/views/calendar-event-form-view.js b/src/Oro/Bundle/CalendarBundle/Resources/public/js/app/views/calendar-event-form-view.js
index 863643e0af4..13a7b807d07 100644
--- a/src/Oro/Bundle/CalendarBundle/Resources/public/js/app/views/calendar-event-form-view.js
+++ b/src/Oro/Bundle/CalendarBundle/Resources/public/js/app/views/calendar-event-form-view.js
@@ -14,6 +14,10 @@ define([
          */
         options: {},
 
+        events: {
+            'change input[name$="[contexts]"]': 'onContextChange'
+        },
+
         /**
          * @constructor
          *
@@ -39,6 +43,10 @@ define([
             opts = this.options;
             datepair = new DatepairView(opts);
             this.subview('datepair', datepair);
+        },
+
+        onContextChange: function() {
+            this.$el.trigger('content:changed');
         }
     });
 
diff --git a/src/Oro/Bundle/WindowsBundle/Resources/public/js/widget/dialog-widget.js b/src/Oro/Bundle/WindowsBundle/Resources/public/js/widget/dialog-widget.js
index d15b5968a0d..6daf72f6f7d 100644
--- a/src/Oro/Bundle/WindowsBundle/Resources/public/js/widget/dialog-widget.js
+++ b/src/Oro/Bundle/WindowsBundle/Resources/public/js/widget/dialog-widget.js
@@ -46,6 +46,10 @@ define(function(require) {
          */
         _isEmbedded: false,
 
+        events: {
+                'content:changed': 'resetDialogPosition'
+        },
+
         listen: {
             'adoptedFormResetClick': 'remove',
             'widgetRender': 'onWidgetRender',

From d75242353ffcd6c5e7f474b99e2c022d4e51b6b2 Mon Sep 17 00:00:00 2001
From: Sergey Zhuravel <zhuravel.sergey@gmail.com>
Date: Tue, 22 Dec 2015 22:37:33 +0200
Subject: [PATCH 224/471] BB-1292: Enable Data Audit for Commerce Entities -
 fix insert attempt for removed entity previously removed by gedmo

---
 .../Loggable/LoggableManager.php              | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/DataAuditBundle/Loggable/LoggableManager.php b/src/Oro/Bundle/DataAuditBundle/Loggable/LoggableManager.php
index 4b15444cb3d..5f7013ac220 100644
--- a/src/Oro/Bundle/DataAuditBundle/Loggable/LoggableManager.php
+++ b/src/Oro/Bundle/DataAuditBundle/Loggable/LoggableManager.php
@@ -5,6 +5,7 @@
 use Symfony\Component\Routing\Exception\InvalidParameterException;
 use Symfony\Component\Security\Core\SecurityContextInterface;
 
+use Doctrine\ORM\UnitOfWork;
 use Doctrine\ORM\PersistentCollection;
 use Doctrine\ORM\EntityManager;
 use Doctrine\Common\Util\ClassUtils;
@@ -167,7 +168,7 @@ public function handleLoggable(EntityManager $em)
 
         $collections = array_merge($uow->getScheduledCollectionUpdates(), $uow->getScheduledCollectionDeletions());
         foreach ($collections as $collection) {
-            $this->calculateCollectionData($collection);
+            $this->calculateActualCollectionData($collection);
         }
 
         $entities = array_merge(
@@ -286,7 +287,7 @@ protected function calculateManyToOneData(DoctrineClassMetadata $entityMeta, $en
             }
 
             $entityIdentifier = $this->getEntityIdentifierString($owner);
-            $this->calculateCollectionData($collection, $entityIdentifier);
+            $this->calculateActualCollectionData($collection, $entityIdentifier);
 
             $entities[$entityIdentifier] = $owner;
         }
@@ -294,6 +295,21 @@ protected function calculateManyToOneData(DoctrineClassMetadata $entityMeta, $en
         return $entities;
     }
 
+    /**
+     * @param PersistentCollection $collection
+     * @param string $entityIdentifier
+     */
+    protected function calculateActualCollectionData(PersistentCollection $collection, $entityIdentifier = null)
+    {
+        $ownerEntity = $collection->getOwner();
+        $entityState = $this->em->getUnitOfWork()->getEntityState($ownerEntity, UnitOfWork::STATE_NEW);
+        if ($entityState === UnitOfWork::STATE_REMOVED) {
+            return;
+        }
+
+        $this->calculateCollectionData($collection, $entityIdentifier);
+    }
+
     /**
      * @param PersistentCollection $collection
      * @param string $entityIdentifier

From 9d2de77e7af250d5b226bb928ad303b3f1ccb6b0 Mon Sep 17 00:00:00 2001
From: Dmytro Krushelnytskyi <dkrushelnytskyi@magecore.com>
Date: Wed, 23 Dec 2015 11:03:45 +0200
Subject: [PATCH 225/471] BAP-9073: Change cron strategy to prevent overflow
 jobs queue

---
 src/Oro/Bundle/CronBundle/Command/CronCommand.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/CronBundle/Command/CronCommand.php b/src/Oro/Bundle/CronBundle/Command/CronCommand.php
index 4259bf5fdb1..d24f52a1395 100644
--- a/src/Oro/Bundle/CronBundle/Command/CronCommand.php
+++ b/src/Oro/Bundle/CronBundle/Command/CronCommand.php
@@ -72,7 +72,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
 
             $schedule = $this->getSchedule($schedules, $name);
-            if (empty($schedule)) {
+            if (0 === count($schedule)) {
                 $schedule = $this->createSchedule($command, $name, $output);
                 $em->persist($schedule);
                 continue;

From 158986111cb869a18fe6158e4b3d6971d0e22c04 Mon Sep 17 00:00:00 2001
From: Dmitry Naydenov <dnaidonov@magecore.com>
Date: Wed, 23 Dec 2015 12:12:30 +0200
Subject: [PATCH 226/471] CRM-4518 RFM calculation never executes - add status
 new on check

---
 .../Entity/Repository/ChannelRepository.php            |  2 +-
 .../Tests/Functional/DataFixtures/LoadJobData.php      | 10 ++++++++++
 .../Entity/Repository/ChannelRepositoryTest.php        |  4 ++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/Oro/Bundle/IntegrationBundle/Entity/Repository/ChannelRepository.php b/src/Oro/Bundle/IntegrationBundle/Entity/Repository/ChannelRepository.php
index 7fab56b0ae7..aefebae3c8d 100644
--- a/src/Oro/Bundle/IntegrationBundle/Entity/Repository/ChannelRepository.php
+++ b/src/Oro/Bundle/IntegrationBundle/Entity/Repository/ChannelRepository.php
@@ -45,7 +45,7 @@ public function getExistingSyncJobsCount($commandName, $integrationId = null)
     {
         $qb = $this->getSyncJobsCountQueryBuilder($commandName, $integrationId);
         $qb->andWhere($qb->expr()->in('j.state', ':states'));
-        $qb->setParameter('states', [Job::STATE_RUNNING, Job::STATE_PENDING]);
+        $qb->setParameter('states', [Job::STATE_RUNNING, Job::STATE_PENDING, Job::STATE_NEW]);
 
         return (int)$qb->getQuery()->getSingleScalarResult();
     }
diff --git a/src/Oro/Bundle/IntegrationBundle/Tests/Functional/DataFixtures/LoadJobData.php b/src/Oro/Bundle/IntegrationBundle/Tests/Functional/DataFixtures/LoadJobData.php
index ffcb7fbaa49..5fa7767d7df 100644
--- a/src/Oro/Bundle/IntegrationBundle/Tests/Functional/DataFixtures/LoadJobData.php
+++ b/src/Oro/Bundle/IntegrationBundle/Tests/Functional/DataFixtures/LoadJobData.php
@@ -53,6 +53,11 @@ class LoadJobData extends AbstractFixture implements DependentFixtureInterface
             'state' => Job::STATE_PENDING,
             'reference' => 'oro_integration:third_pending_job'
         ],
+        [
+            'command' => 'second_test_command',
+            'state' => Job::STATE_NEW,
+            'reference' => 'oro_integration:second_new_job'
+        ],
         [
             'command' => 'third_test_command',
             'state' => Job::STATE_RUNNING,
@@ -69,6 +74,11 @@ class LoadJobData extends AbstractFixture implements DependentFixtureInterface
             'command' => 'third_test_command',
             'state' => Job::STATE_RUNNING,
             'reference' => 'oro_integration:running_third_test_command_job'
+        ],
+        [
+            'command' => 'third_test_command',
+            'state' => Job::STATE_NEW,
+            'reference' => 'oro_integration:new_third_test_command_job'
         ]
     ];
 
diff --git a/src/Oro/Bundle/IntegrationBundle/Tests/Functional/Entity/Repository/ChannelRepositoryTest.php b/src/Oro/Bundle/IntegrationBundle/Tests/Functional/Entity/Repository/ChannelRepositoryTest.php
index 377827fd764..6dcec947563 100644
--- a/src/Oro/Bundle/IntegrationBundle/Tests/Functional/Entity/Repository/ChannelRepositoryTest.php
+++ b/src/Oro/Bundle/IntegrationBundle/Tests/Functional/Entity/Repository/ChannelRepositoryTest.php
@@ -114,11 +114,11 @@ public function getExistingSyncJobsCountDataProvider()
             ],
             [
                 'command'       => 'second_test_command',
-                'expectedCount' => 3
+                'expectedCount' => 4
             ],
             [
                 'command'       => 'third_test_command',
-                'expectedCount' => 2,
+                'expectedCount' => 3,
                 'integration'   => 'oro_integration:foo_integration',
             ]
         ];

From 84bd2dc02689860880e65fd163d6c45a1ba14457 Mon Sep 17 00:00:00 2001
From: Dmytro Krushelnytskyi <dkrushelnytskyi@magecore.com>
Date: Wed, 23 Dec 2015 13:06:10 +0200
Subject: [PATCH 227/471] BAP-9073: Change cron strategy to prevent overflow
 jobs queue

---
 .../CronBundle/Entity/Manager/JobManager.php   |  2 +-
 .../Bundle/CronBundle/Helper/CronHelper.php    | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/Oro/Bundle/CronBundle/Entity/Manager/JobManager.php b/src/Oro/Bundle/CronBundle/Entity/Manager/JobManager.php
index 2d601584fb1..5da5607011c 100644
--- a/src/Oro/Bundle/CronBundle/Entity/Manager/JobManager.php
+++ b/src/Oro/Bundle/CronBundle/Entity/Manager/JobManager.php
@@ -137,7 +137,7 @@ public function hasJobInQueue($name, $args = null)
             ->andWhere('j.command=:command')
             ->andWhere('j.state in (:stateName)')
             ->setParameter('command', $name)
-            ->setParameter('stateName', [Job::STATE_RUNNING, Job::STATE_PENDING]);
+            ->setParameter('stateName', [Job::STATE_NEW, Job::STATE_RUNNING, Job::STATE_PENDING]);
 
         if ($args) {
             $qb->andWhere($qb->expr()->like('cast(j.args as text)', ':args'));
diff --git a/src/Oro/Bundle/CronBundle/Helper/CronHelper.php b/src/Oro/Bundle/CronBundle/Helper/CronHelper.php
index fcd6447b168..1674c2c7e22 100644
--- a/src/Oro/Bundle/CronBundle/Helper/CronHelper.php
+++ b/src/Oro/Bundle/CronBundle/Helper/CronHelper.php
@@ -7,14 +7,22 @@
 class CronHelper
 {
     /**
-     * @param $definition
+     * Create a new CronExpression.
      *
-     * @return \Cron\CronExpression
+     * @param string $definition The CRON expression to create.  There are
+     *                           several special predefined values which can be used to substitute the
+     *                           CRON expression:
+     *
+     *      `@yearly`, `@annually` - Run once a year, midnight, Jan. 1 - 0 0 1 1 *
+     *      `@monthly` - Run once a month, midnight, first of month - 0 0 1 * *
+     *      `@weekly` - Run once a week, midnight on Sun - 0 0 * * 0
+     *      `@daily` - Run once a day, midnight - 0 0 * * *
+     *      `@hourly` - Run once an hour, first minute - 0 * * * *
+     *
+     * @return CronExpression
      */
     public function createCron($definition)
     {
-        $cron = CronExpression::factory($definition);
-
-        return $cron;
+        return CronExpression::factory($definition);
     }
 }

From 57578bfe994822744159c417d80cbe4deb25ffec Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Wed, 23 Dec 2015 13:20:49 +0200
Subject: [PATCH 228/471] dashboard widget header fix

---
 .../DashboardBundle/Resources/public/css/less/dashboard.less     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
index 957336d3d3f..e9d1ef2ff8a 100644
--- a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
+++ b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
@@ -191,7 +191,6 @@
     .row-fluid {
       border-top: none;
     }
-    height: 43px;
     overflow: hidden;
   }
   .collapse-expand-action-container {

From 00442703b7dfa97840afe37c494277e307eaf31a Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Wed, 23 Dec 2015 13:27:58 +0200
Subject: [PATCH 229/471] BAP-9553 access area of actions for dashboard widget

---
 .../DashboardBundle/Resources/public/css/less/dashboard.less | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
index e9d1ef2ff8a..54f3febd4ce 100644
--- a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
+++ b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
@@ -114,7 +114,10 @@
       white-space: nowrap;
       .action-wrapper {
         border-right: 1px solid #ddd;
-        padding: 3px 13px;
+        padding: 0 3px;
+        > a {
+          padding: 10px 8px;
+        }
       }
     }
 

From 98e7efd4d90ff1b9ba28984e5770652296f41ba3 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Wed, 23 Dec 2015 13:35:48 +0200
Subject: [PATCH 230/471] BAP-9553 access area of actions for dashboard widget

---
 .../DashboardBundle/Resources/public/css/less/dashboard.less    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
index 54f3febd4ce..ca1ff455e53 100644
--- a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
+++ b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
@@ -197,7 +197,7 @@
     overflow: hidden;
   }
   .collapse-expand-action-container {
-    padding-left: 8px;
+    padding: 0 2px 0 12px;
   }
 }
 

From b26d5306e7d87b134541914ca5b5f14cf31aeaca Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Wed, 23 Dec 2015 14:10:48 +0200
Subject: [PATCH 231/471] BAP-9553 grid view fix

---
 .../Resources/public/js/datagrid/grid-views/view.js           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
index a13a47423a1..cd049a29b99 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
@@ -590,10 +590,10 @@ define([
             var currentView = this._getCurrentView();
 
             if (typeof currentView === 'undefined') {
-                return this.title ? this.title : __('Please select view');
+                return this.title ? $.trim(this.title) : __('Please select view');
             }
 
-            return currentView.label;
+            return $.trim(currentView.label);
         },
 
         /**

From f44dfac23d5705bbcc69766c43b63220d17b28e9 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Wed, 23 Dec 2015 16:13:40 +0200
Subject: [PATCH 232/471] BAP-9553 Address book fixes

---
 .../AddressBundle/Resources/public/css/less/address.less   | 4 +++-
 .../LocaleBundle/Resources/public/js/formatter/address.js  | 7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Oro/Bundle/AddressBundle/Resources/public/css/less/address.less b/src/Oro/Bundle/AddressBundle/Resources/public/css/less/address.less
index 7cca723fd0d..cfe69bda89a 100644
--- a/src/Oro/Bundle/AddressBundle/Resources/public/css/less/address.less
+++ b/src/Oro/Bundle/AddressBundle/Resources/public/css/less/address.less
@@ -36,7 +36,9 @@
     text-align: center;
   }
   .map-item {
-    cursor:pointer;
+    &:not(.active) {
+      cursor: pointer;
+    }
     address {
       margin-bottom:0;
       line-height:1.5em;
diff --git a/src/Oro/Bundle/LocaleBundle/Resources/public/js/formatter/address.js b/src/Oro/Bundle/LocaleBundle/Resources/public/js/formatter/address.js
index 2466806e2e6..39582b614c0 100644
--- a/src/Oro/Bundle/LocaleBundle/Resources/public/js/formatter/address.js
+++ b/src/Oro/Bundle/LocaleBundle/Resources/public/js/formatter/address.js
@@ -1,5 +1,5 @@
-define(['../locale-settings', './name'
-    ], function(localeSettings, nameFormatter) {
+define(['jquery', '../locale-settings', './name'
+    ], function($, localeSettings, nameFormatter) {
     'use strict';
 
     /**
@@ -52,6 +52,9 @@ define(['../locale-settings', './name'
             var addressLines = formatted
                 .replace(/ *(\\n)+/g, '\\n')
                 .split('\\n');
+            addressLines = addressLines.filter(function(element) {
+                return $.trim(element) !== '';
+            });
             if (typeof newLine === 'function') {
                 for (var i = 0; i < addressLines.length; i++) {
                     addressLines[i] = newLine(addressLines[i]);

From 7cf5b2045821735005584df20070e799d9dcc1c4 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Wed, 23 Dec 2015 16:16:21 +0200
Subject: [PATCH 233/471] BAP-9553 Address book fixes

---
 .../Bundle/LocaleBundle/Resources/public/js/formatter/address.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Oro/Bundle/LocaleBundle/Resources/public/js/formatter/address.js b/src/Oro/Bundle/LocaleBundle/Resources/public/js/formatter/address.js
index 39582b614c0..e4ec84de5fd 100644
--- a/src/Oro/Bundle/LocaleBundle/Resources/public/js/formatter/address.js
+++ b/src/Oro/Bundle/LocaleBundle/Resources/public/js/formatter/address.js
@@ -50,7 +50,6 @@ define(['jquery', '../locale-settings', './name'
             });
 
             var addressLines = formatted
-                .replace(/ *(\\n)+/g, '\\n')
                 .split('\\n');
             addressLines = addressLines.filter(function(element) {
                 return $.trim(element) !== '';

From e50a6771beccec03392e979f483a2982c1b185c4 Mon Sep 17 00:00:00 2001
From: Oleksandr Nechyporenko <onechyporenko@magecore.com>
Date: Wed, 23 Dec 2015 16:34:52 +0200
Subject: [PATCH 234/471] BB-1785: Combine form accessor with form data
 provider  - add ability to set form in options

---
 .../Layout/Block/Type/AbstractFormType.php    | 32 ++++++++++++++-----
 .../Layout/Form/FormLayoutBuilder.php         |  6 +++-
 .../Unit/Layout/Block/Type/FormTypeTest.php   |  4 +++
 .../Layout/Form/FormLayoutBuilderTest.php     | 21 ++++++------
 .../Form/GroupingFormLayoutBuilderTest.php    | 17 +++++-----
 5 files changed, 53 insertions(+), 27 deletions(-)

diff --git a/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/AbstractFormType.php b/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/AbstractFormType.php
index c4009a4332e..33199ba1f61 100644
--- a/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/AbstractFormType.php
+++ b/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/AbstractFormType.php
@@ -18,7 +18,12 @@ abstract class AbstractFormType extends AbstractType
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver
-            ->setDefaults(['form_name' => 'form'])
+            ->setDefaults(
+                [
+                    'form' => null,
+                    'form_name' => 'form',
+                ]
+            )
             ->setAllowedTypes(['form_name' => 'string']);
     }
 
@@ -36,13 +41,24 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
     protected function getFormAccessor(ContextInterface $context, array $options)
     {
         /** @var FormAccessorInterface $formAccessor */
-        $formAccessor = $context->get($options['form_name']);
-        if (!$formAccessor instanceof FormAccessorInterface) {
-            throw new UnexpectedTypeException(
-                $formAccessor,
-                'Oro\Bundle\LayoutBundle\Layout\Form\FormAccessorInterface',
-                sprintf('context[%s]', $options['form_name'])
-            );
+        if (isset($options['form'])) {
+            $formAccessor = $options['form'];
+            if (!$formAccessor instanceof FormAccessorInterface) {
+                throw new UnexpectedTypeException(
+                    $formAccessor,
+                    'Oro\Bundle\LayoutBundle\Layout\Form\FormAccessorInterface',
+                    'options[form]'
+                );
+            }
+        } else {
+            $formAccessor = $context->get($options['form_name']);
+            if (!$formAccessor instanceof FormAccessorInterface) {
+                throw new UnexpectedTypeException(
+                    $formAccessor,
+                    'Oro\Bundle\LayoutBundle\Layout\Form\FormAccessorInterface',
+                    sprintf('context[%s]', $options['form_name'])
+                );
+            }
         }
 
         return $formAccessor;
diff --git a/src/Oro/Bundle/LayoutBundle/Layout/Form/FormLayoutBuilder.php b/src/Oro/Bundle/LayoutBundle/Layout/Form/FormLayoutBuilder.php
index 73164288099..8f6a3fbdcb6 100644
--- a/src/Oro/Bundle/LayoutBundle/Layout/Form/FormLayoutBuilder.php
+++ b/src/Oro/Bundle/LayoutBundle/Layout/Form/FormLayoutBuilder.php
@@ -195,7 +195,11 @@ protected function addField($fieldPath, $id, $parentId = null)
             $id,
             $parentId ?: $this->builder->getId(),
             FormFieldType::NAME,
-            ['form_name' => $this->options['form_name'], 'field_path' => $fieldPath]
+            [
+                'form' => $this->options['form'],
+                'form_name' => $this->options['form_name'],
+                'field_path' => $fieldPath,
+            ]
         );
     }
 
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/FormTypeTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/FormTypeTest.php
index f621c6e509c..ce96a10eab9 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/FormTypeTest.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/FormTypeTest.php
@@ -28,6 +28,7 @@ public function optionsDataProvider()
             'no options'                     => [
                 'options'  => [],
                 'expected' => [
+                    'form'              => null,
                     'form_name'         => 'form',
                     'preferred_fields'  => [],
                     'groups'            => [],
@@ -41,6 +42,7 @@ public function optionsDataProvider()
                     'form_name' => 'test'
                 ],
                 'expected' => [
+                    'form'              => null,
                     'form_name'         => 'test',
                     'preferred_fields'  => [],
                     'groups'            => [],
@@ -55,6 +57,7 @@ public function optionsDataProvider()
                     'form_prefix' => 'test_prefix'
                 ],
                 'expected' => [
+                    'form'              => null,
                     'form_name'         => 'test_form',
                     'preferred_fields'  => [],
                     'groups'            => [],
@@ -73,6 +76,7 @@ public function optionsDataProvider()
                     'form_group_prefix' => 'form_group_prefix_'
                 ],
                 'expected' => [
+                    'form'              => null,
                     'form_name'         => 'test',
                     'preferred_fields'  => ['field1'],
                     'groups'            => ['group1' => ['title' => 'TestGroup']],
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Form/FormLayoutBuilderTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Form/FormLayoutBuilderTest.php
index b1af145d9ed..dd49df76bfd 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Form/FormLayoutBuilderTest.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Form/FormLayoutBuilderTest.php
@@ -69,7 +69,7 @@ public function testFlatForm()
                 self::FIELD_PREFIX . 'field1',
                 self::ROOT_ID,
                 FormFieldType::NAME,
-                ['form_name' => self::FORM_NAME, 'field_path' => 'field1']
+                ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field1']
             )
             ->will($this->returnSelf());
         $this->layoutManipulator->expects($this->at(1))
@@ -78,7 +78,7 @@ public function testFlatForm()
                 self::FIELD_PREFIX . 'field2',
                 self::ROOT_ID,
                 FormFieldType::NAME,
-                ['form_name' => self::FORM_NAME, 'field_path' => 'field2']
+                ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field2']
             )
             ->will($this->returnSelf());
         $this->layoutManipulator->expects($this->exactly(2))
@@ -110,7 +110,7 @@ public function testCompoundChildForm()
                 self::FIELD_PREFIX . 'field1:field11',
                 self::ROOT_ID,
                 FormFieldType::NAME,
-                ['form_name' => self::FORM_NAME, 'field_path' => 'field1.field11']
+                ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field1.field11']
             )
             ->will($this->returnSelf());
         $this->layoutManipulator->expects($this->at(1))
@@ -119,7 +119,7 @@ public function testCompoundChildForm()
                 self::FIELD_PREFIX . 'field2',
                 self::ROOT_ID,
                 FormFieldType::NAME,
-                ['form_name' => self::FORM_NAME, 'field_path' => 'field2']
+                ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field2']
             )
             ->will($this->returnSelf());
         $this->layoutManipulator->expects($this->exactly(2))
@@ -151,7 +151,7 @@ public function testCompoundChildFormWhichMarkedAsSimpleForm()
                 self::FIELD_PREFIX . 'field1',
                 self::ROOT_ID,
                 FormFieldType::NAME,
-                ['form_name' => self::FORM_NAME, 'field_path' => 'field1']
+                ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field1']
             )
             ->will($this->returnSelf());
         $this->layoutManipulator->expects($this->at(1))
@@ -160,7 +160,7 @@ public function testCompoundChildFormWhichMarkedAsSimpleForm()
                 self::FIELD_PREFIX . 'field2',
                 self::ROOT_ID,
                 FormFieldType::NAME,
-                ['form_name' => self::FORM_NAME, 'field_path' => 'field2']
+                ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field2']
             )
             ->will($this->returnSelf());
         $this->layoutManipulator->expects($this->exactly(2))
@@ -193,7 +193,7 @@ public function testPreferredFields()
                 self::FIELD_PREFIX . 'field2',
                 self::ROOT_ID,
                 FormFieldType::NAME,
-                ['form_name' => self::FORM_NAME, 'field_path' => 'field2']
+                ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field2']
             )
             ->will($this->returnSelf());
         $this->layoutManipulator->expects($this->at(1))
@@ -202,7 +202,7 @@ public function testPreferredFields()
                 self::FIELD_PREFIX . 'field1',
                 self::ROOT_ID,
                 FormFieldType::NAME,
-                ['form_name' => self::FORM_NAME, 'field_path' => 'field1']
+                ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field1']
             )
             ->will($this->returnSelf());
         $this->layoutManipulator->expects($this->exactly(2))
@@ -236,7 +236,7 @@ public function testPreferredCompoundFields()
                 self::FIELD_PREFIX . 'field2:field21',
                 self::ROOT_ID,
                 FormFieldType::NAME,
-                ['form_name' => self::FORM_NAME, 'field_path' => 'field2.field21']
+                ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field2.field21']
             )
             ->will($this->returnSelf());
         $this->layoutManipulator->expects($this->at(1))
@@ -245,7 +245,7 @@ public function testPreferredCompoundFields()
                 self::FIELD_PREFIX . 'field1',
                 self::ROOT_ID,
                 FormFieldType::NAME,
-                ['form_name' => self::FORM_NAME, 'field_path' => 'field1']
+                ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field1']
             )
             ->will($this->returnSelf());
         $this->layoutManipulator->expects($this->exactly(2))
@@ -296,6 +296,7 @@ protected function getForm($compound = true, $type = 'form', $name = 'some_form'
     protected function getOptions()
     {
         return [
+            'form'              => null,
             'form_name'         => self::FORM_NAME,
             'preferred_fields'  => [],
             'form_field_prefix' => self::FIELD_PREFIX,
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Form/GroupingFormLayoutBuilderTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Form/GroupingFormLayoutBuilderTest.php
index e6a4bcffbc2..f3c680d969b 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Form/GroupingFormLayoutBuilderTest.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Form/GroupingFormLayoutBuilderTest.php
@@ -102,7 +102,7 @@ public function testGrouping()
                 self::FIELD_PREFIX . 'field1',
                 self::GROUP_PREFIX . 'group2',
                 FormFieldType::NAME,
-                ['form_name' => self::FORM_NAME, 'field_path' => 'field1']
+                ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field1']
             )
             ->will($this->returnSelf());
         $this->layoutManipulator->expects($this->at(1))
@@ -111,7 +111,7 @@ public function testGrouping()
                 self::FIELD_PREFIX . 'field2:field21',
                 self::GROUP_PREFIX . 'group1',
                 FormFieldType::NAME,
-                ['form_name' => self::FORM_NAME, 'field_path' => 'field2.field21']
+                ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field2.field21']
             )
             ->will($this->returnSelf());
         $this->layoutManipulator->expects($this->at(2))
@@ -177,7 +177,7 @@ public function testGroupingWithPreferredFields()
                 self::FIELD_PREFIX . 'field2:field22',
                 self::GROUP_PREFIX . 'group1',
                 FormFieldType::NAME,
-                ['form_name' => self::FORM_NAME, 'field_path' => 'field2.field22']
+                ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field2.field22']
             )
             ->will($this->returnSelf());
         $this->layoutManipulator->expects($this->at(1))
@@ -186,7 +186,7 @@ public function testGroupingWithPreferredFields()
                 self::FIELD_PREFIX . 'field1',
                 self::GROUP_PREFIX . 'group2',
                 FormFieldType::NAME,
-                ['form_name' => self::FORM_NAME, 'field_path' => 'field1']
+                ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field1']
             )
             ->will($this->returnSelf());
         $this->layoutManipulator->expects($this->at(2))
@@ -195,7 +195,7 @@ public function testGroupingWithPreferredFields()
                 self::FIELD_PREFIX . 'field2:field21',
                 self::GROUP_PREFIX . 'group1',
                 FormFieldType::NAME,
-                ['form_name' => self::FORM_NAME, 'field_path' => 'field2.field21']
+                ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field2.field21']
             )
             ->will($this->returnSelf());
         $this->layoutManipulator->expects($this->at(3))
@@ -261,7 +261,7 @@ public function testGroupingByParentFieldPath()
                 self::FIELD_PREFIX . 'field1',
                 self::GROUP_PREFIX . 'group2',
                 FormFieldType::NAME,
-                ['form_name' => self::FORM_NAME, 'field_path' => 'field1']
+                ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field1']
             )
             ->will($this->returnSelf());
         $this->layoutManipulator->expects($this->at(1))
@@ -270,7 +270,7 @@ public function testGroupingByParentFieldPath()
                 self::FIELD_PREFIX . 'field2:field21',
                 self::GROUP_PREFIX . 'group1',
                 FormFieldType::NAME,
-                ['form_name' => self::FORM_NAME, 'field_path' => 'field2.field21']
+                ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field2.field21']
             )
             ->will($this->returnSelf());
         $this->layoutManipulator->expects($this->at(2))
@@ -279,7 +279,7 @@ public function testGroupingByParentFieldPath()
                 self::FIELD_PREFIX . 'field2:field22',
                 self::GROUP_PREFIX . 'group1',
                 FormFieldType::NAME,
-                ['form_name' => self::FORM_NAME, 'field_path' => 'field2.field22']
+                ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field2.field22']
             )
             ->will($this->returnSelf());
         $this->layoutManipulator->expects($this->at(3))
@@ -320,6 +320,7 @@ public function testGroupingByParentFieldPath()
     protected function getOptions()
     {
         return [
+            'form'              => null,
             'form_name'         => self::FORM_NAME,
             'preferred_fields'  => [],
             'groups'            => [],

From f6b640040c1edc9d77a36039c67bce076f162ca7 Mon Sep 17 00:00:00 2001
From: zebimax <zebimax@gmail.com>
Date: Wed, 23 Dec 2015 18:33:21 +0200
Subject: [PATCH 235/471] BAP-8756: Mass delete records  - clone parameters for
 delete query.

---
 .../Ajax/MassDelete/MassDeleteLimiter.php     | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/Actions/Ajax/MassDelete/MassDeleteLimiter.php b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/Actions/Ajax/MassDelete/MassDeleteLimiter.php
index 23de25a5cd9..a5a9c64bc42 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/Actions/Ajax/MassDelete/MassDeleteLimiter.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/Actions/Ajax/MassDelete/MassDeleteLimiter.php
@@ -2,6 +2,9 @@
 
 namespace Oro\Bundle\DataGridBundle\Extension\MassAction\Actions\Ajax\MassDelete;
 
+use Doctrine\ORM\Query;
+use Doctrine\ORM\QueryBuilder;
+
 use Oro\Bundle\DataGridBundle\Datasource\Orm\DeletionIterableResult;
 use Oro\Bundle\DataGridBundle\Extension\MassAction\MassActionHandlerArgs;
 use Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper;
@@ -76,12 +79,30 @@ public function limitQuery(MassDeleteLimitResult $result, MassActionHandlerArgs
      */
     public function getLimitResult(MassActionHandlerArgs $args)
     {
-        $queryBuilder       = $args->getResults()->getSource();
-        $resultsForSelected = new DeletionIterableResult($queryBuilder);
-        $deletableQuery     = clone $queryBuilder;
+        $query              = $args->getResults()->getSource();
+        $resultsForSelected = new DeletionIterableResult($query);
+        $deletableQuery     = $this->cloneQuery($query);
+
         $accessLimitedQuery = $this->aclHelper->apply($deletableQuery, 'DELETE');
         $resultsForDelete   = new DeletionIterableResult($accessLimitedQuery);
 
         return new MassDeleteLimitResult($resultsForSelected->count(), $resultsForDelete->count());
     }
+
+    /**
+     * Clones $query. Also clones parameters for Doctrine\ORM\Query case.
+     *
+     * @param Query|QueryBuilder $query
+     *
+     * @return Query|QueryBuilder
+     */
+    protected function cloneQuery($query)
+    {
+        $cloned = clone $query;
+        if ($query instanceof Query) {
+            $cloned->setParameters(clone $query->getParameters());
+        }
+
+        return $cloned;
+    }
 }

From 71eb55542c30082f08f5d7dbd103b809d9014eb4 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Wed, 23 Dec 2015 18:33:58 +0200
Subject: [PATCH 236/471] BAP-9553 Contact list on account page fixes

---
 .../Resources/public/css/less/layout.less     |  3 +++
 .../public/css/less/mobile/dashboard.less     | 19 -------------------
 .../public/css/less/mobile/layout.less        | 15 +++++++++++++++
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/layout.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/layout.less
index c0c212154c9..71ddf0e89d7 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/layout.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/layout.less
@@ -161,3 +161,6 @@
     }
   }
 }
+.responsive-cell > .oro-tabs {
+
+}
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/dashboard.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/dashboard.less
index 4e0c26d59e8..15b0719b604 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/dashboard.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/dashboard.less
@@ -42,29 +42,10 @@
   }
 }
 .box-type1 {
-  margin: 0 @contentPadding @contentPadding;
-  /*border: 1px solid #b6b6b6;*/
-  .border-radius(3px);
-  .title{
-    /*padding: @contentPadding @contentPadding @contentPadding 0;*/
-    padding: @contentPadding;
-  }
   .calendar-container {
     padding: 0;
   }
 }
-.contact-widget-wrapper{
-  padding-left: 0;
-}
-.contact-widget-wrapper{
-  .box-type1{
-    margin-left: 0;
-    margin-right: 0;
-  }
-}
-.contact-box{
-  width: 100%;
-}
 .oro-tabs{
   .pagination-container{
       .pagination{
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/layout.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/layout.less
index e2a9c2eaad7..e93b99f973b 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/layout.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/layout.less
@@ -186,3 +186,18 @@
   position: fixed;
   bottom: 0;
 }
+
+/* START: moved from oroui/mobile/dashboard.less */
+.box-type1 {
+  margin: 0 @contentPadding @contentPadding;
+  /*border: 1px solid #b6b6b6;*/
+  .border-radius(3px);
+  .title{
+    /*padding: @contentPadding @contentPadding @contentPadding 0;*/
+    padding: @contentPadding;
+  }
+  .calendar-container {
+    padding: 0;
+  }
+}
+/* END: moved from oroui/mobile/dashboard.less */

From 4afe35c6a751a5f35b6f71ec9a1a8a5a6df0cbf5 Mon Sep 17 00:00:00 2001
From: Mykhailo Sulyma <msulima@magecore.com>
Date: Wed, 23 Dec 2015 21:06:08 +0200
Subject: [PATCH 237/471] BB-1777: Action Improvements  - added merge component
  - rename action`s configuration parameters  - added action diagram

---
 .../Config/Merger/ConfigurationMerger.php     | 155 ++++++++++
 .../Unit/Merger/ConfigurationMergerTest.php   | 283 ++++++++++++++++++
 2 files changed, 438 insertions(+)
 create mode 100644 src/Oro/Component/Config/Merger/ConfigurationMerger.php
 create mode 100644 src/Oro/Component/Config/Tests/Unit/Merger/ConfigurationMergerTest.php

diff --git a/src/Oro/Component/Config/Merger/ConfigurationMerger.php b/src/Oro/Component/Config/Merger/ConfigurationMerger.php
new file mode 100644
index 00000000000..9771f9c512c
--- /dev/null
+++ b/src/Oro/Component/Config/Merger/ConfigurationMerger.php
@@ -0,0 +1,155 @@
+<?php
+
+namespace Oro\Component\Config\Merger;
+
+use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
+
+use Oro\Bundle\UIBundle\Tools\ArrayUtils;
+
+class ConfigurationMerger
+{
+    const EXTENDS_NODE_NAME = 'extends';
+    const REPLACES_NODE_NAME = 'replace';
+
+    /** @var array */
+    protected $kernelBundles;
+
+    /** @var array */
+    protected $processedConfigs = [];
+
+    /**
+     * @param array $kernelBundles Must be passed value of container`s parameter %kernel.bundles%
+     */
+    public function __construct(array $kernelBundles)
+    {
+        $this->kernelBundles = array_values($kernelBundles);
+    }
+
+    /**
+     * @param array $rawConfigurationByBundles
+     * @return array
+     */
+    public function mergeConfiguration(array $rawConfigurationByBundles)
+    {
+        $configs = $this->prepareRawConfiguration($rawConfigurationByBundles);
+
+        foreach ($configs as $actionName => $actionConfigs) {
+            $data = array_shift($actionConfigs);
+
+            foreach ($actionConfigs as $config) {
+                $data = $this->merge($data, $config);
+            }
+
+            $configs[$actionName] = (array)$data;
+        }
+
+        foreach ($configs as $actionName => &$actionConfig) {
+            $this->resolveExtends($configs, $actionConfig, $actionName);
+        }
+
+        return $configs;
+    }
+
+    /**
+     * @param array $rawConfigurationByBundles
+     * @return array
+     */
+    protected function prepareRawConfiguration(array $rawConfigurationByBundles)
+    {
+        $actionConfigs = [];
+
+        foreach ($rawConfigurationByBundles as $bundle => $actions) {
+            $bundleNumber = array_search($bundle, $this->kernelBundles, true);
+
+            if ($bundleNumber === false) {
+                continue;
+            }
+
+            foreach ($actions as $actionName => $config) {
+                $actionConfigs[$actionName][$bundleNumber] = $config;
+            }
+        }
+
+        return array_map(
+            function ($configs) {
+                ksort($configs);
+                return $configs;
+            },
+            $actionConfigs
+        );
+    }
+
+    /**
+     * @param array $data
+     * @param array $config
+     * @return array
+     */
+    protected function merge(array $data, array $config)
+    {
+        $replaces = empty($config[self::REPLACES_NODE_NAME]) ? [] : (array)$config[self::REPLACES_NODE_NAME];
+        unset($data[self::REPLACES_NODE_NAME], $config[self::REPLACES_NODE_NAME]);
+
+        foreach ($replaces as $key) {
+            if (empty($config[$key])) {
+                unset($data[$key]);
+            } else {
+                $data[$key] = $config[$key];
+                unset($config[$key]);
+            }
+        }
+
+        foreach ($config as $key => $value) {
+            if (is_int($key)) {
+                $data[] = $value;
+            } else {
+                if (!array_key_exists($key, $data)) {
+                    $data[$key] = $value;
+                } else {
+                    if (is_array($value)) {
+                        $data[$key] = $this->merge($data[$key], $value);
+                    } else {
+                        $data[$key] = $value;
+                    }
+                }
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param array $configs
+     * @param array $config
+     * @param string $actionName
+     * @throws InvalidConfigurationException
+     */
+    protected function resolveExtends(array &$configs, array &$config, $actionName)
+    {
+        $this->processedConfigs[] = $actionName;
+
+        if (!array_key_exists(self::EXTENDS_NODE_NAME, $config) || empty($config[self::EXTENDS_NODE_NAME])) {
+            return;
+        }
+
+        $extends = $config[self::EXTENDS_NODE_NAME];
+        if (!array_key_exists($extends, $configs)) {
+            throw new InvalidConfigurationException(
+                sprintf('Could not found configuration of %s for dependant configuration %s.', $extends, $actionName)
+            );
+        }
+
+        $extendsConfig = &$configs[$extends];
+        if (array_key_exists(self::EXTENDS_NODE_NAME, $extendsConfig)) {
+            if (in_array($extends, $this->processedConfigs, true)) {
+                throw new InvalidConfigurationException(
+                    sprintf('Found circular "extends" references %s and %s configurations.', $extends, $actionName)
+                );
+            }
+
+            $this->resolveExtends($configs, $extendsConfig, $extends);
+        }
+
+        $config = ArrayUtils::arrayMergeRecursiveDistinct($extendsConfig, $config);
+        unset($config[self::EXTENDS_NODE_NAME]);
+    }
+}
diff --git a/src/Oro/Component/Config/Tests/Unit/Merger/ConfigurationMergerTest.php b/src/Oro/Component/Config/Tests/Unit/Merger/ConfigurationMergerTest.php
new file mode 100644
index 00000000000..87cf74ed769
--- /dev/null
+++ b/src/Oro/Component/Config/Tests/Unit/Merger/ConfigurationMergerTest.php
@@ -0,0 +1,283 @@
+<?php
+
+namespace Oro\Component\Config\Tests\Unit\Merger;
+
+use Oro\Component\Config\Merger\ConfigurationMerger;
+
+class ConfigurationMergerTest extends \PHPUnit_Framework_TestCase
+{
+    const BUNDLE1 = 'Oro\Bundle\TestBundle1\TestBundle1';
+    const BUNDLE2 = 'Oro\Bundle\TestBundle1\TestBundle2';
+    const BUNDLE3 = 'Oro\Bundle\TestBundle1\TestBundle3';
+
+    /** @var ConfigurationMerger */
+    protected $merger;
+
+    protected function setUp()
+    {
+        $this->merger = new ConfigurationMerger([self::BUNDLE1, self::BUNDLE2, self::BUNDLE3]);
+    }
+
+    /**
+     * @dataProvider mergeConfigurationDataProvider
+     *
+     * @param array $rawConfig
+     * @param array $expected
+     */
+    public function testMergeConfiguration(array $rawConfig, array $expected)
+    {
+        $configs = $this->merger->mergeConfiguration($rawConfig);
+
+        $this->assertInternalType('array', $configs);
+        $this->assertEquals($expected, $configs);
+    }
+
+    /**
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function mergeConfigurationDataProvider()
+    {
+        return [
+            'merge configuration from bundles' => [
+                'rawConfig' => [
+                    self::BUNDLE1 => [
+                        'test_config' => [
+                            'label' => 'Test Config',
+                            'params' => ['test_param_bundle1']
+                        ]
+                    ],
+                    self::BUNDLE2 => [
+                        'test_config' => [
+                            'label' => 'Test Config Replaced',
+                            'params' => ['test_param_bundle2' => 'data']
+                        ]
+                    ]
+                ],
+                'expected' => [
+                    'test_config' => [
+                        'label' => 'Test Config Replaced',
+                        'params' => ['test_param_bundle1', 'test_param_bundle2' => 'data']
+                    ]
+                ]
+            ],
+            'merge configuration from bundles with replace' => [
+                'rawConfig' => [
+                    self::BUNDLE1 => [
+                        'test_config' => [
+                            'label' => 'Test Config',
+                            'params' => ['test_param_bundle1'],
+                            'array' => [
+                                'single_param' => 'value',
+                                'sub_array' => [
+                                    'param_name' => 'param_value'
+                                ]
+                            ]
+                        ]
+                    ],
+                    self::BUNDLE2 => [
+                        'test_config' => [
+                            'replace' => ['params'],
+                            'params' => ['test_param_bundle2' => 'data'],
+                            'array' => [
+                                'replace' => ['sub_array'],
+                                'sub_array' => [
+                                    'replaced_param_name' => 'replaced_param_value'
+                                ]
+                            ]
+                        ]
+                    ]
+                ],
+                'expected' => [
+                    'test_config' => [
+                        'label' => 'Test Config',
+                        'params' => ['test_param_bundle2' => 'data'],
+                        'array' => [
+                            'single_param' => 'value',
+                            'sub_array' => [
+                                'replaced_param_name' => 'replaced_param_value'
+                            ]
+                        ]
+                    ]
+                ]
+            ],
+            'config with unknown bundle' => [
+                'rawConfig' => [
+                    self::BUNDLE1 => [
+                        'test_config' => ['configurations']
+                    ],
+                    'UnknownBundle' => [
+                        'test_config' => 'test'
+                    ]
+                ],
+                'expected' => [
+                    'test_config' => ['configurations']
+                ]
+            ],
+            'config inheritance' => [
+                'rawConfig' => [
+                    self::BUNDLE1 => [
+                        'test_config' => [
+                            'label' => 'test label',
+                            'params' => [
+                                'param1' => 'value1'
+                            ]
+                        ],
+                        'test_config_extended' => [
+                            'extends' => 'test_config',
+                            'params' => [
+                                'param2' => 'value2'
+                            ]
+                        ]
+                    ]
+                ],
+                'expected' => [
+                    'test_config' => [
+                        'label' => 'test label',
+                        'params' => [
+                            'param1' => 'value1'
+                        ]
+                    ],
+                    'test_config_extended' => [
+                        'label' => 'test label',
+                        'params' => [
+                            'param1' => 'value1',
+                            'param2' => 'value2'
+                        ]
+                    ]
+                ]
+            ],
+            'all cases' => [
+                [
+                    self::BUNDLE1 => [
+                        'test_config1' => [
+                            'label' => 'Test Config1',
+                            'replace' => ['test'],
+                            'params' => ['test_param_bundle1']
+                        ],
+                        'test_config2' => [
+                            'extends' => 'test_config1'
+                        ],
+                        'test_config4' => [
+                            'label' => 'Test Config1',
+                            'some_config' => [
+                                'sub_config1' => 'data1',
+                                'sub_config2' => 'data2',
+                                'sub_config3' => 'data3',
+                            ]
+                        ]
+                    ],
+                    self::BUNDLE2 => [
+                        'test_config1' => [
+                            'replace' => ['params'],
+                        ],
+                        'test_config4' => [
+                            'label' => 'Test Config4',
+                            'some_config' => [
+                                'replace' => ['sub_config1', 'sub_config3'],
+                                'sub_config3' => 'replaced data'
+                            ]
+                        ]
+                    ],
+                    self::BUNDLE3 => [
+                        'test_config1' => [
+                            'replace' => ['params'],
+                            'params' => ['test_param_bundle3']
+                        ],
+                        'test_config2' => [
+                            'label' => 'Test Config2 Bundle3',
+                            'extends' => 'test_config1',
+                        ],
+                        'test_config3' => [
+                            'extends' => 'test_config2',
+                            'params' => ['test_param_bundle3_new']
+                        ]
+                    ],
+                    'UnknownBundle' => [
+                        'test_config1' => [
+                            'replace' => ['params'],
+                            'params' => ['test_param_bundle3']
+                        ]
+                    ]
+                ],
+                [
+                    'test_config1' => [
+                        'label' => 'Test Config1',
+                        'params' => ['test_param_bundle3']
+                    ],
+                    'test_config2' => [
+                        'label' => 'Test Config2 Bundle3',
+                        'params' => ['test_param_bundle3']
+                    ],
+                    'test_config4' => [
+                        'label' => 'Test Config4',
+                        'some_config' => ['sub_config2' => 'data2', 'sub_config3' => 'replaced data']
+                    ],
+                    'test_config3' => [
+                        'label' => 'Test Config2 Bundle3',
+                        'params' => ['test_param_bundle3', 'test_param_bundle3_new']
+                    ]
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * @dataProvider mergeConfigurationExceptionDataProvider
+     *
+     * @param array $rawConfig
+     * @param string $expectedMessage
+     */
+    public function testMergeConfigurationException(array $rawConfig, $expectedMessage)
+    {
+        $this->setExpectedException(
+            'Symfony\Component\Config\Definition\Exception\InvalidConfigurationException',
+            $expectedMessage
+        );
+
+        $this->merger->mergeConfiguration($rawConfig);
+    }
+
+    /**
+     * @return array
+     */
+    public function mergeConfigurationExceptionDataProvider()
+    {
+        return [
+            [
+                [
+                    self::BUNDLE1 => [
+                        'test_config1' => [
+                            'label' => 'Test Config1',
+                            'extends' => 'test_config3',
+                        ]
+                    ],
+                    self::BUNDLE2 => [
+                        'test_config2' => [
+                            'label' => 'Test Config2',
+                            'extends' => 'test_config1',
+                        ]
+                    ],
+                    self::BUNDLE3 => [
+                        'test_config3' => [
+                            'label' => 'Test Config3',
+                            'extends' => 'test_config2',
+                        ]
+                    ]
+                ],
+                'Found circular "extends" references test_config1 and test_config2 configurations.'
+            ],
+            [
+                [
+                    self::BUNDLE2 => [
+                        'test_config2' => [
+                            'label' => 'Test Config2',
+                            'extends' => 'test_config1',
+                        ]
+                    ]
+                ],
+                'Could not found configuration of test_config1 for dependant configuration test_config2.'
+            ]
+        ];
+    }
+}

From 1f4bc981ed6ffff00adacb44e80f9919d1ba0e72 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Thu, 24 Dec 2015 12:15:25 +0200
Subject: [PATCH 238/471] BAP-9553 Activity list design fixes

---
 .../Resources/public/css/less/activity-list.less    |  8 ++++----
 .../Resources/public/css/less/style.less            | 13 +++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/Oro/Bundle/ActivityListBundle/Resources/public/css/less/activity-list.less b/src/Oro/Bundle/ActivityListBundle/Resources/public/css/less/activity-list.less
index b8329d31588..9e5b65c28d5 100644
--- a/src/Oro/Bundle/ActivityListBundle/Resources/public/css/less/activity-list.less
+++ b/src/Oro/Bundle/ActivityListBundle/Resources/public/css/less/activity-list.less
@@ -131,7 +131,7 @@
       width: 27px;
       font-size: 18px;
       color: #999;
-      margin: 8px 0 0 10px;
+      margin: 8px 6px 0 8px;
     }
 
     > .actions{
@@ -141,7 +141,7 @@
       .horizontal-icon-menu;
     }
     > .details {
-      margin: 7px 7px 0 0;
+      margin: 9px 7px 0 0;
       max-width: 247px;
       min-width: 247px;
       padding-bottom: 1px;
@@ -154,7 +154,7 @@
     }
     > .created-at {
       float: right;
-      margin: 7px 0 -1px 8px;
+      margin: 8px 0 -1px 8px;
       color: #888;
     }
     > .comment-count {
@@ -162,7 +162,7 @@
       margin-top: 8px;
     }
     > .message-item {
-      margin: 7px 0 0 0;
+      margin: 9px 0 0 0;
       float: left;
       width: calc(~"100% - 510px");
       color: #888;
diff --git a/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less b/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less
index 3c0fc246a9c..fb6db1be071 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less
+++ b/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less
@@ -433,6 +433,7 @@ span.icon.grid .icon-paperclip {
     .responsive-cell {
       padding-left: 0;
       padding-right: 15px;
+      margin-bottom: 0 !important; /* overrides activity list widget styles */
     }
     .responsive-cell:only-child,
     .responsive-cell:last-child {
@@ -444,6 +445,18 @@ span.icon.grid .icon-paperclip {
       padding-right: 0;
     }
   }
+  &.responsive-small {
+    .email-content {
+      .responsive-cell:not(:last-child) {
+        margin-bottom: 20px !important; /* overrides activity list widget styles */
+      }
+    }
+  }
+}
+.accordion-body .email-info {
+  &:last-child .email-content {
+    padding-bottom: 0;
+  }
 }
 
 .email-detailed-info-table {

From 23202c5ee043f12347e20bbe072a5b1a188cf8f7 Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Thu, 24 Dec 2015 12:28:44 +0200
Subject: [PATCH 239/471] CRM-4828: fix code style

---
 .../WindowsBundle/Resources/public/js/widget/dialog-widget.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/WindowsBundle/Resources/public/js/widget/dialog-widget.js b/src/Oro/Bundle/WindowsBundle/Resources/public/js/widget/dialog-widget.js
index 6daf72f6f7d..b9056b85f64 100644
--- a/src/Oro/Bundle/WindowsBundle/Resources/public/js/widget/dialog-widget.js
+++ b/src/Oro/Bundle/WindowsBundle/Resources/public/js/widget/dialog-widget.js
@@ -47,7 +47,7 @@ define(function(require) {
         _isEmbedded: false,
 
         events: {
-                'content:changed': 'resetDialogPosition'
+            'content:changed': 'resetDialogPosition'
         },
 
         listen: {

From 9c46d5656e0781f53a8c213f57dada5f360088a3 Mon Sep 17 00:00:00 2001
From: Oleksandr Nechyporenko <onechyporenko@magecore.com>
Date: Thu, 24 Dec 2015 13:38:01 +0200
Subject: [PATCH 240/471] BB-1785: Combine form accessor with form data
 provider  - fix tests

---
 .../views/Layout/div_layout.html.twig         |  2 +-
 .../views/Layout/php/input_widget.html.php    |  3 +++
 .../Tests/Functional/RendererTest.php         | 19 +------------------
 3 files changed, 5 insertions(+), 19 deletions(-)
 create mode 100644 src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/input_widget.html.php

diff --git a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
index afdb78a125b..b9e83f60ad6 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
+++ b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/div_layout.html.twig
@@ -44,7 +44,7 @@
             placeholder: attr.placeholder|block_text(translation_domain)
         }) %}
     {% endif %}
-    <input {{ block_widget(block, {attr: attr}) }} />
+    <input{{ block('block_attributes') }}/>
 {%- endblock %}
 
 {% block container_widget -%}
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/input_widget.html.php b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/input_widget.html.php
new file mode 100644
index 00000000000..fb8065fdc43
--- /dev/null
+++ b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/input_widget.html.php
@@ -0,0 +1,3 @@
+<?php //@codingStandardsIgnoreFile ?>
+<?php if (isset($attr['placeholder'])) $attr['placeholder'] = $view['layout']->text($attr['placeholder'], $translation_domain); ?>
+<input <?php echo $view['layout']->block($block, 'block_attributes') ?>/>
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Functional/RendererTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Functional/RendererTest.php
index 0643a83aac8..c7bdf4be570 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Functional/RendererTest.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Functional/RendererTest.php
@@ -156,7 +156,6 @@ protected function getCoreBlocksTestLayout(ContextInterface $context)
             )
             ->add('external_resource', 'head', 'external_resource', ['href' => 'test.css', 'rel' => 'stylesheet'])
             ->add('content', 'root', 'body', ['class_prefix' => 'content'])
-            ->add('top_content', 'content', 'html', ['text' => '<header>Renderer <b>Test</b>!</header>'])
             ->add('list', 'content', 'list')
             ->add(
                 'list_item_1',
@@ -280,20 +279,6 @@ protected function getCoreBlocksTestLayout(ContextInterface $context)
                 ['name' => 'search'],
                 'button'
             )
-            ->add(
-                'block_tag',
-                'content',
-                'block',
-                [
-                    'tag' => 'input',
-                    'attr' => [
-                        'type' => 'button',
-                        'value' => 'Block button',
-                        'class' => '{{ class_prefix }}_input',
-                    ]
-                ],
-                'button'
-            )
             // test manipulations of 'class' attribute
             ->appendOption('content', 'attr.class', ['@join' => [' ', 'class1', 'class2']])
             ->replaceOption('content', 'attr.class', 'class1', ['@value' => ['$context.body_class']])
@@ -352,10 +337,8 @@ protected function getCoreBlocksTestLayoutResult($formLayout)
     </head>
 <body class="test-body class2">
     <button name="btn1"><i class="icon-plus hide-text"></i>Btn1</button>
-    <input type="button" value="Block button" class="content_input"></input>
-    <input type="text" name="search"></input>
+    <input type="text" name="search"/>
     <input type="submit" name="btn2" value="Btn2"/>
-    <header>Renderer <b>Test</b>!</header>
     <ul>
         <li>Hi World!</li>
         <li class="list-item-2"><a href="http://example.com">Hi World!</a></li>

From 7f2e7dabbf3fff5853850792b5b9fd95b51d18ae Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Thu, 24 Dec 2015 13:54:52 +0200
Subject: [PATCH 241/471] BAP-9553 Mobile page header fixes

---
 .../public/css/inline-editable-wrapper.less   | 11 +++++++
 .../public/css/less/mobile/page-header.less   | 32 ++++++++++---------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/Oro/Bundle/FormBundle/Resources/public/css/inline-editable-wrapper.less b/src/Oro/Bundle/FormBundle/Resources/public/css/inline-editable-wrapper.less
index 2a28502e1e4..48551c1a976 100644
--- a/src/Oro/Bundle/FormBundle/Resources/public/css/inline-editable-wrapper.less
+++ b/src/Oro/Bundle/FormBundle/Resources/public/css/inline-editable-wrapper.less
@@ -15,6 +15,17 @@
     box-shadow: 0 2px 5px rgba(0,0,0,0.2);
   }
 }
+.mobile-version .inline-editable-wrapper:not(.loading) .inline-editable-wrapper__start-editing-button {
+  display: block !important;
+  background-color: #f7f7f7;
+  background-image: -moz-linear-gradient(top,#fdfdfd,#efefef);
+  background-image: -webkit-gradient(linear,0 0,0 100%,from(#fdfdfd),to(#efefef));
+  background-image: -webkit-linear-gradient(top,#fdfdfd,#efefef);
+  background-image: -o-linear-gradient(top,#fdfdfd,#efefef);
+  background-image: linear-gradient(to bottom,#fdfdfd,#efefef);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd', endColorstr='#ffefefef', GradientType=0);
+}
 .inline-editable-wrapper {
   &.save-success .inline-editable-container{
     background: #F4FEE2;
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/page-header.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/page-header.less
index 0c669fe55e9..90bd5909f39 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/page-header.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/page-header.less
@@ -10,6 +10,10 @@
   padding-right: 0;
   padding-left: 0;
 }
+.page-title h1 {
+  line-height: @fontSizeLarge * 2;
+  margin: 0;
+}
 .navbar-extra {
   .container-fluid.page-title;
   & > .row > [class^=span] {
@@ -25,11 +29,6 @@
   .user-info-state + .title-buttons-container:not(:empty) {
     margin-top: 10px;
   }
-  .pull-left{
-    .oro-subtitle{
-      margin: 8px 0 0;
-    }
-  }
   .pull-left-extra{
     margin-left: 0;
   }
@@ -41,9 +40,13 @@
     .views-group>.dropdown-toggle {
       height: auto;
     }
+    .actions-group {
+      line-height: 35px;
+    }
     .actions-group+.edited-label,
     .actions-group .dropdown-toggle {
-      height: 28px;
+      line-height: 35px;
+      vertical-align: top;
       &:after {
         content: '';
         font-size: 20px;
@@ -83,7 +86,6 @@
 }
 
 .title-buttons-container, .ui-dialog-buttonpane .widget-actions {
-  margin-top: 5px;
   .btn [class*=icon-].hide-text,
   .btn-group > .dropdown-menu li [class^=icon-] {
     width: 20px;
@@ -99,22 +101,22 @@
   }
   .btn {
     font-size: @fontSizeLarge;
-    line-height: @fontSizeLarge * 1.8;
+    line-height: @fontSizeLarge * 2;
     height: 34px;
     padding-left: 14px;
     padding-right: 14px;
     .caret {
       border-top-color: #666;
-      margin-top: 15px;
-    }
-    &:active .cater{
-      border-top-color: #444;
+      margin-top: 16px;
     }
     [class^=icon-].hide-text:before {
-      margin: 7px 0 0 -9px;
+      margin: 0 0 0 -9px;
+      line-height: 35px;
     }
-    &:active [class^=icon-]:before {
-      color: #444;
+    &:active {
+      [class^=icon-]:before, .caret {
+        color: #444;
+      }
     }
   }
   .btn-group > .dropdown-menu {

From 272402426a5eee2934a2a2e4050144a1c8294d08 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Thu, 24 Dec 2015 13:57:00 +0200
Subject: [PATCH 242/471] BAP-9553 Mobile page header fixes

---
 .../Resources/public/css/less/mobile/page-header.less         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/page-header.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/page-header.less
index 90bd5909f39..2cf6ea074ad 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/page-header.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/page-header.less
@@ -41,11 +41,11 @@
       height: auto;
     }
     .actions-group {
-      line-height: 35px;
+      line-height: @fontSizeLarge * 2;
     }
     .actions-group+.edited-label,
     .actions-group .dropdown-toggle {
-      line-height: 35px;
+      line-height: @fontSizeLarge * 2;
       vertical-align: top;
       &:after {
         content: '';

From 99a29c55c876d86c7339db0bb1e9f05e792560f7 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Thu, 24 Dec 2015 14:51:37 +0200
Subject: [PATCH 243/471] BAP-9553 Activity list and grid toolbar fixes

---
 .../Resources/public/css/less/activity-list.less          | 2 +-
 .../views/ActivityList/widget/activities.html.twig        | 2 +-
 .../Resources/public/css/less/mobile/grid-toolbar.less    | 2 +-
 .../Resources/public/js/filter/empty-filter.js            | 1 +
 .../Resources/public/css/less/mobile/dashboard.less       | 8 +++++---
 .../UIBundle/Resources/public/css/less/oro/datagrid.less  | 8 +++++---
 6 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/Oro/Bundle/ActivityListBundle/Resources/public/css/less/activity-list.less b/src/Oro/Bundle/ActivityListBundle/Resources/public/css/less/activity-list.less
index b8329d31588..2d2db7fc8a2 100644
--- a/src/Oro/Bundle/ActivityListBundle/Resources/public/css/less/activity-list.less
+++ b/src/Oro/Bundle/ActivityListBundle/Resources/public/css/less/activity-list.less
@@ -162,7 +162,7 @@
       margin-top: 8px;
     }
     > .message-item {
-      margin: 7px 0 0 0;
+      margin: 7px 0 7px 0;
       float: left;
       width: calc(~"100% - 510px");
       color: #888;
diff --git a/src/Oro/Bundle/ActivityListBundle/Resources/views/ActivityList/widget/activities.html.twig b/src/Oro/Bundle/ActivityListBundle/Resources/views/ActivityList/widget/activities.html.twig
index 85d81461b60..9297614e60a 100644
--- a/src/Oro/Bundle/ActivityListBundle/Resources/views/ActivityList/widget/activities.html.twig
+++ b/src/Oro/Bundle/ActivityListBundle/Resources/views/ActivityList/widget/activities.html.twig
@@ -20,7 +20,7 @@
                 </div>
             </div>
             <div class="pull-right">
-                <div class="btn-group actions-panel">
+                <div class="actions-panel">
                     {{ UI.clientLink({
                         'aCss': 'action btn',
                         'iCss': 'icon-refresh',
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/mobile/grid-toolbar.less b/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/mobile/grid-toolbar.less
index 23be254a816..3ebf11a7081 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/mobile/grid-toolbar.less
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/mobile/grid-toolbar.less
@@ -25,8 +25,8 @@
     a.action.btn {
       .forScreen(400px, display, none);
       i {
-        font-size: 14px;
         &:before {
+          font-size: 14px;
           line-height: 30px;
         }
       }
diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/empty-filter.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/empty-filter.js
index fa7ef12edd8..6d82e6bc2c3 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/empty-filter.js
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/empty-filter.js
@@ -157,6 +157,7 @@ define([
          */
         _onClickCriteriaSelector: function(e) {
             e.stopPropagation();
+            e.preventDefault();
             $('body').trigger('click');
             if (!this.popupCriteriaShowed) {
                 this._showCriteria();
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/dashboard.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/dashboard.less
index 4e0c26d59e8..3a8f98e44f3 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/dashboard.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/dashboard.less
@@ -46,8 +46,7 @@
   /*border: 1px solid #b6b6b6;*/
   .border-radius(3px);
   .title{
-    /*padding: @contentPadding @contentPadding @contentPadding 0;*/
-    padding: @contentPadding;
+    padding: @contentPadding @contentPadding @contentPadding 0;
   }
   .calendar-container {
     padding: 0;
@@ -62,8 +61,11 @@
     margin-right: 0;
   }
 }
+.contact-box-wrapper{
+  padding: 0;
+}
 .contact-box{
-  width: 100%;
+  width: calc(~"100% - 20px");
 }
 .oro-tabs{
   .pagination-container{
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/datagrid.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/datagrid.less
index 601c198ca64..0bb7cf517a3 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/datagrid.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/datagrid.less
@@ -69,14 +69,16 @@
       padding-top: 7px;
     }
   }
+  .action.btn {
+    border-color:#ccc;
+    line-height:26px;
+    font-size:12px;
+  }
   .btn-group {
     .btn {
-      border-color:#ccc;
       height:27px;
       padding-left:7px;
       padding-right:9px;
-      line-height:26px;
-      font-size:12px;
       [class^='icon-'] {
         &:before {
           display:inline-block;

From 35efb107e3cf5409fef9b6422069d001dc188474 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Thu, 24 Dec 2015 16:14:47 +0200
Subject: [PATCH 244/471] BAP-9553 Emails markup on mobile

---
 .../Bundle/EmailBundle/Resources/public/css/less/style.less | 4 ++++
 .../UIBundle/Resources/public/css/less/mobile/layout.less   | 3 +++
 .../Resources/public/css/less/mobile/page-header.less       | 6 ++++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less b/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less
index 3c0fc246a9c..31a8ed52c4b 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less
+++ b/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less
@@ -291,6 +291,10 @@ span.icon.grid .icon-paperclip {
   }
 }
 
+&.mobile-version .box-type1 > .row-fluid > .widget-content > .thread-view {
+  padding-left: 0;
+}
+
 .email-thread-action-panel {
   .email-view-toggle-all {
     color: #888;
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/layout.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/layout.less
index e2a9c2eaad7..157db2c4357 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/layout.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/layout.less
@@ -50,6 +50,9 @@
     padding-right: @contentPadding;
   }
 }
+.scrollspy.container-fluid, .page-title + [data-bound-component="orodatagrid/js/app/components/datagrid-component"]  {
+  margin-top: -10px;
+}
 .layout-content .responsive-section{
   padding: 0;
   .form-horizontal {
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/page-header.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/page-header.less
index 0c669fe55e9..51d55416b2e 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/page-header.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/page-header.less
@@ -5,13 +5,15 @@
   float: left;
 }
 .breadcrumb-pin,
-.container-fluid.page-title {
+.container-fluid.page-title, .navbar-extra {
   background-color: #f1f1f1;
   padding-right: 0;
   padding-left: 0;
 }
+.container-fluid.page-title {
+  margin-bottom: 10px;
+}
 .navbar-extra {
-  .container-fluid.page-title;
   & > .row > [class^=span] {
     margin: 0;
     width: auto;

From 7831539d1babdf063463e3b6d2a66c246cbeb222 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Thu, 24 Dec 2015 16:35:14 +0200
Subject: [PATCH 245/471] BAP-9553 Emails markup on mobile

---
 .../Resources/public/css/less/style.less      | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less b/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less
index 31a8ed52c4b..d5a9da4e1b1 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less
+++ b/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less
@@ -717,3 +717,22 @@ a.sync-btn span.dots {
 .check-connection-messages {
     width: 294px;
 }
+
+&.mobile-version {
+  .email-view-toggle > .pull-right > .pull-left {
+    margin: 0 5px 5px 0;
+  }
+  .email-info .email-participants {
+    margin-right: 0;
+    float: left;
+  }
+  .email-info .email-short {
+    .email-sent-date {
+      padding: 0
+    }
+    .email-body {
+      margin: 2px 0 0 0;
+      clear: both;
+    }
+  }
+}

From 54b6bcf8c6bc70938a73afa7ac37b0c01dc23883 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Thu, 24 Dec 2015 16:40:33 +0200
Subject: [PATCH 246/471] BAP-8756: Mass delete records  - Change max delete
 records count

---
 .../MassAction/Actions/Ajax/MassDelete/MassDeleteLimiter.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/Actions/Ajax/MassDelete/MassDeleteLimiter.php b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/Actions/Ajax/MassDelete/MassDeleteLimiter.php
index a5a9c64bc42..b555d6912c3 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/Actions/Ajax/MassDelete/MassDeleteLimiter.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/Actions/Ajax/MassDelete/MassDeleteLimiter.php
@@ -15,7 +15,7 @@ class MassDeleteLimiter
     const LIMIT_ACCESS             = 2;
     const LIMIT_MAX_RECORDS        = 3;
     const LIMIT_ACCESS_MAX_RECORDS = 4;
-    const MAX_DELETE_RECORDS       = 1000;
+    const MAX_DELETE_RECORDS       = 5000;
 
     /** @var AclHelper */
     protected $aclHelper;

From 6eea4a859dda2506cc9d5c67fcadb912066d193f Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Thu, 24 Dec 2015 16:47:13 +0200
Subject: [PATCH 247/471] BAP-8756: Mass delete records  - Fix code styles

---
 .../public/js/datagrid/action/delete-mass-action.js          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 37a5cd342d9..abf5a587915 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
@@ -105,7 +105,10 @@ define([
                     if (data.deletable >= data.selected) {
                         this.confirmMessage = __(this.confirmMessages.selected_message, {selected: data.selected});
                     } else {
-                        this.confirmMessage = __(this.confirmMessages.restricted_access_message, {deletable: data.deletable, selected: data.selected});
+                        this.confirmMessage = __(this.confirmMessages.restricted_access_message, {
+                            deletable: data.deletable,
+                            selected: data.selected
+                        });
                     }
                 } else {
                     this.confirmMessage = __(this.confirmMessages.max_limit_message, {max_limit: data.max_limit});

From 34cdf02304f98edba007fd4f2d570f30b3450f11 Mon Sep 17 00:00:00 2001
From: Ivan Klymenko <iklymenko@magecore.com>
Date: Thu, 24 Dec 2015 17:16:12 +0200
Subject: [PATCH 248/471] BAP-9606: Back merge Travis optimization config - set
 phpCS version for Travis - added Travis CI build icon

---
 .travis.yml | 1 +
 README.md   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 066b99df524..960b2218c35 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ php:
 
 env:
   - SYMFONY_VERSION=2.7.*
+  - PHPCS_VERSION=2.3.3
 
 cache:
   directories:
diff --git a/README.md b/README.md
index a9ef7ed1c33..94bf205e296 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ by combining the tools they need. Built in PHP5 and the Symfony2 framework, it s
 into [OroCRM](http://www.orocrm.com/) or works entirely standalone.
 Developing custom business applications has never been so easy.
 
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/orocrm/platform/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/orocrm/platform/?branch=master)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/orocrm/platform/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/orocrm/platform/?branch=master) [![Travis CI build status](https://travis-ci.org/orocrm/platform.svg?branch=master)](https://travis-ci.org/orocrm/platform)
 
 ## Installation
 

From 390e445d9096405b29d8062e9b7d1130b99151c6 Mon Sep 17 00:00:00 2001
From: zebimax <zebimax@gmail.com>
Date: Thu, 24 Dec 2015 17:18:05 +0200
Subject: [PATCH 249/471] BAP-9576: Add field 'default' to GridView  - add
 relation to grid view to users who have chosen this grid view as default

---
 .../Bundle/DataGridBundle/Entity/GridView.php | 73 ++++++++++++++++---
 .../Schema/OroDataGridBundleInstaller.php     |  4 +-
 .../v1_2/DefaultGridViewUsersRelation.php     | 44 +++++++++++
 3 files changed, 111 insertions(+), 10 deletions(-)
 create mode 100644 src/Oro/Bundle/DataGridBundle/Migrations/Schema/v1_2/DefaultGridViewUsersRelation.php

diff --git a/src/Oro/Bundle/DataGridBundle/Entity/GridView.php b/src/Oro/Bundle/DataGridBundle/Entity/GridView.php
index a7c23ac2649..a56e7fcf521 100644
--- a/src/Oro/Bundle/DataGridBundle/Entity/GridView.php
+++ b/src/Oro/Bundle/DataGridBundle/Entity/GridView.php
@@ -2,6 +2,7 @@
 
 namespace Oro\Bundle\DataGridBundle\Entity;
 
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
 
 use Symfony\Component\Validator\Constraints as Assert;
@@ -39,12 +40,12 @@
 class GridView
 {
     const TYPE_PRIVATE = 'private';
-    const TYPE_PUBLIC = 'public';
+    const TYPE_PUBLIC  = 'public';
 
     /** @var array */
     protected static $types = [
         self::TYPE_PRIVATE => self::TYPE_PRIVATE,
-        self::TYPE_PUBLIC => self::TYPE_PUBLIC,
+        self::TYPE_PUBLIC  => self::TYPE_PUBLIC,
     ];
 
     /**
@@ -119,6 +120,29 @@ class GridView
      */
     protected $organization;
 
+    /**
+     * Collection of users who have chosen this grid view as default.
+     *
+     * @var ArrayCollection|User[]
+     *
+     * @ORM\ManyToMany(
+     *      targetEntity="Oro\Bundle\UserBundle\Entity\User"
+     * )
+     * @ORM\JoinTable(name="oro_default_grid_view_users",
+     *     joinColumns={@ORM\JoinColumn(name="grid_view_id", referencedColumnName="id", onDelete="CASCADE")},
+     *     inverseJoinColumns={@ORM\JoinColumn(name="user_id", referencedColumnName="id", onDelete="CASCADE")},
+     * )
+     */
+    protected $chosenDefaultUsers;
+
+    /**
+     * GridView constructor.
+     */
+    public function __construct()
+    {
+        $this->chosenDefaultUsers = new ArrayCollection();
+    }
+
     /**
      * @return int
      */
@@ -178,7 +202,7 @@ public function getOwner()
     /**
      * @param int $id
      *
-     * @return this
+     * @return $this
      */
     public function setId($id)
     {
@@ -190,7 +214,7 @@ public function setId($id)
     /**
      * @param string $name
      *
-     * @return this
+     * @return $this
      */
     public function setName($name)
     {
@@ -202,7 +226,7 @@ public function setName($name)
     /**
      * @param string $type
      *
-     * @return this
+     * @return $this
      */
     public function setType($type)
     {
@@ -214,7 +238,7 @@ public function setType($type)
     /**
      * @param array $filtersData
      *
-     * @return this
+     * @return $this
      */
     public function setFiltersData(array $filtersData = [])
     {
@@ -226,7 +250,7 @@ public function setFiltersData(array $filtersData = [])
     /**
      * @param array $sortersData
      *
-     * @return this
+     * @return $this
      */
     public function setSortersData(array $sortersData = [])
     {
@@ -258,7 +282,7 @@ public function setColumnsData(array $columnsData = [])
     /**
      * @param string $gridName
      *
-     * @return this
+     * @return $this
      */
     public function setGridName($gridName)
     {
@@ -270,7 +294,7 @@ public function setGridName($gridName)
     /**
      * @param User $owner
      *
-     * @return this
+     * @return $this
      */
     public function setOwner(User $owner = null)
     {
@@ -302,6 +326,7 @@ public static function getTypes()
      * Set organization
      *
      * @param OrganizationInterface $organization
+     *
      * @return User
      */
     public function setOrganization(OrganizationInterface $organization = null)
@@ -320,4 +345,34 @@ public function getOrganization()
     {
         return $this->organization;
     }
+
+    /**
+     * @return ArrayCollection|User[]
+     */
+    public function getChosenDefaultUsers()
+    {
+        return $this->chosenDefaultUsers;
+    }
+
+    /**
+     * @param User $user
+     *
+     * @return $this
+     */
+    public function addChosenDefaultUser(User $user)
+    {
+        if (!$this->chosenDefaultUsers->contains($user)) {
+            $this->chosenDefaultUsers->add($user);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param User $user
+     */
+    public function removeChosenDefaultUser(User $user)
+    {
+        $this->chosenDefaultUsers->removeElement($user);
+    }
 }
diff --git a/src/Oro/Bundle/DataGridBundle/Migrations/Schema/OroDataGridBundleInstaller.php b/src/Oro/Bundle/DataGridBundle/Migrations/Schema/OroDataGridBundleInstaller.php
index 354bec81c06..26685157220 100644
--- a/src/Oro/Bundle/DataGridBundle/Migrations/Schema/OroDataGridBundleInstaller.php
+++ b/src/Oro/Bundle/DataGridBundle/Migrations/Schema/OroDataGridBundleInstaller.php
@@ -6,6 +6,7 @@
 
 use Oro\Bundle\MigrationBundle\Migration\Installation;
 use Oro\Bundle\MigrationBundle\Migration\QueryBag;
+use Oro\Bundle\DataGridBundle\Migrations\Schema\v1_2\DefaultGridViewUsersRelation;
 
 class OroDataGridBundleInstaller implements Installation
 {
@@ -14,7 +15,7 @@ class OroDataGridBundleInstaller implements Installation
      */
     public function getMigrationVersion()
     {
-        return 'v1_1';
+        return 'v1_2';
     }
 
     /**
@@ -23,6 +24,7 @@ public function getMigrationVersion()
     public function up(Schema $schema, QueryBag $queries)
     {
         $this->createOroGridViewTable($schema);
+        DefaultGridViewUsersRelation::createOroDefaultGridViewUsersTable($schema);
     }
 
     /**
diff --git a/src/Oro/Bundle/DataGridBundle/Migrations/Schema/v1_2/DefaultGridViewUsersRelation.php b/src/Oro/Bundle/DataGridBundle/Migrations/Schema/v1_2/DefaultGridViewUsersRelation.php
new file mode 100644
index 00000000000..588045784d6
--- /dev/null
+++ b/src/Oro/Bundle/DataGridBundle/Migrations/Schema/v1_2/DefaultGridViewUsersRelation.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Oro\Bundle\DataGridBundle\Migrations\Schema\v1_2;
+
+use Doctrine\DBAL\Schema\Schema;
+
+use Oro\Bundle\MigrationBundle\Migration\Migration;
+use Oro\Bundle\MigrationBundle\Migration\QueryBag;
+
+class DefaultGridViewUsersRelation implements Migration
+{
+    public function up(Schema $schema, QueryBag $queries)
+    {
+        self::createOroDefaultGridViewUsersTable($schema);
+    }
+
+    /**
+     * Creates 'oro_default_grid_view_users' table which represents relationship between grid views and
+     * users who chosen this grid view as default.
+     *
+     * @param Schema $schema
+     */
+    public static function createOroDefaultGridViewUsersTable(Schema $schema)
+    {
+        $table = $schema->createTable('oro_default_grid_view_users');
+        $table->addColumn('grid_view_id', 'integer', []);
+        $table->addColumn('user_id', 'integer', []);
+        $table->setPrimaryKey(['grid_view_id', 'user_id']);
+        $table->addIndex(['grid_view_id'], 'IDX_80CFBA3FBF53711B', []);
+        $table->addIndex(['user_id'], 'IDX_80CFBA3FA76ED395', []);
+        $table->addForeignKeyConstraint(
+            $schema->getTable('oro_grid_view'),
+            ['grid_view_id'],
+            ['id'],
+            ['onDelete' => 'CASCADE', 'onUpdate' => null]
+        );
+        $table->addForeignKeyConstraint(
+            $schema->getTable('oro_user'),
+            ['user_id'],
+            ['id'],
+            ['onDelete' => 'CASCADE', 'onUpdate' => null]
+        );
+    }
+}

From 8cac356aebfc7976863c071f42e436b9a2dcda78 Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Thu, 24 Dec 2015 17:31:08 +0200
Subject: [PATCH 250/471] CRM-4789: fix bug on close dialog with opened filter
 and adjust zindexes

---
 .../Resources/public/js/app/views/activity-view.js            | 3 ++-
 .../FilterBundle/Resources/public/css/less/oro.filter.less    | 2 +-
 .../FilterBundle/Resources/public/js/filter/select-filter.js  | 4 +++-
 src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less    | 3 ---
 .../Bundle/UIBundle/Resources/public/css/less/oro/filter.less | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Oro/Bundle/ActivityListBundle/Resources/public/js/app/views/activity-view.js b/src/Oro/Bundle/ActivityListBundle/Resources/public/js/app/views/activity-view.js
index 851bbfd02ed..04443c681aa 100644
--- a/src/Oro/Bundle/ActivityListBundle/Resources/public/js/app/views/activity-view.js
+++ b/src/Oro/Bundle/ActivityListBundle/Resources/public/js/app/views/activity-view.js
@@ -68,7 +68,8 @@ define(function(require) {
             data.collapsed = this.collapsed;
             data.createdAt = dateTimeFormatter.formatSmartDateTime(data.createdAt);
             data.updatedAt = dateTimeFormatter.formatSmartDateTime(data.updatedAt);
-            data.relatedActivityClass = _.escape(data.relatedActivityClass);
+            // use special model's method to get activity class name with replaced slashes
+            data.relatedActivityClass = _.escape(this.model.getRelatedActivityClass());
             if (data.owner_id) {
                 data.owner_url = routing.generate('oro_user_view', {'id': data.owner_id});
             } else {
diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/css/less/oro.filter.less b/src/Oro/Bundle/FilterBundle/Resources/public/css/less/oro.filter.less
index bb6ab7f1a02..0ae525de3e1 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/css/less/oro.filter.less
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/css/less/oro.filter.less
@@ -69,7 +69,7 @@
     padding: 8px 8px 2px 8px;
     border: 1px solid #d3d3d3;
     display: none;
-    z-index: @zindexPopover;
+    z-index: @oroZindexDropdown;
     margin-top: 7px;
     top: auto;
 }
diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/select-filter.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/select-filter.js
index cdd1aa1dfc0..82c87f7beed 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/select-filter.js
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/select-filter.js
@@ -213,7 +213,9 @@ define([
                     close: _.bind(function() {
                         this._setButtonPressed(this.$(this.containerSelector), false);
                         setTimeout(_.bind(function() {
-                            this.selectDropdownOpened = false;
+                            if (!this.disposed) {
+                                this.selectDropdownOpened = false;
+                            }
                         }, this), 100);
                     }, this),
                     appendTo: this.container
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less
index 43370befa19..09ef6c83988 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less
@@ -83,9 +83,6 @@ h1, h2, h3, h4, h5, h6 {
       min-width: 17px;
     }
   }
-  &.ui-multiselect-menu {
-    z-index: 10000;
-  }
 }
 .dark {
   background-color: #f6f5f5;
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/filter.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/filter.less
index bacf48bfd7b..1e8db2dd613 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/filter.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/filter.less
@@ -103,7 +103,7 @@
         left: 10px;
         position: absolute;
         bottom: -10px;
-        z-index: 10001;
+        z-index: @oroZindexDropdown + 1;
       }
     }
     .divider {

From 24f9cabc624641f66e3948717db6dec3ca64d1dc Mon Sep 17 00:00:00 2001
From: Mykhailo Sulyma <msulima@magecore.com>
Date: Thu, 24 Dec 2015 17:34:12 +0200
Subject: [PATCH 251/471] BB-1777: Action Improvements  - added supports of any
 combinations of replace and append strategies to configuration merger  -
 added replace node support to main level of action configuration

---
 .../Config/Merger/ConfigurationMerger.php     | 76 ++++++++++++-------
 src/Oro/Component/Config/README.md            |  6 ++
 .../Unit/Merger/ConfigurationMergerTest.php   | 48 +++++++++++-
 3 files changed, 98 insertions(+), 32 deletions(-)

diff --git a/src/Oro/Component/Config/Merger/ConfigurationMerger.php b/src/Oro/Component/Config/Merger/ConfigurationMerger.php
index 9771f9c512c..a244eb00ff3 100644
--- a/src/Oro/Component/Config/Merger/ConfigurationMerger.php
+++ b/src/Oro/Component/Config/Merger/ConfigurationMerger.php
@@ -4,8 +4,6 @@
 
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 
-use Oro\Bundle\UIBundle\Tools\ArrayUtils;
-
 class ConfigurationMerger
 {
     const EXTENDS_NODE_NAME = 'extends';
@@ -22,7 +20,7 @@ class ConfigurationMerger
      */
     public function __construct(array $kernelBundles)
     {
-        $this->kernelBundles = array_values($kernelBundles);
+        $this->kernelBundles = array_flip(array_values($kernelBundles));
     }
 
     /**
@@ -31,23 +29,26 @@ public function __construct(array $kernelBundles)
      */
     public function mergeConfiguration(array $rawConfigurationByBundles)
     {
-        $configs = $this->prepareRawConfiguration($rawConfigurationByBundles);
+        $actions = $this->prepareRawConfiguration($rawConfigurationByBundles);
 
-        foreach ($configs as $actionName => $actionConfigs) {
-            $data = array_shift($actionConfigs);
+        foreach ($actions as &$configs) {
+            $data = array_shift($configs);
 
-            foreach ($actionConfigs as $config) {
+            foreach ($configs as $config) {
                 $data = $this->merge($data, $config);
             }
 
-            $configs[$actionName] = (array)$data;
+            $configs = (array)$data;
         }
+        unset($configs);
 
-        foreach ($configs as $actionName => &$actionConfig) {
-            $this->resolveExtends($configs, $actionConfig, $actionName);
+        foreach ($actions as $actionName => &$actionConfig) {
+            $actionConfig = $this->unsetReplaceNodeRecursive(
+                $this->resolveExtends($actions, $actionName)
+            );
         }
 
-        return $configs;
+        return $actions;
     }
 
     /**
@@ -59,14 +60,12 @@ protected function prepareRawConfiguration(array $rawConfigurationByBundles)
         $actionConfigs = [];
 
         foreach ($rawConfigurationByBundles as $bundle => $actions) {
-            $bundleNumber = array_search($bundle, $this->kernelBundles, true);
-
-            if ($bundleNumber === false) {
-                continue;
-            }
+            if (array_key_exists($bundle, $this->kernelBundles)) {
+                $bundleNumber = $this->kernelBundles[$bundle];
 
-            foreach ($actions as $actionName => $config) {
-                $actionConfigs[$actionName][$bundleNumber] = $config;
+                foreach ($actions as $actionName => $config) {
+                    $actionConfigs[$actionName][$bundleNumber] = $config;
+                }
             }
         }
 
@@ -87,7 +86,6 @@ function ($configs) {
     protected function merge(array $data, array $config)
     {
         $replaces = empty($config[self::REPLACES_NODE_NAME]) ? [] : (array)$config[self::REPLACES_NODE_NAME];
-        unset($data[self::REPLACES_NODE_NAME], $config[self::REPLACES_NODE_NAME]);
 
         foreach ($replaces as $key) {
             if (empty($config[$key])) {
@@ -119,37 +117,59 @@ protected function merge(array $data, array $config)
 
     /**
      * @param array $configs
-     * @param array $config
      * @param string $actionName
+     * @return array
      * @throws InvalidConfigurationException
      */
-    protected function resolveExtends(array &$configs, array &$config, $actionName)
+    protected function resolveExtends(array $configs, $actionName)
     {
-        $this->processedConfigs[] = $actionName;
+        if (!in_array($actionName, $this->processedConfigs, true)) {
+            $this->processedConfigs[] = $actionName;
+        }
 
+        $config = $configs[$actionName];
         if (!array_key_exists(self::EXTENDS_NODE_NAME, $config) || empty($config[self::EXTENDS_NODE_NAME])) {
-            return;
+            return $config;
         }
 
         $extends = $config[self::EXTENDS_NODE_NAME];
+        unset($config[self::EXTENDS_NODE_NAME]);
+
         if (!array_key_exists($extends, $configs)) {
             throw new InvalidConfigurationException(
                 sprintf('Could not found configuration of %s for dependant configuration %s.', $extends, $actionName)
             );
         }
 
-        $extendsConfig = &$configs[$extends];
-        if (array_key_exists(self::EXTENDS_NODE_NAME, $extendsConfig)) {
+        if (array_key_exists(self::EXTENDS_NODE_NAME, $configs[$extends])) {
             if (in_array($extends, $this->processedConfigs, true)) {
                 throw new InvalidConfigurationException(
                     sprintf('Found circular "extends" references %s and %s configurations.', $extends, $actionName)
                 );
             }
 
-            $this->resolveExtends($configs, $extendsConfig, $extends);
+            $configs[$extends] = $this->resolveExtends($configs, $extends);
         }
 
-        $config = ArrayUtils::arrayMergeRecursiveDistinct($extendsConfig, $config);
-        unset($config[self::EXTENDS_NODE_NAME]);
+        return $this->merge($configs[$extends], $config);
+    }
+
+    /**
+     * @param array $config
+     * @return array
+     */
+    protected function unsetReplaceNodeRecursive(array $config)
+    {
+        if (array_key_exists(self::REPLACES_NODE_NAME, $config)) {
+            unset($config[self::REPLACES_NODE_NAME]);
+        }
+
+        foreach ($config as &$subConfig) {
+            if (is_array($subConfig)) {
+                $subConfig = $this->unsetReplaceNodeRecursive($subConfig);
+            }
+        }
+
+        return $config;
     }
 }
diff --git a/src/Oro/Component/Config/README.md b/src/Oro/Component/Config/README.md
index 265b9fb9f71..616c053a861 100644
--- a/src/Oro/Component/Config/README.md
+++ b/src/Oro/Component/Config/README.md
@@ -8,6 +8,12 @@ Resource Types
 
  - [Cumulative Resources](./Resources/doc/cumulative_resources.md) provides a way to configure a bundle from other bundles.
 
+Resource Merge
+--------------
+
+ - [Configuration Merger](./Resources/doc/configuration_merger.md) provides a way to merge configurations of some resource both from one or many bundles. Supports two strategy: replace and append config.
+
+
 System Aware Resolver
 ---------------------
 
diff --git a/src/Oro/Component/Config/Tests/Unit/Merger/ConfigurationMergerTest.php b/src/Oro/Component/Config/Tests/Unit/Merger/ConfigurationMergerTest.php
index 87cf74ed769..8f7530d427c 100644
--- a/src/Oro/Component/Config/Tests/Unit/Merger/ConfigurationMergerTest.php
+++ b/src/Oro/Component/Config/Tests/Unit/Merger/ConfigurationMergerTest.php
@@ -64,6 +64,11 @@ public function mergeConfigurationDataProvider()
             'merge configuration from bundles with replace' => [
                 'rawConfig' => [
                     self::BUNDLE1 => [
+                        'test_config_base' => [
+                            'array_base' => [
+                                'base_param' => ['base_value']
+                            ]
+                        ],
                         'test_config' => [
                             'label' => 'Test Config',
                             'params' => ['test_param_bundle1'],
@@ -77,7 +82,8 @@ public function mergeConfigurationDataProvider()
                     ],
                     self::BUNDLE2 => [
                         'test_config' => [
-                            'replace' => ['params'],
+                            'extends' => 'test_config_base',
+                            'replace' => ['params', 'array_base'],
                             'params' => ['test_param_bundle2' => 'data'],
                             'array' => [
                                 'replace' => ['sub_array'],
@@ -89,6 +95,11 @@ public function mergeConfigurationDataProvider()
                     ]
                 ],
                 'expected' => [
+                    'test_config_base' => [
+                        'array_base' => [
+                            'base_param' => ['base_value']
+                        ]
+                    ],
                     'test_config' => [
                         'label' => 'Test Config',
                         'params' => ['test_param_bundle2' => 'data'],
@@ -165,6 +176,18 @@ public function mergeConfigurationDataProvider()
                                 'sub_config2' => 'data2',
                                 'sub_config3' => 'data3',
                             ]
+                        ],
+                        'test_config5' => [
+                            'extends' => 'test_config3',
+                            'replace' => ['params'],
+                            'params' => ['my'],
+                            'array' => [
+                                'replace' => 'param',
+                                'param' => [
+                                    'value3'
+                                ],
+                                'single_param' => 123
+                            ]
                         ]
                     ],
                     self::BUNDLE2 => [
@@ -190,7 +213,13 @@ public function mergeConfigurationDataProvider()
                         ],
                         'test_config3' => [
                             'extends' => 'test_config2',
-                            'params' => ['test_param_bundle3_new']
+                            'params' => ['test_param_bundle3_new'],
+                            'array' => [
+                                'param' => [
+                                    'value1',
+                                    'value2'
+                                ]
+                            ]
                         ]
                     ],
                     'UnknownBundle' => [
@@ -209,13 +238,24 @@ public function mergeConfigurationDataProvider()
                         'label' => 'Test Config2 Bundle3',
                         'params' => ['test_param_bundle3']
                     ],
+                    'test_config3' => [
+                        'label' => 'Test Config2 Bundle3',
+                        'params' => ['test_param_bundle3', 'test_param_bundle3_new'],
+                        'array' => [
+                            'param' => ['value1', 'value2']
+                        ]
+                    ],
                     'test_config4' => [
                         'label' => 'Test Config4',
                         'some_config' => ['sub_config2' => 'data2', 'sub_config3' => 'replaced data']
                     ],
-                    'test_config3' => [
+                    'test_config5' => [
                         'label' => 'Test Config2 Bundle3',
-                        'params' => ['test_param_bundle3', 'test_param_bundle3_new']
+                        'params' => ['my'],
+                        'array' => [
+                            'param' => ['value3'],
+                            'single_param' => 123
+                        ]
                     ]
                 ]
             ]

From aee8787d9572978de320778efd5306b2d01a145a Mon Sep 17 00:00:00 2001
From: Ivan Klymenko <iklymenko@magecore.com>
Date: Thu, 24 Dec 2015 19:04:55 +0200
Subject: [PATCH 252/471] BAP-9606: Back merge Travis optimization config - set
 phpCS version for Travis

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 960b2218c35..d14442d98c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,6 @@ php:
 
 env:
   - SYMFONY_VERSION=2.7.*
-  - PHPCS_VERSION=2.3.3
 
 cache:
   directories:
@@ -20,7 +19,7 @@ before_script:
   - composer self-update
   - phpenv config-add travis.php.ini
   - travis_wait composer require symfony/symfony:${SYMFONY_VERSION} --prefer-source --update-no-dev
-  - travis_wait composer require squizlabs/php_codesniffer:~2 --prefer-source --update-no-dev
+  - travis_wait composer require squizlabs/php_codesniffer:2.3.3 --prefer-source --update-no-dev
 
 script: 
   - phpunit

From d7a4177bc35de71e5e37442231a3f7a1e3251050 Mon Sep 17 00:00:00 2001
From: Oleksandr Nechyporenko <onechyporenko@magecore.com>
Date: Thu, 24 Dec 2015 19:06:42 +0200
Subject: [PATCH 253/471] BB-1491: Login and Registration Page Layouts  - code
 cleanup

---
 .../LayoutBundle/Layout/Block/Type/TextType.php      |  1 -
 .../Resources/views/Layout/php/block_widget.html.php |  5 +----
 .../LayoutBundle/Tests/Functional/RendererTest.php   | 12 ++++++++++--
 src/Oro/Component/Layout/Block/Type/BaseType.php     |  3 ---
 .../Component/Layout/BlockTypeExtensionInterface.php |  1 +
 .../Component/Layout/Tests/Unit/LayoutTestCase.php   |  3 ---
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/TextType.php b/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/TextType.php
index dd3c463e84c..d7326bcaefa 100644
--- a/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/TextType.php
+++ b/src/Oro/Bundle/LayoutBundle/Layout/Block/Type/TextType.php
@@ -19,7 +19,6 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(['escape' => true]);
         $resolver->setRequired(['text']);
-        $resolver->setAllowedTypes(['escape'=> 'bool']);
     }
 
     /**
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/block_widget.html.php b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/block_widget.html.php
index 9ef2b87daee..9eaca89c8bf 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/block_widget.html.php
+++ b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/block_widget.html.php
@@ -1,5 +1,2 @@
 <?php //@codingStandardsIgnoreFile ?>
-<?php if ($tag): ?>
-    <<?php echo $tag ?> <?php echo $view['layout']->block($block, 'block_attributes') ?>>
-    </<?php echo $tag ?>>
-<?php endif ?>
+<?php echo '' ?>
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Functional/RendererTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Functional/RendererTest.php
index c7bdf4be570..ad28011f8fd 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Functional/RendererTest.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Functional/RendererTest.php
@@ -155,7 +155,15 @@ protected function getCoreBlocksTestLayout(ContextInterface $context)
                 ]
             )
             ->add('external_resource', 'head', 'external_resource', ['href' => 'test.css', 'rel' => 'stylesheet'])
-            ->add('content', 'root', 'body', ['class_prefix' => 'content'])
+            ->add(
+                'content',
+                'root',
+                'body',
+                [
+                    'class_prefix' => 'content',
+                    'attr' => ['class' => '{{ class_prefix }}-body']
+                ]
+            )
             ->add('list', 'content', 'list')
             ->add(
                 'list_item_1',
@@ -335,7 +343,7 @@ protected function getCoreBlocksTestLayoutResult($formLayout)
         </script>
         <link rel="stylesheet" href="test.css"/>
     </head>
-<body class="test-body class2">
+<body class="content-body test-body class2">
     <button name="btn1"><i class="icon-plus hide-text"></i>Btn1</button>
     <input type="text" name="search"/>
     <input type="submit" name="btn2" value="Btn2"/>
diff --git a/src/Oro/Component/Layout/Block/Type/BaseType.php b/src/Oro/Component/Layout/Block/Type/BaseType.php
index 12795a9f947..9d21d5ee478 100644
--- a/src/Oro/Component/Layout/Block/Type/BaseType.php
+++ b/src/Oro/Component/Layout/Block/Type/BaseType.php
@@ -19,7 +19,6 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
         $resolver->setOptional(
             [
                 'vars',
-                'tag',
                 'attr',
                 'label',
                 'label_attr',
@@ -30,7 +29,6 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
         $resolver->setAllowedTypes(
             [
                 'vars'       => 'array',
-                'tag'        => 'string',
                 'attr'       => 'array',
                 'label_attr' => 'array',
                 'class_prefix' => 'string'
@@ -51,7 +49,6 @@ public function buildView(BlockView $view, BlockInterface $block, array $options
         // add the view to itself vars to allow get it using 'block' variable in a rendered, for example TWIG
         $view->vars['block'] = $view;
 
-        $view->vars['tag'] = isset($options['tag']) ? $options['tag'] : null;
         $view->vars['class_prefix'] = null;
         if (isset($options['class_prefix'])) {
             $view->vars['class_prefix'] = $options['class_prefix'];
diff --git a/src/Oro/Component/Layout/BlockTypeExtensionInterface.php b/src/Oro/Component/Layout/BlockTypeExtensionInterface.php
index 84b6b4e6a15..37455af07dd 100644
--- a/src/Oro/Component/Layout/BlockTypeExtensionInterface.php
+++ b/src/Oro/Component/Layout/BlockTypeExtensionInterface.php
@@ -56,6 +56,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver);
 
     /**
      * Normalize options after they was resolved.
+     * You can implement this function to manipulate block options before build.
      *
      * @param array $options
      * @param ContextInterface $context
diff --git a/src/Oro/Component/Layout/Tests/Unit/LayoutTestCase.php b/src/Oro/Component/Layout/Tests/Unit/LayoutTestCase.php
index cca934ff430..c67e7a01d83 100644
--- a/src/Oro/Component/Layout/Tests/Unit/LayoutTestCase.php
+++ b/src/Oro/Component/Layout/Tests/Unit/LayoutTestCase.php
@@ -45,9 +45,6 @@ protected function completeView(array &$view)
         if (!isset($view['children'])) {
             $view['children'] = [];
         }
-        if (!isset($view['vars']['tag'])) {
-            $view['vars']['tag'] = null;
-        }
         if (!isset($view['vars']['class_prefix'])) {
             $view['vars']['class_prefix'] = null;
         }

From 4ee80d87ef5dd020a264d59aad6e03a897ea22a9 Mon Sep 17 00:00:00 2001
From: Mykhailo Sulyma <msulima@magecore.com>
Date: Thu, 24 Dec 2015 19:25:20 +0200
Subject: [PATCH 254/471] BB-1777: Action Improvements  - update documentations

---
 src/Oro/Component/Config/README.md            |   2 +-
 .../Resources/doc/configuration_merger.md     | 279 ++++++++++++++++++
 2 files changed, 280 insertions(+), 1 deletion(-)
 create mode 100644 src/Oro/Component/Config/Resources/doc/configuration_merger.md

diff --git a/src/Oro/Component/Config/README.md b/src/Oro/Component/Config/README.md
index 616c053a861..a662464ac3b 100644
--- a/src/Oro/Component/Config/README.md
+++ b/src/Oro/Component/Config/README.md
@@ -11,7 +11,7 @@ Resource Types
 Resource Merge
 --------------
 
- - [Configuration Merger](./Resources/doc/configuration_merger.md) provides a way to merge configurations of some resource both from one or many bundles. Supports two strategy: replace and append config.
+ - [Configuration Merger](./Resources/doc/configuration_merger.md) provides a way to merge configurations of some resource both from one or many bundles. Supports two strategy: replace and append.
 
 
 System Aware Resolver
diff --git a/src/Oro/Component/Config/Resources/doc/configuration_merger.md b/src/Oro/Component/Config/Resources/doc/configuration_merger.md
new file mode 100644
index 00000000000..f251b58c4b2
--- /dev/null
+++ b/src/Oro/Component/Config/Resources/doc/configuration_merger.md
@@ -0,0 +1,279 @@
+Configuration Merger
+====================
+
+This class provides a way to merge configurations with equal name from any configuration groups and way to extend one
+configuration from other configuration. Also exists mechanism to replace some nodes of original configuration by nodes
+of configuration which will be extended from this config. For this case you need to set node `replace` with list of
+nodes, which you want to replace, on the same level of this nodes.
+
+Initialization
+--------------
+
+For creating new instance of merger you need list of some keys. It will use as sorting order for merging all
+configuration from groups which have equal name.
+
+``` php
+<?php
+
+namespace Oro\Bundle\ActionBundle\DependencyInjection\CompilerPass;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class ConfigurationPass implements CompilerPassInterface
+{
+    /** {@inheritDoc} */
+    public function process(ContainerBuilder $container)
+    {
+        ...
+        $bundles = $this->container->getParameter('kernel.bundles');
+
+        $merger = new ConfigurationMerger($bundles);
+        ...
+    }
+}
+...
+```
+
+Using example
+-------------
+
+Please imagine that you need to load configurations from `Resources\config\acme.yml` file located in any bundle in your
+application and merge them to final configurations. For example one bundle, which will be loaded last, override some
+part of configuration from other bundle. All process to load this configurations shows below.
+
+``` php
+<?php
+
+namespace Oro\Bundle\ActionBundle\DependencyInjection\CompilerPass;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+use Oro\Component\Config\Loader\CumulativeConfigLoader;
+use Oro\Component\Config\Loader\YamlCumulativeFileLoader;
+
+class ConfigurationPass implements CompilerPassInterface
+{
+    /** {@inheritDoc} */
+    public function process(ContainerBuilder $container)
+    {
+        $configLoader = new CumulativeConfigLoader(
+            'acme_config',
+            new YamlCumulativeFileLoader('Resources/config/acme.yml')
+        );
+
+        $resources = $configLoader->load($container);
+        $configs = [];
+
+        foreach ($resources as $resource) {
+            $configs[$resource->bundleClass] = $resource->data;
+        }
+
+        $bundles = $this->container->getParameter('kernel.bundles');
+
+        $merger = new ConfigurationMerger($bundles);
+        $configs = $merger->mergeConfiguration($configs);
+        ...
+    }
+}
+```
+
+Examples
+--------
+
+### Merge configurations with the same name from two bundles (use append strategy)
+
+Order of bundles loading: `FirstBundle`, `SecondBundle`.
+
+``` yaml
+# Acme\Bundle\FirstBundle\Resources\config\acme.yml
+
+acme_config:
+    param: value
+    array_param:
+        sub_array_param1: value1
+        sub_array_param2: value2
+```
+
+``` yaml
+# Acme\Bundle\SecondBundle\Resources\config\acme.yml
+
+acme_config:
+    param: replaced_value
+    array_param:
+        sub_array_param3: value3
+```
+
+Result:
+``` yaml
+acme_config:
+    param: replaced_value
+    array_param:
+        sub_array_param1: value1
+        sub_array_param2: value2
+        sub_array_param3: value3
+```
+
+### Extends one configuration from other configuration (use append strategy)
+``` yaml
+# Acme\Bundle\DemoBundle\Resources\config\acme.yml
+
+acme_config_base:
+    param: value
+    array_param:
+        sub_array_param1: value1
+        sub_array_param2: value2
+
+acme_config:
+    extends: acme_config_base
+    new_param: new_value
+    array_param:
+        sub_array_param3: value3
+```
+
+Result:
+``` yaml
+acme_config_base:
+    param: value
+    array_param:
+        sub_array_param1: value1
+        sub_array_param2: value2
+
+acme_config:
+    param: value
+    array_param:
+        sub_array_param1: value1
+        sub_array_param2: value2
+        sub_array_param3: value3
+    new_param: new_value
+```
+
+### Merge configurations with the same name from two bundles and extends one configuration from other configuration (use append strategy)
+
+Order of bundles loading: `FirstBundle`, `SecondBundle`.
+
+``` yaml
+# Acme\Bundle\FirstBundle\Resources\config\acme.yml
+
+acme_config_base:
+    param: value
+    array_param:
+        sub_array_param1: value1
+        sub_array_param2: value2
+
+acme_config:
+    extends: acme_config_base
+    new_param: new_value
+    array_param:
+        sub_array_param4: value4
+```
+
+``` yaml
+# Acme\Bundle\SecondBundle\Resources\config\acme.yml
+
+acme_config_base:
+    param: replaced_value
+    array_param:
+        sub_array_param3: value3
+
+```
+
+Result:
+``` yaml
+acme_config_base:
+    param: replaced_value
+    array_param:
+        sub_array_param1: value1
+        sub_array_param2: value2
+        sub_array_param3: value3
+
+acme_config:
+    param: replaced_value
+    array_param:
+        sub_array_param1: value1
+        sub_array_param2: value2
+        sub_array_param3: value3
+        sub_array_param4: value4
+    new_param: new_value
+```
+
+### Extends one configuration from other configuration (use append and replace strategies)
+``` yaml
+# Acme\Bundle\DemoBundle\Resources\config\acme.yml
+
+acme_config_base:
+    param: value
+    array_param:
+        sub_array_param1: value1
+        sub_array_param2: value2
+
+acme_config:
+    extends: acme_config_base
+    replace: [array_param]
+    new_param: new_value
+    array_param:
+        sub_array_param3: value3
+```
+
+Result:
+``` yaml
+acme_config_base:
+    param: value
+    array_param:
+        sub_array_param1: value1
+        sub_array_param2: value2
+
+acme_config:
+    param: value
+    array_param:
+        sub_array_param3: value3
+    new_param: new_value
+```
+
+### Merge configurations with the same name from two bundles and extends one configuration from other configuration (use append and replace strategy)
+
+Order of bundles loading: `FirstBundle`, `SecondBundle`.
+
+``` yaml
+# Acme\Bundle\FirstBundle\Resources\config\acme.yml
+
+acme_config_base:
+    param: value
+    array_param:
+        sub_array_param1: value1
+        sub_array_param2: value2
+
+acme_config:
+    extends: acme_config_base
+    replace: [array_param]
+    new_param: new_value
+    array_param:
+        sub_array_param4: value4
+```
+
+``` yaml
+# Acme\Bundle\SecondBundle\Resources\config\acme.yml
+
+acme_config_base:
+    param: replaced_value
+    array_param:
+        sub_array_param3: value3
+
+```
+
+Result:
+``` yaml
+acme_config_base:
+    param: replaced_value
+    array_param:
+        sub_array_param1: value1
+        sub_array_param2: value2
+        sub_array_param3: value3
+
+acme_config:
+    param: replaced_value
+    array_param:
+        sub_array_param4: value4
+    new_param: new_value
+```

From 26f11e2a03c8efcc57f86f71fb6f3f9bab1e4ec9 Mon Sep 17 00:00:00 2001
From: zebimax <zebimax@gmail.com>
Date: Thu, 24 Dec 2015 19:52:53 +0200
Subject: [PATCH 255/471] BAP-9576: Add field 'default' to GridView  - rename
 field

---
 .../Bundle/DataGridBundle/Entity/GridView.php  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Entity/GridView.php b/src/Oro/Bundle/DataGridBundle/Entity/GridView.php
index a56e7fcf521..e16a9f38c6d 100644
--- a/src/Oro/Bundle/DataGridBundle/Entity/GridView.php
+++ b/src/Oro/Bundle/DataGridBundle/Entity/GridView.php
@@ -133,14 +133,14 @@ class GridView
      *     inverseJoinColumns={@ORM\JoinColumn(name="user_id", referencedColumnName="id", onDelete="CASCADE")},
      * )
      */
-    protected $chosenDefaultUsers;
+    protected $users;
 
     /**
      * GridView constructor.
      */
     public function __construct()
     {
-        $this->chosenDefaultUsers = new ArrayCollection();
+        $this->users = new ArrayCollection();
     }
 
     /**
@@ -349,9 +349,9 @@ public function getOrganization()
     /**
      * @return ArrayCollection|User[]
      */
-    public function getChosenDefaultUsers()
+    public function getUsers()
     {
-        return $this->chosenDefaultUsers;
+        return $this->users;
     }
 
     /**
@@ -359,10 +359,10 @@ public function getChosenDefaultUsers()
      *
      * @return $this
      */
-    public function addChosenDefaultUser(User $user)
+    public function addUser(User $user)
     {
-        if (!$this->chosenDefaultUsers->contains($user)) {
-            $this->chosenDefaultUsers->add($user);
+        if (!$this->users->contains($user)) {
+            $this->users->add($user);
         }
 
         return $this;
@@ -371,8 +371,8 @@ public function addChosenDefaultUser(User $user)
     /**
      * @param User $user
      */
-    public function removeChosenDefaultUser(User $user)
+    public function removeUser(User $user)
     {
-        $this->chosenDefaultUsers->removeElement($user);
+        $this->users->removeElement($user);
     }
 }

From da5259e27c765869d4b81bd27cd0f564b776d703 Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Thu, 24 Dec 2015 20:12:06 +0200
Subject: [PATCH 256/471] CRM-4829: remove flex styles because IE incorrect
 rendering of popup

---
 .../Resources/public/css/less/oro.less        | 20 +------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less
index c53bf83e964..747902fdb2a 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less
@@ -878,13 +878,8 @@ footer {
   }
 }
 .ui-dialog.ui-resizable:not(.ui-dialog-buttons) {
-  &:after{
-    display: block;
-    height: 15px;
-    content: " ";
-    flex: none;
-  }
   .ui-dialog-content{
+    height: calc(~"100% - 50px") !important;
     border-radius: 0 0 3px 3px;
     border-bottom: 1px solid #e5e5e5;
   }
@@ -1654,19 +1649,6 @@ footer {
     }
   }
   &.ui-dialog-normal {
-    display: flex !important;
-    flex-direction: column;
-    .ui-dialog-titlebar {
-      min-height: 34px;
-      flex: none;
-    }
-    .ui-dialog-content {
-      flex: 1;
-    }
-    .ui-dialog-buttonpane {
-      height: 49px;
-      flex: none;
-    }
     [class*='ui-dialog-titlebar-'] {
       &:hover:before {
         #gradient > .vertical(darken(#838d98,5%), darken(#46515d,5%));

From ca0c67c621bbda0436693e8772d9a88aa6e6a90d Mon Sep 17 00:00:00 2001
From: Dmitry Naydenov <dnaidonov@magecore.com>
Date: Thu, 24 Dec 2015 20:56:49 +0200
Subject: [PATCH 257/471] BAP-9301 Wrong List of BU in the filter on the grid

---
 .../public/js/filter/choice-tree-filter.js    |  33 ++-
 .../Filter/BusinessUnitChoiceFilter.php       |  14 +-
 .../Filter/ChoiceTreeBusinessUnitProvider.php |  79 ++++--
 .../Resources/config/services.yml             |   1 +
 .../ChoiceTreeBusinessUnitProviderTest.php    | 248 ++++++++++++------
 5 files changed, 261 insertions(+), 114 deletions(-)

diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/choice-tree-filter.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/choice-tree-filter.js
index df43b8a974e..d271c102568 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/choice-tree-filter.js
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/choice-tree-filter.js
@@ -248,20 +248,27 @@ define(function(require) {
             return rootArray;
         },
 
-        _convertToTree: function(data) {
-            var self = this;
-            var response = [];
-            _.each(data, function(value) {
-                if (!value.owner_id) {
-                    response.push({
-                        value: value,
-                        children: []
-                    });
-                }
-            });
+        _convertToTree: function (data) {
+            var response = [],
+                idToNodeMap = {};
 
-            _.each(response, function(value, key) {
-                response[key].children = self.searchEngine.findChild(value, data);
+            _.each(data, function (value) {
+                var datum = {};
+                datum.value = value;
+                datum.children = [];
+
+                idToNodeMap[datum.value.id] = datum;
+
+                if (!datum.value.owner_id) {
+                    response.push(datum);
+                } else {
+                    var parentNode = idToNodeMap[datum.value.owner_id];
+                    if (parentNode) {
+                        parentNode.children.push(datum);
+                    } else {
+                        response.push(datum);
+                    }
+                }
             });
 
             return response;
diff --git a/src/Oro/Bundle/OrganizationBundle/Filter/BusinessUnitChoiceFilter.php b/src/Oro/Bundle/OrganizationBundle/Filter/BusinessUnitChoiceFilter.php
index 51a7127831d..8f0721375fe 100644
--- a/src/Oro/Bundle/OrganizationBundle/Filter/BusinessUnitChoiceFilter.php
+++ b/src/Oro/Bundle/OrganizationBundle/Filter/BusinessUnitChoiceFilter.php
@@ -18,7 +18,7 @@ public function apply(FilterDatasourceAdapterInterface $ds, $data)
             return false;
         }
 
-        $type =  $data['type'];
+        $type = $data['type'];
         if (count($data['value']) > 1 || (isset($data['value'][0]) && $data['value'][0] != "")) {
             $parameterName = $ds->generateParameterName($this->getName());
 
@@ -26,30 +26,30 @@ public function apply(FilterDatasourceAdapterInterface $ds, $data)
                 ->createQueryBuilder('u')
                 ->select('u.id')
                 ->leftJoin('u.businessUnits', 'bu')
-                ->where('bu.id in (:'.$parameterName.')')
+                ->where('bu.id in (:' . $parameterName . ')')
                 ->getQuery()
-              ->getDQL();
+                ->getDQL();
 
             $this->applyFilterToClause(
                 $ds,
-                $this->get(FilterUtility::DATA_NAME_KEY) . ' in ('.$qb2.')'
+                $this->get(FilterUtility::DATA_NAME_KEY) . ' in (' . $qb2 . ')'
             );
 
             if (!in_array($type, [FilterUtility::TYPE_EMPTY, FilterUtility::TYPE_NOT_EMPTY], true)) {
                 $ds->setParameter($parameterName, $data['value']);
             }
         }
+
         return true;
     }
 
     /**
-     * @param $data
-     *
-     * @return mixed
+     * {@inheritDoc}
      */
     public function parseData($data)
     {
         $data['value'] = explode(',', $data['value']);
+
         return $data;
     }
 }
diff --git a/src/Oro/Bundle/OrganizationBundle/Provider/Filter/ChoiceTreeBusinessUnitProvider.php b/src/Oro/Bundle/OrganizationBundle/Provider/Filter/ChoiceTreeBusinessUnitProvider.php
index 650b51d2f2a..ee42169e2ed 100644
--- a/src/Oro/Bundle/OrganizationBundle/Provider/Filter/ChoiceTreeBusinessUnitProvider.php
+++ b/src/Oro/Bundle/OrganizationBundle/Provider/Filter/ChoiceTreeBusinessUnitProvider.php
@@ -5,10 +5,12 @@
 use Doctrine\Bundle\DoctrineBundle\Registry;
 
 use Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper;
+use Oro\Bundle\SecurityBundle\Owner\ChainOwnerTreeProvider;
+use Oro\Bundle\SecurityBundle\Owner\OwnerTree;
 use Oro\Bundle\SecurityBundle\SecurityFacade;
-use Oro\Bundle\OrganizationBundle\Entity\Organization;
 use Oro\Bundle\OrganizationBundle\Entity\Repository\BusinessUnitRepository;
 use Oro\Bundle\OrganizationBundle\Entity\BusinessUnit;
+use Oro\Bundle\UserBundle\Entity\User;
 
 class ChoiceTreeBusinessUnitProvider
 {
@@ -21,44 +23,56 @@ class ChoiceTreeBusinessUnitProvider
     /** @var SecurityFacade */
     protected $securityFacade;
 
+    /** @var ChainOwnerTreeProvider */
+    protected $treeProvider;
+
     /**
-     * @param Registry $registry
-     * @param SecurityFacade $securityFacade
-     * @param AclHelper $aclHelper
+     * @param Registry               $registry
+     * @param SecurityFacade         $securityFacade
+     * @param AclHelper              $aclHelper
+     * @param ChainOwnerTreeProvider $treeProvider
      */
     public function __construct(
         Registry $registry,
         SecurityFacade $securityFacade,
-        AclHelper $aclHelper
+        AclHelper $aclHelper,
+        ChainOwnerTreeProvider $treeProvider
     ) {
-        $this->registry = $registry;
+        $this->registry       = $registry;
         $this->securityFacade = $securityFacade;
-        $this->aclHelper = $aclHelper;
+        $this->aclHelper      = $aclHelper;
+        $this->treeProvider   = $treeProvider;
     }
 
     /**
-     * @param Organization $currentOrganization
-     *
      * @return array
      */
     public function getList()
     {
-        $businessUnitRepository = $this->getBusinessUnitRepo();
+        $businessUnitRepo = $this->getBusinessUnitRepo();
+
         $response = [];
 
-        $qb = $businessUnitRepository->getQueryBuilder();
+        $qb = $businessUnitRepo->getQueryBuilder();
+
+        $qb->andWhere(
+            $qb->expr()->in('businessUnit.id', ':ids')
+        );
+
+        $qb->setParameter('ids', $this->getBusinessUnitIds());
+
         $businessUnits = $this->aclHelper->apply($qb)->getResult();
         /** @var BusinessUnit $businessUnit */
         foreach ($businessUnits as $businessUnit) {
             if ($businessUnit->getOwner()) {
-                $name =$businessUnit->getName();
+                $name = $businessUnit->getName();
             } else {
                 $name = $this->getBusinessUnitName($businessUnit);
             }
 
             $response[] = [
-                'id' => $businessUnit->getId(),
-                'name' => $name,
+                'id'       => $businessUnit->getId(),
+                'name'     => $name,
                 'owner_id' => $businessUnit->getOwner() ? $businessUnit->getOwner()->getId() : null
             ];
         }
@@ -81,6 +95,41 @@ protected function getBusinessUnitRepo()
      */
     protected function getBusinessUnitName(BusinessUnit $businessUnit)
     {
-        return  $businessUnit->getName();
+        return $businessUnit->getName();
+    }
+
+    /**
+     * @return User
+     */
+    protected function getUser()
+    {
+        return $this->securityFacade->getToken()->getUser();
+    }
+
+    /**
+     * @return array
+     */
+    protected function getBusinessUnitIds()
+    {
+        $user         = $this->getUser();
+        $organization = $user->getOrganization();
+
+        /** @var OwnerTree $tree */
+        $tree = $this->treeProvider->getTree();
+
+        $userBUIds = $tree->getUserBusinessUnitIds(
+            $user->getId(),
+            $organization->getId()
+        );
+
+        $result = [];
+        foreach ($userBUIds as $businessUnitId) {
+            $subordinateBUIds = $tree->getSubordinateBusinessUnitIds($businessUnitId);
+            $result           = array_merge($subordinateBUIds, $result);
+        }
+
+        return array_unique(
+            array_merge($userBUIds, $result)
+        );
     }
 }
diff --git a/src/Oro/Bundle/OrganizationBundle/Resources/config/services.yml b/src/Oro/Bundle/OrganizationBundle/Resources/config/services.yml
index 6fc011d8f57..98d0ec35c6d 100644
--- a/src/Oro/Bundle/OrganizationBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/OrganizationBundle/Resources/config/services.yml
@@ -200,6 +200,7 @@ services:
             - @doctrine
             - @oro_security.security_facade
             - @oro_security.acl_helper
+            - @oro_security.ownership_tree_provider.chain
 
     oro_organization.autocomplete.business_unit.search_handler:
         class: %oro_organization.autocomplete.business_unit.search_handler.class%
diff --git a/src/Oro/Bundle/OrganizationBundle/Tests/Unit/Provider/Filter/ChoiceTreeBusinessUnitProviderTest.php b/src/Oro/Bundle/OrganizationBundle/Tests/Unit/Provider/Filter/ChoiceTreeBusinessUnitProviderTest.php
index 0ea4d9a949f..61a0c69bfe8 100644
--- a/src/Oro/Bundle/OrganizationBundle/Tests/Unit/Provider/Filter/ChoiceTreeBusinessUnitProviderTest.php
+++ b/src/Oro/Bundle/OrganizationBundle/Tests/Unit/Provider/Filter/ChoiceTreeBusinessUnitProviderTest.php
@@ -7,7 +7,7 @@
 class ChoiceTreeBusinessUnitProviderTest extends \PHPUnit_Framework_TestCase
 {
     /** @var ChoiceTreeBusinessUnitProvider */
-    protected $choiceTreeBusinessUnitProvider;
+    protected $choiceTreeBUProvider;
 
     /** @var \PHPUnit_Framework_MockObject_MockObject */
     protected $registry;
@@ -18,133 +18,223 @@ class ChoiceTreeBusinessUnitProviderTest extends \PHPUnit_Framework_TestCase
     /** @var \PHPUnit_Framework_MockObject_MockObject */
     protected $aclHelper;
 
+    /** @var \PHPUnit_Framework_MockObject_MockObject */
+    protected $treeProvider;
+
     public function setUp()
     {
-        $this->registry = $this->getMockBuilder('Doctrine\Bundle\DoctrineBundle\Registry')
+        $this->registry       = $this->getMockBuilder('Doctrine\Bundle\DoctrineBundle\Registry')
             ->disableOriginalConstructor()
             ->getMock();
         $this->securityFacade = $this->getMockBuilder('Oro\Bundle\SecurityBundle\SecurityFacade')
             ->disableOriginalConstructor()
             ->getMock();
-        $this->aclHelper = $this->getMockBuilder('Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper')
+        $this->aclHelper      = $this->getMockBuilder('Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->treeProvider = $this->getMockBuilder('Oro\Bundle\SecurityBundle\Owner\ChainOwnerTreeProvider')
+            ->setMethods(['getTree'])
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->choiceTreeBusinessUnitProvider = new ChoiceTreeBusinessUnitProvider(
+        $this->choiceTreeBUProvider = new ChoiceTreeBusinessUnitProvider(
             $this->registry,
             $this->securityFacade,
-            $this->aclHelper
+            $this->aclHelper,
+            $this->treeProvider
         );
     }
 
-    public function testGetList()
+    /**
+     * @dataProvider getListDataProvider
+     */
+    public function testGetList($userBUIds, $subordinateBUIds, $times, $queryResult, $result)
     {
-        $businessUnitRepository = $this->getMockBuilder('BusinessUnitRepository')
+        $businessUnitRepos = $this->getMockBuilder('BusinessUnitRepository')
             ->disableOriginalConstructor()
             ->setMethods(['getQueryBuilder'])
             ->getMock();
 
         $qb = $this->getMockBuilder('Doctrine\ORM\QueryBuilder')
-            ->setMethods(['getResult'])
+            ->setMethods(['getResult', 'expr', 'setParameter'])
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->aclHelper->expects($this->any())->method('apply')->willReturn($qb);
-        $businessUnitRepository->expects($this->any())->method('getQueryBuilder')->willReturn($qb);
-        $qb->expects($this->any())->method('getResult')->willReturn($this->getTestBusinessUnits());
-
-        $this->registry->expects($this->once())->method('getRepository')->with('OroOrganizationBundle:BusinessUnit')
-            ->willReturn($businessUnitRepository);
+        $treeOwner = $this->getMockBuilder('Oro\Bundle\SecurityBundle\Owner\OwnerTree')
+            ->setMethods(['getUserBusinessUnitIds', 'getSubordinateBusinessUnitIds'])
+            ->disableOriginalConstructor()
+            ->getMock();
 
-        $result = $this->choiceTreeBusinessUnitProvider->getList();
+        $this->treeProvider->expects(self::once())->method('getTree')->willReturn($treeOwner);
+        $treeOwner->expects(self::once())->method('getUserBusinessUnitIds')->willReturn($userBUIds);
+        $treeOwner
+            ->expects(self::exactly($times))
+            ->method('getSubordinateBusinessUnitIds')
+            ->willReturn($subordinateBUIds);
 
-        $this->assertEquals($this->getExpectedData(), $result);
-    }
+        $this->aclHelper->expects(self::any())->method('apply')->willReturn($qb);
+        $businessUnitRepos->expects(self::any())->method('getQueryBuilder')->willReturn($qb);
 
-    public function testGetEmptyList()
-    {
-        $businessUnitRepository = $this->getMockBuilder('BusinessUnitRepository')
+        $expression = $this->getMockBuilder('Doctrine\ORM\Query\Expr')
+            ->setMethods(['in'])
             ->disableOriginalConstructor()
-            ->setMethods(['getQueryBuilder'])
             ->getMock();
 
-        $qb = $this->getMockBuilder('Doctrine\ORM\QueryBuilder')
-            ->setMethods(['getResult'])
+        $qb->expects(self::once())->method('getResult')->willReturn($queryResult);
+        $qb->expects(self::once())->method('expr')->willReturn($expression);
+        $qb->expects(self::once())->method('setParameter');
+
+        $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+
+        $user = $this->getMockBuilder('Oro\Bundle\UserBundle\Entity\User')
+            ->setMethods(['getId', 'getOrganization'])
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->aclHelper->expects($this->any())->method('apply')->willReturn($qb);
-        $businessUnitRepository->expects($this->any())->method('getQueryBuilder')->willReturn($qb);
-        $qb->expects($this->any())->method('getResult')->willReturn([]);
+        $organization = $this->getMock('Oro\Bundle\OrganizationBundle\Entity\OrganizationInterface');
+        $organization->expects(self::once())->method('getId')->willReturn(1);
+        $user->expects(self::once())->method('getOrganization')->willReturn($organization);
+        $this->securityFacade->expects(self::once())->method('getToken')->willReturn($tokenStorage);
+        $tokenStorage->expects(self::once())->method('getUser')->willReturn($user);
 
-        $this->registry->expects($this->once())->method('getRepository')->with('OroOrganizationBundle:BusinessUnit')
-            ->willReturn($businessUnitRepository);
+        $this->registry
+            ->expects(self::once())
+            ->method('getRepository')
+            ->with('OroOrganizationBundle:BusinessUnit')
+            ->willReturn($businessUnitRepos);
 
-        $result = $this->choiceTreeBusinessUnitProvider->getList();
+        $resultedUserBUids = $this->choiceTreeBUProvider->getList();
 
-        $this->assertEquals([], $result);
+        self::assertEquals($result, $resultedUserBUids);
     }
 
-    protected function getTestBusinessUnits()
+    /**
+     * @return array
+     */
+    public function getListDataProvider()
     {
-        $data = [
-            [
-                'name' => 'Main Business Unit',
-                'id' => 1,
-                'owner_id' => null
+        return [
+            'Three elements in the list' => [
+                'userBUIds'        => [1],
+                'subordinateBUIds' => [2, 3],
+                'times'            => 1,
+                'queryResult'      => $this->getBusinessUnits('one'),
+                'result'           => [
+                    [
+                        'name'     => 'Main Business Unit 1',
+                        'id'       => 1,
+                        'owner_id' => null
+                    ],
+                    [
+                        'name'     => 'Business Unit 1',
+                        'id'       => 2,
+                        'owner_id' => 1
+                    ],
+                    [
+                        'name'     => 'Business Unit 2',
+                        'id'       => 3,
+                        'owner_id' => 1
+                    ],
+                ]
+            ],
+            'Six elements in the list'   => [
+                'userBUIds'        => [1, 2],
+                'subordinateBUIds' => [3, 4, 5, 6],
+                'times'            => 2,
+                'queryResult'      => $this->getBusinessUnits('two'),
+                'result'           => [
+                    [
+                        'name'     => 'Main Business Unit 1',
+                        'id'       => 1,
+                        'owner_id' => null
+                    ],
+                    [
+                        'name'     => 'Main Business Unit 2',
+                        'id'       => 2,
+                        'owner_id' => null
+                    ],
+                    [
+                        'name'     => 'Business Unit 1',
+                        'id'       => 3,
+                        'owner_id' => 1
+                    ],
+                    [
+                        'name'     => 'Business Unit 2',
+                        'id'       => 4,
+                        'owner_id' => 1
+                    ],
+                    [
+                        'name'     => 'Business Unit 3',
+                        'id'       => 5,
+                        'owner_id' => 2
+                    ],
+                    [
+                        'name'     => 'Business Unit 4',
+                        'id'       => 6,
+                        'owner_id' => 2
+                    ],
+                    [
+                        'name'     => 'Business Unit 5',
+                        'id'       => 7,
+                        'owner_id' => 4
+                    ]
+                ]
+            ],
+            'empty list'                 => [
+                'userBUIds'        => [],
+                'subordinateBUIds' => [],
+                'times'            => 0,
+                'queryResult'      => [],
+                'result'           => []
             ],
-            [
-                'name' => 'Business Uit 1',
-                'id' => 2,
-                'owner_id' => $this->getTestDataRootBusinessUnit()
-            ]
         ];
-
-        return $this->convertTestDataToBusinessUnitEntity($data);
     }
 
-    protected function convertTestDataToBusinessUnitEntity($data)
+    /**
+     * @param string $name
+     *
+     * @return array
+     */
+    protected function getBusinessUnits($name)
     {
-        $response = [];
-        foreach ($data as $item) {
-            $businessUnit = $this->getMockBuilder('Oro\Bundle\OrganizationBundle\Entity\BusinessUnit')
+        $scheme = [
+            'one' => [
+                ['name' => 'Main Business Unit 1', 'owner' => null, 'id' => 1],
+                ['name' => 'Business Unit 1', 'owner' => 1, 'id' => 2],
+                ['name' => 'Business Unit 2', 'owner' => 1, 'id' => 3]
+            ],
+            'two' => [
+                ['name' => 'Main Business Unit 1', 'owner' => null, 'id' => 1],
+                ['name' => 'Main Business Unit 2', 'owner' => null, 'id' => 2],
+                ['name' => 'Business Unit 1', 'owner' => 1, 'id' => 3],
+                ['name' => 'Business Unit 2', 'owner' => 1, 'id' => 4],
+                ['name' => 'Business Unit 3', 'owner' => 2, 'id' => 5],
+                ['name' => 'Business Unit 4', 'owner' => 2, 'id' => 6],
+                ['name' => 'Business Unit 5', 'owner' => 4, 'id' => 7],
+            ],
+        ];
+
+        $result         = [];
+        $schemeSet      = $scheme[$name];
+        $schemeSetCount = count($schemeSet);
+
+        for ($i = 0; $i < $schemeSetCount; $i++) {
+            $element = $this->getMockBuilder('Oro\Bundle\OrganizationBundle\Entity\BusinessUnit')
                 ->disableOriginalConstructor()
                 ->getMock();
-            $businessUnit->expects($this->any())->method('getId')->willReturn($item['id']);
-            $businessUnit->expects($this->any())->method('getOwner')->willReturn($item['owner_id']);
-            $businessUnit->expects($this->any())->method('getName')->willReturn($item['name']);
 
-            $response[] = $businessUnit;
-        }
+            $owner = (null === $schemeSet[$i]['owner'])
+                ? $schemeSet[$i]['owner']
+                : $result[$schemeSet[$i]['owner'] - 1];
 
-        return $response;
-    }
+            $element->expects(self::any())->method('getOwner')->willReturn($owner);
+            $element->expects(self::any())->method('getName')->willReturn($schemeSet[$i]['name']);
+            $element->expects(self::any())->method('getId')->willReturn($schemeSet[$i]['id']);
 
-    protected function getTestDataRootBusinessUnit()
-    {
-        $rootBusinessUnit = $this->getMockBuilder('Oro\Bundle\OrganizationBundle\Entity\BusinessUnit')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $rootBusinessUnit->expects($this->any())->method('getId')->willReturn('1');
-        $rootBusinessUnit->expects($this->any())->method('getOwner')->willReturn(null);
-        $rootBusinessUnit->expects($this->any())->method('getName')->willReturn('Main Business Unit');
-
-        return $rootBusinessUnit;
-    }
+            $result[] = $element;
+        }
 
-    protected function getExpectedData()
-    {
-        return [
-            [
-                'name' => 'Main Business Unit',
-                'id' => 1,
-                'owner_id' => null
-            ],
-            [
-                'name' => 'Business Uit 1',
-                'id' => 2,
-                'owner_id' => 1
-            ]
-        ];
+        return $result;
     }
 }

From a4d5cfa29f1eed754832926536a77baa94895409 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Thu, 24 Dec 2015 21:24:34 +0200
Subject: [PATCH 258/471] BAP-9580: Disable grid views for reports and segments

---
 .../GridViews/GridViewsExtension.php          | 19 ++++++++++++++++---
 .../views/Report/table/view.html.twig         | 12 +++++++++++-
 .../Resources/views/Segment/view.html.twig    | 12 +++++++++++-
 3 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
index 560112ff2f9..90ed2a3a772 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
@@ -15,6 +15,9 @@
 
 class GridViewsExtension extends AbstractExtension
 {
+    const GRID_VIEW_ROOT_PARAM = '_grid_view';
+    const DISABLED_PARAM       = '_disabled';
+
     const VIEWS_LIST_KEY           = 'views_list';
     const VIEWS_PARAM_KEY          = 'view';
     const MINIFIED_VIEWS_PARAM_KEY = 'v';
@@ -45,15 +48,25 @@ public function __construct(
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function isApplicable(DatagridConfiguration $config)
     {
-        return true;
+        return !$this->isDisabled();
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isDisabled()
+    {
+        $parameters = $this->getParameters()->get(self::GRID_VIEW_ROOT_PARAM, []);
+
+        return !empty($parameters[self::DISABLED_PARAM]);
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function visitMetadata(DatagridConfiguration $config, MetadataObject $data)
     {
diff --git a/src/Oro/Bundle/ReportBundle/Resources/views/Report/table/view.html.twig b/src/Oro/Bundle/ReportBundle/Resources/views/Report/table/view.html.twig
index 32880ffa91d..22166fbaf91 100644
--- a/src/Oro/Bundle/ReportBundle/Resources/views/Report/table/view.html.twig
+++ b/src/Oro/Bundle/ReportBundle/Resources/views/Report/table/view.html.twig
@@ -41,7 +41,17 @@
             </div>
         {% endif %}
         {% set renderParams = renderParams|default({})|merge({enableFullScreenLayout: true}) %}
-        {{ dataGrid.renderGrid(gridName, params|default({}), renderParams) }}
+        {% set params = params|default({})|merge({
+                '_grid_view': {
+                    '_disabled': true
+                },
+                '_tags': {
+                    '_disabled': true
+                }
+            })
+        %}
+
+        {{ dataGrid.renderGrid(gridName, params, renderParams) }}
     {% else %}
         <div class="container-fluid">
             <div class="grid-container">
diff --git a/src/Oro/Bundle/SegmentBundle/Resources/views/Segment/view.html.twig b/src/Oro/Bundle/SegmentBundle/Resources/views/Segment/view.html.twig
index 3cd25950712..1bea9b8bbd9 100644
--- a/src/Oro/Bundle/SegmentBundle/Resources/views/Segment/view.html.twig
+++ b/src/Oro/Bundle/SegmentBundle/Resources/views/Segment/view.html.twig
@@ -38,7 +38,17 @@
 {% block content_data %}
     {% if gridName is defined and gridName %}
         {% set renderParams = renderParams|default({})|merge({enableFullScreenLayout: true}) %}
-        {{ dataGrid.renderGrid(gridName, params|default({}), renderParams) }}
+        {% set params = params|default({})|merge({
+                '_grid_view': {
+                    '_disabled': true
+                },
+                '_tags': {
+                    '_disabled': true
+                }
+            })
+        %}
+
+        {{ dataGrid.renderGrid(gridName, params, renderParams) }}
     {% else %}
         <div class="container-fluid">
             <div class="grid-container">

From bc8c932aca085c73f493ffd496f8a314c15296f7 Mon Sep 17 00:00:00 2001
From: Dmitry Naydenov <dnaidonov@magecore.com>
Date: Thu, 24 Dec 2015 22:34:59 +0200
Subject: [PATCH 259/471] BAP-9301 Wrong List of BU in the filter on the grid 
 - style fix

---
 .../public/js/filter/choice-tree-filter.js    | 47 ++++++++++---------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/choice-tree-filter.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/choice-tree-filter.js
index d271c102568..ef4fa58a90c 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/choice-tree-filter.js
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/choice-tree-filter.js
@@ -192,7 +192,7 @@ define(function(require) {
                 items = this._getSelectedItems(items);
                 var temp = [];
                 _.each(items, function(value) {
-                    temp .push({
+                    temp.push({
                         value: value,
                         children: []
                     });
@@ -248,25 +248,26 @@ define(function(require) {
             return rootArray;
         },
 
-        _convertToTree: function (data) {
+        _convertToTree: function(data) {
             var response = [],
-                idToNodeMap = {};
+                idToNodeMap = {},
+                element = {};
 
-            _.each(data, function (value) {
-                var datum = {};
-                datum.value = value;
-                datum.children = [];
+            _.each(data, function(value) {
+                element = {};
+                element.value = value;
+                element.children = [];
 
-                idToNodeMap[datum.value.id] = datum;
+                idToNodeMap[element.value.id] = element;
 
-                if (!datum.value.owner_id) {
-                    response.push(datum);
+                if (!element.value.owner_id) {
+                    response.push(element);
                 } else {
-                    var parentNode = idToNodeMap[datum.value.owner_id];
+                    var parentNode = idToNodeMap[element.value.owner_id];
                     if (parentNode) {
-                        parentNode.children.push(datum);
+                        parentNode.children.push(element);
                     } else {
-                        response.push(datum);
+                        response.push(element);
                     }
                 }
             });
@@ -305,12 +306,12 @@ define(function(require) {
                 var id = self.name + '-' + value.value.id;
 
                 template += '<li>' +
-                '<label for="' + id + '" class="' + classSearchResult + '">' +
+                    '<label for="' + id + '" class="' + classSearchResult + '">' +
                     '<input id="' + id + '" ' +
-                            'value="' + value.value.id + '" ' +
-                            'type="checkbox" ' + classSelected + '>' +
+                    'value="' + value.value.id + '" ' +
+                    'type="checkbox" ' + classSelected + '>' +
                     value.value.name +
-                '</label>';
+                    '</label>';
                 if (value.children.length > 0) {
                     template += self.getListTemplate(value.children);
                 }
@@ -340,12 +341,12 @@ define(function(require) {
         },
 
         /**
-        * Set raw value to filter
-        *
-        * @param value
-        * @param skipRefresh
-        * @return {*}
-        */
+         * Set raw value to filter
+         *
+         * @param value
+         * @param skipRefresh
+         * @return {*}
+         */
         setValue: function(value, skipRefresh) {
             if (!tools.isEqualsLoosely(this.value, value)) {
                 var oldValue = this.value;

From d0f5a7324da01ebf1bdaadee714fd72c1ecb1063 Mon Sep 17 00:00:00 2001
From: Tom Holland <codesman@users.noreply.github.com>
Date: Wed, 23 Dec 2015 13:59:15 -0800
Subject: [PATCH 260/471] Update transition-actions.md

Added quotes and a comment on @create_date and @create_datetime actions because without the quotes the value is interpreted as integer and the object creation fails because it requires a string as input.
---
 .../workflow/workflow-entities/transition-actions.md          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/WorkflowBundle/Resources/doc/reference/workflow/workflow-entities/transition-actions.md b/src/Oro/Bundle/WorkflowBundle/Resources/doc/reference/workflow/workflow-entities/transition-actions.md
index 6fcca9aaef8..b5617618c42 100644
--- a/src/Oro/Bundle/WorkflowBundle/Resources/doc/reference/workflow/workflow-entities/transition-actions.md
+++ b/src/Oro/Bundle/WorkflowBundle/Resources/doc/reference/workflow/workflow-entities/transition-actions.md
@@ -434,7 +434,7 @@ OR
             # optional condition configuration
     parameters:
         attribute: $sales_funnel_start_date
-        date: 2014-04-01
+        date: '2014-04-01' # must use quotes because date parameter requires string value
 ```
 
 Create Date Time
@@ -463,7 +463,7 @@ OR
             # optional condition configuration
     parameters:
         attribute: $sales_funnel_start_date
-        time: 2014-04-01 12:12:00
+        time: '2014-04-01 12:12:00' # must use quotes because date parameter requires string value
         timezone: Europe/Kiev
 ```
 

From 09da89b91816294c6f189260ba5fa53fe4daafde Mon Sep 17 00:00:00 2001
From: Tom Holland <codesman@users.noreply.github.com>
Date: Wed, 23 Dec 2015 16:26:24 -0800
Subject: [PATCH 261/471] Fixed typo in transition-actions.md

---
 .../reference/workflow/workflow-entities/transition-actions.md  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/WorkflowBundle/Resources/doc/reference/workflow/workflow-entities/transition-actions.md b/src/Oro/Bundle/WorkflowBundle/Resources/doc/reference/workflow/workflow-entities/transition-actions.md
index b5617618c42..9c1101667df 100644
--- a/src/Oro/Bundle/WorkflowBundle/Resources/doc/reference/workflow/workflow-entities/transition-actions.md
+++ b/src/Oro/Bundle/WorkflowBundle/Resources/doc/reference/workflow/workflow-entities/transition-actions.md
@@ -463,7 +463,7 @@ OR
             # optional condition configuration
     parameters:
         attribute: $sales_funnel_start_date
-        time: '2014-04-01 12:12:00' # must use quotes because date parameter requires string value
+        time: '2014-04-01 12:12:00' # must use quotes because time parameter requires string value
         timezone: Europe/Kiev
 ```
 

From 84ed17a5a9cf0118fe68705194a08daeea93d541 Mon Sep 17 00:00:00 2001
From: Tom Holland <codesman@users.noreply.github.com>
Date: Thu, 24 Dec 2015 11:34:57 -0800
Subject: [PATCH 262/471] Added attribute parameter to call_method action

This appears to have been left out not sure if it's on purpose or not but the attribute parameter is used on the call_method action in this file: https://github.com/orocrm/crm/blob/d3d34ac52808bd2778cd4b5e490618ee19c165f8/src/OroCRM/Bundle/MagentoBundle/Resources/config/process.yml

When I was reading this doc and debugging my process config, I assumed the omission of the attribute parameter meant that it was not supported in the call_method action.  After looking at the magento_customer_export action (and in oro/platform/src/Oro/Bundle/WorkflowBundle/Model/Action/CallMethod.php) , it appears that this is incorrect and that attribute parameter is supported in the call_method action.
---
 .../workflow/workflow-entities/transition-actions.md      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/WorkflowBundle/Resources/doc/reference/workflow/workflow-entities/transition-actions.md b/src/Oro/Bundle/WorkflowBundle/Resources/doc/reference/workflow/workflow-entities/transition-actions.md
index 9c1101667df..0da585c398e 100644
--- a/src/Oro/Bundle/WorkflowBundle/Resources/doc/reference/workflow/workflow-entities/transition-actions.md
+++ b/src/Oro/Bundle/WorkflowBundle/Resources/doc/reference/workflow/workflow-entities/transition-actions.md
@@ -386,9 +386,11 @@ Call Method
 **Description:** Triggers call of object method with parameters.
 
 **Parameters:**
+ - attribute - (optional) target path where result of action will be saved
  - object - path to callee object
- - method - name of method to call
- - method_parameters - list of parameters that will be passed to method call.
+ - method - method name of callee object
+ - method_parameters - (optional) list of parameters that will be passed to method call
+
 
 **Configuration Example**
 ```
@@ -396,6 +398,7 @@ Call Method
     conditions:
         # optional condition configuration
     parameters:
+        attribute: $.leadContactAddAddress
         object: $lead.contact
         method: addAddress
         method_parameters: [$.result.address]
@@ -403,6 +406,7 @@ Call Method
 OR
 
 - @call_method: # add Address to Contact
+    attribute: $.leadContactAddAddress
     object: $lead.contact
     method: addAddress
     method_parameters: [$.result.address]

From dddfb30bd0305516bc863e26357e4527114b1c27 Mon Sep 17 00:00:00 2001
From: Tom Holland <codesman@users.noreply.github.com>
Date: Thu, 24 Dec 2015 12:37:35 -0800
Subject: [PATCH 263/471] Enforced conventions & added (optional) notes

Enforced convention of all parameter descriptions ending in ;

Also enforced convention of indicating if a parameter is optional by moving all (optional) statements to directly after the dash following the parameter name.

A few other misc convention/grammar changes.
---
 .../workflow-entities/transition-actions.md   | 66 +++++++++----------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/Oro/Bundle/WorkflowBundle/Resources/doc/reference/workflow/workflow-entities/transition-actions.md b/src/Oro/Bundle/WorkflowBundle/Resources/doc/reference/workflow/workflow-entities/transition-actions.md
index 0da585c398e..d652e3e7eb0 100644
--- a/src/Oro/Bundle/WorkflowBundle/Resources/doc/reference/workflow/workflow-entities/transition-actions.md
+++ b/src/Oro/Bundle/WorkflowBundle/Resources/doc/reference/workflow/workflow-entities/transition-actions.md
@@ -85,7 +85,7 @@ Assign Value
 
 **Parameters:**
  - attribute / 0 - attribute where value should be set;
- - value / 1 - value that should be set.
+ - value / 1 - value that should be set;
 
 **Configuration Example**
 ```
@@ -167,10 +167,10 @@ Create Object
 **Description:** Creates object with specified class and data, and sets it as attribute value.
 
 **Parameters:**
- - class - class name of created object;
- - arguments - array of object constructor arguments;
- - attribute - attribute that will contain entity instance;
- - data - array of data that should be set to entity.
+ - class - fully qualified class name of object to be created;
+ - arguments - (optional) array of object constructor arguments;
+ - attribute - attribute that will contain the created object instance;
+ - data - (optional) array of data that should be set to object;
 
 **Configuration Example**
 ```
@@ -199,11 +199,11 @@ Create Entity
 **Description:** Creates entity with specified class and data, and sets it as attribute value.
 
 **Parameters:**
- - class - fully qualified class name of created entity;
- - attribute - attribute that will contain entity instance;
- - flush - when flush in DB should be performed.
+ - class - fully qualified class name of entity to be created;
+ - attribute - attribute that will contain the created entity instance;
+ - flush - (optional) when flush in DB should be performed.
            Immediately after entity creation if ``true`` or later if ``false`` (default value: false);
- - data - array of data that should be set to entity.
+ - data - (optional) array of data that should be set to entity.
 
 **Configuration Example**
 ```
@@ -293,15 +293,15 @@ Find Entity
 
 **Alias:** find_entity|request_entity
 
-**Description:** Finds entity by identifier value or "where" condition and saves reference or entity to path.
+**Description:** Finds entity by parameter value and saves reference or entity to path. You must define at least one of 3 optional parameters: `identifier`, `where` or `order_by`.
 
 **Parameters:**
  - class - fully qualified class name of requested entity;
  - attribute - target path where result of action will be saved;
- - identifier - value of identifier of entity to find;
- - where - array of conditions to find entity, key is field name, value is scalar value or path;
- - order_by - array of fields used to sort values, key is field name, value is direction (asc or desc);
- - case_insensitive - boolean flag used to find entity using case insensitive search, default value is false.
+ - identifier - (optional) value of identifier of entity to find;
+ - where - (optional) array of conditions to find entity, key is field name, value is scalar value or path;
+ - order_by - (optional) array of fields used to sort values, key is field name, value is direction (asc or desc);
+ - case_insensitive - (optional) boolean flag used to find entity using case insensitive search, default value is false;
 
 **Configuration Example**
 ```
@@ -386,10 +386,10 @@ Call Method
 **Description:** Triggers call of object method with parameters.
 
 **Parameters:**
- - attribute - (optional) target path where result of action will be saved
- - object - path to callee object
- - method - method name of callee object
- - method_parameters - (optional) list of parameters that will be passed to method call
+ - attribute - (optional) target path where result of action will be saved;
+ - object - fully qualified class name of object to be referenced;
+ - method - method name of referenced object to be called;
+ - method_parameters - (optional) list of parameters that will be passed to method call;
 
 
 **Configuration Example**
@@ -481,10 +481,10 @@ Start Workflow
 **Description:** Triggers start of workflow with configured data. As a result a new WorkflowItem will be produced.
 
 **Parameters:**
- - name - name of Workflow to start
- - attribute - path where result WorkflowItem will be saved
- - entity - path to entity that plays role of managed entity in started Workflow (optional)
- - transition - name of start transition (optional)
+ - name - name of Workflow to start;
+ - attribute - path where result WorkflowItem will be saved;
+ - entity - (optional) path to entity that plays role of managed entity in started Workflow;
+ - transition - (optional) name of start transition;
 
 **Configuration Example**
 ```
@@ -517,9 +517,9 @@ Transit Workflow
 **Description:** Performs transition for workflow on a specific entity. Workflow must be already started. 
 
 **Parameters:**
- - entity (or first parameter) - path to entity used for transition operation
- - transition (or second parameter) - name of the transition
- - data (or third parameter) - additional data passed to workflow item before transition (optional)
+ - entity (or first parameter) - path to entity used for transition operation;
+ - transition (or second parameter) - name of the transition;
+ - data (or third parameter) - (optional) additional data passed to workflow item before transition;
  
 **Configuration Example**
 ```
@@ -559,9 +559,9 @@ Redirect
 **Description:** Redirects unset to some route
 
 **Parameters:**
- - url - URL where user should be redirected
- - route - name of the route, if set than url parameter will be ignored
- - route_parameters - parameters of route
+ - url - URL where user should be redirected;
+ - route - (optional) name of the route, if set than url parameter will be ignored;
+ - route_parameters - (optional) parameters of route;
 
 **Configuration Example**
 ```
@@ -684,14 +684,14 @@ Flash Message
 
 **Alias:** flash_message
 
-**Parameters:**
- - message - message itself, will be passed to translator. Required.
- - message_parameters - message parameters, that will be passed to translator as second argument. Optional.
- - type - message type applicable for Flash Bag. Optional, info by default.
-
 **Description:** Add flash message to session flash bag. Provides ability to show flash messages on frontend.
 Messages are passed through translator.
 
+**Parameters:**
+ - message - message itself, will be passed to translator;
+ - message_parameters - (optional) message parameters, that will be passed to translator as second argument;
+ - type - (optional) message type applicable for Flash Bag. Set to info by default;
+
 **Configuration Example**
 ```
 @flash_message:

From 079fc49dc9ce2664c6f32d65a16929b8616f1cca Mon Sep 17 00:00:00 2001
From: Dmitry Naydenov <dnaidonov@magecore.com>
Date: Fri, 25 Dec 2015 00:43:58 +0200
Subject: [PATCH 264/471] BAP-9301 Wrong List of BU in the filter on the grid -
 fix logic

---
 .../Filter/ChoiceTreeBusinessUnitProvider.php | 32 ++++++++-----------
 .../ChoiceTreeBusinessUnitProviderTest.php    | 26 ++++++---------
 2 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/src/Oro/Bundle/OrganizationBundle/Provider/Filter/ChoiceTreeBusinessUnitProvider.php b/src/Oro/Bundle/OrganizationBundle/Provider/Filter/ChoiceTreeBusinessUnitProvider.php
index ee42169e2ed..e68f05e24ca 100644
--- a/src/Oro/Bundle/OrganizationBundle/Provider/Filter/ChoiceTreeBusinessUnitProvider.php
+++ b/src/Oro/Bundle/OrganizationBundle/Provider/Filter/ChoiceTreeBusinessUnitProvider.php
@@ -54,10 +54,11 @@ public function getList()
         $response = [];
 
         $qb = $businessUnitRepo->getQueryBuilder();
-
-        $qb->andWhere(
-            $qb->expr()->in('businessUnit.id', ':ids')
-        );
+        $qb
+            ->andWhere(
+                $qb->expr()->in('businessUnit.id', ':ids')
+            )
+            ->orderBy('businessUnit.id', 'ASC');
 
         $qb->setParameter('ids', $this->getBusinessUnitIds());
 
@@ -111,25 +112,18 @@ protected function getUser()
      */
     protected function getBusinessUnitIds()
     {
-        $user         = $this->getUser();
-        $organization = $user->getOrganization();
-
         /** @var OwnerTree $tree */
-        $tree = $this->treeProvider->getTree();
+        $tree   = $this->treeProvider->getTree();
+        $user   = $this->getUser();
+        $result = [];
 
-        $userBUIds = $tree->getUserBusinessUnitIds(
-            $user->getId(),
-            $organization->getId()
-        );
+        $organizations = $user->getOrganizations();
 
-        $result = [];
-        foreach ($userBUIds as $businessUnitId) {
-            $subordinateBUIds = $tree->getSubordinateBusinessUnitIds($businessUnitId);
-            $result           = array_merge($subordinateBUIds, $result);
+        foreach ($organizations as $organization) {
+            $subBUIds = $tree->getUserSubordinateBusinessUnitIds($user->getId(), $organization->getId());
+            $result   = array_merge($result, $subBUIds);
         }
 
-        return array_unique(
-            array_merge($userBUIds, $result)
-        );
+        return array_unique($result);
     }
 }
diff --git a/src/Oro/Bundle/OrganizationBundle/Tests/Unit/Provider/Filter/ChoiceTreeBusinessUnitProviderTest.php b/src/Oro/Bundle/OrganizationBundle/Tests/Unit/Provider/Filter/ChoiceTreeBusinessUnitProviderTest.php
index 61a0c69bfe8..a8f96c63806 100644
--- a/src/Oro/Bundle/OrganizationBundle/Tests/Unit/Provider/Filter/ChoiceTreeBusinessUnitProviderTest.php
+++ b/src/Oro/Bundle/OrganizationBundle/Tests/Unit/Provider/Filter/ChoiceTreeBusinessUnitProviderTest.php
@@ -49,7 +49,7 @@ public function setUp()
     /**
      * @dataProvider getListDataProvider
      */
-    public function testGetList($userBUIds, $subordinateBUIds, $times, $queryResult, $result)
+    public function testGetList($userBUIds, $queryResult, $result)
     {
         $businessUnitRepos = $this->getMockBuilder('BusinessUnitRepository')
             ->disableOriginalConstructor()
@@ -62,16 +62,16 @@ public function testGetList($userBUIds, $subordinateBUIds, $times, $queryResult,
             ->getMock();
 
         $treeOwner = $this->getMockBuilder('Oro\Bundle\SecurityBundle\Owner\OwnerTree')
-            ->setMethods(['getUserBusinessUnitIds', 'getSubordinateBusinessUnitIds'])
+            ->setMethods(['getUserSubordinateBusinessUnitIds'])
             ->disableOriginalConstructor()
             ->getMock();
 
         $this->treeProvider->expects(self::once())->method('getTree')->willReturn($treeOwner);
-        $treeOwner->expects(self::once())->method('getUserBusinessUnitIds')->willReturn($userBUIds);
+
         $treeOwner
-            ->expects(self::exactly($times))
-            ->method('getSubordinateBusinessUnitIds')
-            ->willReturn($subordinateBUIds);
+            ->expects(self::once())
+            ->method('getUserSubordinateBusinessUnitIds')
+            ->willReturn($userBUIds);
 
         $this->aclHelper->expects(self::any())->method('apply')->willReturn($qb);
         $businessUnitRepos->expects(self::any())->method('getQueryBuilder')->willReturn($qb);
@@ -88,13 +88,13 @@ public function testGetList($userBUIds, $subordinateBUIds, $times, $queryResult,
         $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
 
         $user = $this->getMockBuilder('Oro\Bundle\UserBundle\Entity\User')
-            ->setMethods(['getId', 'getOrganization'])
+            ->setMethods(['getId', 'getOrganizations'])
             ->disableOriginalConstructor()
             ->getMock();
 
         $organization = $this->getMock('Oro\Bundle\OrganizationBundle\Entity\OrganizationInterface');
         $organization->expects(self::once())->method('getId')->willReturn(1);
-        $user->expects(self::once())->method('getOrganization')->willReturn($organization);
+        $user->expects(self::once())->method('getOrganizations')->willReturn([$organization]);
         $this->securityFacade->expects(self::once())->method('getToken')->willReturn($tokenStorage);
         $tokenStorage->expects(self::once())->method('getUser')->willReturn($user);
 
@@ -116,9 +116,7 @@ public function getListDataProvider()
     {
         return [
             'Three elements in the list' => [
-                'userBUIds'        => [1],
-                'subordinateBUIds' => [2, 3],
-                'times'            => 1,
+                'userBUIds'        => [1, 2, 3],
                 'queryResult'      => $this->getBusinessUnits('one'),
                 'result'           => [
                     [
@@ -139,9 +137,7 @@ public function getListDataProvider()
                 ]
             ],
             'Six elements in the list'   => [
-                'userBUIds'        => [1, 2],
-                'subordinateBUIds' => [3, 4, 5, 6],
-                'times'            => 2,
+                'userBUIds'        => [1, 2, 3, 4, 5, 6],
                 'queryResult'      => $this->getBusinessUnits('two'),
                 'result'           => [
                     [
@@ -183,8 +179,6 @@ public function getListDataProvider()
             ],
             'empty list'                 => [
                 'userBUIds'        => [],
-                'subordinateBUIds' => [],
-                'times'            => 0,
                 'queryResult'      => [],
                 'result'           => []
             ],

From d74f7236216fea98d08a8e7182c3bb70c19d8e4c Mon Sep 17 00:00:00 2001
From: Tom Holland <codesman@hackattic.net>
Date: Thu, 24 Dec 2015 14:43:23 -0800
Subject: [PATCH 265/471] Remove extra line that was making CI fail

---
 .../Layout/Block/Extension/ConfigExpressionExtensionTest.php     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Extension/ConfigExpressionExtensionTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Extension/ConfigExpressionExtensionTest.php
index 26842db0ed0..4761f937081 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Extension/ConfigExpressionExtensionTest.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Extension/ConfigExpressionExtensionTest.php
@@ -110,4 +110,3 @@ protected function getDataAccessorMock()
         return $this->getMock('Oro\Component\Layout\DataAccessorInterface');
     }
 }
-

From df56e054987e0d0507d61b4a5c30be0c843747e7 Mon Sep 17 00:00:00 2001
From: Dmitry Naydenov <dnaidonov@magecore.com>
Date: Fri, 25 Dec 2015 01:05:17 +0200
Subject: [PATCH 266/471] BAP-9301 Wrong List of BU in the filter on the grid -
 js style fix

---
 .../Resources/public/js/filter/choice-tree-filter.js        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/choice-tree-filter.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/choice-tree-filter.js
index ef4fa58a90c..48d95399ca9 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/choice-tree-filter.js
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/choice-tree-filter.js
@@ -249,9 +249,9 @@ define(function(require) {
         },
 
         _convertToTree: function(data) {
-            var response = [],
-                idToNodeMap = {},
-                element = {};
+            var response = [];
+            var idToNodeMap = {};
+            var element = {};
 
             _.each(data, function(value) {
                 element = {};

From 4aee038ff716f0cef804894c7a10cf4218320868 Mon Sep 17 00:00:00 2001
From: Ignat Shcheglovskyi <ignat@orocrm.com>
Date: Thu, 24 Dec 2015 16:36:17 -0800
Subject: [PATCH 267/471] BAP-9594: Role grid shows organization column
 incorrectly - fix issue in datagrid "roles-grid" - added acl_resource and set
 - deprecate constants of datagrid configuration in Builder, move them to
 DatagridConfiguration - add methods to DatagridConfiguration:
 getDatasourceType, getAclResource, isDatasourceSkipAclApply - move datagrid
 option [source][acl_resource] to path [acl_resource] and add backward
 compatibility - deprecate datagrid option option [option][skip_acl_check],
 add option  [source][skip_acl_apply] instead and add backward compatibility -
 refactor existing datagrid configurations and client code to use new approach
 - fix typo in option of datagrid action - "acl_recource" to "acl_resource" -
 update documentation - update tests

---
 UPGRADE-1.9.md                                | 51 ++++++++++++++++
 .../Resources/config/datagrid.yml             | 22 +++----
 .../CronBundle/Resources/config/datagrid.yml  |  4 +-
 .../Resources/config/datagrid.yml             |  2 +-
 .../Resources/config/datagrid.yml             |  4 +-
 .../Controller/GridController.php             |  5 +-
 .../DataGridBundle/Datagrid/Builder.php       | 38 ++++++++++--
 .../Datagrid/Common/DatagridConfiguration.php | 59 +++++++++++++++++++
 .../OrmDatasourceAclListener.php              |  3 +-
 .../GridParams/GridParamsExtension.php        |  3 +-
 .../MassAction/MassActionDispatcher.php       |  3 +-
 .../Extension/Pager/OrmPagerExtension.php     |  9 +--
 .../Extension/Sorter/OrmSorterExtension.php   |  3 +-
 .../Extension/Totals/OrmTotalsExtension.php   |  5 +-
 .../backend/advanced_grid_configuration.md    | 33 ++++++++---
 .../Totals/OrmTotalsExtensionTest.php         |  9 +--
 .../Tests/Unit/Twig/DataGridExtensionTest.php | 20 ++-----
 .../DataGridBundle/Twig/DataGridExtension.php |  6 +-
 .../EmailBundle/Resources/config/datagrid.yml |  8 +--
 .../Resources/config/datagrid.yml             |  2 +-
 .../Resources/config/datagrid.yml             |  4 +-
 .../Resources/config/datagrid.yml             |  8 +--
 .../Grid/AbstractFieldsExtension.php          |  3 +-
 .../Datagrid/EntityPaginationExtension.php    |  3 +-
 .../Grid/Extension/OrmFilterExtension.php     |  5 +-
 .../Resources/config/datagrid.yml             |  4 +-
 .../Resources/config/datagrid.yml             |  2 +-
 .../Event/BusinessUnitGridListener.php        | 13 ++--
 .../Resources/config/datagrid.yml             |  7 +--
 .../Grid/Extension/OrmDatasourceExtension.php |  3 +-
 .../Resources/config/datagrid.yml             |  2 +-
 .../Extension/Pager/SearchPagerExtension.php  |  3 +-
 .../Resources/config/datagrid.yml             |  4 +-
 .../TagBundle/Resources/config/datagrid.yml   |  4 +-
 .../Resources/config/datagrid.yml             |  4 +-
 .../EventListener/OwnerUserGridListener.php   | 13 ++--
 .../UserBundle/Resources/config/datagrid.yml  | 19 +++---
 .../Resources/config/datagrid.yml             |  6 +-
 38 files changed, 265 insertions(+), 131 deletions(-)

diff --git a/UPGRADE-1.9.md b/UPGRADE-1.9.md
index 15368013573..35609e6832d 100644
--- a/UPGRADE-1.9.md
+++ b/UPGRADE-1.9.md
@@ -34,6 +34,57 @@ UPGRADE FROM 1.8 to 1.9
 - `audit-grid` and `audit-history-grid` based on `Oro\Bundle\DataAuditBundle\Entity\AbstractAudit` now. Make join to get your entity on grid
 
 ####DataGridBundle
+- `Oro\Bundle\DataGridBundle\Datagrid\Builder::DATASOURCE_PATH` marked as deprecated. Use `Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration::DATASOURCE_PATH`.
+- `Oro\Bundle\DataGridBundle\Datagrid\Builder::DATASOURCE_TYPE_PATH` marked as deprecated. Use `Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration::getAclResource`.
+- `Oro\Bundle\DataGridBundle\Datagrid\Builder::DATASOURCE_ACL_PATH` marked as deprecated. Use `Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration::getAclResource`.
+- `Oro\Bundle\DataGridBundle\Datagrid\Builder::BASE_DATAGRID_CLASS_PATH` marked as deprecated. Use `Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration::BASE_DATAGRID_CLASS_PATH`.
+- `Oro\Bundle\DataGridBundle\Datagrid\Builder::DATASOURCE_SKIP_ACL_CHECK` marked as deprecated. Use `Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration::isDatasourceSkipAclApply`.
+- `Oro\Bundle\DataGridBundle\Datagrid\Builder::DATASOURCE_SKIP_COUNT_WALKER_PATH` marked as deprecated. Use `Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration::DATASOURCE_SKIP_COUNT_WALKER_PATH`.
+- Option "acl_resource" moved from option "source" too root node of datagrid configuration:
+
+Before
+
+```
+datagrid:
+    acme-demo-grid:
+        ... # some configuration
+        source:
+            acl_resource: 'acme_demo_entity_view'
+            ... # some configuration
+```
+
+Now
+
+```
+datagrid:
+    acme-demo-grid:
+        acl_resource: 'acme_demo_entity_view'
+        ... # some configuration
+```
+
+- Option of datagrid "skip_acl_check" is deprecated, use option "skip_acl_apply" instead. Logic of this option was also changed. Before this option caused ignorance of option "acl_resource". Now it is responsible only for indication whether or not ACL should be applied to source query of the grid. See [advanced_grid_configuration.md](.src/Oro/Bundle/DataGridBundle/Resources/doc/backend/advanced_grid_configuration.md) for use cases. 
+
+Before
+
+```
+datagrid:
+    acme-demo-grid:
+        ... # some configuration
+        options:
+            skip_acl_check: true
+```
+
+Now
+
+```
+datagrid:
+    acme-demo-grid:
+        ... # some configuration
+        source:
+            skip_acl_apply: true
+            ... # some configuration
+```
+
 - Services with tag `oro_datagrid.extension.formatter.property` was marked as private
 - JS collection models format changed to maintain compatibility with Backbone collections: now it is always list of models, and additional parameters are passed through the options 
 - Grid merge uses distinct policy
diff --git a/src/Oro/Bundle/CalendarBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/CalendarBundle/Resources/config/datagrid.yml
index 5a3738772fc..3e62d83b8c3 100644
--- a/src/Oro/Bundle/CalendarBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/CalendarBundle/Resources/config/datagrid.yml
@@ -1,8 +1,8 @@
 datagrid:
     calendar-event-grid:
+        acl_resource: oro_calendar_event_view
         source:
             type: orm
-            acl_resource: oro_calendar_event_view
             query:
                 select:
                     - event.id
@@ -119,25 +119,25 @@ datagrid:
                 label:        Accept
                 link:         accept_link
                 icon:         ok
-                acl_recource: oro_calendar_event_view
+                acl_resource: oro_calendar_event_view
             tentatively:
                 type:         ajax
                 label:        Tentative
                 link:         tentatively_link
                 icon:         question
-                acl_recource: oro_calendar_event_view
+                acl_resource: oro_calendar_event_view
             decline:
                 type:         ajax
                 label:        Decline
                 link:         decline_link
                 icon:         remove
-                acl_recource: oro_calendar_event_view
+                acl_resource: oro_calendar_event_view
             view:
                 type:         navigate
                 label:        View
                 link:         view_link
                 icon:         eye-open
-                acl_recource: oro_calendar_event_view
+                acl_resource: oro_calendar_event_view
                 rowAction:    true
             update:
                 type:          navigate
@@ -157,9 +157,9 @@ datagrid:
             entity_pagination: true
 
     widget-base-calendar-event-grid:
+        acl_resource: oro_calendar_event_view
         source:
             type: orm
-            acl_resource: oro_calendar_event_view
             query:
                 select:
                     - event.id
@@ -210,10 +210,10 @@ datagrid:
                     data_name: event.end
 
     users-calendar-select-grid-exclude-owner:
+        acl_resource: oro_user_user_view
         options:
             entityHint: calendar
         source:
-            acl_resource: oro_user_user_view
             type: orm
             query:
                 select:
@@ -289,6 +289,7 @@ datagrid:
     base-system-calendar-event-grid:
         source:
             type: orm
+            skip_acl_apply: true
             query:
                 select:
                     - event.id
@@ -355,7 +356,7 @@ datagrid:
                 label:        View
                 link:         view_link
                 icon:         eye-open
-                acl_recource: oro_calendar_event_view
+                acl_resource: oro_calendar_event_view
                 rowAction:    true
             update:
                 type:          navigate
@@ -371,7 +372,6 @@ datagrid:
                 link:          delete_link
         options:
             entityHint: calendar_events
-            skip_acl_check: true
             entity_pagination: true
 
     system-calendar-event-grid:
@@ -395,6 +395,7 @@ datagrid:
     system-calendar-grid:
         source:
             type: orm
+            skip_acl_apply: true
             query:
                 select:
                     - sc.id
@@ -464,5 +465,4 @@ datagrid:
                 icon:          trash
                 link:          delete_link
         action_configuration: @oro_calendar.listener.datagrid.system_calendar->getActionConfigurationClosure
-        options:
-            skip_acl_check: true
+
diff --git a/src/Oro/Bundle/CronBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/CronBundle/Resources/config/datagrid.yml
index 614db6f52f3..3dc0f4b05b2 100644
--- a/src/Oro/Bundle/CronBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/CronBundle/Resources/config/datagrid.yml
@@ -1,8 +1,8 @@
 datagrid:
     jobs-grid:
+        acl_resource: oro_jobs
         source:
             type: orm
-            acl_resource: oro_jobs
             query:
                 select:
                     - partial j.{id, command, args, state, runtime, memoryUsageReal, priority, createdAt}
@@ -89,7 +89,7 @@ datagrid:
                 label:        oro.grid.action.view
                 link:         view_link
                 icon:         eye-open
-                acl_recource: oro_jobs
+                acl_resource: oro_jobs
                 rowAction:    true
         options:
             entityHint: job
diff --git a/src/Oro/Bundle/DashboardBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/DashboardBundle/Resources/config/datagrid.yml
index 71e7c80e5bb..3bd2d58292e 100644
--- a/src/Oro/Bundle/DashboardBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/DashboardBundle/Resources/config/datagrid.yml
@@ -1,8 +1,8 @@
 datagrid:
     dashboards-grid:
+        acl_resource: oro_dashboard_view
         source:
             type: orm
-            acl_resource: oro_dashboard_view
             query:
                 select:
                     - dashboard.id
diff --git a/src/Oro/Bundle/DataAuditBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/DataAuditBundle/Resources/config/datagrid.yml
index b0730a6904e..7b38ace447b 100644
--- a/src/Oro/Bundle/DataAuditBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/DataAuditBundle/Resources/config/datagrid.yml
@@ -1,9 +1,9 @@
 datagrid:
     audit-grid:
+        acl_resource: oro_dataaudit_history
         options:
             entityHint: audit
         source:
-            acl_resource: oro_dataaudit_history
             type: orm
             query:
                 select:
@@ -122,8 +122,8 @@ datagrid:
                     enabled: false
 
     audit-history-grid:
+        acl_resource: oro_dataaudit_history
         source:
-            acl_resource: oro_dataaudit_history
             type: orm
             query:
                 select:
diff --git a/src/Oro/Bundle/DataGridBundle/Controller/GridController.php b/src/Oro/Bundle/DataGridBundle/Controller/GridController.php
index 69975475499..15baf3f377a 100644
--- a/src/Oro/Bundle/DataGridBundle/Controller/GridController.php
+++ b/src/Oro/Bundle/DataGridBundle/Controller/GridController.php
@@ -58,10 +58,9 @@ public function getAction($gridName)
     {
         $gridManager = $this->get('oro_datagrid.datagrid.manager');
         $gridConfig  = $gridManager->getConfigurationForGrid($gridName);
-        $acl         = $gridConfig->offsetGetByPath(Builder::DATASOURCE_ACL_PATH);
-        $aclSkip     = $gridConfig->offsetGetByPath(Builder::DATASOURCE_SKIP_ACL_CHECK, false);
+        $acl         = $gridConfig->getAclResource();
 
-        if (!$aclSkip && $acl && !$this->get('oro_security.security_facade')->isGranted($acl)) {
+        if ($acl && !$this->get('oro_security.security_facade')->isGranted($acl)) {
             throw new AccessDeniedException('Access denied.');
         }
 
diff --git a/src/Oro/Bundle/DataGridBundle/Datagrid/Builder.php b/src/Oro/Bundle/DataGridBundle/Datagrid/Builder.php
index 41c34cb0736..5f207f5bfa7 100644
--- a/src/Oro/Bundle/DataGridBundle/Datagrid/Builder.php
+++ b/src/Oro/Bundle/DataGridBundle/Datagrid/Builder.php
@@ -15,13 +15,40 @@
 
 class Builder
 {
+    /**
+     * @deprecated Since 1.9, will be removed after 1.11.
+     * @see DatagridConfiguration::DATASOURCE_PATH
+     */
     const DATASOURCE_PATH           = '[source]';
+
+    /**
+     * @deprecated Since 1.9, will be removed after 1.11.
+     * @see DatagridConfiguration::DATASOURCE_TYPE_PATH, DatagridConfiguration::getDatasourceType
+     */
     const DATASOURCE_TYPE_PATH      = '[source][type]';
+
+    /**
+     * @deprecated Since 1.9, will be removed after 1.11.
+     * @see DatagridConfiguration::ACL_RESOURCE_PATH, DatagridConfiguration::getAclResource
+     */
     const DATASOURCE_ACL_PATH       = '[source][acl_resource]';
+
+    /**
+     * @deprecated Since 1.9, will be removed after 1.11.
+     * @see DatagridConfiguration::BASE_DATAGRID_CLASS_PATH
+     */
     const BASE_DATAGRID_CLASS_PATH  = '[options][base_datagrid_class]';
+
+    /**
+     * @deprecated Since 1.9, will be removed after 1.11.
+     * @see DatagridConfiguration::DATASOURCE_SKIP_ACL_APPLY_PATH, DatagridConfiguration::isDatasourceSkipAclApply
+     */
     const DATASOURCE_SKIP_ACL_CHECK = '[options][skip_acl_check]';
 
-    // Use this option as workaround for http://www.doctrine-project.org/jira/browse/DDC-2794
+    /**
+     * @deprecated Since 1.9, will be removed after 1.11.
+     * @see DatagridConfiguration::DATASOURCE_SKIP_COUNT_WALKER_PATH
+     */
     const DATASOURCE_SKIP_COUNT_WALKER_PATH = '[options][skip_count_walker]';
 
     /** @var string */
@@ -79,7 +106,7 @@ public function build(DatagridConfiguration $config, ParameterBag $parameters)
         $event = new PreBuild($config, $parameters);
         $this->eventDispatcher->dispatch(PreBuild::NAME, $event);
 
-        $class = $config->offsetGetByPath(self::BASE_DATAGRID_CLASS_PATH, $this->baseDatagridClass);
+        $class = $config->offsetGetByPath(DatagridConfiguration::BASE_DATAGRID_CLASS_PATH, $this->baseDatagridClass);
         $name  = $config->getName();
 
         /** @var DatagridInterface $datagrid */
@@ -170,7 +197,7 @@ protected function createAcceptor(DatagridConfiguration $config, ParameterBag $p
      */
     protected function buildDataSource(DatagridInterface $grid, DatagridConfiguration $config)
     {
-        $sourceType = $config->offsetGetByPath(self::DATASOURCE_TYPE_PATH, false);
+        $sourceType = $config->offsetGetByPath(DatagridConfiguration::DATASOURCE_TYPE_PATH, false);
         if (!$sourceType) {
             throw new RuntimeException('Datagrid source does not configured');
         }
@@ -179,6 +206,9 @@ protected function buildDataSource(DatagridInterface $grid, DatagridConfiguratio
             throw new RuntimeException(sprintf('Datagrid source "%s" does not exist', $sourceType));
         }
 
-        $this->dataSources[$sourceType]->process($grid, $config->offsetGetByPath(self::DATASOURCE_PATH, []));
+        $this->dataSources[$sourceType]->process(
+            $grid,
+            $config->offsetGetByPath(DatagridConfiguration::DATASOURCE_PATH, [])
+        );
     }
 }
diff --git a/src/Oro/Bundle/DataGridBundle/Datagrid/Common/DatagridConfiguration.php b/src/Oro/Bundle/DataGridBundle/Datagrid/Common/DatagridConfiguration.php
index 261ceb16a7d..d21629ee02c 100644
--- a/src/Oro/Bundle/DataGridBundle/Datagrid/Common/DatagridConfiguration.php
+++ b/src/Oro/Bundle/DataGridBundle/Datagrid/Common/DatagridConfiguration.php
@@ -3,7 +3,66 @@
 namespace Oro\Bundle\DataGridBundle\Datagrid\Common;
 
 use Oro\Bundle\DataGridBundle\Common\Object;
+use Oro\Bundle\DataGridBundle\Datagrid\Builder;
 
 class DatagridConfiguration extends Object
 {
+    const DATASOURCE_PATH = '[source]';
+    const DATASOURCE_TYPE_PATH = '[source][type]';
+    const BASE_DATAGRID_CLASS_PATH  = '[options][base_datagrid_class]';
+
+    // Use this option as workaround for http://www.doctrine-project.org/jira/browse/DDC-2794
+    const DATASOURCE_SKIP_COUNT_WALKER_PATH = '[options][skip_count_walker]';
+
+    /**
+     * This option refers to ACL resource that will be checked before datagrid is loaded.
+     */
+    const ACL_RESOURCE_PATH = '[acl_resource]';
+
+    /**
+     * This option makes possible to skip apply of ACL adjustment to source query of datagrid.
+     */
+    const DATASOURCE_SKIP_ACL_APPLY_PATH = '[source][skip_acl_apply]';
+
+    /**
+     * @return string
+     */
+    public function getDatasourceType()
+    {
+        return $this->offsetGetByPath(self::DATASOURCE_TYPE_PATH);
+    }
+
+    /**
+     * Get value of "acl_resource" option from datagrid configuration.
+     *
+     * @return string|null
+     */
+    public function getAclResource()
+    {
+        $result = $this->offsetGetByPath(self::ACL_RESOURCE_PATH);
+
+        if (!$result) {
+            // Support backward compatibility until 1.11 to get this option from deprecated path.
+            $result = $this->offsetGetByPath(Builder::DATASOURCE_ACL_PATH);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Check if ACL apply to source query of datagrid should be skipped
+     *
+     * @return bool
+     */
+    public function isDatasourceSkipAclApply()
+    {
+        $result = $this->offsetGetByPath(self::DATASOURCE_SKIP_ACL_APPLY_PATH, false);
+
+        if (!$result) {
+            // Support backward compatibility until 1.11 to get this option from deprecated path.
+            $result = $this->offsetGetByPath(Builder::DATASOURCE_SKIP_ACL_CHECK, false);
+        }
+
+        return (bool)$result;
+    }
 }
diff --git a/src/Oro/Bundle/DataGridBundle/EventListener/OrmDatasourceAclListener.php b/src/Oro/Bundle/DataGridBundle/EventListener/OrmDatasourceAclListener.php
index 3fec80548df..5ffc52d86db 100644
--- a/src/Oro/Bundle/DataGridBundle/EventListener/OrmDatasourceAclListener.php
+++ b/src/Oro/Bundle/DataGridBundle/EventListener/OrmDatasourceAclListener.php
@@ -2,7 +2,6 @@
 
 namespace Oro\Bundle\DataGridBundle\EventListener;
 
-use Oro\Bundle\DataGridBundle\Datagrid\Builder;
 use Oro\Bundle\DataGridBundle\Event\OrmResultBefore;
 
 use Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper;
@@ -26,7 +25,7 @@ public function __construct(AclHelper $aclHelper)
     public function onResultBefore(OrmResultBefore $event)
     {
         $config = $event->getDatagrid()->getConfig();
-        if (!$config->offsetGetByPath(Builder::DATASOURCE_SKIP_ACL_CHECK, false)) {
+        if (!$config->isDatasourceSkipAclApply()) {
             $this->aclHelper->apply($event->getQuery());
         }
     }
diff --git a/src/Oro/Bundle/DataGridBundle/Extension/GridParams/GridParamsExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/GridParams/GridParamsExtension.php
index 9c841347635..69ff37d3994 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/GridParams/GridParamsExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/GridParams/GridParamsExtension.php
@@ -2,7 +2,6 @@
 
 namespace Oro\Bundle\DataGridBundle\Extension\GridParams;
 
-use Oro\Bundle\DataGridBundle\Datagrid\Builder;
 use Oro\Bundle\DataGridBundle\Datasource\Orm\OrmDatasource;
 use Oro\Bundle\DataGridBundle\Extension\AbstractExtension;
 use Oro\Bundle\DataGridBundle\Datagrid\Common\MetadataObject;
@@ -18,7 +17,7 @@ class GridParamsExtension extends AbstractExtension
      */
     public function isApplicable(DatagridConfiguration $config)
     {
-        return $config->offsetGetByPath(Builder::DATASOURCE_TYPE_PATH) == OrmDatasource::TYPE;
+        return $config->getDatasourceType() == OrmDatasource::TYPE;
     }
 
     /**
diff --git a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassActionDispatcher.php b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassActionDispatcher.php
index b07c2254204..922deb9950f 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassActionDispatcher.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassActionDispatcher.php
@@ -9,7 +9,6 @@
 use Symfony\Component\HttpFoundation\File\Exception\UnexpectedTypeException;
 use Symfony\Component\HttpFoundation\Request;
 
-use Oro\Bundle\DataGridBundle\Datagrid\Builder;
 use Oro\Bundle\DataGridBundle\Datagrid\Manager;
 use Oro\Bundle\DataGridBundle\Datagrid\DatagridInterface;
 use Oro\Bundle\DataGridBundle\Datasource\Orm\IterableResult;
@@ -110,7 +109,7 @@ public function dispatch($datagridName, $actionName, array $parameters, array $d
         //prepare query builder
         $qb->setMaxResults(null);
 
-        if (!$datagrid->getConfig()->offsetGetByPath(Builder::DATASOURCE_SKIP_ACL_CHECK, false)) {
+        if (!$datagrid->getConfig()->isDatasourceSkipAclApply()) {
             $qb = $this->aclHelper->apply($qb);
         }
 
diff --git a/src/Oro/Bundle/DataGridBundle/Extension/Pager/OrmPagerExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/Pager/OrmPagerExtension.php
index b3cb16fc04b..6e551f0426d 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/Pager/OrmPagerExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/Pager/OrmPagerExtension.php
@@ -2,7 +2,6 @@
 
 namespace Oro\Bundle\DataGridBundle\Extension\Pager;
 
-use Oro\Bundle\DataGridBundle\Datagrid\Builder;
 use Oro\Bundle\DataGridBundle\Datagrid\Common\MetadataObject;
 use Oro\Bundle\DataGridBundle\Datagrid\Common\ResultsObject;
 use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
@@ -50,7 +49,7 @@ public function isApplicable(DatagridConfiguration $config)
         $disabled = $this->getOr(PagerInterface::DISABLED_PARAM, false)
             || $config->offsetGetByPath(ToolbarExtension::TOOLBAR_PAGINATION_HIDE_OPTION_PATH, false);
 
-        return !$disabled && $config->offsetGetByPath(Builder::DATASOURCE_TYPE_PATH) == OrmDatasource::TYPE;
+        return !$disabled && $config->getDatasourceType() == OrmDatasource::TYPE;
     }
 
     /**
@@ -62,11 +61,9 @@ public function visitDatasource(DatagridConfiguration $config, DatasourceInterfa
 
         if ($datasource instanceof OrmDatasource) {
             $this->pager->setQueryBuilder($datasource->getQueryBuilder());
-            $this->pager->setSkipAclCheck(
-                $config->offsetGetByPath(Builder::DATASOURCE_SKIP_ACL_CHECK, false)
-            );
+            $this->pager->setSkipAclCheck($config->isDatasourceSkipAclApply());
             $this->pager->setSkipCountWalker(
-                $config->offsetGetByPath(Builder::DATASOURCE_SKIP_COUNT_WALKER_PATH)
+                $config->offsetGetByPath(DatagridConfiguration::DATASOURCE_SKIP_COUNT_WALKER_PATH)
             );
         }
 
diff --git a/src/Oro/Bundle/DataGridBundle/Extension/Sorter/OrmSorterExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/Sorter/OrmSorterExtension.php
index 4a08cd7ec9e..3580d888c56 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/Sorter/OrmSorterExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/Sorter/OrmSorterExtension.php
@@ -2,7 +2,6 @@
 
 namespace Oro\Bundle\DataGridBundle\Extension\Sorter;
 
-use Oro\Bundle\DataGridBundle\Datagrid\Builder;
 use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
 use Oro\Bundle\DataGridBundle\Datagrid\Common\MetadataObject;
 use Oro\Bundle\DataGridBundle\Datagrid\ParameterBag;
@@ -36,7 +35,7 @@ class OrmSorterExtension extends AbstractExtension
     public function isApplicable(DatagridConfiguration $config)
     {
         $columns      = $config->offsetGetByPath(Configuration::COLUMNS_PATH);
-        $isApplicable = $config->offsetGetByPath(Builder::DATASOURCE_TYPE_PATH) === OrmDatasource::TYPE
+        $isApplicable = $config->getDatasourceType() === OrmDatasource::TYPE
             && is_array($columns);
 
         return $isApplicable;
diff --git a/src/Oro/Bundle/DataGridBundle/Extension/Totals/OrmTotalsExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/Totals/OrmTotalsExtension.php
index d139d5fb719..76e66d1b6bf 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/Totals/OrmTotalsExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/Totals/OrmTotalsExtension.php
@@ -8,7 +8,6 @@
 
 use Symfony\Component\Translation\TranslatorInterface;
 
-use Oro\Bundle\DataGridBundle\Datagrid\Builder;
 use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
 use Oro\Bundle\DataGridBundle\Datagrid\Common\MetadataObject;
 use Oro\Bundle\DataGridBundle\Datagrid\Common\ResultsObject;
@@ -70,7 +69,7 @@ public function __construct(
      */
     public function isApplicable(DatagridConfiguration $config)
     {
-        return $config->offsetGetByPath(Builder::DATASOURCE_TYPE_PATH) === OrmDatasource::TYPE;
+        return $config->getDatasourceType() === OrmDatasource::TYPE;
     }
 
     /**
@@ -123,7 +122,7 @@ public function visitResult(DatagridConfiguration $config, ResultsObject $result
                         $result,
                         $rowConfig['columns'],
                         $rowConfig[Configuration::TOTALS_PER_PAGE_ROW_KEY],
-                        $config->offsetGetByPath(Builder::DATASOURCE_SKIP_ACL_CHECK, false)
+                        $config->isDatasourceSkipAclApply()
                     )
                 );
             }
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/doc/backend/advanced_grid_configuration.md b/src/Oro/Bundle/DataGridBundle/Resources/doc/backend/advanced_grid_configuration.md
index 958c8f36cab..fa02c01182e 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/doc/backend/advanced_grid_configuration.md
+++ b/src/Oro/Bundle/DataGridBundle/Resources/doc/backend/advanced_grid_configuration.md
@@ -238,28 +238,32 @@ datagrid:
 #### Problem:
 *I'm developing grid that should not be under ACL control*
 #### Solution:
-- set option 'skip_acl_check' to TRUE
+- set option 'skip_acl_apply' to TRUE
 
 Example:
 ``` yml
 datagrid:
     acme-demo-grid:
         ... # some configuration
-        options:
-            skip_acl_check: true
+        source:
+            skip_acl_apply: true
+            ... # some configuration of source
 ```
 
 #### Problem:
-*I want to implement some custom security verification/logic without any default acl, even if some "acl_resource" have been defined *
+*I want to implement some custom security verification/logic without any default ACL, even if some "acl_resource" have been defined *
 *e.g. i'm extending some existing grid but with custom acl logic*
 #### Solution:
-- configure grid (set option 'skip_acl_check' to TRUE)
+- configure grid (set option 'skip_acl_apply' to TRUE)
+- override option 'acl_resource' and to make it false
 ``` yml
 datagrid:
     acme-demo-grid:
         ... # some configuration
-        options:
-            skip_acl_check: true
+        acl_resource: false
+        source:
+            skip_acl_apply: true
+            ... # some configuration of source
 ```
 - declare own grid listener
 ```
@@ -273,3 +277,18 @@ my_bundle.event_listener.my_grid_listener:
 - as an example see:
     - Oro/Bundle/UserBundle/Resources/config/datagrid.yml (owner-users-select-grid)
     - Oro/Bundle/UserBundle/EventListener/OwnerUserGridListener.php (service name: "oro_user.event_listener.owner_user_grid_listener")
+
+#### Problem:
+*I want to have a grid secured by ACL resource but skip applying of ACL to DQL query of the grid.*
+#### Solution:
+- configure grid with option 'skip_acl_apply' set to TRUE, it will ignore applying of ACL to source query of the grid
+- configure grid with option 'acl_resource' set to name of some ACL resource, it will check permission to this ACL resouce before datagrid data will be loaded 
+``` yml
+datagrid:
+    acme-demo-grid:
+        ... # some configuration
+        acl_resource: 'acme_demo_entity_view'
+        source:
+            skip_acl_apply: true
+            
+```
diff --git a/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/Totals/OrmTotalsExtensionTest.php b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/Totals/OrmTotalsExtensionTest.php
index 0b1efe0c112..5e435b346df 100644
--- a/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/Totals/OrmTotalsExtensionTest.php
+++ b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/Totals/OrmTotalsExtensionTest.php
@@ -2,19 +2,12 @@
 
 namespace Oro\Bundle\DataGridBundle\Tests\Unit\Extension\Totals;
 
-use Doctrine\Common\Annotations\AnnotationReader;
-use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
-use Doctrine\ORM\QueryBuilder;
-
-use Oro\Bundle\DataGridBundle\Datagrid\Builder;
 use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
 use Oro\Bundle\DataGridBundle\Datagrid\Common\MetadataObject;
 use Oro\Bundle\DataGridBundle\Datagrid\Common\ResultsObject;
-use Oro\Bundle\DataGridBundle\Datasource\Orm\OrmDatasource;
 use Oro\Bundle\DataGridBundle\Extension\Totals\OrmTotalsExtension;
 use Oro\Bundle\DataGridBundle\Extension\Totals\Configuration;
 
-use Oro\Bundle\TestFrameworkBundle\Test\Doctrine\ORM\Mocks\EntityManagerMock;
 use Oro\Bundle\TestFrameworkBundle\Test\Doctrine\ORM\OrmTestCase;
 
 class OrmTotalsExtensionTest extends OrmTestCase
@@ -77,7 +70,7 @@ protected function setUp()
     public function testIsApplicable()
     {
         $this->assertTrue($this->extension->isApplicable($this->config));
-        $this->config->offsetSetByPath(Builder::DATASOURCE_TYPE_PATH, 'non_orm');
+        $this->config->offsetSetByPath(DatagridConfiguration::DATASOURCE_TYPE_PATH, 'non_orm');
         $this->assertFalse($this->extension->isApplicable($this->config));
     }
 
diff --git a/src/Oro/Bundle/DataGridBundle/Tests/Unit/Twig/DataGridExtensionTest.php b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Twig/DataGridExtensionTest.php
index 5962ffcadd6..a7fc3528cd9 100644
--- a/src/Oro/Bundle/DataGridBundle/Tests/Unit/Twig/DataGridExtensionTest.php
+++ b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Twig/DataGridExtensionTest.php
@@ -5,7 +5,6 @@
 use Oro\Bundle\DataGridBundle\Datagrid\DatagridInterface;
 use Symfony\Component\Routing\RouterInterface;
 
-use Oro\Bundle\DataGridBundle\Datagrid\Builder;
 use Oro\Bundle\DataGridBundle\Datagrid\ManagerInterface;
 use Oro\Bundle\DataGridBundle\Datagrid\NameStrategyInterface;
 use Oro\Bundle\DataGridBundle\Twig\DataGridExtension;
@@ -85,15 +84,11 @@ public function testGetGridWorks()
 
         $configuration = $this->getMockBuilder('Oro\\Bundle\\DataGridBundle\\Datagrid\\Common\\DatagridConfiguration')
             ->disableOriginalConstructor()
+            ->setMethods(['getAclResource'])
             ->getMock();
 
-        $configuration->expects($this->at(0))
-            ->method('offsetGetByPath')
-            ->with(Builder::DATASOURCE_ACL_PATH)
-            ->will($this->returnValue(null));
-        $configuration->expects($this->at(1))
-            ->method('offsetGetByPath')
-            ->with(Builder::DATASOURCE_SKIP_ACL_CHECK)
+        $configuration->expects($this->once())
+            ->method('getAclResource')
             ->will($this->returnValue(null));
 
         $this->manager->expects($this->once())
@@ -131,14 +126,9 @@ public function testGetGridReturnsNullWhenDontHavePermissions()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $configuration->expects($this->at(0))
-            ->method('offsetGetByPath')
-            ->with(Builder::DATASOURCE_ACL_PATH)
+        $configuration->expects($this->once())
+            ->method('getAclResource')
             ->will($this->returnValue($acl));
-        $configuration->expects($this->at(1))
-            ->method('offsetGetByPath')
-            ->with(Builder::DATASOURCE_SKIP_ACL_CHECK)
-            ->will($this->returnValue(false));
 
         $this->manager->expects($this->once())
             ->method('getConfigurationForGrid')
diff --git a/src/Oro/Bundle/DataGridBundle/Twig/DataGridExtension.php b/src/Oro/Bundle/DataGridBundle/Twig/DataGridExtension.php
index 8bef690d211..5b236cca61a 100644
--- a/src/Oro/Bundle/DataGridBundle/Twig/DataGridExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Twig/DataGridExtension.php
@@ -4,7 +4,6 @@
 
 use Symfony\Component\Routing\RouterInterface;
 
-use Oro\Bundle\DataGridBundle\Datagrid\Builder;
 use Oro\Bundle\DataGridBundle\Datagrid\DatagridInterface;
 use Oro\Bundle\DataGridBundle\Datagrid\ManagerInterface;
 use Oro\Bundle\DataGridBundle\Datagrid\NameStrategyInterface;
@@ -183,9 +182,8 @@ protected function isAclGrantedForGridName($gridName)
         $gridConfig = $this->manager->getConfigurationForGrid($gridName);
 
         if ($gridConfig) {
-            $acl     = $gridConfig->offsetGetByPath(Builder::DATASOURCE_ACL_PATH);
-            $aclSKip = $gridConfig->offsetGetByPath(Builder::DATASOURCE_SKIP_ACL_CHECK, false);
-            if (!$aclSKip && $acl && !$this->securityFacade->isGranted($acl)) {
+            $aclResource = $gridConfig->getAclResource();
+            if ($aclResource && !$this->securityFacade->isGranted($aclResource)) {
                 return false;
             } else {
                 return true;
diff --git a/src/Oro/Bundle/EmailBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/EmailBundle/Resources/config/datagrid.yml
index 0b3a8d95a29..d8547ed20ec 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/EmailBundle/Resources/config/datagrid.yml
@@ -1,8 +1,8 @@
 datagrid:
     email-auto-response-rules:
+        acl_resource: oro_email_autoresponserule_view
         source:
             type: orm
-            acl_resource: oro_email_autoresponserule_view
             query:
                 select:
                     - r.id
@@ -85,6 +85,7 @@ datagrid:
     base-email-grid:
         source:
             type: orm
+            skip_acl_apply: true
             query:
                 select:
                     - partial eu.{id, email}
@@ -159,7 +160,6 @@ datagrid:
             default: { sentAt: %oro_datagrid.extension.orm_sorter.class%::DIRECTION_DESC }
         options:
             entityHint: email
-            skip_acl_check: true
 
     simplified-email-grid:
         extends: base-email-grid
@@ -412,9 +412,9 @@ datagrid:
                 receivedAt: %oro_datagrid.extension.orm_sorter.class%::DIRECTION_DESC
 
     email-templates:
+        acl_resource: oro_email_emailtemplate_index
         source:
             type: orm
-            acl_resource: oro_email_emailtemplate_index
             query:
                 select:
                     - t.id
@@ -520,6 +520,7 @@ datagrid:
     base-mailboxes-grid:
         source:
             type: orm
+            skip_acl_apply: true
             query:
                 select:
                     - m
@@ -564,7 +565,6 @@ datagrid:
                 params:
                     id: id
         options:
-            skip_acl_check: true
             toolbarOptions:
                 hide: true
         actions:
diff --git a/src/Oro/Bundle/EmbeddedFormBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/EmbeddedFormBundle/Resources/config/datagrid.yml
index 4f82b651f62..e4cd22fddd1 100644
--- a/src/Oro/Bundle/EmbeddedFormBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/EmbeddedFormBundle/Resources/config/datagrid.yml
@@ -1,7 +1,7 @@
 datagrid:
     embedded-forms-grid:
+        acl_resource: oro_embedded_form_view
         source:
-            acl_resource: oro_embedded_form_view
             type: orm
             query:
                 select:
diff --git a/src/Oro/Bundle/EntityBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/EntityBundle/Resources/config/datagrid.yml
index 2006ed432bf..b56c95230f5 100644
--- a/src/Oro/Bundle/EntityBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/EntityBundle/Resources/config/datagrid.yml
@@ -1,12 +1,12 @@
 datagrid:
     custom-entity-grid:
+        acl_resource: ~
         options:
             base_datagrid_class: Oro\Bundle\EntityBundle\Grid\CustomEntityDatagrid
             entityHint: entity
             export: true
             entity_pagination: true
         source:
-            acl_resource: ~
             type: orm
             query:
                 select:
@@ -61,6 +61,7 @@ datagrid:
             columns: []
 
     entity-relation-grid:
+        acl_resource: ~
         options:
             entityHint: entity
             routerEnabled: false
@@ -71,7 +72,6 @@ datagrid:
                     included: '#appendRelation'
                     excluded: '#removeRelation'
         source:
-            acl_resource: ~
             type: orm
         columns:
             assigned:
diff --git a/src/Oro/Bundle/EntityConfigBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/EntityConfigBundle/Resources/config/datagrid.yml
index 9a7a2fa89d7..c23a3d59b07 100644
--- a/src/Oro/Bundle/EntityConfigBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/EntityConfigBundle/Resources/config/datagrid.yml
@@ -6,8 +6,8 @@ datagrid:
             toolbarOptions:
                 pageSize:
                     default_per_page: 100
+        acl_resource: oro_entityconfig_manage
         source:
-            acl_resource: oro_entityconfig_manage
             type: orm
             query:
                 select:
@@ -69,9 +69,9 @@ datagrid:
             toolbarOptions:
                 pageSize:
                     default_per_page: 50
+        # TODO: check oro_entityconfig_view acl (403) right now
+        acl_resource: oro_entityconfig_manage
         source:
-            # TODO: check oro_entityconfig_view acl (403) right now
-            acl_resource: oro_entityconfig_manage
             type: orm
             query:
                 select:
@@ -126,8 +126,8 @@ datagrid:
     entity-audit-grid:
         options:
             entityHint: history
+        acl_resource: oro_entityconfig_manage
         source:
-            acl_resource: oro_entityconfig_manage
             type: orm
             query:
                 select:
diff --git a/src/Oro/Bundle/EntityExtendBundle/Grid/AbstractFieldsExtension.php b/src/Oro/Bundle/EntityExtendBundle/Grid/AbstractFieldsExtension.php
index d53ddf34a7a..070ccca45db 100644
--- a/src/Oro/Bundle/EntityExtendBundle/Grid/AbstractFieldsExtension.php
+++ b/src/Oro/Bundle/EntityExtendBundle/Grid/AbstractFieldsExtension.php
@@ -5,7 +5,6 @@
 use Doctrine\ORM\Query\Expr\From;
 use Doctrine\ORM\QueryBuilder;
 
-use Oro\Bundle\DataGridBundle\Datagrid\Builder;
 use Oro\Bundle\DataGridBundle\Datagrid\DatagridGuesser;
 use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
 use Oro\Bundle\DataGridBundle\Datasource\DatasourceInterface;
@@ -51,7 +50,7 @@ public function __construct(
      */
     public function isApplicable(DatagridConfiguration $config)
     {
-        return $config->offsetGetByPath(Builder::DATASOURCE_TYPE_PATH) == OrmDatasource::TYPE;
+        return $config->getDatasourceType() == OrmDatasource::TYPE;
     }
 
     /**
diff --git a/src/Oro/Bundle/EntityPaginationBundle/Datagrid/EntityPaginationExtension.php b/src/Oro/Bundle/EntityPaginationBundle/Datagrid/EntityPaginationExtension.php
index 075a86b3371..f724b4ca574 100644
--- a/src/Oro/Bundle/EntityPaginationBundle/Datagrid/EntityPaginationExtension.php
+++ b/src/Oro/Bundle/EntityPaginationBundle/Datagrid/EntityPaginationExtension.php
@@ -2,7 +2,6 @@
 
 namespace Oro\Bundle\EntityPaginationBundle\Datagrid;
 
-use Oro\Bundle\DataGridBundle\Datagrid\Builder;
 use Oro\Bundle\DataGridBundle\Extension\AbstractExtension;
 use Oro\Bundle\DataGridBundle\Datasource\Orm\OrmDatasource;
 use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
@@ -22,7 +21,7 @@ public function isApplicable(DatagridConfiguration $config)
             return false;
         }
 
-        return $config->offsetGetByPath(Builder::DATASOURCE_TYPE_PATH) == OrmDatasource::TYPE;
+        return $config->getDatasourceType() == OrmDatasource::TYPE;
     }
 
     /**
diff --git a/src/Oro/Bundle/FilterBundle/Grid/Extension/OrmFilterExtension.php b/src/Oro/Bundle/FilterBundle/Grid/Extension/OrmFilterExtension.php
index d341e3872a1..f4fb11ba76c 100644
--- a/src/Oro/Bundle/FilterBundle/Grid/Extension/OrmFilterExtension.php
+++ b/src/Oro/Bundle/FilterBundle/Grid/Extension/OrmFilterExtension.php
@@ -2,16 +2,15 @@
 
 namespace Oro\Bundle\FilterBundle\Grid\Extension;
 
-use Oro\Bundle\DataGridBundle\Extension\Formatter\Property\PropertyInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 
-use Oro\Bundle\DataGridBundle\Datagrid\Builder;
 use Oro\Bundle\DataGridBundle\Datagrid\Common\MetadataObject;
 use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
 use Oro\Bundle\DataGridBundle\Datasource\DatasourceInterface;
 use Oro\Bundle\DataGridBundle\Datasource\Orm\OrmDatasource;
 use Oro\Bundle\DataGridBundle\Extension\AbstractExtension;
 use Oro\Bundle\DataGridBundle\Extension\Formatter\Configuration as FormatterConfiguration;
+use Oro\Bundle\DataGridBundle\Extension\Formatter\Property\PropertyInterface;
 use Oro\Bundle\FilterBundle\Filter\FilterUtility;
 use Oro\Bundle\FilterBundle\Filter\FilterInterface;
 use Oro\Bundle\FilterBundle\Datasource\Orm\OrmFilterDatasourceAdapter;
@@ -52,7 +51,7 @@ public function isApplicable(DatagridConfiguration $config)
             return false;
         }
 
-        return $config->offsetGetByPath(Builder::DATASOURCE_TYPE_PATH) == OrmDatasource::TYPE;
+        return $config->getDatasourceType() == OrmDatasource::TYPE;
     }
 
     /**
diff --git a/src/Oro/Bundle/IntegrationBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/IntegrationBundle/Resources/config/datagrid.yml
index 16a77251609..da4176cf24a 100644
--- a/src/Oro/Bundle/IntegrationBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/IntegrationBundle/Resources/config/datagrid.yml
@@ -1,8 +1,8 @@
 datagrid:
     oro-integration-grid:
+        acl_resource: oro_integration_view
         source:
             type: orm
-            acl_resource: oro_integration_view
             query:
                 select:
                     - c.id
@@ -97,9 +97,9 @@ datagrid:
             entityHint: channel
             entity_pagination: true
     oro-integration-status-grid:
+        acl_resource: oro_integration_view
         source:
             type: orm
-            acl_resource: oro_integration_view
             query:
                 select:
                     - s.code
diff --git a/src/Oro/Bundle/NotificationBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/NotificationBundle/Resources/config/datagrid.yml
index c13647beea4..9cdd78ad18a 100644
--- a/src/Oro/Bundle/NotificationBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/NotificationBundle/Resources/config/datagrid.yml
@@ -3,8 +3,8 @@ datagrid:
         options:
             entityHint: transactional email
             entity_pagination: true
+        acl_resource: oro_notification_emailnotification_view
         source:
-            acl_resource: oro_notification_emailnotification_view
             type: orm
             query:
                 select:
diff --git a/src/Oro/Bundle/OrganizationBundle/Event/BusinessUnitGridListener.php b/src/Oro/Bundle/OrganizationBundle/Event/BusinessUnitGridListener.php
index d6e64cd0ba7..c51855e6971 100644
--- a/src/Oro/Bundle/OrganizationBundle/Event/BusinessUnitGridListener.php
+++ b/src/Oro/Bundle/OrganizationBundle/Event/BusinessUnitGridListener.php
@@ -72,10 +72,15 @@ public function onBuildBefore(BuildBefore $event)
                     $organization->getId()
                 );
             }
-            $where = array_merge(
-                $where,
-                ['u.id in (' . implode(', ', $resultBuIds) . ')']
-            );
+            if ($resultBuIds) {
+                $where = array_merge(
+                    $where,
+                    ['u.id in (' . implode(', ', $resultBuIds) . ')']
+                );
+            } else {
+                // There are no records to show, make query to return empty result
+                $where = array_merge($where, ['1 = 0']);
+            }
         }
         if (count($where)) {
             $config->offsetSetByPath('[source][query][where][and]', $where);
diff --git a/src/Oro/Bundle/OrganizationBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/OrganizationBundle/Resources/config/datagrid.yml
index 59e48e6050f..13787f87a41 100644
--- a/src/Oro/Bundle/OrganizationBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/OrganizationBundle/Resources/config/datagrid.yml
@@ -3,11 +3,10 @@ datagrid:
         extended_entity_name: %oro_organization.business_unit.entity.class%
         options:
             entityHint: business unit
-            skip_acl_check: true
             entity_pagination: true
         source:
-            acl_resource: oro_business_unit_view
             type: orm
+            skip_acl_apply: true
             query:
                 select:
                     - u.id
@@ -117,8 +116,8 @@ datagrid:
 
     bu-update-users-grid:
         extends: user-relation-grid
+        acl_resource: oro_business_unit_update
         source:
-            acl_resource: oro_business_unit_update
             query:
                 select:
                     - >
@@ -198,8 +197,8 @@ datagrid:
         extends: user-relation-grid
         options:
             entityHint: user
+        acl_resource: oro_business_unit_view
         source:
-            acl_resource: oro_business_unit_view
             query:
                 where:
                     and:
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Grid/Extension/OrmDatasourceExtension.php b/src/Oro/Bundle/QueryDesignerBundle/Grid/Extension/OrmDatasourceExtension.php
index a6b549f60f7..e325deceffb 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Grid/Extension/OrmDatasourceExtension.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/Grid/Extension/OrmDatasourceExtension.php
@@ -4,7 +4,6 @@
 
 use Doctrine\ORM\QueryBuilder;
 
-use Oro\Bundle\DataGridBundle\Datagrid\Builder;
 use Oro\Bundle\DataGridBundle\Datagrid\ParameterBag;
 use Oro\Bundle\DataGridBundle\Extension\AbstractExtension;
 use Oro\Bundle\DataGridBundle\Datasource\Orm\OrmDatasource;
@@ -38,7 +37,7 @@ public function __construct(RestrictionBuilderInterface $restrictionBuilder)
      */
     public function isApplicable(DatagridConfiguration $config)
     {
-        return $config->offsetGetByPath(Builder::DATASOURCE_TYPE_PATH) == OrmDatasource::TYPE
+        return $config->getDatasourceType() == OrmDatasource::TYPE
             && $config->offsetGetByPath('[source][query_config][filters]');
     }
 
diff --git a/src/Oro/Bundle/ReportBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/ReportBundle/Resources/config/datagrid.yml
index 48db774d122..ecd26b22792 100644
--- a/src/Oro/Bundle/ReportBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/ReportBundle/Resources/config/datagrid.yml
@@ -1,8 +1,8 @@
 datagrid:
     reports-grid:
+        acl_resource: oro_report_view
         source:
             type:           orm
-            acl_resource:   oro_report_view
             query:
                 select:
                     - r.id
diff --git a/src/Oro/Bundle/SearchBundle/Extension/Pager/SearchPagerExtension.php b/src/Oro/Bundle/SearchBundle/Extension/Pager/SearchPagerExtension.php
index e49a3baa935..b649aa7b44e 100644
--- a/src/Oro/Bundle/SearchBundle/Extension/Pager/SearchPagerExtension.php
+++ b/src/Oro/Bundle/SearchBundle/Extension/Pager/SearchPagerExtension.php
@@ -2,7 +2,6 @@
 
 namespace Oro\Bundle\SearchBundle\Extension\Pager;
 
-use Oro\Bundle\DataGridBundle\Datagrid\Builder;
 use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
 use Oro\Bundle\DataGridBundle\Datasource\DatasourceInterface;
 use Oro\Bundle\DataGridBundle\Extension\Pager\PagerInterface;
@@ -29,7 +28,7 @@ public function __construct(IndexerPager $pager)
     public function isApplicable(DatagridConfiguration $config)
     {
         // enabled by default for search datasource
-        return $config->offsetGetByPath(Builder::DATASOURCE_TYPE_PATH) == SearchDatasource::TYPE;
+        return $config->getDatasourceType() == SearchDatasource::TYPE;
     }
 
     /**
diff --git a/src/Oro/Bundle/SegmentBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/SegmentBundle/Resources/config/datagrid.yml
index c65c31635b2..9b46ee6cdb6 100644
--- a/src/Oro/Bundle/SegmentBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/SegmentBundle/Resources/config/datagrid.yml
@@ -1,8 +1,8 @@
 datagrid:
     oro_segments-grid:
+        acl_resource: oro_segment_view
         source:
-            type:           orm
-            acl_resource:   oro_segment_view
+            type: orm
             query:
                 select:
                     - s.id
diff --git a/src/Oro/Bundle/TagBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/TagBundle/Resources/config/datagrid.yml
index cdbc22ab1be..63a7a8944f2 100644
--- a/src/Oro/Bundle/TagBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/TagBundle/Resources/config/datagrid.yml
@@ -3,8 +3,8 @@ datagrid:
         options:
             entityHint: tag
             entity_pagination: true
+        acl_resource: oro_tag_view
         source:
-            acl_resource: oro_tag_view
             type: orm
             query:
                 select:
@@ -90,8 +90,8 @@ datagrid:
     tag-results-grid:
         options:
             entityHint: result
+        acl_resource: oro_tag_view
         source:
-            acl_resource: oro_tag_view
             type: orm
             query:
                 select:
diff --git a/src/Oro/Bundle/TrackingBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/TrackingBundle/Resources/config/datagrid.yml
index 098806bc058..ae4e173cceb 100644
--- a/src/Oro/Bundle/TrackingBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/TrackingBundle/Resources/config/datagrid.yml
@@ -1,9 +1,9 @@
 datagrid:
     website-grid:
         extended_entity_name: %oro_tracking.tracking_website.class%
+        acl_resource: oro_tracking_website_view
         source:
             type: orm
-            acl_resource: oro_tracking_website_view
             query:
                 select:
                     - website.id
@@ -124,9 +124,9 @@ datagrid:
 
     tracking-events-grid:
         extended_entity_name: %oro_tracking.tracking_event.class%
+        acl_resource: oro_tracking_website_view
         source:
             type: orm
-            acl_resource: oro_tracking_website_view
             query:
                 select:
                     - e.id
diff --git a/src/Oro/Bundle/UserBundle/EventListener/OwnerUserGridListener.php b/src/Oro/Bundle/UserBundle/EventListener/OwnerUserGridListener.php
index f7156ba4d4f..61e56df4859 100644
--- a/src/Oro/Bundle/UserBundle/EventListener/OwnerUserGridListener.php
+++ b/src/Oro/Bundle/UserBundle/EventListener/OwnerUserGridListener.php
@@ -137,10 +137,15 @@ protected function applyACL(DatagridConfiguration $config, $accessLevel, User $u
             $leftJoins[] = ['join' => 'u.businessUnits', 'alias' => 'bu'];
             $config->offsetSetByPath('[source][query][join][inner]', $leftJoins);
 
-            $where = array_merge(
-                $where,
-                ['bu.id in (' . implode(', ', $resultBuIds) . ')']
-            );
+            if ($resultBuIds) {
+                $where = array_merge(
+                    $where,
+                    ['bu.id in (' . implode(', ', $resultBuIds) . ')']
+                );
+            } else {
+                // There are no records to show, make query to return empty result
+                $where = array_merge($where, ['1 = 0']);
+            }
         }
         if (count($where)) {
             $config->offsetSetByPath('[source][query][where][and]', $where);
diff --git a/src/Oro/Bundle/UserBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/UserBundle/Resources/config/datagrid.yml
index 6f815a08107..e07672042bc 100644
--- a/src/Oro/Bundle/UserBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/UserBundle/Resources/config/datagrid.yml
@@ -4,8 +4,8 @@ datagrid:
         options:
             entityHint: user
             entity_pagination: true
+        acl_resource: oro_user_user_view
         source:
-            acl_resource: oro_user_user_view
             type: orm
             query:
                 select:
@@ -135,8 +135,8 @@ datagrid:
         options:
             entityHint: group
             entity_pagination: true
+        acl_resource: oro_user_group_view
         source:
-            acl_resource: oro_user_group_view
             type: orm
             query:
                 select:
@@ -195,9 +195,10 @@ datagrid:
         options:
             entityHint: role
             entity_pagination: true
+        acl_resource: oro_user_role_view
         source:
-            acl_resource: oro_user_role_view
             type: orm
+            skip_acl_apply: true
             query:
                 select:
                     - r
@@ -293,8 +294,8 @@ datagrid:
 
     role-users-grid:
         extends: user-relation-grid
+        acl_resource: oro_user_role_update
         source:
-            acl_resource: oro_user_role_update
             query:
                 select:
                     - >
@@ -373,8 +374,8 @@ datagrid:
 
     group-users-grid:
         extends: user-relation-grid
+
         source:
-            acl_resource: oro_user_group_update
             query:
                 select:
                     - >
@@ -454,8 +455,8 @@ datagrid:
         extended_entity_name: %oro_user.entity.class%
         options:
             entityHint: user
+        acl_resource: oro_user_user_view
         source:
-            acl_resource: oro_user_user_view
             type: orm
             query:
                 select:
@@ -526,10 +527,9 @@ datagrid:
         extended_entity_name: %oro_user.entity.class%
         options:
             entityHint: user
-            skip_acl_check: true
         source:
-            acl_resource: oro_user_user_view
             type: orm
+            skip_acl_apply: true
             query:
                 select:
                     - u.id
@@ -614,9 +614,8 @@ datagrid:
                 pageSize:
                     default_per_page: 10
             routerEnabled: false
-
+        acl_resource: oro_user_user_view
         source:
-            acl_resource: oro_user_user_view
             type: orm
             query:
                 select:
diff --git a/src/Oro/Bundle/WorkflowBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/WorkflowBundle/Resources/config/datagrid.yml
index 5fea4a76940..fa72c37d98c 100644
--- a/src/Oro/Bundle/WorkflowBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/WorkflowBundle/Resources/config/datagrid.yml
@@ -3,9 +3,9 @@ datagrid:
         options:
             entityHint: processes
             export:     false
+        acl_resource: oro_process_definition_view
         source:
-            type:         orm
-            acl_resource: oro_process_definition_view
+            type: orm
             query:
                 select:
                     - process.name
@@ -100,9 +100,9 @@ datagrid:
         options:
             entityHint: workflowssss
             export:     false
+        acl_resource: oro_workflow_definition_view
         source:
             type: orm
-            acl_resource: oro_workflow_definition_view
             query:
                 select:
                     - w.name as id

From 430df1f8b7587b24b6f3926c6bcc927a198826c7 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Fri, 25 Dec 2015 11:40:31 +0200
Subject: [PATCH 268/471] CRM-4358 Display help in inline editing mode

---
 .../Resources/config/assets.yml               |  1 +
 .../public/css/less/inline-editing-help.less  | 40 +++++++++++++++++++
 .../grid/inline-editing-help-plugin.js        | 39 ++++++++++++++++++
 .../app/plugins/grid/inline-editing-plugin.js |  2 +
 .../public/js/inline-editing/builder.js       |  4 ++
 .../Resources/translations/jsmessages.en.yml  |  9 +++++
 6 files changed, 95 insertions(+)
 create mode 100644 src/Oro/Bundle/DataGridBundle/Resources/public/css/less/inline-editing-help.less
 create mode 100644 src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-help-plugin.js

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/config/assets.yml b/src/Oro/Bundle/DataGridBundle/Resources/config/assets.yml
index 30050d0e412..6f4b05d1e39 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/config/assets.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/config/assets.yml
@@ -3,3 +3,4 @@ css:
       - 'bundles/orodatagrid/lib/backgrid/backgrid.css'
       - 'bundles/orodatagrid/lib/backgrid/extensions/paginator/backgrid-paginator.css'
       - 'bundles/orodatagrid/css/less/main.less'
+      - 'bundles/orodatagrid/css/less/inline-editing-help.less'
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/inline-editing-help.less b/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/inline-editing-help.less
new file mode 100644
index 00000000000..7bb0cd709de
--- /dev/null
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/inline-editing-help.less
@@ -0,0 +1,40 @@
+.inline-editing-help-wrapper{
+  z-index: 10000;
+  border-radius: 50px;
+  background: white;
+  width: 38px;
+  height: 38px;
+  position: absolute;
+  top: 30px;
+  right: 30px;
+  padding: 4px;
+  box-shadow: 0px 3px 16px rgba(0,0,0,0.4), 0 0 6px rgba(0,0,0,0.4);
+  .inline-editing-help-content {
+    width: 474px;
+    background: #FFF;
+    top: 39px;
+    margin-left: -415px !important;
+    max-width: 457px;
+    z-index: 10000;
+    color: #444;
+    font-size: 13px;
+    padding: 15px;
+    > .arrow {
+      left: 433px;
+    }
+  }
+  &:hover {
+    box-shadow: 0px 4px 20px rgba(0,0,0,0.4), 0 0 8px rgba(0,0,0,0.4);
+  }
+}
+.inline-editing-help{
+  border-radius: 50px;
+  width: 30px;
+  height: 30px;
+  background: rgb(108, 146, 209);
+  color: white;
+  font-size: 24px;
+  text-align: center;
+  line-height: 31px;
+  font-weight: normal;
+}
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-help-plugin.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-help-plugin.js
new file mode 100644
index 00000000000..ca326396f85
--- /dev/null
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-help-plugin.js
@@ -0,0 +1,39 @@
+define(function(require) {
+    'use strict';
+
+    var InlineEditingHelpPlugin;
+    var __ = require('orotranslation/js/translator');
+    var BasePlugin = require('oroui/js/app/plugins/base/plugin');
+    var $ = require('jquery');
+
+    InlineEditingHelpPlugin = BasePlugin.extend({
+        enable: function() {
+            this.listenTo(this.main, 'holdInlineEditingBackdrop', this.onHoldInlineEditingBackdrop);
+            this.listenTo(this.main, 'releaseInlineEditingBackdrop', this.onReleaseInlineEditingBackdrop);
+            InlineEditingHelpPlugin.__super__.enable.call(this);
+        },
+
+        onHoldInlineEditingBackdrop: function() {
+            $(document.body).append(
+                '<div class="inline-editing-help-wrapper">' +
+                    '<div class="inline-editing-help">' +
+                        '<i class="icon-info"></i>' +
+                    '</div>' +
+                    '<div class="inline-editing-help-content popover bottom">' +
+                        '<div class="arrow"></div>' +
+                        __('oro.datagrid.inline_editing.help') +
+                    '</div>' +
+                '</div>'
+            );
+            $('.inline-editing-help-wrapper').click(function() {
+                $('.inline-editing-help-content').toggle();
+            });
+        },
+
+        onReleaseInlineEditingBackdrop: function() {
+            $('body > .inline-editing-help-wrapper').remove();
+        }
+    });
+
+    return InlineEditingHelpPlugin;
+});
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
index d879b024083..cf995f426da 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/plugins/grid/inline-editing-plugin.js
@@ -234,6 +234,7 @@ define(function(require) {
                     this.hidePopover(); // before adding backdrop
                     this.backdropId = backdropManager.hold();
                     $(document).on('keydown', this.onKeyDown);
+                    this.main.trigger('holdInlineEditingBackdrop');
                 }
             }
             this.editModeEnabled = true;
@@ -388,6 +389,7 @@ define(function(require) {
             if (releaseBackdrop !== false) {
                 backdropManager.release(this.backdropId);
                 $(document).off('keydown', this.onKeyDown);
+                this.main.trigger('releaseInlineEditingBackdrop');
             }
             delete this.editorComponent;
         },
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/inline-editing/builder.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/inline-editing/builder.js
index c0312fa4e49..843ff5a0405 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/inline-editing/builder.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/inline-editing/builder.js
@@ -4,6 +4,7 @@ define(function(require) {
     var $ = require('jquery');
     var _ = require('underscore');
     var tools = require('oroui/js/tools');
+    var InlineEditingHelpPlugin = require('../app/plugins/grid/inline-editing-help-plugin');
 
     var gridViewsBuilder = {
         /**
@@ -29,6 +30,9 @@ define(function(require) {
                 options.gridPromise.done(function(grid) {
                     grid.pluginManager.create(options.metadata.inline_editing.plugin, options);
                     grid.pluginManager.enable(options.metadata.inline_editing.plugin);
+                    if (options.metadata.inline_editing.disable_help !== false) {
+                        grid.pluginManager.enable(InlineEditingHelpPlugin);
+                    }
                     deferred.resolve();
                 });
             });
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml b/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
index 2b934e7c14d..022b6a4b7bf 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
@@ -82,3 +82,12 @@ oro:
             close_tooltip: "Close Column Manager"
             empty_list: "No columns found"
         not_number: Not a number
+        inline_editing:
+            help: |
+                <ul style="margin-bottom: 0px;">
+                    <li><span style="font-family: monospace">Enter</span>, <span style="font-family: monospace">Shift + Enter</span> - Save and edit next/previous cell in column</li>
+                	<li><span style="font-family: monospace">Tab</span>, <span style="font-family: monospace">Shift + Tab</span> - Save and edit next/previous cell in row</li>
+                	<li><span style="font-family: monospace">Alt + ←/↑/→/↓  </span> - Navigate between cells</li>
+                	<li><span style="font-family: monospace">Ctrl + Enter</span> - Save and close</li>
+                	<li><span style="font-family: monospace">Escape</span> - Quit</li>
+                </ul>

From 4393634d5f9ba8ffa915f8dfcb83cca369597e2e Mon Sep 17 00:00:00 2001
From: Oleksandr Nechyporenko <onechyporenko@magecore.com>
Date: Fri, 25 Dec 2015 11:45:29 +0200
Subject: [PATCH 269/471] BB-1491: Login and Registration Page Layouts  - fix
 to many new line

---
 .../Layout/Block/Extension/ConfigExpressionExtensionTest.php     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Extension/ConfigExpressionExtensionTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Extension/ConfigExpressionExtensionTest.php
index 26842db0ed0..4761f937081 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Extension/ConfigExpressionExtensionTest.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Extension/ConfigExpressionExtensionTest.php
@@ -110,4 +110,3 @@ protected function getDataAccessorMock()
         return $this->getMock('Oro\Component\Layout\DataAccessorInterface');
     }
 }
-

From 335aa70855fa1ac6786cb0da3a8e0cc4e4c519d4 Mon Sep 17 00:00:00 2001
From: zebimax <zebimax@gmail.com>
Date: Fri, 25 Dec 2015 12:46:17 +0200
Subject: [PATCH 270/471] BAP-9577: Add option 'Use as default' to views
 options  - add repository method to find default gv  - add use as def option

---
 .../Entity/Repository/GridViewRepository.php  | 22 ++++++++++
 .../EventListener/GridViewsLoadListener.php   |  8 ++--
 .../Extension/GridViews/AbstractViewsList.php |  3 +-
 .../GridViews/GridViewsExtension.php          |  9 +++--
 .../Extension/GridViews/View.php              | 40 +++++++++++++++----
 .../public/js/datagrid/grid-views/model.js    |  5 ++-
 .../public/js/datagrid/grid-views/view.js     | 16 +++++++-
 .../Resources/translations/jsmessages.en.yml  |  1 +
 8 files changed, 85 insertions(+), 19 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php b/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php
index 9d174a3a755..d203c31f8b5 100644
--- a/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php
+++ b/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php
@@ -36,4 +36,26 @@ public function findGridViews(AclHelper $aclHelper, UserInterface $user, $gridNa
 
         return $aclHelper->apply($qb)->getResult();
     }
+
+    /**
+     * @param AclHelper     $aclHelper
+     * @param UserInterface $user
+     * @param               $gridName
+     *
+     * @return mixed
+     */
+    public function findUserDefaultGridView(AclHelper $aclHelper, UserInterface $user, $gridName)
+    {
+        $qb = $this->createQueryBuilder('gv');
+        $qb->innerJoin('gv.users', 'u')
+            ->where('gv.gridName = :gridName')
+            ->andWhere('u = :user')
+            ->setParameters([
+                'gridName' => $gridName,
+                'user'    => $user
+            ])
+            ->setMaxResults(1);
+
+        return $aclHelper->apply($qb)->getOneOrNullResult();
+    }
 }
diff --git a/src/Oro/Bundle/DataGridBundle/EventListener/GridViewsLoadListener.php b/src/Oro/Bundle/DataGridBundle/EventListener/GridViewsLoadListener.php
index c84e52b0670..311519eebfc 100644
--- a/src/Oro/Bundle/DataGridBundle/EventListener/GridViewsLoadListener.php
+++ b/src/Oro/Bundle/DataGridBundle/EventListener/GridViewsLoadListener.php
@@ -55,18 +55,19 @@ public function onViewsLoad(GridViewsLoadEvent $event)
             return;
         }
 
-        $gridViews = $this->getGridViewRepository()->findGridViews($this->aclHelper, $currentUser, $gridName);
+        $gridViewRepository = $this->getGridViewRepository();
+        $gridViews          = $gridViewRepository->findGridViews($this->aclHelper, $currentUser, $gridName);
+        $defaultGridView    = $gridViewRepository->findUserDefaultGridView($this->aclHelper, $currentUser, $gridName);
         if (!$gridViews) {
             return;
         }
-
         $choices = [];
         $views = [];
         foreach ($gridViews as $gridView) {
             $view = $gridView->createView();
             $view->setEditable($this->securityFacade->isGranted('EDIT', $gridView));
             $view->setDeletable($this->securityFacade->isGranted('DELETE', $gridView));
-
+            $view->setIsDefault($defaultGridView === $gridView);
             $views[] = $view->getMetadata();
             $choices[] = [
                 'label' => $this->createGridViewLabel($currentUser, $gridView),
@@ -77,6 +78,7 @@ public function onViewsLoad(GridViewsLoadEvent $event)
         $newGridViews = $event->getGridViews();
         $newGridViews['choices'] = array_merge($newGridViews['choices'], $choices);
         $newGridViews['views'] = array_merge($newGridViews['views'], $views);
+        $newGridViews['default'] = $defaultGridView;
 
         $event->setGridViews($newGridViews);
     }
diff --git a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/AbstractViewsList.php b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/AbstractViewsList.php
index bf5734c1785..ef27ddccaa9 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/AbstractViewsList.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/AbstractViewsList.php
@@ -100,7 +100,8 @@ function (View $view) {
 
         return [
             'choices' => $this->toChoiceList(),
-            'views'   => $result->toArray()
+            'views'   => $result->toArray(),
+            'default' => null
         ];
     }
 
diff --git a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
index 560112ff2f9..d50e4a9b75f 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
@@ -76,8 +76,9 @@ public function visitMetadata(DatagridConfiguration $config, MetadataObject $dat
         }
 
         /** @var AbstractViewsList $list */
-        $list = $config->offsetGetOr(self::VIEWS_LIST_KEY, false);
-        $gridViews = [
+        $list          = $config->offsetGetOr(self::VIEWS_LIST_KEY, false);
+        $systemAllView = new View(self::DEFAULT_VIEW_ID);
+        $gridViews     = [
             'choices' => [
                 [
                     'label' => $allLabel,
@@ -85,7 +86,7 @@ public function visitMetadata(DatagridConfiguration $config, MetadataObject $dat
                 ],
             ],
             'views' => [
-                (new View(self::DEFAULT_VIEW_ID))->getMetadata(),
+                $systemAllView->getMetadata(),
             ],
         ];
         if ($list !== false) {
@@ -100,7 +101,7 @@ public function visitMetadata(DatagridConfiguration $config, MetadataObject $dat
             $this->eventDispatcher->dispatch(GridViewsLoadEvent::EVENT_NAME, $event);
             $gridViews = $event->getGridViews();
         }
-
+        $systemAllView->setIsDefault($gridViews['default'] === null);
         $gridViews['gridName'] = $config->getName();
         $gridViews['permissions'] = $this->getPermissions();
         $data->offsetAddToArray('gridViews', $gridViews);
diff --git a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/View.php b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/View.php
index 292a5c750e6..6a9feb46a79 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/View.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/View.php
@@ -25,6 +25,9 @@ class View
     /** @var bool */
     protected $deletable = false;
 
+    /** @var bool */
+    protected $isDefault = false;
+
     /**
      * @var array
      *
@@ -194,6 +197,26 @@ public function setColumnsData(array $columnsData = [])
         $this->columnsData = $columnsData;
     }
 
+    /**
+     * @return boolean
+     */
+    public function isIsDefault()
+    {
+        return $this->isDefault;
+    }
+
+    /**
+     * @param boolean $isDefault
+     *
+     * @return $this
+     */
+    public function setIsDefault($isDefault)
+    {
+        $this->isDefault = $isDefault;
+
+        return $this;
+    }
+
     /**
      * Convert to view data
      *
@@ -202,14 +225,15 @@ public function setColumnsData(array $columnsData = [])
     public function getMetadata()
     {
         return [
-            'name'      => $this->getName(),
-            'label'     => $this->label,
-            'type'      => $this->getType(),
-            'filters'   => $this->getFiltersData(),
-            'sorters'   => $this->getSortersData(),
-            'columns'   => $this->columnsData,
-            'editable'  => $this->editable,
-            'deletable' => $this->deletable,
+            'name'       => $this->getName(),
+            'label'      => $this->label,
+            'type'       => $this->getType(),
+            'filters'    => $this->getFiltersData(),
+            'sorters'    => $this->getSortersData(),
+            'columns'    => $this->columnsData,
+            'editable'   => $this->editable,
+            'deletable'  => $this->deletable,
+            'is_default' => $this->isDefault
         ];
     }
 }
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/model.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/model.js
index 2ea4878c4e7..96d03f981c2 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/model.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/model.js
@@ -20,7 +20,8 @@ define([
             sorters: [],
             columns: {},
             deletable: false,
-            editable:  false
+            editable:  false,
+            is_default: false
         },
 
         /** @property */
@@ -77,7 +78,7 @@ define([
          * @returns {Array}
          */
         toJSON: function() {
-            return _.omit(this.attributes, ['editable', 'deletable']);
+            return _.omit(this.attributes, ['editable', 'deletable', 'is_default']);
         }
     });
 
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
index a13a47423a1..d951f224d54 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
@@ -34,7 +34,8 @@ define([
             'click a.unshare': 'onUnshare',
             'click a.delete': 'onDelete',
             'click a.rename': 'onRename',
-            'click a.discard_changes': 'onDiscardChanges'
+            'click a.discard_changes': 'onDiscardChanges',
+            'click a.use_as_default': 'onUseAsDefault'
         },
 
         /** @property */
@@ -371,6 +372,14 @@ define([
             this.changeView(this.collection.state.gridView);
         },
 
+        /**
+         * @param {Event} e
+         */
+        onUseAsDefault: function(e) {
+            var model = this._getCurrentViewModel();
+            var self = this;
+        },
+
         /**
          * @private
          *
@@ -543,6 +552,11 @@ define([
                     name: 'delete',
                     enabled: typeof currentView !== 'undefined' &&
                             currentView.get('deletable')
+                },
+                {
+                    label: __('oro.datagrid.action.use_as_default_grid_view'),
+                    name: 'use_as_default',
+                    enabled: !currentView.get('is_default')
                 }
             ];
         },
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml b/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
index 2b934e7c14d..028cbdf266f 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
@@ -53,6 +53,7 @@ oro_datagrid.action.refresh: "Refresh"
 "oro.datagrid.action.share_grid_view": "Share With Others"
 "oro.datagrid.action.unshare_grid_view": "Unshare"
 "oro.datagrid.action.delete_grid_view": "Delete"
+"oro.datagrid.action.use_as_default_grid_view": "Use as default"
 "oro.datagrid.gridView.all": "All"
 "oro.datagrid.gridView.default": "Default"
 "oro.datagrid.gridView.created": "View has been successfully created"

From 612b2b211f00a49696718b3083dfed5dd9a238d3 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Fri, 25 Dec 2015 13:18:46 +0200
Subject: [PATCH 271/471] BAP-9553 Grids and debug toolbar fix

---
 .../js/app/views/page/debug-toolbar-view.js   | 13 ++++++++++++
 .../UIBundle/Resources/public/js/layout.js    | 20 ++++++++++++++++---
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/app/views/page/debug-toolbar-view.js b/src/Oro/Bundle/UIBundle/Resources/public/js/app/views/page/debug-toolbar-view.js
index 439b2ea5868..75fc1b5ca19 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/js/app/views/page/debug-toolbar-view.js
+++ b/src/Oro/Bundle/UIBundle/Resources/public/js/app/views/page/debug-toolbar-view.js
@@ -14,6 +14,11 @@ define([
             'page:error mediator': 'onPageUpdate'
         },
 
+        events: {
+            'click .hide-button': 'sendUpdates',
+            'click .sf-minitoolbar': 'sendUpdates'
+        },
+
         /**
          * Handles page load event
          *  - loads debug data
@@ -65,6 +70,14 @@ define([
                 .attr('data-sfurl', url);
             this.$el.html(data);
 
+            this.sendUpdates();
+        },
+
+        /**
+         * Notifies application about updates
+         */
+        sendUpdates: function() {
+            mediator.trigger('debugToolbar:afterUpdateView');
             mediator.trigger('layout:adjustHeight');
         }
     });
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/layout.js b/src/Oro/Bundle/UIBundle/Resources/public/js/layout.js
index 7691dd48e92..c7b834dcc9f 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/js/layout.js
+++ b/src/Oro/Bundle/UIBundle/Resources/public/js/layout.js
@@ -53,10 +53,24 @@ define(function(require) {
          * @returns {number} development toolbar height in dev mode, 0 in production mode
          */
         getDevToolbarHeight: function() {
-            if (!this.devToolbarHeight) {
+            if (!mediator.execute('retrieveOption', 'debug')) {
+                return 0;
+            }
+            if (!this.devToolbarHeightListenersAttached) {
+                this.devToolbarHeightListenersAttached = true;
+                $(window).on('resize', function() {
+                    delete layout.devToolbarHeight;
+                });
+                mediator.on('debugToolbar:afterUpdateView', function() {
+                    delete layout.devToolbarHeight;
+                });
+            }
+            if (this.devToolbarHeight === void 0) {
                 var devToolbarComposition = mediator.execute('composer:retrieve', 'debugToolbar', true);
-                if (devToolbarComposition && devToolbarComposition.view) {
-                    this.devToolbarHeight = devToolbarComposition.view.$el.height();
+                if (devToolbarComposition &&
+                    devToolbarComposition.view &&
+                    devToolbarComposition.view.$('.sf-toolbarreset').is(':visible')) {
+                    this.devToolbarHeight = devToolbarComposition.view.$('.sf-toolbarreset').height();
                 } else {
                     this.devToolbarHeight = 0;
                 }

From ef3cd4f10d2cfa81c489b51e280e716f6e596ed3 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Fri, 25 Dec 2015 13:37:01 +0200
Subject: [PATCH 272/471] BAP-9553 Use default fix

---
 .../ConfigBundle/Resources/public/css/less/config.less     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/ConfigBundle/Resources/public/css/less/config.less b/src/Oro/Bundle/ConfigBundle/Resources/public/css/less/config.less
index 63417e236ea..ec10c7970e7 100644
--- a/src/Oro/Bundle/ConfigBundle/Resources/public/css/less/config.less
+++ b/src/Oro/Bundle/ConfigBundle/Resources/public/css/less/config.less
@@ -31,9 +31,14 @@
   }
   .controls .parent-scope-checkbox {
     float: left;
+    color: #777;
+    padding-top: 6px;
     label {
       float: left;
-      margin: 0 15px 0 0;
+      margin: 0 4px 0 0;
+    }
+    input[type="checkbox"] {
+      margin: -3px 10px 0 0
     }
   }
   .oro-item-collection input[type="text"]{

From 09b43d6324f32ca774d85e830225ef48c9910462 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Fri, 25 Dec 2015 14:08:16 +0200
Subject: [PATCH 273/471] BAP-9553 Select2/Uniform should have same styles

---
 .../UIBundle/Resources/public/css/less/oro.less     | 13 ++++++-------
 .../Resources/public/css/less/oro/select2.less      | 10 +++++++---
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less
index 747902fdb2a..d641c3cbe17 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less
@@ -2243,11 +2243,10 @@ select {
   line-height: 26px;
 }
 div.selector {
-  line-height: 28px;
+  line-height: 30px;
   height: 30px;
   position: relative;
   width: 235px;
-  font-size: 12px;
   border: 1px solid #ddd;
   #gradient > .vertical(#ffffff, #f3f3f3);
   -webkit-border-radius: 3px;
@@ -2257,19 +2256,19 @@ div.selector {
 }
 
 div.selector span {
-  height: 28px;
+  height: 30px;
   display: block;
-  line-height: 28px;
+  line-height: 30px;
   .box-sizing(border-box);
-  padding: 0 5px;
+  padding: 0 5px 0 8px;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
   position: relative;
   &:after {
-    margin:2px 2px 0 0;
+    margin: 3px 2px 0 0;
     display:inline-block;
-    font:15px 'FontAwesome';
+    font:16px 'FontAwesome';
     content: "\f0dd";
     position: absolute;
     right: 5px;
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/select2.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/select2.less
index b00869f2ec4..3575576fdeb 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/select2.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/select2.less
@@ -19,11 +19,11 @@ Version: 3.4.1 Timestamp: Thu Jun 27 18:02:10 PDT 2013
   .select2-choice {
     display: block;
     height: 28px;
-    padding: 0 0 0 8px;
+    padding: 0;
     overflow: hidden;
     position: relative;
     white-space: nowrap;
-    line-height: 28px;
+    line-height: 1em;
     color: #444;
     text-decoration: none;
     -webkit-background-clip: padding-box;
@@ -40,6 +40,10 @@ Version: 3.4.1 Timestamp: Thu Jun 27 18:02:10 PDT 2013
     }
     img{
       max-width: 16px;
+      margin-top: -2px;
+      display: block;
+      float: left;
+      margin-right: 2px;
     }
     &:focus {
       border: none !important;
@@ -508,7 +512,7 @@ disabled look for disabled choices in the results dropdown
 }
 
 .select2-container a.select2-choice .select2-chosen {
-  padding-right: 30px;
+  padding: 8px 30px 0 8px;
 }
 
 .select2-search-choice-close {

From dbd9365eea081e635b3c16d45f70b4ad27d7dcfa Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Fri, 25 Dec 2015 14:18:04 +0200
Subject: [PATCH 274/471] BAP-9553Select2 multi fixes

---
 .../UIBundle/Resources/public/css/less/oro/select2.less       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/select2.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/select2.less
index 3575576fdeb..b81e0f89bd5 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/select2.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/select2.less
@@ -430,7 +430,7 @@ disabled look for disabled choices in the results dropdown
   height: 1%;
   margin: 0;
   padding: 0;
-  min-height: 29px;
+  min-height: 28px;
   position: relative;
   cursor: text;
   overflow: hidden;
@@ -451,7 +451,7 @@ disabled look for disabled choices in the results dropdown
 }
 
 .select2-container-multi .select2-choices .select2-search-field input {
-  padding:3px 5px;
+  padding: 5px 5px 1px;
   margin: 1px 0;
   font-family:@baseFontFamily;
   font-size: 100%;

From 717e61c79ec8c7012f83237bbce364a676cb6015 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Fri, 25 Dec 2015 14:54:52 +0200
Subject: [PATCH 275/471] BAP-9553 Tags IE display fix

---
 .../Bundle/TagBundle/Resources/public/css/tags-container.less | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/TagBundle/Resources/public/css/tags-container.less b/src/Oro/Bundle/TagBundle/Resources/public/css/tags-container.less
index f42a2aee375..15140dc0145 100644
--- a/src/Oro/Bundle/TagBundle/Resources/public/css/tags-container.less
+++ b/src/Oro/Bundle/TagBundle/Resources/public/css/tags-container.less
@@ -13,8 +13,8 @@
   border-radius: 3px;
   margin-right: 0px;
   font-size: 13px;
-  line-height: 13px;
-  padding: 4px 6px;
+  line-height: 20px;
+  padding: 1px 6px 0;
   display: inline-block;
   vertical-align: baseline;
 }

From 75abf7d2b87eb948cab671775497f0e49916fd14 Mon Sep 17 00:00:00 2001
From: Makar Sichevoy <sichevoy@gmail.com>
Date: Fri, 25 Dec 2015 15:00:33 +0200
Subject: [PATCH 276/471] BAP-9301 Wrong List of BU in the filter on the grid -
 highlight search results

---
 .../FilterBundle/Resources/public/css/less/oro.filter.less    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/css/less/oro.filter.less b/src/Oro/Bundle/FilterBundle/Resources/public/css/less/oro.filter.less
index bb6ab7f1a02..06fbb95a259 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/css/less/oro.filter.less
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/css/less/oro.filter.less
@@ -384,9 +384,9 @@ button.ui-multiselect.select-filter-widget.ui-state-hover{
         margin-top: 0;
         margin-left: -18px;
       }
-      label{
+      label {
         padding-left: 20px;
-        .search-result {
+        &.search-result {
           color: #000000;
           font-weight: bold;
         }

From ceab9c6228af9d7bdccca317e47eff0aaf47be1d Mon Sep 17 00:00:00 2001
From: Hryhorii Hrebiniuk <grebinuk@gmail.com>
Date: Fri, 25 Dec 2015 15:07:26 +0200
Subject: [PATCH 277/471] Revert "BAP-9553 fit dashboard widget header"

---
 .../Resources/public/css/less/dashboard.less           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
index eb1e040631d..641d3ea35ef 100644
--- a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
+++ b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
@@ -115,10 +115,7 @@
       white-space: nowrap;
       .action-wrapper {
         border-right: 1px solid #ddd;
-        padding: 0 3px;
-        > a {
-          padding: 10px 8px;
-        }
+        padding: 3px 13px;
       }
     }
 
@@ -146,6 +143,7 @@
       padding-left: 0;
       padding-right: 0;
       max-width: ~"calc(100% - 120px)";
+      padding-bottom: 2px;
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
@@ -153,6 +151,7 @@
 
     .row-fluid {
       border-top: 1px solid #ddd;
+      margin-top: 5px;
     }
 
     .dashboard-widget-content {
@@ -195,10 +194,11 @@
     .row-fluid {
       border-top: none;
     }
+    height: 43px;
     overflow: hidden;
   }
   .collapse-expand-action-container {
-    padding: 0 2px 0 12px;
+    padding-left: 8px;
   }
 }
 

From ab329e611cabf29abd096f29982ef7afce34717d Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevskiy@users.noreply.github.com>
Date: Tue, 22 Dec 2015 19:54:59 +0200
Subject: [PATCH 278/471] BAP-9553 fit dashboard widget header

---
 .../DashboardBundle/Resources/public/css/less/dashboard.less    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
index 641d3ea35ef..d034d84e17b 100644
--- a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
+++ b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
@@ -143,7 +143,6 @@
       padding-left: 0;
       padding-right: 0;
       max-width: ~"calc(100% - 120px)";
-      padding-bottom: 2px;
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
@@ -151,7 +150,6 @@
 
     .row-fluid {
       border-top: 1px solid #ddd;
-      margin-top: 5px;
     }
 
     .dashboard-widget-content {

From 0d4ab872b8c884ddbf73e1e0365b7526bed43a95 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevskiy@users.noreply.github.com>
Date: Wed, 23 Dec 2015 13:20:49 +0200
Subject: [PATCH 279/471] dashboard widget header fix

---
 .../DashboardBundle/Resources/public/css/less/dashboard.less     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
index d034d84e17b..f346128d82f 100644
--- a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
+++ b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
@@ -192,7 +192,6 @@
     .row-fluid {
       border-top: none;
     }
-    height: 43px;
     overflow: hidden;
   }
   .collapse-expand-action-container {

From 64200aa97661fb34e839629d4ff73b75b6a57d70 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevskiy@users.noreply.github.com>
Date: Wed, 23 Dec 2015 13:27:58 +0200
Subject: [PATCH 280/471] BAP-9553 access area of actions for dashboard widget

---
 .../DashboardBundle/Resources/public/css/less/dashboard.less | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
index f346128d82f..f28509e40d6 100644
--- a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
+++ b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
@@ -115,7 +115,10 @@
       white-space: nowrap;
       .action-wrapper {
         border-right: 1px solid #ddd;
-        padding: 3px 13px;
+        padding: 0 3px;
+        > a {
+          padding: 10px 8px;
+        }
       }
     }
 

From 26759016d3224c13fae145c9818cac26ff6a1b50 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevskiy@users.noreply.github.com>
Date: Wed, 23 Dec 2015 13:35:48 +0200
Subject: [PATCH 281/471] BAP-9553 access area of actions for dashboard widget

---
 .../DashboardBundle/Resources/public/css/less/dashboard.less    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
index f28509e40d6..eb1e040631d 100644
--- a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
+++ b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
@@ -198,7 +198,7 @@
     overflow: hidden;
   }
   .collapse-expand-action-container {
-    padding-left: 8px;
+    padding: 0 2px 0 12px;
   }
 }
 

From 38fb8fbe03cc336b40cc532620069003064c9356 Mon Sep 17 00:00:00 2001
From: Andrey Yatsenco <yatsenco@gmail.com>
Date: Fri, 25 Dec 2015 15:58:44 +0200
Subject: [PATCH 282/471] BB-1491: Login and Registration Page Layouts - phpmd
 fix

---
 .../Layout/Tests/Unit/LayoutBuilderTest.php        | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/Oro/Component/Layout/Tests/Unit/LayoutBuilderTest.php b/src/Oro/Component/Layout/Tests/Unit/LayoutBuilderTest.php
index 3464b9e0ae5..a50023332bf 100644
--- a/src/Oro/Component/Layout/Tests/Unit/LayoutBuilderTest.php
+++ b/src/Oro/Component/Layout/Tests/Unit/LayoutBuilderTest.php
@@ -275,15 +275,14 @@ public function testGetLayout()
             ->with($this->identicalTo($rootView))
             ->will($this->returnValue($layout));
 
-        $rawLayout->expects($this->once())
-            ->method('getRootId')
+        $rawLayout->expects($this->once())->method('getRootId')
             ->will($this->returnValue($rootId));
         $rawLayout->expects($this->once())
             ->method('getBlockThemes')
             ->will(
                 $this->returnValue(
                     [
-                        $rootId      => ['RootTheme1', 'RootTheme2', 'RootTheme3'],
+                        $rootId => ['RootTheme1', 'RootTheme2', 'RootTheme3'],
                         'test_block' => ['TestTheme1', 'TestTheme2', 'TestTheme3']
                     ]
                 )
@@ -297,13 +296,8 @@ public function testGetLayout()
         $layout->expects($this->exactly(2))
             ->method('setBlockTheme');
 
-        $rawLayout->expects($this->once())
-            ->method('getFormThemes')
-            ->will(
-                $this->returnValue(
-                    ['TestFormTheme1', 'TestFormTheme2']
-                )
-            );
+        $rawLayout->expects($this->once())->method('getFormThemes')
+            ->will($this->returnValue(['TestFormTheme1', 'TestFormTheme2']));
         $layout->expects($this->at(2))
             ->method('setFormTheme')
             ->with(['TestFormTheme1', 'TestFormTheme2']);

From 5350303288abd6eb8d5c35acff7db04c775fbd5e Mon Sep 17 00:00:00 2001
From: Alexander Nezdoiminoga <alex@magecore.com>
Date: Fri, 25 Dec 2015 16:06:19 +0200
Subject: [PATCH 283/471] BAP-9492: fix Attachments grid not configured to
 support extended fields

---
 src/Oro/Bundle/AttachmentBundle/Resources/config/datagrid.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Oro/Bundle/AttachmentBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/AttachmentBundle/Resources/config/datagrid.yml
index 825461245e7..b1275df03c1 100644
--- a/src/Oro/Bundle/AttachmentBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/AttachmentBundle/Resources/config/datagrid.yml
@@ -1,5 +1,6 @@
 datagrid:
     attachment-grid:
+        extended_entity_name: %oro_attachment.entity.class%
         source:
             type: orm
             query:

From 749f8fa2045799b5c3ee03f5afcf948355cd5257 Mon Sep 17 00:00:00 2001
From: Hryhorii Hrebiniuk <grebinuk@gmail.com>
Date: Fri, 25 Dec 2015 16:12:30 +0200
Subject: [PATCH 284/471] fixed PR

---
 src/Oro/Bundle/UIBundle/Resources/public/css/less/layout.less | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/layout.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/layout.less
index 71ddf0e89d7..c0c212154c9 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/layout.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/layout.less
@@ -161,6 +161,3 @@
     }
   }
 }
-.responsive-cell > .oro-tabs {
-
-}

From d51a7055baa6b3efd63f0a24efe05493b1d17582 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Fri, 25 Dec 2015 16:44:56 +0200
Subject: [PATCH 285/471] BAP-9578: Detect and set default grid view

---
 .../Entity/Repository/GridViewRepository.php  | 23 +++++
 .../GridViews/GridViewsExtension.php          | 44 +++++++--
 .../Resources/config/extensions.yml           |  1 +
 .../GridViews/GridViewsExtensionTest.php      | 91 +++++++++++++++++--
 4 files changed, 142 insertions(+), 17 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php b/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php
index 9d174a3a755..8383af2851e 100644
--- a/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php
+++ b/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php
@@ -8,6 +8,7 @@
 
 use Oro\Bundle\DataGridBundle\Entity\GridView;
 use Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper;
+use Oro\Bundle\UserBundle\Entity\User;
 
 class GridViewRepository extends EntityRepository
 {
@@ -36,4 +37,26 @@ public function findGridViews(AclHelper $aclHelper, UserInterface $user, $gridNa
 
         return $aclHelper->apply($qb)->getResult();
     }
+
+    /**
+     * @param string $gridName
+     * @param User $user
+     *
+     * @return GridView|null
+     */
+    public function findDefaultGridView($gridName, User $user)
+    {
+        $qb = $this->createQueryBuilder('gv')
+            ->join('gv.users', 'user')
+            ->where('gv.gridName = :gridName')
+            ->andWhere('user = :user')
+            ->setParameters(
+                [
+                    'gridName' => $gridName,
+                    'user'     => $user,
+                ]
+            );
+
+        return $qb->getQuery()->getOneOrNullResult();
+    }
 }
diff --git a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
index 90ed2a3a772..19dd8378bf1 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
@@ -2,6 +2,8 @@
 
 namespace Oro\Bundle\DataGridBundle\Extension\GridViews;
 
+use Doctrine\Common\Persistence\ManagerRegistry;
+
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 
@@ -32,19 +34,25 @@ class GridViewsExtension extends AbstractExtension
     /** @var TranslatorInterface */
     protected $translator;
 
+    /** @var ManagerRegistry */
+    protected $registry;
+
     /**
      * @param EventDispatcherInterface $eventDispatcher
-     * @param SecurityFacade $securityFacade
-     * @param TranslatorInterface $translator
+     * @param SecurityFacade           $securityFacade
+     * @param TranslatorInterface      $translator
+     * @param ManagerRegistry          $registry
      */
     public function __construct(
         EventDispatcherInterface $eventDispatcher,
         SecurityFacade $securityFacade,
-        TranslatorInterface $translator
+        TranslatorInterface $translator,
+        ManagerRegistry $registry
     ) {
         $this->eventDispatcher = $eventDispatcher;
-        $this->securityFacade = $securityFacade;
-        $this->translator = $translator;
+        $this->securityFacade  = $securityFacade;
+        $this->translator      = $translator;
+        $this->registry        = $registry;
     }
 
     /**
@@ -70,14 +78,18 @@ protected function isDisabled()
      */
     public function visitMetadata(DatagridConfiguration $config, MetadataObject $data)
     {
-        $params  = $this->getParameters()->get(ParameterBag::ADDITIONAL_PARAMETERS, []);
+        $defaultViewId = $this->getDefaultViewId($config->getName());
+        $params        = $this->getParameters()->get(ParameterBag::ADDITIONAL_PARAMETERS, []);
+
         if (isset($params[self::VIEWS_PARAM_KEY])) {
             $currentView = (int)$params[self::VIEWS_PARAM_KEY];
         } else {
-            $currentView = self::DEFAULT_VIEW_ID;
+            $currentView                   = $defaultViewId;
+            $params[self::VIEWS_PARAM_KEY] = $defaultViewId;
+            $this->getParameters()->set(ParameterBag::ADDITIONAL_PARAMETERS, $params);
         }
 
-        $data->offsetAddToArray('initialState', ['gridView' => self::DEFAULT_VIEW_ID]);
+        $data->offsetAddToArray('initialState', ['gridView' => $defaultViewId]);
         $data->offsetAddToArray('state', ['gridView' => $currentView]);
 
         $allLabel = null;
@@ -119,6 +131,22 @@ public function visitMetadata(DatagridConfiguration $config, MetadataObject $dat
         $data->offsetAddToArray('gridViews', $gridViews);
     }
 
+    /**
+     * @param string $gridName
+     *
+     * @return int|string
+     */
+    protected function getDefaultViewId($gridName)
+    {
+        $defaultGridView = null;
+        if ($this->securityFacade->isGranted('oro_datagrid_gridview_view')) {
+            $repository      = $this->registry->getRepository('OroDataGridBundle:GridView');
+            $defaultGridView = $repository->findDefaultGridView($gridName, $this->securityFacade->getLoggedUser());
+        }
+
+        return $defaultGridView ? $defaultGridView->getId() : self::DEFAULT_VIEW_ID;
+    }
+
     /**
      * @return array
      */
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/config/extensions.yml b/src/Oro/Bundle/DataGridBundle/Resources/config/extensions.yml
index 1647a0e069d..f68083b9c3e 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/config/extensions.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/config/extensions.yml
@@ -81,6 +81,7 @@ services:
             - @event_dispatcher
             - @oro_security.security_facade
             - @translator
+            - @doctrine
         tags:
             - { name: oro_datagrid.extension }
 
diff --git a/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/GridViews/GridViewsExtensionTest.php b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/GridViews/GridViewsExtensionTest.php
index b37de7cd588..15bbfa99a1f 100644
--- a/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/GridViews/GridViewsExtensionTest.php
+++ b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/GridViews/GridViewsExtensionTest.php
@@ -12,6 +12,8 @@
 class GridViewsExtensionTest extends \PHPUnit_Framework_TestCase
 {
     private $eventDispatcher;
+
+    /** @var GridViewsExtension */
     private $gridViewsExtension;
 
     public function setUp()
@@ -29,16 +31,36 @@ public function setUp()
             ->method('isGranted')
             ->will($this->returnValue(true));
 
-        $this->gridViewsExtension = new GridViewsExtension($this->eventDispatcher, $securityFacade, $translator);
+        $repo = $this->getMockBuilder('Doctrine\ORM\EntityRepository')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $repo->expects($this->any())
+            ->method('findDefaultGridView')
+            ->willReturn(null);
+
+        $registry = $this->getMock('Doctrine\Common\Persistence\ManagerRegistry');
+        $registry->expects($this->any())
+            ->method('getRepository')
+            ->willReturn($repo);
+
+        $this->gridViewsExtension = new GridViewsExtension(
+            $this->eventDispatcher,
+            $securityFacade,
+            $translator,
+            $registry
+        );
     }
 
     public function testVisitMetadataShouldAddGridViewsFromEvent()
     {
         $this->gridViewsExtension->setParameters(new ParameterBag());
-        $data = MetadataObject::create([]);
-        $config = DatagridConfiguration::create([
-            DatagridConfiguration::NAME_KEY => 'grid',
-        ]);
+        $data   = MetadataObject::create([]);
+        $config = DatagridConfiguration::create(
+            [
+                DatagridConfiguration::NAME_KEY => 'grid',
+            ]
+        );
 
         $this->eventDispatcher
             ->expects($this->once())
@@ -64,11 +86,15 @@ public function testVisitMetadataShouldAddGridViewsFromEvent()
             ->expects($this->once())
             ->method('dispatch')
             ->with(GridViewsLoadEvent::EVENT_NAME)
-            ->will($this->returnCallback(function ($eventName, GridViewsLoadEvent $event) use ($expectedViews) {
-                $event->setGridViews($expectedViews);
+            ->will(
+                $this->returnCallback(
+                    function ($eventName, GridViewsLoadEvent $event) use ($expectedViews) {
+                        $event->setGridViews($expectedViews);
 
-                return $event;
-            }));
+                        return $event;
+                    }
+                )
+            );
 
         $this->assertFalse($data->offsetExists('gridViews'));
         $this->gridViewsExtension->visitMetadata($config, $data);
@@ -76,6 +102,53 @@ public function testVisitMetadataShouldAddGridViewsFromEvent()
         $this->assertEquals($expectedViews, $data->offsetGet('gridViews'));
     }
 
+
+    /**
+     * @param array $input
+     * @param bool  $expected
+     *
+     * @dataProvider isApplicableDataProvider
+     */
+    public function testIsApplicable($input, $expected)
+    {
+        $this->gridViewsExtension->setParameters(new ParameterBag($input));
+        $config = DatagridConfiguration::create(
+            [
+                DatagridConfiguration::NAME_KEY => 'grid',
+            ]
+        );
+        $this->assertEquals($expected, $this->gridViewsExtension->isApplicable($config));
+    }
+
+    /**
+     * @return array
+     */
+    public function isApplicableDataProvider()
+    {
+        return [
+            'Default'            => [
+                'input'    => [],
+                'expected' => true,
+            ],
+            'Extension disabled' => [
+                'input'    => [
+                    '_grid_view' => [
+                        '_disabled' => true
+                    ]
+                ],
+                'expected' => false,
+            ],
+            'Extension enabled'  => [
+                'input'    => [
+                    '_grid_view' => [
+                        '_disabled' => false
+                    ]
+                ],
+                'expected' => true,
+            ],
+        ];
+    }
+
     /**
      * @param array $input
      * @param array $expected

From 1d41d027844ae0f9be9ba881427c6513ee569c9e Mon Sep 17 00:00:00 2001
From: Hryhorii Hrebiniuk <hhrebiniuk@magecore.com>
Date: Fri, 25 Dec 2015 17:21:40 +0200
Subject: [PATCH 286/471] BAP-9553 Grids and debug toolbar fix

---
 .../UIBundle/Resources/public/css/less/oro/fs-toolbar.less  | 2 ++
 .../public/js/app/views/page/debug-toolbar-view.js          | 6 +++++-
 src/Oro/Bundle/UIBundle/Resources/public/js/init-layout.js  | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/fs-toolbar.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/fs-toolbar.less
index 18233886940..ae5f021e8c2 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/fs-toolbar.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/fs-toolbar.less
@@ -11,9 +11,11 @@
     & > .sf-toolbar-block{
       border-right: 1px solid #13161a;
       border-left: 1px solid #424951;
+      border-bottom-color: #424951;
       &:hover{
         border-right: 1px solid #bbb;
         border-left: 1px solid #bbb;
+        border-bottom-color: #bbb;
       }
     }
     & > .hide-button{
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/app/views/page/debug-toolbar-view.js b/src/Oro/Bundle/UIBundle/Resources/public/js/app/views/page/debug-toolbar-view.js
index 75fc1b5ca19..42e42d5a78a 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/js/app/views/page/debug-toolbar-view.js
+++ b/src/Oro/Bundle/UIBundle/Resources/public/js/app/views/page/debug-toolbar-view.js
@@ -30,7 +30,11 @@ define([
          * @override
          */
         onPageUpdate: function(data, actionArgs, xhr) {
-            if (!xhr) {
+            if (!actionArgs.route.previous) {
+                this.sendUpdates();
+                // nothing to do, the page just loaded
+                return;
+            } else if (!xhr) {
                 this.$el.empty();
                 mediator.trigger('layout:adjustHeight');
                 return;
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/init-layout.js b/src/Oro/Bundle/UIBundle/Resources/public/js/init-layout.js
index 343a003532d..384886a0ffb 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/js/init-layout.js
+++ b/src/Oro/Bundle/UIBundle/Resources/public/js/init-layout.js
@@ -264,7 +264,7 @@ require(['jquery', 'underscore', 'orotranslation/js/translator', 'oroui/js/tools
                 $main.width(realWidth($topPage) - realWidth($leftPanel) - realWidth($rightPanel));
                 layout.updateResponsiveLayout();
 
-                var debugBarHeight = $('.sf-toolbar:visible').height() || 0;
+                var debugBarHeight = layout.getDevToolbarHeight();
                 var anchorTop = anchor.position().top;
                 var footerHeight = $('#footer:visible').height() || 0;
                 var fixContent = 1;

From a0977e3c251820f6fff7fad166112d50990783ea Mon Sep 17 00:00:00 2001
From: Makar Sichevoy <sichevoy@gmail.com>
Date: Fri, 25 Dec 2015 17:38:22 +0200
Subject: [PATCH 287/471] BAP-9612: Unread email's status doesn't sync via IMAP

---
 .../Entity/Repository/EmailUserRepository.php      |  8 +++++++-
 .../Entity/Repository/ImapEmailRepository.php      | 14 ++++++++++----
 .../Sync/ImapEmailSynchronizationProcessor.php     |  6 +++---
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/Oro/Bundle/EmailBundle/Entity/Repository/EmailUserRepository.php b/src/Oro/Bundle/EmailBundle/Entity/Repository/EmailUserRepository.php
index 451542dda47..8039a674f80 100644
--- a/src/Oro/Bundle/EmailBundle/Entity/Repository/EmailUserRepository.php
+++ b/src/Oro/Bundle/EmailBundle/Entity/Repository/EmailUserRepository.php
@@ -79,10 +79,11 @@ public function getEmailUserList(User $user, Organization $organization, array $
     /**
      * @param array       $ids
      * @param EmailFolder $folder
+     * @param \DateTime   $date
      *
      * @return array
      */
-    public function getInvertedIdsFromFolder(array $ids, EmailFolder $folder)
+    public function getInvertedIdsFromFolder(array $ids, EmailFolder $folder, $date = null)
     {
         $qb = $this->createQueryBuilder('email_user');
 
@@ -96,6 +97,11 @@ public function getInvertedIdsFromFolder(array $ids, EmailFolder $folder)
                 ->setParameter('ids', $ids);
         }
 
+        if ($date) {
+            $qb->andWhere($qb->expr()->gt('email_user.receivedAt', ':date'))
+                ->setParameter('date', $date);
+        }
+
         $emailUserIds = $qb->getQuery()->getArrayResult();
 
         $ids = [];
diff --git a/src/Oro/Bundle/ImapBundle/Entity/Repository/ImapEmailRepository.php b/src/Oro/Bundle/ImapBundle/Entity/Repository/ImapEmailRepository.php
index 4c33db03068..00fbd35e214 100644
--- a/src/Oro/Bundle/ImapBundle/Entity/Repository/ImapEmailRepository.php
+++ b/src/Oro/Bundle/ImapBundle/Entity/Repository/ImapEmailRepository.php
@@ -132,22 +132,28 @@ public function getUid($folder, $email)
     /**
      * @param             $uids
      * @param EmailFolder $folder
+     * @param \DateTime   $date
      *
      * @return array
      */
-    public function getEmailUserIdsByUIDs($uids, EmailFolder $folder)
+    public function getEmailUserIdsByUIDs($uids, EmailFolder $folder, $date = null)
     {
         $qb = $this->createQueryBuilder('ie');
 
-        $emailUserIds = $qb->select('email_user.id')
+        $qb = $this->createQueryBuilder('ie')->select('email_user.id')
             ->leftJoin('ie.email', 'email')
             ->leftJoin('email.emailUsers', 'email_user')
             ->leftJoin('email_user.folders', 'folders')
             ->andWhere($qb->expr()->in('folders', ':folder'))
             ->andWhere($qb->expr()->in('ie.uid', ':uids'))
             ->setParameter('uids', $uids)
-            ->setParameter('folder', $folder)
-            ->getQuery()->getArrayResult();
+            ->setParameter('folder', $folder);
+
+        if ($date) {
+            $qb->andWhere($qb->expr()->gt('email_user.receivedAt', ':date'))
+                ->setParameter('date', $date);
+        }
+        $emailUserIds = $qb->getQuery()->getArrayResult();
 
         $ids = [];
         foreach ($emailUserIds as $emailUserId) {
diff --git a/src/Oro/Bundle/ImapBundle/Sync/ImapEmailSynchronizationProcessor.php b/src/Oro/Bundle/ImapBundle/Sync/ImapEmailSynchronizationProcessor.php
index 27aafe2df1e..8c25533d7a6 100644
--- a/src/Oro/Bundle/ImapBundle/Sync/ImapEmailSynchronizationProcessor.php
+++ b/src/Oro/Bundle/ImapBundle/Sync/ImapEmailSynchronizationProcessor.php
@@ -93,7 +93,7 @@ public function process(EmailOrigin $origin, $syncStartTime)
 
                 $startDate = $folder->getSynchronizedAt();
                 $checkStartDate = clone $startDate;
-                $checkStartDate->modify('-1 month');
+                $checkStartDate->modify('-6 month');
 
                 // set seen flags from previously synchronized emails
                 $this->checkFlags($imapFolder, $checkStartDate);
@@ -124,8 +124,8 @@ protected function checkFlags(ImapEmailfolder $imapFolder, $startDate)
             $emailImapRepository = $this->em->getRepository('OroImapBundle:ImapEmail');
             $emailUserRepository = $this->em->getRepository('OroEmailBundle:EmailUser');
 
-            $ids = $emailImapRepository->getEmailUserIdsByUIDs($uids, $imapFolder->getFolder());
-            $invertedIds = $emailUserRepository->getInvertedIdsFromFolder($ids, $imapFolder->getFolder());
+            $ids = $emailImapRepository->getEmailUserIdsByUIDs($uids, $imapFolder->getFolder(), $startDate);
+            $invertedIds = $emailUserRepository->getInvertedIdsFromFolder($ids, $imapFolder->getFolder(), $startDate);
 
             $emailUserRepository->setEmailUsersSeen($ids, false);
             $emailUserRepository->setEmailUsersSeen($invertedIds, true);

From 703f4dc48e620677fa17b4458bd460716afa7d96 Mon Sep 17 00:00:00 2001
From: Mykhailo Kudelia <mkudelia@magecore.com>
Date: Fri, 25 Dec 2015 17:39:23 +0200
Subject: [PATCH 288/471] BAP-9592: Wrong ACL condition to view BU grid

---
 .../Event/BusinessUnitGridListener.php               | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Oro/Bundle/OrganizationBundle/Event/BusinessUnitGridListener.php b/src/Oro/Bundle/OrganizationBundle/Event/BusinessUnitGridListener.php
index d6e64cd0ba7..ab0c58735ef 100644
--- a/src/Oro/Bundle/OrganizationBundle/Event/BusinessUnitGridListener.php
+++ b/src/Oro/Bundle/OrganizationBundle/Event/BusinessUnitGridListener.php
@@ -72,10 +72,14 @@ public function onBuildBefore(BuildBefore $event)
                     $organization->getId()
                 );
             }
-            $where = array_merge(
-                $where,
-                ['u.id in (' . implode(', ', $resultBuIds) . ')']
-            );
+            if (count($resultBuIds)) {
+                $where = array_merge(
+                    $where,
+                    ['u.id in (' . implode(', ', $resultBuIds) . ')']
+                );
+            } else {
+                $where = array_merge($where, ['1 = 0']);
+            }
         }
         if (count($where)) {
             $config->offsetSetByPath('[source][query][where][and]', $where);

From 25e0c06deb43d232d354ce9eafa597c456dd391d Mon Sep 17 00:00:00 2001
From: Hryhorii Hrebiniuk <hhrebiniuk@magecore.com>
Date: Fri, 25 Dec 2015 18:07:22 +0200
Subject: [PATCH 289/471] BAP-9553 Grids and debug toolbar fix

---
 .../Resources/public/css/less/dashboard.less           | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
index 9a0c9f4b10d..6dd7f8d65dc 100644
--- a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
+++ b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
@@ -577,4 +577,14 @@
 }
 #dashboard_selector, #uniform-dashboard_selector {
   height: 28px;
+  &.selector {
+    line-height: 28px;
+    span {
+      height: 28px;
+      line-height: 28px;
+      &:after {
+        margin: 1px 2px 0 0;
+      }
+    }
+  }
 }

From ec25413d5208e13228b0f94b5ddb395bcad92490 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Fri, 25 Dec 2015 18:56:37 +0200
Subject: [PATCH 290/471] BAP-9114: Demo fixes  - Change confirmation messages.
  - Hide "Yes, Delete" confirmation button in case when deleted entities count
 is 0.

---
 .../js/datagrid/action/delete-mass-action.js  | 34 ++++++++++++++++--
 .../Resources/translations/jsmessages.en.yml  | 10 +++---
 .../public/js/delete-confirmation.js          | 36 ++++++++++++++++++-
 3 files changed, 73 insertions(+), 7 deletions(-)

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 abf5a587915..030e409ccc3 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
@@ -34,12 +34,16 @@ define([
         confirmMessages: {
             selected_message: 'oro.datagrid.mass_action.delete.selected_message',
             max_limit_message: 'oro.datagrid.mass_action.delete.max_limit_message',
-            restricted_access_message: 'oro.datagrid.mass_action.delete.restricted_access_message'
+            restricted_access_message: 'oro.datagrid.mass_action.delete.restricted_access_message',
+            restricted_access_empty_message: 'oro.datagrid.mass_action.delete.restricted_access_empty_message'
         },
 
         /** @property {String} */
         confirmMessage: null,
 
+        /** @property {Boolean} */
+        allowOk: true,
+
         /**
          * As in this action we need to send POST request to get data for confirm message
          * we set this.confirmation = false at initialization to prevent opening confirm window.
@@ -52,6 +56,28 @@ define([
             this.confirmation = false;
         },
 
+        /**
+         * Get view for confirm modal
+         *
+         * @return {oroui.Modal}
+         */
+        getConfirmDialog: function(callback) {
+            if (!this.confirmModal) {
+                this.confirmModal = (new this.confirmModalConstructor({
+                    title: __(this.messages.confirm_title),
+                    content: this.getConfirmContentMessage(),
+                    okText: __(this.messages.confirm_ok),
+                    cancelText: __(this.messages.confirm_cancel),
+                    allowOk: this.allowOk
+                }));
+                this.listenTo(this.confirmModal, 'ok', callback);
+
+                this.subviews.push(this.confirmModal);
+            }
+            return this.confirmModal;
+        },
+
+
         /**
          * Need to handle POST and DELETE requests differently.
          *
@@ -100,8 +126,12 @@ define([
          * @param data
          */
         setConfirmMessage: function(data) {
+            this.allowOk = true;
             if (this.isDefined(data.selected) && this.isDefined(data.deletable) && this.isDefined(data.max_limit)) {
-                if (data.deletable <= data.max_limit) {
+                if (data.deletable === 0) {
+                    this.confirmMessage = __(this.confirmMessages.restricted_access_empty_message);
+                    this.allowOk = false;
+                } else if (data.deletable <= data.max_limit) {
                     if (data.deletable >= data.selected) {
                         this.confirmMessage = __(this.confirmMessages.selected_message, {selected: data.selected});
                     } else {
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml b/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
index 95bf6ed2357..8e23c747147 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
@@ -87,10 +87,12 @@ oro:
             delete:
                 selected_message: >
                     You have selected {{ selected }} records.<br/>
-                    Are you sure you want to delete {{ selected }} records?
+                    Are you sure you want to delete them?
                 max_limit_message: >
-                    Due to performance limitations the maximum amount of records to be deleted at once is {{ max_limit }}.<br/>
+                    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?
                 restricted_access_message: >
-                    You have permissions to delete {{ deletable }} records out of {{ selected }} selected.<br/>
-                    Are you sure you want to delete {{ deletable }} records?
+                    You have permissions to delete  {{ deletable }} records out of {{ selected }} selected.<br/>
+                    Are you sure you want to delete them?
+                restricted_access_empty_message: >
+                    You don't have permissions to delete any of the selected records.
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/delete-confirmation.js b/src/Oro/Bundle/UIBundle/Resources/public/js/delete-confirmation.js
index 22cdfd58a8d..908cf544063 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/js/delete-confirmation.js
+++ b/src/Oro/Bundle/UIBundle/Resources/public/js/delete-confirmation.js
@@ -10,20 +10,54 @@ define(['underscore', 'orotranslation/js/translator', 'oroui/js/modal'
      * @extends oroui.Modal
      */
     return Modal.extend({
+
+        /** @property {String} */
+        template: '\
+    <% if (title) { %>\
+      <div class="modal-header">\
+        <% if (allowCancel) { %>\
+          <a class="close">×</a>\
+        <% } %>\
+        <h3>{{title}}</h3>\
+      </div>\
+    <% } %>\
+    <div class="modal-body">{{content}}</div>\
+    <div class="modal-footer">\
+      <% if (allowCancel) { %>\
+        <% if (cancelText) { %>\
+          <a href="#" class="btn cancel">{{cancelText}}</a>\
+        <% } %>\
+      <% } %>\
+      <% if (allowOk) { %>\
+        <a href="#" class="btn ok btn-primary">{{okText}}</a>\
+      <% } %>\
+    </div>\
+  ',
         /** @property {String} */
         className: 'modal oro-modal-danger',
 
         /** @property {String} */
         okButtonClass: 'btn-danger',
 
+        /** @property {Boolean} */
+        allowOk: true,
+
         /**
          * @param {Object} options
          */
         initialize: function(options) {
+            //Set custom template settings
+            var interpolate = {
+                interpolate: /\{\{(.+?)\}\}/g,
+                evaluate: /<%([\s\S]+?)%>/g
+            };
+
             options = _.extend({
                 title: __('Delete Confirmation'),
                 okText: __('Yes, Delete'),
-                cancelText: __('Cancel')
+                cancelText: __('Cancel'),
+                template: _.template(this.template, interpolate),
+                allowOk: this.allowOk
             }, options);
 
             arguments[0] = options;

From bf4670d83d93f1628f52f7c74b9497d8a1f04768 Mon Sep 17 00:00:00 2001
From: Hryhorii Hrebiniuk <hhrebiniuk@magecore.com>
Date: Fri, 25 Dec 2015 19:55:03 +0200
Subject: [PATCH 291/471] BAP-9582: Dashboard widget header fix

---
 .../Resources/public/css/less/dashboard.less             | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
index ddb38697fe8..0c60b55105c 100644
--- a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
+++ b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
@@ -115,6 +115,11 @@
       white-space: nowrap;
       .action-wrapper {
         border-right: 1px solid #ddd;
+        padding: 3px 13px;
+      }
+    }
+    .default-actions-container {
+      .action-wrapper {
         padding: 0 3px;
         > a {
           padding: 10px 8px;
@@ -132,6 +137,10 @@
       margin: 10px -1px 0 0;
     }
 
+    .dashboard-btn {
+      margin-top: -3px;
+    }
+
     .move-action {
       cursor: move;
     }

From faf0086d81b19a5170d0dc5db7ff4ab205a5df86 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Fri, 25 Dec 2015 20:33:38 +0200
Subject: [PATCH 292/471] BAP-9578: Detect and set default grid view  - Review
 fixes

---
 .../DataGridBundle/Entity/Repository/GridViewRepository.php      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php b/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php
index 8383af2851e..c9471a3e48b 100644
--- a/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php
+++ b/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php
@@ -50,6 +50,7 @@ public function findDefaultGridView($gridName, User $user)
             ->join('gv.users', 'user')
             ->where('gv.gridName = :gridName')
             ->andWhere('user = :user')
+            ->setMaxResults(1)
             ->setParameters(
                 [
                     'gridName' => $gridName,

From e5416338ee4f94da1d85f3e33109ed124865205d Mon Sep 17 00:00:00 2001
From: zebimax <zebimax@gmail.com>
Date: Fri, 25 Dec 2015 21:27:20 +0200
Subject: [PATCH 293/471] BAP-9577: Add option 'Use as default' to views
 options  - add api and use default js logic, need to fix __all__ label

---
 .../Api/Rest/GridViewController.php           | 45 +++++++++++++++
 .../Entity/Repository/GridViewRepository.php  | 56 +++++++++++++++----
 .../EventListener/GridViewsLoadListener.php   |  2 +-
 .../GridViews/GridViewsExtension.php          |  8 +--
 .../public/js/datagrid/grid-views/view.js     | 56 ++++++++++++++++++-
 5 files changed, 149 insertions(+), 18 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Controller/Api/Rest/GridViewController.php b/src/Oro/Bundle/DataGridBundle/Controller/Api/Rest/GridViewController.php
index efab9eacf64..8af8e4bdcb0 100644
--- a/src/Oro/Bundle/DataGridBundle/Controller/Api/Rest/GridViewController.php
+++ b/src/Oro/Bundle/DataGridBundle/Controller/Api/Rest/GridViewController.php
@@ -6,9 +6,11 @@
 use FOS\RestBundle\Controller\Annotations\Post;
 use FOS\RestBundle\Controller\Annotations\Put;
 use FOS\RestBundle\Controller\Annotations as Rest;
+use FOS\RestBundle\Util\Codes;
 
 use Nelmio\ApiDocBundle\Annotation\ApiDoc;
 
+use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 
@@ -16,6 +18,7 @@
 use Oro\Bundle\SecurityBundle\Annotation\Acl;
 use Oro\Bundle\SecurityBundle\SecurityFacade;
 use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController;
+use Oro\Bundle\DataGridBundle\Entity\Repository\GridViewRepository;
 
 /**
  * @Rest\NamePrefix("oro_datagrid_api_rest_gridview_")
@@ -98,6 +101,48 @@ public function deleteAction($id)
         return $this->handleDeleteRequest($id);
     }
 
+
+    /**
+     * @param int  $id
+     * @param bool $default
+     *
+     * @return Response
+     * @Post(
+     *     "/gridviews/{id}/setdefault/{default}",
+     *     requirements={"id"="\d+", "default"="\d+"},
+     *     defaults={"default"=false}
+     *)
+     * @ApiDoc(
+     *      description="Set/unset grid view as default for current user",
+     *      resource=true,
+     *      requirements={
+     *          {"name"="id", "dataType"="integer"},
+     *          {"name"="default", "dataType"="boolean"},
+     *      },
+     *     defaults={"default"="false"}
+     * )
+     * @Acl(
+     *     id="oro_datagrid_gridview_update",
+     *     type="entity",
+     *     class="OroDataGridBundle:GridView",
+     *     permission="EDIT"
+     * )
+     */
+    public function setDefaultAction($id, $default = false)
+    {
+        /** @var GridView $gridView */
+        $gridView = $this->getManager()->find($id);
+        if ($gridView->getType() === GridView::TYPE_PUBLIC) {
+            $this->checkEditPublicAccess($gridView);
+        }
+        /** @var GridViewRepository $repository */
+        $repository = $this->getManager()->getRepository();
+        $user = $this->getUser();
+        $repository->setGridViewDefault($user, $gridView, $default);
+
+        return new JsonResponse([], Codes::HTTP_OK);
+    }
+
     /**
      * @param GridView $gridView
      *
diff --git a/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php b/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php
index d203c31f8b5..f98ca48c81b 100644
--- a/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php
+++ b/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php
@@ -2,10 +2,12 @@
 
 namespace Oro\Bundle\DataGridBundle\Entity\Repository;
 
-use Symfony\Component\Security\Core\User\UserInterface;
-
+use Doctrine\ORM\QueryBuilder;
 use Doctrine\ORM\EntityRepository;
 
+use Symfony\Component\Security\Core\User\UserInterface;
+
+use Oro\Bundle\UserBundle\Entity\User;
 use Oro\Bundle\DataGridBundle\Entity\GridView;
 use Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper;
 
@@ -38,13 +40,48 @@ public function findGridViews(AclHelper $aclHelper, UserInterface $user, $gridNa
     }
 
     /**
-     * @param AclHelper     $aclHelper
      * @param UserInterface $user
-     * @param               $gridName
+     * @param string        $gridName
+     *
+     * @return GridView|null
+     */
+    public function findDefaultGridView(UserInterface $user, $gridName)
+    {
+        $qb = $this->getFindDefaultGridViewQb($user, $gridName);
+
+        return $qb->setMaxResults(1)->getQuery()->getOneOrNullResult();
+    }
+
+    /**
+     * @param User     $user
+     * @param GridView $gridView
+     * @param bool     $default
+     */
+    public function setGridViewDefault(User $user, GridView $gridView, $default)
+    {
+        /** @var GridView[] $defaultGridViews */
+        $defaultGridViews = $this
+            ->getFindDefaultGridViewQb($user, $gridView->getGridName())
+            ->getQuery()
+            ->getResult();
+
+        foreach ($defaultGridViews as $view) {
+            $view->removeUser($user);
+        }
+        if ($default) {
+            $gridView->addUser($user);
+        }
+
+        $this->getEntityManager()->flush();
+    }
+
+    /**
+     * @param UserInterface $user
+     * @param string        $gridName
      *
-     * @return mixed
+     * @return QueryBuilder
      */
-    public function findUserDefaultGridView(AclHelper $aclHelper, UserInterface $user, $gridName)
+    protected function getFindDefaultGridViewQb(UserInterface $user, $gridName)
     {
         $qb = $this->createQueryBuilder('gv');
         $qb->innerJoin('gv.users', 'u')
@@ -52,10 +89,9 @@ public function findUserDefaultGridView(AclHelper $aclHelper, UserInterface $use
             ->andWhere('u = :user')
             ->setParameters([
                 'gridName' => $gridName,
-                'user'    => $user
-            ])
-            ->setMaxResults(1);
+                'user'     => $user
+            ]);
 
-        return $aclHelper->apply($qb)->getOneOrNullResult();
+        return $qb;
     }
 }
diff --git a/src/Oro/Bundle/DataGridBundle/EventListener/GridViewsLoadListener.php b/src/Oro/Bundle/DataGridBundle/EventListener/GridViewsLoadListener.php
index 311519eebfc..1e5dc1cdf4f 100644
--- a/src/Oro/Bundle/DataGridBundle/EventListener/GridViewsLoadListener.php
+++ b/src/Oro/Bundle/DataGridBundle/EventListener/GridViewsLoadListener.php
@@ -57,7 +57,7 @@ public function onViewsLoad(GridViewsLoadEvent $event)
 
         $gridViewRepository = $this->getGridViewRepository();
         $gridViews          = $gridViewRepository->findGridViews($this->aclHelper, $currentUser, $gridName);
-        $defaultGridView    = $gridViewRepository->findUserDefaultGridView($this->aclHelper, $currentUser, $gridName);
+        $defaultGridView    = $gridViewRepository->findDefaultGridView($currentUser, $gridName);
         if (!$gridViews) {
             return;
         }
diff --git a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
index d50e4a9b75f..88292cd49fc 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
@@ -85,9 +85,7 @@ public function visitMetadata(DatagridConfiguration $config, MetadataObject $dat
                     'value' => self::DEFAULT_VIEW_ID,
                 ],
             ],
-            'views' => [
-                $systemAllView->getMetadata(),
-            ],
+            'views' => [],
         ];
         if ($list !== false) {
             $configuredGridViews = $list->getMetadata();
@@ -101,9 +99,11 @@ public function visitMetadata(DatagridConfiguration $config, MetadataObject $dat
             $this->eventDispatcher->dispatch(GridViewsLoadEvent::EVENT_NAME, $event);
             $gridViews = $event->getGridViews();
         }
-        $systemAllView->setIsDefault($gridViews['default'] === null);
+        $systemAllView->setIsDefault(empty($gridViews['default']));
+        unset($gridViews['default']);
         $gridViews['gridName'] = $config->getName();
         $gridViews['permissions'] = $this->getPermissions();
+        $gridViews['views'][] = $systemAllView->getMetadata();
         $data->offsetAddToArray('gridViews', $gridViews);
     }
 
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
index d951f224d54..41e47835452 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
@@ -6,8 +6,9 @@ define([
     './model',
     './view-name-modal',
     'oroui/js/mediator',
-    'oroui/js/delete-confirmation'
-], function(Backbone, _, __, GridViewsCollection, GridViewModel, ViewNameModal, mediator, DeleteConfirmation) {
+    'oroui/js/delete-confirmation',
+    'routing'
+], function(Backbone, _, __, GridViewsCollection, GridViewModel, ViewNameModal, mediator, DeleteConfirmation, routing) {
     'use strict';
 
     var GridViewsView;
@@ -376,8 +377,33 @@ define([
          * @param {Event} e
          */
         onUseAsDefault: function(e) {
-            var model = this._getCurrentViewModel();
             var self = this;
+            var isDefault = 1;
+            var defaultModel = this._getCurrentDefaultViewModel();
+            var currentViewModel = this._getCurrentViewModel();
+            var id = currentViewModel.id;
+            if (this._isSystemView()) {
+                isDefault = 0;
+                id = defaultModel.id;
+                if (defaultModel.id === self.DEFAULT_GRID_VIEW_ID) {
+                    return self._showFlashMessage('success', __('oro.datagrid.gridView.updated'));
+                }
+            }
+
+            return $.post(
+                routing.generate('oro_datagrid_api_rest_gridview_set_default', {
+                    id: id,
+                    default: isDefault
+                }),
+                {},
+                function(response) {
+                    defaultModel.set('is_default', false);
+                    currentViewModel.set('is_default', true);
+                    mediator.trigger('datagrid:' + this.gridName + ':views:change', currentViewModel);
+
+                    self._showFlashMessage('success', __('oro.datagrid.gridView.updated'));
+                }
+            );
         },
 
         /**
@@ -586,6 +612,30 @@ define([
             });
         },
 
+        /**
+         * @private
+         *
+         * @returns {undefined|GridViewModel}
+         */
+        _getCurrentDefaultViewModel: function() {
+            if (!this._hasActiveView()) {
+                return;
+            }
+
+            return this.viewsCollection.findWhere({
+                is_default: true
+            });
+        },
+
+        /**
+         * @private
+         *
+         * @returns {boolean}
+         */
+        _isSystemView: function() {
+            return this._getCurrentView().value === this.DEFAULT_GRID_VIEW_ID;
+        },
+
         /**
          * @private
          *

From 0e4d46bd1ce8ce30a09817b7f227661a8b929409 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Fri, 25 Dec 2015 21:34:06 +0200
Subject: [PATCH 294/471] BAP-9578: Detect and set default grid view  - Fix
 code styles

---
 .../js/datagrid/action/delete-mass-action.js  |  1 -
 .../public/js/delete-confirmation.js          | 30 +++++--------------
 .../public/templates/delete-confirmation.html | 19 ++++++++++++
 3 files changed, 26 insertions(+), 24 deletions(-)
 create mode 100644 src/Oro/Bundle/UIBundle/Resources/public/templates/delete-confirmation.html

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 030e409ccc3..5533eb2e3ed 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
@@ -77,7 +77,6 @@ define([
             return this.confirmModal;
         },
 
-
         /**
          * Need to handle POST and DELETE requests differently.
          *
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/delete-confirmation.js b/src/Oro/Bundle/UIBundle/Resources/public/js/delete-confirmation.js
index 908cf544063..5b592d8f4da 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/js/delete-confirmation.js
+++ b/src/Oro/Bundle/UIBundle/Resources/public/js/delete-confirmation.js
@@ -1,7 +1,10 @@
-define(['underscore', 'orotranslation/js/translator', 'oroui/js/modal'
-    ], function(_, __, Modal) {
+define(function(require) {
     'use strict';
 
+    var _ = require('underscore');
+    var __ = require('orotranslation/js/translator');
+    var Modal = require('oroui/js/modal');
+
     /**
      * Delete confirmation dialog
      *
@@ -12,27 +15,8 @@ define(['underscore', 'orotranslation/js/translator', 'oroui/js/modal'
     return Modal.extend({
 
         /** @property {String} */
-        template: '\
-    <% if (title) { %>\
-      <div class="modal-header">\
-        <% if (allowCancel) { %>\
-          <a class="close">×</a>\
-        <% } %>\
-        <h3>{{title}}</h3>\
-      </div>\
-    <% } %>\
-    <div class="modal-body">{{content}}</div>\
-    <div class="modal-footer">\
-      <% if (allowCancel) { %>\
-        <% if (cancelText) { %>\
-          <a href="#" class="btn cancel">{{cancelText}}</a>\
-        <% } %>\
-      <% } %>\
-      <% if (allowOk) { %>\
-        <a href="#" class="btn ok btn-primary">{{okText}}</a>\
-      <% } %>\
-    </div>\
-  ',
+        template: require('text!oroui/templates/delete-confirmation.html'),
+
         /** @property {String} */
         className: 'modal oro-modal-danger',
 
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/templates/delete-confirmation.html b/src/Oro/Bundle/UIBundle/Resources/public/templates/delete-confirmation.html
new file mode 100644
index 00000000000..bb08ee0ca60
--- /dev/null
+++ b/src/Oro/Bundle/UIBundle/Resources/public/templates/delete-confirmation.html
@@ -0,0 +1,19 @@
+<% if (title) { %>
+<div class="modal-header">
+    <% if (allowCancel) { %>
+        <a class="close">×</a>
+    <% } %>
+    <h3>{{title}}</h3>
+</div>
+<% } %>
+<div class="modal-body">{{content}}</div>
+<div class="modal-footer">
+    <% if (allowCancel) { %>
+        <% if (cancelText) { %>
+            <a href="#" class="btn cancel">{{cancelText}}</a>
+        <% } %>
+    <% } %>
+    <% if (allowOk) { %>
+        <a href="#" class="btn ok btn-primary">{{okText}}</a>
+    <% } %>
+</div>

From 31fab93d6c134c8eed2bcb55b2cff4c25c8d949d Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Fri, 25 Dec 2015 22:52:49 +0200
Subject: [PATCH 295/471] CRM-4318: implement up down buttons for mobile
 version instead dnd

---
 .../Resources/public/css/less/dashboard.less  | 11 ++++-
 .../Resources/public/js/items/view.js         | 43 ++++++++++++++++---
 .../Resources/translations/messages.en.yml    |  2 +
 .../Resources/views/Js/items.html.twig        |  9 ++++
 .../public/js/items-manager/table.js          |  7 ++-
 5 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
index 9a0c9f4b10d..fbb575ab012 100644
--- a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
+++ b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
@@ -570,9 +570,18 @@
   margin-bottom: 10px;
   .controls {
     width: 445px;
-    .mobile-version & {
+  }
+  .mobile-version & {
+    .controls {
       width: initial;
     }
+    .action-column {
+      width: 110px;
+      text-align: center;
+    }
+    .action-cell .btn {
+      padding: 0 4px;
+    }
   }
 }
 #dashboard_selector, #uniform-dashboard_selector {
diff --git a/src/Oro/Bundle/DashboardBundle/Resources/public/js/items/view.js b/src/Oro/Bundle/DashboardBundle/Resources/public/js/items/view.js
index 91bdba5d69f..2d64c41c9f2 100644
--- a/src/Oro/Bundle/DashboardBundle/Resources/public/js/items/view.js
+++ b/src/Oro/Bundle/DashboardBundle/Resources/public/js/items/view.js
@@ -88,13 +88,20 @@ define([
         },
 
         _initializeItemGrid: function(items) {
+            var comparator = function(model) {
+                return model.get('order');
+            };
             var $itemContainer = this.$('.item-container');
-            var showedItems    = items.where({show: true});
-            var filteredItems  = new ItemCollection(showedItems);
+            var showedItems    = items.where({show: true}).map(function(model) {
+                return model.toJSON();
+            });
+            var filteredItems  = new ItemCollection(showedItems, {comparator: comparator});
 
             $itemContainer.itemsManagerTable({
                 itemTemplate: Backbone.$(this.itemTplSelector).html(),
-                collection: filteredItems
+                collection: filteredItems,
+                moveUpHandler: _.bind(this.moveUpHandler, this),
+                moveDownHandler: _.bind(this.moveDownHandler, this)
             });
 
             filteredItems.on('sort add', function() {
@@ -118,10 +125,13 @@ define([
             });
 
             $itemContainer.on('change', function(e) {
+                var value;
                 var $target = Backbone.$(e.target);
                 var item = items.get($target.closest('tr').data('cid'));
-                var value = $target.is(':checkbox') ? $target.is(':checked') : $target.val();
-                item.set($target.data('name'), value);
+                if (item) {
+                    value = $target.is(':checkbox') ? $target.is(':checked') : $target.val();
+                    item.set($target.data('name'), value);
+                }
             });
         },
 
@@ -148,6 +158,29 @@ define([
             } else {
                 this.$('.add-button').addClass('disabled');
             }
+        },
+
+        moveUpHandler: function(model) {
+            this._moveModel(model, -1);
+        },
+
+        moveDownHandler: function(model) {
+            this._moveModel(model, +1);
+        },
+
+        _moveModel: function(model, shift) {
+            var order;
+            var targetModel;
+            var collection = model.collection;
+            var targetIndex = collection.indexOf(model) + shift;
+            if (targetIndex >= 0 && targetIndex < collection.length) {
+                targetModel = collection.at(targetIndex);
+                order = model.get('order');
+                model.set('order', targetModel.get('order'));
+                targetModel.set('order', order);
+                collection.sort();
+                collection.trigger('reset');
+            }
         }
     });
 });
diff --git a/src/Oro/Bundle/DashboardBundle/Resources/translations/messages.en.yml b/src/Oro/Bundle/DashboardBundle/Resources/translations/messages.en.yml
index 95ee268ec80..55d48aac1b9 100644
--- a/src/Oro/Bundle/DashboardBundle/Resources/translations/messages.en.yml
+++ b/src/Oro/Bundle/DashboardBundle/Resources/translations/messages.en.yml
@@ -77,6 +77,8 @@ oro:
                 actions: Actions
             actions:
                 move_column.label: Move column
+                move_column_up.label: Move column up
+                move_column_down.label: Move column down
                 add.label: Add
                 add_all.label: Add all
                 delete.label: Delete column
diff --git a/src/Oro/Bundle/DashboardBundle/Resources/views/Js/items.html.twig b/src/Oro/Bundle/DashboardBundle/Resources/views/Js/items.html.twig
index 64c27aab57e..55388a75f38 100644
--- a/src/Oro/Bundle/DashboardBundle/Resources/views/Js/items.html.twig
+++ b/src/Oro/Bundle/DashboardBundle/Resources/views/Js/items.html.twig
@@ -21,9 +21,18 @@
                     data-collection-action="delete">
                 <i class="icon-trash hide-text"></i>
             </a>
+            <% if (!_.isMobile()) { %>
             <span title="{{ 'oro.dashboard.datagrid.actions.move_column.label'|trans }}">
                 <i class="icon-resize-vertical handle"></i>
             </span>
+            <% } else { %>
+            <span class="btn move-up<% if (isFirst) { %> disabled<% } %>" data-collection-action="moveUp" title="{{ 'oro.dashboard.datagrid.actions.move_column_up.label'|trans }}">
+                <i class="icon-chevron-up"></i>
+            </span>
+            <span class="btn move-down<% if (isLast) { %> disabled<% } %>" data-collection-action="moveDown" title="{{ 'oro.dashboard.datagrid.actions.move_column_down.label'|trans }}">
+                <i class="icon-chevron-down"></i>
+            </span>
+            <% } %>
         </td>
     </tr>
 </script>
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/items-manager/table.js b/src/Oro/Bundle/UIBundle/Resources/public/js/items-manager/table.js
index e24814fc6d6..1f50486e1a1 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/js/items-manager/table.js
+++ b/src/Oro/Bundle/UIBundle/Resources/public/js/items-manager/table.js
@@ -161,7 +161,12 @@ define(['jquery', 'underscore', 'oroui/js/mediator', 'jquery-ui'], function($, _
         },
 
         _renderModel: function(model) {
-            var data = _.extend({cid: model.cid}, model.toJSON());
+            var index = model.collection.indexOf(model);
+            var data = _.extend({
+                cid: model.cid,
+                isFirst: index === 0,
+                isLast: index === model.collection.length -1
+            }, model.toJSON());
             return this._itemRender(this.itemTemplate, data);
         },
 

From 98e0e190c4c2527dcf1fdfab76d14c00b4fcca7b Mon Sep 17 00:00:00 2001
From: Sergey Zhuravel <zhuravel.sergey@gmail.com>
Date: Mon, 28 Dec 2015 11:28:12 +0200
Subject: [PATCH 296/471] BB-1539: 500 error on frontend
 api/rest/latest/windows request

---
 src/Oro/Bundle/WindowsBundle/Manager/WindowsStateManager.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/WindowsBundle/Manager/WindowsStateManager.php b/src/Oro/Bundle/WindowsBundle/Manager/WindowsStateManager.php
index 6c9a54e5e2c..35a8f61f3ef 100644
--- a/src/Oro/Bundle/WindowsBundle/Manager/WindowsStateManager.php
+++ b/src/Oro/Bundle/WindowsBundle/Manager/WindowsStateManager.php
@@ -144,7 +144,9 @@ protected function getUser()
         return $user;
     }
 
-    /** @return bool */
+    /**
+     * @return bool
+     */
     public function isApplicable()
     {
         try {

From f6d1fca86cb1c9e1c4395f033d34c8e00286da49 Mon Sep 17 00:00:00 2001
From: Yevhen Shyshkin <yshyshkin@magecore.com>
Date: Mon, 28 Dec 2015 12:39:08 +0100
Subject: [PATCH 297/471] OC-630: Refactored several items in
 transition-actions.md  - review fixes

---
 .../workflow/workflow-entities/transition-actions.md          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/WorkflowBundle/Resources/doc/reference/workflow/workflow-entities/transition-actions.md b/src/Oro/Bundle/WorkflowBundle/Resources/doc/reference/workflow/workflow-entities/transition-actions.md
index d652e3e7eb0..0177c00109d 100644
--- a/src/Oro/Bundle/WorkflowBundle/Resources/doc/reference/workflow/workflow-entities/transition-actions.md
+++ b/src/Oro/Bundle/WorkflowBundle/Resources/doc/reference/workflow/workflow-entities/transition-actions.md
@@ -398,7 +398,7 @@ Call Method
     conditions:
         # optional condition configuration
     parameters:
-        attribute: $.leadContactAddAddress
+        attribute: $.result.addressResult
         object: $lead.contact
         method: addAddress
         method_parameters: [$.result.address]
@@ -406,7 +406,7 @@ Call Method
 OR
 
 - @call_method: # add Address to Contact
-    attribute: $.leadContactAddAddress
+    attribute: $.result.addressResult
     object: $lead.contact
     method: addAddress
     method_parameters: [$.result.address]

From 40afe8768fc352a0429f19ae6fc014613a393459 Mon Sep 17 00:00:00 2001
From: Hryhorii Hrebiniuk <grebinuk@gmail.com>
Date: Mon, 28 Dec 2015 13:53:15 +0200
Subject: [PATCH 298/471] BAP-9553 Mobile page header fixes

---
 .../Resources/public/css/less/activity-list.less  |  2 +-
 .../Resources/public/css/less/mobile/layout.less  | 15 ---------------
 .../public/css/less/mobile/page-header.less       | 10 +++-------
 3 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/src/Oro/Bundle/ActivityListBundle/Resources/public/css/less/activity-list.less b/src/Oro/Bundle/ActivityListBundle/Resources/public/css/less/activity-list.less
index 9e5b65c28d5..749770af82f 100644
--- a/src/Oro/Bundle/ActivityListBundle/Resources/public/css/less/activity-list.less
+++ b/src/Oro/Bundle/ActivityListBundle/Resources/public/css/less/activity-list.less
@@ -220,7 +220,7 @@
     .accordion > .items {
       .message-item {
         clear: left;
-        margin-left: 4px;
+        margin: 7px 0 7px 4px;
         width: calc(~"100% - 186px");
       }
       .details {
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/layout.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/layout.less
index e93b99f973b..e2a9c2eaad7 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/layout.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/layout.less
@@ -186,18 +186,3 @@
   position: fixed;
   bottom: 0;
 }
-
-/* START: moved from oroui/mobile/dashboard.less */
-.box-type1 {
-  margin: 0 @contentPadding @contentPadding;
-  /*border: 1px solid #b6b6b6;*/
-  .border-radius(3px);
-  .title{
-    /*padding: @contentPadding @contentPadding @contentPadding 0;*/
-    padding: @contentPadding;
-  }
-  .calendar-container {
-    padding: 0;
-  }
-}
-/* END: moved from oroui/mobile/dashboard.less */
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/page-header.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/page-header.less
index 2cf6ea074ad..47f41d3d24b 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/page-header.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/page-header.less
@@ -10,10 +10,6 @@
   padding-right: 0;
   padding-left: 0;
 }
-.page-title h1 {
-  line-height: @fontSizeLarge * 2;
-  margin: 0;
-}
 .navbar-extra {
   .container-fluid.page-title;
   & > .row > [class^=span] {
@@ -55,11 +51,11 @@
   }
 }
 
-.customer-info {
+.page-title {
   h1 {
     font-size: @baseFontSize * 1.75;
-    margin: 5px 0 10px;
-    line-height: @baseFontSize * 2;
+    margin: 0;
+    line-height: @baseFontSize * 2.5;
     display: block;
   }
   .sub-title {

From 85eaebc54e2dc5e49e088a9ca865b8df852747af Mon Sep 17 00:00:00 2001
From: zebimax <zebimax@gmail.com>
Date: Mon, 28 Dec 2015 15:29:16 +0200
Subject: [PATCH 299/471] BAP-9577:Add option 'Use as default' to views options
  - rename relations table  - set view permission to set default grid  - add
 fix to save specific views labels

---
 .../Api/Rest/GridViewController.php           | 10 +++------
 .../Bundle/DataGridBundle/Entity/GridView.php |  2 +-
 .../EventListener/GridViewsLoadListener.php   | 22 ++++++++++++-------
 .../v1_2/DefaultGridViewUsersRelation.php     |  4 ++--
 .../public/js/datagrid/grid-views/view.js     | 16 ++++++--------
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Controller/Api/Rest/GridViewController.php b/src/Oro/Bundle/DataGridBundle/Controller/Api/Rest/GridViewController.php
index 8af8e4bdcb0..b3c25839909 100644
--- a/src/Oro/Bundle/DataGridBundle/Controller/Api/Rest/GridViewController.php
+++ b/src/Oro/Bundle/DataGridBundle/Controller/Api/Rest/GridViewController.php
@@ -122,23 +122,19 @@ public function deleteAction($id)
      *     defaults={"default"="false"}
      * )
      * @Acl(
-     *     id="oro_datagrid_gridview_update",
+     *     id="oro_datagrid_gridview_view",
      *     type="entity",
      *     class="OroDataGridBundle:GridView",
-     *     permission="EDIT"
+     *     permission="VIEW"
      * )
      */
     public function setDefaultAction($id, $default = false)
     {
         /** @var GridView $gridView */
         $gridView = $this->getManager()->find($id);
-        if ($gridView->getType() === GridView::TYPE_PUBLIC) {
-            $this->checkEditPublicAccess($gridView);
-        }
         /** @var GridViewRepository $repository */
         $repository = $this->getManager()->getRepository();
-        $user = $this->getUser();
-        $repository->setGridViewDefault($user, $gridView, $default);
+        $repository->setGridViewDefault($this->getUser(), $gridView, $default);
 
         return new JsonResponse([], Codes::HTTP_OK);
     }
diff --git a/src/Oro/Bundle/DataGridBundle/Entity/GridView.php b/src/Oro/Bundle/DataGridBundle/Entity/GridView.php
index e16a9f38c6d..89f051fd969 100644
--- a/src/Oro/Bundle/DataGridBundle/Entity/GridView.php
+++ b/src/Oro/Bundle/DataGridBundle/Entity/GridView.php
@@ -128,7 +128,7 @@ class GridView
      * @ORM\ManyToMany(
      *      targetEntity="Oro\Bundle\UserBundle\Entity\User"
      * )
-     * @ORM\JoinTable(name="oro_default_grid_view_users",
+     * @ORM\JoinTable(name="oro_grid_view_users",
      *     joinColumns={@ORM\JoinColumn(name="grid_view_id", referencedColumnName="id", onDelete="CASCADE")},
      *     inverseJoinColumns={@ORM\JoinColumn(name="user_id", referencedColumnName="id", onDelete="CASCADE")},
      * )
diff --git a/src/Oro/Bundle/DataGridBundle/EventListener/GridViewsLoadListener.php b/src/Oro/Bundle/DataGridBundle/EventListener/GridViewsLoadListener.php
index 1e5dc1cdf4f..da729013384 100644
--- a/src/Oro/Bundle/DataGridBundle/EventListener/GridViewsLoadListener.php
+++ b/src/Oro/Bundle/DataGridBundle/EventListener/GridViewsLoadListener.php
@@ -49,7 +49,7 @@ public function __construct(
      */
     public function onViewsLoad(GridViewsLoadEvent $event)
     {
-        $gridName = $event->getGridName();
+        $gridName    = $event->getGridName();
         $currentUser = $this->getCurrentUser();
         if (!$currentUser) {
             return;
@@ -62,24 +62,30 @@ public function onViewsLoad(GridViewsLoadEvent $event)
             return;
         }
         $choices = [];
-        $views = [];
+        $views   = [];
+        $default = null;
         foreach ($gridViews as $gridView) {
+            $isDefault = false;
+            if ($defaultGridView === $gridView) {
+                $isDefault = true;
+                $default   = $gridView;
+            }
             $view = $gridView->createView();
             $view->setEditable($this->securityFacade->isGranted('EDIT', $gridView));
             $view->setDeletable($this->securityFacade->isGranted('DELETE', $gridView));
-            $view->setIsDefault($defaultGridView === $gridView);
-            $views[] = $view->getMetadata();
+            $view->setIsDefault($isDefault);
+            $views[]   = $view->getMetadata();
             $choices[] = [
                 'label' => $this->createGridViewLabel($currentUser, $gridView),
                 'value' => $gridView->getId(),
             ];
+
         }
 
-        $newGridViews = $event->getGridViews();
+        $newGridViews            = $event->getGridViews();
         $newGridViews['choices'] = array_merge($newGridViews['choices'], $choices);
-        $newGridViews['views'] = array_merge($newGridViews['views'], $views);
-        $newGridViews['default'] = $defaultGridView;
-
+        $newGridViews['views']   = array_merge($newGridViews['views'], $views);
+        $newGridViews['default'] = $default;
         $event->setGridViews($newGridViews);
     }
 
diff --git a/src/Oro/Bundle/DataGridBundle/Migrations/Schema/v1_2/DefaultGridViewUsersRelation.php b/src/Oro/Bundle/DataGridBundle/Migrations/Schema/v1_2/DefaultGridViewUsersRelation.php
index 588045784d6..dac38a28733 100644
--- a/src/Oro/Bundle/DataGridBundle/Migrations/Schema/v1_2/DefaultGridViewUsersRelation.php
+++ b/src/Oro/Bundle/DataGridBundle/Migrations/Schema/v1_2/DefaultGridViewUsersRelation.php
@@ -15,14 +15,14 @@ public function up(Schema $schema, QueryBag $queries)
     }
 
     /**
-     * Creates 'oro_default_grid_view_users' table which represents relationship between grid views and
+     * Creates 'oro_grid_view_users' table which represents relationship between grid views and
      * users who chosen this grid view as default.
      *
      * @param Schema $schema
      */
     public static function createOroDefaultGridViewUsersTable(Schema $schema)
     {
-        $table = $schema->createTable('oro_default_grid_view_users');
+        $table = $schema->createTable('oro_grid_view_users');
         $table->addColumn('grid_view_id', 'integer', []);
         $table->addColumn('user_id', 'integer', []);
         $table->setPrimaryKey(['grid_view_id', 'user_id']);
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
index 41e47835452..9a336c17a5e 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
@@ -382,14 +382,11 @@ define([
             var defaultModel = this._getCurrentDefaultViewModel();
             var currentViewModel = this._getCurrentViewModel();
             var id = currentViewModel.id;
-            if (this._isSystemView()) {
+            if (this._isCurrentViewSystem()) {
+                // in this case we need to set default to false on current default view
                 isDefault = 0;
                 id = defaultModel.id;
-                if (defaultModel.id === self.DEFAULT_GRID_VIEW_ID) {
-                    return self._showFlashMessage('success', __('oro.datagrid.gridView.updated'));
-                }
             }
-
             return $.post(
                 routing.generate('oro_datagrid_api_rest_gridview_set_default', {
                     id: id,
@@ -397,10 +394,11 @@ define([
                 }),
                 {},
                 function(response) {
-                    defaultModel.set('is_default', false);
-                    currentViewModel.set('is_default', true);
-                    mediator.trigger('datagrid:' + this.gridName + ':views:change', currentViewModel);
 
+                    // TODO how we can remove this fix with labels?
+                    // for now we need to get label from choices to save specifically built labels(shared, system)
+                    defaultModel.set({is_default:false, label: self._getView(defaultModel.get('name')).label});
+                    currentViewModel.set({is_default:true, label: self._getView(currentViewModel.get('name')).label});
                     self._showFlashMessage('success', __('oro.datagrid.gridView.updated'));
                 }
             );
@@ -632,7 +630,7 @@ define([
          *
          * @returns {boolean}
          */
-        _isSystemView: function() {
+        _isCurrentViewSystem: function() {
             return this._getCurrentView().value === this.DEFAULT_GRID_VIEW_ID;
         },
 

From 684882b8505f1951bc4d8c8ce9dcf2a7b9d14131 Mon Sep 17 00:00:00 2001
From: Ivan Shirko <ivan.shirko@effective-soft.com>
Date: Mon, 28 Dec 2015 16:59:15 +0300
Subject: [PATCH 300/471] BB-1777: Action Improvements: - small changes for
 ConfigurationMerger

---
 .../Component/Config/Merger/ConfigurationMerger.php  | 12 ++++--------
 src/Oro/Component/Config/README.md                   |  2 +-
 .../Config/Resources/doc/configuration_merger.md     |  2 +-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/Oro/Component/Config/Merger/ConfigurationMerger.php b/src/Oro/Component/Config/Merger/ConfigurationMerger.php
index a244eb00ff3..2778124464b 100644
--- a/src/Oro/Component/Config/Merger/ConfigurationMerger.php
+++ b/src/Oro/Component/Config/Merger/ConfigurationMerger.php
@@ -100,14 +100,10 @@ protected function merge(array $data, array $config)
             if (is_int($key)) {
                 $data[] = $value;
             } else {
-                if (!array_key_exists($key, $data)) {
-                    $data[$key] = $value;
+                if (array_key_exists($key, $data) && is_array($value)) {
+                    $data[$key] = $this->merge($data[$key], $value);
                 } else {
-                    if (is_array($value)) {
-                        $data[$key] = $this->merge($data[$key], $value);
-                    } else {
-                        $data[$key] = $value;
-                    }
+                    $data[$key] = $value;
                 }
             }
         }
@@ -128,7 +124,7 @@ protected function resolveExtends(array $configs, $actionName)
         }
 
         $config = $configs[$actionName];
-        if (!array_key_exists(self::EXTENDS_NODE_NAME, $config) || empty($config[self::EXTENDS_NODE_NAME])) {
+        if (empty($config[self::EXTENDS_NODE_NAME])) {
             return $config;
         }
 
diff --git a/src/Oro/Component/Config/README.md b/src/Oro/Component/Config/README.md
index a662464ac3b..79344a5b537 100644
--- a/src/Oro/Component/Config/README.md
+++ b/src/Oro/Component/Config/README.md
@@ -11,7 +11,7 @@ Resource Types
 Resource Merge
 --------------
 
- - [Configuration Merger](./Resources/doc/configuration_merger.md) provides a way to merge configurations of some resource both from one or many bundles. Supports two strategy: replace and append.
+ - [Configuration Merger](./Resources/doc/configuration_merger.md) provides a way to merge configurations of some resource both from one or many bundles. Supports two strategies: replace and append.
 
 
 System Aware Resolver
diff --git a/src/Oro/Component/Config/Resources/doc/configuration_merger.md b/src/Oro/Component/Config/Resources/doc/configuration_merger.md
index f251b58c4b2..09ed9f5a0a5 100644
--- a/src/Oro/Component/Config/Resources/doc/configuration_merger.md
+++ b/src/Oro/Component/Config/Resources/doc/configuration_merger.md
@@ -9,7 +9,7 @@ nodes, which you want to replace, on the same level of this nodes.
 Initialization
 --------------
 
-For creating new instance of merger you need list of some keys. It will use as sorting order for merging all
+For creating new instance of merger you need list of some keys. It will be used as sorting order for merging all
 configuration from groups which have equal name.
 
 ``` php

From 99dcef06b918905297140dbbad54c4ec7feb079f Mon Sep 17 00:00:00 2001
From: Mykhailo Kudelia <mkudelia@magecore.com>
Date: Mon, 28 Dec 2015 17:01:33 +0200
Subject: [PATCH 301/471] OEE-784: Wrong ACL condition to view BU in the Second
 Org

---
 src/Oro/Bundle/SecurityBundle/Owner/OwnerTreeProvider.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/SecurityBundle/Owner/OwnerTreeProvider.php b/src/Oro/Bundle/SecurityBundle/Owner/OwnerTreeProvider.php
index 914b656f5ee..e2398a942c3 100644
--- a/src/Oro/Bundle/SecurityBundle/Owner/OwnerTreeProvider.php
+++ b/src/Oro/Bundle/SecurityBundle/Owner/OwnerTreeProvider.php
@@ -106,7 +106,7 @@ protected function fillTree(OwnerTreeInterface $tree)
 
         foreach ($businessUnits as $businessUnit) {
             if (!empty($businessUnit['organization'])) {
-                $tree->addLocalEntity($businessUnit['id'], $businessUnit['organization']);
+                $tree->addLocalEntity($businessUnit['id'], (int)$businessUnit['organization']);
                 if ($businessUnit['owner']) {
                     $tree->addDeepEntity($businessUnit['id'], $businessUnit['owner']);
                 }

From 191ce113562e04a3f8ed7b7632c603a29359908b Mon Sep 17 00:00:00 2001
From: Hryhorii Hrebiniuk <grebinuk@gmail.com>
Date: Mon, 28 Dec 2015 17:56:52 +0200
Subject: [PATCH 302/471] BAP-9553 Emails markup on mobile

---
 .../Resources/config/assets.yml               |  2 +-
 .../Resources/public/css/less/main.less       |  4 ++
 .../public/css/less/mobile/activity-list.less | 21 +++++++
 .../public/css/less/mobile/main.less          |  4 ++
 .../ActivityList/widget/activities.html.twig  |  2 +-
 .../public/css/less/mobile/oro.grid.less      |  8 +++
 .../EmailBundle/Resources/config/assets.yml   |  2 +-
 .../Resources/public/css/less/main.less       |  9 +++
 .../public/css/less/mobile/main.less          |  4 ++
 .../public/css/less/mobile/thread-view.less   | 56 +++++++++++++++++++
 .../Resources/public/css/less/style.less      | 23 --------
 .../public/css/less/mobile/filter.less        |  6 +-
 .../public/css/less/mobile/layout.less        |  4 +-
 13 files changed, 116 insertions(+), 29 deletions(-)
 create mode 100644 src/Oro/Bundle/ActivityListBundle/Resources/public/css/less/main.less
 create mode 100644 src/Oro/Bundle/ActivityListBundle/Resources/public/css/less/mobile/activity-list.less
 create mode 100644 src/Oro/Bundle/ActivityListBundle/Resources/public/css/less/mobile/main.less
 create mode 100644 src/Oro/Bundle/EmailBundle/Resources/public/css/less/main.less
 create mode 100644 src/Oro/Bundle/EmailBundle/Resources/public/css/less/mobile/main.less
 create mode 100644 src/Oro/Bundle/EmailBundle/Resources/public/css/less/mobile/thread-view.less

diff --git a/src/Oro/Bundle/ActivityListBundle/Resources/config/assets.yml b/src/Oro/Bundle/ActivityListBundle/Resources/config/assets.yml
index 7831d3d2c3b..a3cc25040ef 100644
--- a/src/Oro/Bundle/ActivityListBundle/Resources/config/assets.yml
+++ b/src/Oro/Bundle/ActivityListBundle/Resources/config/assets.yml
@@ -1,3 +1,3 @@
 css:
     oroactivitylist:
-        - 'bundles/oroactivitylist/css/less/activity-list.less'
+        - 'bundles/oroactivitylist/css/less/main.less'
diff --git a/src/Oro/Bundle/ActivityListBundle/Resources/public/css/less/main.less b/src/Oro/Bundle/ActivityListBundle/Resources/public/css/less/main.less
new file mode 100644
index 00000000000..e70f1ca72b7
--- /dev/null
+++ b/src/Oro/Bundle/ActivityListBundle/Resources/public/css/less/main.less
@@ -0,0 +1,4 @@
+@import "./activity-list";
+
+// mobile
+@import "./mobile/main";
diff --git a/src/Oro/Bundle/ActivityListBundle/Resources/public/css/less/mobile/activity-list.less b/src/Oro/Bundle/ActivityListBundle/Resources/public/css/less/mobile/activity-list.less
new file mode 100644
index 00000000000..93333ccb0c5
--- /dev/null
+++ b/src/Oro/Bundle/ActivityListBundle/Resources/public/css/less/mobile/activity-list.less
@@ -0,0 +1,21 @@
+.activity-list-widget {
+  .activity-context-activity-list {
+    padding: 0 @contentPadding;
+  }
+  .activity-list {
+    .info {
+      margin-bottom: @contentPadding;
+    }
+  }
+  .grid-toolbar {
+    padding: 0;
+    margin-bottom: @contentPadding;
+    .filter-container {
+      padding: 0;
+      margin-bottom: @contentPadding;
+    }
+  }
+  .comments-view-footer {
+    margin-bottom: 0;
+  }
+}
diff --git a/src/Oro/Bundle/ActivityListBundle/Resources/public/css/less/mobile/main.less b/src/Oro/Bundle/ActivityListBundle/Resources/public/css/less/mobile/main.less
new file mode 100644
index 00000000000..4e3b4d898b3
--- /dev/null
+++ b/src/Oro/Bundle/ActivityListBundle/Resources/public/css/less/mobile/main.less
@@ -0,0 +1,4 @@
+.mobile-version {
+  @import "oroui/css/less/mobile/variables";
+  @import "./activity-list";
+}
diff --git a/src/Oro/Bundle/ActivityListBundle/Resources/views/ActivityList/widget/activities.html.twig b/src/Oro/Bundle/ActivityListBundle/Resources/views/ActivityList/widget/activities.html.twig
index 9297614e60a..cf0bfa1cee3 100644
--- a/src/Oro/Bundle/ActivityListBundle/Resources/views/ActivityList/widget/activities.html.twig
+++ b/src/Oro/Bundle/ActivityListBundle/Resources/views/ActivityList/widget/activities.html.twig
@@ -20,7 +20,7 @@
                 </div>
             </div>
             <div class="pull-right">
-                <div class="actions-panel">
+                <div class="actions-panel pull-right">
                     {{ UI.clientLink({
                         'aCss': 'action btn',
                         'iCss': 'icon-refresh',
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/mobile/oro.grid.less b/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/mobile/oro.grid.less
index 82ea344ea28..7a0c9e3907c 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/mobile/oro.grid.less
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/mobile/oro.grid.less
@@ -1,3 +1,6 @@
+.grid-views {
+  margin: 0;
+}
 .grid-toolbar {
   padding: @contentPadding 10px;
   margin-bottom: -@contentPadding;
@@ -71,6 +74,11 @@
 .other-scroll-container {
   margin: 10px 10px 10px 10px;
 }
+.responsive-cell {
+  .other-scroll-container {
+    margin: 10px 0;
+  }
+}
 .grid-scrollable-container {
   -webkit-overflow-scrolling: touch;
   overflow-scrolling: touch;
diff --git a/src/Oro/Bundle/EmailBundle/Resources/config/assets.yml b/src/Oro/Bundle/EmailBundle/Resources/config/assets.yml
index 924e52487eb..44e0c8b46e4 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/config/assets.yml
+++ b/src/Oro/Bundle/EmailBundle/Resources/config/assets.yml
@@ -1,3 +1,3 @@
 css:
     'oroemail':
-      - 'bundles/oroemail/css/less/style.less'
+      - 'bundles/oroemail/css/less/main.less'
diff --git a/src/Oro/Bundle/EmailBundle/Resources/public/css/less/main.less b/src/Oro/Bundle/EmailBundle/Resources/public/css/less/main.less
new file mode 100644
index 00000000000..0cb7af53631
--- /dev/null
+++ b/src/Oro/Bundle/EmailBundle/Resources/public/css/less/main.less
@@ -0,0 +1,9 @@
+@import "oroui/css/less/mixins";
+@import "./header";
+@import "./email-notification-menu";
+@import "./short-emails-list";
+@import "./sidebar-widget";
+@import "./style";
+
+// mobile
+@import "./mobile/main";
diff --git a/src/Oro/Bundle/EmailBundle/Resources/public/css/less/mobile/main.less b/src/Oro/Bundle/EmailBundle/Resources/public/css/less/mobile/main.less
new file mode 100644
index 00000000000..f8ce0327713
--- /dev/null
+++ b/src/Oro/Bundle/EmailBundle/Resources/public/css/less/mobile/main.less
@@ -0,0 +1,4 @@
+.mobile-version {
+  @import "oroui/css/less/mobile/variables";
+  @import "./thread-view";
+}
diff --git a/src/Oro/Bundle/EmailBundle/Resources/public/css/less/mobile/thread-view.less b/src/Oro/Bundle/EmailBundle/Resources/public/css/less/mobile/thread-view.less
new file mode 100644
index 00000000000..a056efd61ef
--- /dev/null
+++ b/src/Oro/Bundle/EmailBundle/Resources/public/css/less/mobile/thread-view.less
@@ -0,0 +1,56 @@
+.thread-view {
+  padding-left: 0;
+  .email-info, .email-load-more {
+    margin: 0;
+  }
+  .email-info {
+    .responsive-cell {
+      padding: 0;
+    }
+    .email-full {
+      .email-sent-date {
+        padding-right: 0;
+      }
+    }
+    .email-view-toggle {
+      padding: @contentPadding;
+    }
+    .email-content {
+      padding: 0 @contentPadding @contentPadding;
+    }
+    &:only-child {
+      .email-view-toggle {
+        padding: 0 0 10px;
+      }
+      .email-content {
+        padding: 0;
+      }
+    }
+  }
+  .email-detailed-info-table {
+    .dropdown-menu {
+      padding: 0px @contentPadding;
+    }
+    .control-group:last-child {
+      margin-bottom: 0;
+      .controls {
+        margin-bottom: 0;
+      }
+    }
+  }
+}
+
+.activity-list-widget {
+  .thread-view {
+    .email-info {
+      &:last-child, &:only-child  {
+        .email-view-toggle {
+          padding: @contentPadding;
+        }
+        .email-content {
+          padding: 0 @contentPadding;
+        }
+      }
+    }
+  }
+}
diff --git a/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less b/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less
index a5dedd77ce2..fb6db1be071 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less
+++ b/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less
@@ -291,10 +291,6 @@ span.icon.grid .icon-paperclip {
   }
 }
 
-&.mobile-version .box-type1 > .row-fluid > .widget-content > .thread-view {
-  padding-left: 0;
-}
-
 .email-thread-action-panel {
   .email-view-toggle-all {
     color: #888;
@@ -730,22 +726,3 @@ a.sync-btn span.dots {
 .check-connection-messages {
     width: 294px;
 }
-
-&.mobile-version {
-  .email-view-toggle > .pull-right > .pull-left {
-    margin: 0 5px 5px 0;
-  }
-  .email-info .email-participants {
-    margin-right: 0;
-    float: left;
-  }
-  .email-info .email-short {
-    .email-sent-date {
-      padding: 0
-    }
-    .email-body {
-      margin: 2px 0 0 0;
-      clear: both;
-    }
-  }
-}
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/filter.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/filter.less
index 4ecf01619bd..19d55c80c8a 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/filter.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/filter.less
@@ -20,6 +20,7 @@
     display: inline-block;
   }
   .dropdown > .dropdown-menu {
+    padding: 10px;
     margin: 10px auto 0;
     max-width: 506px;
     width: 100%;
@@ -52,7 +53,7 @@
     top: -7px;
   }
   .filter-container {
-    padding: 10px;
+    padding: 0;
     .reset-filter-button {
       padding: 6px 0 4px 6px;
       position: absolute;
@@ -62,6 +63,9 @@
       margin: 0 0 10px 0;
       width: 100%;
       white-space: normal;
+      &:last-child {
+        margin-bottom: 0;
+      }
       .btn-group {
         margin-bottom: 0;
       }
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/layout.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/layout.less
index 157db2c4357..f426ca13089 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/layout.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/layout.less
@@ -125,8 +125,8 @@
     }
     .container-fluid,
     .grid-toolbar{
-      padding-left: 10px;
-      padding-right: 10px;
+      padding-left: 0;
+      padding-right: 0;
     }
   }
 }

From 85d90b5e7539bf0c53a0ed2042d2075840c9ad77 Mon Sep 17 00:00:00 2001
From: Hryhorii Hrebiniuk <grebinuk@gmail.com>
Date: Mon, 28 Dec 2015 18:42:08 +0200
Subject: [PATCH 303/471] BAP-9618: Broken view of field integration's Type

---
 .../IntegrationBundle/Resources/public/css/style.css     | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Oro/Bundle/IntegrationBundle/Resources/public/css/style.css b/src/Oro/Bundle/IntegrationBundle/Resources/public/css/style.css
index fca6170f8dc..fc5ed37e01a 100644
--- a/src/Oro/Bundle/IntegrationBundle/Resources/public/css/style.css
+++ b/src/Oro/Bundle/IntegrationBundle/Resources/public/css/style.css
@@ -4,6 +4,10 @@
     height: 16px;
     width: 16px;
     background-size: contain !important;
+    margin-right: 4px;
+    margin-top: -2px;
+    vertical-align: middle;
+    float: left;
 }
 
 .select2-results .select2-result-label .aware-icon-block {
@@ -11,11 +15,6 @@
     top: 3px;
 }
 
-.select2-choice .select2-chosen .aware-icon-block-selected,
-.select2-results .select2-result-label .aware-icon-block-selected {
-    margin-bottom: 5px;
-}
-
 .integration-icon,
 .select2-choice .select2-chosen .aware-icon-block-text,
 .select2-results .select2-result-label .aware-icon-block-text {

From 5fe6413ec9ecd88da6d54d4cd0187c7fd5e9eac1 Mon Sep 17 00:00:00 2001
From: Yevhen Shyshkin <yshyshkin@magecore.com>
Date: Mon, 28 Dec 2015 18:56:32 +0100
Subject: [PATCH 304/471] OC-631: Problem with process parameters in
 EntityPaginationBundle  - small fixes  - added unit test

---
 .../Storage/StorageDataCollector.php          |  3 ++-
 .../Unit/Storage/StorageDataCollectorTest.php | 24 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/EntityPaginationBundle/Storage/StorageDataCollector.php b/src/Oro/Bundle/EntityPaginationBundle/Storage/StorageDataCollector.php
index a4a36b3656f..67bad490673 100644
--- a/src/Oro/Bundle/EntityPaginationBundle/Storage/StorageDataCollector.php
+++ b/src/Oro/Bundle/EntityPaginationBundle/Storage/StorageDataCollector.php
@@ -85,13 +85,14 @@ public function collect(Request $request, $scope)
 
         $gridNames = array();
         if ($request->query->get('grid')) {
-            $gridNames = array_keys($request->query->get('grid', []));
+            $gridNames = array_keys((array)$request->query->get('grid', []));
         }
         foreach ($gridNames as $gridName) {
             try {
                 // datagrid manager automatically extracts all required parameters from request
                 $dataGrid = $this->datagridManager->getDatagridByRequestParams($gridName);
             } catch (\RuntimeException $e) {
+                // processing of invalid grid names
                 continue;
             }
 
diff --git a/src/Oro/Bundle/EntityPaginationBundle/Tests/Unit/Storage/StorageDataCollectorTest.php b/src/Oro/Bundle/EntityPaginationBundle/Tests/Unit/Storage/StorageDataCollectorTest.php
index 0e282def516..040bb4e53d7 100644
--- a/src/Oro/Bundle/EntityPaginationBundle/Tests/Unit/Storage/StorageDataCollectorTest.php
+++ b/src/Oro/Bundle/EntityPaginationBundle/Tests/Unit/Storage/StorageDataCollectorTest.php
@@ -96,6 +96,30 @@ public function testCollectWithDisabledPagination()
         $this->assertFalse($this->collector->collect($this->getGridRequest(), 'test'));
     }
 
+    public function testCollectWithEmptyGridRequest()
+    {
+        $this->setPaginationEnabled(true);
+        $this->datagridManager->expects($this->never())
+            ->method('getDatagridByRequestParams');
+
+        $this->assertFalse($this->collector->collect(new Request(['grid' => '']), 'test'));
+    }
+
+    public function testCollectWithInvalidGridName()
+    {
+        $invalidGridName = 'invalid';
+
+        $this->setPaginationEnabled(true);
+        $this->datagridManager->expects($this->once())
+            ->method('getDatagridByRequestParams')
+            ->with($invalidGridName)
+            ->willThrowException(new \RuntimeException());
+        $this->storage->expects($this->never())
+            ->method('hasData');
+
+        $this->assertFalse($this->collector->collect(new Request(['grid' => [$invalidGridName => null]]), 'test'));
+    }
+
     public function testCollectGridNotApplicable()
     {
         $this->setPaginationEnabled(true);

From 00a316d6aae5f005f4d29131f8afb88948f53cd9 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Mon, 28 Dec 2015 20:09:35 +0200
Subject: [PATCH 305/471] BAP-9579: Process default filters, sorters from grid
 view

---
 .../GridViews/GridViewsExtension.php          | 97 ++++++++++++++++---
 1 file changed, 81 insertions(+), 16 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
index 19dd8378bf1..eb9058dc53c 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
@@ -14,6 +14,7 @@
 use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
 
 use Oro\Bundle\SecurityBundle\SecurityFacade;
+use Oro\Bundle\DataGridBundle\Entity\GridView;
 
 class GridViewsExtension extends AbstractExtension
 {
@@ -37,6 +38,9 @@ class GridViewsExtension extends AbstractExtension
     /** @var ManagerRegistry */
     protected $registry;
 
+    /** @var GridView|null */
+    protected $defaultGridView;
+
     /**
      * @param EventDispatcherInterface $eventDispatcher
      * @param SecurityFacade           $securityFacade
@@ -63,6 +67,14 @@ public function isApplicable(DatagridConfiguration $config)
         return !$this->isDisabled();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getPriority()
+    {
+        return 10;
+    }
+
     /**
      * @return bool
      */
@@ -78,19 +90,11 @@ protected function isDisabled()
      */
     public function visitMetadata(DatagridConfiguration $config, MetadataObject $data)
     {
-        $defaultViewId = $this->getDefaultViewId($config->getName());
-        $params        = $this->getParameters()->get(ParameterBag::ADDITIONAL_PARAMETERS, []);
-
-        if (isset($params[self::VIEWS_PARAM_KEY])) {
-            $currentView = (int)$params[self::VIEWS_PARAM_KEY];
-        } else {
-            $currentView                   = $defaultViewId;
-            $params[self::VIEWS_PARAM_KEY] = $defaultViewId;
-            $this->getParameters()->set(ParameterBag::ADDITIONAL_PARAMETERS, $params);
-        }
+        $currentViewId = $this->getCurrentViewId($config);
+        $this->setDefaultParams($config);
 
-        $data->offsetAddToArray('initialState', ['gridView' => $defaultViewId]);
-        $data->offsetAddToArray('state', ['gridView' => $currentView]);
+        $data->offsetAddToArray('initialState', ['gridView' => self::DEFAULT_VIEW_ID]);
+        $data->offsetAddToArray('state', ['gridView' => $currentViewId]);
 
         $allLabel = null;
         if (isset($config['options'])
@@ -132,19 +136,80 @@ public function visitMetadata(DatagridConfiguration $config, MetadataObject $dat
     }
 
     /**
+     * Gets id for current grid view
+     *
+     * @param DatagridConfiguration $config
+     *
+     * @return int|string
+     */
+    protected function getCurrentViewId(DatagridConfiguration $config)
+    {
+        $params = $this->getParameters()->get(ParameterBag::ADDITIONAL_PARAMETERS, []);
+        if (isset($params[self::VIEWS_PARAM_KEY])) {
+            return (int)$params[self::VIEWS_PARAM_KEY];
+        } else {
+            return $this->getDefaultViewId($config->getName());
+        }
+    }
+
+    /**
+     * Gets id for defined as default grid view for current logged user.
+     * If is not defined returns id for raw configured grid.
+     *
      * @param string $gridName
      *
      * @return int|string
      */
     protected function getDefaultViewId($gridName)
     {
-        $defaultGridView = null;
-        if ($this->securityFacade->isGranted('oro_datagrid_gridview_view')) {
+        $defaultGridView = $this->getDefaultView($gridName);
+
+        return $defaultGridView ? $defaultGridView->getId() : self::DEFAULT_VIEW_ID;
+    }
+
+    /**
+     * Gets defined as default grid view for current logged user.
+     *
+     * @param string $gridName
+     *
+     * @return GridView|null
+     */
+    protected function getDefaultView($gridName)
+    {
+
+        if ($this->defaultGridView === null &&
+            $this->securityFacade->isGranted('oro_datagrid_gridview_view')
+        ) {
             $repository      = $this->registry->getRepository('OroDataGridBundle:GridView');
-            $defaultGridView = $repository->findDefaultGridView($gridName, $this->securityFacade->getLoggedUser());
+            $defaultGridView = $repository->findDefaultGridView(
+                $gridName,
+                $this->securityFacade->getLoggedUser()
+            );
+
+            $this->defaultGridView = $defaultGridView;
         }
 
-        return $defaultGridView ? $defaultGridView->getId() : self::DEFAULT_VIEW_ID;
+        return $this->defaultGridView;
+    }
+
+    /**
+     * Sets default parameters.
+     * Added filters and sorters for defined as default grid view for current logged user.
+     *
+     * @param DatagridConfiguration $config
+     */
+    protected function setDefaultParams(DatagridConfiguration $config)
+    {
+        $params = $this->getParameters()->get(ParameterBag::ADDITIONAL_PARAMETERS, []);
+
+        $params[self::VIEWS_PARAM_KEY] = $this->getDefaultViewId($config->getName());
+
+        $defaultGridView = $this->getDefaultView($config->getName());
+        if ($defaultGridView) {
+            $this->getParameters()->mergeKey('_filter', $defaultGridView->getFiltersData());
+            $this->getParameters()->mergeKey('_sort_by', $defaultGridView->getSortersData());
+        }
+        $this->getParameters()->set(ParameterBag::ADDITIONAL_PARAMETERS, $params);
     }
 
     /**

From 87fde77343a4a3e8314fe532a19322bd29cc79d8 Mon Sep 17 00:00:00 2001
From: zebimax <zebimax@gmail.com>
Date: Mon, 28 Dec 2015 21:03:41 +0200
Subject: [PATCH 306/471] BAP-9577:Add option 'Use as default' to views options
  - fix review comments  - fix removing default view

---
 .../Api/Rest/GridViewController.php           | 13 ++++----
 .../Bundle/DataGridBundle/Entity/GridView.php |  2 +-
 .../Manager/GridViewApiEntityManager.php      | 32 +++++++++++++++++++
 .../Entity/Repository/GridViewRepository.php  | 13 ++------
 .../EventListener/GridViewsLoadListener.php   |  9 +-----
 .../GridViews/GridViewsExtension.php          | 11 +++++--
 .../Extension/GridViews/View.php              | 14 ++++----
 .../v1_2/DefaultGridViewUsersRelation.php     |  4 +--
 .../Resources/config/services.yml             |  2 +-
 .../public/js/datagrid/grid-views/view.js     | 19 +++++++++--
 10 files changed, 80 insertions(+), 39 deletions(-)
 create mode 100644 src/Oro/Bundle/DataGridBundle/Entity/Manager/GridViewApiEntityManager.php

diff --git a/src/Oro/Bundle/DataGridBundle/Controller/Api/Rest/GridViewController.php b/src/Oro/Bundle/DataGridBundle/Controller/Api/Rest/GridViewController.php
index b3c25839909..98edee243bd 100644
--- a/src/Oro/Bundle/DataGridBundle/Controller/Api/Rest/GridViewController.php
+++ b/src/Oro/Bundle/DataGridBundle/Controller/Api/Rest/GridViewController.php
@@ -103,12 +103,14 @@ public function deleteAction($id)
 
 
     /**
+     * Set/unset grid view as default for current user.
+     *
      * @param int  $id
      * @param bool $default
      *
      * @return Response
      * @Post(
-     *     "/gridviews/{id}/setdefault/{default}",
+     *     "/gridviews/{id}/default/{default}",
      *     requirements={"id"="\d+", "default"="\d+"},
      *     defaults={"default"=false}
      *)
@@ -131,12 +133,11 @@ public function deleteAction($id)
     public function setDefaultAction($id, $default = false)
     {
         /** @var GridView $gridView */
-        $gridView = $this->getManager()->find($id);
-        /** @var GridViewRepository $repository */
-        $repository = $this->getManager()->getRepository();
-        $repository->setGridViewDefault($this->getUser(), $gridView, $default);
+        $manager  = $this->getManager();
+        $gridView = $manager->find($id);
+        $manager->setGridViewDefault($this->getUser(), $gridView, $default);
 
-        return new JsonResponse([], Codes::HTTP_OK);
+        return new JsonResponse([], Codes::HTTP_NO_CONTENT);
     }
 
     /**
diff --git a/src/Oro/Bundle/DataGridBundle/Entity/GridView.php b/src/Oro/Bundle/DataGridBundle/Entity/GridView.php
index 89f051fd969..e29cffaf28e 100644
--- a/src/Oro/Bundle/DataGridBundle/Entity/GridView.php
+++ b/src/Oro/Bundle/DataGridBundle/Entity/GridView.php
@@ -128,7 +128,7 @@ class GridView
      * @ORM\ManyToMany(
      *      targetEntity="Oro\Bundle\UserBundle\Entity\User"
      * )
-     * @ORM\JoinTable(name="oro_grid_view_users",
+     * @ORM\JoinTable(name="oro_grid_view_user",
      *     joinColumns={@ORM\JoinColumn(name="grid_view_id", referencedColumnName="id", onDelete="CASCADE")},
      *     inverseJoinColumns={@ORM\JoinColumn(name="user_id", referencedColumnName="id", onDelete="CASCADE")},
      * )
diff --git a/src/Oro/Bundle/DataGridBundle/Entity/Manager/GridViewApiEntityManager.php b/src/Oro/Bundle/DataGridBundle/Entity/Manager/GridViewApiEntityManager.php
new file mode 100644
index 00000000000..046e606822f
--- /dev/null
+++ b/src/Oro/Bundle/DataGridBundle/Entity/Manager/GridViewApiEntityManager.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Oro\Bundle\DataGridBundle\Entity\Manager;
+
+use Oro\Bundle\DataGridBundle\Entity\GridView;
+use Oro\Bundle\DataGridBundle\Entity\Repository\GridViewRepository;
+use Oro\Bundle\SoapBundle\Entity\Manager\ApiEntityManager;
+use Oro\Bundle\UserBundle\Entity\User;
+
+class GridViewApiEntityManager extends ApiEntityManager
+{
+    /**
+     * @param User     $user
+     * @param GridView $gridView
+     * @param bool     $default
+     */
+    public function setGridViewDefault(User $user, GridView $gridView, $default)
+    {
+        /** @var GridViewRepository $repository */
+        $repository = $this->getRepository();
+        $gridViews = $repository->findDefaultGridViews($user, $gridView);
+
+        foreach ($gridViews as $view) {
+            $view->removeUser($user);
+        }
+        if ($default) {
+            $gridView->addUser($user);
+        }
+
+        $this->getObjectManager()->flush();
+    }
+}
diff --git a/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php b/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php
index f98ca48c81b..e2224fc41fd 100644
--- a/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php
+++ b/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php
@@ -55,9 +55,9 @@ public function findDefaultGridView(UserInterface $user, $gridName)
     /**
      * @param User     $user
      * @param GridView $gridView
-     * @param bool     $default
+     * @return GridView[]
      */
-    public function setGridViewDefault(User $user, GridView $gridView, $default)
+    public function findDefaultGridViews(User $user, GridView $gridView)
     {
         /** @var GridView[] $defaultGridViews */
         $defaultGridViews = $this
@@ -65,14 +65,7 @@ public function setGridViewDefault(User $user, GridView $gridView, $default)
             ->getQuery()
             ->getResult();
 
-        foreach ($defaultGridViews as $view) {
-            $view->removeUser($user);
-        }
-        if ($default) {
-            $gridView->addUser($user);
-        }
-
-        $this->getEntityManager()->flush();
+        return $defaultGridViews;
     }
 
     /**
diff --git a/src/Oro/Bundle/DataGridBundle/EventListener/GridViewsLoadListener.php b/src/Oro/Bundle/DataGridBundle/EventListener/GridViewsLoadListener.php
index da729013384..406a39bd55a 100644
--- a/src/Oro/Bundle/DataGridBundle/EventListener/GridViewsLoadListener.php
+++ b/src/Oro/Bundle/DataGridBundle/EventListener/GridViewsLoadListener.php
@@ -63,17 +63,11 @@ public function onViewsLoad(GridViewsLoadEvent $event)
         }
         $choices = [];
         $views   = [];
-        $default = null;
         foreach ($gridViews as $gridView) {
-            $isDefault = false;
-            if ($defaultGridView === $gridView) {
-                $isDefault = true;
-                $default   = $gridView;
-            }
             $view = $gridView->createView();
             $view->setEditable($this->securityFacade->isGranted('EDIT', $gridView));
             $view->setDeletable($this->securityFacade->isGranted('DELETE', $gridView));
-            $view->setIsDefault($isDefault);
+            $view->setDefault($defaultGridView === $gridView);
             $views[]   = $view->getMetadata();
             $choices[] = [
                 'label' => $this->createGridViewLabel($currentUser, $gridView),
@@ -85,7 +79,6 @@ public function onViewsLoad(GridViewsLoadEvent $event)
         $newGridViews            = $event->getGridViews();
         $newGridViews['choices'] = array_merge($newGridViews['choices'], $choices);
         $newGridViews['views']   = array_merge($newGridViews['views'], $views);
-        $newGridViews['default'] = $default;
         $event->setGridViews($newGridViews);
     }
 
diff --git a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
index 88292cd49fc..efb8669585a 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
@@ -99,8 +99,15 @@ public function visitMetadata(DatagridConfiguration $config, MetadataObject $dat
             $this->eventDispatcher->dispatch(GridViewsLoadEvent::EVENT_NAME, $event);
             $gridViews = $event->getGridViews();
         }
-        $systemAllView->setIsDefault(empty($gridViews['default']));
-        unset($gridViews['default']);
+        $hasDefault = false;
+        foreach ($gridViews['views'] as $view) {
+            if (!empty($view['is_default'])) {
+                $hasDefault = true;
+                break;
+            }
+        }
+
+        $systemAllView->setDefault(!$hasDefault);
         $gridViews['gridName'] = $config->getName();
         $gridViews['permissions'] = $this->getPermissions();
         $gridViews['views'][] = $systemAllView->getMetadata();
diff --git a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/View.php b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/View.php
index 6a9feb46a79..434d4bcca31 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/View.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/View.php
@@ -26,7 +26,7 @@ class View
     protected $deletable = false;
 
     /** @var bool */
-    protected $isDefault = false;
+    protected $default = false;
 
     /**
      * @var array
@@ -200,19 +200,19 @@ public function setColumnsData(array $columnsData = [])
     /**
      * @return boolean
      */
-    public function isIsDefault()
+    public function isDefault()
     {
-        return $this->isDefault;
+        return $this->default;
     }
 
     /**
-     * @param boolean $isDefault
+     * @param boolean $default
      *
      * @return $this
      */
-    public function setIsDefault($isDefault)
+    public function setDefault($default)
     {
-        $this->isDefault = $isDefault;
+        $this->default = $default;
 
         return $this;
     }
@@ -233,7 +233,7 @@ public function getMetadata()
             'columns'    => $this->columnsData,
             'editable'   => $this->editable,
             'deletable'  => $this->deletable,
-            'is_default' => $this->isDefault
+            'is_default' => $this->default
         ];
     }
 }
diff --git a/src/Oro/Bundle/DataGridBundle/Migrations/Schema/v1_2/DefaultGridViewUsersRelation.php b/src/Oro/Bundle/DataGridBundle/Migrations/Schema/v1_2/DefaultGridViewUsersRelation.php
index dac38a28733..241af2abd43 100644
--- a/src/Oro/Bundle/DataGridBundle/Migrations/Schema/v1_2/DefaultGridViewUsersRelation.php
+++ b/src/Oro/Bundle/DataGridBundle/Migrations/Schema/v1_2/DefaultGridViewUsersRelation.php
@@ -15,14 +15,14 @@ public function up(Schema $schema, QueryBag $queries)
     }
 
     /**
-     * Creates 'oro_grid_view_users' table which represents relationship between grid views and
+     * Creates 'oro_grid_view_user' table which represents relationship between grid views and
      * users who chosen this grid view as default.
      *
      * @param Schema $schema
      */
     public static function createOroDefaultGridViewUsersTable(Schema $schema)
     {
-        $table = $schema->createTable('oro_grid_view_users');
+        $table = $schema->createTable('oro_grid_view_user');
         $table->addColumn('grid_view_id', 'integer', []);
         $table->addColumn('user_id', 'integer', []);
         $table->setPrimaryKey(['grid_view_id', 'user_id']);
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/config/services.yml b/src/Oro/Bundle/DataGridBundle/Resources/config/services.yml
index 06667c8eae1..de1b16940d9 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/config/services.yml
@@ -24,7 +24,7 @@ parameters:
     oro_datagrid.event_listener.grid_views_load.class:            Oro\Bundle\DataGridBundle\EventListener\GridViewsLoadListener
     oro_datagrid.form.type.grid_view_type.class:                  Oro\Bundle\DataGridBundle\Form\Type\GridViewType
     oro_datagrid.form.type.sorting_type.class:                    Oro\Bundle\DataGridBundle\Form\Type\GridSortingType
-    oro_datagrid.grid_view.manager.api.class:                     Oro\Bundle\SoapBundle\Entity\Manager\ApiEntityManager
+    oro_datagrid.grid_view.manager.api.class:                     Oro\Bundle\DataGridBundle\Entity\Manager\GridViewApiEntityManager
     oro_datagrid.grid_view.entity.class:                          Oro\Bundle\DataGridBundle\Entity\GridView
     oro_datagrid.grid_view.form.handler.api.class:                Oro\Bundle\DataGridBundle\Form\Handler\GridViewApiHandler
     oro_datagrid.columns.helper.class:                            Oro\Bundle\DataGridBundle\Tools\ColumnsHelper
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
index 9a336c17a5e..4b291c4e4d8 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
@@ -394,7 +394,6 @@ define([
                 }),
                 {},
                 function(response) {
-
                     // TODO how we can remove this fix with labels?
                     // for now we need to get label from choices to save specifically built labels(shared, system)
                     defaultModel.set({is_default:false, label: self._getView(defaultModel.get('name')).label});
@@ -435,6 +434,11 @@ define([
                 this.viewDirty = !this._isCurrentStateSynchronized();
             }
 
+            if (model.get('is_default')) {
+                var systemModel = this._getDefaultSystemViewModel();
+                systemModel.set({is_default:true, label: this._getView(this.DEFAULT_GRID_VIEW_ID).label});
+            }
+
             this.render();
         },
 
@@ -580,7 +584,7 @@ define([
                 {
                     label: __('oro.datagrid.action.use_as_default_grid_view'),
                     name: 'use_as_default',
-                    enabled: !currentView.get('is_default')
+                    enabled: typeof currentView !== 'undefined' && !currentView.get('is_default')
                 }
             ];
         },
@@ -634,6 +638,17 @@ define([
             return this._getCurrentView().value === this.DEFAULT_GRID_VIEW_ID;
         },
 
+        /**
+         * @private
+         *
+         * @returns {undefined|GridViewModel}
+         */
+        _getDefaultSystemViewModel: function() {
+            return this.viewsCollection.findWhere({
+                name:this.DEFAULT_GRID_VIEW_ID
+            });
+        },
+
         /**
          * @private
          *

From 36ff22782d338f9403bec86f13812409c2c9ac55 Mon Sep 17 00:00:00 2001
From: zebimax <zebimax@gmail.com>
Date: Mon, 28 Dec 2015 22:24:58 +0200
Subject: [PATCH 307/471] BAP-9577:Add option 'Use as default' to views options
   - fix merge conflicts

---
 .../Entity/Repository/GridViewRepository.php  | 13 ++---
 .../GridViews/GridViewsExtension.php          | 47 +++++--------------
 2 files changed, 20 insertions(+), 40 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php b/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php
index e2224fc41fd..c401cb85db1 100644
--- a/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php
+++ b/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php
@@ -40,12 +40,12 @@ public function findGridViews(AclHelper $aclHelper, UserInterface $user, $gridNa
     }
 
     /**
-     * @param UserInterface $user
-     * @param string        $gridName
+     * @param User   $user
+     * @param string $gridName
      *
      * @return GridView|null
      */
-    public function findDefaultGridView(UserInterface $user, $gridName)
+    public function findDefaultGridView(User $user, $gridName)
     {
         $qb = $this->getFindDefaultGridViewQb($user, $gridName);
 
@@ -55,6 +55,7 @@ public function findDefaultGridView(UserInterface $user, $gridName)
     /**
      * @param User     $user
      * @param GridView $gridView
+     *
      * @return GridView[]
      */
     public function findDefaultGridViews(User $user, GridView $gridView)
@@ -69,12 +70,12 @@ public function findDefaultGridViews(User $user, GridView $gridView)
     }
 
     /**
-     * @param UserInterface $user
-     * @param string        $gridName
+     * @param User   $user
+     * @param string $gridName
      *
      * @return QueryBuilder
      */
-    protected function getFindDefaultGridViewQb(UserInterface $user, $gridName)
+    protected function getFindDefaultGridViewQb(User $user, $gridName)
     {
         $qb = $this->createQueryBuilder('gv');
         $qb->innerJoin('gv.users', 'u')
diff --git a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
index dc8645909e7..ca449fbb365 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
@@ -78,25 +78,8 @@ protected function isDisabled()
      */
     public function visitMetadata(DatagridConfiguration $config, MetadataObject $data)
     {
-        $defaultViewId = $this->getDefaultViewId($config->getName());
-        $params        = $this->getParameters()->get(ParameterBag::ADDITIONAL_PARAMETERS, []);
-
-        if (isset($params[self::VIEWS_PARAM_KEY])) {
-            $currentView = (int)$params[self::VIEWS_PARAM_KEY];
-        } else {
-            $currentView                   = $defaultViewId;
-            $params[self::VIEWS_PARAM_KEY] = $defaultViewId;
-            $this->getParameters()->set(ParameterBag::ADDITIONAL_PARAMETERS, $params);
-        }
-
-        $data->offsetAddToArray('initialState', ['gridView' => $defaultViewId]);
-        $data->offsetAddToArray('state', ['gridView' => $currentView]);
-
         $allLabel = null;
-        if (isset($config['options'])
-                &&isset($config['options']['gridViews'])
-                && isset($config['options']['gridViews']['allLabel'])
-            ) {
+        if (isset($config['options'], $config['options']['gridViews'], $config['options']['gridViews']['allLabel'])) {
             $allLabel = $this->translator->trans($config['options']['gridViews']['allLabel']);
         }
 
@@ -124,35 +107,31 @@ public function visitMetadata(DatagridConfiguration $config, MetadataObject $dat
             $this->eventDispatcher->dispatch(GridViewsLoadEvent::EVENT_NAME, $event);
             $gridViews = $event->getGridViews();
         }
-        $hasDefault = false;
+        $defaultViewId = self::DEFAULT_VIEW_ID;
         foreach ($gridViews['views'] as $view) {
             if (!empty($view['is_default'])) {
-                $hasDefault = true;
+                $defaultViewId = $view['name'];
                 break;
             }
         }
 
-        $systemAllView->setDefault(!$hasDefault);
+        $systemAllView->setDefault($defaultViewId === self::DEFAULT_VIEW_ID);
         $gridViews['gridName'] = $config->getName();
         $gridViews['permissions'] = $this->getPermissions();
         $gridViews['views'][] = $systemAllView->getMetadata();
         $data->offsetAddToArray('gridViews', $gridViews);
-    }
 
-    /**
-     * @param string $gridName
-     *
-     * @return int|string
-     */
-    protected function getDefaultViewId($gridName)
-    {
-        $defaultGridView = null;
-        if ($this->securityFacade->isGranted('oro_datagrid_gridview_view')) {
-            $repository      = $this->registry->getRepository('OroDataGridBundle:GridView');
-            $defaultGridView = $repository->findDefaultGridView($gridName, $this->securityFacade->getLoggedUser());
+        $params        = $this->getParameters()->get(ParameterBag::ADDITIONAL_PARAMETERS, []);
+        if (isset($params[self::VIEWS_PARAM_KEY])) {
+            $currentView = (int)$params[self::VIEWS_PARAM_KEY];
+        } else {
+            $currentView                   = $defaultViewId;
+            $params[self::VIEWS_PARAM_KEY] = $defaultViewId;
+            $this->getParameters()->set(ParameterBag::ADDITIONAL_PARAMETERS, $params);
         }
 
-        return $defaultGridView ? $defaultGridView->getId() : self::DEFAULT_VIEW_ID;
+        $data->offsetAddToArray('initialState', ['gridView' => self::DEFAULT_VIEW_ID]);
+        $data->offsetAddToArray('state', ['gridView' => $currentView]);
     }
 
     /**

From 30a20f4516da7a4db13b1abc4f9cf9e6aae72885 Mon Sep 17 00:00:00 2001
From: zebimax <zebimax@gmail.com>
Date: Mon, 28 Dec 2015 22:30:05 +0200
Subject: [PATCH 308/471] BAP-9577:Add option 'Use as default' to views options
   - remove unused

---
 .../DataGridBundle/Controller/Api/Rest/GridViewController.php  | 1 -
 .../DataGridBundle/Extension/GridViews/AbstractViewsList.php   | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Controller/Api/Rest/GridViewController.php b/src/Oro/Bundle/DataGridBundle/Controller/Api/Rest/GridViewController.php
index 98edee243bd..ce54b905cae 100644
--- a/src/Oro/Bundle/DataGridBundle/Controller/Api/Rest/GridViewController.php
+++ b/src/Oro/Bundle/DataGridBundle/Controller/Api/Rest/GridViewController.php
@@ -18,7 +18,6 @@
 use Oro\Bundle\SecurityBundle\Annotation\Acl;
 use Oro\Bundle\SecurityBundle\SecurityFacade;
 use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController;
-use Oro\Bundle\DataGridBundle\Entity\Repository\GridViewRepository;
 
 /**
  * @Rest\NamePrefix("oro_datagrid_api_rest_gridview_")
diff --git a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/AbstractViewsList.php b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/AbstractViewsList.php
index ef27ddccaa9..bf5734c1785 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/AbstractViewsList.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/AbstractViewsList.php
@@ -100,8 +100,7 @@ function (View $view) {
 
         return [
             'choices' => $this->toChoiceList(),
-            'views'   => $result->toArray(),
-            'default' => null
+            'views'   => $result->toArray()
         ];
     }
 

From 5ad84114c06e61f70f884ad783e70575c892546c Mon Sep 17 00:00:00 2001
From: Oleg Popadko <oleg@popadko.com>
Date: Fri, 25 Dec 2015 20:04:42 +0200
Subject: [PATCH 309/471] BAP-7696: Update jsTree library - update jsTree lib

---
 .../UIBundle/Resources/config/assets.yml      |    2 +-
 .../UIBundle/Resources/config/requirejs.yml   |    8 +-
 .../js/app/components/basic-tree-component.js |  142 +
 .../app/components/tree-manage-component.js   |  166 +
 .../public/lib/jstree/jquery.cookie.js        |   96 -
 .../public/lib/jstree/jquery.hotkeys.js       |  111 -
 .../public/lib/jstree/jquery.jstree.js        | 4562 ----------
 .../Resources/public/lib/jstree/jstree.js     | 7781 +++++++++++++++++
 .../Resources/public/lib/jstree/jstree.min.js |    5 +
 .../public/lib/jstree/themes/apple/bg.jpg     |  Bin 331 -> 0 bytes
 .../public/lib/jstree/themes/apple/d.png      |  Bin 7765 -> 0 bytes
 .../lib/jstree/themes/apple/dot_for_ie.gif    |  Bin 43 -> 0 bytes
 .../public/lib/jstree/themes/apple/style.css  |   61 -
 .../lib/jstree/themes/apple/throbber.gif      |  Bin 1849 -> 0 bytes
 .../public/lib/jstree/themes/classic/d.gif    |  Bin 3003 -> 0 bytes
 .../public/lib/jstree/themes/classic/d.png    |  Bin 7535 -> 0 bytes
 .../lib/jstree/themes/classic/dot_for_ie.gif  |  Bin 43 -> 0 bytes
 .../lib/jstree/themes/classic/style.css       |   77 -
 .../lib/jstree/themes/classic/throbber.gif    |  Bin 1849 -> 0 bytes
 .../lib/jstree/themes/default-dark/32px.png   |  Bin 0 -> 1562 bytes
 .../lib/jstree/themes/default-dark/40px.png   |  Bin 0 -> 5717 bytes
 .../lib/jstree/themes/default-dark/style.css  | 1105 +++
 .../jstree/themes/default-dark/style.min.css  |    1 +
 .../jstree/themes/default-dark/throbber.gif   |  Bin 0 -> 1720 bytes
 .../lib/jstree/themes/default-rtl/d.gif       |  Bin 2872 -> 0 bytes
 .../lib/jstree/themes/default-rtl/d.png       |  Bin 5437 -> 0 bytes
 .../lib/jstree/themes/default-rtl/dots.gif    |  Bin 132 -> 0 bytes
 .../lib/jstree/themes/default-rtl/style.css   |   84 -
 .../jstree/themes/default-rtl/throbber.gif    |  Bin 1849 -> 0 bytes
 .../public/lib/jstree/themes/default/32px.png |  Bin 0 -> 3121 bytes
 .../public/lib/jstree/themes/default/40px.png |  Bin 0 -> 1880 bytes
 .../public/lib/jstree/themes/default/d.gif    |  Bin 2944 -> 0 bytes
 .../public/lib/jstree/themes/default/d.png    |  Bin 5437 -> 0 bytes
 .../lib/jstree/themes/default/style.css       | 1138 ++-
 .../lib/jstree/themes/default/style.min.css   |    1 +
 .../lib/jstree/themes/default/throbber.gif    |  Bin 1849 -> 1720 bytes
 .../Resources/translations/jsmessages.en.yml  |    3 +
 37 files changed, 10268 insertions(+), 5075 deletions(-)
 create mode 100644 src/Oro/Bundle/UIBundle/Resources/public/js/app/components/basic-tree-component.js
 create mode 100644 src/Oro/Bundle/UIBundle/Resources/public/js/app/components/tree-manage-component.js
 delete mode 100644 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/jquery.cookie.js
 delete mode 100644 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/jquery.hotkeys.js
 delete mode 100644 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/jquery.jstree.js
 create mode 100755 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/jstree.js
 create mode 100755 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/jstree.min.js
 delete mode 100644 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/apple/bg.jpg
 delete mode 100644 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/apple/d.png
 delete mode 100644 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/apple/dot_for_ie.gif
 delete mode 100644 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/apple/style.css
 delete mode 100644 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/apple/throbber.gif
 delete mode 100644 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/classic/d.gif
 delete mode 100644 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/classic/d.png
 delete mode 100644 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/classic/dot_for_ie.gif
 delete mode 100644 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/classic/style.css
 delete mode 100644 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/classic/throbber.gif
 create mode 100755 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/32px.png
 create mode 100755 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/40px.png
 create mode 100755 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/style.css
 create mode 100755 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/style.min.css
 create mode 100755 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/throbber.gif
 delete mode 100644 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-rtl/d.gif
 delete mode 100644 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-rtl/d.png
 delete mode 100644 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-rtl/dots.gif
 delete mode 100644 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-rtl/style.css
 delete mode 100644 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-rtl/throbber.gif
 create mode 100755 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/32px.png
 create mode 100755 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/40px.png
 delete mode 100644 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/d.gif
 delete mode 100644 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/d.png
 mode change 100644 => 100755 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/style.css
 create mode 100755 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/style.min.css
 mode change 100644 => 100755 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/throbber.gif

diff --git a/src/Oro/Bundle/UIBundle/Resources/config/assets.yml b/src/Oro/Bundle/UIBundle/Resources/config/assets.yml
index a1c27b8e2c1..362422c6155 100644
--- a/src/Oro/Bundle/UIBundle/Resources/config/assets.yml
+++ b/src/Oro/Bundle/UIBundle/Resources/config/assets.yml
@@ -4,7 +4,7 @@ css:
     'oroui':
         # libraries' styles
         - 'bundles/oroui/lib/bootstrap/bootstrap.less'
-        - 'bundles/oroui/lib/jstree/themes/default/style.css'
+        - 'bundles/oroui/lib/jstree/themes/default/style.min.css'
         - 'bundles/oroui/lib/font-awesome/css/font-awesome.css'
         - 'bundles/oroui/lib/simplecolorpicker/jquery.simplecolorpicker.css'
         - 'bundles/oroui/lib/simplecolorpicker/jquery.simplecolorpicker-fontawesome.css'
diff --git a/src/Oro/Bundle/UIBundle/Resources/config/requirejs.yml b/src/Oro/Bundle/UIBundle/Resources/config/requirejs.yml
index 567bebe0d03..370d6d0f0fa 100644
--- a/src/Oro/Bundle/UIBundle/Resources/config/requirejs.yml
+++ b/src/Oro/Bundle/UIBundle/Resources/config/requirejs.yml
@@ -26,9 +26,6 @@ config:
         'jquery.cookie':
             deps:
                 - 'jquery'
-        'jstree/jquery.hotkeys':
-            deps:
-                - 'jquery.jstree'
         'bootstrap':
             deps:
                 - 'jquery'
@@ -132,10 +129,8 @@ config:
         'jquery.simplecolorpicker': 'bundles/oroui/lib/simplecolorpicker/jquery.simplecolorpicker.js'
         'jquery.minicolors': 'bundles/oroui/lib/minicolors/jquery.minicolors.js'
         'jquery.cookie': 'bundles/oroui/lib/jquery/jquery.cookie.js'
-        'jquery.jstree': 'bundles/oroui/lib/jstree/jquery.jstree.js'
+        'jquery.jstree': 'bundles/oroui/lib/jstree/jstree.min.js'
         'jquery.ajax.queue': 'bundles/oroui/lib/jquery/jquery.ajaxQueue.min.js'
-        'jstree/jquery.cookie': 'bundles/oroui/lib/jstree/jquery.cookie.js'
-        'jstree/jquery.hotkeys': 'bundles/oroui/lib/jstree/jquery.hotkeys.js'
         'bootstrap': 'bundles/oroui/lib/bootstrap.min.js'
 #        'bootstrap': 'bundles/oroui/js/bootstrap-dev.js'
         'underscore': 'bundles/components/underscore/underscore.js'
@@ -188,6 +183,7 @@ config:
         'oroui/js/app/components/tabs-component': 'bundles/oroui/js/app/components/tabs-component.js'
         'oroui/js/app/components/view-component': 'bundles/oroui/js/app/components/view-component.js'
         'oroui/js/app/components/widget-component': 'bundles/oroui/js/app/components/widget-component.js'
+        'oroui/js/app/components/basic-tree-component': 'bundles/oroui/js/app/components/basic-tree-component.js'
         'oroui/js/widget-manager': 'bundles/oroui/js/widget/widget-manager.js'
         'oroui/js/widget/abstract-widget': 'bundles/oroui/js/widget/abstract-widget.js'
         'oro/block-widget': 'bundles/oroui/js/widget/block-widget.js'
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/basic-tree-component.js b/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/basic-tree-component.js
new file mode 100644
index 00000000000..acf353ae212
--- /dev/null
+++ b/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/basic-tree-component.js
@@ -0,0 +1,142 @@
+define(function(require) {
+    'use strict';
+
+    var BasicTreeComponent;
+    var $ = require('jquery');
+    var _ = require('underscore');
+    var mediator = require('oroui/js/mediator');
+    var layout = require('oroui/js/layout');
+    var BaseComponent = require('oroui/js/app/components/base/component');
+
+    require('jquery.jstree');
+
+    /**
+     * Options:
+     * - data - tree structure in jstree json format
+     * - nodeId - identifier of selected node
+     *
+     * @export oroui/js/app/components/basic-tree-component
+     * @extends oroui.app.components.base.Component
+     * @class oroui.app.components.BasicTreeComponent
+     */
+    BasicTreeComponent = BaseComponent.extend({
+        /**
+         * @property {Object}
+         */
+        $tree: null,
+
+        /**
+         * @property {Number}
+         */
+        nodeId: null,
+
+        /**
+         * @property {Boolean}
+         */
+        initialization: false,
+
+        /**
+         * @param {Object} options
+         */
+        initialize: function(options) {
+            var nodeList = options.data;
+            if (!nodeList) {
+                return;
+            }
+
+            this.$tree = $(options._sourceElement);
+
+            var config = {
+                'core': {
+                    'multiple': false,
+                    'data': nodeList,
+                    'check_callback': true
+                },
+                'state': {
+                    'key': options.key,
+                    'filter': _.bind(this.onFilter, this)
+                },
+                'plugins': ['state']
+            };
+            config = this.customizeTreeConfig(options, config);
+
+            this.nodeId = options.nodeId;
+
+            this._deferredInit();
+            this.initialization = true;
+
+            this.$tree.jstree(config);
+
+            var self = this;
+            this.$tree.on('ready.jstree', function() {
+                self._resolveDeferredInit();
+                self.initialization = false;
+            });
+
+            self._fixContainerHeight();
+        },
+
+        /**
+         * Customize jstree config to add plugins, callbacks etc.
+         *
+         * @param {Object} options
+         * @param {Object} config
+         * @returns {Object}
+         */
+        customizeTreeConfig: function(options, config) {
+            return config;
+        },
+
+        /**
+         * Filters tree state
+         *
+         * @param {Object} state
+         * @returns {Object}
+         */
+        onFilter: function(state) {
+            if (this.nodeId) {
+                state.core.selected = [this.nodeId];
+            } else {
+                state.core.selected = [];
+            }
+            return state;
+        },
+
+        /**
+         * Fix scrollable container height
+         * TODO: This method should be removed during fixing of https://magecore.atlassian.net/browse/BB-336
+         *
+         */
+        _fixContainerHeight: function() {
+            var tree = this.$tree.parent();
+            if (!tree.hasClass('category-tree')) {
+                return;
+            }
+
+            var container = tree.parent();
+            if (!container.hasClass('category-container')) {
+                return;
+            }
+
+            var fixHeight = function() {
+                var anchor = $('#bottom-anchor').position().top;
+                var container = container.position().top;
+                var debugBarHeight = $('.sf-toolbar:visible').height() || 0;
+                var footerHeight = $('#footer:visible').height() || 0;
+                var fixContent = 1;
+
+                tree.height(anchor - container - debugBarHeight - footerHeight + fixContent);
+            };
+
+            layout.onPageRendered(fixHeight);
+            $(window).on('resize', _.debounce(fixHeight, 50));
+            mediator.on('page:afterChange', fixHeight);
+            mediator.on('layout:adjustReloaded', fixHeight);
+            mediator.on('layout:adjustHeight', fixHeight);
+
+            fixHeight();
+        }
+    });
+
+    return BasicTreeComponent;
+});
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/tree-manage-component.js b/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/tree-manage-component.js
new file mode 100644
index 00000000000..2267ff0d35e
--- /dev/null
+++ b/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/tree-manage-component.js
@@ -0,0 +1,166 @@
+define(function(require) {
+    'use strict';
+
+    var TreeManageComponent;
+    var $ = require('jquery');
+    var _ = require('underscore');
+    var __ = require('orotranslation/js/translator');
+    var widgetManager = require('oroui/js/widget-manager');
+    var mediator = require('oroui/js/mediator');
+    var messenger = require('oroui/js/messenger');
+    var routing = require('routing');
+    var BasicTreeComponent = require('oroui/js/app/components/basic-tree-component');
+
+    /**
+     * @export oroui/js/app/components/tree-manage-component
+     * @extends oroui.app.components.BasicTreeComponent
+     * @class oroui.app.components.TreeManageComponent
+     */
+    TreeManageComponent = BasicTreeComponent.extend({
+        /**
+         * @property {Boolean}
+         */
+        updateAllowed: false,
+
+        /**
+         * @property {Boolean}
+         */
+        moveTriggered: false,
+
+        /**
+         * @property {String}
+         */
+        reloadWidget: '',
+
+        /**
+         * @property {String}
+         */
+        onSelectRoute: '',
+
+        /**
+         * @property {String}
+         */
+        onMoveRoute: '',
+
+        /**
+         * @param {Object} options
+         */
+        initialize: function(options) {
+            TreeManageComponent.__super__.initialize.call(this, options);
+            if (!this.$tree) {
+                return;
+            }
+
+            this.updateAllowed = options.updateAllowed;
+            this.reloadWidget = options.reloadWidget;
+            this.onSelectRoute = options.onSelectRoute;
+            this.onMoveRoute = options.onMoveRoute;
+
+            this.$tree.on('select_node.jstree', _.bind(this.onSelect, this));
+            this.$tree.on('move_node.jstree', _.bind(this.onMove, this));
+
+            this._fixContainerHeight();
+        },
+
+        /**
+         * @param {Object} options
+         * @param {Object} config
+         * @returns {Object}
+         */
+        customizeTreeConfig: function(options, config) {
+            if (options.updateAllowed) {
+                config.plugins.push('dnd');
+                config.dnd = {
+                    'copy': false
+                };
+            }
+
+            return config;
+        },
+
+        /**
+         * Triggers after node selection in tree
+         *
+         * @param {Object} node
+         * @param {Object} selected
+         */
+        onSelect: function(node, selected) {
+            if (this.initialization || !this.updateAllowed) {
+                return;
+            }
+
+            var url = routing.generate(this.onSelectRoute, {id: selected.node.id});
+            mediator.execute('redirectTo', {url: url});
+        },
+
+        /**
+         * Triggers after node move
+         *
+         * @param {Object} e
+         * @param {Object} data
+         */
+        onMove: function(e, data) {
+            if (this.moveTriggered) {
+                return;
+            }
+
+            if (data.parent === '#' && data.old_parent === '#') {
+                this.rollback(data);
+                messenger.notificationFlashMessage('warning', __('oro.ui.jstree.move_root_page_warning'));
+                return;
+            }
+
+            var self = this;
+            $.ajax({
+                async: false,
+                type: 'PUT',
+                url: routing.generate(self.onMoveRoute),
+                data: {
+                    id: data.node.id,
+                    parent: data.parent,
+                    position: data.position
+                },
+                success: function(result) {
+                    if (!result.status) {
+                        self.rollback(data);
+                        messenger.notificationFlashMessage(
+                            'error',
+                            __('oro.ui.jstree.move_page_error', {nodeText: data.node.text})
+                        );
+                    } else if (self.reloadWidget) {
+                        widgetManager.getWidgetInstanceByAlias(self.reloadWidget, function(widget) {
+                            widget.render();
+                        });
+                    }
+                }
+            });
+        },
+
+        /**
+         * Rollback node move
+         *
+         * @param {Object} data
+         */
+        rollback: function(data) {
+            this.moveTriggered = true;
+            this.$tree.jstree('move_node', data.node, data.old_parent, data.old_position);
+            this.moveTriggered = false;
+        },
+
+        /**
+         * Off events
+         */
+        dispose: function() {
+            if (this.disposed) {
+                return;
+            }
+            this.$tree
+                .off('select_node.jstree')
+                .off('move_node.jstree');
+
+            TreeManageComponent.__super__.dispose.call(this);
+        }
+    });
+
+    return TreeManageComponent;
+});
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/jquery.cookie.js b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/jquery.cookie.js
deleted file mode 100644
index 6df1faca25f..00000000000
--- a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/jquery.cookie.js
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * Cookie plugin
- *
- * Copyright (c) 2006 Klaus Hartl (stilbuero.de)
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
- *
- */
-
-/**
- * Create a cookie with the given name and value and other optional parameters.
- *
- * @example $.cookie('the_cookie', 'the_value');
- * @desc Set the value of a cookie.
- * @example $.cookie('the_cookie', 'the_value', { expires: 7, path: '/', domain: 'jquery.com', secure: true });
- * @desc Create a cookie with all available options.
- * @example $.cookie('the_cookie', 'the_value');
- * @desc Create a session cookie.
- * @example $.cookie('the_cookie', null);
- * @desc Delete a cookie by passing null as value. Keep in mind that you have to use the same path and domain
- *       used when the cookie was set.
- *
- * @param String name The name of the cookie.
- * @param String value The value of the cookie.
- * @param Object options An object literal containing key/value pairs to provide optional cookie attributes.
- * @option Number|Date expires Either an integer specifying the expiration date from now on in days or a Date object.
- *                             If a negative value is specified (e.g. a date in the past), the cookie will be deleted.
- *                             If set to null or omitted, the cookie will be a session cookie and will not be retained
- *                             when the the browser exits.
- * @option String path The value of the path atribute of the cookie (default: path of page that created the cookie).
- * @option String domain The value of the domain attribute of the cookie (default: domain of page that created the cookie).
- * @option Boolean secure If true, the secure attribute of the cookie will be set and the cookie transmission will
- *                        require a secure protocol (like HTTPS).
- * @type undefined
- *
- * @name $.cookie
- * @cat Plugins/Cookie
- * @author Klaus Hartl/klaus.hartl@stilbuero.de
- */
-
-/**
- * Get the value of a cookie with the given name.
- *
- * @example $.cookie('the_cookie');
- * @desc Get the value of a cookie.
- *
- * @param String name The name of the cookie.
- * @return The value of the cookie.
- * @type String
- *
- * @name $.cookie
- * @cat Plugins/Cookie
- * @author Klaus Hartl/klaus.hartl@stilbuero.de
- */
-jQuery.cookie = function(name, value, options) {
-    if (typeof value != 'undefined') { // name and value given, set cookie
-        options = options || {};
-        if (value === null) {
-            value = '';
-            options.expires = -1;
-        }
-        var expires = '';
-        if (options.expires && (typeof options.expires == 'number' || options.expires.toUTCString)) {
-            var date;
-            if (typeof options.expires == 'number') {
-                date = new Date();
-                date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000));
-            } else {
-                date = options.expires;
-            }
-            expires = '; expires=' + date.toUTCString(); // use expires attribute, max-age is not supported by IE
-        }
-        // CAUTION: Needed to parenthesize options.path and options.domain
-        // in the following expressions, otherwise they evaluate to undefined
-        // in the packed version for some reason...
-        var path = options.path ? '; path=' + (options.path) : '';
-        var domain = options.domain ? '; domain=' + (options.domain) : '';
-        var secure = options.secure ? '; secure' : '';
-        document.cookie = [name, '=', encodeURIComponent(value), expires, path, domain, secure].join('');
-    } else { // only name given, get cookie
-        var cookieValue = null;
-        if (document.cookie && document.cookie != '') {
-            var cookies = document.cookie.split(';');
-            for (var i = 0; i < cookies.length; i++) {
-                var cookie = jQuery.trim(cookies[i]);
-                // Does this cookie string begin with the name we want?
-                if (cookie.substring(0, name.length + 1) == (name + '=')) {
-                    cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
-                    break;
-                }
-            }
-        }
-        return cookieValue;
-    }
-};
\ No newline at end of file
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/jquery.hotkeys.js b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/jquery.hotkeys.js
deleted file mode 100644
index c240a7fd7f2..00000000000
--- a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/jquery.hotkeys.js
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * jQuery Hotkeys Plugin
- * Copyright 2010, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- *
- * Based upon the plugin by Tzury Bar Yochay:
- * http://github.com/tzuryby/hotkeys
- *
- * Original idea by:
- * Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/
-*/
-
-/*
- * One small change is: now keys are passed by object { keys: '...' }
- * Might be useful, when you want to pass some other data to your handler
- */
-
-(function(jQuery){
-	
-	jQuery.hotkeys = {
-		version: "0.8",
-
-		specialKeys: {
-			8: "backspace", 9: "tab", 10: "return", 13: "return", 16: "shift", 17: "ctrl", 18: "alt", 19: "pause",
-			20: "capslock", 27: "esc", 32: "space", 33: "pageup", 34: "pagedown", 35: "end", 36: "home",
-			37: "left", 38: "up", 39: "right", 40: "down", 45: "insert", 46: "del", 
-			96: "0", 97: "1", 98: "2", 99: "3", 100: "4", 101: "5", 102: "6", 103: "7",
-			104: "8", 105: "9", 106: "*", 107: "+", 109: "-", 110: ".", 111 : "/", 
-			112: "f1", 113: "f2", 114: "f3", 115: "f4", 116: "f5", 117: "f6", 118: "f7", 119: "f8", 
-			120: "f9", 121: "f10", 122: "f11", 123: "f12", 144: "numlock", 145: "scroll", 186: ";", 191: "/",
-			220: "\\", 222: "'", 224: "meta"
-		},
-	
-		shiftNums: {
-			"`": "~", "1": "!", "2": "@", "3": "#", "4": "$", "5": "%", "6": "^", "7": "&", 
-			"8": "*", "9": "(", "0": ")", "-": "_", "=": "+", ";": ": ", "'": "\"", ",": "<", 
-			".": ">",  "/": "?",  "\\": "|"
-		}
-	};
-
-	function keyHandler( handleObj ) {
-		if ( typeof handleObj.data === "string" ) {
-			handleObj.data = { keys: handleObj.data };
-		}
-
-		// Only care when a possible input has been specified
-		if ( !handleObj.data || !handleObj.data.keys || typeof handleObj.data.keys !== "string" ) {
-			return;
-		}
-
-		var origHandler = handleObj.handler,
-			keys = handleObj.data.keys.toLowerCase().split(" "),
-			textAcceptingInputTypes = ["text", "password", "number", "email", "url", "range", "date", "month", "week", "time", "datetime", "datetime-local", "search", "color", "tel"];
-	
-		handleObj.handler = function( event ) {
-			// Don't fire in text-accepting inputs that we didn't directly bind to
-			if ( this !== event.target && (/textarea|select/i.test( event.target.nodeName ) ||
-				jQuery.inArray(event.target.type, textAcceptingInputTypes) > -1 ) ) {
-				return;
-			}
-
-			var special = jQuery.hotkeys.specialKeys[ event.keyCode ],
-				// character codes are available only in keypress
-				character = event.type === "keypress" && String.fromCharCode( event.which ).toLowerCase(),
-				modif = "", possible = {};
-
-			// check combinations (alt|ctrl|shift+anything)
-			if ( event.altKey && special !== "alt" ) {
-				modif += "alt+";
-			}
-
-			if ( event.ctrlKey && special !== "ctrl" ) {
-				modif += "ctrl+";
-			}
-			
-			// TODO: Need to make sure this works consistently across platforms
-			if ( event.metaKey && !event.ctrlKey && special !== "meta" ) {
-				modif += "meta+";
-			}
-
-			if ( event.shiftKey && special !== "shift" ) {
-				modif += "shift+";
-			}
-
-			if ( special ) {
-				possible[ modif + special ] = true;
-			}
-
-			if ( character ) {
-				possible[ modif + character ] = true;
-				possible[ modif + jQuery.hotkeys.shiftNums[ character ] ] = true;
-
-				// "$" can be triggered as "Shift+4" or "Shift+$" or just "$"
-				if ( modif === "shift+" ) {
-					possible[ jQuery.hotkeys.shiftNums[ character ] ] = true;
-				}
-			}
-
-			for ( var i = 0, l = keys.length; i < l; i++ ) {
-				if ( possible[ keys[i] ] ) {
-					return origHandler.apply( this, arguments );
-				}
-			}
-		};
-	}
-
-	jQuery.each([ "keydown", "keyup", "keypress" ], function() {
-		jQuery.event.special[ this ] = { add: keyHandler };
-	});
-
-})( this.jQuery );
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/jquery.jstree.js b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/jquery.jstree.js
deleted file mode 100644
index 6b23c05f3e1..00000000000
--- a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/jquery.jstree.js
+++ /dev/null
@@ -1,4562 +0,0 @@
-/*
- * jsTree 1.0-rc3
- * http://jstree.com/
- *
- * Copyright (c) 2010 Ivan Bozhanov (vakata.com)
- *
- * Licensed same as jquery - under the terms of either the MIT License or the GPL Version 2 License
- *   http://www.opensource.org/licenses/mit-license.php
- *   http://www.gnu.org/licenses/gpl.html
- *
- * $Date: 2011-02-09 01:17:14 +0200 (ср, 09 февр 2011) $
- * $Revision: 236 $
- */
-
-
-"use strict";
-
-// top wrapper to prevent multiple inclusion (is this OK?)
-(function () { if(jQuery && jQuery.jstree) { return; }
-	var is_ie6 = false, is_ie7 = false, is_ff2 = false;
-
-/* 
- * jsTree core
- */
-(function ($) {
-	// Common functions not related to jsTree 
-	// decided to move them to a `vakata` "namespace"
-	$.vakata = {};
-	// CSS related functions
-	$.vakata.css = {
-		get_css : function(rule_name, delete_flag, sheet) {
-			rule_name = rule_name.toLowerCase();
-			var css_rules = sheet.cssRules || sheet.rules,
-				j = 0;
-			do {
-				if(css_rules.length && j > css_rules.length + 5) { return false; }
-				if(css_rules[j].selectorText && css_rules[j].selectorText.toLowerCase() == rule_name) {
-					if(delete_flag === true) {
-						if(sheet.removeRule) { sheet.removeRule(j); }
-						if(sheet.deleteRule) { sheet.deleteRule(j); }
-						return true;
-					}
-					else { return css_rules[j]; }
-				}
-			}
-			while (css_rules[++j]);
-			return false;
-		},
-		add_css : function(rule_name, sheet) {
-			if($.jstree.css.get_css(rule_name, false, sheet)) { return false; }
-			if(sheet.insertRule) { sheet.insertRule(rule_name + ' { }', 0); } else { sheet.addRule(rule_name, null, 0); }
-			return $.vakata.css.get_css(rule_name);
-		},
-		remove_css : function(rule_name, sheet) { 
-			return $.vakata.css.get_css(rule_name, true, sheet); 
-		},
-		add_sheet : function(opts) {
-			var tmp = false, is_new = true;
-			if(opts.str) {
-				if(opts.title) { tmp = $("style[id='" + opts.title + "-stylesheet']")[0]; }
-				if(tmp) { is_new = false; }
-				else {
-					tmp = document.createElement("style");
-					tmp.setAttribute('type',"text/css");
-					if(opts.title) { tmp.setAttribute("id", opts.title + "-stylesheet"); }
-				}
-				if(tmp.styleSheet) {
-					if(is_new) { 
-						document.getElementsByTagName("head")[0].appendChild(tmp); 
-						tmp.styleSheet.cssText = opts.str; 
-					}
-					else {
-						tmp.styleSheet.cssText = tmp.styleSheet.cssText + " " + opts.str; 
-					}
-				}
-				else {
-					tmp.appendChild(document.createTextNode(opts.str));
-					document.getElementsByTagName("head")[0].appendChild(tmp);
-				}
-				return tmp.sheet || tmp.styleSheet;
-			}
-			if(opts.url) {
-				if(document.createStyleSheet) {
-					try { tmp = document.createStyleSheet(opts.url); } catch (e) { }
-				}
-				else {
-					tmp			= document.createElement('link');
-					tmp.rel		= 'stylesheet';
-					tmp.type	= 'text/css';
-					tmp.media	= "all";
-					tmp.href	= opts.url;
-					document.getElementsByTagName("head")[0].appendChild(tmp);
-					return tmp.styleSheet;
-				}
-			}
-		}
-	};
-
-	// private variables 
-	var instances = [],			// instance array (used by $.jstree.reference/create/focused)
-		focused_instance = -1,	// the index in the instance array of the currently focused instance
-		plugins = {},			// list of included plugins
-		prepared_move = {};		// for the move_node function
-
-	// jQuery plugin wrapper (thanks to jquery UI widget function)
-	$.fn.jstree = function (settings) {
-		var isMethodCall = (typeof settings == 'string'), // is this a method call like $().jstree("open_node")
-			args = Array.prototype.slice.call(arguments, 1), 
-			returnValue = this;
-
-		// if a method call execute the method on all selected instances
-		if(isMethodCall) {
-			if(settings.substring(0, 1) == '_') { return returnValue; }
-			this.each(function() {
-				var instance = instances[$.data(this, "jstree_instance_id")],
-					methodValue = (instance && $.isFunction(instance[settings])) ? instance[settings].apply(instance, args) : instance;
-					if(typeof methodValue !== "undefined" && (settings.indexOf("is_") === 0 || (methodValue !== true && methodValue !== false))) { returnValue = methodValue; return false; }
-			});
-		}
-		else {
-			this.each(function() {
-				// extend settings and allow for multiple hashes and $.data
-				var instance_id = $.data(this, "jstree_instance_id"),
-					a = [],
-					b = settings ? $.extend({}, true, settings) : {},
-					c = $(this), 
-					s = false, 
-					t = [];
-				a = a.concat(args);
-				if(c.data("jstree")) { a.push(c.data("jstree")); }
-				b = a.length ? $.extend.apply(null, [true, b].concat(a)) : b;
-
-				// if an instance already exists, destroy it first
-				if(typeof instance_id !== "undefined" && instances[instance_id]) { instances[instance_id].destroy(); }
-				// push a new empty object to the instances array
-				instance_id = parseInt(instances.push({}),10) - 1;
-				// store the jstree instance id to the container element
-				$.data(this, "jstree_instance_id", instance_id);
-				// clean up all plugins
-				b.plugins = $.isArray(b.plugins) ? b.plugins : $.jstree.defaults.plugins.slice();
-				b.plugins.unshift("core");
-				// only unique plugins
-				b.plugins = b.plugins.sort().join(",,").replace(/(,|^)([^,]+)(,,\2)+(,|$)/g,"$1$2$4").replace(/,,+/g,",").replace(/,$/,"").split(",");
-
-				// extend defaults with passed data
-				s = $.extend(true, {}, $.jstree.defaults, b);
-				s.plugins = b.plugins;
-				$.each(plugins, function (i, val) { 
-					if($.inArray(i, s.plugins) === -1) { s[i] = null; delete s[i]; } 
-					else { t.push(i); }
-				});
-				s.plugins = t;
-
-				// push the new object to the instances array (at the same time set the default classes to the container) and init
-				instances[instance_id] = new $.jstree._instance(instance_id, $(this).addClass("jstree jstree-" + instance_id), s); 
-				// init all activated plugins for this instance
-				$.each(instances[instance_id]._get_settings().plugins, function (i, val) { instances[instance_id].data[val] = {}; });
-				$.each(instances[instance_id]._get_settings().plugins, function (i, val) { if(plugins[val]) { plugins[val].__init.apply(instances[instance_id]); } });
-				// initialize the instance
-				setTimeout(function() { if(instances[instance_id]) { instances[instance_id].init(); } }, 0);
-			});
-		}
-		// return the jquery selection (or if it was a method call that returned a value - the returned value)
-		return returnValue;
-	};
-	// object to store exposed functions and objects
-	$.jstree = {
-		defaults : {
-			plugins : []
-		},
-		_focused : function () { return instances[focused_instance] || null; },
-		_reference : function (needle) { 
-			// get by instance id
-			if(instances[needle]) { return instances[needle]; }
-			// get by DOM (if still no luck - return null
-			var o = $(needle); 
-			if(!o.length && typeof needle === "string") { o = $("#" + needle); }
-			if(!o.length) { return null; }
-			return instances[o.closest(".jstree").data("jstree_instance_id")] || null; 
-		},
-		_instance : function (index, container, settings) { 
-			// for plugins to store data in
-			this.data = { core : {} };
-			this.get_settings	= function () { return $.extend(true, {}, settings); };
-			this._get_settings	= function () { return settings; };
-			this.get_index		= function () { return index; };
-			this.get_container	= function () { return container; };
-			this.get_container_ul = function () { return container.children("ul:eq(0)"); };
-			this._set_settings	= function (s) { 
-				settings = $.extend(true, {}, settings, s);
-			};
-		},
-		_fn : { },
-		plugin : function (pname, pdata) {
-			pdata = $.extend({}, {
-				__init		: $.noop, 
-				__destroy	: $.noop,
-				_fn			: {},
-				defaults	: false
-			}, pdata);
-			plugins[pname] = pdata;
-
-			$.jstree.defaults[pname] = pdata.defaults;
-			$.each(pdata._fn, function (i, val) {
-				val.plugin		= pname;
-				val.old			= $.jstree._fn[i];
-				$.jstree._fn[i] = function () {
-					var rslt,
-						func = val,
-						args = Array.prototype.slice.call(arguments),
-						evnt = new $.Event("before.jstree"),
-						rlbk = false;
-
-					if(this.data.core.locked === true && i !== "unlock" && i !== "is_locked") { return; }
-
-					// Check if function belongs to the included plugins of this instance
-					do {
-						if(func && func.plugin && $.inArray(func.plugin, this._get_settings().plugins) !== -1) { break; }
-						func = func.old;
-					} while(func);
-					if(!func) { return; }
-
-					// context and function to trigger events, then finally call the function
-					if(i.indexOf("_") === 0) {
-						rslt = func.apply(this, args);
-					}
-					else {
-						rslt = this.get_container().triggerHandler(evnt, { "func" : i, "inst" : this, "args" : args, "plugin" : func.plugin });
-						if(rslt === false) { return; }
-						if(typeof rslt !== "undefined") { args = rslt; }
-
-						rslt = func.apply(
-							$.extend({}, this, { 
-								__callback : function (data) { 
-									this.get_container().triggerHandler( i + '.jstree', { "inst" : this, "args" : args, "rslt" : data, "rlbk" : rlbk });
-								},
-								__rollback : function () { 
-									rlbk = this.get_rollback();
-									return rlbk;
-								},
-								__call_old : function (replace_arguments) {
-									return func.old.apply(this, (replace_arguments ? Array.prototype.slice.call(arguments, 1) : args ) );
-								}
-							}), args);
-					}
-
-					// return the result
-					return rslt;
-				};
-				$.jstree._fn[i].old = val.old;
-				$.jstree._fn[i].plugin = pname;
-			});
-		},
-		rollback : function (rb) {
-			if(rb) {
-				if(!$.isArray(rb)) { rb = [ rb ]; }
-				$.each(rb, function (i, val) {
-					instances[val.i].set_rollback(val.h, val.d);
-				});
-			}
-		}
-	};
-	// set the prototype for all instances
-	$.jstree._fn = $.jstree._instance.prototype = {};
-
-	// load the css when DOM is ready
-	$(function() {
-		// code is copied from jQuery ($.browser is deprecated + there is a bug in IE)
-		var u = navigator.userAgent.toLowerCase(),
-			v = (u.match( /.+?(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [0,'0'])[1],
-			css_string = '' + 
-				'.jstree ul, .jstree li { display:block; margin:0 0 0 0; padding:0 0 0 0; list-style-type:none; } ' + 
-				'.jstree li { display:block; min-height:18px; line-height:18px; white-space:nowrap; margin-left:18px; min-width:18px; } ' + 
-				'.jstree-rtl li { margin-left:0; margin-right:18px; } ' + 
-				'.jstree > ul > li { margin-left:0px; } ' + 
-				'.jstree-rtl > ul > li { margin-right:0px; } ' + 
-				'.jstree ins { display:inline-block; text-decoration:none; width:18px; height:18px; margin:0 0 0 0; padding:0; } ' + 
-				'.jstree a { display:inline-block; line-height:16px; height:16px; color:black; white-space:nowrap; text-decoration:none; padding:1px 2px; margin:0; } ' + 
-				'.jstree a:focus { outline: none; } ' + 
-				'.jstree a > ins { height:16px; width:16px; } ' + 
-				'.jstree a > .jstree-icon { margin-right:3px; } ' + 
-				'.jstree-rtl a > .jstree-icon { margin-left:3px; margin-right:0; } ' + 
-				'li.jstree-open > ul { display:block; } ' + 
-				'li.jstree-closed > ul { display:none; } ';
-		// Correct IE 6 (does not support the > CSS selector)
-		if(/msie/.test(u) && parseInt(v, 10) == 6) { 
-			is_ie6 = true;
-
-			// fix image flicker and lack of caching
-			try {
-				document.execCommand("BackgroundImageCache", false, true);
-			} catch (err) { }
-
-			css_string += '' + 
-				'.jstree li { height:18px; margin-left:0; margin-right:0; } ' + 
-				'.jstree li li { margin-left:18px; } ' + 
-				'.jstree-rtl li li { margin-left:0px; margin-right:18px; } ' + 
-				'li.jstree-open ul { display:block; } ' + 
-				'li.jstree-closed ul { display:none !important; } ' + 
-				'.jstree li a { display:inline; border-width:0 !important; padding:0px 2px !important; } ' + 
-				'.jstree li a ins { height:16px; width:16px; margin-right:3px; } ' + 
-				'.jstree-rtl li a ins { margin-right:0px; margin-left:3px; } ';
-		}
-		// Correct IE 7 (shifts anchor nodes onhover)
-		if(/msie/.test(u) && parseInt(v, 10) == 7) { 
-			is_ie7 = true;
-			css_string += '.jstree li a { border-width:0 !important; padding:0px 2px !important; } ';
-		}
-		// correct ff2 lack of display:inline-block
-		if(!/compatible/.test(u) && /mozilla/.test(u) && parseFloat(v, 10) < 1.9) {
-			is_ff2 = true;
-			css_string += '' + 
-				'.jstree ins { display:-moz-inline-box; } ' + 
-				'.jstree li { line-height:12px; } ' + // WHY??
-				'.jstree a { display:-moz-inline-box; } ' + 
-				'.jstree .jstree-no-icons .jstree-checkbox { display:-moz-inline-stack !important; } ';
-				/* this shouldn't be here as it is theme specific */
-		}
-		// the default stylesheet
-		$.vakata.css.add_sheet({ str : css_string, title : "jstree" });
-	});
-
-	// core functions (open, close, create, update, delete)
-	$.jstree.plugin("core", {
-		__init : function () {
-			this.data.core.locked = false;
-			this.data.core.to_open = this.get_settings().core.initially_open;
-			this.data.core.to_load = this.get_settings().core.initially_load;
-		},
-		defaults : { 
-			html_titles	: false,
-			animation	: 500,
-			initially_open : [],
-			initially_load : [],
-			open_parents : true,
-			notify_plugins : true,
-			rtl			: false,
-			load_open	: false,
-			strings		: {
-				loading		: "Loading ...",
-				new_node	: "New node",
-				multiple_selection : "Multiple selection"
-			}
-		},
-		_fn : { 
-			init	: function () { 
-				this.set_focus(); 
-				if(this._get_settings().core.rtl) {
-					this.get_container().addClass("jstree-rtl").css("direction", "rtl");
-				}
-				this.get_container().html("<ul><li class='jstree-last jstree-leaf'><ins>&#160;</ins><a class='jstree-loading' href='#'><ins class='jstree-icon'>&#160;</ins>" + this._get_string("loading") + "</a></li></ul>");
-				this.data.core.li_height = this.get_container_ul().find("li.jstree-closed, li.jstree-leaf").eq(0).height() || 18;
-
-				this.get_container()
-					.delegate("li > ins", "click.jstree", $.proxy(function (event) {
-							var trgt = $(event.target);
-							// if(trgt.is("ins") && event.pageY - trgt.offset().top < this.data.core.li_height) { this.toggle_node(trgt); }
-							this.toggle_node(trgt);
-						}, this))
-					.bind("mousedown.jstree", $.proxy(function () { 
-							this.set_focus(); // This used to be setTimeout(set_focus,0) - why?
-						}, this))
-					.bind("dblclick.jstree", function (event) { 
-						var sel;
-						if(document.selection && document.selection.empty) { document.selection.empty(); }
-						else {
-							if(window.getSelection) {
-								sel = window.getSelection();
-								try { 
-									sel.removeAllRanges();
-									sel.collapse();
-								} catch (err) { }
-							}
-						}
-					});
-				if(this._get_settings().core.notify_plugins) {
-					this.get_container()
-						.bind("load_node.jstree", $.proxy(function (e, data) { 
-								var o = this._get_node(data.rslt.obj),
-									t = this;
-								if(o === -1) { o = this.get_container_ul(); }
-								if(!o.length) { return; }
-								o.find("li").each(function () {
-									var th = $(this);
-									if(th.data("jstree")) {
-										$.each(th.data("jstree"), function (plugin, values) {
-											if(t.data[plugin] && $.isFunction(t["_" + plugin + "_notify"])) {
-												t["_" + plugin + "_notify"].call(t, th, values);
-											}
-										});
-									}
-								});
-							}, this));
-				}
-				if(this._get_settings().core.load_open) {
-					this.get_container()
-						.bind("load_node.jstree", $.proxy(function (e, data) { 
-								var o = this._get_node(data.rslt.obj),
-									t = this;
-								if(o === -1) { o = this.get_container_ul(); }
-								if(!o.length) { return; }
-								o.find("li.jstree-open:not(:has(ul))").each(function () {
-									t.load_node(this, $.noop, $.noop);
-								});
-							}, this));
-				}
-				this.__callback();
-				this.load_node(-1, function () { this.loaded(); this.reload_nodes(); });
-			},
-			destroy	: function () { 
-				var i,
-					n = this.get_index(),
-					s = this._get_settings(),
-					_this = this;
-
-				$.each(s.plugins, function (i, val) {
-					try { plugins[val].__destroy.apply(_this); } catch(err) { }
-				});
-				this.__callback();
-				// set focus to another instance if this one is focused
-				if(this.is_focused()) { 
-					for(i in instances) { 
-						if(instances.hasOwnProperty(i) && i != n) { 
-							instances[i].set_focus(); 
-							break; 
-						} 
-					}
-				}
-				// if no other instance found
-				if(n === focused_instance) { focused_instance = -1; }
-				// remove all traces of jstree in the DOM (only the ones set using jstree*) and cleans all events
-				this.get_container()
-					.unbind(".jstree")
-					.undelegate(".jstree")
-					.removeData("jstree_instance_id")
-					.find("[class^='jstree']")
-						.addBack()
-						.attr("class", function () { return this.className.replace(/jstree[^ ]*|$/ig,''); });
-				$(document)
-					.unbind(".jstree-" + n)
-					.undelegate(".jstree-" + n);
-				// remove the actual data
-				instances[n] = null;
-				delete instances[n];
-			},
-
-			_core_notify : function (n, data) {
-				if(data.opened) {
-					this.open_node(n, false, true);
-				}
-			},
-
-			lock : function () {
-				this.data.core.locked = true;
-				this.get_container().children("ul").addClass("jstree-locked").css("opacity","0.7");
-				this.__callback({});
-			},
-			unlock : function () {
-				this.data.core.locked = false;
-				this.get_container().children("ul").removeClass("jstree-locked").css("opacity","1");
-				this.__callback({});
-			},
-			is_locked : function () { return this.data.core.locked; },
-			save_opened : function () {
-				var _this = this;
-				this.data.core.to_open = [];
-				this.get_container_ul().find("li.jstree-open").each(function () { 
-					if(this.id) { _this.data.core.to_open.push("#" + this.id.toString().replace(/^#/,"").replace(/\\\//g,"/").replace(/\//g,"\\\/").replace(/\\\./g,".").replace(/\./g,"\\.").replace(/\:/g,"\\:")); }
-				});
-				this.__callback(_this.data.core.to_open);
-			},
-			save_loaded : function () { },
-			reload_nodes : function (is_callback) {
-				var _this = this,
-					done = true,
-					current = [],
-					remaining = [];
-				if(!is_callback) { 
-					this.data.core.reopen = false; 
-					this.data.core.refreshing = true; 
-					this.data.core.to_open = $.map($.makeArray(this.data.core.to_open), function (n) { return "#" + n.toString().replace(/^#/,"").replace(/\\\//g,"/").replace(/\//g,"\\\/").replace(/\\\./g,".").replace(/\./g,"\\.").replace(/\:/g,"\\:"); });
-					this.data.core.to_load = $.map($.makeArray(this.data.core.to_load), function (n) { return "#" + n.toString().replace(/^#/,"").replace(/\\\//g,"/").replace(/\//g,"\\\/").replace(/\\\./g,".").replace(/\./g,"\\.").replace(/\:/g,"\\:"); });
-					if(this.data.core.to_open.length) {
-						this.data.core.to_load = this.data.core.to_load.concat(this.data.core.to_open);
-					}
-				}
-				if(this.data.core.to_load.length) {
-					$.each(this.data.core.to_load, function (i, val) {
-						if(val == "#") { return true; }
-						if($(val).length) { current.push(val); }
-						else { remaining.push(val); }
-					});
-					if(current.length) {
-						this.data.core.to_load = remaining;
-						$.each(current, function (i, val) { 
-							if(!_this._is_loaded(val)) {
-								_this.load_node(val, function () { _this.reload_nodes(true); }, function () { _this.reload_nodes(true); });
-								done = false;
-							}
-						});
-					}
-				}
-				if(this.data.core.to_open.length) {
-					$.each(this.data.core.to_open, function (i, val) {
-						_this.open_node(val, false, true); 
-					});
-				}
-				if(done) { 
-					// TODO: find a more elegant approach to syncronizing returning requests
-					if(this.data.core.reopen) { clearTimeout(this.data.core.reopen); }
-					this.data.core.reopen = setTimeout(function () { _this.__callback({}, _this); }, 50);
-					this.data.core.refreshing = false;
-					this.reopen();
-				}
-			},
-			reopen : function () {
-				var _this = this;
-				if(this.data.core.to_open.length) {
-					$.each(this.data.core.to_open, function (i, val) {
-						_this.open_node(val, false, true); 
-					});
-				}
-				this.__callback({});
-			},
-			refresh : function (obj) {
-				var _this = this;
-				this.save_opened();
-				if(!obj) { obj = -1; }
-				obj = this._get_node(obj);
-				if(!obj) { obj = -1; }
-				if(obj !== -1) { obj.children("UL").remove(); }
-				else { this.get_container_ul().empty(); }
-				this.load_node(obj, function () { _this.__callback({ "obj" : obj}); _this.reload_nodes(); });
-			},
-			// Dummy function to fire after the first load (so that there is a jstree.loaded event)
-			loaded	: function () { 
-				this.__callback(); 
-			},
-			// deal with focus
-			set_focus	: function () { 
-				if(this.is_focused()) { return; }
-				var f = $.jstree._focused();
-				if(f) { f.unset_focus(); }
-
-				this.get_container().addClass("jstree-focused"); 
-				focused_instance = this.get_index(); 
-				this.__callback();
-			},
-			is_focused	: function () { 
-				return focused_instance == this.get_index(); 
-			},
-			unset_focus	: function () {
-				if(this.is_focused()) {
-					this.get_container().removeClass("jstree-focused"); 
-					focused_instance = -1; 
-				}
-				this.__callback();
-			},
-
-			// traverse
-			_get_node		: function (obj) { 
-				var $obj = $(obj, this.get_container()); 
-				if($obj.is(".jstree") || obj == -1) { return -1; } 
-				$obj = $obj.closest("li", this.get_container()); 
-				return $obj.length ? $obj : false; 
-			},
-			_get_next		: function (obj, strict) {
-				obj = this._get_node(obj);
-				if(obj === -1) { return this.get_container().find("> ul > li:first-child"); }
-				if(!obj.length) { return false; }
-				if(strict) { return (obj.nextAll("li").size() > 0) ? obj.nextAll("li:eq(0)") : false; }
-
-				if(obj.hasClass("jstree-open")) { return obj.find("li:eq(0)"); }
-				else if(obj.nextAll("li").size() > 0) { return obj.nextAll("li:eq(0)"); }
-				else { return obj.parentsUntil(".jstree","li").next("li").eq(0); }
-			},
-			_get_prev		: function (obj, strict) {
-				obj = this._get_node(obj);
-				if(obj === -1) { return this.get_container().find("> ul > li:last-child"); }
-				if(!obj.length) { return false; }
-				if(strict) { return (obj.prevAll("li").length > 0) ? obj.prevAll("li:eq(0)") : false; }
-
-				if(obj.prev("li").length) {
-					obj = obj.prev("li").eq(0);
-					while(obj.hasClass("jstree-open")) { obj = obj.children("ul:eq(0)").children("li:last"); }
-					return obj;
-				}
-				else { var o = obj.parentsUntil(".jstree","li:eq(0)"); return o.length ? o : false; }
-			},
-			_get_parent		: function (obj) {
-				obj = this._get_node(obj);
-				if(obj == -1 || !obj.length) { return false; }
-				var o = obj.parentsUntil(".jstree", "li:eq(0)");
-				return o.length ? o : -1;
-			},
-			_get_children	: function (obj) {
-				obj = this._get_node(obj);
-				if(obj === -1) { return this.get_container().children("ul:eq(0)").children("li"); }
-				if(!obj.length) { return false; }
-				return obj.children("ul:eq(0)").children("li");
-			},
-			get_path		: function (obj, id_mode) {
-				var p = [],
-					_this = this;
-				obj = this._get_node(obj);
-				if(obj === -1 || !obj || !obj.length) { return false; }
-				obj.parentsUntil(".jstree", "li").each(function () {
-					p.push( id_mode ? this.id : _this.get_text(this) );
-				});
-				p.reverse();
-				p.push( id_mode ? obj.attr("id") : this.get_text(obj) );
-				return p;
-			},
-
-			// string functions
-			_get_string : function (key) {
-				return this._get_settings().core.strings[key] || key;
-			},
-
-			is_open		: function (obj) { obj = this._get_node(obj); return obj && obj !== -1 && obj.hasClass("jstree-open"); },
-			is_closed	: function (obj) { obj = this._get_node(obj); return obj && obj !== -1 && obj.hasClass("jstree-closed"); },
-			is_leaf		: function (obj) { obj = this._get_node(obj); return obj && obj !== -1 && obj.hasClass("jstree-leaf"); },
-			correct_state	: function (obj) {
-				obj = this._get_node(obj);
-				if(!obj || obj === -1) { return false; }
-				obj.removeClass("jstree-closed jstree-open").addClass("jstree-leaf").children("ul").remove();
-				this.__callback({ "obj" : obj });
-			},
-			// open/close
-			open_node	: function (obj, callback, skip_animation) {
-				obj = this._get_node(obj);
-				if(!obj.length) { return false; }
-				if(!obj.hasClass("jstree-closed")) { if(callback) { callback.call(); } return false; }
-				var s = skip_animation || is_ie6 ? 0 : this._get_settings().core.animation,
-					t = this;
-				if(!this._is_loaded(obj)) {
-					obj.children("a").addClass("jstree-loading");
-					this.load_node(obj, function () { t.open_node(obj, callback, skip_animation); }, callback);
-				}
-				else {
-					if(this._get_settings().core.open_parents) {
-						obj.parentsUntil(".jstree",".jstree-closed").each(function () {
-							t.open_node(this, false, true);
-						});
-					}
-					if(s) { obj.children("ul").css("display","none"); }
-					obj.removeClass("jstree-closed").addClass("jstree-open").children("a").removeClass("jstree-loading");
-					if(s) { obj.children("ul").stop(true, true).slideDown(s, function () { this.style.display = ""; t.after_open(obj); }); }
-					else { t.after_open(obj); }
-					this.__callback({ "obj" : obj });
-					if(callback) { callback.call(); }
-				}
-			},
-			after_open	: function (obj) { this.__callback({ "obj" : obj }); },
-			close_node	: function (obj, skip_animation) {
-				obj = this._get_node(obj);
-				var s = skip_animation || is_ie6 ? 0 : this._get_settings().core.animation,
-					t = this;
-				if(!obj.length || !obj.hasClass("jstree-open")) { return false; }
-				if(s) { obj.children("ul").attr("style","display:block !important"); }
-				obj.removeClass("jstree-open").addClass("jstree-closed");
-				if(s) { obj.children("ul").stop(true, true).slideUp(s, function () { this.style.display = ""; t.after_close(obj); }); }
-				else { t.after_close(obj); }
-				this.__callback({ "obj" : obj });
-			},
-			after_close	: function (obj) { this.__callback({ "obj" : obj }); },
-			toggle_node	: function (obj) {
-				obj = this._get_node(obj);
-				if(obj.hasClass("jstree-closed")) { return this.open_node(obj); }
-				if(obj.hasClass("jstree-open")) { return this.close_node(obj); }
-			},
-			open_all	: function (obj, do_animation, original_obj) {
-				obj = obj ? this._get_node(obj) : -1;
-				if(!obj || obj === -1) { obj = this.get_container_ul(); }
-				if(original_obj) { 
-					obj = obj.find("li.jstree-closed");
-				}
-				else {
-					original_obj = obj;
-					if(obj.is(".jstree-closed")) { obj = obj.find("li.jstree-closed").addBack(); }
-					else { obj = obj.find("li.jstree-closed"); }
-				}
-				var _this = this;
-				obj.each(function () { 
-					var __this = this; 
-					if(!_this._is_loaded(this)) { _this.open_node(this, function() { _this.open_all(__this, do_animation, original_obj); }, !do_animation); }
-					else { _this.open_node(this, false, !do_animation); }
-				});
-				// so that callback is fired AFTER all nodes are open
-				if(original_obj.find('li.jstree-closed').length === 0) { this.__callback({ "obj" : original_obj }); }
-			},
-			close_all	: function (obj, do_animation) {
-				var _this = this;
-				obj = obj ? this._get_node(obj) : this.get_container();
-				if(!obj || obj === -1) { obj = this.get_container_ul(); }
-				obj.find("li.jstree-open").addBack().each(function () { _this.close_node(this, !do_animation); });
-				this.__callback({ "obj" : obj });
-			},
-			clean_node	: function (obj) {
-				obj = obj && obj != -1 ? $(obj) : this.get_container_ul();
-				obj = obj.is("li") ? obj.find("li").addBack() : obj.find("li");
-				obj.removeClass("jstree-last")
-					.filter("li:last-child").addClass("jstree-last").end()
-					.filter(":has(li)")
-						.not(".jstree-open").removeClass("jstree-leaf").addClass("jstree-closed");
-				obj.not(".jstree-open, .jstree-closed").addClass("jstree-leaf").children("ul").remove();
-				this.__callback({ "obj" : obj });
-			},
-			// rollback
-			get_rollback : function () { 
-				this.__callback();
-				return { i : this.get_index(), h : this.get_container().children("ul").clone(true), d : this.data }; 
-			},
-			set_rollback : function (html, data) {
-				this.get_container().empty().append(html);
-				this.data = data;
-				this.__callback();
-			},
-			// Dummy functions to be overwritten by any datastore plugin included
-			load_node	: function (obj, s_call, e_call) { this.__callback({ "obj" : obj }); },
-			_is_loaded	: function (obj) { return true; },
-
-			// Basic operations: create
-			create_node	: function (obj, position, js, callback, is_loaded) {
-				obj = this._get_node(obj);
-				position = typeof position === "undefined" ? "last" : position;
-				var d = $("<li />"),
-					s = this._get_settings().core,
-					tmp;
-
-				if(obj !== -1 && !obj.length) { return false; }
-				if(!is_loaded && !this._is_loaded(obj)) { this.load_node(obj, function () { this.create_node(obj, position, js, callback, true); }); return false; }
-
-				this.__rollback();
-
-				if(typeof js === "string") { js = { "data" : js }; }
-				if(!js) { js = {}; }
-				if(js.attr) { d.attr(js.attr); }
-				if(js.metadata) { d.data(js.metadata); }
-				if(js.state) { d.addClass("jstree-" + js.state); }
-				if(!js.data) { js.data = this._get_string("new_node"); }
-				if(!$.isArray(js.data)) { tmp = js.data; js.data = []; js.data.push(tmp); }
-				$.each(js.data, function (i, m) {
-					tmp = $("<a />");
-					if($.isFunction(m)) { m = m.call(this, js); }
-					if(typeof m == "string") { tmp.attr('href','#')[ s.html_titles ? "html" : "text" ](m); }
-					else {
-						if(!m.attr) { m.attr = {}; }
-						if(!m.attr.href) { m.attr.href = '#'; }
-						tmp.attr(m.attr)[ s.html_titles ? "html" : "text" ](m.title);
-						if(m.language) { tmp.addClass(m.language); }
-					}
-					tmp.prepend("<ins class='jstree-icon'>&#160;</ins>");
-					if(!m.icon && js.icon) { m.icon = js.icon; }
-					if(m.icon) { 
-						if(m.icon.indexOf("/") === -1) { tmp.children("ins").addClass(m.icon); }
-						else { tmp.children("ins").css("background","url('" + m.icon + "') center center no-repeat"); }
-					}
-					d.append(tmp);
-				});
-				d.prepend("<ins class='jstree-icon'>&#160;</ins>");
-				if(obj === -1) {
-					obj = this.get_container();
-					if(position === "before") { position = "first"; }
-					if(position === "after") { position = "last"; }
-				}
-				switch(position) {
-					case "before": obj.before(d); tmp = this._get_parent(obj); break;
-					case "after" : obj.after(d);  tmp = this._get_parent(obj); break;
-					case "inside":
-					case "first" :
-						if(!obj.children("ul").length) { obj.append("<ul />"); }
-						obj.children("ul").prepend(d);
-						tmp = obj;
-						break;
-					case "last":
-						if(!obj.children("ul").length) { obj.append("<ul />"); }
-						obj.children("ul").append(d);
-						tmp = obj;
-						break;
-					default:
-						if(!obj.children("ul").length) { obj.append("<ul />"); }
-						if(!position) { position = 0; }
-						tmp = obj.children("ul").children("li").eq(position);
-						if(tmp.length) { tmp.before(d); }
-						else { obj.children("ul").append(d); }
-						tmp = obj;
-						break;
-				}
-				if(tmp === -1 || tmp.get(0) === this.get_container().get(0)) { tmp = -1; }
-				this.clean_node(tmp);
-				this.__callback({ "obj" : d, "parent" : tmp });
-				if(callback) { callback.call(this, d); }
-				return d;
-			},
-			// Basic operations: rename (deal with text)
-			get_text	: function (obj) {
-				obj = this._get_node(obj);
-				if(!obj.length) { return false; }
-				var s = this._get_settings().core.html_titles;
-				obj = obj.children("a:eq(0)");
-				if(s) {
-					obj = obj.clone();
-					obj.children("INS").remove();
-					return obj.html();
-				}
-				else {
-					obj = obj.contents().filter(function() { return this.nodeType == 3; })[0];
-					return obj.nodeValue;
-				}
-			},
-			set_text	: function (obj, val) {
-				obj = this._get_node(obj);
-				if(!obj.length) { return false; }
-				obj = obj.children("a:eq(0)");
-				if(this._get_settings().core.html_titles) {
-					var tmp = obj.children("INS").clone();
-					obj.html(val).prepend(tmp);
-					this.__callback({ "obj" : obj, "name" : val });
-					return true;
-				}
-				else {
-					obj = obj.contents().filter(function() { return this.nodeType == 3; })[0];
-					this.__callback({ "obj" : obj, "name" : val });
-					return (obj.nodeValue = val);
-				}
-			},
-			rename_node : function (obj, val) {
-				obj = this._get_node(obj);
-				this.__rollback();
-				if(obj && obj.length && this.set_text.apply(this, Array.prototype.slice.call(arguments))) { this.__callback({ "obj" : obj, "name" : val }); }
-			},
-			// Basic operations: deleting nodes
-			delete_node : function (obj) {
-				obj = this._get_node(obj);
-				if(!obj.length) { return false; }
-				this.__rollback();
-				var p = this._get_parent(obj), prev = $([]), t = this;
-				obj.each(function () {
-					prev = prev.add(t._get_prev(this));
-				});
-				obj = obj.detach();
-				if(p !== -1 && p.find("> ul > li").length === 0) {
-					p.removeClass("jstree-open jstree-closed").addClass("jstree-leaf");
-				}
-				this.clean_node(p);
-				this.__callback({ "obj" : obj, "prev" : prev, "parent" : p });
-				return obj;
-			},
-			prepare_move : function (o, r, pos, cb, is_cb) {
-				var p = {};
-
-				p.ot = $.jstree._reference(o) || this;
-				p.o = p.ot._get_node(o);
-				p.r = r === - 1 ? -1 : this._get_node(r);
-				p.p = (typeof pos === "undefined" || pos === false) ? "last" : pos; // TODO: move to a setting
-				if(!is_cb && prepared_move.o && prepared_move.o[0] === p.o[0] && prepared_move.r[0] === p.r[0] && prepared_move.p === p.p) {
-					this.__callback(prepared_move);
-					if(cb) { cb.call(this, prepared_move); }
-					return;
-				}
-				p.ot = $.jstree._reference(p.o) || this;
-				p.rt = $.jstree._reference(p.r) || this; // r === -1 ? p.ot : $.jstree._reference(p.r) || this
-				if(p.r === -1 || !p.r) {
-					p.cr = -1;
-					switch(p.p) {
-						case "first":
-						case "before":
-						case "inside":
-							p.cp = 0; 
-							break;
-						case "after":
-						case "last":
-							p.cp = p.rt.get_container().find(" > ul > li").length; 
-							break;
-						default:
-							p.cp = p.p;
-							break;
-					}
-				}
-				else {
-					if(!/^(before|after)$/.test(p.p) && !this._is_loaded(p.r)) {
-						return this.load_node(p.r, function () { this.prepare_move(o, r, pos, cb, true); });
-					}
-					switch(p.p) {
-						case "before":
-							p.cp = p.r.index();
-							p.cr = p.rt._get_parent(p.r);
-							break;
-						case "after":
-							p.cp = p.r.index() + 1;
-							p.cr = p.rt._get_parent(p.r);
-							break;
-						case "inside":
-						case "first":
-							p.cp = 0;
-							p.cr = p.r;
-							break;
-						case "last":
-							p.cp = p.r.find(" > ul > li").length; 
-							p.cr = p.r;
-							break;
-						default: 
-							p.cp = p.p;
-							p.cr = p.r;
-							break;
-					}
-				}
-				p.np = p.cr == -1 ? p.rt.get_container() : p.cr;
-				p.op = p.ot._get_parent(p.o);
-				p.cop = p.o.index();
-				if(p.op === -1) { p.op = p.ot ? p.ot.get_container() : this.get_container(); }
-				if(!/^(before|after)$/.test(p.p) && p.op && p.np && p.op[0] === p.np[0] && p.o.index() < p.cp) { p.cp++; }
-				//if(p.p === "before" && p.op && p.np && p.op[0] === p.np[0] && p.o.index() < p.cp) { p.cp--; }
-				p.or = p.np.find(" > ul > li:nth-child(" + (p.cp + 1) + ")");
-				prepared_move = p;
-				this.__callback(prepared_move);
-				if(cb) { cb.call(this, prepared_move); }
-			},
-			check_move : function () {
-				var obj = prepared_move, ret = true, r = obj.r === -1 ? this.get_container() : obj.r;
-				if(!obj || !obj.o || obj.or[0] === obj.o[0]) { return false; }
-				if(!obj.cy) {
-					if(obj.op && obj.np && obj.op[0] === obj.np[0] && obj.cp - 1 === obj.o.index()) { return false; }
-					obj.o.each(function () { 
-						if(r.parentsUntil(".jstree", "li").addBack().index(this) !== -1) { ret = false; return false; }
-					});
-				}
-				return ret;
-			},
-			move_node : function (obj, ref, position, is_copy, is_prepared, skip_check) {
-				if(!is_prepared) { 
-					return this.prepare_move(obj, ref, position, function (p) {
-						this.move_node(p, false, false, is_copy, true, skip_check);
-					});
-				}
-				if(is_copy) { 
-					prepared_move.cy = true;
-				}
-				if(!skip_check && !this.check_move()) { return false; }
-
-				this.__rollback();
-				var o = false;
-				if(is_copy) {
-					o = obj.o.clone(true);
-					o.find("*[id]").addBack().each(function () {
-						if(this.id) { this.id = "copy_" + this.id; }
-					});
-				}
-				else { o = obj.o; }
-
-				if(obj.or.length) { obj.or.before(o); }
-				else { 
-					if(!obj.np.children("ul").length) { $("<ul />").appendTo(obj.np); }
-					obj.np.children("ul:eq(0)").append(o); 
-				}
-
-				try { 
-					obj.ot.clean_node(obj.op);
-					obj.rt.clean_node(obj.np);
-					if(!obj.op.find("> ul > li").length) {
-						obj.op.removeClass("jstree-open jstree-closed").addClass("jstree-leaf").children("ul").remove();
-					}
-				} catch (e) { }
-
-				if(is_copy) { 
-					prepared_move.cy = true;
-					prepared_move.oc = o; 
-				}
-				this.__callback(prepared_move);
-				return prepared_move;
-			},
-			_get_move : function () { return prepared_move; }
-		}
-	});
-})(jQuery);
-//*/
-
-/* 
- * jsTree ui plugin
- * This plugins handles selecting/deselecting/hovering/dehovering nodes
- */
-(function ($) {
-	var scrollbar_width, e1, e2;
-	$(function() {
-		if (/msie/.test(navigator.userAgent.toLowerCase())) {
-			e1 = $('<textarea cols="10" rows="2"></textarea>').css({ position: 'absolute', top: -1000, left: 0 }).appendTo('body');
-			e2 = $('<textarea cols="10" rows="2" style="overflow: hidden;"></textarea>').css({ position: 'absolute', top: -1000, left: 0 }).appendTo('body');
-			scrollbar_width = e1.width() - e2.width();
-			e1.add(e2).remove();
-		} 
-		else {
-			e1 = $('<div />').css({ width: 100, height: 100, overflow: 'auto', position: 'absolute', top: -1000, left: 0 })
-					.prependTo('body').append('<div />').find('div').css({ width: '100%', height: 200 });
-			scrollbar_width = 100 - e1.width();
-			e1.parent().remove();
-		}
-	});
-	$.jstree.plugin("ui", {
-		__init : function () { 
-			this.data.ui.selected = $(); 
-			this.data.ui.last_selected = false; 
-			this.data.ui.hovered = null;
-			this.data.ui.to_select = this.get_settings().ui.initially_select;
-
-			this.get_container()
-				.delegate("a", "click.jstree", $.proxy(function (event) {
-						event.preventDefault();
-						event.currentTarget.blur();
-						if(!$(event.currentTarget).hasClass("jstree-loading")) {
-							this.select_node(event.currentTarget, true, event);
-						}
-					}, this))
-				.delegate("a", "mouseenter.jstree", $.proxy(function (event) {
-						if(!$(event.currentTarget).hasClass("jstree-loading")) {
-							this.hover_node(event.target);
-						}
-					}, this))
-				.delegate("a", "mouseleave.jstree", $.proxy(function (event) {
-						if(!$(event.currentTarget).hasClass("jstree-loading")) {
-							this.dehover_node(event.target);
-						}
-					}, this))
-				.bind("reopen.jstree", $.proxy(function () { 
-						this.reselect();
-					}, this))
-				.bind("get_rollback.jstree", $.proxy(function () { 
-						this.dehover_node();
-						this.save_selected();
-					}, this))
-				.bind("set_rollback.jstree", $.proxy(function () { 
-						this.reselect();
-					}, this))
-				.bind("close_node.jstree", $.proxy(function (event, data) { 
-						var s = this._get_settings().ui,
-							obj = this._get_node(data.rslt.obj),
-							clk = (obj && obj.length) ? obj.children("ul").find("a.jstree-clicked") : $(),
-							_this = this;
-						if(s.selected_parent_close === false || !clk.length) { return; }
-						clk.each(function () { 
-							_this.deselect_node(this);
-							if(s.selected_parent_close === "select_parent") { _this.select_node(obj); }
-						});
-					}, this))
-				.bind("delete_node.jstree", $.proxy(function (event, data) { 
-						var s = this._get_settings().ui.select_prev_on_delete,
-							obj = this._get_node(data.rslt.obj),
-							clk = (obj && obj.length) ? obj.find("a.jstree-clicked") : [],
-							_this = this;
-						clk.each(function () { _this.deselect_node(this); });
-						if(s && clk.length) { 
-							data.rslt.prev.each(function () { 
-								if(this.parentNode) { _this.select_node(this); return false; /* if return false is removed all prev nodes will be selected */}
-							});
-						}
-					}, this))
-				.bind("move_node.jstree", $.proxy(function (event, data) { 
-						if(data.rslt.cy) { 
-							data.rslt.oc.find("a.jstree-clicked").removeClass("jstree-clicked");
-						}
-					}, this));
-		},
-		defaults : {
-			select_limit : -1, // 0, 1, 2 ... or -1 for unlimited
-			select_multiple_modifier : "ctrl", // on, or ctrl, shift, alt
-			select_range_modifier : "shift",
-			selected_parent_close : "select_parent", // false, "deselect", "select_parent"
-			selected_parent_open : true,
-			select_prev_on_delete : true,
-			disable_selecting_children : false,
-			initially_select : []
-		},
-		_fn : { 
-			_get_node : function (obj, allow_multiple) {
-				if(typeof obj === "undefined" || obj === null) { return allow_multiple ? this.data.ui.selected : this.data.ui.last_selected; }
-				var $obj = $(obj, this.get_container()); 
-				if($obj.is(".jstree") || obj == -1) { return -1; } 
-				$obj = $obj.closest("li", this.get_container()); 
-				return $obj.length ? $obj : false; 
-			},
-			_ui_notify : function (n, data) {
-				if(data.selected) {
-					this.select_node(n, false);
-				}
-			},
-			save_selected : function () {
-				var _this = this;
-				this.data.ui.to_select = [];
-				this.data.ui.selected.each(function () { if(this.id) { _this.data.ui.to_select.push("#" + this.id.toString().replace(/^#/,"").replace(/\\\//g,"/").replace(/\//g,"\\\/").replace(/\\\./g,".").replace(/\./g,"\\.").replace(/\:/g,"\\:")); } });
-				this.__callback(this.data.ui.to_select);
-			},
-			reselect : function () {
-				var _this = this,
-					s = this.data.ui.to_select;
-				s = $.map($.makeArray(s), function (n) { return "#" + n.toString().replace(/^#/,"").replace(/\\\//g,"/").replace(/\//g,"\\\/").replace(/\\\./g,".").replace(/\./g,"\\.").replace(/\:/g,"\\:"); });
-				// this.deselect_all(); WHY deselect, breaks plugin state notifier?
-				$.each(s, function (i, val) { if(val && val !== "#") { _this.select_node(val); } });
-				this.data.ui.selected = this.data.ui.selected.filter(function () { return this.parentNode; });
-				this.__callback();
-			},
-			refresh : function (obj) {
-				this.save_selected();
-				return this.__call_old();
-			},
-			hover_node : function (obj) {
-				obj = this._get_node(obj);
-				if(!obj.length) { return false; }
-				//if(this.data.ui.hovered && obj.get(0) === this.data.ui.hovered.get(0)) { return; }
-				if(!obj.hasClass("jstree-hovered")) { this.dehover_node(); }
-				this.data.ui.hovered = obj.children("a").addClass("jstree-hovered").parent();
-				this._fix_scroll(obj);
-				this.__callback({ "obj" : obj });
-			},
-			dehover_node : function () {
-				var obj = this.data.ui.hovered, p;
-				if(!obj || !obj.length) { return false; }
-				p = obj.children("a").removeClass("jstree-hovered").parent();
-				if(this.data.ui.hovered[0] === p[0]) { this.data.ui.hovered = null; }
-				this.__callback({ "obj" : obj });
-			},
-			select_node : function (obj, check, e) {
-				obj = this._get_node(obj);
-				if(obj == -1 || !obj || !obj.length) { return false; }
-				var s = this._get_settings().ui,
-					is_multiple = (s.select_multiple_modifier == "on" || (s.select_multiple_modifier !== false && e && e[s.select_multiple_modifier + "Key"])),
-					is_range = (s.select_range_modifier !== false && e && e[s.select_range_modifier + "Key"] && this.data.ui.last_selected && this.data.ui.last_selected[0] !== obj[0] && this.data.ui.last_selected.parent()[0] === obj.parent()[0]),
-					is_selected = this.is_selected(obj),
-					proceed = true,
-					t = this;
-				if(check) {
-					if(s.disable_selecting_children && is_multiple && 
-						(
-							(obj.parentsUntil(".jstree","li").children("a.jstree-clicked").length) ||
-							(obj.children("ul").find("a.jstree-clicked:eq(0)").length)
-						)
-					) {
-						return false;
-					}
-					proceed = false;
-					switch(!0) {
-						case (is_range):
-							this.data.ui.last_selected.addClass("jstree-last-selected");
-							obj = obj[ obj.index() < this.data.ui.last_selected.index() ? "nextUntil" : "prevUntil" ](".jstree-last-selected").addBack();
-							if(s.select_limit == -1 || obj.length < s.select_limit) {
-								this.data.ui.last_selected.removeClass("jstree-last-selected");
-								this.data.ui.selected.each(function () {
-									if(this !== t.data.ui.last_selected[0]) { t.deselect_node(this); }
-								});
-								is_selected = false;
-								proceed = true;
-							}
-							else {
-								proceed = false;
-							}
-							break;
-						case (is_selected && !is_multiple): 
-							this.deselect_all();
-							is_selected = false;
-							proceed = true;
-							break;
-						case (!is_selected && !is_multiple): 
-							if(s.select_limit == -1 || s.select_limit > 0) {
-								this.deselect_all();
-								proceed = true;
-							}
-							break;
-						case (is_selected && is_multiple): 
-							this.deselect_node(obj);
-							break;
-						case (!is_selected && is_multiple): 
-							if(s.select_limit == -1 || this.data.ui.selected.length + 1 <= s.select_limit) { 
-								proceed = true;
-							}
-							break;
-					}
-				}
-				if(proceed && !is_selected) {
-					if(!is_range) { this.data.ui.last_selected = obj; }
-					obj.children("a").addClass("jstree-clicked");
-					if(s.selected_parent_open) {
-						obj.parents(".jstree-closed").each(function () { t.open_node(this, false, true); });
-					}
-					this.data.ui.selected = this.data.ui.selected.add(obj);
-					this._fix_scroll(obj.eq(0));
-					this.__callback({ "obj" : obj, "e" : e });
-				}
-			},
-			_fix_scroll : function (obj) {
-				var c = this.get_container()[0], t;
-				if(c.scrollHeight > c.offsetHeight) {
-					obj = this._get_node(obj);
-					if(!obj || obj === -1 || !obj.length || !obj.is(":visible")) { return; }
-					t = obj.offset().top - this.get_container().offset().top;
-					if(t < 0) { 
-						c.scrollTop = c.scrollTop + t - 1; 
-					}
-					if(t + this.data.core.li_height + (c.scrollWidth > c.offsetWidth ? scrollbar_width : 0) > c.offsetHeight) { 
-						c.scrollTop = c.scrollTop + (t - c.offsetHeight + this.data.core.li_height + 1 + (c.scrollWidth > c.offsetWidth ? scrollbar_width : 0)); 
-					}
-				}
-			},
-			deselect_node : function (obj) {
-				obj = this._get_node(obj);
-				if(!obj.length) { return false; }
-				if(this.is_selected(obj)) {
-					obj.children("a").removeClass("jstree-clicked");
-					this.data.ui.selected = this.data.ui.selected.not(obj);
-					if(this.data.ui.last_selected.get(0) === obj.get(0)) { this.data.ui.last_selected = this.data.ui.selected.eq(0); }
-					this.__callback({ "obj" : obj });
-				}
-			},
-			toggle_select : function (obj) {
-				obj = this._get_node(obj);
-				if(!obj.length) { return false; }
-				if(this.is_selected(obj)) { this.deselect_node(obj); }
-				else { this.select_node(obj); }
-			},
-			is_selected : function (obj) { return this.data.ui.selected.index(this._get_node(obj)) >= 0; },
-			get_selected : function (context) { 
-				return context ? $(context).find("a.jstree-clicked").parent() : this.data.ui.selected; 
-			},
-			deselect_all : function (context) {
-				var ret = context ? $(context).find("a.jstree-clicked").parent() : this.get_container().find("a.jstree-clicked").parent();
-				ret.children("a.jstree-clicked").removeClass("jstree-clicked");
-				this.data.ui.selected = $([]);
-				this.data.ui.last_selected = false;
-				this.__callback({ "obj" : ret });
-			}
-		}
-	});
-	// include the selection plugin by default
-	$.jstree.defaults.plugins.push("ui");
-})(jQuery);
-//*/
-
-/* 
- * jsTree CRRM plugin
- * Handles creating/renaming/removing/moving nodes by user interaction.
- */
-(function ($) {
-	$.jstree.plugin("crrm", { 
-		__init : function () {
-			this.get_container()
-				.bind("move_node.jstree", $.proxy(function (e, data) {
-					if(this._get_settings().crrm.move.open_onmove) {
-						var t = this;
-						data.rslt.np.parentsUntil(".jstree").addBack().filter(".jstree-closed").each(function () {
-							t.open_node(this, false, true);
-						});
-					}
-				}, this));
-		},
-		defaults : {
-			input_width_limit : 200,
-			move : {
-				always_copy			: false, // false, true or "multitree"
-				open_onmove			: true,
-				default_position	: "last",
-				check_move			: function (m) { return true; }
-			}
-		},
-		_fn : {
-			_show_input : function (obj, callback) {
-				obj = this._get_node(obj);
-				var rtl = this._get_settings().core.rtl,
-					w = this._get_settings().crrm.input_width_limit,
-					w1 = obj.children("ins").width(),
-					w2 = obj.find("> a:visible > ins").width() * obj.find("> a:visible > ins").length,
-					t = this.get_text(obj),
-					h1 = $("<div />", { css : { "position" : "absolute", "top" : "-200px", "left" : (rtl ? "0px" : "-1000px"), "visibility" : "hidden" } }).appendTo("body"),
-					h2 = obj.css("position","relative").append(
-					$("<input />", { 
-						"value" : t,
-						"class" : "jstree-rename-input",
-						// "size" : t.length,
-						"css" : {
-							"padding" : "0",
-							"border" : "1px solid silver",
-							"position" : "absolute",
-							"left"  : (rtl ? "auto" : (w1 + w2 + 4) + "px"),
-							"right" : (rtl ? (w1 + w2 + 4) + "px" : "auto"),
-							"top" : "0px",
-							"height" : (this.data.core.li_height - 2) + "px",
-							"lineHeight" : (this.data.core.li_height - 2) + "px",
-							"width" : "150px" // will be set a bit further down
-						},
-						"blur" : $.proxy(function () {
-							var i = obj.children(".jstree-rename-input"),
-								v = i.val();
-							if(v === "") { v = t; }
-							h1.remove();
-							i.remove(); // rollback purposes
-							this.set_text(obj,t); // rollback purposes
-							this.rename_node(obj, v);
-							callback.call(this, obj, v, t);
-							obj.css("position","");
-						}, this),
-						"keyup" : function (event) {
-							var key = event.keyCode || event.which;
-							if(key == 27) { this.value = t; this.blur(); return; }
-							else if(key == 13) { this.blur(); return; }
-							else {
-								h2.width(Math.min(h1.text("pW" + this.value).width(),w));
-							}
-						},
-						"keypress" : function(event) {
-							var key = event.keyCode || event.which;
-							if(key == 13) { return false; }
-						}
-					})
-				).children(".jstree-rename-input"); 
-				this.set_text(obj, "");
-				h1.css({
-						fontFamily		: h2.css('fontFamily')		|| '',
-						fontSize		: h2.css('fontSize')		|| '',
-						fontWeight		: h2.css('fontWeight')		|| '',
-						fontStyle		: h2.css('fontStyle')		|| '',
-						fontStretch		: h2.css('fontStretch')		|| '',
-						fontVariant		: h2.css('fontVariant')		|| '',
-						letterSpacing	: h2.css('letterSpacing')	|| '',
-						wordSpacing		: h2.css('wordSpacing')		|| ''
-				});
-				h2.width(Math.min(h1.text("pW" + h2[0].value).width(),w))[0].select();
-			},
-			rename : function (obj) {
-				obj = this._get_node(obj);
-				this.__rollback();
-				var f = this.__callback;
-				this._show_input(obj, function (obj, new_name, old_name) { 
-					f.call(this, { "obj" : obj, "new_name" : new_name, "old_name" : old_name });
-				});
-			},
-			create : function (obj, position, js, callback, skip_rename) {
-				var t, _this = this;
-				obj = this._get_node(obj);
-				if(!obj) { obj = -1; }
-				this.__rollback();
-				t = this.create_node(obj, position, js, function (t) {
-					var p = this._get_parent(t),
-						pos = $(t).index();
-					if(callback) { callback.call(this, t); }
-					if(p.length && p.hasClass("jstree-closed")) { this.open_node(p, false, true); }
-					if(!skip_rename) { 
-						this._show_input(t, function (obj, new_name, old_name) { 
-							_this.__callback({ "obj" : obj, "name" : new_name, "parent" : p, "position" : pos });
-						});
-					}
-					else { _this.__callback({ "obj" : t, "name" : this.get_text(t), "parent" : p, "position" : pos }); }
-				});
-				return t;
-			},
-			remove : function (obj) {
-				obj = this._get_node(obj, true);
-				var p = this._get_parent(obj), prev = this._get_prev(obj);
-				this.__rollback();
-				obj = this.delete_node(obj);
-				if(obj !== false) { this.__callback({ "obj" : obj, "prev" : prev, "parent" : p }); }
-			},
-			check_move : function () {
-				if(!this.__call_old()) { return false; }
-				var s = this._get_settings().crrm.move;
-				if(!s.check_move.call(this, this._get_move())) { return false; }
-				return true;
-			},
-			move_node : function (obj, ref, position, is_copy, is_prepared, skip_check) {
-				var s = this._get_settings().crrm.move;
-				if(!is_prepared) { 
-					if(typeof position === "undefined") { position = s.default_position; }
-					if(position === "inside" && !s.default_position.match(/^(before|after)$/)) { position = s.default_position; }
-					return this.__call_old(true, obj, ref, position, is_copy, false, skip_check);
-				}
-				// if the move is already prepared
-				if(s.always_copy === true || (s.always_copy === "multitree" && obj.rt.get_index() !== obj.ot.get_index() )) {
-					is_copy = true;
-				}
-				this.__call_old(true, obj, ref, position, is_copy, true, skip_check);
-			},
-
-			cut : function (obj) {
-				obj = this._get_node(obj, true);
-				if(!obj || !obj.length) { return false; }
-				this.data.crrm.cp_nodes = false;
-				this.data.crrm.ct_nodes = obj;
-				this.__callback({ "obj" : obj });
-			},
-			copy : function (obj) {
-				obj = this._get_node(obj, true);
-				if(!obj || !obj.length) { return false; }
-				this.data.crrm.ct_nodes = false;
-				this.data.crrm.cp_nodes = obj;
-				this.__callback({ "obj" : obj });
-			},
-			paste : function (obj) { 
-				obj = this._get_node(obj);
-				if(!obj || !obj.length) { return false; }
-				var nodes = this.data.crrm.ct_nodes ? this.data.crrm.ct_nodes : this.data.crrm.cp_nodes;
-				if(!this.data.crrm.ct_nodes && !this.data.crrm.cp_nodes) { return false; }
-				if(this.data.crrm.ct_nodes) { this.move_node(this.data.crrm.ct_nodes, obj); this.data.crrm.ct_nodes = false; }
-				if(this.data.crrm.cp_nodes) { this.move_node(this.data.crrm.cp_nodes, obj, false, true); }
-				this.__callback({ "obj" : obj, "nodes" : nodes });
-			}
-		}
-	});
-	// include the crr plugin by default
-	// $.jstree.defaults.plugins.push("crrm");
-})(jQuery);
-//*/
-
-/* 
- * jsTree themes plugin
- * Handles loading and setting themes, as well as detecting path to themes, etc.
- */
-(function ($) {
-	var themes_loaded = [];
-	// this variable stores the path to the themes folder - if left as false - it will be autodetected
-	$.jstree._themes = false;
-	$.jstree.plugin("themes", {
-		__init : function () { 
-			this.get_container()
-				.bind("init.jstree", $.proxy(function () {
-						var s = this._get_settings().themes;
-						this.data.themes.dots = s.dots; 
-						this.data.themes.icons = s.icons; 
-						this.set_theme(s.theme, s.url);
-					}, this))
-				.bind("loaded.jstree", $.proxy(function () {
-						// bound here too, as simple HTML tree's won't honor dots & icons otherwise
-						if(!this.data.themes.dots) { this.hide_dots(); }
-						else { this.show_dots(); }
-						if(!this.data.themes.icons) { this.hide_icons(); }
-						else { this.show_icons(); }
-					}, this));
-		},
-		defaults : { 
-			theme : "default", 
-			url : false,
-			dots : true,
-			icons : true
-		},
-		_fn : {
-			set_theme : function (theme_name, theme_url) {
-				if(!theme_name) { return false; }
-				if(!theme_url) { theme_url = $.jstree._themes + theme_name + '/style.css'; }
-				if($.inArray(theme_url, themes_loaded) == -1) {
-					$.vakata.css.add_sheet({ "url" : theme_url });
-					themes_loaded.push(theme_url);
-				}
-				if(this.data.themes.theme != theme_name) {
-					this.get_container().removeClass('jstree-' + this.data.themes.theme);
-					this.data.themes.theme = theme_name;
-				}
-				this.get_container().addClass('jstree-' + theme_name);
-				if(!this.data.themes.dots) { this.hide_dots(); }
-				else { this.show_dots(); }
-				if(!this.data.themes.icons) { this.hide_icons(); }
-				else { this.show_icons(); }
-				this.__callback();
-			},
-			get_theme	: function () { return this.data.themes.theme; },
-
-			show_dots	: function () { this.data.themes.dots = true; this.get_container().children("ul").removeClass("jstree-no-dots"); },
-			hide_dots	: function () { this.data.themes.dots = false; this.get_container().children("ul").addClass("jstree-no-dots"); },
-			toggle_dots	: function () { if(this.data.themes.dots) { this.hide_dots(); } else { this.show_dots(); } },
-
-			show_icons	: function () { this.data.themes.icons = true; this.get_container().children("ul").removeClass("jstree-no-icons"); },
-			hide_icons	: function () { this.data.themes.icons = false; this.get_container().children("ul").addClass("jstree-no-icons"); },
-			toggle_icons: function () { if(this.data.themes.icons) { this.hide_icons(); } else { this.show_icons(); } }
-		}
-	});
-	// autodetect themes path
-	$(function () {
-		if($.jstree._themes === false) {
-			$("script").each(function () { 
-				if(this.src.toString().match(/jquery\.jstree[^\/]*?\.js(\?.*)?$/)) { 
-					$.jstree._themes = this.src.toString().replace(/jquery\.jstree[^\/]*?\.js(\?.*)?$/, "") + 'themes/'; 
-					return false; 
-				}
-			});
-		}
-		if($.jstree._themes === false) { $.jstree._themes = "themes/"; }
-	});
-	// include the themes plugin by default
-	$.jstree.defaults.plugins.push("themes");
-})(jQuery);
-//*/
-
-/*
- * jsTree hotkeys plugin
- * Enables keyboard navigation for all tree instances
- * Depends on the jstree ui & jquery hotkeys plugins
- */
-(function ($) {
-	var bound = [];
-	function exec(i, event) {
-		var f = $.jstree._focused(), tmp;
-		if(f && f.data && f.data.hotkeys && f.data.hotkeys.enabled) { 
-			tmp = f._get_settings().hotkeys[i];
-			if(tmp) { return tmp.call(f, event); }
-		}
-	}
-	$.jstree.plugin("hotkeys", {
-		__init : function () {
-			if(typeof $.hotkeys === "undefined") { throw "jsTree hotkeys: jQuery hotkeys plugin not included."; }
-			if(!this.data.ui) { throw "jsTree hotkeys: jsTree UI plugin not included."; }
-			$.each(this._get_settings().hotkeys, function (i, v) {
-				if(v !== false && $.inArray(i, bound) == -1) {
-					$(document).bind("keydown", i, function (event) { return exec(i, event); });
-					bound.push(i);
-				}
-			});
-			this.get_container()
-				.bind("lock.jstree", $.proxy(function () {
-						if(this.data.hotkeys.enabled) { this.data.hotkeys.enabled = false; this.data.hotkeys.revert = true; }
-					}, this))
-				.bind("unlock.jstree", $.proxy(function () {
-						if(this.data.hotkeys.revert) { this.data.hotkeys.enabled = true; }
-					}, this));
-			this.enable_hotkeys();
-		},
-		defaults : {
-			"up" : function () { 
-				var o = this.data.ui.hovered || this.data.ui.last_selected || -1;
-				this.hover_node(this._get_prev(o));
-				return false; 
-			},
-			"ctrl+up" : function () { 
-				var o = this.data.ui.hovered || this.data.ui.last_selected || -1;
-				this.hover_node(this._get_prev(o));
-				return false; 
-			},
-			"shift+up" : function () { 
-				var o = this.data.ui.hovered || this.data.ui.last_selected || -1;
-				this.hover_node(this._get_prev(o));
-				return false; 
-			},
-			"down" : function () { 
-				var o = this.data.ui.hovered || this.data.ui.last_selected || -1;
-				this.hover_node(this._get_next(o));
-				return false;
-			},
-			"ctrl+down" : function () { 
-				var o = this.data.ui.hovered || this.data.ui.last_selected || -1;
-				this.hover_node(this._get_next(o));
-				return false;
-			},
-			"shift+down" : function () { 
-				var o = this.data.ui.hovered || this.data.ui.last_selected || -1;
-				this.hover_node(this._get_next(o));
-				return false;
-			},
-			"left" : function () { 
-				var o = this.data.ui.hovered || this.data.ui.last_selected;
-				if(o) {
-					if(o.hasClass("jstree-open")) { this.close_node(o); }
-					else { this.hover_node(this._get_prev(o)); }
-				}
-				return false;
-			},
-			"ctrl+left" : function () { 
-				var o = this.data.ui.hovered || this.data.ui.last_selected;
-				if(o) {
-					if(o.hasClass("jstree-open")) { this.close_node(o); }
-					else { this.hover_node(this._get_prev(o)); }
-				}
-				return false;
-			},
-			"shift+left" : function () { 
-				var o = this.data.ui.hovered || this.data.ui.last_selected;
-				if(o) {
-					if(o.hasClass("jstree-open")) { this.close_node(o); }
-					else { this.hover_node(this._get_prev(o)); }
-				}
-				return false;
-			},
-			"right" : function () { 
-				var o = this.data.ui.hovered || this.data.ui.last_selected;
-				if(o && o.length) {
-					if(o.hasClass("jstree-closed")) { this.open_node(o); }
-					else { this.hover_node(this._get_next(o)); }
-				}
-				return false;
-			},
-			"ctrl+right" : function () { 
-				var o = this.data.ui.hovered || this.data.ui.last_selected;
-				if(o && o.length) {
-					if(o.hasClass("jstree-closed")) { this.open_node(o); }
-					else { this.hover_node(this._get_next(o)); }
-				}
-				return false;
-			},
-			"shift+right" : function () { 
-				var o = this.data.ui.hovered || this.data.ui.last_selected;
-				if(o && o.length) {
-					if(o.hasClass("jstree-closed")) { this.open_node(o); }
-					else { this.hover_node(this._get_next(o)); }
-				}
-				return false;
-			},
-			"space" : function () { 
-				if(this.data.ui.hovered) { this.data.ui.hovered.children("a:eq(0)").click(); } 
-				return false; 
-			},
-			"ctrl+space" : function (event) { 
-				event.type = "click";
-				if(this.data.ui.hovered) { this.data.ui.hovered.children("a:eq(0)").trigger(event); } 
-				return false; 
-			},
-			"shift+space" : function (event) { 
-				event.type = "click";
-				if(this.data.ui.hovered) { this.data.ui.hovered.children("a:eq(0)").trigger(event); } 
-				return false; 
-			},
-			"f2" : function () { this.rename(this.data.ui.hovered || this.data.ui.last_selected); },
-			"del" : function () { this.remove(this.data.ui.hovered || this._get_node(null)); }
-		},
-		_fn : {
-			enable_hotkeys : function () {
-				this.data.hotkeys.enabled = true;
-			},
-			disable_hotkeys : function () {
-				this.data.hotkeys.enabled = false;
-			}
-		}
-	});
-})(jQuery);
-//*/
-
-/* 
- * jsTree JSON plugin
- * The JSON data store. Datastores are build by overriding the `load_node` and `_is_loaded` functions.
- */
-(function ($) {
-	$.jstree.plugin("json_data", {
-		__init : function() {
-			var s = this._get_settings().json_data;
-			if(s.progressive_unload) {
-				this.get_container().bind("after_close.jstree", function (e, data) {
-					data.rslt.obj.children("ul").remove();
-				});
-			}
-		},
-		defaults : { 
-			// `data` can be a function:
-			//  * accepts two arguments - node being loaded and a callback to pass the result to
-			//  * will be executed in the current tree's scope & ajax won't be supported
-			data : false, 
-			ajax : false,
-			correct_state : true,
-			progressive_render : false,
-			progressive_unload : false
-		},
-		_fn : {
-			load_node : function (obj, s_call, e_call) { var _this = this; this.load_node_json(obj, function () { _this.__callback({ "obj" : _this._get_node(obj) }); s_call.call(this); }, e_call); },
-			_is_loaded : function (obj) { 
-				var s = this._get_settings().json_data;
-				obj = this._get_node(obj); 
-				return obj == -1 || !obj || (!s.ajax && !s.progressive_render && !$.isFunction(s.data)) || obj.is(".jstree-open, .jstree-leaf") || obj.children("ul").children("li").length > 0;
-			},
-			refresh : function (obj) {
-				obj = this._get_node(obj);
-				var s = this._get_settings().json_data;
-				if(obj && obj !== -1 && s.progressive_unload && ($.isFunction(s.data) || !!s.ajax)) {
-					obj.removeData("jstree_children");
-				}
-				return this.__call_old();
-			},
-			load_node_json : function (obj, s_call, e_call) {
-				var s = this.get_settings().json_data, d,
-					error_func = function () {},
-					success_func = function () {};
-				obj = this._get_node(obj);
-
-				if(obj && obj !== -1 && (s.progressive_render || s.progressive_unload) && !obj.is(".jstree-open, .jstree-leaf") && obj.children("ul").children("li").length === 0 && obj.data("jstree_children")) {
-					d = this._parse_json(obj.data("jstree_children"), obj);
-					if(d) {
-						obj.append(d);
-						if(!s.progressive_unload) { obj.removeData("jstree_children"); }
-					}
-					this.clean_node(obj);
-					if(s_call) { s_call.call(this); }
-					return;
-				}
-
-				if(obj && obj !== -1) {
-					if(obj.data("jstree_is_loading")) { return; }
-					else { obj.data("jstree_is_loading",true); }
-				}
-				switch(!0) {
-					case (!s.data && !s.ajax): throw "Neither data nor ajax settings supplied.";
-					// function option added here for easier model integration (also supporting async - see callback)
-					case ($.isFunction(s.data)):
-						s.data.call(this, obj, $.proxy(function (d) {
-							d = this._parse_json(d, obj);
-							if(!d) { 
-								if(obj === -1 || !obj) {
-									if(s.correct_state) { this.get_container().children("ul").empty(); }
-								}
-								else {
-									obj.children("a.jstree-loading").removeClass("jstree-loading");
-									obj.removeData("jstree_is_loading");
-									if(s.correct_state) { this.correct_state(obj); }
-								}
-								if(e_call) { e_call.call(this); }
-							}
-							else {
-								if(obj === -1 || !obj) { this.get_container().children("ul").empty().append(d.children()); }
-								else { obj.append(d).children("a.jstree-loading").removeClass("jstree-loading"); obj.removeData("jstree_is_loading"); }
-								this.clean_node(obj);
-								if(s_call) { s_call.call(this); }
-							}
-						}, this));
-						break;
-					case (!!s.data && !s.ajax) || (!!s.data && !!s.ajax && (!obj || obj === -1)):
-						if(!obj || obj == -1) {
-							d = this._parse_json(s.data, obj);
-							if(d) {
-								this.get_container().children("ul").empty().append(d.children());
-								this.clean_node();
-							}
-							else { 
-								if(s.correct_state) { this.get_container().children("ul").empty(); }
-							}
-						}
-						if(s_call) { s_call.call(this); }
-						break;
-					case (!s.data && !!s.ajax) || (!!s.data && !!s.ajax && obj && obj !== -1):
-						error_func = function (x, t, e) {
-							var ef = this.get_settings().json_data.ajax.error; 
-							if(ef) { ef.call(this, x, t, e); }
-							if(obj != -1 && obj.length) {
-								obj.children("a.jstree-loading").removeClass("jstree-loading");
-								obj.removeData("jstree_is_loading");
-								if(t === "success" && s.correct_state) { this.correct_state(obj); }
-							}
-							else {
-								if(t === "success" && s.correct_state) { this.get_container().children("ul").empty(); }
-							}
-							if(e_call) { e_call.call(this); }
-						};
-						success_func = function (d, t, x) {
-							var sf = this.get_settings().json_data.ajax.success; 
-							if(sf) { d = sf.call(this,d,t,x) || d; }
-							if(d === "" || (d && d.toString && d.toString().replace(/^[\s\n]+$/,"") === "") || (!$.isArray(d) && !$.isPlainObject(d))) {
-								return error_func.call(this, x, t, "");
-							}
-							d = this._parse_json(d, obj);
-							if(d) {
-								if(obj === -1 || !obj) { this.get_container().children("ul").empty().append(d.children()); }
-								else { obj.append(d).children("a.jstree-loading").removeClass("jstree-loading"); obj.removeData("jstree_is_loading"); }
-								this.clean_node(obj);
-								if(s_call) { s_call.call(this); }
-							}
-							else {
-								if(obj === -1 || !obj) {
-									if(s.correct_state) { 
-										this.get_container().children("ul").empty(); 
-										if(s_call) { s_call.call(this); }
-									}
-								}
-								else {
-									obj.children("a.jstree-loading").removeClass("jstree-loading");
-									obj.removeData("jstree_is_loading");
-									if(s.correct_state) { 
-										this.correct_state(obj);
-										if(s_call) { s_call.call(this); } 
-									}
-								}
-							}
-						};
-						s.ajax.context = this;
-						s.ajax.error = error_func;
-						s.ajax.success = success_func;
-						if(!s.ajax.dataType) { s.ajax.dataType = "json"; }
-						if($.isFunction(s.ajax.url)) { s.ajax.url = s.ajax.url.call(this, obj); }
-						if($.isFunction(s.ajax.data)) { s.ajax.data = s.ajax.data.call(this, obj); }
-						$.ajax(s.ajax);
-						break;
-				}
-			},
-			_parse_json : function (js, obj, is_callback) {
-				var d = false, 
-					p = this._get_settings(),
-					s = p.json_data,
-					t = p.core.html_titles,
-					tmp, i, j, ul1, ul2;
-
-				if(!js) { return d; }
-				if(s.progressive_unload && obj && obj !== -1) { 
-					obj.data("jstree_children", d);
-				}
-				if($.isArray(js)) {
-					d = $('<ul>');
-					if(!js.length) { return false; }
-					for(i = 0, j = js.length; i < j; i++) {
-						tmp = this._parse_json(js[i], obj, true);
-						if(tmp.length) {
-							d = d.append(tmp);
-						}
-					}
-					d = d.children();
-				}
-				else {
-					if(typeof js == "string") { js = { data : js }; }
-					if(!js.data && js.data !== "") { return d; }
-					d = $("<li />");
-					if(js.attr) { d.attr(js.attr); }
-					if(js.metadata) { d.data(js.metadata); }
-					if(js.state) { d.addClass("jstree-" + js.state); }
-					if(!$.isArray(js.data)) { tmp = js.data; js.data = []; js.data.push(tmp); }
-					$.each(js.data, function (i, m) {
-						tmp = $("<a />");
-						if($.isFunction(m)) { m = m.call(this, js); }
-						if(typeof m == "string") { tmp.attr('href','#')[ t ? "html" : "text" ](m); }
-						else {
-							if(!m.attr) { m.attr = {}; }
-							if(!m.attr.href) { m.attr.href = '#'; }
-							tmp.attr(m.attr)[ t ? "html" : "text" ](m.title);
-							if(m.language) { tmp.addClass(m.language); }
-						}
-						tmp.prepend("<ins class='jstree-icon'>&#160;</ins>");
-						if(!m.icon && js.icon) { m.icon = js.icon; }
-						if(m.icon) { 
-							if(m.icon.indexOf("/") === -1) { tmp.children("ins").addClass(m.icon); }
-							else { tmp.children("ins").css("background","url('" + m.icon + "') center center no-repeat"); }
-						}
-						d.append(tmp);
-					});
-					d.prepend("<ins class='jstree-icon'>&#160;</ins>");
-					if(js.children) { 
-						if(s.progressive_render && js.state !== "open") {
-							d.addClass("jstree-closed").data("jstree_children", js.children);
-						}
-						else {
-							if(s.progressive_unload) { d.data("jstree_children", js.children); }
-							if($.isArray(js.children) && js.children.length) {
-								tmp = this._parse_json(js.children, obj, true);
-								if(tmp.length) {
-									ul2 = $("<ul />");
-									ul2.append(tmp);
-									d.append(ul2);
-								}
-							}
-						}
-					}
-				}
-				if(!is_callback) {
-					ul1 = $("<ul />");
-					ul1.append(d);
-					d = ul1;
-				}
-				return d;
-			},
-			get_json : function (obj, li_attr, a_attr, is_callback) {
-				var result = [], 
-					s = this._get_settings(), 
-					_this = this,
-					tmp1, tmp2, li, a, t, lang;
-				obj = this._get_node(obj);
-				if(!obj || obj === -1) { obj = this.get_container().find("> ul > li"); }
-				li_attr = $.isArray(li_attr) ? li_attr : [ "id", "class" ];
-				if(!is_callback && this.data.types) { li_attr.push(s.types.type_attr); }
-				a_attr = $.isArray(a_attr) ? a_attr : [ ];
-
-				obj.each(function () {
-					li = $(this);
-					tmp1 = { data : [] };
-					if(li_attr.length) { tmp1.attr = { }; }
-					$.each(li_attr, function (i, v) { 
-						tmp2 = li.attr(v); 
-						if(tmp2 && tmp2.length && tmp2.replace(/jstree[^ ]*/ig,'').length) {
-							tmp1.attr[v] = (" " + tmp2).replace(/ jstree[^ ]*/ig,'').replace(/\s+$/ig," ").replace(/^ /,"").replace(/ $/,""); 
-						}
-					});
-					if(li.hasClass("jstree-open")) { tmp1.state = "open"; }
-					if(li.hasClass("jstree-closed")) { tmp1.state = "closed"; }
-					if(li.data()) { tmp1.metadata = li.data(); }
-					a = li.children("a");
-					a.each(function () {
-						t = $(this);
-						if(
-							a_attr.length || 
-							$.inArray("languages", s.plugins) !== -1 || 
-							t.children("ins").get(0).style.backgroundImage.length || 
-							(t.children("ins").get(0).className && t.children("ins").get(0).className.replace(/jstree[^ ]*|$/ig,'').length)
-						) { 
-							lang = false;
-							if($.inArray("languages", s.plugins) !== -1 && $.isArray(s.languages) && s.languages.length) {
-								$.each(s.languages, function (l, lv) {
-									if(t.hasClass(lv)) {
-										lang = lv;
-										return false;
-									}
-								});
-							}
-							tmp2 = { attr : { }, title : _this.get_text(t, lang) }; 
-							$.each(a_attr, function (k, z) {
-								tmp2.attr[z] = (" " + (t.attr(z) || "")).replace(/ jstree[^ ]*/ig,'').replace(/\s+$/ig," ").replace(/^ /,"").replace(/ $/,"");
-							});
-							if($.inArray("languages", s.plugins) !== -1 && $.isArray(s.languages) && s.languages.length) {
-								$.each(s.languages, function (k, z) {
-									if(t.hasClass(z)) { tmp2.language = z; return true; }
-								});
-							}
-							if(t.children("ins").get(0).className.replace(/jstree[^ ]*|$/ig,'').replace(/^\s+$/ig,"").length) {
-								tmp2.icon = t.children("ins").get(0).className.replace(/jstree[^ ]*|$/ig,'').replace(/\s+$/ig," ").replace(/^ /,"").replace(/ $/,"");
-							}
-							if(t.children("ins").get(0).style.backgroundImage.length) {
-								tmp2.icon = t.children("ins").get(0).style.backgroundImage.replace("url(","").replace(")","");
-							}
-						}
-						else {
-							tmp2 = _this.get_text(t);
-						}
-						if(a.length > 1) { tmp1.data.push(tmp2); }
-						else { tmp1.data = tmp2; }
-					});
-					li = li.find("> ul > li");
-					if(li.length) { tmp1.children = _this.get_json(li, li_attr, a_attr, true); }
-					result.push(tmp1);
-				});
-				return result;
-			}
-		}
-	});
-})(jQuery);
-//*/
-
-/* 
- * jsTree languages plugin
- * Adds support for multiple language versions in one tree
- * This basically allows for many titles coexisting in one node, but only one of them being visible at any given time
- * This is useful for maintaining the same structure in many languages (hence the name of the plugin)
- */
-(function ($) {
-	var sh = false;
-	$.jstree.plugin("languages", {
-		__init : function () { this._load_css();  },
-		defaults : [],
-		_fn : {
-			set_lang : function (i) { 
-				var langs = this._get_settings().languages,
-					st = false,
-					selector = ".jstree-" + this.get_index() + ' a';
-				if(!$.isArray(langs) || langs.length === 0) { return false; }
-				if($.inArray(i,langs) == -1) {
-					if(!!langs[i]) { i = langs[i]; }
-					else { return false; }
-				}
-				if(i == this.data.languages.current_language) { return true; }
-				st = $.vakata.css.get_css(selector + "." + this.data.languages.current_language, false, sh);
-				if(st !== false) { st.style.display = "none"; }
-				st = $.vakata.css.get_css(selector + "." + i, false, sh);
-				if(st !== false) { st.style.display = ""; }
-				this.data.languages.current_language = i;
-				this.__callback(i);
-				return true;
-			},
-			get_lang : function () {
-				return this.data.languages.current_language;
-			},
-			_get_string : function (key, lang) {
-				var langs = this._get_settings().languages,
-					s = this._get_settings().core.strings;
-				if($.isArray(langs) && langs.length) {
-					lang = (lang && $.inArray(lang,langs) != -1) ? lang : this.data.languages.current_language;
-				}
-				if(s[lang] && s[lang][key]) { return s[lang][key]; }
-				if(s[key]) { return s[key]; }
-				return key;
-			},
-			get_text : function (obj, lang) {
-				obj = this._get_node(obj) || this.data.ui.last_selected;
-				if(!obj.size()) { return false; }
-				var langs = this._get_settings().languages,
-					s = this._get_settings().core.html_titles;
-				if($.isArray(langs) && langs.length) {
-					lang = (lang && $.inArray(lang,langs) != -1) ? lang : this.data.languages.current_language;
-					obj = obj.children("a." + lang);
-				}
-				else { obj = obj.children("a:eq(0)"); }
-				if(s) {
-					obj = obj.clone();
-					obj.children("INS").remove();
-					return obj.html();
-				}
-				else {
-					obj = obj.contents().filter(function() { return this.nodeType == 3; })[0];
-					return obj.nodeValue;
-				}
-			},
-			set_text : function (obj, val, lang) {
-				obj = this._get_node(obj) || this.data.ui.last_selected;
-				if(!obj.size()) { return false; }
-				var langs = this._get_settings().languages,
-					s = this._get_settings().core.html_titles,
-					tmp;
-				if($.isArray(langs) && langs.length) {
-					lang = (lang && $.inArray(lang,langs) != -1) ? lang : this.data.languages.current_language;
-					obj = obj.children("a." + lang);
-				}
-				else { obj = obj.children("a:eq(0)"); }
-				if(s) {
-					tmp = obj.children("INS").clone();
-					obj.html(val).prepend(tmp);
-					this.__callback({ "obj" : obj, "name" : val, "lang" : lang });
-					return true;
-				}
-				else {
-					obj = obj.contents().filter(function() { return this.nodeType == 3; })[0];
-					this.__callback({ "obj" : obj, "name" : val, "lang" : lang });
-					return (obj.nodeValue = val);
-				}
-			},
-			_load_css : function () {
-				var langs = this._get_settings().languages,
-					str = "/* languages css */",
-					selector = ".jstree-" + this.get_index() + ' a',
-					ln;
-				if($.isArray(langs) && langs.length) {
-					this.data.languages.current_language = langs[0];
-					for(ln = 0; ln < langs.length; ln++) {
-						str += selector + "." + langs[ln] + " {";
-						if(langs[ln] != this.data.languages.current_language) { str += " display:none; "; }
-						str += " } ";
-					}
-					sh = $.vakata.css.add_sheet({ 'str' : str, 'title' : "jstree-languages" });
-				}
-			},
-			create_node : function (obj, position, js, callback) {
-				var t = this.__call_old(true, obj, position, js, function (t) {
-					var langs = this._get_settings().languages,
-						a = t.children("a"),
-						ln;
-					if($.isArray(langs) && langs.length) {
-						for(ln = 0; ln < langs.length; ln++) {
-							if(!a.is("." + langs[ln])) {
-								t.append(a.eq(0).clone().removeClass(langs.join(" ")).addClass(langs[ln]));
-							}
-						}
-						a.not("." + langs.join(", .")).remove();
-					}
-					if(callback) { callback.call(this, t); }
-				});
-				return t;
-			}
-		}
-	});
-})(jQuery);
-//*/
-
-/*
- * jsTree cookies plugin
- * Stores the currently opened/selected nodes in a cookie and then restores them
- * Depends on the jquery.cookie plugin
- */
-(function ($) {
-	$.jstree.plugin("cookies", {
-		__init : function () {
-			if(typeof $.cookie === "undefined") { throw "jsTree cookie: jQuery cookie plugin not included."; }
-
-			var s = this._get_settings().cookies,
-				tmp;
-			if(!!s.save_loaded) {
-				tmp = $.cookie(s.save_loaded);
-				if(tmp && tmp.length) { this.data.core.to_load = tmp.split(","); }
-			}
-			if(!!s.save_opened) {
-				tmp = $.cookie(s.save_opened);
-				if(tmp && tmp.length) { this.data.core.to_open = tmp.split(","); }
-			}
-			if(!!s.save_selected) {
-				tmp = $.cookie(s.save_selected);
-				if(tmp && tmp.length && this.data.ui) { this.data.ui.to_select = tmp.split(","); }
-			}
-			this.get_container()
-				.one( ( this.data.ui ? "reselect" : "reopen" ) + ".jstree", $.proxy(function () {
-					this.get_container()
-						.bind("open_node.jstree close_node.jstree select_node.jstree deselect_node.jstree", $.proxy(function (e) { 
-								if(this._get_settings().cookies.auto_save) { this.save_cookie((e.handleObj.namespace + e.handleObj.type).replace("jstree","")); }
-							}, this));
-				}, this));
-		},
-		defaults : {
-			save_loaded		: "jstree_load",
-			save_opened		: "jstree_open",
-			save_selected	: "jstree_select",
-			auto_save		: true,
-			cookie_options	: {}
-		},
-		_fn : {
-			save_cookie : function (c) {
-				if(this.data.core.refreshing) { return; }
-				var s = this._get_settings().cookies;
-				if(!c) { // if called manually and not by event
-					if(s.save_loaded) {
-						this.save_loaded();
-						$.cookie(s.save_loaded, this.data.core.to_load.join(","), s.cookie_options);
-					}
-					if(s.save_opened) {
-						this.save_opened();
-						$.cookie(s.save_opened, this.data.core.to_open.join(","), s.cookie_options);
-					}
-					if(s.save_selected && this.data.ui) {
-						this.save_selected();
-						$.cookie(s.save_selected, this.data.ui.to_select.join(","), s.cookie_options);
-					}
-					return;
-				}
-				switch(c) {
-					case "open_node":
-					case "close_node":
-						if(!!s.save_opened) { 
-							this.save_opened(); 
-							$.cookie(s.save_opened, this.data.core.to_open.join(","), s.cookie_options); 
-						}
-						if(!!s.save_loaded) { 
-							this.save_loaded(); 
-							$.cookie(s.save_loaded, this.data.core.to_load.join(","), s.cookie_options); 
-						}
-						break;
-					case "select_node":
-					case "deselect_node":
-						if(!!s.save_selected && this.data.ui) { 
-							this.save_selected(); 
-							$.cookie(s.save_selected, this.data.ui.to_select.join(","), s.cookie_options); 
-						}
-						break;
-				}
-			}
-		}
-	});
-	// include cookies by default
-	// $.jstree.defaults.plugins.push("cookies");
-})(jQuery);
-//*/
-
-/*
- * jsTree sort plugin
- * Sorts items alphabetically (or using any other function)
- */
-(function ($) {
-	$.jstree.plugin("sort", {
-		__init : function () {
-			this.get_container()
-				.bind("load_node.jstree", $.proxy(function (e, data) {
-						var obj = this._get_node(data.rslt.obj);
-						obj = obj === -1 ? this.get_container().children("ul") : obj.children("ul");
-						this.sort(obj);
-					}, this))
-				.bind("rename_node.jstree create_node.jstree create.jstree", $.proxy(function (e, data) {
-						this.sort(data.rslt.obj.parent());
-					}, this))
-				.bind("move_node.jstree", $.proxy(function (e, data) {
-						var m = data.rslt.np == -1 ? this.get_container() : data.rslt.np;
-						this.sort(m.children("ul"));
-					}, this));
-		},
-		defaults : function (a, b) { return this.get_text(a) > this.get_text(b) ? 1 : -1; },
-		_fn : {
-			sort : function (obj) {
-				var s = this._get_settings().sort,
-					t = this;
-				obj.append($.makeArray(obj.children("li")).sort($.proxy(s, t)));
-				obj.find("> li > ul").each(function() { t.sort($(this)); });
-				this.clean_node(obj);
-			}
-		}
-	});
-})(jQuery);
-//*/
-
-/*
- * jsTree DND plugin
- * Drag and drop plugin for moving/copying nodes
- */
-(function ($) {
-	var o = false,
-		r = false,
-		m = false,
-		ml = false,
-		sli = false,
-		sti = false,
-		dir1 = false,
-		dir2 = false,
-		last_pos = false;
-	$.vakata.dnd = {
-		is_down : false,
-		is_drag : false,
-		helper : false,
-		scroll_spd : 10,
-		init_x : 0,
-		init_y : 0,
-		threshold : 5,
-		helper_left : 5,
-		helper_top : 10,
-		user_data : {},
-
-		drag_start : function (e, data, html) { 
-			if($.vakata.dnd.is_drag) { $.vakata.drag_stop({}); }
-			try {
-				e.currentTarget.unselectable = "on";
-				e.currentTarget.onselectstart = function() { return false; };
-				if(e.currentTarget.style) { e.currentTarget.style.MozUserSelect = "none"; }
-			} catch(err) { }
-			$.vakata.dnd.init_x = e.pageX;
-			$.vakata.dnd.init_y = e.pageY;
-			$.vakata.dnd.user_data = data;
-			$.vakata.dnd.is_down = true;
-			$.vakata.dnd.helper = $("<div id='vakata-dragged' />").html(html); //.fadeTo(10,0.25);
-			$(document).bind("mousemove", $.vakata.dnd.drag);
-			$(document).bind("mouseup", $.vakata.dnd.drag_stop);
-			return false;
-		},
-		drag : function (e) { 
-			if(!$.vakata.dnd.is_down) { return; }
-			if(!$.vakata.dnd.is_drag) {
-				if(Math.abs(e.pageX - $.vakata.dnd.init_x) > 5 || Math.abs(e.pageY - $.vakata.dnd.init_y) > 5) { 
-					$.vakata.dnd.helper.appendTo("body");
-					$.vakata.dnd.is_drag = true;
-					$(document).triggerHandler("drag_start.vakata", { "event" : e, "data" : $.vakata.dnd.user_data });
-				}
-				else { return; }
-			}
-
-			// maybe use a scrolling parent element instead of document?
-			if(e.type === "mousemove") { // thought of adding scroll in order to move the helper, but mouse poisition is n/a
-				var d = $(document), t = d.scrollTop(), l = d.scrollLeft();
-				if(e.pageY - t < 20) { 
-					if(sti && dir1 === "down") { clearInterval(sti); sti = false; }
-					if(!sti) { dir1 = "up"; sti = setInterval(function () { $(document).scrollTop($(document).scrollTop() - $.vakata.dnd.scroll_spd); }, 150); }
-				}
-				else { 
-					if(sti && dir1 === "up") { clearInterval(sti); sti = false; }
-				}
-				if($(window).height() - (e.pageY - t) < 20) {
-					if(sti && dir1 === "up") { clearInterval(sti); sti = false; }
-					if(!sti) { dir1 = "down"; sti = setInterval(function () { $(document).scrollTop($(document).scrollTop() + $.vakata.dnd.scroll_spd); }, 150); }
-				}
-				else { 
-					if(sti && dir1 === "down") { clearInterval(sti); sti = false; }
-				}
-
-				if(e.pageX - l < 20) {
-					if(sli && dir2 === "right") { clearInterval(sli); sli = false; }
-					if(!sli) { dir2 = "left"; sli = setInterval(function () { $(document).scrollLeft($(document).scrollLeft() - $.vakata.dnd.scroll_spd); }, 150); }
-				}
-				else { 
-					if(sli && dir2 === "left") { clearInterval(sli); sli = false; }
-				}
-				if($(window).width() - (e.pageX - l) < 20) {
-					if(sli && dir2 === "left") { clearInterval(sli); sli = false; }
-					if(!sli) { dir2 = "right"; sli = setInterval(function () { $(document).scrollLeft($(document).scrollLeft() + $.vakata.dnd.scroll_spd); }, 150); }
-				}
-				else { 
-					if(sli && dir2 === "right") { clearInterval(sli); sli = false; }
-				}
-			}
-
-			$.vakata.dnd.helper.css({ left : (e.pageX + $.vakata.dnd.helper_left) + "px", top : (e.pageY + $.vakata.dnd.helper_top) + "px" });
-			$(document).triggerHandler("drag.vakata", { "event" : e, "data" : $.vakata.dnd.user_data });
-		},
-		drag_stop : function (e) {
-			if(sli) { clearInterval(sli); }
-			if(sti) { clearInterval(sti); }
-			$(document).unbind("mousemove", $.vakata.dnd.drag);
-			$(document).unbind("mouseup", $.vakata.dnd.drag_stop);
-			$(document).triggerHandler("drag_stop.vakata", { "event" : e, "data" : $.vakata.dnd.user_data });
-			$.vakata.dnd.helper.remove();
-			$.vakata.dnd.init_x = 0;
-			$.vakata.dnd.init_y = 0;
-			$.vakata.dnd.user_data = {};
-			$.vakata.dnd.is_down = false;
-			$.vakata.dnd.is_drag = false;
-		}
-	};
-	$(function() {
-		var css_string = '#vakata-dragged { display:block; margin:0 0 0 0; padding:4px 4px 4px 24px; position:absolute; top:-2000px; line-height:16px; z-index:10000; } ';
-		$.vakata.css.add_sheet({ str : css_string, title : "vakata" });
-	});
-
-	$.jstree.plugin("dnd", {
-		__init : function () {
-			this.data.dnd = {
-				active : false,
-				after : false,
-				inside : false,
-				before : false,
-				off : false,
-				prepared : false,
-				w : 0,
-				to1 : false,
-				to2 : false,
-				cof : false,
-				cw : false,
-				ch : false,
-				i1 : false,
-				i2 : false,
-				mto : false
-			};
-			this.get_container()
-				.bind("mouseenter.jstree", $.proxy(function (e) {
-						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree) {
-							if(this.data.themes) {
-								m.attr("class", "jstree-" + this.data.themes.theme); 
-								if(ml) { ml.attr("class", "jstree-" + this.data.themes.theme); }
-								$.vakata.dnd.helper.attr("class", "jstree-dnd-helper jstree-" + this.data.themes.theme);
-							}
-							//if($(e.currentTarget).find("> ul > li").length === 0) {
-							if(e.currentTarget === e.target && $.vakata.dnd.user_data.obj && $($.vakata.dnd.user_data.obj).length && $($.vakata.dnd.user_data.obj).parents(".jstree:eq(0)")[0] !== e.target) { // node should not be from the same tree
-								var tr = $.jstree._reference(e.target), dc;
-								if(tr.data.dnd.foreign) {
-									dc = tr._get_settings().dnd.drag_check.call(this, { "o" : o, "r" : tr.get_container(), is_root : true });
-									if(dc === true || dc.inside === true || dc.before === true || dc.after === true) {
-										$.vakata.dnd.helper.children("ins").attr("class","jstree-ok");
-									}
-								}
-								else {
-									tr.prepare_move(o, tr.get_container(), "last");
-									if(tr.check_move()) {
-										$.vakata.dnd.helper.children("ins").attr("class","jstree-ok");
-									}
-								}
-							}
-						}
-					}, this))
-				.bind("mouseup.jstree", $.proxy(function (e) {
-						//if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree && $(e.currentTarget).find("> ul > li").length === 0) {
-						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree && e.currentTarget === e.target && $.vakata.dnd.user_data.obj && $($.vakata.dnd.user_data.obj).length && $($.vakata.dnd.user_data.obj).parents(".jstree:eq(0)")[0] !== e.target) { // node should not be from the same tree
-							var tr = $.jstree._reference(e.currentTarget), dc;
-							if(tr.data.dnd.foreign) {
-								dc = tr._get_settings().dnd.drag_check.call(this, { "o" : o, "r" : tr.get_container(), is_root : true });
-								if(dc === true || dc.inside === true || dc.before === true || dc.after === true) {
-									tr._get_settings().dnd.drag_finish.call(this, { "o" : o, "r" : tr.get_container(), is_root : true });
-								}
-							}
-							else {
-								tr.move_node(o, tr.get_container(), "last", e[tr._get_settings().dnd.copy_modifier + "Key"]);
-							}
-						}
-					}, this))
-				.bind("mouseleave.jstree", $.proxy(function (e) {
-						if(e.relatedTarget && e.relatedTarget.id && e.relatedTarget.id === "jstree-marker-line") {
-							return false; 
-						}
-						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree) {
-							if(this.data.dnd.i1) { clearInterval(this.data.dnd.i1); }
-							if(this.data.dnd.i2) { clearInterval(this.data.dnd.i2); }
-							if(this.data.dnd.to1) { clearTimeout(this.data.dnd.to1); }
-							if(this.data.dnd.to2) { clearTimeout(this.data.dnd.to2); }
-							if($.vakata.dnd.helper.children("ins").hasClass("jstree-ok")) {
-								$.vakata.dnd.helper.children("ins").attr("class","jstree-invalid");
-							}
-						}
-					}, this))
-				.bind("mousemove.jstree", $.proxy(function (e) {
-						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree) {
-							var cnt = this.get_container()[0];
-
-							// Horizontal scroll
-							if(e.pageX + 24 > this.data.dnd.cof.left + this.data.dnd.cw) {
-								if(this.data.dnd.i1) { clearInterval(this.data.dnd.i1); }
-								this.data.dnd.i1 = setInterval($.proxy(function () { this.scrollLeft += $.vakata.dnd.scroll_spd; }, cnt), 100);
-							}
-							else if(e.pageX - 24 < this.data.dnd.cof.left) {
-								if(this.data.dnd.i1) { clearInterval(this.data.dnd.i1); }
-								this.data.dnd.i1 = setInterval($.proxy(function () { this.scrollLeft -= $.vakata.dnd.scroll_spd; }, cnt), 100);
-							}
-							else {
-								if(this.data.dnd.i1) { clearInterval(this.data.dnd.i1); }
-							}
-
-							// Vertical scroll
-							if(e.pageY + 24 > this.data.dnd.cof.top + this.data.dnd.ch) {
-								if(this.data.dnd.i2) { clearInterval(this.data.dnd.i2); }
-								this.data.dnd.i2 = setInterval($.proxy(function () { this.scrollTop += $.vakata.dnd.scroll_spd; }, cnt), 100);
-							}
-							else if(e.pageY - 24 < this.data.dnd.cof.top) {
-								if(this.data.dnd.i2) { clearInterval(this.data.dnd.i2); }
-								this.data.dnd.i2 = setInterval($.proxy(function () { this.scrollTop -= $.vakata.dnd.scroll_spd; }, cnt), 100);
-							}
-							else {
-								if(this.data.dnd.i2) { clearInterval(this.data.dnd.i2); }
-							}
-
-						}
-					}, this))
-				.bind("scroll.jstree", $.proxy(function (e) { 
-						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree && m && ml) {
-							m.hide();
-							ml.hide();
-						}
-					}, this))
-				.delegate("a", "mousedown.jstree", $.proxy(function (e) { 
-						if(e.which === 1) {
-							this.start_drag(e.currentTarget, e);
-							return false;
-						}
-					}, this))
-				.delegate("a", "mouseenter.jstree", $.proxy(function (e) { 
-						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree) {
-							this.dnd_enter(e.currentTarget);
-						}
-					}, this))
-				.delegate("a", "mousemove.jstree", $.proxy(function (e) { 
-						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree) {
-							if(!r || !r.length || r.children("a")[0] !== e.currentTarget) {
-								this.dnd_enter(e.currentTarget);
-							}
-							if(typeof this.data.dnd.off.top === "undefined") { this.data.dnd.off = $(e.target).offset(); }
-							this.data.dnd.w = (e.pageY - (this.data.dnd.off.top || 0)) % this.data.core.li_height;
-							if(this.data.dnd.w < 0) { this.data.dnd.w += this.data.core.li_height; }
-							this.dnd_show();
-						}
-					}, this))
-				.delegate("a", "mouseleave.jstree", $.proxy(function (e) { 
-						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree) {
-							if(e.relatedTarget && e.relatedTarget.id && e.relatedTarget.id === "jstree-marker-line") {
-								return false; 
-							}
-								if(m) { m.hide(); }
-								if(ml) { ml.hide(); }
-							/*
-							var ec = $(e.currentTarget).closest("li"), 
-								er = $(e.relatedTarget).closest("li");
-							if(er[0] !== ec.prev()[0] && er[0] !== ec.next()[0]) {
-								if(m) { m.hide(); }
-								if(ml) { ml.hide(); }
-							}
-							*/
-							this.data.dnd.mto = setTimeout( 
-								(function (t) { return function () { t.dnd_leave(e); }; })(this),
-							0);
-						}
-					}, this))
-				.delegate("a", "mouseup.jstree", $.proxy(function (e) { 
-						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree) {
-							this.dnd_finish(e);
-						}
-					}, this));
-
-			$(document)
-				.bind("drag_stop.vakata", $.proxy(function () {
-						if(this.data.dnd.to1) { clearTimeout(this.data.dnd.to1); }
-						if(this.data.dnd.to2) { clearTimeout(this.data.dnd.to2); }
-						if(this.data.dnd.i1) { clearInterval(this.data.dnd.i1); }
-						if(this.data.dnd.i2) { clearInterval(this.data.dnd.i2); }
-						this.data.dnd.after		= false;
-						this.data.dnd.before	= false;
-						this.data.dnd.inside	= false;
-						this.data.dnd.off		= false;
-						this.data.dnd.prepared	= false;
-						this.data.dnd.w			= false;
-						this.data.dnd.to1		= false;
-						this.data.dnd.to2		= false;
-						this.data.dnd.i1		= false;
-						this.data.dnd.i2		= false;
-						this.data.dnd.active	= false;
-						this.data.dnd.foreign	= false;
-						if(m) { m.css({ "top" : "-2000px" }); }
-						if(ml) { ml.css({ "top" : "-2000px" }); }
-					}, this))
-				.bind("drag_start.vakata", $.proxy(function (e, data) {
-						if(data.data.jstree) { 
-							var et = $(data.event.target);
-							if(et.closest(".jstree").hasClass("jstree-" + this.get_index())) {
-								this.dnd_enter(et);
-							}
-						}
-					}, this));
-				/*
-				.bind("keydown.jstree-" + this.get_index() + " keyup.jstree-" + this.get_index(), $.proxy(function(e) {
-						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree && !this.data.dnd.foreign) {
-							var h = $.vakata.dnd.helper.children("ins");
-							if(e[this._get_settings().dnd.copy_modifier + "Key"] && h.hasClass("jstree-ok")) {
-								h.parent().html(h.parent().html().replace(/ \(Copy\)$/, "") + " (Copy)");
-							} 
-							else {
-								h.parent().html(h.parent().html().replace(/ \(Copy\)$/, ""));
-							}
-						}
-					}, this)); */
-
-
-
-			var s = this._get_settings().dnd;
-			if(s.drag_target) {
-				$(document)
-					.delegate(s.drag_target, "mousedown.jstree-" + this.get_index(), $.proxy(function (e) {
-						o = e.target;
-						$.vakata.dnd.drag_start(e, { jstree : true, obj : e.target }, "<ins class='jstree-icon'></ins>" + $(e.target).text() );
-						if(this.data.themes) { 
-							if(m) { m.attr("class", "jstree-" + this.data.themes.theme); }
-							if(ml) { ml.attr("class", "jstree-" + this.data.themes.theme); }
-							$.vakata.dnd.helper.attr("class", "jstree-dnd-helper jstree-" + this.data.themes.theme); 
-						}
-						$.vakata.dnd.helper.children("ins").attr("class","jstree-invalid");
-						var cnt = this.get_container();
-						this.data.dnd.cof = cnt.offset();
-						this.data.dnd.cw = parseInt(cnt.width(),10);
-						this.data.dnd.ch = parseInt(cnt.height(),10);
-						this.data.dnd.foreign = true;
-						e.preventDefault();
-					}, this));
-			}
-			if(s.drop_target) {
-				$(document)
-					.delegate(s.drop_target, "mouseenter.jstree-" + this.get_index(), $.proxy(function (e) {
-							if(this.data.dnd.active && this._get_settings().dnd.drop_check.call(this, { "o" : o, "r" : $(e.target), "e" : e })) {
-								$.vakata.dnd.helper.children("ins").attr("class","jstree-ok");
-							}
-						}, this))
-					.delegate(s.drop_target, "mouseleave.jstree-" + this.get_index(), $.proxy(function (e) {
-							if(this.data.dnd.active) {
-								$.vakata.dnd.helper.children("ins").attr("class","jstree-invalid");
-							}
-						}, this))
-					.delegate(s.drop_target, "mouseup.jstree-" + this.get_index(), $.proxy(function (e) {
-							if(this.data.dnd.active && $.vakata.dnd.helper.children("ins").hasClass("jstree-ok")) {
-								this._get_settings().dnd.drop_finish.call(this, { "o" : o, "r" : $(e.target), "e" : e });
-							}
-						}, this));
-			}
-		},
-		defaults : {
-			copy_modifier	: "ctrl",
-			check_timeout	: 100,
-			open_timeout	: 500,
-			drop_target		: ".jstree-drop",
-			drop_check		: function (data) { return true; },
-			drop_finish		: $.noop,
-			drag_target		: ".jstree-draggable",
-			drag_finish		: $.noop,
-			drag_check		: function (data) { return { after : false, before : false, inside : true }; }
-		},
-		_fn : {
-			dnd_prepare : function () {
-				if(!r || !r.length) { return; }
-				this.data.dnd.off = r.offset();
-				if(this._get_settings().core.rtl) {
-					this.data.dnd.off.right = this.data.dnd.off.left + r.width();
-				}
-				if(this.data.dnd.foreign) {
-					var a = this._get_settings().dnd.drag_check.call(this, { "o" : o, "r" : r });
-					this.data.dnd.after = a.after;
-					this.data.dnd.before = a.before;
-					this.data.dnd.inside = a.inside;
-					this.data.dnd.prepared = true;
-					return this.dnd_show();
-				}
-				this.prepare_move(o, r, "before");
-				this.data.dnd.before = this.check_move();
-				this.prepare_move(o, r, "after");
-				this.data.dnd.after = this.check_move();
-				if(this._is_loaded(r)) {
-					this.prepare_move(o, r, "inside");
-					this.data.dnd.inside = this.check_move();
-				}
-				else {
-					this.data.dnd.inside = false;
-				}
-				this.data.dnd.prepared = true;
-				return this.dnd_show();
-			},
-			dnd_show : function () {
-				if(!this.data.dnd.prepared) { return; }
-				var o = ["before","inside","after"],
-					r = false,
-					rtl = this._get_settings().core.rtl,
-					pos;
-				if(this.data.dnd.w < this.data.core.li_height/3) { o = ["before","inside","after"]; }
-				else if(this.data.dnd.w <= this.data.core.li_height*2/3) {
-					o = this.data.dnd.w < this.data.core.li_height/2 ? ["inside","before","after"] : ["inside","after","before"];
-				}
-				else { o = ["after","inside","before"]; }
-				$.each(o, $.proxy(function (i, val) { 
-					if(this.data.dnd[val]) {
-						$.vakata.dnd.helper.children("ins").attr("class","jstree-ok");
-						r = val;
-						return false;
-					}
-				}, this));
-				if(r === false) { $.vakata.dnd.helper.children("ins").attr("class","jstree-invalid"); }
-				
-				pos = rtl ? (this.data.dnd.off.right - 18) : (this.data.dnd.off.left + 10);
-				switch(r) {
-					case "before":
-						m.css({ "left" : pos + "px", "top" : (this.data.dnd.off.top - 6) + "px" }).show();
-						if(ml) { ml.css({ "left" : (pos + 8) + "px", "top" : (this.data.dnd.off.top - 1) + "px" }).show(); }
-						break;
-					case "after":
-						m.css({ "left" : pos + "px", "top" : (this.data.dnd.off.top + this.data.core.li_height - 6) + "px" }).show();
-						if(ml) { ml.css({ "left" : (pos + 8) + "px", "top" : (this.data.dnd.off.top + this.data.core.li_height - 1) + "px" }).show(); }
-						break;
-					case "inside":
-						m.css({ "left" : pos + ( rtl ? -4 : 4) + "px", "top" : (this.data.dnd.off.top + this.data.core.li_height/2 - 5) + "px" }).show();
-						if(ml) { ml.hide(); }
-						break;
-					default:
-						m.hide();
-						if(ml) { ml.hide(); }
-						break;
-				}
-				last_pos = r;
-				return r;
-			},
-			dnd_open : function () {
-				this.data.dnd.to2 = false;
-				this.open_node(r, $.proxy(this.dnd_prepare,this), true);
-			},
-			dnd_finish : function (e) {
-				if(this.data.dnd.foreign) {
-					if(this.data.dnd.after || this.data.dnd.before || this.data.dnd.inside) {
-						this._get_settings().dnd.drag_finish.call(this, { "o" : o, "r" : r, "p" : last_pos });
-					}
-				}
-				else {
-					this.dnd_prepare();
-					this.move_node(o, r, last_pos, e[this._get_settings().dnd.copy_modifier + "Key"]);
-				}
-				o = false;
-				r = false;
-				m.hide();
-				if(ml) { ml.hide(); }
-			},
-			dnd_enter : function (obj) {
-				if(this.data.dnd.mto) { 
-					clearTimeout(this.data.dnd.mto);
-					this.data.dnd.mto = false;
-				}
-				var s = this._get_settings().dnd;
-				this.data.dnd.prepared = false;
-				r = this._get_node(obj);
-				if(s.check_timeout) { 
-					// do the calculations after a minimal timeout (users tend to drag quickly to the desired location)
-					if(this.data.dnd.to1) { clearTimeout(this.data.dnd.to1); }
-					this.data.dnd.to1 = setTimeout($.proxy(this.dnd_prepare, this), s.check_timeout); 
-				}
-				else { 
-					this.dnd_prepare(); 
-				}
-				if(s.open_timeout) { 
-					if(this.data.dnd.to2) { clearTimeout(this.data.dnd.to2); }
-					if(r && r.length && r.hasClass("jstree-closed")) { 
-						// if the node is closed - open it, then recalculate
-						this.data.dnd.to2 = setTimeout($.proxy(this.dnd_open, this), s.open_timeout);
-					}
-				}
-				else {
-					if(r && r.length && r.hasClass("jstree-closed")) { 
-						this.dnd_open();
-					}
-				}
-			},
-			dnd_leave : function (e) {
-				this.data.dnd.after		= false;
-				this.data.dnd.before	= false;
-				this.data.dnd.inside	= false;
-				$.vakata.dnd.helper.children("ins").attr("class","jstree-invalid");
-				m.hide();
-				if(ml) { ml.hide(); }
-				if(r && r[0] === e.target.parentNode) {
-					if(this.data.dnd.to1) {
-						clearTimeout(this.data.dnd.to1);
-						this.data.dnd.to1 = false;
-					}
-					if(this.data.dnd.to2) {
-						clearTimeout(this.data.dnd.to2);
-						this.data.dnd.to2 = false;
-					}
-				}
-			},
-			start_drag : function (obj, e) {
-				o = this._get_node(obj);
-				if(this.data.ui && this.is_selected(o)) { o = this._get_node(null, true); }
-				var dt = o.length > 1 ? this._get_string("multiple_selection") : this.get_text(o),
-					cnt = this.get_container();
-				if(!this._get_settings().core.html_titles) { dt = dt.replace(/</ig,"&lt;").replace(/>/ig,"&gt;"); }
-				$.vakata.dnd.drag_start(e, { jstree : true, obj : o }, "<ins class='jstree-icon'></ins>" + dt );
-				if(this.data.themes) { 
-					if(m) { m.attr("class", "jstree-" + this.data.themes.theme); }
-					if(ml) { ml.attr("class", "jstree-" + this.data.themes.theme); }
-					$.vakata.dnd.helper.attr("class", "jstree-dnd-helper jstree-" + this.data.themes.theme); 
-				}
-				this.data.dnd.cof = cnt.offset();
-				this.data.dnd.cw = parseInt(cnt.width(),10);
-				this.data.dnd.ch = parseInt(cnt.height(),10);
-				this.data.dnd.active = true;
-			}
-		}
-	});
-	$(function() {
-		var css_string = '' + 
-			'#vakata-dragged ins { display:block; text-decoration:none; width:16px; height:16px; margin:0 0 0 0; padding:0; position:absolute; top:4px; left:4px; ' + 
-			' -moz-border-radius:4px; border-radius:4px; -webkit-border-radius:4px; ' +
-			'} ' + 
-			'#vakata-dragged .jstree-ok { background:green; } ' + 
-			'#vakata-dragged .jstree-invalid { background:red; } ' + 
-			'#jstree-marker { padding:0; margin:0; font-size:12px; overflow:hidden; height:12px; width:8px; position:absolute; top:-30px; z-index:10001; background-repeat:no-repeat; display:none; background-color:transparent; text-shadow:1px 1px 1px white; color:black; line-height:10px; } ' + 
-			'#jstree-marker-line { padding:0; margin:0; line-height:0%; font-size:1px; overflow:hidden; height:1px; width:100px; position:absolute; top:-30px; z-index:10000; background-repeat:no-repeat; display:none; background-color:#456c43; ' + 
-			' cursor:pointer; border:1px solid #eeeeee; border-left:0; -moz-box-shadow: 0px 0px 2px #666; -webkit-box-shadow: 0px 0px 2px #666; box-shadow: 0px 0px 2px #666; ' + 
-			' -moz-border-radius:1px; border-radius:1px; -webkit-border-radius:1px; ' +
-			'}' + 
-			'';
-		$.vakata.css.add_sheet({ str : css_string, title : "jstree" });
-		m = $("<div />").attr({ id : "jstree-marker" }).hide().html("&raquo;")
-			.bind("mouseleave mouseenter", function (e) { 
-				m.hide();
-				ml.hide();
-				e.preventDefault(); 
-				e.stopImmediatePropagation(); 
-				return false; 
-			})
-			.appendTo("body");
-		ml = $("<div />").attr({ id : "jstree-marker-line" }).hide()
-			.bind("mouseup", function (e) { 
-				if(r && r.length) { 
-					r.children("a").trigger(e); 
-					e.preventDefault(); 
-					e.stopImmediatePropagation(); 
-					return false; 
-				} 
-			})
-			.bind("mouseleave", function (e) { 
-				var rt = $(e.relatedTarget);
-				if(rt.is(".jstree") || rt.closest(".jstree").length === 0) {
-					if(r && r.length) { 
-						r.children("a").trigger(e); 
-						m.hide();
-						ml.hide();
-						e.preventDefault(); 
-						e.stopImmediatePropagation(); 
-						return false; 
-					}
-				}
-			})
-			.appendTo("body");
-		$(document).bind("drag_start.vakata", function (e, data) {
-			if(data.data.jstree) { m.show(); if(ml) { ml.show(); } }
-		});
-		$(document).bind("drag_stop.vakata", function (e, data) {
-			if(data.data.jstree) { m.hide(); if(ml) { ml.hide(); } }
-		});
-	});
-})(jQuery);
-//*/
-
-/*
- * jsTree checkbox plugin
- * Inserts checkboxes in front of every node
- * Depends on the ui plugin
- * DOES NOT WORK NICELY WITH MULTITREE DRAG'N'DROP
- */
-(function ($) {
-	$.jstree.plugin("checkbox", {
-		__init : function () {
-			this.data.checkbox.noui = this._get_settings().checkbox.override_ui;
-			if(this.data.ui && this.data.checkbox.noui) {
-				this.select_node = this.deselect_node = this.deselect_all = $.noop;
-				this.get_selected = this.get_checked;
-			}
-
-			this.get_container()
-				.bind("open_node.jstree create_node.jstree clean_node.jstree refresh.jstree", $.proxy(function (e, data) { 
-						this._prepare_checkboxes(data.rslt.obj);
-					}, this))
-				.bind("loaded.jstree", $.proxy(function (e) {
-						this._prepare_checkboxes();
-					}, this))
-				.delegate( (this.data.ui && this.data.checkbox.noui ? "a" : "ins.jstree-checkbox") , "click.jstree", $.proxy(function (e) {
-						e.preventDefault();
-						if(this._get_node(e.target).hasClass("jstree-checked")) { this.uncheck_node(e.target); }
-						else { this.check_node(e.target); }
-						if(this.data.ui && this.data.checkbox.noui) {
-							this.save_selected();
-							if(this.data.cookies) { this.save_cookie("select_node"); }
-						}
-						else {
-							e.stopImmediatePropagation();
-							return false;
-						}
-					}, this));
-		},
-		defaults : {
-			override_ui : false,
-			two_state : false,
-			real_checkboxes : false,
-			checked_parent_open : true,
-			real_checkboxes_names : function (n) { return [ ("check_" + (n[0].id || Math.ceil(Math.random() * 10000))) , 1]; }
-		},
-		__destroy : function () {
-			this.get_container()
-				.find("input.jstree-real-checkbox").removeClass("jstree-real-checkbox").end()
-				.find("ins.jstree-checkbox").remove();
-		},
-		_fn : {
-			_checkbox_notify : function (n, data) {
-				if(data.checked) {
-					this.check_node(n, false);
-				}
-			},
-			_prepare_checkboxes : function (obj) {
-				obj = !obj || obj == -1 ? this.get_container().find("> ul > li") : this._get_node(obj);
-				if(obj === false) { return; } // added for removing root nodes
-				var c, _this = this, t, ts = this._get_settings().checkbox.two_state, rc = this._get_settings().checkbox.real_checkboxes, rcn = this._get_settings().checkbox.real_checkboxes_names;
-				obj.each(function () {
-					t = $(this);
-					c = t.is("li") && (t.hasClass("jstree-checked") || (rc && t.children(":checked").length)) ? "jstree-checked" : "jstree-unchecked";
-					t.find("li").addBack().each(function () {
-						var $t = $(this), nm;
-						$t.children("a" + (_this.data.languages ? "" : ":eq(0)") ).not(":has(.jstree-checkbox)").prepend("<ins class='jstree-checkbox'>&#160;</ins>").parent().not(".jstree-checked, .jstree-unchecked").addClass( ts ? "jstree-unchecked" : c );
-						if(rc) {
-							if(!$t.children(":checkbox").length) {
-								nm = rcn.call(_this, $t);
-								$t.prepend("<input type='checkbox' class='jstree-real-checkbox' id='" + nm[0] + "' name='" + nm[0] + "' value='" + nm[1] + "' />");
-							}
-							else {
-								$t.children(":checkbox").addClass("jstree-real-checkbox");
-							}
-						}
-						if(!ts) {
-							if(c === "jstree-checked" || $t.hasClass("jstree-checked") || $t.children(':checked').length) {
-								$t.find("li").addBack().addClass("jstree-checked").children(":checkbox").prop("checked", true);
-							}
-						}
-						else {
-							if($t.hasClass("jstree-checked") || $t.children(':checked').length) {
-								$t.addClass("jstree-checked").children(":checkbox").prop("checked", true);
-							}
-						}
-					});
-				});
-				if(!ts) {
-					obj.find(".jstree-checked").parent().parent().each(function () { _this._repair_state(this); }); 
-				}
-			},
-			change_state : function (obj, state) {
-				obj = this._get_node(obj);
-				var coll = false, rc = this._get_settings().checkbox.real_checkboxes;
-				if(!obj || obj === -1) { return false; }
-				state = (state === false || state === true) ? state : obj.hasClass("jstree-checked");
-				if(this._get_settings().checkbox.two_state) {
-					if(state) { 
-						obj.removeClass("jstree-checked").addClass("jstree-unchecked"); 
-						if(rc) { obj.children(":checkbox").prop("checked", false); }
-					}
-					else { 
-						obj.removeClass("jstree-unchecked").addClass("jstree-checked"); 
-						if(rc) { obj.children(":checkbox").prop("checked", true); }
-					}
-				}
-				else {
-					if(state) { 
-						coll = obj.find("li").addBack();
-						if(!coll.filter(".jstree-checked, .jstree-undetermined").length) { return false; }
-						coll.removeClass("jstree-checked jstree-undetermined").addClass("jstree-unchecked"); 
-						if(rc) { coll.children(":checkbox").prop("checked", false); }
-					}
-					else { 
-						coll = obj.find("li").addBack();
-						if(!coll.filter(".jstree-unchecked, .jstree-undetermined").length) { return false; }
-						coll.removeClass("jstree-unchecked jstree-undetermined").addClass("jstree-checked"); 
-						if(rc) { coll.children(":checkbox").prop("checked", true); }
-						if(this.data.ui) { this.data.ui.last_selected = obj; }
-						this.data.checkbox.last_selected = obj;
-					}
-					obj.parentsUntil(".jstree", "li").each(function () {
-						var $this = $(this);
-						if(state) {
-							if($this.children("ul").children("li.jstree-checked, li.jstree-undetermined").length) {
-								$this.parentsUntil(".jstree", "li").addBack().removeClass("jstree-checked jstree-unchecked").addClass("jstree-undetermined");
-								if(rc) { $this.parentsUntil(".jstree", "li").addBack().children(":checkbox").prop("checked", false); }
-								return false;
-							}
-							else {
-								$this.removeClass("jstree-checked jstree-undetermined").addClass("jstree-unchecked");
-								if(rc) { $this.children(":checkbox").prop("checked", false); }
-							}
-						}
-						else {
-							if($this.children("ul").children("li.jstree-unchecked, li.jstree-undetermined").length) {
-								$this.parentsUntil(".jstree", "li").addBack().removeClass("jstree-checked jstree-unchecked").addClass("jstree-undetermined");
-								if(rc) { $this.parentsUntil(".jstree", "li").addBack().children(":checkbox").prop("checked", false); }
-								return false;
-							}
-							else {
-								$this.removeClass("jstree-unchecked jstree-undetermined").addClass("jstree-checked");
-								if(rc) { $this.children(":checkbox").prop("checked", true); }
-							}
-						}
-					});
-				}
-				if(this.data.ui && this.data.checkbox.noui) { this.data.ui.selected = this.get_checked(); }
-				this.__callback(obj);
-				return true;
-			},
-			check_node : function (obj) {
-				if(this.change_state(obj, false)) { 
-					obj = this._get_node(obj);
-					if(this._get_settings().checkbox.checked_parent_open) {
-						var t = this;
-						obj.parents(".jstree-closed").each(function () { t.open_node(this, false, true); });
-					}
-					this.__callback({ "obj" : obj }); 
-				}
-			},
-			uncheck_node : function (obj) {
-				if(this.change_state(obj, true)) { this.__callback({ "obj" : this._get_node(obj) }); }
-			},
-			check_all : function () {
-				var _this = this, 
-					coll = this._get_settings().checkbox.two_state ? this.get_container_ul().find("li") : this.get_container_ul().children("li");
-				coll.each(function () {
-					_this.change_state(this, false);
-				});
-				this.__callback();
-			},
-			uncheck_all : function () {
-				var _this = this,
-					coll = this._get_settings().checkbox.two_state ? this.get_container_ul().find("li") : this.get_container_ul().children("li");
-				coll.each(function () {
-					_this.change_state(this, true);
-				});
-				this.__callback();
-			},
-
-			is_checked : function(obj) {
-				obj = this._get_node(obj);
-				return obj.length ? obj.is(".jstree-checked") : false;
-			},
-			get_checked : function (obj, get_all) {
-				obj = !obj || obj === -1 ? this.get_container() : this._get_node(obj);
-				return get_all || this._get_settings().checkbox.two_state ? obj.find(".jstree-checked") : obj.find("> ul > .jstree-checked, .jstree-undetermined > ul > .jstree-checked");
-			},
-			get_unchecked : function (obj, get_all) { 
-				obj = !obj || obj === -1 ? this.get_container() : this._get_node(obj);
-				return get_all || this._get_settings().checkbox.two_state ? obj.find(".jstree-unchecked") : obj.find("> ul > .jstree-unchecked, .jstree-undetermined > ul > .jstree-unchecked");
-			},
-
-			show_checkboxes : function () { this.get_container().children("ul").removeClass("jstree-no-checkboxes"); },
-			hide_checkboxes : function () { this.get_container().children("ul").addClass("jstree-no-checkboxes"); },
-
-			_repair_state : function (obj) {
-				obj = this._get_node(obj);
-				if(!obj.length) { return; }
-				if(this._get_settings().checkbox.two_state) {
-					obj.find('li').addBack().not('.jstree-checked').removeClass('jstree-undetermined').addClass('jstree-unchecked').children(':checkbox').prop('checked', true);
-					return;
-				}
-				var rc = this._get_settings().checkbox.real_checkboxes,
-					a = obj.find("> ul > .jstree-checked").length,
-					b = obj.find("> ul > .jstree-undetermined").length,
-					c = obj.find("> ul > li").length;
-				if(c === 0) { if(obj.hasClass("jstree-undetermined")) { this.change_state(obj, false); } }
-				else if(a === 0 && b === 0) { this.change_state(obj, true); }
-				else if(a === c) { this.change_state(obj, false); }
-				else { 
-					obj.parentsUntil(".jstree","li").addBack().removeClass("jstree-checked jstree-unchecked").addClass("jstree-undetermined");
-					if(rc) { obj.parentsUntil(".jstree", "li").addBack().children(":checkbox").prop("checked", false); }
-				}
-			},
-			reselect : function () {
-				if(this.data.ui && this.data.checkbox.noui) { 
-					var _this = this,
-						s = this.data.ui.to_select;
-					s = $.map($.makeArray(s), function (n) { return "#" + n.toString().replace(/^#/,"").replace(/\\\//g,"/").replace(/\//g,"\\\/").replace(/\\\./g,".").replace(/\./g,"\\.").replace(/\:/g,"\\:"); });
-					this.deselect_all();
-					$.each(s, function (i, val) { _this.check_node(val); });
-					this.__callback();
-				}
-				else { 
-					this.__call_old(); 
-				}
-			},
-			save_loaded : function () {
-				var _this = this;
-				this.data.core.to_load = [];
-				this.get_container_ul().find("li.jstree-closed.jstree-undetermined").each(function () {
-					if(this.id) { _this.data.core.to_load.push("#" + this.id); }
-				});
-			}
-		}
-	});
-	$(function() {
-		var css_string = '.jstree .jstree-real-checkbox { display:none; } ';
-		$.vakata.css.add_sheet({ str : css_string, title : "jstree" });
-	});
-})(jQuery);
-//*/
-
-/* 
- * jsTree XML plugin
- * The XML data store. Datastores are build by overriding the `load_node` and `_is_loaded` functions.
- */
-(function ($) {
-	$.vakata.xslt = function (xml, xsl, callback) {
-		var r = false, p, q, s;
-		// IE9
-		if(r === false && window.ActiveXObject) {
-			try {
-				r = new ActiveXObject("Msxml2.XSLTemplate");
-				q = new ActiveXObject("Msxml2.DOMDocument");
-				q.loadXML(xml);
-				s = new ActiveXObject("Msxml2.FreeThreadedDOMDocument");
-				s.loadXML(xsl);
-				r.stylesheet = s;
-				p = r.createProcessor();
-				p.input = q;
-				p.transform();
-				r = p.output;
-			}
-			catch (e) { }
-		}
-		xml = $.parseXML(xml);
-		xsl = $.parseXML(xsl);
-		// FF, Chrome
-		if(r === false && typeof (XSLTProcessor) !== "undefined") {
-			p = new XSLTProcessor();
-			p.importStylesheet(xsl);
-			r = p.transformToFragment(xml, document);
-			r = $('<div />').append(r).html();
-		}
-		// OLD IE
-		if(r === false && typeof (xml.transformNode) !== "undefined") {
-			r = xml.transformNode(xsl);
-		}
-		callback.call(null, r);
-	};
-	var xsl = {
-		'nest' : '<' + '?xml version="1.0" encoding="utf-8" ?>' + 
-			'<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >' + 
-			'<xsl:output method="html" encoding="utf-8" omit-xml-declaration="yes" standalone="no" indent="no" media-type="text/html" />' + 
-			'<xsl:template match="/">' + 
-			'	<xsl:call-template name="nodes">' + 
-			'		<xsl:with-param name="node" select="/root" />' + 
-			'	</xsl:call-template>' + 
-			'</xsl:template>' + 
-			'<xsl:template name="nodes">' + 
-			'	<xsl:param name="node" />' + 
-			'	<ul>' + 
-			'	<xsl:for-each select="$node/item">' + 
-			'		<xsl:variable name="children" select="count(./item) &gt; 0" />' + 
-			'		<li>' + 
-			'			<xsl:attribute name="class">' + 
-			'				<xsl:if test="position() = last()">jstree-last </xsl:if>' + 
-			'				<xsl:choose>' + 
-			'					<xsl:when test="@state = \'open\'">jstree-open </xsl:when>' + 
-			'					<xsl:when test="$children or @hasChildren or @state = \'closed\'">jstree-closed </xsl:when>' + 
-			'					<xsl:otherwise>jstree-leaf </xsl:otherwise>' + 
-			'				</xsl:choose>' + 
-			'				<xsl:value-of select="@class" />' + 
-			'			</xsl:attribute>' + 
-			'			<xsl:for-each select="@*">' + 
-			'				<xsl:if test="name() != \'class\' and name() != \'state\' and name() != \'hasChildren\'">' + 
-			'					<xsl:attribute name="{name()}"><xsl:value-of select="." /></xsl:attribute>' + 
-			'				</xsl:if>' + 
-			'			</xsl:for-each>' + 
-			'	<ins class="jstree-icon"><xsl:text>&#xa0;</xsl:text></ins>' + 
-			'			<xsl:for-each select="content/name">' + 
-			'				<a>' + 
-			'				<xsl:attribute name="href">' + 
-			'					<xsl:choose>' + 
-			'					<xsl:when test="@href"><xsl:value-of select="@href" /></xsl:when>' + 
-			'					<xsl:otherwise>#</xsl:otherwise>' + 
-			'					</xsl:choose>' + 
-			'				</xsl:attribute>' + 
-			'				<xsl:attribute name="class"><xsl:value-of select="@lang" /> <xsl:value-of select="@class" /></xsl:attribute>' + 
-			'				<xsl:attribute name="style"><xsl:value-of select="@style" /></xsl:attribute>' + 
-			'				<xsl:for-each select="@*">' + 
-			'					<xsl:if test="name() != \'style\' and name() != \'class\' and name() != \'href\'">' + 
-			'						<xsl:attribute name="{name()}"><xsl:value-of select="." /></xsl:attribute>' + 
-			'					</xsl:if>' + 
-			'				</xsl:for-each>' + 
-			'					<ins>' + 
-			'						<xsl:attribute name="class">jstree-icon ' + 
-			'							<xsl:if test="string-length(attribute::icon) > 0 and not(contains(@icon,\'/\'))"><xsl:value-of select="@icon" /></xsl:if>' + 
-			'						</xsl:attribute>' + 
-			'						<xsl:if test="string-length(attribute::icon) > 0 and contains(@icon,\'/\')"><xsl:attribute name="style">background:url(<xsl:value-of select="@icon" />) center center no-repeat;</xsl:attribute></xsl:if>' + 
-			'						<xsl:text>&#xa0;</xsl:text>' + 
-			'					</ins>' + 
-			'					<xsl:copy-of select="./child::node()" />' + 
-			'				</a>' + 
-			'			</xsl:for-each>' + 
-			'			<xsl:if test="$children or @hasChildren"><xsl:call-template name="nodes"><xsl:with-param name="node" select="current()" /></xsl:call-template></xsl:if>' + 
-			'		</li>' + 
-			'	</xsl:for-each>' + 
-			'	</ul>' + 
-			'</xsl:template>' + 
-			'</xsl:stylesheet>',
-
-		'flat' : '<' + '?xml version="1.0" encoding="utf-8" ?>' + 
-			'<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >' + 
-			'<xsl:output method="html" encoding="utf-8" omit-xml-declaration="yes" standalone="no" indent="no" media-type="text/xml" />' + 
-			'<xsl:template match="/">' + 
-			'	<ul>' + 
-			'	<xsl:for-each select="//item[not(@parent_id) or @parent_id=0 or not(@parent_id = //item/@id)]">' + /* the last `or` may be removed */
-			'		<xsl:call-template name="nodes">' + 
-			'			<xsl:with-param name="node" select="." />' + 
-			'			<xsl:with-param name="is_last" select="number(position() = last())" />' + 
-			'		</xsl:call-template>' + 
-			'	</xsl:for-each>' + 
-			'	</ul>' + 
-			'</xsl:template>' + 
-			'<xsl:template name="nodes">' + 
-			'	<xsl:param name="node" />' + 
-			'	<xsl:param name="is_last" />' + 
-			'	<xsl:variable name="children" select="count(//item[@parent_id=$node/attribute::id]) &gt; 0" />' + 
-			'	<li>' + 
-			'	<xsl:attribute name="class">' + 
-			'		<xsl:if test="$is_last = true()">jstree-last </xsl:if>' + 
-			'		<xsl:choose>' + 
-			'			<xsl:when test="@state = \'open\'">jstree-open </xsl:when>' + 
-			'			<xsl:when test="$children or @hasChildren or @state = \'closed\'">jstree-closed </xsl:when>' + 
-			'			<xsl:otherwise>jstree-leaf </xsl:otherwise>' + 
-			'		</xsl:choose>' + 
-			'		<xsl:value-of select="@class" />' + 
-			'	</xsl:attribute>' + 
-			'	<xsl:for-each select="@*">' + 
-			'		<xsl:if test="name() != \'parent_id\' and name() != \'hasChildren\' and name() != \'class\' and name() != \'state\'">' + 
-			'		<xsl:attribute name="{name()}"><xsl:value-of select="." /></xsl:attribute>' + 
-			'		</xsl:if>' + 
-			'	</xsl:for-each>' + 
-			'	<ins class="jstree-icon"><xsl:text>&#xa0;</xsl:text></ins>' + 
-			'	<xsl:for-each select="content/name">' + 
-			'		<a>' + 
-			'		<xsl:attribute name="href">' + 
-			'			<xsl:choose>' + 
-			'			<xsl:when test="@href"><xsl:value-of select="@href" /></xsl:when>' + 
-			'			<xsl:otherwise>#</xsl:otherwise>' + 
-			'			</xsl:choose>' + 
-			'		</xsl:attribute>' + 
-			'		<xsl:attribute name="class"><xsl:value-of select="@lang" /> <xsl:value-of select="@class" /></xsl:attribute>' + 
-			'		<xsl:attribute name="style"><xsl:value-of select="@style" /></xsl:attribute>' + 
-			'		<xsl:for-each select="@*">' + 
-			'			<xsl:if test="name() != \'style\' and name() != \'class\' and name() != \'href\'">' + 
-			'				<xsl:attribute name="{name()}"><xsl:value-of select="." /></xsl:attribute>' + 
-			'			</xsl:if>' + 
-			'		</xsl:for-each>' + 
-			'			<ins>' + 
-			'				<xsl:attribute name="class">jstree-icon ' + 
-			'					<xsl:if test="string-length(attribute::icon) > 0 and not(contains(@icon,\'/\'))"><xsl:value-of select="@icon" /></xsl:if>' + 
-			'				</xsl:attribute>' + 
-			'				<xsl:if test="string-length(attribute::icon) > 0 and contains(@icon,\'/\')"><xsl:attribute name="style">background:url(<xsl:value-of select="@icon" />) center center no-repeat;</xsl:attribute></xsl:if>' + 
-			'				<xsl:text>&#xa0;</xsl:text>' + 
-			'			</ins>' + 
-			'			<xsl:copy-of select="./child::node()" />' + 
-			'		</a>' + 
-			'	</xsl:for-each>' + 
-			'	<xsl:if test="$children">' + 
-			'		<ul>' + 
-			'		<xsl:for-each select="//item[@parent_id=$node/attribute::id]">' + 
-			'			<xsl:call-template name="nodes">' + 
-			'				<xsl:with-param name="node" select="." />' + 
-			'				<xsl:with-param name="is_last" select="number(position() = last())" />' + 
-			'			</xsl:call-template>' + 
-			'		</xsl:for-each>' + 
-			'		</ul>' + 
-			'	</xsl:if>' + 
-			'	</li>' + 
-			'</xsl:template>' + 
-			'</xsl:stylesheet>'
-	},
-	escape_xml = function(string) {
-		return string
-			.toString()
-			.replace(/&/g, '&amp;')
-			.replace(/</g, '&lt;')
-			.replace(/>/g, '&gt;')
-			.replace(/"/g, '&quot;')
-			.replace(/'/g, '&apos;');
-	};
-	$.jstree.plugin("xml_data", {
-		defaults : { 
-			data : false,
-			ajax : false,
-			xsl : "flat",
-			clean_node : false,
-			correct_state : true,
-			get_skip_empty : false,
-			get_include_preamble : true
-		},
-		_fn : {
-			load_node : function (obj, s_call, e_call) { var _this = this; this.load_node_xml(obj, function () { _this.__callback({ "obj" : _this._get_node(obj) }); s_call.call(this); }, e_call); },
-			_is_loaded : function (obj) { 
-				var s = this._get_settings().xml_data;
-				obj = this._get_node(obj);
-				return obj == -1 || !obj || (!s.ajax && !$.isFunction(s.data)) || obj.is(".jstree-open, .jstree-leaf") || obj.children("ul").children("li").size() > 0;
-			},
-			load_node_xml : function (obj, s_call, e_call) {
-				var s = this.get_settings().xml_data,
-					error_func = function () {},
-					success_func = function () {};
-
-				obj = this._get_node(obj);
-				if(obj && obj !== -1) {
-					if(obj.data("jstree_is_loading")) { return; }
-					else { obj.data("jstree_is_loading",true); }
-				}
-				switch(!0) {
-					case (!s.data && !s.ajax): throw "Neither data nor ajax settings supplied.";
-					case ($.isFunction(s.data)):
-						s.data.call(this, obj, $.proxy(function (d) {
-							this.parse_xml(d, $.proxy(function (d) {
-								if(d) {
-									d = d.replace(/ ?xmlns="[^"]*"/ig, "");
-									if(d.length > 10) {
-										d = $(d);
-										if(obj === -1 || !obj) { this.get_container().children("ul").empty().append(d.children()); }
-										else { obj.children("a.jstree-loading").removeClass("jstree-loading"); obj.append(d); obj.removeData("jstree_is_loading"); }
-										if(s.clean_node) { this.clean_node(obj); }
-										if(s_call) { s_call.call(this); }
-									}
-									else {
-										if(obj && obj !== -1) { 
-											obj.children("a.jstree-loading").removeClass("jstree-loading");
-											obj.removeData("jstree_is_loading");
-											if(s.correct_state) { 
-												this.correct_state(obj);
-												if(s_call) { s_call.call(this); } 
-											}
-										}
-										else {
-											if(s.correct_state) { 
-												this.get_container().children("ul").empty();
-												if(s_call) { s_call.call(this); } 
-											}
-										}
-									}
-								}
-							}, this));
-						}, this));
-						break;
-					case (!!s.data && !s.ajax) || (!!s.data && !!s.ajax && (!obj || obj === -1)):
-						if(!obj || obj == -1) {
-							this.parse_xml(s.data, $.proxy(function (d) {
-								if(d) {
-									d = d.replace(/ ?xmlns="[^"]*"/ig, "");
-									if(d.length > 10) {
-										d = $(d);
-										this.get_container().children("ul").empty().append(d.children());
-										if(s.clean_node) { this.clean_node(obj); }
-										if(s_call) { s_call.call(this); }
-									}
-								}
-								else { 
-									if(s.correct_state) { 
-										this.get_container().children("ul").empty(); 
-										if(s_call) { s_call.call(this); }
-									}
-								}
-							}, this));
-						}
-						break;
-					case (!s.data && !!s.ajax) || (!!s.data && !!s.ajax && obj && obj !== -1):
-						error_func = function (x, t, e) {
-							var ef = this.get_settings().xml_data.ajax.error; 
-							if(ef) { ef.call(this, x, t, e); }
-							if(obj !== -1 && obj.length) {
-								obj.children("a.jstree-loading").removeClass("jstree-loading");
-								obj.removeData("jstree_is_loading");
-								if(t === "success" && s.correct_state) { this.correct_state(obj); }
-							}
-							else {
-								if(t === "success" && s.correct_state) { this.get_container().children("ul").empty(); }
-							}
-							if(e_call) { e_call.call(this); }
-						};
-						success_func = function (d, t, x) {
-							d = x.responseText;
-							var sf = this.get_settings().xml_data.ajax.success; 
-							if(sf) { d = sf.call(this,d,t,x) || d; }
-							if(d === "" || (d && d.toString && d.toString().replace(/^[\s\n]+$/,"") === "")) {
-								return error_func.call(this, x, t, "");
-							}
-							this.parse_xml(d, $.proxy(function (d) {
-								if(d) {
-									d = d.replace(/ ?xmlns="[^"]*"/ig, "");
-									if(d.length > 10) {
-										d = $(d);
-										if(obj === -1 || !obj) { this.get_container().children("ul").empty().append(d.children()); }
-										else { obj.children("a.jstree-loading").removeClass("jstree-loading"); obj.append(d); obj.removeData("jstree_is_loading"); }
-										if(s.clean_node) { this.clean_node(obj); }
-										if(s_call) { s_call.call(this); }
-									}
-									else {
-										if(obj && obj !== -1) { 
-											obj.children("a.jstree-loading").removeClass("jstree-loading");
-											obj.removeData("jstree_is_loading");
-											if(s.correct_state) { 
-												this.correct_state(obj);
-												if(s_call) { s_call.call(this); } 
-											}
-										}
-										else {
-											if(s.correct_state) { 
-												this.get_container().children("ul").empty();
-												if(s_call) { s_call.call(this); } 
-											}
-										}
-									}
-								}
-							}, this));
-						};
-						s.ajax.context = this;
-						s.ajax.error = error_func;
-						s.ajax.success = success_func;
-						if(!s.ajax.dataType) { s.ajax.dataType = "xml"; }
-						if($.isFunction(s.ajax.url)) { s.ajax.url = s.ajax.url.call(this, obj); }
-						if($.isFunction(s.ajax.data)) { s.ajax.data = s.ajax.data.call(this, obj); }
-						$.ajax(s.ajax);
-						break;
-				}
-			},
-			parse_xml : function (xml, callback) {
-				var s = this._get_settings().xml_data;
-				$.vakata.xslt(xml, xsl[s.xsl], callback);
-			},
-			get_xml : function (tp, obj, li_attr, a_attr, is_callback) {
-				var result = "", 
-					s = this._get_settings(), 
-					_this = this,
-					tmp1, tmp2, li, a, lang;
-				if(!tp) { tp = "flat"; }
-				if(!is_callback) { is_callback = 0; }
-				obj = this._get_node(obj);
-				if(!obj || obj === -1) { obj = this.get_container().find("> ul > li"); }
-				li_attr = $.isArray(li_attr) ? li_attr : [ "id", "class" ];
-				if(!is_callback && this.data.types && $.inArray(s.types.type_attr, li_attr) === -1) { li_attr.push(s.types.type_attr); }
-
-				a_attr = $.isArray(a_attr) ? a_attr : [ ];
-
-				if(!is_callback) { 
-					if(s.xml_data.get_include_preamble) { 
-						result += '<' + '?xml version="1.0" encoding="UTF-8"?' + '>'; 
-					}
-					result += "<root>"; 
-				}
-				obj.each(function () {
-					result += "<item";
-					li = $(this);
-					$.each(li_attr, function (i, v) { 
-						var t = li.attr(v);
-						if(!s.xml_data.get_skip_empty || typeof t !== "undefined") {
-							result += " " + v + "=\"" + escape_xml((" " + (t || "")).replace(/ jstree[^ ]*/ig,'').replace(/\s+$/ig," ").replace(/^ /,"").replace(/ $/,"")) + "\""; 
-						}
-					});
-					if(li.hasClass("jstree-open")) { result += " state=\"open\""; }
-					if(li.hasClass("jstree-closed")) { result += " state=\"closed\""; }
-					if(tp === "flat") { result += " parent_id=\"" + escape_xml(is_callback) + "\""; }
-					result += ">";
-					result += "<content>";
-					a = li.children("a");
-					a.each(function () {
-						tmp1 = $(this);
-						lang = false;
-						result += "<name";
-						if($.inArray("languages", s.plugins) !== -1) {
-							$.each(s.languages, function (k, z) {
-								if(tmp1.hasClass(z)) { result += " lang=\"" + escape_xml(z) + "\""; lang = z; return false; }
-							});
-						}
-						if(a_attr.length) { 
-							$.each(a_attr, function (k, z) {
-								var t = tmp1.attr(z);
-								if(!s.xml_data.get_skip_empty || typeof t !== "undefined") {
-									result += " " + z + "=\"" + escape_xml((" " + t || "").replace(/ jstree[^ ]*/ig,'').replace(/\s+$/ig," ").replace(/^ /,"").replace(/ $/,"")) + "\"";
-								}
-							});
-						}
-						if(tmp1.children("ins").get(0).className.replace(/jstree[^ ]*|$/ig,'').replace(/^\s+$/ig,"").length) {
-							result += ' icon="' + escape_xml(tmp1.children("ins").get(0).className.replace(/jstree[^ ]*|$/ig,'').replace(/\s+$/ig," ").replace(/^ /,"").replace(/ $/,"")) + '"';
-						}
-						if(tmp1.children("ins").get(0).style.backgroundImage.length) {
-							result += ' icon="' + escape_xml(tmp1.children("ins").get(0).style.backgroundImage.replace("url(","").replace(")","").replace(/'/ig,"").replace(/"/ig,"")) + '"';
-						}
-						result += ">";
-						result += "<![CDATA[" + _this.get_text(tmp1, lang) + "]]>";
-						result += "</name>";
-					});
-					result += "</content>";
-					tmp2 = li[0].id || true;
-					li = li.find("> ul > li");
-					if(li.length) { tmp2 = _this.get_xml(tp, li, li_attr, a_attr, tmp2); }
-					else { tmp2 = ""; }
-					if(tp == "nest") { result += tmp2; }
-					result += "</item>";
-					if(tp == "flat") { result += tmp2; }
-				});
-				if(!is_callback) { result += "</root>"; }
-				return result;
-			}
-		}
-	});
-})(jQuery);
-//*/
-
-/*
- * jsTree search plugin
- * Enables both sync and async search on the tree
- * DOES NOT WORK WITH JSON PROGRESSIVE RENDER
- */
-(function ($) {
-	if($().jquery.split('.')[1] >= 8) {
-		$.expr[':'].jstree_contains = $.expr.createPseudo(function(search) {
-			return function(a) {
-				return (a.textContent || a.innerText || "").toLowerCase().indexOf(search.toLowerCase())>=0;
-			};
-		});
-		$.expr[':'].jstree_title_contains = $.expr.createPseudo(function(search) {
-			return function(a) {
-				return (a.getAttribute("title") || "").toLowerCase().indexOf(search.toLowerCase())>=0;
-			};
-		});
-	}
-	else {
-		$.expr[':'].jstree_contains = function(a,i,m){
-			return (a.textContent || a.innerText || "").toLowerCase().indexOf(m[3].toLowerCase())>=0;
-		};
-		$.expr[':'].jstree_title_contains = function(a,i,m) {
-			return (a.getAttribute("title") || "").toLowerCase().indexOf(m[3].toLowerCase())>=0;
-		};
-	}
-	$.jstree.plugin("search", {
-		__init : function () {
-			this.data.search.str = "";
-			this.data.search.result = $();
-			if(this._get_settings().search.show_only_matches) {
-				this.get_container()
-					.bind("search.jstree", function (e, data) {
-						$(this).children("ul").find("li").hide().removeClass("jstree-last");
-						data.rslt.nodes.parentsUntil(".jstree").addBack().show()
-							.filter("ul").each(function () { $(this).children("li:visible").eq(-1).addClass("jstree-last"); });
-					})
-					.bind("clear_search.jstree", function () {
-						$(this).children("ul").find("li").css("display","").end().end().jstree("clean_node", -1);
-					});
-			}
-		},
-		defaults : {
-			ajax : false,
-			search_method : "jstree_contains", // for case insensitive - jstree_contains
-			show_only_matches : false
-		},
-		_fn : {
-			search : function (str, skip_async) {
-				if($.trim(str) === "") { this.clear_search(); return; }
-				var s = this.get_settings().search, 
-					t = this,
-					error_func = function () { },
-					success_func = function () { };
-				this.data.search.str = str;
-
-				if(!skip_async && s.ajax !== false && this.get_container_ul().find("li.jstree-closed:not(:has(ul)):eq(0)").length > 0) {
-					this.search.supress_callback = true;
-					error_func = function () { };
-					success_func = function (d, t, x) {
-						var sf = this.get_settings().search.ajax.success; 
-						if(sf) { d = sf.call(this,d,t,x) || d; }
-						this.data.search.to_open = d;
-						this._search_open();
-					};
-					s.ajax.context = this;
-					s.ajax.error = error_func;
-					s.ajax.success = success_func;
-					if($.isFunction(s.ajax.url)) { s.ajax.url = s.ajax.url.call(this, str); }
-					if($.isFunction(s.ajax.data)) { s.ajax.data = s.ajax.data.call(this, str); }
-					if(!s.ajax.data) { s.ajax.data = { "search_string" : str }; }
-					if(!s.ajax.dataType || /^json/.exec(s.ajax.dataType)) { s.ajax.dataType = "json"; }
-					$.ajax(s.ajax);
-					return;
-				}
-				if(this.data.search.result.length) { this.clear_search(); }
-				this.data.search.result = this.get_container().find("a" + (this.data.languages ? "." + this.get_lang() : "" ) + ":" + (s.search_method) + "(" + this.data.search.str + ")");
-				this.data.search.result.addClass("jstree-search").parent().parents(".jstree-closed").each(function () {
-					t.open_node(this, false, true);
-				});
-				this.__callback({ nodes : this.data.search.result, str : str });
-			},
-			clear_search : function (str) {
-				this.data.search.result.removeClass("jstree-search");
-				this.__callback(this.data.search.result);
-				this.data.search.result = $();
-			},
-			_search_open : function (is_callback) {
-				var _this = this,
-					done = true,
-					current = [],
-					remaining = [];
-				if(this.data.search.to_open.length) {
-					$.each(this.data.search.to_open, function (i, val) {
-						if(val == "#") { return true; }
-						if($(val).length && $(val).is(".jstree-closed")) { current.push(val); }
-						else { remaining.push(val); }
-					});
-					if(current.length) {
-						this.data.search.to_open = remaining;
-						$.each(current, function (i, val) { 
-							_this.open_node(val, function () { _this._search_open(true); }); 
-						});
-						done = false;
-					}
-				}
-				if(done) { this.search(this.data.search.str, true); }
-			}
-		}
-	});
-})(jQuery);
-//*/
-
-/* 
- * jsTree contextmenu plugin
- */
-(function ($) {
-	$.vakata.context = {
-		hide_on_mouseleave : false,
-
-		cnt		: $("<div id='vakata-contextmenu' />"),
-		vis		: false,
-		tgt		: false,
-		par		: false,
-		func	: false,
-		data	: false,
-		rtl		: false,
-		show	: function (s, t, x, y, d, p, rtl) {
-			$.vakata.context.rtl = !!rtl;
-			var html = $.vakata.context.parse(s), h, w;
-			if(!html) { return; }
-			$.vakata.context.vis = true;
-			$.vakata.context.tgt = t;
-			$.vakata.context.par = p || t || null;
-			$.vakata.context.data = d || null;
-			$.vakata.context.cnt
-				.html(html)
-				.css({ "visibility" : "hidden", "display" : "block", "left" : 0, "top" : 0 });
-
-			if($.vakata.context.hide_on_mouseleave) {
-				$.vakata.context.cnt
-					.one("mouseleave", function(e) { $.vakata.context.hide(); });
-			}
-
-			h = $.vakata.context.cnt.height();
-			w = $.vakata.context.cnt.width();
-			if(x + w > $(document).width()) { 
-				x = $(document).width() - (w + 5); 
-				$.vakata.context.cnt.find("li > ul").addClass("right"); 
-			}
-			if(y + h > $(document).height()) { 
-				y = y - (h + t[0].offsetHeight); 
-				$.vakata.context.cnt.find("li > ul").addClass("bottom"); 
-			}
-
-			$.vakata.context.cnt
-				.css({ "left" : x, "top" : y })
-				.find("li:has(ul)")
-					.bind("mouseenter", function (e) { 
-						var w = $(document).width(),
-							h = $(document).height(),
-							ul = $(this).children("ul").show(); 
-						if(w !== $(document).width()) { ul.toggleClass("right"); }
-						if(h !== $(document).height()) { ul.toggleClass("bottom"); }
-					})
-					.bind("mouseleave", function (e) { 
-						$(this).children("ul").hide(); 
-					})
-					.end()
-				.css({ "visibility" : "visible" })
-				.show();
-			$(document).triggerHandler("context_show.vakata");
-		},
-		hide	: function () {
-			$.vakata.context.vis = false;
-			$.vakata.context.cnt.attr("class","").css({ "visibility" : "hidden" });
-			$(document).triggerHandler("context_hide.vakata");
-		},
-		parse	: function (s, is_callback) {
-			if(!s) { return false; }
-			var str = "",
-				tmp = false,
-				was_sep = true;
-			if(!is_callback) { $.vakata.context.func = {}; }
-			str += "<ul>";
-			$.each(s, function (i, val) {
-				if(!val) { return true; }
-				$.vakata.context.func[i] = val.action;
-				if(!was_sep && val.separator_before) {
-					str += "<li class='vakata-separator vakata-separator-before'></li>";
-				}
-				was_sep = false;
-				str += "<li class='" + (val._class || "") + (val._disabled ? " jstree-contextmenu-disabled " : "") + "'><ins ";
-				if(val.icon && val.icon.indexOf("/") === -1) { str += " class='" + val.icon + "' "; }
-				if(val.icon && val.icon.indexOf("/") !== -1) { str += " style='background:url(" + val.icon + ") center center no-repeat;' "; }
-				str += ">&#160;</ins><a href='#' rel='" + i + "'>";
-				if(val.submenu) {
-					str += "<span style='float:" + ($.vakata.context.rtl ? "left" : "right") + ";'>&raquo;</span>";
-				}
-				str += val.label + "</a>";
-				if(val.submenu) {
-					tmp = $.vakata.context.parse(val.submenu, true);
-					if(tmp) { str += tmp; }
-				}
-				str += "</li>";
-				if(val.separator_after) {
-					str += "<li class='vakata-separator vakata-separator-after'></li>";
-					was_sep = true;
-				}
-			});
-			str = str.replace(/<li class\='vakata-separator vakata-separator-after'\><\/li\>$/,"");
-			str += "</ul>";
-			$(document).triggerHandler("context_parse.vakata");
-			return str.length > 10 ? str : false;
-		},
-		exec	: function (i) {
-			if($.isFunction($.vakata.context.func[i])) {
-				// if is string - eval and call it!
-				$.vakata.context.func[i].call($.vakata.context.data, $.vakata.context.par);
-				return true;
-			}
-			else { return false; }
-		}
-	};
-	$(function () {
-		var css_string = '' + 
-			'#vakata-contextmenu { display:block; visibility:hidden; left:0; top:-200px; position:absolute; margin:0; padding:0; min-width:180px; background:#ebebeb; border:1px solid silver; z-index:10000; *width:180px; } ' + 
-			'#vakata-contextmenu ul { min-width:180px; *width:180px; } ' + 
-			'#vakata-contextmenu ul, #vakata-contextmenu li { margin:0; padding:0; list-style-type:none; display:block; } ' + 
-			'#vakata-contextmenu li { line-height:20px; min-height:20px; position:relative; padding:0px; } ' + 
-			'#vakata-contextmenu li a { padding:1px 6px; line-height:17px; display:block; text-decoration:none; margin:1px 1px 0 1px; } ' + 
-			'#vakata-contextmenu li ins { float:left; width:16px; height:16px; text-decoration:none; margin-right:2px; } ' + 
-			'#vakata-contextmenu li a:hover, #vakata-contextmenu li.vakata-hover > a { background:gray; color:white; } ' + 
-			'#vakata-contextmenu li ul { display:none; position:absolute; top:-2px; left:100%; background:#ebebeb; border:1px solid gray; } ' + 
-			'#vakata-contextmenu .right { right:100%; left:auto; } ' + 
-			'#vakata-contextmenu .bottom { bottom:-1px; top:auto; } ' + 
-			'#vakata-contextmenu li.vakata-separator { min-height:0; height:1px; line-height:1px; font-size:1px; overflow:hidden; margin:0 2px; background:silver; /* border-top:1px solid #fefefe; */ padding:0; } ';
-		$.vakata.css.add_sheet({ str : css_string, title : "vakata" });
-		$.vakata.context.cnt
-			.delegate("a","click", function (e) { e.preventDefault(); })
-			.delegate("a","mouseup", function (e) {
-				if(!$(this).parent().hasClass("jstree-contextmenu-disabled") && $.vakata.context.exec($(this).attr("rel"))) {
-					$.vakata.context.hide();
-				}
-				else { $(this).blur(); }
-			})
-			.delegate("a","mouseover", function () {
-				$.vakata.context.cnt.find(".vakata-hover").removeClass("vakata-hover");
-			})
-			.appendTo("body");
-		$(document).bind("mousedown", function (e) { if($.vakata.context.vis && !$.contains($.vakata.context.cnt[0], e.target)) { $.vakata.context.hide(); } });
-		if(typeof $.hotkeys !== "undefined") {
-			$(document)
-				.bind("keydown", "up", function (e) { 
-					if($.vakata.context.vis) { 
-						var o = $.vakata.context.cnt.find("ul:visible").last().children(".vakata-hover").removeClass("vakata-hover").prevAll("li:not(.vakata-separator)").first();
-						if(!o.length) { o = $.vakata.context.cnt.find("ul:visible").last().children("li:not(.vakata-separator)").last(); }
-						o.addClass("vakata-hover");
-						e.stopImmediatePropagation(); 
-						e.preventDefault();
-					} 
-				})
-				.bind("keydown", "down", function (e) { 
-					if($.vakata.context.vis) { 
-						var o = $.vakata.context.cnt.find("ul:visible").last().children(".vakata-hover").removeClass("vakata-hover").nextAll("li:not(.vakata-separator)").first();
-						if(!o.length) { o = $.vakata.context.cnt.find("ul:visible").last().children("li:not(.vakata-separator)").first(); }
-						o.addClass("vakata-hover");
-						e.stopImmediatePropagation(); 
-						e.preventDefault();
-					} 
-				})
-				.bind("keydown", "right", function (e) { 
-					if($.vakata.context.vis) { 
-						$.vakata.context.cnt.find(".vakata-hover").children("ul").show().children("li:not(.vakata-separator)").removeClass("vakata-hover").first().addClass("vakata-hover");
-						e.stopImmediatePropagation(); 
-						e.preventDefault();
-					} 
-				})
-				.bind("keydown", "left", function (e) { 
-					if($.vakata.context.vis) { 
-						$.vakata.context.cnt.find(".vakata-hover").children("ul").hide().children(".vakata-separator").removeClass("vakata-hover");
-						e.stopImmediatePropagation(); 
-						e.preventDefault();
-					} 
-				})
-				.bind("keydown", "esc", function (e) { 
-					$.vakata.context.hide(); 
-					e.preventDefault();
-				})
-				.bind("keydown", "space", function (e) { 
-					$.vakata.context.cnt.find(".vakata-hover").last().children("a").click();
-					e.preventDefault();
-				});
-		}
-	});
-
-	$.jstree.plugin("contextmenu", {
-		__init : function () {
-			this.get_container()
-				.delegate("a", "contextmenu.jstree", $.proxy(function (e) {
-						e.preventDefault();
-						if(!$(e.currentTarget).hasClass("jstree-loading")) {
-							this.show_contextmenu(e.currentTarget, e.pageX, e.pageY);
-						}
-					}, this))
-				.delegate("a", "click.jstree", $.proxy(function (e) {
-						if(this.data.contextmenu) {
-							$.vakata.context.hide();
-						}
-					}, this))
-				.bind("destroy.jstree", $.proxy(function () {
-						// TODO: move this to descruct method
-						if(this.data.contextmenu) {
-							$.vakata.context.hide();
-						}
-					}, this));
-			$(document).bind("context_hide.vakata", $.proxy(function () { this.data.contextmenu = false; }, this));
-		},
-		defaults : { 
-			select_node : false, // requires UI plugin
-			show_at_node : true,
-			items : { // Could be a function that should return an object like this one
-				"create" : {
-					"separator_before"	: false,
-					"separator_after"	: true,
-					"label"				: "Create",
-					"action"			: function (obj) { this.create(obj); }
-				},
-				"rename" : {
-					"separator_before"	: false,
-					"separator_after"	: false,
-					"label"				: "Rename",
-					"action"			: function (obj) { this.rename(obj); }
-				},
-				"remove" : {
-					"separator_before"	: false,
-					"icon"				: false,
-					"separator_after"	: false,
-					"label"				: "Delete",
-					"action"			: function (obj) { if(this.is_selected(obj)) { this.remove(); } else { this.remove(obj); } }
-				},
-				"ccp" : {
-					"separator_before"	: true,
-					"icon"				: false,
-					"separator_after"	: false,
-					"label"				: "Edit",
-					"action"			: false,
-					"submenu" : { 
-						"cut" : {
-							"separator_before"	: false,
-							"separator_after"	: false,
-							"label"				: "Cut",
-							"action"			: function (obj) { this.cut(obj); }
-						},
-						"copy" : {
-							"separator_before"	: false,
-							"icon"				: false,
-							"separator_after"	: false,
-							"label"				: "Copy",
-							"action"			: function (obj) { this.copy(obj); }
-						},
-						"paste" : {
-							"separator_before"	: false,
-							"icon"				: false,
-							"separator_after"	: false,
-							"label"				: "Paste",
-							"action"			: function (obj) { this.paste(obj); }
-						}
-					}
-				}
-			}
-		},
-		_fn : {
-			show_contextmenu : function (obj, x, y) {
-				obj = this._get_node(obj);
-				var s = this.get_settings().contextmenu,
-					a = obj.children("a:visible:eq(0)"),
-					o = false,
-					i = false;
-				if(s.select_node && this.data.ui && !this.is_selected(obj)) {
-					this.deselect_all();
-					this.select_node(obj, true);
-				}
-				if(s.show_at_node || typeof x === "undefined" || typeof y === "undefined") {
-					o = a.offset();
-					x = o.left;
-					y = o.top + this.data.core.li_height;
-				}
-				i = obj.data("jstree") && obj.data("jstree").contextmenu ? obj.data("jstree").contextmenu : s.items;
-				if($.isFunction(i)) { i = i.call(this, obj); }
-				this.data.contextmenu = true;
-				$.vakata.context.show(i, a, x, y, this, obj, this._get_settings().core.rtl);
-				if(this.data.themes) { $.vakata.context.cnt.attr("class", "jstree-" + this.data.themes.theme + "-context"); }
-			}
-		}
-	});
-})(jQuery);
-//*/
-
-/* 
- * jsTree types plugin
- * Adds support types of nodes
- * You can set an attribute on each li node, that represents its type.
- * According to the type setting the node may get custom icon/validation rules
- */
-(function ($) {
-	$.jstree.plugin("types", {
-		__init : function () {
-			var s = this._get_settings().types;
-			this.data.types.attach_to = [];
-			this.get_container()
-				.bind("init.jstree", $.proxy(function () { 
-						var types = s.types, 
-							attr  = s.type_attr, 
-							icons_css = "", 
-							_this = this;
-
-						$.each(types, function (i, tp) {
-							$.each(tp, function (k, v) { 
-								if(!/^(max_depth|max_children|icon|valid_children)$/.test(k)) { _this.data.types.attach_to.push(k); }
-							});
-							if(!tp.icon) { return true; }
-							if( tp.icon.image || tp.icon.position) {
-								if(i == "default")	{ icons_css += '.jstree-' + _this.get_index() + ' a > .jstree-icon { '; }
-								else				{ icons_css += '.jstree-' + _this.get_index() + ' li[' + attr + '="' + i + '"] > a > .jstree-icon { '; }
-								if(tp.icon.image)	{ icons_css += ' background-image:url(' + tp.icon.image + '); '; }
-								if(tp.icon.position){ icons_css += ' background-position:' + tp.icon.position + '; '; }
-								else				{ icons_css += ' background-position:0 0; '; }
-								icons_css += '} ';
-							}
-						});
-						if(icons_css !== "") { $.vakata.css.add_sheet({ 'str' : icons_css, title : "jstree-types" }); }
-					}, this))
-				.bind("before.jstree", $.proxy(function (e, data) { 
-						var s, t, 
-							o = this._get_settings().types.use_data ? this._get_node(data.args[0]) : false, 
-							d = o && o !== -1 && o.length ? o.data("jstree") : false;
-						if(d && d.types && d.types[data.func] === false) { e.stopImmediatePropagation(); return false; }
-						if($.inArray(data.func, this.data.types.attach_to) !== -1) {
-							if(!data.args[0] || (!data.args[0].tagName && !data.args[0].jquery)) { return; }
-							s = this._get_settings().types.types;
-							t = this._get_type(data.args[0]);
-							if(
-								( 
-									(s[t] && typeof s[t][data.func] !== "undefined") || 
-									(s["default"] && typeof s["default"][data.func] !== "undefined") 
-								) && this._check(data.func, data.args[0]) === false
-							) {
-								e.stopImmediatePropagation();
-								return false;
-							}
-						}
-					}, this));
-			if(is_ie6) {
-				this.get_container()
-					.bind("load_node.jstree set_type.jstree", $.proxy(function (e, data) {
-							var r = data && data.rslt && data.rslt.obj && data.rslt.obj !== -1 ? this._get_node(data.rslt.obj).parent() : this.get_container_ul(),
-								c = false,
-								s = this._get_settings().types;
-							$.each(s.types, function (i, tp) {
-								if(tp.icon && (tp.icon.image || tp.icon.position)) {
-									c = i === "default" ? r.find("li > a > .jstree-icon") : r.find("li[" + s.type_attr + "='" + i + "'] > a > .jstree-icon");
-									if(tp.icon.image) { c.css("backgroundImage","url(" + tp.icon.image + ")"); }
-									c.css("backgroundPosition", tp.icon.position || "0 0");
-								}
-							});
-						}, this));
-			}
-		},
-		defaults : {
-			// defines maximum number of root nodes (-1 means unlimited, -2 means disable max_children checking)
-			max_children		: -1,
-			// defines the maximum depth of the tree (-1 means unlimited, -2 means disable max_depth checking)
-			max_depth			: -1,
-			// defines valid node types for the root nodes
-			valid_children		: "all",
-
-			// whether to use $.data
-			use_data : false, 
-			// where is the type stores (the rel attribute of the LI element)
-			type_attr : "rel",
-			// a list of types
-			types : {
-				// the default type
-				"default" : {
-					"max_children"	: -1,
-					"max_depth"		: -1,
-					"valid_children": "all"
-
-					// Bound functions - you can bind any other function here (using boolean or function)
-					//"select_node"	: true
-				}
-			}
-		},
-		_fn : {
-			_types_notify : function (n, data) {
-				if(data.type && this._get_settings().types.use_data) {
-					this.set_type(data.type, n);
-				}
-			},
-			_get_type : function (obj) {
-				obj = this._get_node(obj);
-				return (!obj || !obj.length) ? false : obj.attr(this._get_settings().types.type_attr) || "default";
-			},
-			set_type : function (str, obj) {
-				obj = this._get_node(obj);
-				var ret = (!obj.length || !str) ? false : obj.attr(this._get_settings().types.type_attr, str);
-				if(ret) { this.__callback({ obj : obj, type : str}); }
-				return ret;
-			},
-			_check : function (rule, obj, opts) {
-				obj = this._get_node(obj);
-				var v = false, t = this._get_type(obj), d = 0, _this = this, s = this._get_settings().types, data = false;
-				if(obj === -1) { 
-					if(!!s[rule]) { v = s[rule]; }
-					else { return; }
-				}
-				else {
-					if(t === false) { return; }
-					data = s.use_data ? obj.data("jstree") : false;
-					if(data && data.types && typeof data.types[rule] !== "undefined") { v = data.types[rule]; }
-					else if(!!s.types[t] && typeof s.types[t][rule] !== "undefined") { v = s.types[t][rule]; }
-					else if(!!s.types["default"] && typeof s.types["default"][rule] !== "undefined") { v = s.types["default"][rule]; }
-				}
-				if($.isFunction(v)) { v = v.call(this, obj); }
-				if(rule === "max_depth" && obj !== -1 && opts !== false && s.max_depth !== -2 && v !== 0) {
-					// also include the node itself - otherwise if root node it is not checked
-					obj.children("a:eq(0)").parentsUntil(".jstree","li").each(function (i) {
-						// check if current depth already exceeds global tree depth
-						if(s.max_depth !== -1 && s.max_depth - (i + 1) <= 0) { v = 0; return false; }
-						d = (i === 0) ? v : _this._check(rule, this, false);
-						// check if current node max depth is already matched or exceeded
-						if(d !== -1 && d - (i + 1) <= 0) { v = 0; return false; }
-						// otherwise - set the max depth to the current value minus current depth
-						if(d >= 0 && (d - (i + 1) < v || v < 0) ) { v = d - (i + 1); }
-						// if the global tree depth exists and it minus the nodes calculated so far is less than `v` or `v` is unlimited
-						if(s.max_depth >= 0 && (s.max_depth - (i + 1) < v || v < 0) ) { v = s.max_depth - (i + 1); }
-					});
-				}
-				return v;
-			},
-			check_move : function () {
-				if(!this.__call_old()) { return false; }
-				var m  = this._get_move(),
-					s  = m.rt._get_settings().types,
-					mc = m.rt._check("max_children", m.cr),
-					md = m.rt._check("max_depth", m.cr),
-					vc = m.rt._check("valid_children", m.cr),
-					ch = 0, d = 1, t;
-
-				if(vc === "none") { return false; } 
-				if($.isArray(vc) && m.ot && m.ot._get_type) {
-					m.o.each(function () {
-						if($.inArray(m.ot._get_type(this), vc) === -1) { d = false; return false; }
-					});
-					if(d === false) { return false; }
-				}
-				if(s.max_children !== -2 && mc !== -1) {
-					ch = m.cr === -1 ? this.get_container().find("> ul > li").not(m.o).length : m.cr.find("> ul > li").not(m.o).length;
-					if(ch + m.o.length > mc) { return false; }
-				}
-				if(s.max_depth !== -2 && md !== -1) {
-					d = 0;
-					if(md === 0) { return false; }
-					if(typeof m.o.d === "undefined") {
-						// TODO: deal with progressive rendering and async when checking max_depth (how to know the depth of the moved node)
-						t = m.o;
-						while(t.length > 0) {
-							t = t.find("> ul > li");
-							d ++;
-						}
-						m.o.d = d;
-					}
-					if(md - m.o.d < 0) { return false; }
-				}
-				return true;
-			},
-			create_node : function (obj, position, js, callback, is_loaded, skip_check) {
-				if(!skip_check && (is_loaded || this._is_loaded(obj))) {
-					var p  = (typeof position == "string" && position.match(/^before|after$/i) && obj !== -1) ? this._get_parent(obj) : this._get_node(obj),
-						s  = this._get_settings().types,
-						mc = this._check("max_children", p),
-						md = this._check("max_depth", p),
-						vc = this._check("valid_children", p),
-						ch;
-					if(typeof js === "string") { js = { data : js }; }
-					if(!js) { js = {}; }
-					if(vc === "none") { return false; } 
-					if($.isArray(vc)) {
-						if(!js.attr || !js.attr[s.type_attr]) { 
-							if(!js.attr) { js.attr = {}; }
-							js.attr[s.type_attr] = vc[0]; 
-						}
-						else {
-							if($.inArray(js.attr[s.type_attr], vc) === -1) { return false; }
-						}
-					}
-					if(s.max_children !== -2 && mc !== -1) {
-						ch = p === -1 ? this.get_container().find("> ul > li").length : p.find("> ul > li").length;
-						if(ch + 1 > mc) { return false; }
-					}
-					if(s.max_depth !== -2 && md !== -1 && (md - 1) < 0) { return false; }
-				}
-				return this.__call_old(true, obj, position, js, callback, is_loaded, skip_check);
-			}
-		}
-	});
-})(jQuery);
-//*/
-
-/* 
- * jsTree HTML plugin
- * The HTML data store. Datastores are build by replacing the `load_node` and `_is_loaded` functions.
- */
-(function ($) {
-	$.jstree.plugin("html_data", {
-		__init : function () { 
-			// this used to use html() and clean the whitespace, but this way any attached data was lost
-			this.data.html_data.original_container_html = this.get_container().find(" > ul > li").clone(true);
-			// remove white space from LI node - otherwise nodes appear a bit to the right
-			this.data.html_data.original_container_html.find("li").addBack().contents().filter(function() { return this.nodeType == 3; }).remove();
-		},
-		defaults : { 
-			data : false,
-			ajax : false,
-			correct_state : true
-		},
-		_fn : {
-			load_node : function (obj, s_call, e_call) { var _this = this; this.load_node_html(obj, function () { _this.__callback({ "obj" : _this._get_node(obj) }); s_call.call(this); }, e_call); },
-			_is_loaded : function (obj) { 
-				obj = this._get_node(obj); 
-				return obj == -1 || !obj || (!this._get_settings().html_data.ajax && !$.isFunction(this._get_settings().html_data.data)) || obj.is(".jstree-open, .jstree-leaf") || obj.children("ul").children("li").size() > 0;
-			},
-			load_node_html : function (obj, s_call, e_call) {
-				var d,
-					s = this.get_settings().html_data,
-					error_func = function () {},
-					success_func = function () {};
-				obj = this._get_node(obj);
-				if(obj && obj !== -1) {
-					if(obj.data("jstree_is_loading")) { return; }
-					else { obj.data("jstree_is_loading",true); }
-				}
-				switch(!0) {
-					case ($.isFunction(s.data)):
-						s.data.call(this, obj, $.proxy(function (d) {
-							if(d && d !== "" && d.toString && d.toString().replace(/^[\s\n]+$/,"") !== "") {
-								d = $(d);
-								if(!d.is("ul")) { d = $("<ul />").append(d); }
-								if(obj == -1 || !obj) { this.get_container().children("ul").empty().append(d.children()).find("li, a").filter(function () { return !this.firstChild || !this.firstChild.tagName || this.firstChild.tagName !== "INS"; }).prepend("<ins class='jstree-icon'>&#160;</ins>").end().filter("a").children("ins:first-child").not(".jstree-icon").addClass("jstree-icon"); }
-								else { obj.children("a.jstree-loading").removeClass("jstree-loading"); obj.append(d).children("ul").find("li, a").filter(function () { return !this.firstChild || !this.firstChild.tagName || this.firstChild.tagName !== "INS"; }).prepend("<ins class='jstree-icon'>&#160;</ins>").end().filter("a").children("ins:first-child").not(".jstree-icon").addClass("jstree-icon"); obj.removeData("jstree_is_loading"); }
-								this.clean_node(obj);
-								if(s_call) { s_call.call(this); }
-							}
-							else {
-								if(obj && obj !== -1) {
-									obj.children("a.jstree-loading").removeClass("jstree-loading");
-									obj.removeData("jstree_is_loading");
-									if(s.correct_state) { 
-										this.correct_state(obj);
-										if(s_call) { s_call.call(this); } 
-									}
-								}
-								else {
-									if(s.correct_state) { 
-										this.get_container().children("ul").empty();
-										if(s_call) { s_call.call(this); } 
-									}
-								}
-							}
-						}, this));
-						break;
-					case (!s.data && !s.ajax):
-						if(!obj || obj == -1) {
-							this.get_container()
-								.children("ul").empty()
-								.append(this.data.html_data.original_container_html)
-								.find("li, a").filter(function () { return !this.firstChild || !this.firstChild.tagName || this.firstChild.tagName !== "INS"; }).prepend("<ins class='jstree-icon'>&#160;</ins>").end()
-								.filter("a").children("ins:first-child").not(".jstree-icon").addClass("jstree-icon");
-							this.clean_node();
-						}
-						if(s_call) { s_call.call(this); }
-						break;
-					case (!!s.data && !s.ajax) || (!!s.data && !!s.ajax && (!obj || obj === -1)):
-						if(!obj || obj == -1) {
-							d = $(s.data);
-							if(!d.is("ul")) { d = $("<ul />").append(d); }
-							this.get_container()
-								.children("ul").empty().append(d.children())
-								.find("li, a").filter(function () { return !this.firstChild || !this.firstChild.tagName || this.firstChild.tagName !== "INS"; }).prepend("<ins class='jstree-icon'>&#160;</ins>").end()
-								.filter("a").children("ins:first-child").not(".jstree-icon").addClass("jstree-icon");
-							this.clean_node();
-						}
-						if(s_call) { s_call.call(this); }
-						break;
-					case (!s.data && !!s.ajax) || (!!s.data && !!s.ajax && obj && obj !== -1):
-						obj = this._get_node(obj);
-						error_func = function (x, t, e) {
-							var ef = this.get_settings().html_data.ajax.error; 
-							if(ef) { ef.call(this, x, t, e); }
-							if(obj != -1 && obj.length) {
-								obj.children("a.jstree-loading").removeClass("jstree-loading");
-								obj.removeData("jstree_is_loading");
-								if(t === "success" && s.correct_state) { this.correct_state(obj); }
-							}
-							else {
-								if(t === "success" && s.correct_state) { this.get_container().children("ul").empty(); }
-							}
-							if(e_call) { e_call.call(this); }
-						};
-						success_func = function (d, t, x) {
-							var sf = this.get_settings().html_data.ajax.success; 
-							if(sf) { d = sf.call(this,d,t,x) || d; }
-							if(d === "" || (d && d.toString && d.toString().replace(/^[\s\n]+$/,"") === "")) {
-								return error_func.call(this, x, t, "");
-							}
-							if(d) {
-								d = $(d);
-								if(!d.is("ul")) { d = $("<ul />").append(d); }
-								if(obj == -1 || !obj) { this.get_container().children("ul").empty().append(d.children()).find("li, a").filter(function () { return !this.firstChild || !this.firstChild.tagName || this.firstChild.tagName !== "INS"; }).prepend("<ins class='jstree-icon'>&#160;</ins>").end().filter("a").children("ins:first-child").not(".jstree-icon").addClass("jstree-icon"); }
-								else { obj.children("a.jstree-loading").removeClass("jstree-loading"); obj.append(d).children("ul").find("li, a").filter(function () { return !this.firstChild || !this.firstChild.tagName || this.firstChild.tagName !== "INS"; }).prepend("<ins class='jstree-icon'>&#160;</ins>").end().filter("a").children("ins:first-child").not(".jstree-icon").addClass("jstree-icon"); obj.removeData("jstree_is_loading"); }
-								this.clean_node(obj);
-								if(s_call) { s_call.call(this); }
-							}
-							else {
-								if(obj && obj !== -1) {
-									obj.children("a.jstree-loading").removeClass("jstree-loading");
-									obj.removeData("jstree_is_loading");
-									if(s.correct_state) { 
-										this.correct_state(obj);
-										if(s_call) { s_call.call(this); } 
-									}
-								}
-								else {
-									if(s.correct_state) { 
-										this.get_container().children("ul").empty();
-										if(s_call) { s_call.call(this); } 
-									}
-								}
-							}
-						};
-						s.ajax.context = this;
-						s.ajax.error = error_func;
-						s.ajax.success = success_func;
-						if(!s.ajax.dataType) { s.ajax.dataType = "html"; }
-						if($.isFunction(s.ajax.url)) { s.ajax.url = s.ajax.url.call(this, obj); }
-						if($.isFunction(s.ajax.data)) { s.ajax.data = s.ajax.data.call(this, obj); }
-						$.ajax(s.ajax);
-						break;
-				}
-			}
-		}
-	});
-	// include the HTML data plugin by default
-	$.jstree.defaults.plugins.push("html_data");
-})(jQuery);
-//*/
-
-/* 
- * jsTree themeroller plugin
- * Adds support for jQuery UI themes. Include this at the end of your plugins list, also make sure "themes" is not included.
- */
-(function ($) {
-	$.jstree.plugin("themeroller", {
-		__init : function () {
-			var s = this._get_settings().themeroller;
-			this.get_container()
-				.addClass("ui-widget-content")
-				.addClass("jstree-themeroller")
-				.delegate("a","mouseenter.jstree", function (e) {
-					if(!$(e.currentTarget).hasClass("jstree-loading")) {
-						$(this).addClass(s.item_h);
-					}
-				})
-				.delegate("a","mouseleave.jstree", function () {
-					$(this).removeClass(s.item_h);
-				})
-				.bind("init.jstree", $.proxy(function (e, data) { 
-						data.inst.get_container().find("> ul > li > .jstree-loading > ins").addClass("ui-icon-refresh");
-						this._themeroller(data.inst.get_container().find("> ul > li"));
-					}, this))
-				.bind("open_node.jstree create_node.jstree", $.proxy(function (e, data) { 
-						this._themeroller(data.rslt.obj);
-					}, this))
-				.bind("loaded.jstree refresh.jstree", $.proxy(function (e) {
-						this._themeroller();
-					}, this))
-				.bind("close_node.jstree", $.proxy(function (e, data) {
-						this._themeroller(data.rslt.obj);
-					}, this))
-				.bind("delete_node.jstree", $.proxy(function (e, data) {
-						this._themeroller(data.rslt.parent);
-					}, this))
-				.bind("correct_state.jstree", $.proxy(function (e, data) {
-						data.rslt.obj
-							.children("ins.jstree-icon").removeClass(s.opened + " " + s.closed + " ui-icon").end()
-							.find("> a > ins.ui-icon")
-								.filter(function() { 
-									return this.className.toString()
-										.replace(s.item_clsd,"").replace(s.item_open,"").replace(s.item_leaf,"")
-										.indexOf("ui-icon-") === -1; 
-								}).removeClass(s.item_open + " " + s.item_clsd).addClass(s.item_leaf || "jstree-no-icon");
-					}, this))
-				.bind("select_node.jstree", $.proxy(function (e, data) {
-						data.rslt.obj.children("a").addClass(s.item_a);
-					}, this))
-				.bind("deselect_node.jstree deselect_all.jstree", $.proxy(function (e, data) {
-						this.get_container()
-							.find("a." + s.item_a).removeClass(s.item_a).end()
-							.find("a.jstree-clicked").addClass(s.item_a);
-					}, this))
-				.bind("dehover_node.jstree", $.proxy(function (e, data) {
-						data.rslt.obj.children("a").removeClass(s.item_h);
-					}, this))
-				.bind("hover_node.jstree", $.proxy(function (e, data) {
-						this.get_container()
-							.find("a." + s.item_h).not(data.rslt.obj).removeClass(s.item_h);
-						data.rslt.obj.children("a").addClass(s.item_h);
-					}, this))
-				.bind("move_node.jstree", $.proxy(function (e, data) {
-						this._themeroller(data.rslt.o);
-						this._themeroller(data.rslt.op);
-					}, this));
-		},
-		__destroy : function () {
-			var s = this._get_settings().themeroller,
-				c = [ "ui-icon" ];
-			$.each(s, function (i, v) {
-				v = v.split(" ");
-				if(v.length) { c = c.concat(v); }
-			});
-			this.get_container()
-				.removeClass("ui-widget-content")
-				.find("." + c.join(", .")).removeClass(c.join(" "));
-		},
-		_fn : {
-			_themeroller : function (obj) {
-				var s = this._get_settings().themeroller;
-				obj = (!obj || obj == -1) ? this.get_container_ul() : this._get_node(obj);
-				obj = (!obj || obj == -1) ? this.get_container_ul() : obj.parent();
-				obj
-					.find("li.jstree-closed")
-						.children("ins.jstree-icon").removeClass(s.opened).addClass("ui-icon " + s.closed).end()
-						.children("a").addClass(s.item)
-							.children("ins.jstree-icon").addClass("ui-icon")
-								.filter(function() { 
-									return this.className.toString()
-										.replace(s.item_clsd,"").replace(s.item_open,"").replace(s.item_leaf,"")
-										.indexOf("ui-icon-") === -1; 
-								}).removeClass(s.item_leaf + " " + s.item_open).addClass(s.item_clsd || "jstree-no-icon")
-								.end()
-							.end()
-						.end()
-					.end()
-					.find("li.jstree-open")
-						.children("ins.jstree-icon").removeClass(s.closed).addClass("ui-icon " + s.opened).end()
-						.children("a").addClass(s.item)
-							.children("ins.jstree-icon").addClass("ui-icon")
-								.filter(function() { 
-									return this.className.toString()
-										.replace(s.item_clsd,"").replace(s.item_open,"").replace(s.item_leaf,"")
-										.indexOf("ui-icon-") === -1; 
-								}).removeClass(s.item_leaf + " " + s.item_clsd).addClass(s.item_open || "jstree-no-icon")
-								.end()
-							.end()
-						.end()
-					.end()
-					.find("li.jstree-leaf")
-						.children("ins.jstree-icon").removeClass(s.closed + " ui-icon " + s.opened).end()
-						.children("a").addClass(s.item)
-							.children("ins.jstree-icon").addClass("ui-icon")
-								.filter(function() { 
-									return this.className.toString()
-										.replace(s.item_clsd,"").replace(s.item_open,"").replace(s.item_leaf,"")
-										.indexOf("ui-icon-") === -1; 
-								}).removeClass(s.item_clsd + " " + s.item_open).addClass(s.item_leaf || "jstree-no-icon");
-			}
-		},
-		defaults : {
-			"opened"	: "ui-icon-triangle-1-se",
-			"closed"	: "ui-icon-triangle-1-e",
-			"item"		: "ui-state-default",
-			"item_h"	: "ui-state-hover",
-			"item_a"	: "ui-state-active",
-			"item_open"	: "ui-icon-folder-open",
-			"item_clsd"	: "ui-icon-folder-collapsed",
-			"item_leaf"	: "ui-icon-document"
-		}
-	});
-	$(function() {
-		var css_string = '' + 
-			'.jstree-themeroller .ui-icon { overflow:visible; } ' + 
-			'.jstree-themeroller a { padding:0 2px; } ' + 
-			'.jstree-themeroller .jstree-no-icon { display:none; }';
-		$.vakata.css.add_sheet({ str : css_string, title : "jstree" });
-	});
-})(jQuery);
-//*/
-
-/* 
- * jsTree unique plugin
- * Forces different names amongst siblings (still a bit experimental)
- * NOTE: does not check language versions (it will not be possible to have nodes with the same title, even in different languages)
- */
-(function ($) {
-	$.jstree.plugin("unique", {
-		__init : function () {
-			this.get_container()
-				.bind("before.jstree", $.proxy(function (e, data) { 
-						var nms = [], res = true, p, t;
-						if(data.func == "move_node") {
-							// obj, ref, position, is_copy, is_prepared, skip_check
-							if(data.args[4] === true) {
-								if(data.args[0].o && data.args[0].o.length) {
-									data.args[0].o.children("a").each(function () { nms.push($(this).text().replace(/^\s+/g,"")); });
-									res = this._check_unique(nms, data.args[0].np.find("> ul > li").not(data.args[0].o), "move_node");
-								}
-							}
-						}
-						if(data.func == "create_node") {
-							// obj, position, js, callback, is_loaded
-							if(data.args[4] || this._is_loaded(data.args[0])) {
-								p = this._get_node(data.args[0]);
-								if(data.args[1] && (data.args[1] === "before" || data.args[1] === "after")) {
-									p = this._get_parent(data.args[0]);
-									if(!p || p === -1) { p = this.get_container(); }
-								}
-								if(typeof data.args[2] === "string") { nms.push(data.args[2]); }
-								else if(!data.args[2] || !data.args[2].data) { nms.push(this._get_string("new_node")); }
-								else { nms.push(data.args[2].data); }
-								res = this._check_unique(nms, p.find("> ul > li"), "create_node");
-							}
-						}
-						if(data.func == "rename_node") {
-							// obj, val
-							nms.push(data.args[1]);
-							t = this._get_node(data.args[0]);
-							p = this._get_parent(t);
-							if(!p || p === -1) { p = this.get_container(); }
-							res = this._check_unique(nms, p.find("> ul > li").not(t), "rename_node");
-						}
-						if(!res) {
-							e.stopPropagation();
-							return false;
-						}
-					}, this));
-		},
-		defaults : { 
-			error_callback : $.noop
-		},
-		_fn : { 
-			_check_unique : function (nms, p, func) {
-				var cnms = [], ok = true;
-				p.children("a").each(function () { cnms.push($(this).text().replace(/^\s+/g,"")); });
-				if(!cnms.length || !nms.length) { return true; }
-				$.each(nms, function (i, v) {
-					if($.inArray(v, cnms) !== -1) {
-						ok = false;
-						return false;
-					}
-				});
-				if(!ok) {
-					this._get_settings().unique.error_callback.call(null, nms, p, func);
-				}
-				return ok;
-			},
-			check_move : function () {
-				if(!this.__call_old()) { return false; }
-				var p = this._get_move(), nms = [];
-				if(p.o && p.o.length) {
-					p.o.children("a").each(function () { nms.push($(this).text().replace(/^\s+/g,"")); });
-					return this._check_unique(nms, p.np.find("> ul > li").not(p.o), "check_move");
-				}
-				return true;
-			}
-		}
-	});
-})(jQuery);
-//*/
-
-/*
- * jsTree wholerow plugin
- * Makes select and hover work on the entire width of the node
- * MAY BE HEAVY IN LARGE DOM
- */
-(function ($) {
-	$.jstree.plugin("wholerow", {
-		__init : function () {
-			if(!this.data.ui) { throw "jsTree wholerow: jsTree UI plugin not included."; }
-			this.data.wholerow.html = false;
-			this.data.wholerow.to = false;
-			this.get_container()
-				.bind("init.jstree", $.proxy(function (e, data) { 
-						this._get_settings().core.animation = 0;
-					}, this))
-				.bind("open_node.jstree create_node.jstree clean_node.jstree loaded.jstree", $.proxy(function (e, data) { 
-						this._prepare_wholerow_span( data && data.rslt && data.rslt.obj ? data.rslt.obj : -1 );
-					}, this))
-				.bind("search.jstree clear_search.jstree reopen.jstree after_open.jstree after_close.jstree create_node.jstree delete_node.jstree clean_node.jstree", $.proxy(function (e, data) { 
-						if(this.data.to) { clearTimeout(this.data.to); }
-						this.data.to = setTimeout( (function (t, o) { return function() { t._prepare_wholerow_ul(o); }; })(this,  data && data.rslt && data.rslt.obj ? data.rslt.obj : -1), 0);
-					}, this))
-				.bind("deselect_all.jstree", $.proxy(function (e, data) { 
-						this.get_container().find(" > .jstree-wholerow .jstree-clicked").removeClass("jstree-clicked " + (this.data.themeroller ? this._get_settings().themeroller.item_a : "" ));
-					}, this))
-				.bind("select_node.jstree deselect_node.jstree ", $.proxy(function (e, data) { 
-						data.rslt.obj.each(function () { 
-							var ref = data.inst.get_container().find(" > .jstree-wholerow li:visible:eq(" + ( parseInt((($(this).offset().top - data.inst.get_container().offset().top + data.inst.get_container()[0].scrollTop) / data.inst.data.core.li_height),10)) + ")");
-							// ref.children("a")[e.type === "select_node" ? "addClass" : "removeClass"]("jstree-clicked");
-							ref.children("a").attr("class",data.rslt.obj.children("a").attr("class"));
-						});
-					}, this))
-				.bind("hover_node.jstree dehover_node.jstree", $.proxy(function (e, data) { 
-						this.get_container().find(" > .jstree-wholerow .jstree-hovered").removeClass("jstree-hovered " + (this.data.themeroller ? this._get_settings().themeroller.item_h : "" ));
-						if(e.type === "hover_node") {
-							var ref = this.get_container().find(" > .jstree-wholerow li:visible:eq(" + ( parseInt(((data.rslt.obj.offset().top - this.get_container().offset().top + this.get_container()[0].scrollTop) / this.data.core.li_height),10)) + ")");
-							// ref.children("a").addClass("jstree-hovered");
-							ref.children("a").attr("class",data.rslt.obj.children(".jstree-hovered").attr("class"));
-						}
-					}, this))
-				.delegate(".jstree-wholerow-span, ins.jstree-icon, li", "click.jstree", function (e) {
-						var n = $(e.currentTarget);
-						if(e.target.tagName === "A" || (e.target.tagName === "INS" && n.closest("li").is(".jstree-open, .jstree-closed"))) { return; }
-						n.closest("li").children("a:visible:eq(0)").click();
-						e.stopImmediatePropagation();
-					})
-				.delegate("li", "mouseover.jstree", $.proxy(function (e) {
-						e.stopImmediatePropagation();
-						if($(e.currentTarget).children(".jstree-hovered, .jstree-clicked").length) { return false; }
-						this.hover_node(e.currentTarget);
-						return false;
-					}, this))
-				.delegate("li", "mouseleave.jstree", $.proxy(function (e) {
-						if($(e.currentTarget).children("a").hasClass("jstree-hovered").length) { return; }
-						this.dehover_node(e.currentTarget);
-					}, this));
-			if(is_ie7 || is_ie6) {
-				$.vakata.css.add_sheet({ str : ".jstree-" + this.get_index() + " { position:relative; } ", title : "jstree" });
-			}
-		},
-		defaults : {
-		},
-		__destroy : function () {
-			this.get_container().children(".jstree-wholerow").remove();
-			this.get_container().find(".jstree-wholerow-span").remove();
-		},
-		_fn : {
-			_prepare_wholerow_span : function (obj) {
-				obj = !obj || obj == -1 ? this.get_container().find("> ul > li") : this._get_node(obj);
-				if(obj === false) { return; } // added for removing root nodes
-				obj.each(function () {
-					$(this).find("li").addBack().each(function () {
-						var $t = $(this);
-						if($t.children(".jstree-wholerow-span").length) { return true; }
-						$t.prepend("<span class='jstree-wholerow-span' style='width:" + ($t.parentsUntil(".jstree","li").length * 18) + "px;'>&#160;</span>");
-					});
-				});
-			},
-			_prepare_wholerow_ul : function () {
-				var o = this.get_container().children("ul").eq(0), h = o.html();
-				o.addClass("jstree-wholerow-real");
-				if(this.data.wholerow.last_html !== h) {
-					this.data.wholerow.last_html = h;
-					this.get_container().children(".jstree-wholerow").remove();
-					this.get_container().append(
-						o.clone().removeClass("jstree-wholerow-real")
-							.wrapAll("<div class='jstree-wholerow' />").parent()
-							.width(o.parent()[0].scrollWidth)
-							.css("top", (o.height() + ( is_ie7 ? 5 : 0)) * -1 )
-							.find("li[id]").each(function () { this.removeAttribute("id"); }).end()
-					);
-				}
-			}
-		}
-	});
-	$(function() {
-		var css_string = '' + 
-			'.jstree .jstree-wholerow-real { position:relative; z-index:1; } ' + 
-			'.jstree .jstree-wholerow-real li { cursor:pointer; } ' + 
-			'.jstree .jstree-wholerow-real a { border-left-color:transparent !important; border-right-color:transparent !important; } ' + 
-			'.jstree .jstree-wholerow { position:relative; z-index:0; height:0; } ' + 
-			'.jstree .jstree-wholerow ul, .jstree .jstree-wholerow li { width:100%; } ' + 
-			'.jstree .jstree-wholerow, .jstree .jstree-wholerow ul, .jstree .jstree-wholerow li, .jstree .jstree-wholerow a { margin:0 !important; padding:0 !important; } ' + 
-			'.jstree .jstree-wholerow, .jstree .jstree-wholerow ul, .jstree .jstree-wholerow li { background:transparent !important; }' + 
-			'.jstree .jstree-wholerow ins, .jstree .jstree-wholerow span, .jstree .jstree-wholerow input { display:none !important; }' + 
-			'.jstree .jstree-wholerow a, .jstree .jstree-wholerow a:hover { text-indent:-9999px; !important; width:100%; padding:0 !important; border-right-width:0px !important; border-left-width:0px !important; } ' + 
-			'.jstree .jstree-wholerow-span { position:absolute; left:0; margin:0px; padding:0; height:18px; border-width:0; padding:0; z-index:0; }';
-		if(is_ff2) {
-			css_string += '' + 
-				'.jstree .jstree-wholerow a { display:block; height:18px; margin:0; padding:0; border:0; } ' + 
-				'.jstree .jstree-wholerow-real a { border-color:transparent !important; } ';
-		}
-		if(is_ie7 || is_ie6) {
-			css_string += '' + 
-				'.jstree .jstree-wholerow, .jstree .jstree-wholerow li, .jstree .jstree-wholerow ul, .jstree .jstree-wholerow a { margin:0; padding:0; line-height:18px; } ' + 
-				'.jstree .jstree-wholerow a { display:block; height:18px; line-height:18px; overflow:hidden; } ';
-		}
-		$.vakata.css.add_sheet({ str : css_string, title : "jstree" });
-	});
-})(jQuery);
-//*/
-
-/*
-* jsTree model plugin
-* This plugin gets jstree to use a class model to retrieve data, creating great dynamism
-*/
-(function ($) {
-	var nodeInterface = ["getChildren","getChildrenCount","getAttr","getName","getProps"],
-		validateInterface = function(obj, inter) {
-			var valid = true;
-			obj = obj || {};
-			inter = [].concat(inter);
-			$.each(inter, function (i, v) {
-				if(!$.isFunction(obj[v])) { valid = false; return false; }
-			});
-			return valid;
-		};
-	$.jstree.plugin("model", {
-		__init : function () {
-			if(!this.data.json_data) { throw "jsTree model: jsTree json_data plugin not included."; }
-			this._get_settings().json_data.data = function (n, b) {
-				var obj = (n == -1) ? this._get_settings().model.object : n.data("jstree_model");
-				if(!validateInterface(obj, nodeInterface)) { return b.call(null, false); }
-				if(this._get_settings().model.async) {
-					obj.getChildren($.proxy(function (data) {
-						this.model_done(data, b);
-					}, this));
-				}
-				else {
-					this.model_done(obj.getChildren(), b);
-				}
-			};
-		},
-		defaults : {
-			object : false,
-			id_prefix : false,
-			async : false
-		},
-		_fn : {
-			model_done : function (data, callback) {
-				var ret = [], 
-					s = this._get_settings(),
-					_this = this;
-
-				if(!$.isArray(data)) { data = [data]; }
-				$.each(data, function (i, nd) {
-					var r = nd.getProps() || {};
-					r.attr = nd.getAttr() || {};
-					if(nd.getChildrenCount()) { r.state = "closed"; }
-					r.data = nd.getName();
-					if(!$.isArray(r.data)) { r.data = [r.data]; }
-					if(_this.data.types && $.isFunction(nd.getType)) {
-						r.attr[s.types.type_attr] = nd.getType();
-					}
-					if(r.attr.id && s.model.id_prefix) { r.attr.id = s.model.id_prefix + r.attr.id; }
-					if(!r.metadata) { r.metadata = { }; }
-					r.metadata.jstree_model = nd;
-					ret.push(r);
-				});
-				callback.call(null, ret);
-			}
-		}
-	});
-})(jQuery);
-//*/
-
-})();
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/jstree.js b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/jstree.js
new file mode 100755
index 00000000000..48ee5ce0144
--- /dev/null
+++ b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/jstree.js
@@ -0,0 +1,7781 @@
+/*globals jQuery, define, module, exports, require, window, document, postMessage */
+(function (factory) {
+	"use strict";
+	if (typeof define === 'function' && define.amd) {
+		define(['jquery'], factory);
+	}
+	else if(typeof module !== 'undefined' && module.exports) {
+		module.exports = factory(require('jquery'));
+	}
+	else {
+		factory(jQuery);
+	}
+}(function ($, undefined) {
+	"use strict";
+/*!
+ * jsTree 3.2.1
+ * http://jstree.com/
+ *
+ * Copyright (c) 2014 Ivan Bozhanov (http://vakata.com)
+ *
+ * Licensed same as jquery - under the terms of the MIT License
+ *   http://www.opensource.org/licenses/mit-license.php
+ */
+/*!
+ * if using jslint please allow for the jQuery global and use following options:
+ * jslint: browser: true, ass: true, bitwise: true, continue: true, nomen: true, plusplus: true, regexp: true, unparam: true, todo: true, white: true
+ */
+
+	// prevent another load? maybe there is a better way?
+	if($.jstree) {
+		return;
+	}
+
+	/**
+	 * ### jsTree core functionality
+	 */
+
+	// internal variables
+	var instance_counter = 0,
+		ccp_node = false,
+		ccp_mode = false,
+		ccp_inst = false,
+		themes_loaded = [],
+		src = $('script:last').attr('src'),
+		document = window.document, // local variable is always faster to access then a global
+		_node = document.createElement('LI'), _temp1, _temp2;
+
+	_node.setAttribute('role', 'treeitem');
+	_temp1 = document.createElement('I');
+	_temp1.className = 'jstree-icon jstree-ocl';
+	_temp1.setAttribute('role', 'presentation');
+	_node.appendChild(_temp1);
+	_temp1 = document.createElement('A');
+	_temp1.className = 'jstree-anchor';
+	_temp1.setAttribute('href','#');
+	_temp1.setAttribute('tabindex','-1');
+	_temp2 = document.createElement('I');
+	_temp2.className = 'jstree-icon jstree-themeicon';
+	_temp2.setAttribute('role', 'presentation');
+	_temp1.appendChild(_temp2);
+	_node.appendChild(_temp1);
+	_temp1 = _temp2 = null;
+
+
+	/**
+	 * holds all jstree related functions and variables, including the actual class and methods to create, access and manipulate instances.
+	 * @name $.jstree
+	 */
+	$.jstree = {
+		/**
+		 * specifies the jstree version in use
+		 * @name $.jstree.version
+		 */
+		version : '3.2.1',
+		/**
+		 * holds all the default options used when creating new instances
+		 * @name $.jstree.defaults
+		 */
+		defaults : {
+			/**
+			 * configure which plugins will be active on an instance. Should be an array of strings, where each element is a plugin name. The default is `[]`
+			 * @name $.jstree.defaults.plugins
+			 */
+			plugins : []
+		},
+		/**
+		 * stores all loaded jstree plugins (used internally)
+		 * @name $.jstree.plugins
+		 */
+		plugins : {},
+		path : src && src.indexOf('/') !== -1 ? src.replace(/\/[^\/]+$/,'') : '',
+		idregex : /[\\:&!^|()\[\]<>@*'+~#";.,=\- \/${}%?`]/g,
+		root : '#'
+	};
+	/**
+	 * creates a jstree instance
+	 * @name $.jstree.create(el [, options])
+	 * @param {DOMElement|jQuery|String} el the element to create the instance on, can be jQuery extended or a selector
+	 * @param {Object} options options for this instance (extends `$.jstree.defaults`)
+	 * @return {jsTree} the new instance
+	 */
+	$.jstree.create = function (el, options) {
+		var tmp = new $.jstree.core(++instance_counter),
+			opt = options;
+		options = $.extend(true, {}, $.jstree.defaults, options);
+		if(opt && opt.plugins) {
+			options.plugins = opt.plugins;
+		}
+		$.each(options.plugins, function (i, k) {
+			if(i !== 'core') {
+				tmp = tmp.plugin(k, options[k]);
+			}
+		});
+		$(el).data('jstree', tmp);
+		tmp.init(el, options);
+		return tmp;
+	};
+	/**
+	 * remove all traces of jstree from the DOM and destroy all instances
+	 * @name $.jstree.destroy()
+	 */
+	$.jstree.destroy = function () {
+		$('.jstree:jstree').jstree('destroy');
+		$(document).off('.jstree');
+	};
+	/**
+	 * the jstree class constructor, used only internally
+	 * @private
+	 * @name $.jstree.core(id)
+	 * @param {Number} id this instance's index
+	 */
+	$.jstree.core = function (id) {
+		this._id = id;
+		this._cnt = 0;
+		this._wrk = null;
+		this._data = {
+			core : {
+				themes : {
+					name : false,
+					dots : false,
+					icons : false
+				},
+				selected : [],
+				last_error : {},
+				working : false,
+				worker_queue : [],
+				focused : null
+			}
+		};
+	};
+	/**
+	 * get a reference to an existing instance
+	 *
+	 * __Examples__
+	 *
+	 *	// provided a container with an ID of "tree", and a nested node with an ID of "branch"
+	 *	// all of there will return the same instance
+	 *	$.jstree.reference('tree');
+	 *	$.jstree.reference('#tree');
+	 *	$.jstree.reference($('#tree'));
+	 *	$.jstree.reference(document.getElementByID('tree'));
+	 *	$.jstree.reference('branch');
+	 *	$.jstree.reference('#branch');
+	 *	$.jstree.reference($('#branch'));
+	 *	$.jstree.reference(document.getElementByID('branch'));
+	 *
+	 * @name $.jstree.reference(needle)
+	 * @param {DOMElement|jQuery|String} needle
+	 * @return {jsTree|null} the instance or `null` if not found
+	 */
+	$.jstree.reference = function (needle) {
+		var tmp = null,
+			obj = null;
+		if(needle && needle.id && (!needle.tagName || !needle.nodeType)) { needle = needle.id; }
+
+		if(!obj || !obj.length) {
+			try { obj = $(needle); } catch (ignore) { }
+		}
+		if(!obj || !obj.length) {
+			try { obj = $('#' + needle.replace($.jstree.idregex,'\\$&')); } catch (ignore) { }
+		}
+		if(obj && obj.length && (obj = obj.closest('.jstree')).length && (obj = obj.data('jstree'))) {
+			tmp = obj;
+		}
+		else {
+			$('.jstree').each(function () {
+				var inst = $(this).data('jstree');
+				if(inst && inst._model.data[needle]) {
+					tmp = inst;
+					return false;
+				}
+			});
+		}
+		return tmp;
+	};
+	/**
+	 * Create an instance, get an instance or invoke a command on a instance.
+	 *
+	 * If there is no instance associated with the current node a new one is created and `arg` is used to extend `$.jstree.defaults` for this new instance. There would be no return value (chaining is not broken).
+	 *
+	 * If there is an existing instance and `arg` is a string the command specified by `arg` is executed on the instance, with any additional arguments passed to the function. If the function returns a value it will be returned (chaining could break depending on function).
+	 *
+	 * If there is an existing instance and `arg` is not a string the instance itself is returned (similar to `$.jstree.reference`).
+	 *
+	 * In any other case - nothing is returned and chaining is not broken.
+	 *
+	 * __Examples__
+	 *
+	 *	$('#tree1').jstree(); // creates an instance
+	 *	$('#tree2').jstree({ plugins : [] }); // create an instance with some options
+	 *	$('#tree1').jstree('open_node', '#branch_1'); // call a method on an existing instance, passing additional arguments
+	 *	$('#tree2').jstree(); // get an existing instance (or create an instance)
+	 *	$('#tree2').jstree(true); // get an existing instance (will not create new instance)
+	 *	$('#branch_1').jstree().select_node('#branch_1'); // get an instance (using a nested element and call a method)
+	 *
+	 * @name $().jstree([arg])
+	 * @param {String|Object} arg
+	 * @return {Mixed}
+	 */
+	$.fn.jstree = function (arg) {
+		// check for string argument
+		var is_method	= (typeof arg === 'string'),
+			args		= Array.prototype.slice.call(arguments, 1),
+			result		= null;
+		if(arg === true && !this.length) { return false; }
+		this.each(function () {
+			// get the instance (if there is one) and method (if it exists)
+			var instance = $.jstree.reference(this),
+				method = is_method && instance ? instance[arg] : null;
+			// if calling a method, and method is available - execute on the instance
+			result = is_method && method ?
+				method.apply(instance, args) :
+				null;
+			// if there is no instance and no method is being called - create one
+			if(!instance && !is_method && (arg === undefined || $.isPlainObject(arg))) {
+				$.jstree.create(this, arg);
+			}
+			// if there is an instance and no method is called - return the instance
+			if( (instance && !is_method) || arg === true ) {
+				result = instance || false;
+			}
+			// if there was a method call which returned a result - break and return the value
+			if(result !== null && result !== undefined) {
+				return false;
+			}
+		});
+		// if there was a method call with a valid return value - return that, otherwise continue the chain
+		return result !== null && result !== undefined ?
+			result : this;
+	};
+	/**
+	 * used to find elements containing an instance
+	 *
+	 * __Examples__
+	 *
+	 *	$('div:jstree').each(function () {
+	 *		$(this).jstree('destroy');
+	 *	});
+	 *
+	 * @name $(':jstree')
+	 * @return {jQuery}
+	 */
+	$.expr[':'].jstree = $.expr.createPseudo(function(search) {
+		return function(a) {
+			return $(a).hasClass('jstree') &&
+				$(a).data('jstree') !== undefined;
+		};
+	});
+
+	/**
+	 * stores all defaults for the core
+	 * @name $.jstree.defaults.core
+	 */
+	$.jstree.defaults.core = {
+		/**
+		 * data configuration
+		 *
+		 * If left as `false` the HTML inside the jstree container element is used to populate the tree (that should be an unordered list with list items).
+		 *
+		 * You can also pass in a HTML string or a JSON array here.
+		 *
+		 * It is possible to pass in a standard jQuery-like AJAX config and jstree will automatically determine if the response is JSON or HTML and use that to populate the tree.
+		 * In addition to the standard jQuery ajax options here you can suppy functions for `data` and `url`, the functions will be run in the current instance's scope and a param will be passed indicating which node is being loaded, the return value of those functions will be used.
+		 *
+		 * The last option is to specify a function, that function will receive the node being loaded as argument and a second param which is a function which should be called with the result.
+		 *
+		 * __Examples__
+		 *
+		 *	// AJAX
+		 *	$('#tree').jstree({
+		 *		'core' : {
+		 *			'data' : {
+		 *				'url' : '/get/children/',
+		 *				'data' : function (node) {
+		 *					return { 'id' : node.id };
+		 *				}
+		 *			}
+		 *		});
+		 *
+		 *	// direct data
+		 *	$('#tree').jstree({
+		 *		'core' : {
+		 *			'data' : [
+		 *				'Simple root node',
+		 *				{
+		 *					'id' : 'node_2',
+		 *					'text' : 'Root node with options',
+		 *					'state' : { 'opened' : true, 'selected' : true },
+		 *					'children' : [ { 'text' : 'Child 1' }, 'Child 2']
+		 *				}
+		 *			]
+		 *		});
+		 *
+		 *	// function
+		 *	$('#tree').jstree({
+		 *		'core' : {
+		 *			'data' : function (obj, callback) {
+		 *				callback.call(this, ['Root 1', 'Root 2']);
+		 *			}
+		 *		});
+		 *
+		 * @name $.jstree.defaults.core.data
+		 */
+		data			: false,
+		/**
+		 * configure the various strings used throughout the tree
+		 *
+		 * You can use an object where the key is the string you need to replace and the value is your replacement.
+		 * Another option is to specify a function which will be called with an argument of the needed string and should return the replacement.
+		 * If left as `false` no replacement is made.
+		 *
+		 * __Examples__
+		 *
+		 *	$('#tree').jstree({
+		 *		'core' : {
+		 *			'strings' : {
+		 *				'Loading ...' : 'Please wait ...'
+		 *			}
+		 *		}
+		 *	});
+		 *
+		 * @name $.jstree.defaults.core.strings
+		 */
+		strings			: false,
+		/**
+		 * determines what happens when a user tries to modify the structure of the tree
+		 * If left as `false` all operations like create, rename, delete, move or copy are prevented.
+		 * You can set this to `true` to allow all interactions or use a function to have better control.
+		 *
+		 * __Examples__
+		 *
+		 *	$('#tree').jstree({
+		 *		'core' : {
+		 *			'check_callback' : function (operation, node, node_parent, node_position, more) {
+		 *				// operation can be 'create_node', 'rename_node', 'delete_node', 'move_node' or 'copy_node'
+		 *				// in case of 'rename_node' node_position is filled with the new node name
+		 *				return operation === 'rename_node' ? true : false;
+		 *			}
+		 *		}
+		 *	});
+		 *
+		 * @name $.jstree.defaults.core.check_callback
+		 */
+		check_callback	: false,
+		/**
+		 * a callback called with a single object parameter in the instance's scope when something goes wrong (operation prevented, ajax failed, etc)
+		 * @name $.jstree.defaults.core.error
+		 */
+		error			: $.noop,
+		/**
+		 * the open / close animation duration in milliseconds - set this to `false` to disable the animation (default is `200`)
+		 * @name $.jstree.defaults.core.animation
+		 */
+		animation		: 200,
+		/**
+		 * a boolean indicating if multiple nodes can be selected
+		 * @name $.jstree.defaults.core.multiple
+		 */
+		multiple		: true,
+		/**
+		 * theme configuration object
+		 * @name $.jstree.defaults.core.themes
+		 */
+		themes			: {
+			/**
+			 * the name of the theme to use (if left as `false` the default theme is used)
+			 * @name $.jstree.defaults.core.themes.name
+			 */
+			name			: false,
+			/**
+			 * the URL of the theme's CSS file, leave this as `false` if you have manually included the theme CSS (recommended). You can set this to `true` too which will try to autoload the theme.
+			 * @name $.jstree.defaults.core.themes.url
+			 */
+			url				: false,
+			/**
+			 * the location of all jstree themes - only used if `url` is set to `true`
+			 * @name $.jstree.defaults.core.themes.dir
+			 */
+			dir				: false,
+			/**
+			 * a boolean indicating if connecting dots are shown
+			 * @name $.jstree.defaults.core.themes.dots
+			 */
+			dots			: true,
+			/**
+			 * a boolean indicating if node icons are shown
+			 * @name $.jstree.defaults.core.themes.icons
+			 */
+			icons			: true,
+			/**
+			 * a boolean indicating if the tree background is striped
+			 * @name $.jstree.defaults.core.themes.stripes
+			 */
+			stripes			: false,
+			/**
+			 * a string (or boolean `false`) specifying the theme variant to use (if the theme supports variants)
+			 * @name $.jstree.defaults.core.themes.variant
+			 */
+			variant			: false,
+			/**
+			 * a boolean specifying if a reponsive version of the theme should kick in on smaller screens (if the theme supports it). Defaults to `false`.
+			 * @name $.jstree.defaults.core.themes.responsive
+			 */
+			responsive		: false
+		},
+		/**
+		 * if left as `true` all parents of all selected nodes will be opened once the tree loads (so that all selected nodes are visible to the user)
+		 * @name $.jstree.defaults.core.expand_selected_onload
+		 */
+		expand_selected_onload : true,
+		/**
+		 * if left as `true` web workers will be used to parse incoming JSON data where possible, so that the UI will not be blocked by large requests. Workers are however about 30% slower. Defaults to `true`
+		 * @name $.jstree.defaults.core.worker
+		 */
+		worker : true,
+		/**
+		 * Force node text to plain text (and escape HTML). Defaults to `false`
+		 * @name $.jstree.defaults.core.force_text
+		 */
+		force_text : false,
+		/**
+		 * Should the node should be toggled if the text is double clicked . Defaults to `true`
+		 * @name $.jstree.defaults.core.dblclick_toggle
+		 */
+		dblclick_toggle : true
+	};
+	$.jstree.core.prototype = {
+		/**
+		 * used to decorate an instance with a plugin. Used internally.
+		 * @private
+		 * @name plugin(deco [, opts])
+		 * @param  {String} deco the plugin to decorate with
+		 * @param  {Object} opts options for the plugin
+		 * @return {jsTree}
+		 */
+		plugin : function (deco, opts) {
+			var Child = $.jstree.plugins[deco];
+			if(Child) {
+				this._data[deco] = {};
+				Child.prototype = this;
+				return new Child(opts, this);
+			}
+			return this;
+		},
+		/**
+		 * initialize the instance. Used internally.
+		 * @private
+		 * @name init(el, optons)
+		 * @param {DOMElement|jQuery|String} el the element we are transforming
+		 * @param {Object} options options for this instance
+		 * @trigger init.jstree, loading.jstree, loaded.jstree, ready.jstree, changed.jstree
+		 */
+		init : function (el, options) {
+			this._model = {
+				data : {},
+				changed : [],
+				force_full_redraw : false,
+				redraw_timeout : false,
+				default_state : {
+					loaded : true,
+					opened : false,
+					selected : false,
+					disabled : false
+				}
+			};
+			this._model.data[$.jstree.root] = {
+				id : $.jstree.root,
+				parent : null,
+				parents : [],
+				children : [],
+				children_d : [],
+				state : { loaded : false }
+			};
+
+			this.element = $(el).addClass('jstree jstree-' + this._id);
+			this.settings = options;
+
+			this._data.core.ready = false;
+			this._data.core.loaded = false;
+			this._data.core.rtl = (this.element.css("direction") === "rtl");
+			this.element[this._data.core.rtl ? 'addClass' : 'removeClass']("jstree-rtl");
+			this.element.attr('role','tree');
+			if(this.settings.core.multiple) {
+				this.element.attr('aria-multiselectable', true);
+			}
+			if(!this.element.attr('tabindex')) {
+				this.element.attr('tabindex','0');
+			}
+
+			this.bind();
+			/**
+			 * triggered after all events are bound
+			 * @event
+			 * @name init.jstree
+			 */
+			this.trigger("init");
+
+			this._data.core.original_container_html = this.element.find(" > ul > li").clone(true);
+			this._data.core.original_container_html
+				.find("li").addBack()
+				.contents().filter(function() {
+					return this.nodeType === 3 && (!this.nodeValue || /^\s+$/.test(this.nodeValue));
+				})
+				.remove();
+			this.element.html("<"+"ul class='jstree-container-ul jstree-children' role='group'><"+"li id='j"+this._id+"_loading' class='jstree-initial-node jstree-loading jstree-leaf jstree-last' role='tree-item'><i class='jstree-icon jstree-ocl'></i><"+"a class='jstree-anchor' href='#'><i class='jstree-icon jstree-themeicon-hidden'></i>" + this.get_string("Loading ...") + "</a></li></ul>");
+			this.element.attr('aria-activedescendant','j' + this._id + '_loading');
+			this._data.core.li_height = this.get_container_ul().children("li").first().height() || 24;
+			/**
+			 * triggered after the loading text is shown and before loading starts
+			 * @event
+			 * @name loading.jstree
+			 */
+			this.trigger("loading");
+			this.load_node($.jstree.root);
+		},
+		/**
+		 * destroy an instance
+		 * @name destroy()
+		 * @param  {Boolean} keep_html if not set to `true` the container will be emptied, otherwise the current DOM elements will be kept intact
+		 */
+		destroy : function (keep_html) {
+			if(this._wrk) {
+				try {
+					window.URL.revokeObjectURL(this._wrk);
+					this._wrk = null;
+				}
+				catch (ignore) { }
+			}
+			if(!keep_html) { this.element.empty(); }
+			this.teardown();
+		},
+		/**
+		 * part of the destroying of an instance. Used internally.
+		 * @private
+		 * @name teardown()
+		 */
+		teardown : function () {
+			this.unbind();
+			this.element
+				.removeClass('jstree')
+				.removeData('jstree')
+				.find("[class^='jstree']")
+					.addBack()
+					.attr("class", function () { return this.className.replace(/jstree[^ ]*|$/ig,''); });
+			this.element = null;
+		},
+		/**
+		 * bind all events. Used internally.
+		 * @private
+		 * @name bind()
+		 */
+		bind : function () {
+			var word = '',
+				tout = null,
+				was_click = 0;
+			this.element
+				.on("dblclick.jstree", function (e) {
+						if(e.target.tagName && e.target.tagName.toLowerCase() === "input") { return true; }
+						if(document.selection && document.selection.empty) {
+							document.selection.empty();
+						}
+						else {
+							if(window.getSelection) {
+								var sel = window.getSelection();
+								try {
+									sel.removeAllRanges();
+									sel.collapse();
+								} catch (ignore) { }
+							}
+						}
+					})
+				.on("mousedown.jstree", $.proxy(function (e) {
+						if(e.target === this.element[0]) {
+							e.preventDefault(); // prevent losing focus when clicking scroll arrows (FF, Chrome)
+							was_click = +(new Date()); // ie does not allow to prevent losing focus
+						}
+					}, this))
+				.on("mousedown.jstree", ".jstree-ocl", function (e) {
+						e.preventDefault(); // prevent any node inside from losing focus when clicking the open/close icon
+					})
+				.on("click.jstree", ".jstree-ocl", $.proxy(function (e) {
+						this.toggle_node(e.target);
+					}, this))
+				.on("dblclick.jstree", ".jstree-anchor", $.proxy(function (e) {
+						if(e.target.tagName && e.target.tagName.toLowerCase() === "input") { return true; }
+						if(this.settings.core.dblclick_toggle) {
+							this.toggle_node(e.target);
+						}
+					}, this))
+				.on("click.jstree", ".jstree-anchor", $.proxy(function (e) {
+						e.preventDefault();
+						if(e.currentTarget !== document.activeElement) { $(e.currentTarget).focus(); }
+						this.activate_node(e.currentTarget, e);
+					}, this))
+				.on('keydown.jstree', '.jstree-anchor', $.proxy(function (e) {
+						if(e.target.tagName && e.target.tagName.toLowerCase() === "input") { return true; }
+						if(e.which !== 32 && e.which !== 13 && (e.shiftKey || e.ctrlKey || e.altKey || e.metaKey)) { return true; }
+						var o = null;
+						if(this._data.core.rtl) {
+							if(e.which === 37) { e.which = 39; }
+							else if(e.which === 39) { e.which = 37; }
+						}
+						switch(e.which) {
+							case 32: // aria defines space only with Ctrl
+								if(e.ctrlKey) {
+									e.type = "click";
+									$(e.currentTarget).trigger(e);
+								}
+								break;
+							case 13: // enter
+								e.type = "click";
+								$(e.currentTarget).trigger(e);
+								break;
+							case 37: // right
+								e.preventDefault();
+								if(this.is_open(e.currentTarget)) {
+									this.close_node(e.currentTarget);
+								}
+								else {
+									o = this.get_parent(e.currentTarget);
+									if(o && o.id !== $.jstree.root) { this.get_node(o, true).children('.jstree-anchor').focus(); }
+								}
+								break;
+							case 38: // up
+								e.preventDefault();
+								o = this.get_prev_dom(e.currentTarget);
+								if(o && o.length) { o.children('.jstree-anchor').focus(); }
+								break;
+							case 39: // left
+								e.preventDefault();
+								if(this.is_closed(e.currentTarget)) {
+									this.open_node(e.currentTarget, function (o) { this.get_node(o, true).children('.jstree-anchor').focus(); });
+								}
+								else if (this.is_open(e.currentTarget)) {
+									o = this.get_node(e.currentTarget, true).children('.jstree-children')[0];
+									if(o) { $(this._firstChild(o)).children('.jstree-anchor').focus(); }
+								}
+								break;
+							case 40: // down
+								e.preventDefault();
+								o = this.get_next_dom(e.currentTarget);
+								if(o && o.length) { o.children('.jstree-anchor').focus(); }
+								break;
+							case 106: // aria defines * on numpad as open_all - not very common
+								this.open_all();
+								break;
+							case 36: // home
+								e.preventDefault();
+								o = this._firstChild(this.get_container_ul()[0]);
+								if(o) { $(o).children('.jstree-anchor').filter(':visible').focus(); }
+								break;
+							case 35: // end
+								e.preventDefault();
+								this.element.find('.jstree-anchor').filter(':visible').last().focus();
+								break;
+							/*!
+							// delete
+							case 46:
+								e.preventDefault();
+								o = this.get_node(e.currentTarget);
+								if(o && o.id && o.id !== $.jstree.root) {
+									o = this.is_selected(o) ? this.get_selected() : o;
+									this.delete_node(o);
+								}
+								break;
+							// f2
+							case 113:
+								e.preventDefault();
+								o = this.get_node(e.currentTarget);
+								if(o && o.id && o.id !== $.jstree.root) {
+									// this.edit(o);
+								}
+								break;
+							default:
+								// console.log(e.which);
+								break;
+							*/
+						}
+					}, this))
+				.on("load_node.jstree", $.proxy(function (e, data) {
+						if(data.status) {
+							if(data.node.id === $.jstree.root && !this._data.core.loaded) {
+								this._data.core.loaded = true;
+								if(this._firstChild(this.get_container_ul()[0])) {
+									this.element.attr('aria-activedescendant',this._firstChild(this.get_container_ul()[0]).id);
+								}
+								/**
+								 * triggered after the root node is loaded for the first time
+								 * @event
+								 * @name loaded.jstree
+								 */
+								this.trigger("loaded");
+							}
+							if(!this._data.core.ready) {
+								setTimeout($.proxy(function() {
+									if(this.element && !this.get_container_ul().find('.jstree-loading').length) {
+										this._data.core.ready = true;
+										if(this._data.core.selected.length) {
+											if(this.settings.core.expand_selected_onload) {
+												var tmp = [], i, j;
+												for(i = 0, j = this._data.core.selected.length; i < j; i++) {
+													tmp = tmp.concat(this._model.data[this._data.core.selected[i]].parents);
+												}
+												tmp = $.vakata.array_unique(tmp);
+												for(i = 0, j = tmp.length; i < j; i++) {
+													this.open_node(tmp[i], false, 0);
+												}
+											}
+											this.trigger('changed', { 'action' : 'ready', 'selected' : this._data.core.selected });
+										}
+										/**
+										 * triggered after all nodes are finished loading
+										 * @event
+										 * @name ready.jstree
+										 */
+										this.trigger("ready");
+									}
+								}, this), 0);
+							}
+						}
+					}, this))
+				// quick searching when the tree is focused
+				.on('keypress.jstree', $.proxy(function (e) {
+						if(e.target.tagName && e.target.tagName.toLowerCase() === "input") { return true; }
+						if(tout) { clearTimeout(tout); }
+						tout = setTimeout(function () {
+							word = '';
+						}, 500);
+
+						var chr = String.fromCharCode(e.which).toLowerCase(),
+							col = this.element.find('.jstree-anchor').filter(':visible'),
+							ind = col.index(document.activeElement) || 0,
+							end = false;
+						word += chr;
+
+						// match for whole word from current node down (including the current node)
+						if(word.length > 1) {
+							col.slice(ind).each($.proxy(function (i, v) {
+								if($(v).text().toLowerCase().indexOf(word) === 0) {
+									$(v).focus();
+									end = true;
+									return false;
+								}
+							}, this));
+							if(end) { return; }
+
+							// match for whole word from the beginning of the tree
+							col.slice(0, ind).each($.proxy(function (i, v) {
+								if($(v).text().toLowerCase().indexOf(word) === 0) {
+									$(v).focus();
+									end = true;
+									return false;
+								}
+							}, this));
+							if(end) { return; }
+						}
+						// list nodes that start with that letter (only if word consists of a single char)
+						if(new RegExp('^' + chr.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&') + '+$').test(word)) {
+							// search for the next node starting with that letter
+							col.slice(ind + 1).each($.proxy(function (i, v) {
+								if($(v).text().toLowerCase().charAt(0) === chr) {
+									$(v).focus();
+									end = true;
+									return false;
+								}
+							}, this));
+							if(end) { return; }
+
+							// search from the beginning
+							col.slice(0, ind + 1).each($.proxy(function (i, v) {
+								if($(v).text().toLowerCase().charAt(0) === chr) {
+									$(v).focus();
+									end = true;
+									return false;
+								}
+							}, this));
+							if(end) { return; }
+						}
+					}, this))
+				// THEME RELATED
+				.on("init.jstree", $.proxy(function () {
+						var s = this.settings.core.themes;
+						this._data.core.themes.dots			= s.dots;
+						this._data.core.themes.stripes		= s.stripes;
+						this._data.core.themes.icons		= s.icons;
+						this.set_theme(s.name || "default", s.url);
+						this.set_theme_variant(s.variant);
+					}, this))
+				.on("loading.jstree", $.proxy(function () {
+						this[ this._data.core.themes.dots ? "show_dots" : "hide_dots" ]();
+						this[ this._data.core.themes.icons ? "show_icons" : "hide_icons" ]();
+						this[ this._data.core.themes.stripes ? "show_stripes" : "hide_stripes" ]();
+					}, this))
+				.on('blur.jstree', '.jstree-anchor', $.proxy(function (e) {
+						this._data.core.focused = null;
+						$(e.currentTarget).filter('.jstree-hovered').mouseleave();
+						this.element.attr('tabindex', '0');
+					}, this))
+				.on('focus.jstree', '.jstree-anchor', $.proxy(function (e) {
+						var tmp = this.get_node(e.currentTarget);
+						if(tmp && tmp.id) {
+							this._data.core.focused = tmp.id;
+						}
+						this.element.find('.jstree-hovered').not(e.currentTarget).mouseleave();
+						$(e.currentTarget).mouseenter();
+						this.element.attr('tabindex', '-1');
+					}, this))
+				.on('focus.jstree', $.proxy(function () {
+						if(+(new Date()) - was_click > 500 && !this._data.core.focused) {
+							was_click = 0;
+							var act = this.get_node(this.element.attr('aria-activedescendant'), true);
+							if(act) {
+								act.find('> .jstree-anchor').focus();
+							}
+						}
+					}, this))
+				.on('mouseenter.jstree', '.jstree-anchor', $.proxy(function (e) {
+						this.hover_node(e.currentTarget);
+					}, this))
+				.on('mouseleave.jstree', '.jstree-anchor', $.proxy(function (e) {
+						this.dehover_node(e.currentTarget);
+					}, this));
+		},
+		/**
+		 * part of the destroying of an instance. Used internally.
+		 * @private
+		 * @name unbind()
+		 */
+		unbind : function () {
+			this.element.off('.jstree');
+			$(document).off('.jstree-' + this._id);
+		},
+		/**
+		 * trigger an event. Used internally.
+		 * @private
+		 * @name trigger(ev [, data])
+		 * @param  {String} ev the name of the event to trigger
+		 * @param  {Object} data additional data to pass with the event
+		 */
+		trigger : function (ev, data) {
+			if(!data) {
+				data = {};
+			}
+			data.instance = this;
+			this.element.triggerHandler(ev.replace('.jstree','') + '.jstree', data);
+		},
+		/**
+		 * returns the jQuery extended instance container
+		 * @name get_container()
+		 * @return {jQuery}
+		 */
+		get_container : function () {
+			return this.element;
+		},
+		/**
+		 * returns the jQuery extended main UL node inside the instance container. Used internally.
+		 * @private
+		 * @name get_container_ul()
+		 * @return {jQuery}
+		 */
+		get_container_ul : function () {
+			return this.element.children(".jstree-children").first();
+		},
+		/**
+		 * gets string replacements (localization). Used internally.
+		 * @private
+		 * @name get_string(key)
+		 * @param  {String} key
+		 * @return {String}
+		 */
+		get_string : function (key) {
+			var a = this.settings.core.strings;
+			if($.isFunction(a)) { return a.call(this, key); }
+			if(a && a[key]) { return a[key]; }
+			return key;
+		},
+		/**
+		 * gets the first child of a DOM node. Used internally.
+		 * @private
+		 * @name _firstChild(dom)
+		 * @param  {DOMElement} dom
+		 * @return {DOMElement}
+		 */
+		_firstChild : function (dom) {
+			dom = dom ? dom.firstChild : null;
+			while(dom !== null && dom.nodeType !== 1) {
+				dom = dom.nextSibling;
+			}
+			return dom;
+		},
+		/**
+		 * gets the next sibling of a DOM node. Used internally.
+		 * @private
+		 * @name _nextSibling(dom)
+		 * @param  {DOMElement} dom
+		 * @return {DOMElement}
+		 */
+		_nextSibling : function (dom) {
+			dom = dom ? dom.nextSibling : null;
+			while(dom !== null && dom.nodeType !== 1) {
+				dom = dom.nextSibling;
+			}
+			return dom;
+		},
+		/**
+		 * gets the previous sibling of a DOM node. Used internally.
+		 * @private
+		 * @name _previousSibling(dom)
+		 * @param  {DOMElement} dom
+		 * @return {DOMElement}
+		 */
+		_previousSibling : function (dom) {
+			dom = dom ? dom.previousSibling : null;
+			while(dom !== null && dom.nodeType !== 1) {
+				dom = dom.previousSibling;
+			}
+			return dom;
+		},
+		/**
+		 * get the JSON representation of a node (or the actual jQuery extended DOM node) by using any input (child DOM element, ID string, selector, etc)
+		 * @name get_node(obj [, as_dom])
+		 * @param  {mixed} obj
+		 * @param  {Boolean} as_dom
+		 * @return {Object|jQuery}
+		 */
+		get_node : function (obj, as_dom) {
+			if(obj && obj.id) {
+				obj = obj.id;
+			}
+			var dom;
+			try {
+				if(this._model.data[obj]) {
+					obj = this._model.data[obj];
+				}
+				else if(typeof obj === "string" && this._model.data[obj.replace(/^#/, '')]) {
+					obj = this._model.data[obj.replace(/^#/, '')];
+				}
+				else if(typeof obj === "string" && (dom = $('#' + obj.replace($.jstree.idregex,'\\$&'), this.element)).length && this._model.data[dom.closest('.jstree-node').attr('id')]) {
+					obj = this._model.data[dom.closest('.jstree-node').attr('id')];
+				}
+				else if((dom = $(obj, this.element)).length && this._model.data[dom.closest('.jstree-node').attr('id')]) {
+					obj = this._model.data[dom.closest('.jstree-node').attr('id')];
+				}
+				else if((dom = $(obj, this.element)).length && dom.hasClass('jstree')) {
+					obj = this._model.data[$.jstree.root];
+				}
+				else {
+					return false;
+				}
+
+				if(as_dom) {
+					obj = obj.id === $.jstree.root ? this.element : $('#' + obj.id.replace($.jstree.idregex,'\\$&'), this.element);
+				}
+				return obj;
+			} catch (ex) { return false; }
+		},
+		/**
+		 * get the path to a node, either consisting of node texts, or of node IDs, optionally glued together (otherwise an array)
+		 * @name get_path(obj [, glue, ids])
+		 * @param  {mixed} obj the node
+		 * @param  {String} glue if you want the path as a string - pass the glue here (for example '/'), if a falsy value is supplied here, an array is returned
+		 * @param  {Boolean} ids if set to true build the path using ID, otherwise node text is used
+		 * @return {mixed}
+		 */
+		get_path : function (obj, glue, ids) {
+			obj = obj.parents ? obj : this.get_node(obj);
+			if(!obj || obj.id === $.jstree.root || !obj.parents) {
+				return false;
+			}
+			var i, j, p = [];
+			p.push(ids ? obj.id : obj.text);
+			for(i = 0, j = obj.parents.length; i < j; i++) {
+				p.push(ids ? obj.parents[i] : this.get_text(obj.parents[i]));
+			}
+			p = p.reverse().slice(1);
+			return glue ? p.join(glue) : p;
+		},
+		/**
+		 * get the next visible node that is below the `obj` node. If `strict` is set to `true` only sibling nodes are returned.
+		 * @name get_next_dom(obj [, strict])
+		 * @param  {mixed} obj
+		 * @param  {Boolean} strict
+		 * @return {jQuery}
+		 */
+		get_next_dom : function (obj, strict) {
+			var tmp;
+			obj = this.get_node(obj, true);
+			if(obj[0] === this.element[0]) {
+				tmp = this._firstChild(this.get_container_ul()[0]);
+				while (tmp && tmp.offsetHeight === 0) {
+					tmp = this._nextSibling(tmp);
+				}
+				return tmp ? $(tmp) : false;
+			}
+			if(!obj || !obj.length) {
+				return false;
+			}
+			if(strict) {
+				tmp = obj[0];
+				do {
+					tmp = this._nextSibling(tmp);
+				} while (tmp && tmp.offsetHeight === 0);
+				return tmp ? $(tmp) : false;
+			}
+			if(obj.hasClass("jstree-open")) {
+				tmp = this._firstChild(obj.children('.jstree-children')[0]);
+				while (tmp && tmp.offsetHeight === 0) {
+					tmp = this._nextSibling(tmp);
+				}
+				if(tmp !== null) {
+					return $(tmp);
+				}
+			}
+			tmp = obj[0];
+			do {
+				tmp = this._nextSibling(tmp);
+			} while (tmp && tmp.offsetHeight === 0);
+			if(tmp !== null) {
+				return $(tmp);
+			}
+			return obj.parentsUntil(".jstree",".jstree-node").nextAll(".jstree-node:visible").first();
+		},
+		/**
+		 * get the previous visible node that is above the `obj` node. If `strict` is set to `true` only sibling nodes are returned.
+		 * @name get_prev_dom(obj [, strict])
+		 * @param  {mixed} obj
+		 * @param  {Boolean} strict
+		 * @return {jQuery}
+		 */
+		get_prev_dom : function (obj, strict) {
+			var tmp;
+			obj = this.get_node(obj, true);
+			if(obj[0] === this.element[0]) {
+				tmp = this.get_container_ul()[0].lastChild;
+				while (tmp && tmp.offsetHeight === 0) {
+					tmp = this._previousSibling(tmp);
+				}
+				return tmp ? $(tmp) : false;
+			}
+			if(!obj || !obj.length) {
+				return false;
+			}
+			if(strict) {
+				tmp = obj[0];
+				do {
+					tmp = this._previousSibling(tmp);
+				} while (tmp && tmp.offsetHeight === 0);
+				return tmp ? $(tmp) : false;
+			}
+			tmp = obj[0];
+			do {
+				tmp = this._previousSibling(tmp);
+			} while (tmp && tmp.offsetHeight === 0);
+			if(tmp !== null) {
+				obj = $(tmp);
+				while(obj.hasClass("jstree-open")) {
+					obj = obj.children(".jstree-children").first().children(".jstree-node:visible:last");
+				}
+				return obj;
+			}
+			tmp = obj[0].parentNode.parentNode;
+			return tmp && tmp.className && tmp.className.indexOf('jstree-node') !== -1 ? $(tmp) : false;
+		},
+		/**
+		 * get the parent ID of a node
+		 * @name get_parent(obj)
+		 * @param  {mixed} obj
+		 * @return {String}
+		 */
+		get_parent : function (obj) {
+			obj = this.get_node(obj);
+			if(!obj || obj.id === $.jstree.root) {
+				return false;
+			}
+			return obj.parent;
+		},
+		/**
+		 * get a jQuery collection of all the children of a node (node must be rendered)
+		 * @name get_children_dom(obj)
+		 * @param  {mixed} obj
+		 * @return {jQuery}
+		 */
+		get_children_dom : function (obj) {
+			obj = this.get_node(obj, true);
+			if(obj[0] === this.element[0]) {
+				return this.get_container_ul().children(".jstree-node");
+			}
+			if(!obj || !obj.length) {
+				return false;
+			}
+			return obj.children(".jstree-children").children(".jstree-node");
+		},
+		/**
+		 * checks if a node has children
+		 * @name is_parent(obj)
+		 * @param  {mixed} obj
+		 * @return {Boolean}
+		 */
+		is_parent : function (obj) {
+			obj = this.get_node(obj);
+			return obj && (obj.state.loaded === false || obj.children.length > 0);
+		},
+		/**
+		 * checks if a node is loaded (its children are available)
+		 * @name is_loaded(obj)
+		 * @param  {mixed} obj
+		 * @return {Boolean}
+		 */
+		is_loaded : function (obj) {
+			obj = this.get_node(obj);
+			return obj && obj.state.loaded;
+		},
+		/**
+		 * check if a node is currently loading (fetching children)
+		 * @name is_loading(obj)
+		 * @param  {mixed} obj
+		 * @return {Boolean}
+		 */
+		is_loading : function (obj) {
+			obj = this.get_node(obj);
+			return obj && obj.state && obj.state.loading;
+		},
+		/**
+		 * check if a node is opened
+		 * @name is_open(obj)
+		 * @param  {mixed} obj
+		 * @return {Boolean}
+		 */
+		is_open : function (obj) {
+			obj = this.get_node(obj);
+			return obj && obj.state.opened;
+		},
+		/**
+		 * check if a node is in a closed state
+		 * @name is_closed(obj)
+		 * @param  {mixed} obj
+		 * @return {Boolean}
+		 */
+		is_closed : function (obj) {
+			obj = this.get_node(obj);
+			return obj && this.is_parent(obj) && !obj.state.opened;
+		},
+		/**
+		 * check if a node has no children
+		 * @name is_leaf(obj)
+		 * @param  {mixed} obj
+		 * @return {Boolean}
+		 */
+		is_leaf : function (obj) {
+			return !this.is_parent(obj);
+		},
+		/**
+		 * loads a node (fetches its children using the `core.data` setting). Multiple nodes can be passed to by using an array.
+		 * @name load_node(obj [, callback])
+		 * @param  {mixed} obj
+		 * @param  {function} callback a function to be executed once loading is complete, the function is executed in the instance's scope and receives two arguments - the node and a boolean status
+		 * @return {Boolean}
+		 * @trigger load_node.jstree
+		 */
+		load_node : function (obj, callback) {
+			var k, l, i, j, c;
+			if($.isArray(obj)) {
+				this._load_nodes(obj.slice(), callback);
+				return true;
+			}
+			obj = this.get_node(obj);
+			if(!obj) {
+				if(callback) { callback.call(this, obj, false); }
+				return false;
+			}
+			// if(obj.state.loading) { } // the node is already loading - just wait for it to load and invoke callback? but if called implicitly it should be loaded again?
+			if(obj.state.loaded) {
+				obj.state.loaded = false;
+				for(k = 0, l = obj.children_d.length; k < l; k++) {
+					for(i = 0, j = obj.parents.length; i < j; i++) {
+						this._model.data[obj.parents[i]].children_d = $.vakata.array_remove_item(this._model.data[obj.parents[i]].children_d, obj.children_d[k]);
+					}
+					if(this._model.data[obj.children_d[k]].state.selected) {
+						c = true;
+						this._data.core.selected = $.vakata.array_remove_item(this._data.core.selected, obj.children_d[k]);
+					}
+					delete this._model.data[obj.children_d[k]];
+				}
+				obj.children = [];
+				obj.children_d = [];
+				if(c) {
+					this.trigger('changed', { 'action' : 'load_node', 'node' : obj, 'selected' : this._data.core.selected });
+				}
+			}
+			obj.state.failed = false;
+			obj.state.loading = true;
+			this.get_node(obj, true).addClass("jstree-loading").attr('aria-busy',true);
+			this._load_node(obj, $.proxy(function (status) {
+				obj = this._model.data[obj.id];
+				obj.state.loading = false;
+				obj.state.loaded = status;
+				obj.state.failed = !obj.state.loaded;
+				var dom = this.get_node(obj, true), i = 0, j = 0, m = this._model.data, has_children = false;
+				for(i = 0, j = obj.children.length; i < j; i++) {
+					if(m[obj.children[i]] && !m[obj.children[i]].state.hidden) {
+						has_children = true;
+						break;
+					}
+				}
+				if(obj.state.loaded && !has_children && dom && dom.length && !dom.hasClass('jstree-leaf')) {
+					dom.removeClass('jstree-closed jstree-open').addClass('jstree-leaf');
+				}
+				dom.removeClass("jstree-loading").attr('aria-busy',false);
+				/**
+				 * triggered after a node is loaded
+				 * @event
+				 * @name load_node.jstree
+				 * @param {Object} node the node that was loading
+				 * @param {Boolean} status was the node loaded successfully
+				 */
+				this.trigger('load_node', { "node" : obj, "status" : status });
+				if(callback) {
+					callback.call(this, obj, status);
+				}
+			}, this));
+			return true;
+		},
+		/**
+		 * load an array of nodes (will also load unavailable nodes as soon as the appear in the structure). Used internally.
+		 * @private
+		 * @name _load_nodes(nodes [, callback])
+		 * @param  {array} nodes
+		 * @param  {function} callback a function to be executed once loading is complete, the function is executed in the instance's scope and receives one argument - the array passed to _load_nodes
+		 */
+		_load_nodes : function (nodes, callback, is_callback) {
+			var r = true,
+				c = function () { this._load_nodes(nodes, callback, true); },
+				m = this._model.data, i, j, tmp = [];
+			for(i = 0, j = nodes.length; i < j; i++) {
+				if(m[nodes[i]] && ( (!m[nodes[i]].state.loaded && !m[nodes[i]].state.failed) || !is_callback)) {
+					if(!this.is_loading(nodes[i])) {
+						this.load_node(nodes[i], c);
+					}
+					r = false;
+				}
+			}
+			if(r) {
+				for(i = 0, j = nodes.length; i < j; i++) {
+					if(m[nodes[i]] && m[nodes[i]].state.loaded) {
+						tmp.push(nodes[i]);
+					}
+				}
+				if(callback && !callback.done) {
+					callback.call(this, tmp);
+					callback.done = true;
+				}
+			}
+		},
+		/**
+		 * loads all unloaded nodes
+		 * @name load_all([obj, callback])
+		 * @param {mixed} obj the node to load recursively, omit to load all nodes in the tree
+		 * @param {function} callback a function to be executed once loading all the nodes is complete,
+		 * @trigger load_all.jstree
+		 */
+		load_all : function (obj, callback) {
+			if(!obj) { obj = $.jstree.root; }
+			obj = this.get_node(obj);
+			if(!obj) { return false; }
+			var to_load = [],
+				m = this._model.data,
+				c = m[obj.id].children_d,
+				i, j;
+			if(obj.state && !obj.state.loaded) {
+				to_load.push(obj.id);
+			}
+			for(i = 0, j = c.length; i < j; i++) {
+				if(m[c[i]] && m[c[i]].state && !m[c[i]].state.loaded) {
+					to_load.push(c[i]);
+				}
+			}
+			if(to_load.length) {
+				this._load_nodes(to_load, function () {
+					this.load_all(obj, callback);
+				});
+			}
+			else {
+				/**
+				 * triggered after a load_all call completes
+				 * @event
+				 * @name load_all.jstree
+				 * @param {Object} node the recursively loaded node
+				 */
+				if(callback) { callback.call(this, obj); }
+				this.trigger('load_all', { "node" : obj });
+			}
+		},
+		/**
+		 * handles the actual loading of a node. Used only internally.
+		 * @private
+		 * @name _load_node(obj [, callback])
+		 * @param  {mixed} obj
+		 * @param  {function} callback a function to be executed once loading is complete, the function is executed in the instance's scope and receives one argument - a boolean status
+		 * @return {Boolean}
+		 */
+		_load_node : function (obj, callback) {
+			var s = this.settings.core.data, t;
+			// use original HTML
+			if(!s) {
+				if(obj.id === $.jstree.root) {
+					return this._append_html_data(obj, this._data.core.original_container_html.clone(true), function (status) {
+						callback.call(this, status);
+					});
+				}
+				else {
+					return callback.call(this, false);
+				}
+				// return callback.call(this, obj.id === $.jstree.root ? this._append_html_data(obj, this._data.core.original_container_html.clone(true)) : false);
+			}
+			if($.isFunction(s)) {
+				return s.call(this, obj, $.proxy(function (d) {
+					if(d === false) {
+						callback.call(this, false);
+					}
+					this[typeof d === 'string' ? '_append_html_data' : '_append_json_data'](obj, typeof d === 'string' ? $($.parseHTML(d)).filter(function () { return this.nodeType !== 3; }) : d, function (status) {
+						callback.call(this, status);
+					});
+					// return d === false ? callback.call(this, false) : callback.call(this, this[typeof d === 'string' ? '_append_html_data' : '_append_json_data'](obj, typeof d === 'string' ? $(d) : d));
+				}, this));
+			}
+			if(typeof s === 'object') {
+				if(s.url) {
+					s = $.extend(true, {}, s);
+					if($.isFunction(s.url)) {
+						s.url = s.url.call(this, obj);
+					}
+					if($.isFunction(s.data)) {
+						s.data = s.data.call(this, obj);
+					}
+					return $.ajax(s)
+						.done($.proxy(function (d,t,x) {
+								var type = x.getResponseHeader('Content-Type');
+								if((type && type.indexOf('json') !== -1) || typeof d === "object") {
+									return this._append_json_data(obj, d, function (status) { callback.call(this, status); });
+									//return callback.call(this, this._append_json_data(obj, d));
+								}
+								if((type && type.indexOf('html') !== -1) || typeof d === "string") {
+									return this._append_html_data(obj, $($.parseHTML(d)).filter(function () { return this.nodeType !== 3; }), function (status) { callback.call(this, status); });
+									// return callback.call(this, this._append_html_data(obj, $(d)));
+								}
+								this._data.core.last_error = { 'error' : 'ajax', 'plugin' : 'core', 'id' : 'core_04', 'reason' : 'Could not load node', 'data' : JSON.stringify({ 'id' : obj.id, 'xhr' : x }) };
+								this.settings.core.error.call(this, this._data.core.last_error);
+								return callback.call(this, false);
+							}, this))
+						.fail($.proxy(function (f) {
+								callback.call(this, false);
+								this._data.core.last_error = { 'error' : 'ajax', 'plugin' : 'core', 'id' : 'core_04', 'reason' : 'Could not load node', 'data' : JSON.stringify({ 'id' : obj.id, 'xhr' : f }) };
+								this.settings.core.error.call(this, this._data.core.last_error);
+							}, this));
+				}
+				t = ($.isArray(s) || $.isPlainObject(s)) ? JSON.parse(JSON.stringify(s)) : s;
+				if(obj.id === $.jstree.root) {
+					return this._append_json_data(obj, t, function (status) {
+						callback.call(this, status);
+					});
+				}
+				else {
+					this._data.core.last_error = { 'error' : 'nodata', 'plugin' : 'core', 'id' : 'core_05', 'reason' : 'Could not load node', 'data' : JSON.stringify({ 'id' : obj.id }) };
+					this.settings.core.error.call(this, this._data.core.last_error);
+					return callback.call(this, false);
+				}
+				//return callback.call(this, (obj.id === $.jstree.root ? this._append_json_data(obj, t) : false) );
+			}
+			if(typeof s === 'string') {
+				if(obj.id === $.jstree.root) {
+					return this._append_html_data(obj, $($.parseHTML(s)).filter(function () { return this.nodeType !== 3; }), function (status) {
+						callback.call(this, status);
+					});
+				}
+				else {
+					this._data.core.last_error = { 'error' : 'nodata', 'plugin' : 'core', 'id' : 'core_06', 'reason' : 'Could not load node', 'data' : JSON.stringify({ 'id' : obj.id }) };
+					this.settings.core.error.call(this, this._data.core.last_error);
+					return callback.call(this, false);
+				}
+				//return callback.call(this, (obj.id === $.jstree.root ? this._append_html_data(obj, $(s)) : false) );
+			}
+			return callback.call(this, false);
+		},
+		/**
+		 * adds a node to the list of nodes to redraw. Used only internally.
+		 * @private
+		 * @name _node_changed(obj [, callback])
+		 * @param  {mixed} obj
+		 */
+		_node_changed : function (obj) {
+			obj = this.get_node(obj);
+			if(obj) {
+				this._model.changed.push(obj.id);
+			}
+		},
+		/**
+		 * appends HTML content to the tree. Used internally.
+		 * @private
+		 * @name _append_html_data(obj, data)
+		 * @param  {mixed} obj the node to append to
+		 * @param  {String} data the HTML string to parse and append
+		 * @trigger model.jstree, changed.jstree
+		 */
+		_append_html_data : function (dom, data, cb) {
+			dom = this.get_node(dom);
+			dom.children = [];
+			dom.children_d = [];
+			var dat = data.is('ul') ? data.children() : data,
+				par = dom.id,
+				chd = [],
+				dpc = [],
+				m = this._model.data,
+				p = m[par],
+				s = this._data.core.selected.length,
+				tmp, i, j;
+			dat.each($.proxy(function (i, v) {
+				tmp = this._parse_model_from_html($(v), par, p.parents.concat());
+				if(tmp) {
+					chd.push(tmp);
+					dpc.push(tmp);
+					if(m[tmp].children_d.length) {
+						dpc = dpc.concat(m[tmp].children_d);
+					}
+				}
+			}, this));
+			p.children = chd;
+			p.children_d = dpc;
+			for(i = 0, j = p.parents.length; i < j; i++) {
+				m[p.parents[i]].children_d = m[p.parents[i]].children_d.concat(dpc);
+			}
+			/**
+			 * triggered when new data is inserted to the tree model
+			 * @event
+			 * @name model.jstree
+			 * @param {Array} nodes an array of node IDs
+			 * @param {String} parent the parent ID of the nodes
+			 */
+			this.trigger('model', { "nodes" : dpc, 'parent' : par });
+			if(par !== $.jstree.root) {
+				this._node_changed(par);
+				this.redraw();
+			}
+			else {
+				this.get_container_ul().children('.jstree-initial-node').remove();
+				this.redraw(true);
+			}
+			if(this._data.core.selected.length !== s) {
+				this.trigger('changed', { 'action' : 'model', 'selected' : this._data.core.selected });
+			}
+			cb.call(this, true);
+		},
+		/**
+		 * appends JSON content to the tree. Used internally.
+		 * @private
+		 * @name _append_json_data(obj, data)
+		 * @param  {mixed} obj the node to append to
+		 * @param  {String} data the JSON object to parse and append
+		 * @param  {Boolean} force_processing internal param - do not set
+		 * @trigger model.jstree, changed.jstree
+		 */
+		_append_json_data : function (dom, data, cb, force_processing) {
+			if(this.element === null) { return; }
+			dom = this.get_node(dom);
+			dom.children = [];
+			dom.children_d = [];
+			// *%$@!!!
+			if(data.d) {
+				data = data.d;
+				if(typeof data === "string") {
+					data = JSON.parse(data);
+				}
+			}
+			if(!$.isArray(data)) { data = [data]; }
+			var w = null,
+				args = {
+					'df'	: this._model.default_state,
+					'dat'	: data,
+					'par'	: dom.id,
+					'm'		: this._model.data,
+					't_id'	: this._id,
+					't_cnt'	: this._cnt,
+					'sel'	: this._data.core.selected
+				},
+				func = function (data, undefined) {
+					if(data.data) { data = data.data; }
+					var dat = data.dat,
+						par = data.par,
+						chd = [],
+						dpc = [],
+						add = [],
+						df = data.df,
+						t_id = data.t_id,
+						t_cnt = data.t_cnt,
+						m = data.m,
+						p = m[par],
+						sel = data.sel,
+						tmp, i, j, rslt,
+						parse_flat = function (d, p, ps) {
+							if(!ps) { ps = []; }
+							else { ps = ps.concat(); }
+							if(p) { ps.unshift(p); }
+							var tid = d.id.toString(),
+								i, j, c, e,
+								tmp = {
+									id			: tid,
+									text		: d.text || '',
+									icon		: d.icon !== undefined ? d.icon : true,
+									parent		: p,
+									parents		: ps,
+									children	: d.children || [],
+									children_d	: d.children_d || [],
+									data		: d.data,
+									state		: { },
+									li_attr		: { id : false },
+									a_attr		: { href : '#' },
+									original	: false
+								};
+							for(i in df) {
+								if(df.hasOwnProperty(i)) {
+									tmp.state[i] = df[i];
+								}
+							}
+							if(d && d.data && d.data.jstree && d.data.jstree.icon) {
+								tmp.icon = d.data.jstree.icon;
+							}
+							if(tmp.icon === undefined || tmp.icon === null || tmp.icon === "") {
+								tmp.icon = true;
+							}
+							if(d && d.data) {
+								tmp.data = d.data;
+								if(d.data.jstree) {
+									for(i in d.data.jstree) {
+										if(d.data.jstree.hasOwnProperty(i)) {
+											tmp.state[i] = d.data.jstree[i];
+										}
+									}
+								}
+							}
+							if(d && typeof d.state === 'object') {
+								for (i in d.state) {
+									if(d.state.hasOwnProperty(i)) {
+										tmp.state[i] = d.state[i];
+									}
+								}
+							}
+							if(d && typeof d.li_attr === 'object') {
+								for (i in d.li_attr) {
+									if(d.li_attr.hasOwnProperty(i)) {
+										tmp.li_attr[i] = d.li_attr[i];
+									}
+								}
+							}
+							if(!tmp.li_attr.id) {
+								tmp.li_attr.id = tid;
+							}
+							if(d && typeof d.a_attr === 'object') {
+								for (i in d.a_attr) {
+									if(d.a_attr.hasOwnProperty(i)) {
+										tmp.a_attr[i] = d.a_attr[i];
+									}
+								}
+							}
+							if(d && d.children && d.children === true) {
+								tmp.state.loaded = false;
+								tmp.children = [];
+								tmp.children_d = [];
+							}
+							m[tmp.id] = tmp;
+							for(i = 0, j = tmp.children.length; i < j; i++) {
+								c = parse_flat(m[tmp.children[i]], tmp.id, ps);
+								e = m[c];
+								tmp.children_d.push(c);
+								if(e.children_d.length) {
+									tmp.children_d = tmp.children_d.concat(e.children_d);
+								}
+							}
+							delete d.data;
+							delete d.children;
+							m[tmp.id].original = d;
+							if(tmp.state.selected) {
+								add.push(tmp.id);
+							}
+							return tmp.id;
+						},
+						parse_nest = function (d, p, ps) {
+							if(!ps) { ps = []; }
+							else { ps = ps.concat(); }
+							if(p) { ps.unshift(p); }
+							var tid = false, i, j, c, e, tmp;
+							do {
+								tid = 'j' + t_id + '_' + (++t_cnt);
+							} while(m[tid]);
+
+							tmp = {
+								id			: false,
+								text		: typeof d === 'string' ? d : '',
+								icon		: typeof d === 'object' && d.icon !== undefined ? d.icon : true,
+								parent		: p,
+								parents		: ps,
+								children	: [],
+								children_d	: [],
+								data		: null,
+								state		: { },
+								li_attr		: { id : false },
+								a_attr		: { href : '#' },
+								original	: false
+							};
+							for(i in df) {
+								if(df.hasOwnProperty(i)) {
+									tmp.state[i] = df[i];
+								}
+							}
+							if(d && d.id) { tmp.id = d.id.toString(); }
+							if(d && d.text) { tmp.text = d.text; }
+							if(d && d.data && d.data.jstree && d.data.jstree.icon) {
+								tmp.icon = d.data.jstree.icon;
+							}
+							if(tmp.icon === undefined || tmp.icon === null || tmp.icon === "") {
+								tmp.icon = true;
+							}
+							if(d && d.data) {
+								tmp.data = d.data;
+								if(d.data.jstree) {
+									for(i in d.data.jstree) {
+										if(d.data.jstree.hasOwnProperty(i)) {
+											tmp.state[i] = d.data.jstree[i];
+										}
+									}
+								}
+							}
+							if(d && typeof d.state === 'object') {
+								for (i in d.state) {
+									if(d.state.hasOwnProperty(i)) {
+										tmp.state[i] = d.state[i];
+									}
+								}
+							}
+							if(d && typeof d.li_attr === 'object') {
+								for (i in d.li_attr) {
+									if(d.li_attr.hasOwnProperty(i)) {
+										tmp.li_attr[i] = d.li_attr[i];
+									}
+								}
+							}
+							if(tmp.li_attr.id && !tmp.id) {
+								tmp.id = tmp.li_attr.id.toString();
+							}
+							if(!tmp.id) {
+								tmp.id = tid;
+							}
+							if(!tmp.li_attr.id) {
+								tmp.li_attr.id = tmp.id;
+							}
+							if(d && typeof d.a_attr === 'object') {
+								for (i in d.a_attr) {
+									if(d.a_attr.hasOwnProperty(i)) {
+										tmp.a_attr[i] = d.a_attr[i];
+									}
+								}
+							}
+							if(d && d.children && d.children.length) {
+								for(i = 0, j = d.children.length; i < j; i++) {
+									c = parse_nest(d.children[i], tmp.id, ps);
+									e = m[c];
+									tmp.children.push(c);
+									if(e.children_d.length) {
+										tmp.children_d = tmp.children_d.concat(e.children_d);
+									}
+								}
+								tmp.children_d = tmp.children_d.concat(tmp.children);
+							}
+							if(d && d.children && d.children === true) {
+								tmp.state.loaded = false;
+								tmp.children = [];
+								tmp.children_d = [];
+							}
+							delete d.data;
+							delete d.children;
+							tmp.original = d;
+							m[tmp.id] = tmp;
+							if(tmp.state.selected) {
+								add.push(tmp.id);
+							}
+							return tmp.id;
+						};
+
+					if(dat.length && dat[0].id !== undefined && dat[0].parent !== undefined) {
+						// Flat JSON support (for easy import from DB):
+						// 1) convert to object (foreach)
+						for(i = 0, j = dat.length; i < j; i++) {
+							if(!dat[i].children) {
+								dat[i].children = [];
+							}
+							m[dat[i].id.toString()] = dat[i];
+						}
+						// 2) populate children (foreach)
+						for(i = 0, j = dat.length; i < j; i++) {
+							m[dat[i].parent.toString()].children.push(dat[i].id.toString());
+							// populate parent.children_d
+							p.children_d.push(dat[i].id.toString());
+						}
+						// 3) normalize && populate parents and children_d with recursion
+						for(i = 0, j = p.children.length; i < j; i++) {
+							tmp = parse_flat(m[p.children[i]], par, p.parents.concat());
+							dpc.push(tmp);
+							if(m[tmp].children_d.length) {
+								dpc = dpc.concat(m[tmp].children_d);
+							}
+						}
+						for(i = 0, j = p.parents.length; i < j; i++) {
+							m[p.parents[i]].children_d = m[p.parents[i]].children_d.concat(dpc);
+						}
+						// ?) three_state selection - p.state.selected && t - (if three_state foreach(dat => ch) -> foreach(parents) if(parent.selected) child.selected = true;
+						rslt = {
+							'cnt' : t_cnt,
+							'mod' : m,
+							'sel' : sel,
+							'par' : par,
+							'dpc' : dpc,
+							'add' : add
+						};
+					}
+					else {
+						for(i = 0, j = dat.length; i < j; i++) {
+							tmp = parse_nest(dat[i], par, p.parents.concat());
+							if(tmp) {
+								chd.push(tmp);
+								dpc.push(tmp);
+								if(m[tmp].children_d.length) {
+									dpc = dpc.concat(m[tmp].children_d);
+								}
+							}
+						}
+						p.children = chd;
+						p.children_d = dpc;
+						for(i = 0, j = p.parents.length; i < j; i++) {
+							m[p.parents[i]].children_d = m[p.parents[i]].children_d.concat(dpc);
+						}
+						rslt = {
+							'cnt' : t_cnt,
+							'mod' : m,
+							'sel' : sel,
+							'par' : par,
+							'dpc' : dpc,
+							'add' : add
+						};
+					}
+					if(typeof window === 'undefined' || typeof window.document === 'undefined') {
+						postMessage(rslt);
+					}
+					else {
+						return rslt;
+					}
+				},
+				rslt = function (rslt, worker) {
+					if(this.element === null) { return; }
+					this._cnt = rslt.cnt;
+					this._model.data = rslt.mod; // breaks the reference in load_node - careful
+
+					if(worker) {
+						var i, j, a = rslt.add, r = rslt.sel, s = this._data.core.selected.slice(), m = this._model.data;
+						// if selection was changed while calculating in worker
+						if(r.length !== s.length || $.vakata.array_unique(r.concat(s)).length !== r.length) {
+							// deselect nodes that are no longer selected
+							for(i = 0, j = r.length; i < j; i++) {
+								if($.inArray(r[i], a) === -1 && $.inArray(r[i], s) === -1) {
+									m[r[i]].state.selected = false;
+								}
+							}
+							// select nodes that were selected in the mean time
+							for(i = 0, j = s.length; i < j; i++) {
+								if($.inArray(s[i], r) === -1) {
+									m[s[i]].state.selected = true;
+								}
+							}
+						}
+					}
+					if(rslt.add.length) {
+						this._data.core.selected = this._data.core.selected.concat(rslt.add);
+					}
+
+					this.trigger('model', { "nodes" : rslt.dpc, 'parent' : rslt.par });
+
+					if(rslt.par !== $.jstree.root) {
+						this._node_changed(rslt.par);
+						this.redraw();
+					}
+					else {
+						// this.get_container_ul().children('.jstree-initial-node').remove();
+						this.redraw(true);
+					}
+					if(rslt.add.length) {
+						this.trigger('changed', { 'action' : 'model', 'selected' : this._data.core.selected });
+					}
+					cb.call(this, true);
+				};
+			if(this.settings.core.worker && window.Blob && window.URL && window.Worker) {
+				try {
+					if(this._wrk === null) {
+						this._wrk = window.URL.createObjectURL(
+							new window.Blob(
+								['self.onmessage = ' + func.toString()],
+								{type:"text/javascript"}
+							)
+						);
+					}
+					if(!this._data.core.working || force_processing) {
+						this._data.core.working = true;
+						w = new window.Worker(this._wrk);
+						w.onmessage = $.proxy(function (e) {
+							rslt.call(this, e.data, true);
+							try { w.terminate(); w = null; } catch(ignore) { }
+							if(this._data.core.worker_queue.length) {
+								this._append_json_data.apply(this, this._data.core.worker_queue.shift());
+							}
+							else {
+								this._data.core.working = false;
+							}
+						}, this);
+						if(!args.par) {
+							if(this._data.core.worker_queue.length) {
+								this._append_json_data.apply(this, this._data.core.worker_queue.shift());
+							}
+							else {
+								this._data.core.working = false;
+							}
+						}
+						else {
+							w.postMessage(args);
+						}
+					}
+					else {
+						this._data.core.worker_queue.push([dom, data, cb, true]);
+					}
+				}
+				catch(e) {
+					rslt.call(this, func(args), false);
+					if(this._data.core.worker_queue.length) {
+						this._append_json_data.apply(this, this._data.core.worker_queue.shift());
+					}
+					else {
+						this._data.core.working = false;
+					}
+				}
+			}
+			else {
+				rslt.call(this, func(args), false);
+			}
+		},
+		/**
+		 * parses a node from a jQuery object and appends them to the in memory tree model. Used internally.
+		 * @private
+		 * @name _parse_model_from_html(d [, p, ps])
+		 * @param  {jQuery} d the jQuery object to parse
+		 * @param  {String} p the parent ID
+		 * @param  {Array} ps list of all parents
+		 * @return {String} the ID of the object added to the model
+		 */
+		_parse_model_from_html : function (d, p, ps) {
+			if(!ps) { ps = []; }
+			else { ps = [].concat(ps); }
+			if(p) { ps.unshift(p); }
+			var c, e, m = this._model.data,
+				data = {
+					id			: false,
+					text		: false,
+					icon		: true,
+					parent		: p,
+					parents		: ps,
+					children	: [],
+					children_d	: [],
+					data		: null,
+					state		: { },
+					li_attr		: { id : false },
+					a_attr		: { href : '#' },
+					original	: false
+				}, i, tmp, tid;
+			for(i in this._model.default_state) {
+				if(this._model.default_state.hasOwnProperty(i)) {
+					data.state[i] = this._model.default_state[i];
+				}
+			}
+			tmp = $.vakata.attributes(d, true);
+			$.each(tmp, function (i, v) {
+				v = $.trim(v);
+				if(!v.length) { return true; }
+				data.li_attr[i] = v;
+				if(i === 'id') {
+					data.id = v.toString();
+				}
+			});
+			tmp = d.children('a').first();
+			if(tmp.length) {
+				tmp = $.vakata.attributes(tmp, true);
+				$.each(tmp, function (i, v) {
+					v = $.trim(v);
+					if(v.length) {
+						data.a_attr[i] = v;
+					}
+				});
+			}
+			tmp = d.children("a").first().length ? d.children("a").first().clone() : d.clone();
+			tmp.children("ins, i, ul").remove();
+			tmp = tmp.html();
+			tmp = $('<div />').html(tmp);
+			data.text = this.settings.core.force_text ? tmp.text() : tmp.html();
+			tmp = d.data();
+			data.data = tmp ? $.extend(true, {}, tmp) : null;
+			data.state.opened = d.hasClass('jstree-open');
+			data.state.selected = d.children('a').hasClass('jstree-clicked');
+			data.state.disabled = d.children('a').hasClass('jstree-disabled');
+			if(data.data && data.data.jstree) {
+				for(i in data.data.jstree) {
+					if(data.data.jstree.hasOwnProperty(i)) {
+						data.state[i] = data.data.jstree[i];
+					}
+				}
+			}
+			tmp = d.children("a").children(".jstree-themeicon");
+			if(tmp.length) {
+				data.icon = tmp.hasClass('jstree-themeicon-hidden') ? false : tmp.attr('rel');
+			}
+			if(data.state.icon !== undefined) {
+				data.icon = data.state.icon;
+			}
+			if(data.icon === undefined || data.icon === null || data.icon === "") {
+				data.icon = true;
+			}
+			tmp = d.children("ul").children("li");
+			do {
+				tid = 'j' + this._id + '_' + (++this._cnt);
+			} while(m[tid]);
+			data.id = data.li_attr.id ? data.li_attr.id.toString() : tid;
+			if(tmp.length) {
+				tmp.each($.proxy(function (i, v) {
+					c = this._parse_model_from_html($(v), data.id, ps);
+					e = this._model.data[c];
+					data.children.push(c);
+					if(e.children_d.length) {
+						data.children_d = data.children_d.concat(e.children_d);
+					}
+				}, this));
+				data.children_d = data.children_d.concat(data.children);
+			}
+			else {
+				if(d.hasClass('jstree-closed')) {
+					data.state.loaded = false;
+				}
+			}
+			if(data.li_attr['class']) {
+				data.li_attr['class'] = data.li_attr['class'].replace('jstree-closed','').replace('jstree-open','');
+			}
+			if(data.a_attr['class']) {
+				data.a_attr['class'] = data.a_attr['class'].replace('jstree-clicked','').replace('jstree-disabled','');
+			}
+			m[data.id] = data;
+			if(data.state.selected) {
+				this._data.core.selected.push(data.id);
+			}
+			return data.id;
+		},
+		/**
+		 * parses a node from a JSON object (used when dealing with flat data, which has no nesting of children, but has id and parent properties) and appends it to the in memory tree model. Used internally.
+		 * @private
+		 * @name _parse_model_from_flat_json(d [, p, ps])
+		 * @param  {Object} d the JSON object to parse
+		 * @param  {String} p the parent ID
+		 * @param  {Array} ps list of all parents
+		 * @return {String} the ID of the object added to the model
+		 */
+		_parse_model_from_flat_json : function (d, p, ps) {
+			if(!ps) { ps = []; }
+			else { ps = ps.concat(); }
+			if(p) { ps.unshift(p); }
+			var tid = d.id.toString(),
+				m = this._model.data,
+				df = this._model.default_state,
+				i, j, c, e,
+				tmp = {
+					id			: tid,
+					text		: d.text || '',
+					icon		: d.icon !== undefined ? d.icon : true,
+					parent		: p,
+					parents		: ps,
+					children	: d.children || [],
+					children_d	: d.children_d || [],
+					data		: d.data,
+					state		: { },
+					li_attr		: { id : false },
+					a_attr		: { href : '#' },
+					original	: false
+				};
+			for(i in df) {
+				if(df.hasOwnProperty(i)) {
+					tmp.state[i] = df[i];
+				}
+			}
+			if(d && d.data && d.data.jstree && d.data.jstree.icon) {
+				tmp.icon = d.data.jstree.icon;
+			}
+			if(tmp.icon === undefined || tmp.icon === null || tmp.icon === "") {
+				tmp.icon = true;
+			}
+			if(d && d.data) {
+				tmp.data = d.data;
+				if(d.data.jstree) {
+					for(i in d.data.jstree) {
+						if(d.data.jstree.hasOwnProperty(i)) {
+							tmp.state[i] = d.data.jstree[i];
+						}
+					}
+				}
+			}
+			if(d && typeof d.state === 'object') {
+				for (i in d.state) {
+					if(d.state.hasOwnProperty(i)) {
+						tmp.state[i] = d.state[i];
+					}
+				}
+			}
+			if(d && typeof d.li_attr === 'object') {
+				for (i in d.li_attr) {
+					if(d.li_attr.hasOwnProperty(i)) {
+						tmp.li_attr[i] = d.li_attr[i];
+					}
+				}
+			}
+			if(!tmp.li_attr.id) {
+				tmp.li_attr.id = tid;
+			}
+			if(d && typeof d.a_attr === 'object') {
+				for (i in d.a_attr) {
+					if(d.a_attr.hasOwnProperty(i)) {
+						tmp.a_attr[i] = d.a_attr[i];
+					}
+				}
+			}
+			if(d && d.children && d.children === true) {
+				tmp.state.loaded = false;
+				tmp.children = [];
+				tmp.children_d = [];
+			}
+			m[tmp.id] = tmp;
+			for(i = 0, j = tmp.children.length; i < j; i++) {
+				c = this._parse_model_from_flat_json(m[tmp.children[i]], tmp.id, ps);
+				e = m[c];
+				tmp.children_d.push(c);
+				if(e.children_d.length) {
+					tmp.children_d = tmp.children_d.concat(e.children_d);
+				}
+			}
+			delete d.data;
+			delete d.children;
+			m[tmp.id].original = d;
+			if(tmp.state.selected) {
+				this._data.core.selected.push(tmp.id);
+			}
+			return tmp.id;
+		},
+		/**
+		 * parses a node from a JSON object and appends it to the in memory tree model. Used internally.
+		 * @private
+		 * @name _parse_model_from_json(d [, p, ps])
+		 * @param  {Object} d the JSON object to parse
+		 * @param  {String} p the parent ID
+		 * @param  {Array} ps list of all parents
+		 * @return {String} the ID of the object added to the model
+		 */
+		_parse_model_from_json : function (d, p, ps) {
+			if(!ps) { ps = []; }
+			else { ps = ps.concat(); }
+			if(p) { ps.unshift(p); }
+			var tid = false, i, j, c, e, m = this._model.data, df = this._model.default_state, tmp;
+			do {
+				tid = 'j' + this._id + '_' + (++this._cnt);
+			} while(m[tid]);
+
+			tmp = {
+				id			: false,
+				text		: typeof d === 'string' ? d : '',
+				icon		: typeof d === 'object' && d.icon !== undefined ? d.icon : true,
+				parent		: p,
+				parents		: ps,
+				children	: [],
+				children_d	: [],
+				data		: null,
+				state		: { },
+				li_attr		: { id : false },
+				a_attr		: { href : '#' },
+				original	: false
+			};
+			for(i in df) {
+				if(df.hasOwnProperty(i)) {
+					tmp.state[i] = df[i];
+				}
+			}
+			if(d && d.id) { tmp.id = d.id.toString(); }
+			if(d && d.text) { tmp.text = d.text; }
+			if(d && d.data && d.data.jstree && d.data.jstree.icon) {
+				tmp.icon = d.data.jstree.icon;
+			}
+			if(tmp.icon === undefined || tmp.icon === null || tmp.icon === "") {
+				tmp.icon = true;
+			}
+			if(d && d.data) {
+				tmp.data = d.data;
+				if(d.data.jstree) {
+					for(i in d.data.jstree) {
+						if(d.data.jstree.hasOwnProperty(i)) {
+							tmp.state[i] = d.data.jstree[i];
+						}
+					}
+				}
+			}
+			if(d && typeof d.state === 'object') {
+				for (i in d.state) {
+					if(d.state.hasOwnProperty(i)) {
+						tmp.state[i] = d.state[i];
+					}
+				}
+			}
+			if(d && typeof d.li_attr === 'object') {
+				for (i in d.li_attr) {
+					if(d.li_attr.hasOwnProperty(i)) {
+						tmp.li_attr[i] = d.li_attr[i];
+					}
+				}
+			}
+			if(tmp.li_attr.id && !tmp.id) {
+				tmp.id = tmp.li_attr.id.toString();
+			}
+			if(!tmp.id) {
+				tmp.id = tid;
+			}
+			if(!tmp.li_attr.id) {
+				tmp.li_attr.id = tmp.id;
+			}
+			if(d && typeof d.a_attr === 'object') {
+				for (i in d.a_attr) {
+					if(d.a_attr.hasOwnProperty(i)) {
+						tmp.a_attr[i] = d.a_attr[i];
+					}
+				}
+			}
+			if(d && d.children && d.children.length) {
+				for(i = 0, j = d.children.length; i < j; i++) {
+					c = this._parse_model_from_json(d.children[i], tmp.id, ps);
+					e = m[c];
+					tmp.children.push(c);
+					if(e.children_d.length) {
+						tmp.children_d = tmp.children_d.concat(e.children_d);
+					}
+				}
+				tmp.children_d = tmp.children_d.concat(tmp.children);
+			}
+			if(d && d.children && d.children === true) {
+				tmp.state.loaded = false;
+				tmp.children = [];
+				tmp.children_d = [];
+			}
+			delete d.data;
+			delete d.children;
+			tmp.original = d;
+			m[tmp.id] = tmp;
+			if(tmp.state.selected) {
+				this._data.core.selected.push(tmp.id);
+			}
+			return tmp.id;
+		},
+		/**
+		 * redraws all nodes that need to be redrawn. Used internally.
+		 * @private
+		 * @name _redraw()
+		 * @trigger redraw.jstree
+		 */
+		_redraw : function () {
+			var nodes = this._model.force_full_redraw ? this._model.data[$.jstree.root].children.concat([]) : this._model.changed.concat([]),
+				f = document.createElement('UL'), tmp, i, j, fe = this._data.core.focused;
+			for(i = 0, j = nodes.length; i < j; i++) {
+				tmp = this.redraw_node(nodes[i], true, this._model.force_full_redraw);
+				if(tmp && this._model.force_full_redraw) {
+					f.appendChild(tmp);
+				}
+			}
+			if(this._model.force_full_redraw) {
+				f.className = this.get_container_ul()[0].className;
+				f.setAttribute('role','group');
+				this.element.empty().append(f);
+				//this.get_container_ul()[0].appendChild(f);
+			}
+			if(fe !== null) {
+				tmp = this.get_node(fe, true);
+				if(tmp && tmp.length && tmp.children('.jstree-anchor')[0] !== document.activeElement) {
+					tmp.children('.jstree-anchor').focus();
+				}
+				else {
+					this._data.core.focused = null;
+				}
+			}
+			this._model.force_full_redraw = false;
+			this._model.changed = [];
+			/**
+			 * triggered after nodes are redrawn
+			 * @event
+			 * @name redraw.jstree
+			 * @param {array} nodes the redrawn nodes
+			 */
+			this.trigger('redraw', { "nodes" : nodes });
+		},
+		/**
+		 * redraws all nodes that need to be redrawn or optionally - the whole tree
+		 * @name redraw([full])
+		 * @param {Boolean} full if set to `true` all nodes are redrawn.
+		 */
+		redraw : function (full) {
+			if(full) {
+				this._model.force_full_redraw = true;
+			}
+			//if(this._model.redraw_timeout) {
+			//	clearTimeout(this._model.redraw_timeout);
+			//}
+			//this._model.redraw_timeout = setTimeout($.proxy(this._redraw, this),0);
+			this._redraw();
+		},
+		/**
+		 * redraws a single node's children. Used internally.
+		 * @private
+		 * @name draw_children(node)
+		 * @param {mixed} node the node whose children will be redrawn
+		 */
+		draw_children : function (node) {
+			var obj = this.get_node(node),
+				i = false,
+				j = false,
+				k = false,
+				d = document;
+			if(!obj) { return false; }
+			if(obj.id === $.jstree.root) { return this.redraw(true); }
+			node = this.get_node(node, true);
+			if(!node || !node.length) { return false; } // TODO: quick toggle
+
+			node.children('.jstree-children').remove();
+			node = node[0];
+			if(obj.children.length && obj.state.loaded) {
+				k = d.createElement('UL');
+				k.setAttribute('role', 'group');
+				k.className = 'jstree-children';
+				for(i = 0, j = obj.children.length; i < j; i++) {
+					k.appendChild(this.redraw_node(obj.children[i], true, true));
+				}
+				node.appendChild(k);
+			}
+		},
+		/**
+		 * redraws a single node. Used internally.
+		 * @private
+		 * @name redraw_node(node, deep, is_callback, force_render)
+		 * @param {mixed} node the node to redraw
+		 * @param {Boolean} deep should child nodes be redrawn too
+		 * @param {Boolean} is_callback is this a recursion call
+		 * @param {Boolean} force_render should children of closed parents be drawn anyway
+		 */
+		redraw_node : function (node, deep, is_callback, force_render) {
+			var obj = this.get_node(node),
+				par = false,
+				ind = false,
+				old = false,
+				i = false,
+				j = false,
+				k = false,
+				c = '',
+				d = document,
+				m = this._model.data,
+				f = false,
+				s = false,
+				tmp = null,
+				t = 0,
+				l = 0,
+				has_children = false,
+				last_sibling = false;
+			if(!obj) { return false; }
+			if(obj.id === $.jstree.root) {  return this.redraw(true); }
+			deep = deep || obj.children.length === 0;
+			node = !document.querySelector ? document.getElementById(obj.id) : this.element[0].querySelector('#' + ("0123456789".indexOf(obj.id[0]) !== -1 ? '\\3' + obj.id[0] + ' ' + obj.id.substr(1).replace($.jstree.idregex,'\\$&') : obj.id.replace($.jstree.idregex,'\\$&')) ); //, this.element);
+			if(!node) {
+				deep = true;
+				//node = d.createElement('LI');
+				if(!is_callback) {
+					par = obj.parent !== $.jstree.root ? $('#' + obj.parent.replace($.jstree.idregex,'\\$&'), this.element)[0] : null;
+					if(par !== null && (!par || !m[obj.parent].state.opened)) {
+						return false;
+					}
+					ind = $.inArray(obj.id, par === null ? m[$.jstree.root].children : m[obj.parent].children);
+				}
+			}
+			else {
+				node = $(node);
+				if(!is_callback) {
+					par = node.parent().parent()[0];
+					if(par === this.element[0]) {
+						par = null;
+					}
+					ind = node.index();
+				}
+				// m[obj.id].data = node.data(); // use only node's data, no need to touch jquery storage
+				if(!deep && obj.children.length && !node.children('.jstree-children').length) {
+					deep = true;
+				}
+				if(!deep) {
+					old = node.children('.jstree-children')[0];
+				}
+				f = node.children('.jstree-anchor')[0] === document.activeElement;
+				node.remove();
+				//node = d.createElement('LI');
+				//node = node[0];
+			}
+			node = _node.cloneNode(true);
+			// node is DOM, deep is boolean
+
+			c = 'jstree-node ';
+			for(i in obj.li_attr) {
+				if(obj.li_attr.hasOwnProperty(i)) {
+					if(i === 'id') { continue; }
+					if(i !== 'class') {
+						node.setAttribute(i, obj.li_attr[i]);
+					}
+					else {
+						c += obj.li_attr[i];
+					}
+				}
+			}
+			if(!obj.a_attr.id) {
+				obj.a_attr.id = obj.id + '_anchor';
+			}
+			node.setAttribute('aria-selected', !!obj.state.selected);
+			node.setAttribute('aria-level', obj.parents.length);
+			node.setAttribute('aria-labelledby', obj.a_attr.id);
+			if(obj.state.disabled) {
+				node.setAttribute('aria-disabled', true);
+			}
+
+			for(i = 0, j = obj.children.length; i < j; i++) {
+				if(!m[obj.children[i]].state.hidden) {
+					has_children = true;
+					break;
+				}
+			}
+			if(obj.parent !== null && m[obj.parent] && !obj.state.hidden) {
+				i = $.inArray(obj.id, m[obj.parent].children);
+				last_sibling = obj.id;
+				if(i !== -1) {
+					i++;
+					for(j = m[obj.parent].children.length; i < j; i++) {
+						if(!m[m[obj.parent].children[i]].state.hidden) {
+							last_sibling = m[obj.parent].children[i];
+						}
+						if(last_sibling !== obj.id) {
+							break;
+						}
+					}
+				}
+			}
+
+			if(obj.state.hidden) {
+				c += ' jstree-hidden';
+			}
+			if(obj.state.loaded && !has_children) {
+				c += ' jstree-leaf';
+			}
+			else {
+				c += obj.state.opened && obj.state.loaded ? ' jstree-open' : ' jstree-closed';
+				node.setAttribute('aria-expanded', (obj.state.opened && obj.state.loaded) );
+			}
+			if(last_sibling === obj.id) {
+				c += ' jstree-last';
+			}
+			node.id = obj.id;
+			node.className = c;
+			c = ( obj.state.selected ? ' jstree-clicked' : '') + ( obj.state.disabled ? ' jstree-disabled' : '');
+			for(j in obj.a_attr) {
+				if(obj.a_attr.hasOwnProperty(j)) {
+					if(j === 'href' && obj.a_attr[j] === '#') { continue; }
+					if(j !== 'class') {
+						node.childNodes[1].setAttribute(j, obj.a_attr[j]);
+					}
+					else {
+						c += ' ' + obj.a_attr[j];
+					}
+				}
+			}
+			if(c.length) {
+				node.childNodes[1].className = 'jstree-anchor ' + c;
+			}
+			if((obj.icon && obj.icon !== true) || obj.icon === false) {
+				if(obj.icon === false) {
+					node.childNodes[1].childNodes[0].className += ' jstree-themeicon-hidden';
+				}
+				else if(obj.icon.indexOf('/') === -1 && obj.icon.indexOf('.') === -1) {
+					node.childNodes[1].childNodes[0].className += ' ' + obj.icon + ' jstree-themeicon-custom';
+				}
+				else {
+					node.childNodes[1].childNodes[0].style.backgroundImage = 'url('+obj.icon+')';
+					node.childNodes[1].childNodes[0].style.backgroundPosition = 'center center';
+					node.childNodes[1].childNodes[0].style.backgroundSize = 'auto';
+					node.childNodes[1].childNodes[0].className += ' jstree-themeicon-custom';
+				}
+			}
+
+			if(this.settings.core.force_text) {
+				node.childNodes[1].appendChild(d.createTextNode(obj.text));
+			}
+			else {
+				node.childNodes[1].innerHTML += obj.text;
+			}
+
+
+			if(deep && obj.children.length && (obj.state.opened || force_render) && obj.state.loaded) {
+				k = d.createElement('UL');
+				k.setAttribute('role', 'group');
+				k.className = 'jstree-children';
+				for(i = 0, j = obj.children.length; i < j; i++) {
+					k.appendChild(this.redraw_node(obj.children[i], deep, true));
+				}
+				node.appendChild(k);
+			}
+			if(old) {
+				node.appendChild(old);
+			}
+			if(!is_callback) {
+				// append back using par / ind
+				if(!par) {
+					par = this.element[0];
+				}
+				for(i = 0, j = par.childNodes.length; i < j; i++) {
+					if(par.childNodes[i] && par.childNodes[i].className && par.childNodes[i].className.indexOf('jstree-children') !== -1) {
+						tmp = par.childNodes[i];
+						break;
+					}
+				}
+				if(!tmp) {
+					tmp = d.createElement('UL');
+					tmp.setAttribute('role', 'group');
+					tmp.className = 'jstree-children';
+					par.appendChild(tmp);
+				}
+				par = tmp;
+
+				if(ind < par.childNodes.length) {
+					par.insertBefore(node, par.childNodes[ind]);
+				}
+				else {
+					par.appendChild(node);
+				}
+				if(f) {
+					t = this.element[0].scrollTop;
+					l = this.element[0].scrollLeft;
+					node.childNodes[1].focus();
+					this.element[0].scrollTop = t;
+					this.element[0].scrollLeft = l;
+				}
+			}
+			if(obj.state.opened && !obj.state.loaded) {
+				obj.state.opened = false;
+				setTimeout($.proxy(function () {
+					this.open_node(obj.id, false, 0);
+				}, this), 0);
+			}
+			return node;
+		},
+		/**
+		 * opens a node, revaling its children. If the node is not loaded it will be loaded and opened once ready.
+		 * @name open_node(obj [, callback, animation])
+		 * @param {mixed} obj the node to open
+		 * @param {Function} callback a function to execute once the node is opened
+		 * @param {Number} animation the animation duration in milliseconds when opening the node (overrides the `core.animation` setting). Use `false` for no animation.
+		 * @trigger open_node.jstree, after_open.jstree, before_open.jstree
+		 */
+		open_node : function (obj, callback, animation) {
+			var t1, t2, d, t;
+			if($.isArray(obj)) {
+				obj = obj.slice();
+				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+					this.open_node(obj[t1], callback, animation);
+				}
+				return true;
+			}
+			obj = this.get_node(obj);
+			if(!obj || obj.id === $.jstree.root) {
+				return false;
+			}
+			animation = animation === undefined ? this.settings.core.animation : animation;
+			if(!this.is_closed(obj)) {
+				if(callback) {
+					callback.call(this, obj, false);
+				}
+				return false;
+			}
+			if(!this.is_loaded(obj)) {
+				if(this.is_loading(obj)) {
+					return setTimeout($.proxy(function () {
+						this.open_node(obj, callback, animation);
+					}, this), 500);
+				}
+				this.load_node(obj, function (o, ok) {
+					return ok ? this.open_node(o, callback, animation) : (callback ? callback.call(this, o, false) : false);
+				});
+			}
+			else {
+				d = this.get_node(obj, true);
+				t = this;
+				if(d.length) {
+					if(animation && d.children(".jstree-children").length) {
+						d.children(".jstree-children").stop(true, true);
+					}
+					if(obj.children.length && !this._firstChild(d.children('.jstree-children')[0])) {
+						this.draw_children(obj);
+						//d = this.get_node(obj, true);
+					}
+					if(!animation) {
+						this.trigger('before_open', { "node" : obj });
+						d[0].className = d[0].className.replace('jstree-closed', 'jstree-open');
+						d[0].setAttribute("aria-expanded", true);
+					}
+					else {
+						this.trigger('before_open', { "node" : obj });
+						d
+							.children(".jstree-children").css("display","none").end()
+							.removeClass("jstree-closed").addClass("jstree-open").attr("aria-expanded", true)
+							.children(".jstree-children").stop(true, true)
+								.slideDown(animation, function () {
+									this.style.display = "";
+									t.trigger("after_open", { "node" : obj });
+								});
+					}
+				}
+				obj.state.opened = true;
+				if(callback) {
+					callback.call(this, obj, true);
+				}
+				if(!d.length) {
+					/**
+					 * triggered when a node is about to be opened (if the node is supposed to be in the DOM, it will be, but it won't be visible yet)
+					 * @event
+					 * @name before_open.jstree
+					 * @param {Object} node the opened node
+					 */
+					this.trigger('before_open', { "node" : obj });
+				}
+				/**
+				 * triggered when a node is opened (if there is an animation it will not be completed yet)
+				 * @event
+				 * @name open_node.jstree
+				 * @param {Object} node the opened node
+				 */
+				this.trigger('open_node', { "node" : obj });
+				if(!animation || !d.length) {
+					/**
+					 * triggered when a node is opened and the animation is complete
+					 * @event
+					 * @name after_open.jstree
+					 * @param {Object} node the opened node
+					 */
+					this.trigger("after_open", { "node" : obj });
+				}
+				return true;
+			}
+		},
+		/**
+		 * opens every parent of a node (node should be loaded)
+		 * @name _open_to(obj)
+		 * @param {mixed} obj the node to reveal
+		 * @private
+		 */
+		_open_to : function (obj) {
+			obj = this.get_node(obj);
+			if(!obj || obj.id === $.jstree.root) {
+				return false;
+			}
+			var i, j, p = obj.parents;
+			for(i = 0, j = p.length; i < j; i+=1) {
+				if(i !== $.jstree.root) {
+					this.open_node(p[i], false, 0);
+				}
+			}
+			return $('#' + obj.id.replace($.jstree.idregex,'\\$&'), this.element);
+		},
+		/**
+		 * closes a node, hiding its children
+		 * @name close_node(obj [, animation])
+		 * @param {mixed} obj the node to close
+		 * @param {Number} animation the animation duration in milliseconds when closing the node (overrides the `core.animation` setting). Use `false` for no animation.
+		 * @trigger close_node.jstree, after_close.jstree
+		 */
+		close_node : function (obj, animation) {
+			var t1, t2, t, d;
+			if($.isArray(obj)) {
+				obj = obj.slice();
+				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+					this.close_node(obj[t1], animation);
+				}
+				return true;
+			}
+			obj = this.get_node(obj);
+			if(!obj || obj.id === $.jstree.root) {
+				return false;
+			}
+			if(this.is_closed(obj)) {
+				return false;
+			}
+			animation = animation === undefined ? this.settings.core.animation : animation;
+			t = this;
+			d = this.get_node(obj, true);
+			if(d.length) {
+				if(!animation) {
+					d[0].className = d[0].className.replace('jstree-open', 'jstree-closed');
+					d.attr("aria-expanded", false).children('.jstree-children').remove();
+				}
+				else {
+					d
+						.children(".jstree-children").attr("style","display:block !important").end()
+						.removeClass("jstree-open").addClass("jstree-closed").attr("aria-expanded", false)
+						.children(".jstree-children").stop(true, true).slideUp(animation, function () {
+							this.style.display = "";
+							d.children('.jstree-children').remove();
+							t.trigger("after_close", { "node" : obj });
+						});
+				}
+			}
+			obj.state.opened = false;
+			/**
+			 * triggered when a node is closed (if there is an animation it will not be complete yet)
+			 * @event
+			 * @name close_node.jstree
+			 * @param {Object} node the closed node
+			 */
+			this.trigger('close_node',{ "node" : obj });
+			if(!animation || !d.length) {
+				/**
+				 * triggered when a node is closed and the animation is complete
+				 * @event
+				 * @name after_close.jstree
+				 * @param {Object} node the closed node
+				 */
+				this.trigger("after_close", { "node" : obj });
+			}
+		},
+		/**
+		 * toggles a node - closing it if it is open, opening it if it is closed
+		 * @name toggle_node(obj)
+		 * @param {mixed} obj the node to toggle
+		 */
+		toggle_node : function (obj) {
+			var t1, t2;
+			if($.isArray(obj)) {
+				obj = obj.slice();
+				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+					this.toggle_node(obj[t1]);
+				}
+				return true;
+			}
+			if(this.is_closed(obj)) {
+				return this.open_node(obj);
+			}
+			if(this.is_open(obj)) {
+				return this.close_node(obj);
+			}
+		},
+		/**
+		 * opens all nodes within a node (or the tree), revaling their children. If the node is not loaded it will be loaded and opened once ready.
+		 * @name open_all([obj, animation, original_obj])
+		 * @param {mixed} obj the node to open recursively, omit to open all nodes in the tree
+		 * @param {Number} animation the animation duration in milliseconds when opening the nodes, the default is no animation
+		 * @param {jQuery} reference to the node that started the process (internal use)
+		 * @trigger open_all.jstree
+		 */
+		open_all : function (obj, animation, original_obj) {
+			if(!obj) { obj = $.jstree.root; }
+			obj = this.get_node(obj);
+			if(!obj) { return false; }
+			var dom = obj.id === $.jstree.root ? this.get_container_ul() : this.get_node(obj, true), i, j, _this;
+			if(!dom.length) {
+				for(i = 0, j = obj.children_d.length; i < j; i++) {
+					if(this.is_closed(this._model.data[obj.children_d[i]])) {
+						this._model.data[obj.children_d[i]].state.opened = true;
+					}
+				}
+				return this.trigger('open_all', { "node" : obj });
+			}
+			original_obj = original_obj || dom;
+			_this = this;
+			dom = this.is_closed(obj) ? dom.find('.jstree-closed').addBack() : dom.find('.jstree-closed');
+			dom.each(function () {
+				_this.open_node(
+					this,
+					function(node, status) { if(status && this.is_parent(node)) { this.open_all(node, animation, original_obj); } },
+					animation || 0
+				);
+			});
+			if(original_obj.find('.jstree-closed').length === 0) {
+				/**
+				 * triggered when an `open_all` call completes
+				 * @event
+				 * @name open_all.jstree
+				 * @param {Object} node the opened node
+				 */
+				this.trigger('open_all', { "node" : this.get_node(original_obj) });
+			}
+		},
+		/**
+		 * closes all nodes within a node (or the tree), revaling their children
+		 * @name close_all([obj, animation])
+		 * @param {mixed} obj the node to close recursively, omit to close all nodes in the tree
+		 * @param {Number} animation the animation duration in milliseconds when closing the nodes, the default is no animation
+		 * @trigger close_all.jstree
+		 */
+		close_all : function (obj, animation) {
+			if(!obj) { obj = $.jstree.root; }
+			obj = this.get_node(obj);
+			if(!obj) { return false; }
+			var dom = obj.id === $.jstree.root ? this.get_container_ul() : this.get_node(obj, true),
+				_this = this, i, j;
+			if(dom.length) {
+				dom = this.is_open(obj) ? dom.find('.jstree-open').addBack() : dom.find('.jstree-open');
+				$(dom.get().reverse()).each(function () { _this.close_node(this, animation || 0); });
+			}
+			for(i = 0, j = obj.children_d.length; i < j; i++) {
+				this._model.data[obj.children_d[i]].state.opened = false;
+			}
+			/**
+			 * triggered when an `close_all` call completes
+			 * @event
+			 * @name close_all.jstree
+			 * @param {Object} node the closed node
+			 */
+			this.trigger('close_all', { "node" : obj });
+		},
+		/**
+		 * checks if a node is disabled (not selectable)
+		 * @name is_disabled(obj)
+		 * @param  {mixed} obj
+		 * @return {Boolean}
+		 */
+		is_disabled : function (obj) {
+			obj = this.get_node(obj);
+			return obj && obj.state && obj.state.disabled;
+		},
+		/**
+		 * enables a node - so that it can be selected
+		 * @name enable_node(obj)
+		 * @param {mixed} obj the node to enable
+		 * @trigger enable_node.jstree
+		 */
+		enable_node : function (obj) {
+			var t1, t2;
+			if($.isArray(obj)) {
+				obj = obj.slice();
+				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+					this.enable_node(obj[t1]);
+				}
+				return true;
+			}
+			obj = this.get_node(obj);
+			if(!obj || obj.id === $.jstree.root) {
+				return false;
+			}
+			obj.state.disabled = false;
+			this.get_node(obj,true).children('.jstree-anchor').removeClass('jstree-disabled').attr('aria-disabled', false);
+			/**
+			 * triggered when an node is enabled
+			 * @event
+			 * @name enable_node.jstree
+			 * @param {Object} node the enabled node
+			 */
+			this.trigger('enable_node', { 'node' : obj });
+		},
+		/**
+		 * disables a node - so that it can not be selected
+		 * @name disable_node(obj)
+		 * @param {mixed} obj the node to disable
+		 * @trigger disable_node.jstree
+		 */
+		disable_node : function (obj) {
+			var t1, t2;
+			if($.isArray(obj)) {
+				obj = obj.slice();
+				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+					this.disable_node(obj[t1]);
+				}
+				return true;
+			}
+			obj = this.get_node(obj);
+			if(!obj || obj.id === $.jstree.root) {
+				return false;
+			}
+			obj.state.disabled = true;
+			this.get_node(obj,true).children('.jstree-anchor').addClass('jstree-disabled').attr('aria-disabled', true);
+			/**
+			 * triggered when an node is disabled
+			 * @event
+			 * @name disable_node.jstree
+			 * @param {Object} node the disabled node
+			 */
+			this.trigger('disable_node', { 'node' : obj });
+		},
+		/**
+		 * hides a node - it is still in the structure but will not be visible
+		 * @name hide_node(obj)
+		 * @param {mixed} obj the node to hide
+		 * @param {Boolean} redraw internal parameter controlling if redraw is called
+		 * @trigger hide_node.jstree
+		 */
+		hide_node : function (obj, skip_redraw) {
+			var t1, t2;
+			if($.isArray(obj)) {
+				obj = obj.slice();
+				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+					this.hide_node(obj[t1], true);
+				}
+				this.redraw();
+				return true;
+			}
+			obj = this.get_node(obj);
+			if(!obj || obj.id === $.jstree.root) {
+				return false;
+			}
+			if(!obj.state.hidden) {
+				obj.state.hidden = true;
+				this._node_changed(obj.parent);
+				if(!skip_redraw) {
+					this.redraw();
+				}
+				/**
+				 * triggered when an node is hidden
+				 * @event
+				 * @name hide_node.jstree
+				 * @param {Object} node the hidden node
+				 */
+				this.trigger('hide_node', { 'node' : obj });
+			}
+		},
+		/**
+		 * shows a node
+		 * @name show_node(obj)
+		 * @param {mixed} obj the node to show
+		 * @param {Boolean} skip_redraw internal parameter controlling if redraw is called
+		 * @trigger show_node.jstree
+		 */
+		show_node : function (obj, skip_redraw) {
+			var t1, t2;
+			if($.isArray(obj)) {
+				obj = obj.slice();
+				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+					this.show_node(obj[t1], true);
+				}
+				this.redraw();
+				return true;
+			}
+			obj = this.get_node(obj);
+			if(!obj || obj.id === $.jstree.root) {
+				return false;
+			}
+			if(obj.state.hidden) {
+				obj.state.hidden = false;
+				this._node_changed(obj.parent);
+				if(!skip_redraw) {
+					this.redraw();
+				}
+				/**
+				 * triggered when an node is shown
+				 * @event
+				 * @name show_node.jstree
+				 * @param {Object} node the shown node
+				 */
+				this.trigger('show_node', { 'node' : obj });
+			}
+		},
+		/**
+		 * hides all nodes
+		 * @name hide_all()
+		 * @trigger hide_all.jstree
+		 */
+		hide_all : function (skip_redraw) {
+			var i, m = this._model.data, ids = [];
+			for(i in m) {
+				if(m.hasOwnProperty(i) && i !== $.jstree.root && !m[i].state.hidden) {
+					m[i].state.hidden = true;
+					ids.push(i);
+				}
+			}
+			this._model.force_full_redraw = true;
+			if(!skip_redraw) {
+				this.redraw();
+			}
+			/**
+			 * triggered when all nodes are hidden
+			 * @event
+			 * @name hide_all.jstree
+			 * @param {Array} nodes the IDs of all hidden nodes
+			 */
+			this.trigger('hide_all', { 'nodes' : ids });
+			return ids;
+		},
+		/**
+		 * shows all nodes
+		 * @name show_all()
+		 * @trigger show_all.jstree
+		 */
+		show_all : function (skip_redraw) {
+			var i, m = this._model.data, ids = [];
+			for(i in m) {
+				if(m.hasOwnProperty(i) && i !== $.jstree.root && m[i].state.hidden) {
+					m[i].state.hidden = false;
+					ids.push(i);
+				}
+			}
+			this._model.force_full_redraw = true;
+			if(!skip_redraw) {
+				this.redraw();
+			}
+			/**
+			 * triggered when all nodes are shown
+			 * @event
+			 * @name show_all.jstree
+			 * @param {Array} nodes the IDs of all shown nodes
+			 */
+			this.trigger('show_all', { 'nodes' : ids });
+			return ids;
+		},
+		/**
+		 * called when a node is selected by the user. Used internally.
+		 * @private
+		 * @name activate_node(obj, e)
+		 * @param {mixed} obj the node
+		 * @param {Object} e the related event
+		 * @trigger activate_node.jstree, changed.jstree
+		 */
+		activate_node : function (obj, e) {
+			if(this.is_disabled(obj)) {
+				return false;
+			}
+			if(!e || typeof e !== 'object') {
+				e = {};
+			}
+
+			// ensure last_clicked is still in the DOM, make it fresh (maybe it was moved?) and make sure it is still selected, if not - make last_clicked the last selected node
+			this._data.core.last_clicked = this._data.core.last_clicked && this._data.core.last_clicked.id !== undefined ? this.get_node(this._data.core.last_clicked.id) : null;
+			if(this._data.core.last_clicked && !this._data.core.last_clicked.state.selected) { this._data.core.last_clicked = null; }
+			if(!this._data.core.last_clicked && this._data.core.selected.length) { this._data.core.last_clicked = this.get_node(this._data.core.selected[this._data.core.selected.length - 1]); }
+
+			if(!this.settings.core.multiple || (!e.metaKey && !e.ctrlKey && !e.shiftKey) || (e.shiftKey && (!this._data.core.last_clicked || !this.get_parent(obj) || this.get_parent(obj) !== this._data.core.last_clicked.parent ) )) {
+				if(!this.settings.core.multiple && (e.metaKey || e.ctrlKey || e.shiftKey) && this.is_selected(obj)) {
+					this.deselect_node(obj, false, e);
+				}
+				else {
+					this.deselect_all(true);
+					this.select_node(obj, false, false, e);
+					this._data.core.last_clicked = this.get_node(obj);
+				}
+			}
+			else {
+				if(e.shiftKey) {
+					var o = this.get_node(obj).id,
+						l = this._data.core.last_clicked.id,
+						p = this.get_node(this._data.core.last_clicked.parent).children,
+						c = false,
+						i, j;
+					for(i = 0, j = p.length; i < j; i += 1) {
+						// separate IFs work whem o and l are the same
+						if(p[i] === o) {
+							c = !c;
+						}
+						if(p[i] === l) {
+							c = !c;
+						}
+						if(!this.is_disabled(p[i]) && (c || p[i] === o || p[i] === l)) {
+							this.select_node(p[i], true, false, e);
+						}
+						else {
+							this.deselect_node(p[i], true, e);
+						}
+					}
+					this.trigger('changed', { 'action' : 'select_node', 'node' : this.get_node(obj), 'selected' : this._data.core.selected, 'event' : e });
+				}
+				else {
+					if(!this.is_selected(obj)) {
+						this.select_node(obj, false, false, e);
+					}
+					else {
+						this.deselect_node(obj, false, e);
+					}
+				}
+			}
+			/**
+			 * triggered when an node is clicked or intercated with by the user
+			 * @event
+			 * @name activate_node.jstree
+			 * @param {Object} node
+			 * @param {Object} event the ooriginal event (if any) which triggered the call (may be an empty object)
+			 */
+			this.trigger('activate_node', { 'node' : this.get_node(obj), 'event' : e });
+		},
+		/**
+		 * applies the hover state on a node, called when a node is hovered by the user. Used internally.
+		 * @private
+		 * @name hover_node(obj)
+		 * @param {mixed} obj
+		 * @trigger hover_node.jstree
+		 */
+		hover_node : function (obj) {
+			obj = this.get_node(obj, true);
+			if(!obj || !obj.length || obj.children('.jstree-hovered').length) {
+				return false;
+			}
+			var o = this.element.find('.jstree-hovered'), t = this.element;
+			if(o && o.length) { this.dehover_node(o); }
+
+			obj.children('.jstree-anchor').addClass('jstree-hovered');
+			/**
+			 * triggered when an node is hovered
+			 * @event
+			 * @name hover_node.jstree
+			 * @param {Object} node
+			 */
+			this.trigger('hover_node', { 'node' : this.get_node(obj) });
+			setTimeout(function () { t.attr('aria-activedescendant', obj[0].id); }, 0);
+		},
+		/**
+		 * removes the hover state from a nodecalled when a node is no longer hovered by the user. Used internally.
+		 * @private
+		 * @name dehover_node(obj)
+		 * @param {mixed} obj
+		 * @trigger dehover_node.jstree
+		 */
+		dehover_node : function (obj) {
+			obj = this.get_node(obj, true);
+			if(!obj || !obj.length || !obj.children('.jstree-hovered').length) {
+				return false;
+			}
+			obj.children('.jstree-anchor').removeClass('jstree-hovered');
+			/**
+			 * triggered when an node is no longer hovered
+			 * @event
+			 * @name dehover_node.jstree
+			 * @param {Object} node
+			 */
+			this.trigger('dehover_node', { 'node' : this.get_node(obj) });
+		},
+		/**
+		 * select a node
+		 * @name select_node(obj [, supress_event, prevent_open])
+		 * @param {mixed} obj an array can be used to select multiple nodes
+		 * @param {Boolean} supress_event if set to `true` the `changed.jstree` event won't be triggered
+		 * @param {Boolean} prevent_open if set to `true` parents of the selected node won't be opened
+		 * @trigger select_node.jstree, changed.jstree
+		 */
+		select_node : function (obj, supress_event, prevent_open, e) {
+			var dom, t1, t2, th;
+			if($.isArray(obj)) {
+				obj = obj.slice();
+				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+					this.select_node(obj[t1], supress_event, prevent_open, e);
+				}
+				return true;
+			}
+			obj = this.get_node(obj);
+			if(!obj || obj.id === $.jstree.root) {
+				return false;
+			}
+			dom = this.get_node(obj, true);
+			if(!obj.state.selected) {
+				obj.state.selected = true;
+				this._data.core.selected.push(obj.id);
+				if(!prevent_open) {
+					dom = this._open_to(obj);
+				}
+				if(dom && dom.length) {
+					dom.attr('aria-selected', true).children('.jstree-anchor').addClass('jstree-clicked');
+				}
+				/**
+				 * triggered when an node is selected
+				 * @event
+				 * @name select_node.jstree
+				 * @param {Object} node
+				 * @param {Array} selected the current selection
+				 * @param {Object} event the event (if any) that triggered this select_node
+				 */
+				this.trigger('select_node', { 'node' : obj, 'selected' : this._data.core.selected, 'event' : e });
+				if(!supress_event) {
+					/**
+					 * triggered when selection changes
+					 * @event
+					 * @name changed.jstree
+					 * @param {Object} node
+					 * @param {Object} action the action that caused the selection to change
+					 * @param {Array} selected the current selection
+					 * @param {Object} event the event (if any) that triggered this changed event
+					 */
+					this.trigger('changed', { 'action' : 'select_node', 'node' : obj, 'selected' : this._data.core.selected, 'event' : e });
+				}
+			}
+		},
+		/**
+		 * deselect a node
+		 * @name deselect_node(obj [, supress_event])
+		 * @param {mixed} obj an array can be used to deselect multiple nodes
+		 * @param {Boolean} supress_event if set to `true` the `changed.jstree` event won't be triggered
+		 * @trigger deselect_node.jstree, changed.jstree
+		 */
+		deselect_node : function (obj, supress_event, e) {
+			var t1, t2, dom;
+			if($.isArray(obj)) {
+				obj = obj.slice();
+				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+					this.deselect_node(obj[t1], supress_event, e);
+				}
+				return true;
+			}
+			obj = this.get_node(obj);
+			if(!obj || obj.id === $.jstree.root) {
+				return false;
+			}
+			dom = this.get_node(obj, true);
+			if(obj.state.selected) {
+				obj.state.selected = false;
+				this._data.core.selected = $.vakata.array_remove_item(this._data.core.selected, obj.id);
+				if(dom.length) {
+					dom.attr('aria-selected', false).children('.jstree-anchor').removeClass('jstree-clicked');
+				}
+				/**
+				 * triggered when an node is deselected
+				 * @event
+				 * @name deselect_node.jstree
+				 * @param {Object} node
+				 * @param {Array} selected the current selection
+				 * @param {Object} event the event (if any) that triggered this deselect_node
+				 */
+				this.trigger('deselect_node', { 'node' : obj, 'selected' : this._data.core.selected, 'event' : e });
+				if(!supress_event) {
+					this.trigger('changed', { 'action' : 'deselect_node', 'node' : obj, 'selected' : this._data.core.selected, 'event' : e });
+				}
+			}
+		},
+		/**
+		 * select all nodes in the tree
+		 * @name select_all([supress_event])
+		 * @param {Boolean} supress_event if set to `true` the `changed.jstree` event won't be triggered
+		 * @trigger select_all.jstree, changed.jstree
+		 */
+		select_all : function (supress_event) {
+			var tmp = this._data.core.selected.concat([]), i, j;
+			this._data.core.selected = this._model.data[$.jstree.root].children_d.concat();
+			for(i = 0, j = this._data.core.selected.length; i < j; i++) {
+				if(this._model.data[this._data.core.selected[i]]) {
+					this._model.data[this._data.core.selected[i]].state.selected = true;
+				}
+			}
+			this.redraw(true);
+			/**
+			 * triggered when all nodes are selected
+			 * @event
+			 * @name select_all.jstree
+			 * @param {Array} selected the current selection
+			 */
+			this.trigger('select_all', { 'selected' : this._data.core.selected });
+			if(!supress_event) {
+				this.trigger('changed', { 'action' : 'select_all', 'selected' : this._data.core.selected, 'old_selection' : tmp });
+			}
+		},
+		/**
+		 * deselect all selected nodes
+		 * @name deselect_all([supress_event])
+		 * @param {Boolean} supress_event if set to `true` the `changed.jstree` event won't be triggered
+		 * @trigger deselect_all.jstree, changed.jstree
+		 */
+		deselect_all : function (supress_event) {
+			var tmp = this._data.core.selected.concat([]), i, j;
+			for(i = 0, j = this._data.core.selected.length; i < j; i++) {
+				if(this._model.data[this._data.core.selected[i]]) {
+					this._model.data[this._data.core.selected[i]].state.selected = false;
+				}
+			}
+			this._data.core.selected = [];
+			this.element.find('.jstree-clicked').removeClass('jstree-clicked').parent().attr('aria-selected', false);
+			/**
+			 * triggered when all nodes are deselected
+			 * @event
+			 * @name deselect_all.jstree
+			 * @param {Object} node the previous selection
+			 * @param {Array} selected the current selection
+			 */
+			this.trigger('deselect_all', { 'selected' : this._data.core.selected, 'node' : tmp });
+			if(!supress_event) {
+				this.trigger('changed', { 'action' : 'deselect_all', 'selected' : this._data.core.selected, 'old_selection' : tmp });
+			}
+		},
+		/**
+		 * checks if a node is selected
+		 * @name is_selected(obj)
+		 * @param  {mixed}  obj
+		 * @return {Boolean}
+		 */
+		is_selected : function (obj) {
+			obj = this.get_node(obj);
+			if(!obj || obj.id === $.jstree.root) {
+				return false;
+			}
+			return obj.state.selected;
+		},
+		/**
+		 * get an array of all selected nodes
+		 * @name get_selected([full])
+		 * @param  {mixed}  full if set to `true` the returned array will consist of the full node objects, otherwise - only IDs will be returned
+		 * @return {Array}
+		 */
+		get_selected : function (full) {
+			return full ? $.map(this._data.core.selected, $.proxy(function (i) { return this.get_node(i); }, this)) : this._data.core.selected.slice();
+		},
+		/**
+		 * get an array of all top level selected nodes (ignoring children of selected nodes)
+		 * @name get_top_selected([full])
+		 * @param  {mixed}  full if set to `true` the returned array will consist of the full node objects, otherwise - only IDs will be returned
+		 * @return {Array}
+		 */
+		get_top_selected : function (full) {
+			var tmp = this.get_selected(true),
+				obj = {}, i, j, k, l;
+			for(i = 0, j = tmp.length; i < j; i++) {
+				obj[tmp[i].id] = tmp[i];
+			}
+			for(i = 0, j = tmp.length; i < j; i++) {
+				for(k = 0, l = tmp[i].children_d.length; k < l; k++) {
+					if(obj[tmp[i].children_d[k]]) {
+						delete obj[tmp[i].children_d[k]];
+					}
+				}
+			}
+			tmp = [];
+			for(i in obj) {
+				if(obj.hasOwnProperty(i)) {
+					tmp.push(i);
+				}
+			}
+			return full ? $.map(tmp, $.proxy(function (i) { return this.get_node(i); }, this)) : tmp;
+		},
+		/**
+		 * get an array of all bottom level selected nodes (ignoring selected parents)
+		 * @name get_bottom_selected([full])
+		 * @param  {mixed}  full if set to `true` the returned array will consist of the full node objects, otherwise - only IDs will be returned
+		 * @return {Array}
+		 */
+		get_bottom_selected : function (full) {
+			var tmp = this.get_selected(true),
+				obj = [], i, j;
+			for(i = 0, j = tmp.length; i < j; i++) {
+				if(!tmp[i].children.length) {
+					obj.push(tmp[i].id);
+				}
+			}
+			return full ? $.map(obj, $.proxy(function (i) { return this.get_node(i); }, this)) : obj;
+		},
+		/**
+		 * gets the current state of the tree so that it can be restored later with `set_state(state)`. Used internally.
+		 * @name get_state()
+		 * @private
+		 * @return {Object}
+		 */
+		get_state : function () {
+			var state	= {
+				'core' : {
+					'open' : [],
+					'scroll' : {
+						'left' : this.element.scrollLeft(),
+						'top' : this.element.scrollTop()
+					},
+					/*!
+					'themes' : {
+						'name' : this.get_theme(),
+						'icons' : this._data.core.themes.icons,
+						'dots' : this._data.core.themes.dots
+					},
+					*/
+					'selected' : []
+				}
+			}, i;
+			for(i in this._model.data) {
+				if(this._model.data.hasOwnProperty(i)) {
+					if(i !== $.jstree.root) {
+						if(this._model.data[i].state.opened) {
+							state.core.open.push(i);
+						}
+						if(this._model.data[i].state.selected) {
+							state.core.selected.push(i);
+						}
+					}
+				}
+			}
+			return state;
+		},
+		/**
+		 * sets the state of the tree. Used internally.
+		 * @name set_state(state [, callback])
+		 * @private
+		 * @param {Object} state the state to restore. Keep in mind this object is passed by reference and jstree will modify it.
+		 * @param {Function} callback an optional function to execute once the state is restored.
+		 * @trigger set_state.jstree
+		 */
+		set_state : function (state, callback) {
+			if(state) {
+				if(state.core) {
+					var res, n, t, _this, i;
+					if(state.core.open) {
+						if(!$.isArray(state.core.open) || !state.core.open.length) {
+							delete state.core.open;
+							this.set_state(state, callback);
+						}
+						else {
+							this._load_nodes(state.core.open, function (nodes) {
+								this.open_node(nodes, false, 0);
+								delete state.core.open;
+								this.set_state(state, callback);
+							}, true);
+						}
+						return false;
+					}
+					if(state.core.scroll) {
+						if(state.core.scroll && state.core.scroll.left !== undefined) {
+							this.element.scrollLeft(state.core.scroll.left);
+						}
+						if(state.core.scroll && state.core.scroll.top !== undefined) {
+							this.element.scrollTop(state.core.scroll.top);
+						}
+						delete state.core.scroll;
+						this.set_state(state, callback);
+						return false;
+					}
+					if(state.core.selected) {
+						_this = this;
+						this.deselect_all();
+						$.each(state.core.selected, function (i, v) {
+							_this.select_node(v, false, true);
+						});
+						delete state.core.selected;
+						this.set_state(state, callback);
+						return false;
+					}
+					for(i in state) {
+						if(state.hasOwnProperty(i) && i !== "core" && $.inArray(i, this.settings.plugins) === -1) {
+							delete state[i];
+						}
+					}
+					if($.isEmptyObject(state.core)) {
+						delete state.core;
+						this.set_state(state, callback);
+						return false;
+					}
+				}
+				if($.isEmptyObject(state)) {
+					state = null;
+					if(callback) { callback.call(this); }
+					/**
+					 * triggered when a `set_state` call completes
+					 * @event
+					 * @name set_state.jstree
+					 */
+					this.trigger('set_state');
+					return false;
+				}
+				return true;
+			}
+			return false;
+		},
+		/**
+		 * refreshes the tree - all nodes are reloaded with calls to `load_node`.
+		 * @name refresh()
+		 * @param {Boolean} skip_loading an option to skip showing the loading indicator
+		 * @param {Mixed} forget_state if set to `true` state will not be reapplied, if set to a function (receiving the current state as argument) the result of that function will be used as state
+		 * @trigger refresh.jstree
+		 */
+		refresh : function (skip_loading, forget_state) {
+			this._data.core.state = forget_state === true ? {} : this.get_state();
+			if(forget_state && $.isFunction(forget_state)) { this._data.core.state = forget_state.call(this, this._data.core.state); }
+			this._cnt = 0;
+			this._model.data = {};
+			this._model.data[$.jstree.root] = {
+				id : $.jstree.root,
+				parent : null,
+				parents : [],
+				children : [],
+				children_d : [],
+				state : { loaded : false }
+			};
+			this._data.core.selected = [];
+			this._data.core.last_clicked = null;
+			this._data.core.focused = null;
+
+			var c = this.get_container_ul()[0].className;
+			if(!skip_loading) {
+				this.element.html("<"+"ul class='"+c+"' role='group'><"+"li class='jstree-initial-node jstree-loading jstree-leaf jstree-last' role='treeitem' id='j"+this._id+"_loading'><i class='jstree-icon jstree-ocl'></i><"+"a class='jstree-anchor' href='#'><i class='jstree-icon jstree-themeicon-hidden'></i>" + this.get_string("Loading ...") + "</a></li></ul>");
+				this.element.attr('aria-activedescendant','j'+this._id+'_loading');
+			}
+			this.load_node($.jstree.root, function (o, s) {
+				if(s) {
+					this.get_container_ul()[0].className = c;
+					if(this._firstChild(this.get_container_ul()[0])) {
+						this.element.attr('aria-activedescendant',this._firstChild(this.get_container_ul()[0]).id);
+					}
+					this.set_state($.extend(true, {}, this._data.core.state), function () {
+						/**
+						 * triggered when a `refresh` call completes
+						 * @event
+						 * @name refresh.jstree
+						 */
+						this.trigger('refresh');
+					});
+				}
+				this._data.core.state = null;
+			});
+		},
+		/**
+		 * refreshes a node in the tree (reload its children) all opened nodes inside that node are reloaded with calls to `load_node`.
+		 * @name refresh_node(obj)
+		 * @param  {mixed} obj the node
+		 * @trigger refresh_node.jstree
+		 */
+		refresh_node : function (obj) {
+			obj = this.get_node(obj);
+			if(!obj || obj.id === $.jstree.root) { return false; }
+			var opened = [], to_load = [], s = this._data.core.selected.concat([]);
+			to_load.push(obj.id);
+			if(obj.state.opened === true) { opened.push(obj.id); }
+			this.get_node(obj, true).find('.jstree-open').each(function() { opened.push(this.id); });
+			this._load_nodes(to_load, $.proxy(function (nodes) {
+				this.open_node(opened, false, 0);
+				this.select_node(this._data.core.selected);
+				/**
+				 * triggered when a node is refreshed
+				 * @event
+				 * @name refresh_node.jstree
+				 * @param {Object} node - the refreshed node
+				 * @param {Array} nodes - an array of the IDs of the nodes that were reloaded
+				 */
+				this.trigger('refresh_node', { 'node' : obj, 'nodes' : nodes });
+			}, this));
+		},
+		/**
+		 * set (change) the ID of a node
+		 * @name set_id(obj, id)
+		 * @param  {mixed} obj the node
+		 * @param  {String} id the new ID
+		 * @return {Boolean}
+		 */
+		set_id : function (obj, id) {
+			obj = this.get_node(obj);
+			if(!obj || obj.id === $.jstree.root) { return false; }
+			var i, j, m = this._model.data;
+			id = id.toString();
+			// update parents (replace current ID with new one in children and children_d)
+			m[obj.parent].children[$.inArray(obj.id, m[obj.parent].children)] = id;
+			for(i = 0, j = obj.parents.length; i < j; i++) {
+				m[obj.parents[i]].children_d[$.inArray(obj.id, m[obj.parents[i]].children_d)] = id;
+			}
+			// update children (replace current ID with new one in parent and parents)
+			for(i = 0, j = obj.children.length; i < j; i++) {
+				m[obj.children[i]].parent = id;
+			}
+			for(i = 0, j = obj.children_d.length; i < j; i++) {
+				m[obj.children_d[i]].parents[$.inArray(obj.id, m[obj.children_d[i]].parents)] = id;
+			}
+			i = $.inArray(obj.id, this._data.core.selected);
+			if(i !== -1) { this._data.core.selected[i] = id; }
+			// update model and obj itself (obj.id, this._model.data[KEY])
+			i = this.get_node(obj.id, true);
+			if(i) {
+				i.attr('id', id).children('.jstree-anchor').attr('id', id + '_anchor').end().attr('aria-labelledby', id + '_anchor');
+				if(this.element.attr('aria-activedescendant') === obj.id) {
+					this.element.attr('aria-activedescendant', id);
+				}
+			}
+			delete m[obj.id];
+			obj.id = id;
+			obj.li_attr.id = id;
+			m[id] = obj;
+			return true;
+		},
+		/**
+		 * get the text value of a node
+		 * @name get_text(obj)
+		 * @param  {mixed} obj the node
+		 * @return {String}
+		 */
+		get_text : function (obj) {
+			obj = this.get_node(obj);
+			return (!obj || obj.id === $.jstree.root) ? false : obj.text;
+		},
+		/**
+		 * set the text value of a node. Used internally, please use `rename_node(obj, val)`.
+		 * @private
+		 * @name set_text(obj, val)
+		 * @param  {mixed} obj the node, you can pass an array to set the text on multiple nodes
+		 * @param  {String} val the new text value
+		 * @return {Boolean}
+		 * @trigger set_text.jstree
+		 */
+		set_text : function (obj, val) {
+			var t1, t2;
+			if($.isArray(obj)) {
+				obj = obj.slice();
+				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+					this.set_text(obj[t1], val);
+				}
+				return true;
+			}
+			obj = this.get_node(obj);
+			if(!obj || obj.id === $.jstree.root) { return false; }
+			obj.text = val;
+			if(this.get_node(obj, true).length) {
+				this.redraw_node(obj.id);
+			}
+			/**
+			 * triggered when a node text value is changed
+			 * @event
+			 * @name set_text.jstree
+			 * @param {Object} obj
+			 * @param {String} text the new value
+			 */
+			this.trigger('set_text',{ "obj" : obj, "text" : val });
+			return true;
+		},
+		/**
+		 * gets a JSON representation of a node (or the whole tree)
+		 * @name get_json([obj, options])
+		 * @param  {mixed} obj
+		 * @param  {Object} options
+		 * @param  {Boolean} options.no_state do not return state information
+		 * @param  {Boolean} options.no_id do not return ID
+		 * @param  {Boolean} options.no_children do not include children
+		 * @param  {Boolean} options.no_data do not include node data
+		 * @param  {Boolean} options.flat return flat JSON instead of nested
+		 * @return {Object}
+		 */
+		get_json : function (obj, options, flat) {
+			obj = this.get_node(obj || $.jstree.root);
+			if(!obj) { return false; }
+			if(options && options.flat && !flat) { flat = []; }
+			var tmp = {
+				'id' : obj.id,
+				'text' : obj.text,
+				'icon' : this.get_icon(obj),
+				'li_attr' : $.extend(true, {}, obj.li_attr),
+				'a_attr' : $.extend(true, {}, obj.a_attr),
+				'state' : {},
+				'data' : options && options.no_data ? false : $.extend(true, {}, obj.data)
+				//( this.get_node(obj, true).length ? this.get_node(obj, true).data() : obj.data ),
+			}, i, j;
+			if(options && options.flat) {
+				tmp.parent = obj.parent;
+			}
+			else {
+				tmp.children = [];
+			}
+			if(!options || !options.no_state) {
+				for(i in obj.state) {
+					if(obj.state.hasOwnProperty(i)) {
+						tmp.state[i] = obj.state[i];
+					}
+				}
+			}
+			if(options && options.no_id) {
+				delete tmp.id;
+				if(tmp.li_attr && tmp.li_attr.id) {
+					delete tmp.li_attr.id;
+				}
+				if(tmp.a_attr && tmp.a_attr.id) {
+					delete tmp.a_attr.id;
+				}
+			}
+			if(options && options.flat && obj.id !== $.jstree.root) {
+				flat.push(tmp);
+			}
+			if(!options || !options.no_children) {
+				for(i = 0, j = obj.children.length; i < j; i++) {
+					if(options && options.flat) {
+						this.get_json(obj.children[i], options, flat);
+					}
+					else {
+						tmp.children.push(this.get_json(obj.children[i], options));
+					}
+				}
+			}
+			return options && options.flat ? flat : (obj.id === $.jstree.root ? tmp.children : tmp);
+		},
+		/**
+		 * create a new node (do not confuse with load_node)
+		 * @name create_node([obj, node, pos, callback, is_loaded])
+		 * @param  {mixed}   par       the parent node (to create a root node use either "#" (string) or `null`)
+		 * @param  {mixed}   node      the data for the new node (a valid JSON object, or a simple string with the name)
+		 * @param  {mixed}   pos       the index at which to insert the node, "first" and "last" are also supported, default is "last"
+		 * @param  {Function} callback a function to be called once the node is created
+		 * @param  {Boolean} is_loaded internal argument indicating if the parent node was succesfully loaded
+		 * @return {String}            the ID of the newly create node
+		 * @trigger model.jstree, create_node.jstree
+		 */
+		create_node : function (par, node, pos, callback, is_loaded) {
+			if(par === null) { par = $.jstree.root; }
+			par = this.get_node(par);
+			if(!par) { return false; }
+			pos = pos === undefined ? "last" : pos;
+			if(!pos.toString().match(/^(before|after)$/) && !is_loaded && !this.is_loaded(par)) {
+				return this.load_node(par, function () { this.create_node(par, node, pos, callback, true); });
+			}
+			if(!node) { node = { "text" : this.get_string('New node') }; }
+			if(typeof node === "string") { node = { "text" : node }; }
+			if(node.text === undefined) { node.text = this.get_string('New node'); }
+			var tmp, dpc, i, j;
+
+			if(par.id === $.jstree.root) {
+				if(pos === "before") { pos = "first"; }
+				if(pos === "after") { pos = "last"; }
+			}
+			switch(pos) {
+				case "before":
+					tmp = this.get_node(par.parent);
+					pos = $.inArray(par.id, tmp.children);
+					par = tmp;
+					break;
+				case "after" :
+					tmp = this.get_node(par.parent);
+					pos = $.inArray(par.id, tmp.children) + 1;
+					par = tmp;
+					break;
+				case "inside":
+				case "first":
+					pos = 0;
+					break;
+				case "last":
+					pos = par.children.length;
+					break;
+				default:
+					if(!pos) { pos = 0; }
+					break;
+			}
+			if(pos > par.children.length) { pos = par.children.length; }
+			if(!node.id) { node.id = true; }
+			if(!this.check("create_node", node, par, pos)) {
+				this.settings.core.error.call(this, this._data.core.last_error);
+				return false;
+			}
+			if(node.id === true) { delete node.id; }
+			node = this._parse_model_from_json(node, par.id, par.parents.concat());
+			if(!node) { return false; }
+			tmp = this.get_node(node);
+			dpc = [];
+			dpc.push(node);
+			dpc = dpc.concat(tmp.children_d);
+			this.trigger('model', { "nodes" : dpc, "parent" : par.id });
+
+			par.children_d = par.children_d.concat(dpc);
+			for(i = 0, j = par.parents.length; i < j; i++) {
+				this._model.data[par.parents[i]].children_d = this._model.data[par.parents[i]].children_d.concat(dpc);
+			}
+			node = tmp;
+			tmp = [];
+			for(i = 0, j = par.children.length; i < j; i++) {
+				tmp[i >= pos ? i+1 : i] = par.children[i];
+			}
+			tmp[pos] = node.id;
+			par.children = tmp;
+
+			this.redraw_node(par, true);
+			if(callback) { callback.call(this, this.get_node(node)); }
+			/**
+			 * triggered when a node is created
+			 * @event
+			 * @name create_node.jstree
+			 * @param {Object} node
+			 * @param {String} parent the parent's ID
+			 * @param {Number} position the position of the new node among the parent's children
+			 */
+			this.trigger('create_node', { "node" : this.get_node(node), "parent" : par.id, "position" : pos });
+			return node.id;
+		},
+		/**
+		 * set the text value of a node
+		 * @name rename_node(obj, val)
+		 * @param  {mixed} obj the node, you can pass an array to rename multiple nodes to the same name
+		 * @param  {String} val the new text value
+		 * @return {Boolean}
+		 * @trigger rename_node.jstree
+		 */
+		rename_node : function (obj, val) {
+			var t1, t2, old;
+			if($.isArray(obj)) {
+				obj = obj.slice();
+				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+					this.rename_node(obj[t1], val);
+				}
+				return true;
+			}
+			obj = this.get_node(obj);
+			if(!obj || obj.id === $.jstree.root) { return false; }
+			old = obj.text;
+			if(!this.check("rename_node", obj, this.get_parent(obj), val)) {
+				this.settings.core.error.call(this, this._data.core.last_error);
+				return false;
+			}
+			this.set_text(obj, val); // .apply(this, Array.prototype.slice.call(arguments))
+			/**
+			 * triggered when a node is renamed
+			 * @event
+			 * @name rename_node.jstree
+			 * @param {Object} node
+			 * @param {String} text the new value
+			 * @param {String} old the old value
+			 */
+			this.trigger('rename_node', { "node" : obj, "text" : val, "old" : old });
+			return true;
+		},
+		/**
+		 * remove a node
+		 * @name delete_node(obj)
+		 * @param  {mixed} obj the node, you can pass an array to delete multiple nodes
+		 * @return {Boolean}
+		 * @trigger delete_node.jstree, changed.jstree
+		 */
+		delete_node : function (obj) {
+			var t1, t2, par, pos, tmp, i, j, k, l, c, top, lft;
+			if($.isArray(obj)) {
+				obj = obj.slice();
+				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+					this.delete_node(obj[t1]);
+				}
+				return true;
+			}
+			obj = this.get_node(obj);
+			if(!obj || obj.id === $.jstree.root) { return false; }
+			par = this.get_node(obj.parent);
+			pos = $.inArray(obj.id, par.children);
+			c = false;
+			if(!this.check("delete_node", obj, par, pos)) {
+				this.settings.core.error.call(this, this._data.core.last_error);
+				return false;
+			}
+			if(pos !== -1) {
+				par.children = $.vakata.array_remove(par.children, pos);
+			}
+			tmp = obj.children_d.concat([]);
+			tmp.push(obj.id);
+			for(k = 0, l = tmp.length; k < l; k++) {
+				for(i = 0, j = obj.parents.length; i < j; i++) {
+					pos = $.inArray(tmp[k], this._model.data[obj.parents[i]].children_d);
+					if(pos !== -1) {
+						this._model.data[obj.parents[i]].children_d = $.vakata.array_remove(this._model.data[obj.parents[i]].children_d, pos);
+					}
+				}
+				if(this._model.data[tmp[k]].state.selected) {
+					c = true;
+					pos = $.inArray(tmp[k], this._data.core.selected);
+					if(pos !== -1) {
+						this._data.core.selected = $.vakata.array_remove(this._data.core.selected, pos);
+					}
+				}
+			}
+			/**
+			 * triggered when a node is deleted
+			 * @event
+			 * @name delete_node.jstree
+			 * @param {Object} node
+			 * @param {String} parent the parent's ID
+			 */
+			this.trigger('delete_node', { "node" : obj, "parent" : par.id });
+			if(c) {
+				this.trigger('changed', { 'action' : 'delete_node', 'node' : obj, 'selected' : this._data.core.selected, 'parent' : par.id });
+			}
+			for(k = 0, l = tmp.length; k < l; k++) {
+				delete this._model.data[tmp[k]];
+			}
+			if($.inArray(this._data.core.focused, tmp) !== -1) {
+				this._data.core.focused = null;
+				top = this.element[0].scrollTop;
+				lft = this.element[0].scrollLeft;
+				if(par.id === $.jstree.root) {
+					this.get_node(this._model.data[$.jstree.root].children[0], true).children('.jstree-anchor').focus();
+				}
+				else {
+					this.get_node(par, true).children('.jstree-anchor').focus();
+				}
+				this.element[0].scrollTop  = top;
+				this.element[0].scrollLeft = lft;
+			}
+			this.redraw_node(par, true);
+			return true;
+		},
+		/**
+		 * check if an operation is premitted on the tree. Used internally.
+		 * @private
+		 * @name check(chk, obj, par, pos)
+		 * @param  {String} chk the operation to check, can be "create_node", "rename_node", "delete_node", "copy_node" or "move_node"
+		 * @param  {mixed} obj the node
+		 * @param  {mixed} par the parent
+		 * @param  {mixed} pos the position to insert at, or if "rename_node" - the new name
+		 * @param  {mixed} more some various additional information, for example if a "move_node" operations is triggered by DND this will be the hovered node
+		 * @return {Boolean}
+		 */
+		check : function (chk, obj, par, pos, more) {
+			obj = obj && obj.id ? obj : this.get_node(obj);
+			par = par && par.id ? par : this.get_node(par);
+			var tmp = chk.match(/^move_node|copy_node|create_node$/i) ? par : obj,
+				chc = this.settings.core.check_callback;
+			if(chk === "move_node" || chk === "copy_node") {
+				if((!more || !more.is_multi) && (obj.id === par.id || $.inArray(obj.id, par.children) === pos || $.inArray(par.id, obj.children_d) !== -1)) {
+					this._data.core.last_error = { 'error' : 'check', 'plugin' : 'core', 'id' : 'core_01', 'reason' : 'Moving parent inside child', 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
+					return false;
+				}
+			}
+			if(tmp && tmp.data) { tmp = tmp.data; }
+			if(tmp && tmp.functions && (tmp.functions[chk] === false || tmp.functions[chk] === true)) {
+				if(tmp.functions[chk] === false) {
+					this._data.core.last_error = { 'error' : 'check', 'plugin' : 'core', 'id' : 'core_02', 'reason' : 'Node data prevents function: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
+				}
+				return tmp.functions[chk];
+			}
+			if(chc === false || ($.isFunction(chc) && chc.call(this, chk, obj, par, pos, more) === false) || (chc && chc[chk] === false)) {
+				this._data.core.last_error = { 'error' : 'check', 'plugin' : 'core', 'id' : 'core_03', 'reason' : 'User config for core.check_callback prevents function: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
+				return false;
+			}
+			return true;
+		},
+		/**
+		 * get the last error
+		 * @name last_error()
+		 * @return {Object}
+		 */
+		last_error : function () {
+			return this._data.core.last_error;
+		},
+		/**
+		 * move a node to a new parent
+		 * @name move_node(obj, par [, pos, callback, is_loaded])
+		 * @param  {mixed} obj the node to move, pass an array to move multiple nodes
+		 * @param  {mixed} par the new parent
+		 * @param  {mixed} pos the position to insert at (besides integer values, "first" and "last" are supported, as well as "before" and "after"), defaults to integer `0`
+		 * @param  {function} callback a function to call once the move is completed, receives 3 arguments - the node, the new parent and the position
+		 * @param  {Boolean} is_loaded internal parameter indicating if the parent node has been loaded
+		 * @param  {Boolean} skip_redraw internal parameter indicating if the tree should be redrawn
+		 * @param  {Boolean} instance internal parameter indicating if the node comes from another instance
+		 * @trigger move_node.jstree
+		 */
+		move_node : function (obj, par, pos, callback, is_loaded, skip_redraw, origin) {
+			var t1, t2, old_par, old_pos, new_par, old_ins, is_multi, dpc, tmp, i, j, k, l, p;
+
+			par = this.get_node(par);
+			pos = pos === undefined ? 0 : pos;
+			if(!par) { return false; }
+			if(!pos.toString().match(/^(before|after)$/) && !is_loaded && !this.is_loaded(par)) {
+				return this.load_node(par, function () { this.move_node(obj, par, pos, callback, true, false, origin); });
+			}
+
+			if($.isArray(obj)) {
+				if(obj.length === 1) {
+					obj = obj[0];
+				}
+				else {
+					//obj = obj.slice();
+					for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+						if((tmp = this.move_node(obj[t1], par, pos, callback, is_loaded, false, origin))) {
+							par = tmp;
+							pos = "after";
+						}
+					}
+					this.redraw();
+					return true;
+				}
+			}
+			obj = obj && obj.id ? obj : this.get_node(obj);
+
+			if(!obj || obj.id === $.jstree.root) { return false; }
+
+			old_par = (obj.parent || $.jstree.root).toString();
+			new_par = (!pos.toString().match(/^(before|after)$/) || par.id === $.jstree.root) ? par : this.get_node(par.parent);
+			old_ins = origin ? origin : (this._model.data[obj.id] ? this : $.jstree.reference(obj.id));
+			is_multi = !old_ins || !old_ins._id || (this._id !== old_ins._id);
+			old_pos = old_ins && old_ins._id && old_par && old_ins._model.data[old_par] && old_ins._model.data[old_par].children ? $.inArray(obj.id, old_ins._model.data[old_par].children) : -1;
+			if(old_ins && old_ins._id) {
+				obj = old_ins._model.data[obj.id];
+			}
+
+			if(is_multi) {
+				if((tmp = this.copy_node(obj, par, pos, callback, is_loaded, false, origin))) {
+					if(old_ins) { old_ins.delete_node(obj); }
+					return tmp;
+				}
+				return false;
+			}
+			//var m = this._model.data;
+			if(par.id === $.jstree.root) {
+				if(pos === "before") { pos = "first"; }
+				if(pos === "after") { pos = "last"; }
+			}
+			switch(pos) {
+				case "before":
+					pos = $.inArray(par.id, new_par.children);
+					break;
+				case "after" :
+					pos = $.inArray(par.id, new_par.children) + 1;
+					break;
+				case "inside":
+				case "first":
+					pos = 0;
+					break;
+				case "last":
+					pos = new_par.children.length;
+					break;
+				default:
+					if(!pos) { pos = 0; }
+					break;
+			}
+			if(pos > new_par.children.length) { pos = new_par.children.length; }
+			if(!this.check("move_node", obj, new_par, pos, { 'core' : true, 'origin' : origin, 'is_multi' : (old_ins && old_ins._id && old_ins._id !== this._id), 'is_foreign' : (!old_ins || !old_ins._id) })) {
+				this.settings.core.error.call(this, this._data.core.last_error);
+				return false;
+			}
+			if(obj.parent === new_par.id) {
+				dpc = new_par.children.concat();
+				tmp = $.inArray(obj.id, dpc);
+				if(tmp !== -1) {
+					dpc = $.vakata.array_remove(dpc, tmp);
+					if(pos > tmp) { pos--; }
+				}
+				tmp = [];
+				for(i = 0, j = dpc.length; i < j; i++) {
+					tmp[i >= pos ? i+1 : i] = dpc[i];
+				}
+				tmp[pos] = obj.id;
+				new_par.children = tmp;
+				this._node_changed(new_par.id);
+				this.redraw(new_par.id === $.jstree.root);
+			}
+			else {
+				// clean old parent and up
+				tmp = obj.children_d.concat();
+				tmp.push(obj.id);
+				for(i = 0, j = obj.parents.length; i < j; i++) {
+					dpc = [];
+					p = old_ins._model.data[obj.parents[i]].children_d;
+					for(k = 0, l = p.length; k < l; k++) {
+						if($.inArray(p[k], tmp) === -1) {
+							dpc.push(p[k]);
+						}
+					}
+					old_ins._model.data[obj.parents[i]].children_d = dpc;
+				}
+				old_ins._model.data[old_par].children = $.vakata.array_remove_item(old_ins._model.data[old_par].children, obj.id);
+
+				// insert into new parent and up
+				for(i = 0, j = new_par.parents.length; i < j; i++) {
+					this._model.data[new_par.parents[i]].children_d = this._model.data[new_par.parents[i]].children_d.concat(tmp);
+				}
+				dpc = [];
+				for(i = 0, j = new_par.children.length; i < j; i++) {
+					dpc[i >= pos ? i+1 : i] = new_par.children[i];
+				}
+				dpc[pos] = obj.id;
+				new_par.children = dpc;
+				new_par.children_d.push(obj.id);
+				new_par.children_d = new_par.children_d.concat(obj.children_d);
+
+				// update object
+				obj.parent = new_par.id;
+				tmp = new_par.parents.concat();
+				tmp.unshift(new_par.id);
+				p = obj.parents.length;
+				obj.parents = tmp;
+
+				// update object children
+				tmp = tmp.concat();
+				for(i = 0, j = obj.children_d.length; i < j; i++) {
+					this._model.data[obj.children_d[i]].parents = this._model.data[obj.children_d[i]].parents.slice(0,p*-1);
+					Array.prototype.push.apply(this._model.data[obj.children_d[i]].parents, tmp);
+				}
+
+				if(old_par === $.jstree.root || new_par.id === $.jstree.root) {
+					this._model.force_full_redraw = true;
+				}
+				if(!this._model.force_full_redraw) {
+					this._node_changed(old_par);
+					this._node_changed(new_par.id);
+				}
+				if(!skip_redraw) {
+					this.redraw();
+				}
+			}
+			if(callback) { callback.call(this, obj, new_par, pos); }
+			/**
+			 * triggered when a node is moved
+			 * @event
+			 * @name move_node.jstree
+			 * @param {Object} node
+			 * @param {String} parent the parent's ID
+			 * @param {Number} position the position of the node among the parent's children
+			 * @param {String} old_parent the old parent of the node
+			 * @param {Number} old_position the old position of the node
+			 * @param {Boolean} is_multi do the node and new parent belong to different instances
+			 * @param {jsTree} old_instance the instance the node came from
+			 * @param {jsTree} new_instance the instance of the new parent
+			 */
+			this.trigger('move_node', { "node" : obj, "parent" : new_par.id, "position" : pos, "old_parent" : old_par, "old_position" : old_pos, 'is_multi' : (old_ins && old_ins._id && old_ins._id !== this._id), 'is_foreign' : (!old_ins || !old_ins._id), 'old_instance' : old_ins, 'new_instance' : this });
+			return obj.id;
+		},
+		/**
+		 * copy a node to a new parent
+		 * @name copy_node(obj, par [, pos, callback, is_loaded])
+		 * @param  {mixed} obj the node to copy, pass an array to copy multiple nodes
+		 * @param  {mixed} par the new parent
+		 * @param  {mixed} pos the position to insert at (besides integer values, "first" and "last" are supported, as well as "before" and "after"), defaults to integer `0`
+		 * @param  {function} callback a function to call once the move is completed, receives 3 arguments - the node, the new parent and the position
+		 * @param  {Boolean} is_loaded internal parameter indicating if the parent node has been loaded
+		 * @param  {Boolean} skip_redraw internal parameter indicating if the tree should be redrawn
+		 * @param  {Boolean} instance internal parameter indicating if the node comes from another instance
+		 * @trigger model.jstree copy_node.jstree
+		 */
+		copy_node : function (obj, par, pos, callback, is_loaded, skip_redraw, origin) {
+			var t1, t2, dpc, tmp, i, j, node, old_par, new_par, old_ins, is_multi;
+
+			par = this.get_node(par);
+			pos = pos === undefined ? 0 : pos;
+			if(!par) { return false; }
+			if(!pos.toString().match(/^(before|after)$/) && !is_loaded && !this.is_loaded(par)) {
+				return this.load_node(par, function () { this.copy_node(obj, par, pos, callback, true, false, origin); });
+			}
+
+			if($.isArray(obj)) {
+				if(obj.length === 1) {
+					obj = obj[0];
+				}
+				else {
+					//obj = obj.slice();
+					for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+						if((tmp = this.copy_node(obj[t1], par, pos, callback, is_loaded, true, origin))) {
+							par = tmp;
+							pos = "after";
+						}
+					}
+					this.redraw();
+					return true;
+				}
+			}
+			obj = obj && obj.id ? obj : this.get_node(obj);
+			if(!obj || obj.id === $.jstree.root) { return false; }
+
+			old_par = (obj.parent || $.jstree.root).toString();
+			new_par = (!pos.toString().match(/^(before|after)$/) || par.id === $.jstree.root) ? par : this.get_node(par.parent);
+			old_ins = origin ? origin : (this._model.data[obj.id] ? this : $.jstree.reference(obj.id));
+			is_multi = !old_ins || !old_ins._id || (this._id !== old_ins._id);
+
+			if(old_ins && old_ins._id) {
+				obj = old_ins._model.data[obj.id];
+			}
+
+			if(par.id === $.jstree.root) {
+				if(pos === "before") { pos = "first"; }
+				if(pos === "after") { pos = "last"; }
+			}
+			switch(pos) {
+				case "before":
+					pos = $.inArray(par.id, new_par.children);
+					break;
+				case "after" :
+					pos = $.inArray(par.id, new_par.children) + 1;
+					break;
+				case "inside":
+				case "first":
+					pos = 0;
+					break;
+				case "last":
+					pos = new_par.children.length;
+					break;
+				default:
+					if(!pos) { pos = 0; }
+					break;
+			}
+			if(pos > new_par.children.length) { pos = new_par.children.length; }
+			if(!this.check("copy_node", obj, new_par, pos, { 'core' : true, 'origin' : origin, 'is_multi' : (old_ins && old_ins._id && old_ins._id !== this._id), 'is_foreign' : (!old_ins || !old_ins._id) })) {
+				this.settings.core.error.call(this, this._data.core.last_error);
+				return false;
+			}
+			node = old_ins ? old_ins.get_json(obj, { no_id : true, no_data : true, no_state : true }) : obj;
+			if(!node) { return false; }
+			if(node.id === true) { delete node.id; }
+			node = this._parse_model_from_json(node, new_par.id, new_par.parents.concat());
+			if(!node) { return false; }
+			tmp = this.get_node(node);
+			if(obj && obj.state && obj.state.loaded === false) { tmp.state.loaded = false; }
+			dpc = [];
+			dpc.push(node);
+			dpc = dpc.concat(tmp.children_d);
+			this.trigger('model', { "nodes" : dpc, "parent" : new_par.id });
+
+			// insert into new parent and up
+			for(i = 0, j = new_par.parents.length; i < j; i++) {
+				this._model.data[new_par.parents[i]].children_d = this._model.data[new_par.parents[i]].children_d.concat(dpc);
+			}
+			dpc = [];
+			for(i = 0, j = new_par.children.length; i < j; i++) {
+				dpc[i >= pos ? i+1 : i] = new_par.children[i];
+			}
+			dpc[pos] = tmp.id;
+			new_par.children = dpc;
+			new_par.children_d.push(tmp.id);
+			new_par.children_d = new_par.children_d.concat(tmp.children_d);
+
+			if(new_par.id === $.jstree.root) {
+				this._model.force_full_redraw = true;
+			}
+			if(!this._model.force_full_redraw) {
+				this._node_changed(new_par.id);
+			}
+			if(!skip_redraw) {
+				this.redraw(new_par.id === $.jstree.root);
+			}
+			if(callback) { callback.call(this, tmp, new_par, pos); }
+			/**
+			 * triggered when a node is copied
+			 * @event
+			 * @name copy_node.jstree
+			 * @param {Object} node the copied node
+			 * @param {Object} original the original node
+			 * @param {String} parent the parent's ID
+			 * @param {Number} position the position of the node among the parent's children
+			 * @param {String} old_parent the old parent of the node
+			 * @param {Number} old_position the position of the original node
+			 * @param {Boolean} is_multi do the node and new parent belong to different instances
+			 * @param {jsTree} old_instance the instance the node came from
+			 * @param {jsTree} new_instance the instance of the new parent
+			 */
+			this.trigger('copy_node', { "node" : tmp, "original" : obj, "parent" : new_par.id, "position" : pos, "old_parent" : old_par, "old_position" : old_ins && old_ins._id && old_par && old_ins._model.data[old_par] && old_ins._model.data[old_par].children ? $.inArray(obj.id, old_ins._model.data[old_par].children) : -1,'is_multi' : (old_ins && old_ins._id && old_ins._id !== this._id), 'is_foreign' : (!old_ins || !old_ins._id), 'old_instance' : old_ins, 'new_instance' : this });
+			return tmp.id;
+		},
+		/**
+		 * cut a node (a later call to `paste(obj)` would move the node)
+		 * @name cut(obj)
+		 * @param  {mixed} obj multiple objects can be passed using an array
+		 * @trigger cut.jstree
+		 */
+		cut : function (obj) {
+			if(!obj) { obj = this._data.core.selected.concat(); }
+			if(!$.isArray(obj)) { obj = [obj]; }
+			if(!obj.length) { return false; }
+			var tmp = [], o, t1, t2;
+			for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+				o = this.get_node(obj[t1]);
+				if(o && o.id && o.id !== $.jstree.root) { tmp.push(o); }
+			}
+			if(!tmp.length) { return false; }
+			ccp_node = tmp;
+			ccp_inst = this;
+			ccp_mode = 'move_node';
+			/**
+			 * triggered when nodes are added to the buffer for moving
+			 * @event
+			 * @name cut.jstree
+			 * @param {Array} node
+			 */
+			this.trigger('cut', { "node" : obj });
+		},
+		/**
+		 * copy a node (a later call to `paste(obj)` would copy the node)
+		 * @name copy(obj)
+		 * @param  {mixed} obj multiple objects can be passed using an array
+		 * @trigger copy.jstree
+		 */
+		copy : function (obj) {
+			if(!obj) { obj = this._data.core.selected.concat(); }
+			if(!$.isArray(obj)) { obj = [obj]; }
+			if(!obj.length) { return false; }
+			var tmp = [], o, t1, t2;
+			for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+				o = this.get_node(obj[t1]);
+				if(o && o.id && o.id !== $.jstree.root) { tmp.push(o); }
+			}
+			if(!tmp.length) { return false; }
+			ccp_node = tmp;
+			ccp_inst = this;
+			ccp_mode = 'copy_node';
+			/**
+			 * triggered when nodes are added to the buffer for copying
+			 * @event
+			 * @name copy.jstree
+			 * @param {Array} node
+			 */
+			this.trigger('copy', { "node" : obj });
+		},
+		/**
+		 * get the current buffer (any nodes that are waiting for a paste operation)
+		 * @name get_buffer()
+		 * @return {Object} an object consisting of `mode` ("copy_node" or "move_node"), `node` (an array of objects) and `inst` (the instance)
+		 */
+		get_buffer : function () {
+			return { 'mode' : ccp_mode, 'node' : ccp_node, 'inst' : ccp_inst };
+		},
+		/**
+		 * check if there is something in the buffer to paste
+		 * @name can_paste()
+		 * @return {Boolean}
+		 */
+		can_paste : function () {
+			return ccp_mode !== false && ccp_node !== false; // && ccp_inst._model.data[ccp_node];
+		},
+		/**
+		 * copy or move the previously cut or copied nodes to a new parent
+		 * @name paste(obj [, pos])
+		 * @param  {mixed} obj the new parent
+		 * @param  {mixed} pos the position to insert at (besides integer, "first" and "last" are supported), defaults to integer `0`
+		 * @trigger paste.jstree
+		 */
+		paste : function (obj, pos) {
+			obj = this.get_node(obj);
+			if(!obj || !ccp_mode || !ccp_mode.match(/^(copy_node|move_node)$/) || !ccp_node) { return false; }
+			if(this[ccp_mode](ccp_node, obj, pos, false, false, false, ccp_inst)) {
+				/**
+				 * triggered when paste is invoked
+				 * @event
+				 * @name paste.jstree
+				 * @param {String} parent the ID of the receiving node
+				 * @param {Array} node the nodes in the buffer
+				 * @param {String} mode the performed operation - "copy_node" or "move_node"
+				 */
+				this.trigger('paste', { "parent" : obj.id, "node" : ccp_node, "mode" : ccp_mode });
+			}
+			ccp_node = false;
+			ccp_mode = false;
+			ccp_inst = false;
+		},
+		/**
+		 * clear the buffer of previously copied or cut nodes
+		 * @name clear_buffer()
+		 * @trigger clear_buffer.jstree
+		 */
+		clear_buffer : function () {
+			ccp_node = false;
+			ccp_mode = false;
+			ccp_inst = false;
+			/**
+			 * triggered when the copy / cut buffer is cleared
+			 * @event
+			 * @name clear_buffer.jstree
+			 */
+			this.trigger('clear_buffer');
+		},
+		/**
+		 * put a node in edit mode (input field to rename the node)
+		 * @name edit(obj [, default_text, callback])
+		 * @param  {mixed} obj
+		 * @param  {String} default_text the text to populate the input with (if omitted or set to a non-string value the node's text value is used)
+		 * @param  {Function} callback a function to be called once the text box is blurred, it is called in the instance's scope and receives the node, a status parameter (true if the rename is successful, false otherwise) and a boolean indicating if the user cancelled the edit. You can access the node's title using .text
+		 */
+		edit : function (obj, default_text, callback) {
+			var rtl, w, a, s, t, h1, h2, fn, tmp, cancel = false;
+			obj = this.get_node(obj);
+			if(!obj) { return false; }
+			if(this.settings.core.check_callback === false) {
+				this._data.core.last_error = { 'error' : 'check', 'plugin' : 'core', 'id' : 'core_07', 'reason' : 'Could not edit node because of check_callback' };
+				this.settings.core.error.call(this, this._data.core.last_error);
+				return false;
+			}
+			tmp = obj;
+			default_text = typeof default_text === 'string' ? default_text : obj.text;
+			this.set_text(obj, "");
+			obj = this._open_to(obj);
+			tmp.text = default_text;
+
+			rtl = this._data.core.rtl;
+			w  = this.element.width();
+			this._data.core.focused = tmp.id;
+			a  = obj.children('.jstree-anchor').focus();
+			s  = $('<span>');
+			/*!
+			oi = obj.children("i:visible"),
+			ai = a.children("i:visible"),
+			w1 = oi.width() * oi.length,
+			w2 = ai.width() * ai.length,
+			*/
+			t  = default_text;
+			h1 = $("<"+"div />", { css : { "position" : "absolute", "top" : "-200px", "left" : (rtl ? "0px" : "-1000px"), "visibility" : "hidden" } }).appendTo("body");
+			h2 = $("<"+"input />", {
+						"value" : t,
+						"class" : "jstree-rename-input",
+						// "size" : t.length,
+						"css" : {
+							"padding" : "0",
+							"border" : "1px solid silver",
+							"box-sizing" : "border-box",
+							"display" : "inline-block",
+							"height" : (this._data.core.li_height) + "px",
+							"lineHeight" : (this._data.core.li_height) + "px",
+							"width" : "150px" // will be set a bit further down
+						},
+						"blur" : $.proxy(function (e) {
+							e.stopImmediatePropagation();
+							e.preventDefault();
+							var i = s.children(".jstree-rename-input"),
+								v = i.val(),
+								f = this.settings.core.force_text,
+								nv;
+							if(v === "") { v = t; }
+							h1.remove();
+							s.replaceWith(a);
+							s.remove();
+							t = f ? t : $('<div></div>').append($.parseHTML(t)).html();
+							this.set_text(obj, t);
+							nv = !!this.rename_node(obj, f ? $('<div></div>').text(v).text() : $('<div></div>').append($.parseHTML(v)).html());
+							if(!nv) {
+								this.set_text(obj, t); // move this up? and fix #483
+							}
+							this._data.core.focused = tmp.id;
+							setTimeout($.proxy(function () {
+								var node = this.get_node(tmp.id, true);
+								if(node.length) {
+									this._data.core.focused = tmp.id;
+									node.children('.jstree-anchor').focus();
+								}
+							}, this), 0);
+							if(callback) {
+								callback.call(this, tmp, nv, cancel);
+							}
+						}, this),
+						"keydown" : function (e) {
+							var key = e.which;
+							if(key === 27) {
+								cancel = true;
+								this.value = t;
+							}
+							if(key === 27 || key === 13 || key === 37 || key === 38 || key === 39 || key === 40 || key === 32) {
+								e.stopImmediatePropagation();
+							}
+							if(key === 27 || key === 13) {
+								e.preventDefault();
+								this.blur();
+							}
+						},
+						"click" : function (e) { e.stopImmediatePropagation(); },
+						"mousedown" : function (e) { e.stopImmediatePropagation(); },
+						"keyup" : function (e) {
+							h2.width(Math.min(h1.text("pW" + this.value).width(),w));
+						},
+						"keypress" : function(e) {
+							if(e.which === 13) { return false; }
+						}
+					});
+				fn = {
+						fontFamily		: a.css('fontFamily')		|| '',
+						fontSize		: a.css('fontSize')			|| '',
+						fontWeight		: a.css('fontWeight')		|| '',
+						fontStyle		: a.css('fontStyle')		|| '',
+						fontStretch		: a.css('fontStretch')		|| '',
+						fontVariant		: a.css('fontVariant')		|| '',
+						letterSpacing	: a.css('letterSpacing')	|| '',
+						wordSpacing		: a.css('wordSpacing')		|| ''
+				};
+			s.attr('class', a.attr('class')).append(a.contents().clone()).append(h2);
+			a.replaceWith(s);
+			h1.css(fn);
+			h2.css(fn).width(Math.min(h1.text("pW" + h2[0].value).width(),w))[0].select();
+		},
+
+
+		/**
+		 * changes the theme
+		 * @name set_theme(theme_name [, theme_url])
+		 * @param {String} theme_name the name of the new theme to apply
+		 * @param {mixed} theme_url  the location of the CSS file for this theme. Omit or set to `false` if you manually included the file. Set to `true` to autoload from the `core.themes.dir` directory.
+		 * @trigger set_theme.jstree
+		 */
+		set_theme : function (theme_name, theme_url) {
+			if(!theme_name) { return false; }
+			if(theme_url === true) {
+				var dir = this.settings.core.themes.dir;
+				if(!dir) { dir = $.jstree.path + '/themes'; }
+				theme_url = dir + '/' + theme_name + '/style.css';
+			}
+			if(theme_url && $.inArray(theme_url, themes_loaded) === -1) {
+				$('head').append('<'+'link rel="stylesheet" href="' + theme_url + '" type="text/css" />');
+				themes_loaded.push(theme_url);
+			}
+			if(this._data.core.themes.name) {
+				this.element.removeClass('jstree-' + this._data.core.themes.name);
+			}
+			this._data.core.themes.name = theme_name;
+			this.element.addClass('jstree-' + theme_name);
+			this.element[this.settings.core.themes.responsive ? 'addClass' : 'removeClass' ]('jstree-' + theme_name + '-responsive');
+			/**
+			 * triggered when a theme is set
+			 * @event
+			 * @name set_theme.jstree
+			 * @param {String} theme the new theme
+			 */
+			this.trigger('set_theme', { 'theme' : theme_name });
+		},
+		/**
+		 * gets the name of the currently applied theme name
+		 * @name get_theme()
+		 * @return {String}
+		 */
+		get_theme : function () { return this._data.core.themes.name; },
+		/**
+		 * changes the theme variant (if the theme has variants)
+		 * @name set_theme_variant(variant_name)
+		 * @param {String|Boolean} variant_name the variant to apply (if `false` is used the current variant is removed)
+		 */
+		set_theme_variant : function (variant_name) {
+			if(this._data.core.themes.variant) {
+				this.element.removeClass('jstree-' + this._data.core.themes.name + '-' + this._data.core.themes.variant);
+			}
+			this._data.core.themes.variant = variant_name;
+			if(variant_name) {
+				this.element.addClass('jstree-' + this._data.core.themes.name + '-' + this._data.core.themes.variant);
+			}
+		},
+		/**
+		 * gets the name of the currently applied theme variant
+		 * @name get_theme()
+		 * @return {String}
+		 */
+		get_theme_variant : function () { return this._data.core.themes.variant; },
+		/**
+		 * shows a striped background on the container (if the theme supports it)
+		 * @name show_stripes()
+		 */
+		show_stripes : function () { this._data.core.themes.stripes = true; this.get_container_ul().addClass("jstree-striped"); },
+		/**
+		 * hides the striped background on the container
+		 * @name hide_stripes()
+		 */
+		hide_stripes : function () { this._data.core.themes.stripes = false; this.get_container_ul().removeClass("jstree-striped"); },
+		/**
+		 * toggles the striped background on the container
+		 * @name toggle_stripes()
+		 */
+		toggle_stripes : function () { if(this._data.core.themes.stripes) { this.hide_stripes(); } else { this.show_stripes(); } },
+		/**
+		 * shows the connecting dots (if the theme supports it)
+		 * @name show_dots()
+		 */
+		show_dots : function () { this._data.core.themes.dots = true; this.get_container_ul().removeClass("jstree-no-dots"); },
+		/**
+		 * hides the connecting dots
+		 * @name hide_dots()
+		 */
+		hide_dots : function () { this._data.core.themes.dots = false; this.get_container_ul().addClass("jstree-no-dots"); },
+		/**
+		 * toggles the connecting dots
+		 * @name toggle_dots()
+		 */
+		toggle_dots : function () { if(this._data.core.themes.dots) { this.hide_dots(); } else { this.show_dots(); } },
+		/**
+		 * show the node icons
+		 * @name show_icons()
+		 */
+		show_icons : function () { this._data.core.themes.icons = true; this.get_container_ul().removeClass("jstree-no-icons"); },
+		/**
+		 * hide the node icons
+		 * @name hide_icons()
+		 */
+		hide_icons : function () { this._data.core.themes.icons = false; this.get_container_ul().addClass("jstree-no-icons"); },
+		/**
+		 * toggle the node icons
+		 * @name toggle_icons()
+		 */
+		toggle_icons : function () { if(this._data.core.themes.icons) { this.hide_icons(); } else { this.show_icons(); } },
+		/**
+		 * set the node icon for a node
+		 * @name set_icon(obj, icon)
+		 * @param {mixed} obj
+		 * @param {String} icon the new icon - can be a path to an icon or a className, if using an image that is in the current directory use a `./` prefix, otherwise it will be detected as a class
+		 */
+		set_icon : function (obj, icon) {
+			var t1, t2, dom, old;
+			if($.isArray(obj)) {
+				obj = obj.slice();
+				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+					this.set_icon(obj[t1], icon);
+				}
+				return true;
+			}
+			obj = this.get_node(obj);
+			if(!obj || obj.id === $.jstree.root) { return false; }
+			old = obj.icon;
+			obj.icon = icon === true || icon === null || icon === undefined || icon === '' ? true : icon;
+			dom = this.get_node(obj, true).children(".jstree-anchor").children(".jstree-themeicon");
+			if(icon === false) {
+				this.hide_icon(obj);
+			}
+			else if(icon === true || icon === null || icon === undefined || icon === '') {
+				dom.removeClass('jstree-themeicon-custom ' + old).css("background","").removeAttr("rel");
+				if(old === false) { this.show_icon(obj); }
+			}
+			else if(icon.indexOf("/") === -1 && icon.indexOf(".") === -1) {
+				dom.removeClass(old).css("background","");
+				dom.addClass(icon + ' jstree-themeicon-custom').attr("rel",icon);
+				if(old === false) { this.show_icon(obj); }
+			}
+			else {
+				dom.removeClass(old).css("background","");
+				dom.addClass('jstree-themeicon-custom').css("background", "url('" + icon + "') center center no-repeat").attr("rel",icon);
+				if(old === false) { this.show_icon(obj); }
+			}
+			return true;
+		},
+		/**
+		 * get the node icon for a node
+		 * @name get_icon(obj)
+		 * @param {mixed} obj
+		 * @return {String}
+		 */
+		get_icon : function (obj) {
+			obj = this.get_node(obj);
+			return (!obj || obj.id === $.jstree.root) ? false : obj.icon;
+		},
+		/**
+		 * hide the icon on an individual node
+		 * @name hide_icon(obj)
+		 * @param {mixed} obj
+		 */
+		hide_icon : function (obj) {
+			var t1, t2;
+			if($.isArray(obj)) {
+				obj = obj.slice();
+				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+					this.hide_icon(obj[t1]);
+				}
+				return true;
+			}
+			obj = this.get_node(obj);
+			if(!obj || obj === $.jstree.root) { return false; }
+			obj.icon = false;
+			this.get_node(obj, true).children(".jstree-anchor").children(".jstree-themeicon").addClass('jstree-themeicon-hidden');
+			return true;
+		},
+		/**
+		 * show the icon on an individual node
+		 * @name show_icon(obj)
+		 * @param {mixed} obj
+		 */
+		show_icon : function (obj) {
+			var t1, t2, dom;
+			if($.isArray(obj)) {
+				obj = obj.slice();
+				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+					this.show_icon(obj[t1]);
+				}
+				return true;
+			}
+			obj = this.get_node(obj);
+			if(!obj || obj === $.jstree.root) { return false; }
+			dom = this.get_node(obj, true);
+			obj.icon = dom.length ? dom.children(".jstree-anchor").children(".jstree-themeicon").attr('rel') : true;
+			if(!obj.icon) { obj.icon = true; }
+			dom.children(".jstree-anchor").children(".jstree-themeicon").removeClass('jstree-themeicon-hidden');
+			return true;
+		}
+	};
+
+	// helpers
+	$.vakata = {};
+	// collect attributes
+	$.vakata.attributes = function(node, with_values) {
+		node = $(node)[0];
+		var attr = with_values ? {} : [];
+		if(node && node.attributes) {
+			$.each(node.attributes, function (i, v) {
+				if($.inArray(v.name.toLowerCase(),['style','contenteditable','hasfocus','tabindex']) !== -1) { return; }
+				if(v.value !== null && $.trim(v.value) !== '') {
+					if(with_values) { attr[v.name] = v.value; }
+					else { attr.push(v.name); }
+				}
+			});
+		}
+		return attr;
+	};
+	$.vakata.array_unique = function(array) {
+		var a = [], i, j, l, o = {};
+		for(i = 0, l = array.length; i < l; i++) {
+			if(o[array[i]] === undefined) {
+				a.push(array[i]);
+				o[array[i]] = true;
+			}
+		}
+		return a;
+	};
+	// remove item from array
+	$.vakata.array_remove = function(array, from, to) {
+		var rest = array.slice((to || from) + 1 || array.length);
+		array.length = from < 0 ? array.length + from : from;
+		array.push.apply(array, rest);
+		return array;
+	};
+	// remove item from array
+	$.vakata.array_remove_item = function(array, item) {
+		var tmp = $.inArray(item, array);
+		return tmp !== -1 ? $.vakata.array_remove(array, tmp) : array;
+	};
+
+
+/**
+ * ### Changed plugin
+ *
+ * This plugin adds more information to the `changed.jstree` event. The new data is contained in the `changed` event data property, and contains a lists of `selected` and `deselected` nodes.
+ */
+
+	$.jstree.plugins.changed = function (options, parent) {
+		var last = [];
+		this.trigger = function (ev, data) {
+			var i, j;
+			if(!data) {
+				data = {};
+			}
+			if(ev.replace('.jstree','') === 'changed') {
+				data.changed = { selected : [], deselected : [] };
+				var tmp = {};
+				for(i = 0, j = last.length; i < j; i++) {
+					tmp[last[i]] = 1;
+				}
+				for(i = 0, j = data.selected.length; i < j; i++) {
+					if(!tmp[data.selected[i]]) {
+						data.changed.selected.push(data.selected[i]);
+					}
+					else {
+						tmp[data.selected[i]] = 2;
+					}
+				}
+				for(i = 0, j = last.length; i < j; i++) {
+					if(tmp[last[i]] === 1) {
+						data.changed.deselected.push(last[i]);
+					}
+				}
+				last = data.selected.slice();
+			}
+			/**
+			 * triggered when selection changes (the "changed" plugin enhances the original event with more data)
+			 * @event
+			 * @name changed.jstree
+			 * @param {Object} node
+			 * @param {Object} action the action that caused the selection to change
+			 * @param {Array} selected the current selection
+			 * @param {Object} changed an object containing two properties `selected` and `deselected` - both arrays of node IDs, which were selected or deselected since the last changed event
+			 * @param {Object} event the event (if any) that triggered this changed event
+			 * @plugin changed
+			 */
+			parent.trigger.call(this, ev, data);
+		};
+		this.refresh = function (skip_loading, forget_state) {
+			last = [];
+			return parent.refresh.apply(this, arguments);
+		};
+	};
+
+/**
+ * ### Checkbox plugin
+ *
+ * This plugin renders checkbox icons in front of each node, making multiple selection much easier.
+ * It also supports tri-state behavior, meaning that if a node has a few of its children checked it will be rendered as undetermined, and state will be propagated up.
+ */
+
+	var _i = document.createElement('I');
+	_i.className = 'jstree-icon jstree-checkbox';
+	_i.setAttribute('role', 'presentation');
+	/**
+	 * stores all defaults for the checkbox plugin
+	 * @name $.jstree.defaults.checkbox
+	 * @plugin checkbox
+	 */
+	$.jstree.defaults.checkbox = {
+		/**
+		 * a boolean indicating if checkboxes should be visible (can be changed at a later time using `show_checkboxes()` and `hide_checkboxes`). Defaults to `true`.
+		 * @name $.jstree.defaults.checkbox.visible
+		 * @plugin checkbox
+		 */
+		visible				: true,
+		/**
+		 * a boolean indicating if checkboxes should cascade down and have an undetermined state. Defaults to `true`.
+		 * @name $.jstree.defaults.checkbox.three_state
+		 * @plugin checkbox
+		 */
+		three_state			: true,
+		/**
+		 * a boolean indicating if clicking anywhere on the node should act as clicking on the checkbox. Defaults to `true`.
+		 * @name $.jstree.defaults.checkbox.whole_node
+		 * @plugin checkbox
+		 */
+		whole_node			: true,
+		/**
+		 * a boolean indicating if the selected style of a node should be kept, or removed. Defaults to `true`.
+		 * @name $.jstree.defaults.checkbox.keep_selected_style
+		 * @plugin checkbox
+		 */
+		keep_selected_style	: true,
+		/**
+		 * This setting controls how cascading and undetermined nodes are applied.
+		 * If 'up' is in the string - cascading up is enabled, if 'down' is in the string - cascading down is enabled, if 'undetermined' is in the string - undetermined nodes will be used.
+		 * If `three_state` is set to `true` this setting is automatically set to 'up+down+undetermined'. Defaults to ''.
+		 * @name $.jstree.defaults.checkbox.cascade
+		 * @plugin checkbox
+		 */
+		cascade				: '',
+		/**
+		 * This setting controls if checkbox are bound to the general tree selection or to an internal array maintained by the checkbox plugin. Defaults to `true`, only set to `false` if you know exactly what you are doing.
+		 * @name $.jstree.defaults.checkbox.tie_selection
+		 * @plugin checkbox
+		 */
+		tie_selection		: true
+	};
+	$.jstree.plugins.checkbox = function (options, parent) {
+		this.bind = function () {
+			parent.bind.call(this);
+			this._data.checkbox.uto = false;
+			this._data.checkbox.selected = [];
+			if(this.settings.checkbox.three_state) {
+				this.settings.checkbox.cascade = 'up+down+undetermined';
+			}
+			this.element
+				.on("init.jstree", $.proxy(function () {
+						this._data.checkbox.visible = this.settings.checkbox.visible;
+						if(!this.settings.checkbox.keep_selected_style) {
+							this.element.addClass('jstree-checkbox-no-clicked');
+						}
+						if(this.settings.checkbox.tie_selection) {
+							this.element.addClass('jstree-checkbox-selection');
+						}
+					}, this))
+				.on("loading.jstree", $.proxy(function () {
+						this[ this._data.checkbox.visible ? 'show_checkboxes' : 'hide_checkboxes' ]();
+					}, this));
+			if(this.settings.checkbox.cascade.indexOf('undetermined') !== -1) {
+				this.element
+					.on('changed.jstree uncheck_node.jstree check_node.jstree uncheck_all.jstree check_all.jstree move_node.jstree copy_node.jstree redraw.jstree open_node.jstree', $.proxy(function () {
+							// only if undetermined is in setting
+							if(this._data.checkbox.uto) { clearTimeout(this._data.checkbox.uto); }
+							this._data.checkbox.uto = setTimeout($.proxy(this._undetermined, this), 50);
+						}, this));
+			}
+			if(!this.settings.checkbox.tie_selection) {
+				this.element
+					.on('model.jstree', $.proxy(function (e, data) {
+						var m = this._model.data,
+							p = m[data.parent],
+							dpc = data.nodes,
+							i, j;
+						for(i = 0, j = dpc.length; i < j; i++) {
+							m[dpc[i]].state.checked = m[dpc[i]].state.checked || (m[dpc[i]].original && m[dpc[i]].original.state && m[dpc[i]].original.state.checked);
+							if(m[dpc[i]].state.checked) {
+								this._data.checkbox.selected.push(dpc[i]);
+							}
+						}
+					}, this));
+			}
+			if(this.settings.checkbox.cascade.indexOf('up') !== -1 || this.settings.checkbox.cascade.indexOf('down') !== -1) {
+				this.element
+					.on('model.jstree', $.proxy(function (e, data) {
+							var m = this._model.data,
+								p = m[data.parent],
+								dpc = data.nodes,
+								chd = [],
+								c, i, j, k, l, tmp, s = this.settings.checkbox.cascade, t = this.settings.checkbox.tie_selection;
+
+							if(s.indexOf('down') !== -1) {
+								// apply down
+								if(p.state[ t ? 'selected' : 'checked' ]) {
+									for(i = 0, j = dpc.length; i < j; i++) {
+										m[dpc[i]].state[ t ? 'selected' : 'checked' ] = true;
+									}
+									this._data[ t ? 'core' : 'checkbox' ].selected = this._data[ t ? 'core' : 'checkbox' ].selected.concat(dpc);
+								}
+								else {
+									for(i = 0, j = dpc.length; i < j; i++) {
+										if(m[dpc[i]].state[ t ? 'selected' : 'checked' ]) {
+											for(k = 0, l = m[dpc[i]].children_d.length; k < l; k++) {
+												m[m[dpc[i]].children_d[k]].state[ t ? 'selected' : 'checked' ] = true;
+											}
+											this._data[ t ? 'core' : 'checkbox' ].selected = this._data[ t ? 'core' : 'checkbox' ].selected.concat(m[dpc[i]].children_d);
+										}
+									}
+								}
+							}
+
+							if(s.indexOf('up') !== -1) {
+								// apply up
+								for(i = 0, j = p.children_d.length; i < j; i++) {
+									if(!m[p.children_d[i]].children.length) {
+										chd.push(m[p.children_d[i]].parent);
+									}
+								}
+								chd = $.vakata.array_unique(chd);
+								for(k = 0, l = chd.length; k < l; k++) {
+									p = m[chd[k]];
+									while(p && p.id !== $.jstree.root) {
+										c = 0;
+										for(i = 0, j = p.children.length; i < j; i++) {
+											c += m[p.children[i]].state[ t ? 'selected' : 'checked' ];
+										}
+										if(c === j) {
+											p.state[ t ? 'selected' : 'checked' ] = true;
+											this._data[ t ? 'core' : 'checkbox' ].selected.push(p.id);
+											tmp = this.get_node(p, true);
+											if(tmp && tmp.length) {
+												tmp.attr('aria-selected', true).children('.jstree-anchor').addClass( t ? 'jstree-clicked' : 'jstree-checked');
+											}
+										}
+										else {
+											break;
+										}
+										p = this.get_node(p.parent);
+									}
+								}
+							}
+
+							this._data[ t ? 'core' : 'checkbox' ].selected = $.vakata.array_unique(this._data[ t ? 'core' : 'checkbox' ].selected);
+						}, this))
+					.on(this.settings.checkbox.tie_selection ? 'select_node.jstree' : 'check_node.jstree', $.proxy(function (e, data) {
+							var obj = data.node,
+								m = this._model.data,
+								par = this.get_node(obj.parent),
+								dom = this.get_node(obj, true),
+								i, j, c, tmp, s = this.settings.checkbox.cascade, t = this.settings.checkbox.tie_selection;
+
+							// apply down
+							if(s.indexOf('down') !== -1) {
+								this._data[ t ? 'core' : 'checkbox' ].selected = $.vakata.array_unique(this._data[ t ? 'core' : 'checkbox' ].selected.concat(obj.children_d));
+								for(i = 0, j = obj.children_d.length; i < j; i++) {
+									tmp = m[obj.children_d[i]];
+									tmp.state[ t ? 'selected' : 'checked' ] = true;
+									if(tmp && tmp.original && tmp.original.state && tmp.original.state.undetermined) {
+										tmp.original.state.undetermined = false;
+									}
+								}
+							}
+
+							// apply up
+							if(s.indexOf('up') !== -1) {
+								while(par && par.id !== $.jstree.root) {
+									c = 0;
+									for(i = 0, j = par.children.length; i < j; i++) {
+										c += m[par.children[i]].state[ t ? 'selected' : 'checked' ];
+									}
+									if(c === j) {
+										par.state[ t ? 'selected' : 'checked' ] = true;
+										this._data[ t ? 'core' : 'checkbox' ].selected.push(par.id);
+										tmp = this.get_node(par, true);
+										if(tmp && tmp.length) {
+											tmp.attr('aria-selected', true).children('.jstree-anchor').addClass(t ? 'jstree-clicked' : 'jstree-checked');
+										}
+									}
+									else {
+										break;
+									}
+									par = this.get_node(par.parent);
+								}
+							}
+
+							// apply down (process .children separately?)
+							if(s.indexOf('down') !== -1 && dom.length) {
+								dom.find('.jstree-anchor').addClass(t ? 'jstree-clicked' : 'jstree-checked').parent().attr('aria-selected', true);
+							}
+						}, this))
+					.on(this.settings.checkbox.tie_selection ? 'deselect_all.jstree' : 'uncheck_all.jstree', $.proxy(function (e, data) {
+							var obj = this.get_node($.jstree.root),
+								m = this._model.data,
+								i, j, tmp;
+							for(i = 0, j = obj.children_d.length; i < j; i++) {
+								tmp = m[obj.children_d[i]];
+								if(tmp && tmp.original && tmp.original.state && tmp.original.state.undetermined) {
+									tmp.original.state.undetermined = false;
+								}
+							}
+						}, this))
+					.on(this.settings.checkbox.tie_selection ? 'deselect_node.jstree' : 'uncheck_node.jstree', $.proxy(function (e, data) {
+							var obj = data.node,
+								dom = this.get_node(obj, true),
+								i, j, tmp, s = this.settings.checkbox.cascade, t = this.settings.checkbox.tie_selection;
+							if(obj && obj.original && obj.original.state && obj.original.state.undetermined) {
+								obj.original.state.undetermined = false;
+							}
+
+							// apply down
+							if(s.indexOf('down') !== -1) {
+								for(i = 0, j = obj.children_d.length; i < j; i++) {
+									tmp = this._model.data[obj.children_d[i]];
+									tmp.state[ t ? 'selected' : 'checked' ] = false;
+									if(tmp && tmp.original && tmp.original.state && tmp.original.state.undetermined) {
+										tmp.original.state.undetermined = false;
+									}
+								}
+							}
+
+							// apply up
+							if(s.indexOf('up') !== -1) {
+								for(i = 0, j = obj.parents.length; i < j; i++) {
+									tmp = this._model.data[obj.parents[i]];
+									tmp.state[ t ? 'selected' : 'checked' ] = false;
+									if(tmp && tmp.original && tmp.original.state && tmp.original.state.undetermined) {
+										tmp.original.state.undetermined = false;
+									}
+									tmp = this.get_node(obj.parents[i], true);
+									if(tmp && tmp.length) {
+										tmp.attr('aria-selected', false).children('.jstree-anchor').removeClass(t ? 'jstree-clicked' : 'jstree-checked');
+									}
+								}
+							}
+							tmp = [];
+							for(i = 0, j = this._data[ t ? 'core' : 'checkbox' ].selected.length; i < j; i++) {
+								// apply down + apply up
+								if(
+									(s.indexOf('down') === -1 || $.inArray(this._data[ t ? 'core' : 'checkbox' ].selected[i], obj.children_d) === -1) &&
+									(s.indexOf('up') === -1 || $.inArray(this._data[ t ? 'core' : 'checkbox' ].selected[i], obj.parents) === -1)
+								) {
+									tmp.push(this._data[ t ? 'core' : 'checkbox' ].selected[i]);
+								}
+							}
+							this._data[ t ? 'core' : 'checkbox' ].selected = $.vakata.array_unique(tmp);
+
+							// apply down (process .children separately?)
+							if(s.indexOf('down') !== -1 && dom.length) {
+								dom.find('.jstree-anchor').removeClass(t ? 'jstree-clicked' : 'jstree-checked').parent().attr('aria-selected', false);
+							}
+						}, this));
+			}
+			if(this.settings.checkbox.cascade.indexOf('up') !== -1) {
+				this.element
+					.on('delete_node.jstree', $.proxy(function (e, data) {
+							// apply up (whole handler)
+							var p = this.get_node(data.parent),
+								m = this._model.data,
+								i, j, c, tmp, t = this.settings.checkbox.tie_selection;
+							while(p && p.id !== $.jstree.root && !p.state[ t ? 'selected' : 'checked' ]) {
+								c = 0;
+								for(i = 0, j = p.children.length; i < j; i++) {
+									c += m[p.children[i]].state[ t ? 'selected' : 'checked' ];
+								}
+								if(j > 0 && c === j) {
+									p.state[ t ? 'selected' : 'checked' ] = true;
+									this._data[ t ? 'core' : 'checkbox' ].selected.push(p.id);
+									tmp = this.get_node(p, true);
+									if(tmp && tmp.length) {
+										tmp.attr('aria-selected', true).children('.jstree-anchor').addClass(t ? 'jstree-clicked' : 'jstree-checked');
+									}
+								}
+								else {
+									break;
+								}
+								p = this.get_node(p.parent);
+							}
+						}, this))
+					.on('move_node.jstree', $.proxy(function (e, data) {
+							// apply up (whole handler)
+							var is_multi = data.is_multi,
+								old_par = data.old_parent,
+								new_par = this.get_node(data.parent),
+								m = this._model.data,
+								p, c, i, j, tmp, t = this.settings.checkbox.tie_selection;
+							if(!is_multi) {
+								p = this.get_node(old_par);
+								while(p && p.id !== $.jstree.root && !p.state[ t ? 'selected' : 'checked' ]) {
+									c = 0;
+									for(i = 0, j = p.children.length; i < j; i++) {
+										c += m[p.children[i]].state[ t ? 'selected' : 'checked' ];
+									}
+									if(j > 0 && c === j) {
+										p.state[ t ? 'selected' : 'checked' ] = true;
+										this._data[ t ? 'core' : 'checkbox' ].selected.push(p.id);
+										tmp = this.get_node(p, true);
+										if(tmp && tmp.length) {
+											tmp.attr('aria-selected', true).children('.jstree-anchor').addClass(t ? 'jstree-clicked' : 'jstree-checked');
+										}
+									}
+									else {
+										break;
+									}
+									p = this.get_node(p.parent);
+								}
+							}
+							p = new_par;
+							while(p && p.id !== $.jstree.root) {
+								c = 0;
+								for(i = 0, j = p.children.length; i < j; i++) {
+									c += m[p.children[i]].state[ t ? 'selected' : 'checked' ];
+								}
+								if(c === j) {
+									if(!p.state[ t ? 'selected' : 'checked' ]) {
+										p.state[ t ? 'selected' : 'checked' ] = true;
+										this._data[ t ? 'core' : 'checkbox' ].selected.push(p.id);
+										tmp = this.get_node(p, true);
+										if(tmp && tmp.length) {
+											tmp.attr('aria-selected', true).children('.jstree-anchor').addClass(t ? 'jstree-clicked' : 'jstree-checked');
+										}
+									}
+								}
+								else {
+									if(p.state[ t ? 'selected' : 'checked' ]) {
+										p.state[ t ? 'selected' : 'checked' ] = false;
+										this._data[ t ? 'core' : 'checkbox' ].selected = $.vakata.array_remove_item(this._data[ t ? 'core' : 'checkbox' ].selected, p.id);
+										tmp = this.get_node(p, true);
+										if(tmp && tmp.length) {
+											tmp.attr('aria-selected', false).children('.jstree-anchor').removeClass(t ? 'jstree-clicked' : 'jstree-checked');
+										}
+									}
+									else {
+										break;
+									}
+								}
+								p = this.get_node(p.parent);
+							}
+						}, this));
+			}
+		};
+		/**
+		 * set the undetermined state where and if necessary. Used internally.
+		 * @private
+		 * @name _undetermined()
+		 * @plugin checkbox
+		 */
+		this._undetermined = function () {
+			if(this.element === null) { return; }
+			var i, j, k, l, o = {}, m = this._model.data, t = this.settings.checkbox.tie_selection, s = this._data[ t ? 'core' : 'checkbox' ].selected, p = [], tt = this;
+			for(i = 0, j = s.length; i < j; i++) {
+				if(m[s[i]] && m[s[i]].parents) {
+					for(k = 0, l = m[s[i]].parents.length; k < l; k++) {
+						if(o[m[s[i]].parents[k]] === undefined && m[s[i]].parents[k] !== $.jstree.root) {
+							o[m[s[i]].parents[k]] = true;
+							p.push(m[s[i]].parents[k]);
+						}
+					}
+				}
+			}
+			// attempt for server side undetermined state
+			this.element.find('.jstree-closed').not(':has(.jstree-children)')
+				.each(function () {
+					var tmp = tt.get_node(this), tmp2;
+					if(!tmp.state.loaded) {
+						if(tmp.original && tmp.original.state && tmp.original.state.undetermined && tmp.original.state.undetermined === true) {
+							if(o[tmp.id] === undefined && tmp.id !== $.jstree.root) {
+								o[tmp.id] = true;
+								p.push(tmp.id);
+							}
+							for(k = 0, l = tmp.parents.length; k < l; k++) {
+								if(o[tmp.parents[k]] === undefined && tmp.parents[k] !== $.jstree.root) {
+									o[tmp.parents[k]] = true;
+									p.push(tmp.parents[k]);
+								}
+							}
+						}
+					}
+					else {
+						for(i = 0, j = tmp.children_d.length; i < j; i++) {
+							tmp2 = m[tmp.children_d[i]];
+							if(!tmp2.state.loaded && tmp2.original && tmp2.original.state && tmp2.original.state.undetermined && tmp2.original.state.undetermined === true) {
+								if(o[tmp2.id] === undefined && tmp2.id !== $.jstree.root) {
+									o[tmp2.id] = true;
+									p.push(tmp2.id);
+								}
+								for(k = 0, l = tmp2.parents.length; k < l; k++) {
+									if(o[tmp2.parents[k]] === undefined && tmp2.parents[k] !== $.jstree.root) {
+										o[tmp2.parents[k]] = true;
+										p.push(tmp2.parents[k]);
+									}
+								}
+							}
+						}
+					}
+				});
+
+			this.element.find('.jstree-undetermined').removeClass('jstree-undetermined');
+			for(i = 0, j = p.length; i < j; i++) {
+				if(!m[p[i]].state[ t ? 'selected' : 'checked' ]) {
+					s = this.get_node(p[i], true);
+					if(s && s.length) {
+						s.children('.jstree-anchor').children('.jstree-checkbox').addClass('jstree-undetermined');
+					}
+				}
+			}
+		};
+		this.redraw_node = function(obj, deep, is_callback, force_render) {
+			obj = parent.redraw_node.apply(this, arguments);
+			if(obj) {
+				var i, j, tmp = null, icon = null;
+				for(i = 0, j = obj.childNodes.length; i < j; i++) {
+					if(obj.childNodes[i] && obj.childNodes[i].className && obj.childNodes[i].className.indexOf("jstree-anchor") !== -1) {
+						tmp = obj.childNodes[i];
+						break;
+					}
+				}
+				if(tmp) {
+					if(!this.settings.checkbox.tie_selection && this._model.data[obj.id].state.checked) { tmp.className += ' jstree-checked'; }
+					icon = _i.cloneNode(false);
+					if(this._model.data[obj.id].state.checkbox_disabled) { icon.className += ' jstree-checkbox-disabled'; }
+					tmp.insertBefore(icon, tmp.childNodes[0]);
+				}
+			}
+			if(!is_callback && this.settings.checkbox.cascade.indexOf('undetermined') !== -1) {
+				if(this._data.checkbox.uto) { clearTimeout(this._data.checkbox.uto); }
+				this._data.checkbox.uto = setTimeout($.proxy(this._undetermined, this), 50);
+			}
+			return obj;
+		};
+		/**
+		 * show the node checkbox icons
+		 * @name show_checkboxes()
+		 * @plugin checkbox
+		 */
+		this.show_checkboxes = function () { this._data.core.themes.checkboxes = true; this.get_container_ul().removeClass("jstree-no-checkboxes"); };
+		/**
+		 * hide the node checkbox icons
+		 * @name hide_checkboxes()
+		 * @plugin checkbox
+		 */
+		this.hide_checkboxes = function () { this._data.core.themes.checkboxes = false; this.get_container_ul().addClass("jstree-no-checkboxes"); };
+		/**
+		 * toggle the node icons
+		 * @name toggle_checkboxes()
+		 * @plugin checkbox
+		 */
+		this.toggle_checkboxes = function () { if(this._data.core.themes.checkboxes) { this.hide_checkboxes(); } else { this.show_checkboxes(); } };
+		/**
+		 * checks if a node is in an undetermined state
+		 * @name is_undetermined(obj)
+		 * @param  {mixed} obj
+		 * @return {Boolean}
+		 */
+		this.is_undetermined = function (obj) {
+			obj = this.get_node(obj);
+			var s = this.settings.checkbox.cascade, i, j, t = this.settings.checkbox.tie_selection, d = this._data[ t ? 'core' : 'checkbox' ].selected, m = this._model.data;
+			if(!obj || obj.state[ t ? 'selected' : 'checked' ] === true || s.indexOf('undetermined') === -1 || (s.indexOf('down') === -1 && s.indexOf('up') === -1)) {
+				return false;
+			}
+			if(!obj.state.loaded && obj.original.state.undetermined === true) {
+				return true;
+			}
+			for(i = 0, j = obj.children_d.length; i < j; i++) {
+				if($.inArray(obj.children_d[i], d) !== -1 || (!m[obj.children_d[i]].state.loaded && m[obj.children_d[i]].original.state.undetermined)) {
+					return true;
+				}
+			}
+			return false;
+		};
+		/**
+		 * disable a node's checkbox
+		 * @name disable_checkbox(obj)
+		 * @param {mixed} obj an array can be used too
+		 * @trigger disable_checkbox.jstree
+		 * @plugin checkbox
+		 */
+		this.disable_checkbox = function (obj) {
+			var t1, t2, dom;
+			if($.isArray(obj)) {
+				obj = obj.slice();
+				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+					this.disable_checkbox(obj[t1]);
+				}
+				return true;
+			}
+			obj = this.get_node(obj);
+			if(!obj || obj.id === $.jstree.root) {
+				return false;
+			}
+			dom = this.get_node(obj, true);
+			if(!obj.state.checkbox_disabled) {
+				obj.state.checkbox_disabled = true;
+				if(dom && dom.length) {
+					dom.children('.jstree-anchor').children('.jstree-checkbox').addClass('jstree-checkbox-disabled');
+				}
+				/**
+				 * triggered when an node's checkbox is disabled
+				 * @event
+				 * @name disable_checkbox.jstree
+				 * @param {Object} node
+				 * @plugin checkbox
+				 */
+				this.trigger('disable_checkbox', { 'node' : obj });
+			}
+		};
+		/**
+		 * enable a node's checkbox
+		 * @name disable_checkbox(obj)
+		 * @param {mixed} obj an array can be used too
+		 * @trigger enable_checkbox.jstree
+		 * @plugin checkbox
+		 */
+		this.enable_checkbox = function (obj) {
+			var t1, t2, dom;
+			if($.isArray(obj)) {
+				obj = obj.slice();
+				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+					this.enable_checkbox(obj[t1]);
+				}
+				return true;
+			}
+			obj = this.get_node(obj);
+			if(!obj || obj.id === $.jstree.root) {
+				return false;
+			}
+			dom = this.get_node(obj, true);
+			if(obj.state.checkbox_disabled) {
+				obj.state.checkbox_disabled = false;
+				if(dom && dom.length) {
+					dom.children('.jstree-anchor').children('.jstree-checkbox').removeClass('jstree-checkbox-disabled');
+				}
+				/**
+				 * triggered when an node's checkbox is enabled
+				 * @event
+				 * @name enable_checkbox.jstree
+				 * @param {Object} node
+				 * @plugin checkbox
+				 */
+				this.trigger('enable_checkbox', { 'node' : obj });
+			}
+		};
+
+		this.activate_node = function (obj, e) {
+			if($(e.target).hasClass('jstree-checkbox-disabled')) {
+				return false;
+			}
+			if(this.settings.checkbox.tie_selection && (this.settings.checkbox.whole_node || $(e.target).hasClass('jstree-checkbox'))) {
+				e.ctrlKey = true;
+			}
+			if(this.settings.checkbox.tie_selection || (!this.settings.checkbox.whole_node && !$(e.target).hasClass('jstree-checkbox'))) {
+				return parent.activate_node.call(this, obj, e);
+			}
+			if(this.is_disabled(obj)) {
+				return false;
+			}
+			if(this.is_checked(obj)) {
+				this.uncheck_node(obj, e);
+			}
+			else {
+				this.check_node(obj, e);
+			}
+			this.trigger('activate_node', { 'node' : this.get_node(obj) });
+		};
+
+		/**
+		 * check a node (only if tie_selection in checkbox settings is false, otherwise select_node will be called internally)
+		 * @name check_node(obj)
+		 * @param {mixed} obj an array can be used to check multiple nodes
+		 * @trigger check_node.jstree
+		 * @plugin checkbox
+		 */
+		this.check_node = function (obj, e) {
+			if(this.settings.checkbox.tie_selection) { return this.select_node(obj, false, true, e); }
+			var dom, t1, t2, th;
+			if($.isArray(obj)) {
+				obj = obj.slice();
+				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+					this.check_node(obj[t1], e);
+				}
+				return true;
+			}
+			obj = this.get_node(obj);
+			if(!obj || obj.id === $.jstree.root) {
+				return false;
+			}
+			dom = this.get_node(obj, true);
+			if(!obj.state.checked) {
+				obj.state.checked = true;
+				this._data.checkbox.selected.push(obj.id);
+				if(dom && dom.length) {
+					dom.children('.jstree-anchor').addClass('jstree-checked');
+				}
+				/**
+				 * triggered when an node is checked (only if tie_selection in checkbox settings is false)
+				 * @event
+				 * @name check_node.jstree
+				 * @param {Object} node
+				 * @param {Array} selected the current selection
+				 * @param {Object} event the event (if any) that triggered this check_node
+				 * @plugin checkbox
+				 */
+				this.trigger('check_node', { 'node' : obj, 'selected' : this._data.checkbox.selected, 'event' : e });
+			}
+		};
+		/**
+		 * uncheck a node (only if tie_selection in checkbox settings is false, otherwise deselect_node will be called internally)
+		 * @name uncheck_node(obj)
+		 * @param {mixed} obj an array can be used to uncheck multiple nodes
+		 * @trigger uncheck_node.jstree
+		 * @plugin checkbox
+		 */
+		this.uncheck_node = function (obj, e) {
+			if(this.settings.checkbox.tie_selection) { return this.deselect_node(obj, false, e); }
+			var t1, t2, dom;
+			if($.isArray(obj)) {
+				obj = obj.slice();
+				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+					this.uncheck_node(obj[t1], e);
+				}
+				return true;
+			}
+			obj = this.get_node(obj);
+			if(!obj || obj.id === $.jstree.root) {
+				return false;
+			}
+			dom = this.get_node(obj, true);
+			if(obj.state.checked) {
+				obj.state.checked = false;
+				this._data.checkbox.selected = $.vakata.array_remove_item(this._data.checkbox.selected, obj.id);
+				if(dom.length) {
+					dom.children('.jstree-anchor').removeClass('jstree-checked');
+				}
+				/**
+				 * triggered when an node is unchecked (only if tie_selection in checkbox settings is false)
+				 * @event
+				 * @name uncheck_node.jstree
+				 * @param {Object} node
+				 * @param {Array} selected the current selection
+				 * @param {Object} event the event (if any) that triggered this uncheck_node
+				 * @plugin checkbox
+				 */
+				this.trigger('uncheck_node', { 'node' : obj, 'selected' : this._data.checkbox.selected, 'event' : e });
+			}
+		};
+		/**
+		 * checks all nodes in the tree (only if tie_selection in checkbox settings is false, otherwise select_all will be called internally)
+		 * @name check_all()
+		 * @trigger check_all.jstree, changed.jstree
+		 * @plugin checkbox
+		 */
+		this.check_all = function () {
+			if(this.settings.checkbox.tie_selection) { return this.select_all(); }
+			var tmp = this._data.checkbox.selected.concat([]), i, j;
+			this._data.checkbox.selected = this._model.data[$.jstree.root].children_d.concat();
+			for(i = 0, j = this._data.checkbox.selected.length; i < j; i++) {
+				if(this._model.data[this._data.checkbox.selected[i]]) {
+					this._model.data[this._data.checkbox.selected[i]].state.checked = true;
+				}
+			}
+			this.redraw(true);
+			/**
+			 * triggered when all nodes are checked (only if tie_selection in checkbox settings is false)
+			 * @event
+			 * @name check_all.jstree
+			 * @param {Array} selected the current selection
+			 * @plugin checkbox
+			 */
+			this.trigger('check_all', { 'selected' : this._data.checkbox.selected });
+		};
+		/**
+		 * uncheck all checked nodes (only if tie_selection in checkbox settings is false, otherwise deselect_all will be called internally)
+		 * @name uncheck_all()
+		 * @trigger uncheck_all.jstree
+		 * @plugin checkbox
+		 */
+		this.uncheck_all = function () {
+			if(this.settings.checkbox.tie_selection) { return this.deselect_all(); }
+			var tmp = this._data.checkbox.selected.concat([]), i, j;
+			for(i = 0, j = this._data.checkbox.selected.length; i < j; i++) {
+				if(this._model.data[this._data.checkbox.selected[i]]) {
+					this._model.data[this._data.checkbox.selected[i]].state.checked = false;
+				}
+			}
+			this._data.checkbox.selected = [];
+			this.element.find('.jstree-checked').removeClass('jstree-checked');
+			/**
+			 * triggered when all nodes are unchecked (only if tie_selection in checkbox settings is false)
+			 * @event
+			 * @name uncheck_all.jstree
+			 * @param {Object} node the previous selection
+			 * @param {Array} selected the current selection
+			 * @plugin checkbox
+			 */
+			this.trigger('uncheck_all', { 'selected' : this._data.checkbox.selected, 'node' : tmp });
+		};
+		/**
+		 * checks if a node is checked (if tie_selection is on in the settings this function will return the same as is_selected)
+		 * @name is_checked(obj)
+		 * @param  {mixed}  obj
+		 * @return {Boolean}
+		 * @plugin checkbox
+		 */
+		this.is_checked = function (obj) {
+			if(this.settings.checkbox.tie_selection) { return this.is_selected(obj); }
+			obj = this.get_node(obj);
+			if(!obj || obj.id === $.jstree.root) { return false; }
+			return obj.state.checked;
+		};
+		/**
+		 * get an array of all checked nodes (if tie_selection is on in the settings this function will return the same as get_selected)
+		 * @name get_checked([full])
+		 * @param  {mixed}  full if set to `true` the returned array will consist of the full node objects, otherwise - only IDs will be returned
+		 * @return {Array}
+		 * @plugin checkbox
+		 */
+		this.get_checked = function (full) {
+			if(this.settings.checkbox.tie_selection) { return this.get_selected(full); }
+			return full ? $.map(this._data.checkbox.selected, $.proxy(function (i) { return this.get_node(i); }, this)) : this._data.checkbox.selected;
+		};
+		/**
+		 * get an array of all top level checked nodes (ignoring children of checked nodes) (if tie_selection is on in the settings this function will return the same as get_top_selected)
+		 * @name get_top_checked([full])
+		 * @param  {mixed}  full if set to `true` the returned array will consist of the full node objects, otherwise - only IDs will be returned
+		 * @return {Array}
+		 * @plugin checkbox
+		 */
+		this.get_top_checked = function (full) {
+			if(this.settings.checkbox.tie_selection) { return this.get_top_selected(full); }
+			var tmp = this.get_checked(true),
+				obj = {}, i, j, k, l;
+			for(i = 0, j = tmp.length; i < j; i++) {
+				obj[tmp[i].id] = tmp[i];
+			}
+			for(i = 0, j = tmp.length; i < j; i++) {
+				for(k = 0, l = tmp[i].children_d.length; k < l; k++) {
+					if(obj[tmp[i].children_d[k]]) {
+						delete obj[tmp[i].children_d[k]];
+					}
+				}
+			}
+			tmp = [];
+			for(i in obj) {
+				if(obj.hasOwnProperty(i)) {
+					tmp.push(i);
+				}
+			}
+			return full ? $.map(tmp, $.proxy(function (i) { return this.get_node(i); }, this)) : tmp;
+		};
+		/**
+		 * get an array of all bottom level checked nodes (ignoring selected parents) (if tie_selection is on in the settings this function will return the same as get_bottom_selected)
+		 * @name get_bottom_checked([full])
+		 * @param  {mixed}  full if set to `true` the returned array will consist of the full node objects, otherwise - only IDs will be returned
+		 * @return {Array}
+		 * @plugin checkbox
+		 */
+		this.get_bottom_checked = function (full) {
+			if(this.settings.checkbox.tie_selection) { return this.get_bottom_selected(full); }
+			var tmp = this.get_checked(true),
+				obj = [], i, j;
+			for(i = 0, j = tmp.length; i < j; i++) {
+				if(!tmp[i].children.length) {
+					obj.push(tmp[i].id);
+				}
+			}
+			return full ? $.map(obj, $.proxy(function (i) { return this.get_node(i); }, this)) : obj;
+		};
+		this.load_node = function (obj, callback) {
+			var k, l, i, j, c, tmp;
+			if(!$.isArray(obj) && !this.settings.checkbox.tie_selection) {
+				tmp = this.get_node(obj);
+				if(tmp && tmp.state.loaded) {
+					for(k = 0, l = tmp.children_d.length; k < l; k++) {
+						if(this._model.data[tmp.children_d[k]].state.checked) {
+							c = true;
+							this._data.checkbox.selected = $.vakata.array_remove_item(this._data.checkbox.selected, tmp.children_d[k]);
+						}
+					}
+				}
+			}
+			return parent.load_node.apply(this, arguments);
+		};
+		this.get_state = function () {
+			var state = parent.get_state.apply(this, arguments);
+			if(this.settings.checkbox.tie_selection) { return state; }
+			state.checkbox = this._data.checkbox.selected.slice();
+			return state;
+		};
+		this.set_state = function (state, callback) {
+			var res = parent.set_state.apply(this, arguments);
+			if(res && state.checkbox) {
+				if(!this.settings.checkbox.tie_selection) {
+					this.uncheck_all();
+					var _this = this;
+					$.each(state.checkbox, function (i, v) {
+						_this.check_node(v);
+					});
+				}
+				delete state.checkbox;
+				this.set_state(state, callback);
+				return false;
+			}
+			return res;
+		};
+		this.refresh = function (skip_loading, forget_state) {
+			if(!this.settings.checkbox.tie_selection) {
+				this._data.checkbox.selected = [];
+			}
+			return parent.refresh.apply(this, arguments);
+		};
+	};
+
+	// include the checkbox plugin by default
+	// $.jstree.defaults.plugins.push("checkbox");
+
+/**
+ * ### Conditionalselect plugin
+ *
+ * This plugin allows defining a callback to allow or deny node selection by user input (activate node method).
+ */
+
+	/**
+	 * a callback (function) which is invoked in the instance's scope and receives two arguments - the node and the event that triggered the `activate_node` call. Returning false prevents working with the node, returning true allows invoking activate_node. Defaults to returning `true`.
+	 * @name $.jstree.defaults.checkbox.visible
+	 * @plugin checkbox
+	 */
+	$.jstree.defaults.conditionalselect = function () { return true; };
+	$.jstree.plugins.conditionalselect = function (options, parent) {
+		// own function
+		this.activate_node = function (obj, e) {
+			if(this.settings.conditionalselect.call(this, this.get_node(obj), e)) {
+				parent.activate_node.call(this, obj, e);
+			}
+		};
+	};
+
+
+/**
+ * ### Contextmenu plugin
+ *
+ * Shows a context menu when a node is right-clicked.
+ */
+
+	/**
+	 * stores all defaults for the contextmenu plugin
+	 * @name $.jstree.defaults.contextmenu
+	 * @plugin contextmenu
+	 */
+	$.jstree.defaults.contextmenu = {
+		/**
+		 * a boolean indicating if the node should be selected when the context menu is invoked on it. Defaults to `true`.
+		 * @name $.jstree.defaults.contextmenu.select_node
+		 * @plugin contextmenu
+		 */
+		select_node : true,
+		/**
+		 * a boolean indicating if the menu should be shown aligned with the node. Defaults to `true`, otherwise the mouse coordinates are used.
+		 * @name $.jstree.defaults.contextmenu.show_at_node
+		 * @plugin contextmenu
+		 */
+		show_at_node : true,
+		/**
+		 * an object of actions, or a function that accepts a node and a callback function and calls the callback function with an object of actions available for that node (you can also return the items too).
+		 *
+		 * Each action consists of a key (a unique name) and a value which is an object with the following properties (only label and action are required):
+		 *
+		 * * `separator_before` - a boolean indicating if there should be a separator before this item
+		 * * `separator_after` - a boolean indicating if there should be a separator after this item
+		 * * `_disabled` - a boolean indicating if this action should be disabled
+		 * * `label` - a string - the name of the action (could be a function returning a string)
+		 * * `action` - a function to be executed if this item is chosen
+		 * * `icon` - a string, can be a path to an icon or a className, if using an image that is in the current directory use a `./` prefix, otherwise it will be detected as a class
+		 * * `shortcut` - keyCode which will trigger the action if the menu is open (for example `113` for rename, which equals F2)
+		 * * `shortcut_label` - shortcut label (like for example `F2` for rename)
+		 *
+		 * @name $.jstree.defaults.contextmenu.items
+		 * @plugin contextmenu
+		 */
+		items : function (o, cb) { // Could be an object directly
+			return {
+				"create" : {
+					"separator_before"	: false,
+					"separator_after"	: true,
+					"_disabled"			: false, //(this.check("create_node", data.reference, {}, "last")),
+					"label"				: "Create",
+					"action"			: function (data) {
+						var inst = $.jstree.reference(data.reference),
+							obj = inst.get_node(data.reference);
+						inst.create_node(obj, {}, "last", function (new_node) {
+							setTimeout(function () { inst.edit(new_node); },0);
+						});
+					}
+				},
+				"rename" : {
+					"separator_before"	: false,
+					"separator_after"	: false,
+					"_disabled"			: false, //(this.check("rename_node", data.reference, this.get_parent(data.reference), "")),
+					"label"				: "Rename",
+					/*!
+					"shortcut"			: 113,
+					"shortcut_label"	: 'F2',
+					"icon"				: "glyphicon glyphicon-leaf",
+					*/
+					"action"			: function (data) {
+						var inst = $.jstree.reference(data.reference),
+							obj = inst.get_node(data.reference);
+						inst.edit(obj);
+					}
+				},
+				"remove" : {
+					"separator_before"	: false,
+					"icon"				: false,
+					"separator_after"	: false,
+					"_disabled"			: false, //(this.check("delete_node", data.reference, this.get_parent(data.reference), "")),
+					"label"				: "Delete",
+					"action"			: function (data) {
+						var inst = $.jstree.reference(data.reference),
+							obj = inst.get_node(data.reference);
+						if(inst.is_selected(obj)) {
+							inst.delete_node(inst.get_selected());
+						}
+						else {
+							inst.delete_node(obj);
+						}
+					}
+				},
+				"ccp" : {
+					"separator_before"	: true,
+					"icon"				: false,
+					"separator_after"	: false,
+					"label"				: "Edit",
+					"action"			: false,
+					"submenu" : {
+						"cut" : {
+							"separator_before"	: false,
+							"separator_after"	: false,
+							"label"				: "Cut",
+							"action"			: function (data) {
+								var inst = $.jstree.reference(data.reference),
+									obj = inst.get_node(data.reference);
+								if(inst.is_selected(obj)) {
+									inst.cut(inst.get_top_selected());
+								}
+								else {
+									inst.cut(obj);
+								}
+							}
+						},
+						"copy" : {
+							"separator_before"	: false,
+							"icon"				: false,
+							"separator_after"	: false,
+							"label"				: "Copy",
+							"action"			: function (data) {
+								var inst = $.jstree.reference(data.reference),
+									obj = inst.get_node(data.reference);
+								if(inst.is_selected(obj)) {
+									inst.copy(inst.get_top_selected());
+								}
+								else {
+									inst.copy(obj);
+								}
+							}
+						},
+						"paste" : {
+							"separator_before"	: false,
+							"icon"				: false,
+							"_disabled"			: function (data) {
+								return !$.jstree.reference(data.reference).can_paste();
+							},
+							"separator_after"	: false,
+							"label"				: "Paste",
+							"action"			: function (data) {
+								var inst = $.jstree.reference(data.reference),
+									obj = inst.get_node(data.reference);
+								inst.paste(obj);
+							}
+						}
+					}
+				}
+			};
+		}
+	};
+
+	$.jstree.plugins.contextmenu = function (options, parent) {
+		this.bind = function () {
+			parent.bind.call(this);
+
+			var last_ts = 0, cto = null, ex, ey;
+			this.element
+				.on("contextmenu.jstree", ".jstree-anchor", $.proxy(function (e, data) {
+						e.preventDefault();
+						last_ts = e.ctrlKey ? +new Date() : 0;
+						if(data || cto) {
+							last_ts = (+new Date()) + 10000;
+						}
+						if(cto) {
+							clearTimeout(cto);
+						}
+						if(!this.is_loading(e.currentTarget)) {
+							this.show_contextmenu(e.currentTarget, e.pageX, e.pageY, e);
+						}
+					}, this))
+				.on("click.jstree", ".jstree-anchor", $.proxy(function (e) {
+						if(this._data.contextmenu.visible && (!last_ts || (+new Date()) - last_ts > 250)) { // work around safari & macOS ctrl+click
+							$.vakata.context.hide();
+						}
+						last_ts = 0;
+					}, this))
+				.on("touchstart.jstree", ".jstree-anchor", function (e) {
+						if(!e.originalEvent || !e.originalEvent.changedTouches || !e.originalEvent.changedTouches[0]) {
+							return;
+						}
+						ex = e.pageX;
+						ey = e.pageY;
+						cto = setTimeout(function () {
+							$(e.currentTarget).trigger('contextmenu', true);
+						}, 750);
+					})
+				.on('touchmove.vakata.jstree', function (e) {
+						if(cto && e.originalEvent && e.originalEvent.changedTouches && e.originalEvent.changedTouches[0] && (Math.abs(ex - e.pageX) > 50 || Math.abs(ey - e.pageY) > 50)) {
+							clearTimeout(cto);
+						}
+					})
+				.on('touchend.vakata.jstree', function (e) {
+						if(cto) {
+							clearTimeout(cto);
+						}
+					});
+
+			/*!
+			if(!('oncontextmenu' in document.body) && ('ontouchstart' in document.body)) {
+				var el = null, tm = null;
+				this.element
+					.on("touchstart", ".jstree-anchor", function (e) {
+						el = e.currentTarget;
+						tm = +new Date();
+						$(document).one("touchend", function (e) {
+							e.target = document.elementFromPoint(e.originalEvent.targetTouches[0].pageX - window.pageXOffset, e.originalEvent.targetTouches[0].pageY - window.pageYOffset);
+							e.currentTarget = e.target;
+							tm = ((+(new Date())) - tm);
+							if(e.target === el && tm > 600 && tm < 1000) {
+								e.preventDefault();
+								$(el).trigger('contextmenu', e);
+							}
+							el = null;
+							tm = null;
+						});
+					});
+			}
+			*/
+			$(document).on("context_hide.vakata.jstree", $.proxy(function () { this._data.contextmenu.visible = false; }, this));
+		};
+		this.teardown = function () {
+			if(this._data.contextmenu.visible) {
+				$.vakata.context.hide();
+			}
+			parent.teardown.call(this);
+		};
+
+		/**
+		 * prepare and show the context menu for a node
+		 * @name show_contextmenu(obj [, x, y])
+		 * @param {mixed} obj the node
+		 * @param {Number} x the x-coordinate relative to the document to show the menu at
+		 * @param {Number} y the y-coordinate relative to the document to show the menu at
+		 * @param {Object} e the event if available that triggered the contextmenu
+		 * @plugin contextmenu
+		 * @trigger show_contextmenu.jstree
+		 */
+		this.show_contextmenu = function (obj, x, y, e) {
+			obj = this.get_node(obj);
+			if(!obj || obj.id === $.jstree.root) { return false; }
+			var s = this.settings.contextmenu,
+				d = this.get_node(obj, true),
+				a = d.children(".jstree-anchor"),
+				o = false,
+				i = false;
+			if(s.show_at_node || x === undefined || y === undefined) {
+				o = a.offset();
+				x = o.left;
+				y = o.top + this._data.core.li_height;
+			}
+			if(this.settings.contextmenu.select_node && !this.is_selected(obj)) {
+				this.activate_node(obj, e);
+			}
+
+			i = s.items;
+			if($.isFunction(i)) {
+				i = i.call(this, obj, $.proxy(function (i) {
+					this._show_contextmenu(obj, x, y, i);
+				}, this));
+			}
+			if($.isPlainObject(i)) {
+				this._show_contextmenu(obj, x, y, i);
+			}
+		};
+		/**
+		 * show the prepared context menu for a node
+		 * @name _show_contextmenu(obj, x, y, i)
+		 * @param {mixed} obj the node
+		 * @param {Number} x the x-coordinate relative to the document to show the menu at
+		 * @param {Number} y the y-coordinate relative to the document to show the menu at
+		 * @param {Number} i the object of items to show
+		 * @plugin contextmenu
+		 * @trigger show_contextmenu.jstree
+		 * @private
+		 */
+		this._show_contextmenu = function (obj, x, y, i) {
+			var d = this.get_node(obj, true),
+				a = d.children(".jstree-anchor");
+			$(document).one("context_show.vakata.jstree", $.proxy(function (e, data) {
+				var cls = 'jstree-contextmenu jstree-' + this.get_theme() + '-contextmenu';
+				$(data.element).addClass(cls);
+			}, this));
+			this._data.contextmenu.visible = true;
+			$.vakata.context.show(a, { 'x' : x, 'y' : y }, i);
+			/**
+			 * triggered when the contextmenu is shown for a node
+			 * @event
+			 * @name show_contextmenu.jstree
+			 * @param {Object} node the node
+			 * @param {Number} x the x-coordinate of the menu relative to the document
+			 * @param {Number} y the y-coordinate of the menu relative to the document
+			 * @plugin contextmenu
+			 */
+			this.trigger('show_contextmenu', { "node" : obj, "x" : x, "y" : y });
+		};
+	};
+
+	// contextmenu helper
+	(function ($) {
+		var right_to_left = false,
+			vakata_context = {
+				element		: false,
+				reference	: false,
+				position_x	: 0,
+				position_y	: 0,
+				items		: [],
+				html		: "",
+				is_visible	: false
+			};
+
+		$.vakata.context = {
+			settings : {
+				hide_onmouseleave	: 0,
+				icons				: true
+			},
+			_trigger : function (event_name) {
+				$(document).triggerHandler("context_" + event_name + ".vakata", {
+					"reference"	: vakata_context.reference,
+					"element"	: vakata_context.element,
+					"position"	: {
+						"x" : vakata_context.position_x,
+						"y" : vakata_context.position_y
+					}
+				});
+			},
+			_execute : function (i) {
+				i = vakata_context.items[i];
+				return i && (!i._disabled || ($.isFunction(i._disabled) && !i._disabled({ "item" : i, "reference" : vakata_context.reference, "element" : vakata_context.element }))) && i.action ? i.action.call(null, {
+							"item"		: i,
+							"reference"	: vakata_context.reference,
+							"element"	: vakata_context.element,
+							"position"	: {
+								"x" : vakata_context.position_x,
+								"y" : vakata_context.position_y
+							}
+						}) : false;
+			},
+			_parse : function (o, is_callback) {
+				if(!o) { return false; }
+				if(!is_callback) {
+					vakata_context.html		= "";
+					vakata_context.items	= [];
+				}
+				var str = "",
+					sep = false,
+					tmp;
+
+				if(is_callback) { str += "<"+"ul>"; }
+				$.each(o, function (i, val) {
+					if(!val) { return true; }
+					vakata_context.items.push(val);
+					if(!sep && val.separator_before) {
+						str += "<"+"li class='vakata-context-separator'><"+"a href='#' " + ($.vakata.context.settings.icons ? '' : 'style="margin-left:0px;"') + ">&#160;<"+"/a><"+"/li>";
+					}
+					sep = false;
+					str += "<"+"li class='" + (val._class || "") + (val._disabled === true || ($.isFunction(val._disabled) && val._disabled({ "item" : val, "reference" : vakata_context.reference, "element" : vakata_context.element })) ? " vakata-contextmenu-disabled " : "") + "' "+(val.shortcut?" data-shortcut='"+val.shortcut+"' ":'')+">";
+					str += "<"+"a href='#' rel='" + (vakata_context.items.length - 1) + "'>";
+					if($.vakata.context.settings.icons) {
+						str += "<"+"i ";
+						if(val.icon) {
+							if(val.icon.indexOf("/") !== -1 || val.icon.indexOf(".") !== -1) { str += " style='background:url(\"" + val.icon + "\") center center no-repeat' "; }
+							else { str += " class='" + val.icon + "' "; }
+						}
+						str += "><"+"/i><"+"span class='vakata-contextmenu-sep'>&#160;<"+"/span>";
+					}
+					str += ($.isFunction(val.label) ? val.label({ "item" : i, "reference" : vakata_context.reference, "element" : vakata_context.element }) : val.label) + (val.shortcut?' <span class="vakata-contextmenu-shortcut vakata-contextmenu-shortcut-'+val.shortcut+'">'+ (val.shortcut_label || '') +'</span>':'') + "<"+"/a>";
+					if(val.submenu) {
+						tmp = $.vakata.context._parse(val.submenu, true);
+						if(tmp) { str += tmp; }
+					}
+					str += "<"+"/li>";
+					if(val.separator_after) {
+						str += "<"+"li class='vakata-context-separator'><"+"a href='#' " + ($.vakata.context.settings.icons ? '' : 'style="margin-left:0px;"') + ">&#160;<"+"/a><"+"/li>";
+						sep = true;
+					}
+				});
+				str  = str.replace(/<li class\='vakata-context-separator'\><\/li\>$/,"");
+				if(is_callback) { str += "</ul>"; }
+				/**
+				 * triggered on the document when the contextmenu is parsed (HTML is built)
+				 * @event
+				 * @plugin contextmenu
+				 * @name context_parse.vakata
+				 * @param {jQuery} reference the element that was right clicked
+				 * @param {jQuery} element the DOM element of the menu itself
+				 * @param {Object} position the x & y coordinates of the menu
+				 */
+				if(!is_callback) { vakata_context.html = str; $.vakata.context._trigger("parse"); }
+				return str.length > 10 ? str : false;
+			},
+			_show_submenu : function (o) {
+				o = $(o);
+				if(!o.length || !o.children("ul").length) { return; }
+				var e = o.children("ul"),
+					x = o.offset().left + o.outerWidth(),
+					y = o.offset().top,
+					w = e.width(),
+					h = e.height(),
+					dw = $(window).width() + $(window).scrollLeft(),
+					dh = $(window).height() + $(window).scrollTop();
+				// може да се спести е една проверка - дали няма някой от класовете вече нагоре
+				if(right_to_left) {
+					o[x - (w + 10 + o.outerWidth()) < 0 ? "addClass" : "removeClass"]("vakata-context-left");
+				}
+				else {
+					o[x + w + 10 > dw ? "addClass" : "removeClass"]("vakata-context-right");
+				}
+				if(y + h + 10 > dh) {
+					e.css("bottom","-1px");
+				}
+				e.show();
+			},
+			show : function (reference, position, data) {
+				var o, e, x, y, w, h, dw, dh, cond = true;
+				if(vakata_context.element && vakata_context.element.length) {
+					vakata_context.element.width('');
+				}
+				switch(cond) {
+					case (!position && !reference):
+						return false;
+					case (!!position && !!reference):
+						vakata_context.reference	= reference;
+						vakata_context.position_x	= position.x;
+						vakata_context.position_y	= position.y;
+						break;
+					case (!position && !!reference):
+						vakata_context.reference	= reference;
+						o = reference.offset();
+						vakata_context.position_x	= o.left + reference.outerHeight();
+						vakata_context.position_y	= o.top;
+						break;
+					case (!!position && !reference):
+						vakata_context.position_x	= position.x;
+						vakata_context.position_y	= position.y;
+						break;
+				}
+				if(!!reference && !data && $(reference).data('vakata_contextmenu')) {
+					data = $(reference).data('vakata_contextmenu');
+				}
+				if($.vakata.context._parse(data)) {
+					vakata_context.element.html(vakata_context.html);
+				}
+				if(vakata_context.items.length) {
+					vakata_context.element.appendTo("body");
+					e = vakata_context.element;
+					x = vakata_context.position_x;
+					y = vakata_context.position_y;
+					w = e.width();
+					h = e.height();
+					dw = $(window).width() + $(window).scrollLeft();
+					dh = $(window).height() + $(window).scrollTop();
+					if(right_to_left) {
+						x -= (e.outerWidth() - $(reference).outerWidth());
+						if(x < $(window).scrollLeft() + 20) {
+							x = $(window).scrollLeft() + 20;
+						}
+					}
+					if(x + w + 20 > dw) {
+						x = dw - (w + 20);
+					}
+					if(y + h + 20 > dh) {
+						y = dh - (h + 20);
+					}
+
+					vakata_context.element
+						.css({ "left" : x, "top" : y })
+						.show()
+						.find('a').first().focus().parent().addClass("vakata-context-hover");
+					vakata_context.is_visible = true;
+					/**
+					 * triggered on the document when the contextmenu is shown
+					 * @event
+					 * @plugin contextmenu
+					 * @name context_show.vakata
+					 * @param {jQuery} reference the element that was right clicked
+					 * @param {jQuery} element the DOM element of the menu itself
+					 * @param {Object} position the x & y coordinates of the menu
+					 */
+					$.vakata.context._trigger("show");
+				}
+			},
+			hide : function () {
+				if(vakata_context.is_visible) {
+					vakata_context.element.hide().find("ul").hide().end().find(':focus').blur().end().detach();
+					vakata_context.is_visible = false;
+					/**
+					 * triggered on the document when the contextmenu is hidden
+					 * @event
+					 * @plugin contextmenu
+					 * @name context_hide.vakata
+					 * @param {jQuery} reference the element that was right clicked
+					 * @param {jQuery} element the DOM element of the menu itself
+					 * @param {Object} position the x & y coordinates of the menu
+					 */
+					$.vakata.context._trigger("hide");
+				}
+			}
+		};
+		$(function () {
+			right_to_left = $("body").css("direction") === "rtl";
+			var to = false;
+
+			vakata_context.element = $("<ul class='vakata-context'></ul>");
+			vakata_context.element
+				.on("mouseenter", "li", function (e) {
+					e.stopImmediatePropagation();
+
+					if($.contains(this, e.relatedTarget)) {
+						// премахнато заради delegate mouseleave по-долу
+						// $(this).find(".vakata-context-hover").removeClass("vakata-context-hover");
+						return;
+					}
+
+					if(to) { clearTimeout(to); }
+					vakata_context.element.find(".vakata-context-hover").removeClass("vakata-context-hover").end();
+
+					$(this)
+						.siblings().find("ul").hide().end().end()
+						.parentsUntil(".vakata-context", "li").addBack().addClass("vakata-context-hover");
+					$.vakata.context._show_submenu(this);
+				})
+				// тестово - дали не натоварва?
+				.on("mouseleave", "li", function (e) {
+					if($.contains(this, e.relatedTarget)) { return; }
+					$(this).find(".vakata-context-hover").addBack().removeClass("vakata-context-hover");
+				})
+				.on("mouseleave", function (e) {
+					$(this).find(".vakata-context-hover").removeClass("vakata-context-hover");
+					if($.vakata.context.settings.hide_onmouseleave) {
+						to = setTimeout(
+							(function (t) {
+								return function () { $.vakata.context.hide(); };
+							}(this)), $.vakata.context.settings.hide_onmouseleave);
+					}
+				})
+				.on("click", "a", function (e) {
+					e.preventDefault();
+				//})
+				//.on("mouseup", "a", function (e) {
+					if(!$(this).blur().parent().hasClass("vakata-context-disabled") && $.vakata.context._execute($(this).attr("rel")) !== false) {
+						$.vakata.context.hide();
+					}
+				})
+				.on('keydown', 'a', function (e) {
+						var o = null;
+						switch(e.which) {
+							case 13:
+							case 32:
+								e.type = "mouseup";
+								e.preventDefault();
+								$(e.currentTarget).trigger(e);
+								break;
+							case 37:
+								if(vakata_context.is_visible) {
+									vakata_context.element.find(".vakata-context-hover").last().closest("li").first().find("ul").hide().find(".vakata-context-hover").removeClass("vakata-context-hover").end().end().children('a').focus();
+									e.stopImmediatePropagation();
+									e.preventDefault();
+								}
+								break;
+							case 38:
+								if(vakata_context.is_visible) {
+									o = vakata_context.element.find("ul:visible").addBack().last().children(".vakata-context-hover").removeClass("vakata-context-hover").prevAll("li:not(.vakata-context-separator)").first();
+									if(!o.length) { o = vakata_context.element.find("ul:visible").addBack().last().children("li:not(.vakata-context-separator)").last(); }
+									o.addClass("vakata-context-hover").children('a').focus();
+									e.stopImmediatePropagation();
+									e.preventDefault();
+								}
+								break;
+							case 39:
+								if(vakata_context.is_visible) {
+									vakata_context.element.find(".vakata-context-hover").last().children("ul").show().children("li:not(.vakata-context-separator)").removeClass("vakata-context-hover").first().addClass("vakata-context-hover").children('a').focus();
+									e.stopImmediatePropagation();
+									e.preventDefault();
+								}
+								break;
+							case 40:
+								if(vakata_context.is_visible) {
+									o = vakata_context.element.find("ul:visible").addBack().last().children(".vakata-context-hover").removeClass("vakata-context-hover").nextAll("li:not(.vakata-context-separator)").first();
+									if(!o.length) { o = vakata_context.element.find("ul:visible").addBack().last().children("li:not(.vakata-context-separator)").first(); }
+									o.addClass("vakata-context-hover").children('a').focus();
+									e.stopImmediatePropagation();
+									e.preventDefault();
+								}
+								break;
+							case 27:
+								$.vakata.context.hide();
+								e.preventDefault();
+								break;
+							default:
+								//console.log(e.which);
+								break;
+						}
+					})
+				.on('keydown', function (e) {
+					e.preventDefault();
+					var a = vakata_context.element.find('.vakata-contextmenu-shortcut-' + e.which).parent();
+					if(a.parent().not('.vakata-context-disabled')) {
+						a.click();
+					}
+				});
+
+			$(document)
+				.on("mousedown.vakata.jstree", function (e) {
+					if(vakata_context.is_visible && !$.contains(vakata_context.element[0], e.target)) {
+						$.vakata.context.hide();
+					}
+				})
+				.on("context_show.vakata.jstree", function (e, data) {
+					vakata_context.element.find("li:has(ul)").children("a").addClass("vakata-context-parent");
+					if(right_to_left) {
+						vakata_context.element.addClass("vakata-context-rtl").css("direction", "rtl");
+					}
+					// also apply a RTL class?
+					vakata_context.element.find("ul").hide().end();
+				});
+		});
+	}($));
+	// $.jstree.defaults.plugins.push("contextmenu");
+
+/**
+ * ### Drag'n'drop plugin
+ *
+ * Enables dragging and dropping of nodes in the tree, resulting in a move or copy operations.
+ */
+
+	/**
+	 * stores all defaults for the drag'n'drop plugin
+	 * @name $.jstree.defaults.dnd
+	 * @plugin dnd
+	 */
+	$.jstree.defaults.dnd = {
+		/**
+		 * a boolean indicating if a copy should be possible while dragging (by pressint the meta key or Ctrl). Defaults to `true`.
+		 * @name $.jstree.defaults.dnd.copy
+		 * @plugin dnd
+		 */
+		copy : true,
+		/**
+		 * a number indicating how long a node should remain hovered while dragging to be opened. Defaults to `500`.
+		 * @name $.jstree.defaults.dnd.open_timeout
+		 * @plugin dnd
+		 */
+		open_timeout : 500,
+		/**
+		 * a function invoked each time a node is about to be dragged, invoked in the tree's scope and receives the nodes about to be dragged as an argument (array) and the event that started the drag - return `false` to prevent dragging
+		 * @name $.jstree.defaults.dnd.is_draggable
+		 * @plugin dnd
+		 */
+		is_draggable : true,
+		/**
+		 * a boolean indicating if checks should constantly be made while the user is dragging the node (as opposed to checking only on drop), default is `true`
+		 * @name $.jstree.defaults.dnd.check_while_dragging
+		 * @plugin dnd
+		 */
+		check_while_dragging : true,
+		/**
+		 * a boolean indicating if nodes from this tree should only be copied with dnd (as opposed to moved), default is `false`
+		 * @name $.jstree.defaults.dnd.always_copy
+		 * @plugin dnd
+		 */
+		always_copy : false,
+		/**
+		 * when dropping a node "inside", this setting indicates the position the node should go to - it can be an integer or a string: "first" (same as 0) or "last", default is `0`
+		 * @name $.jstree.defaults.dnd.inside_pos
+		 * @plugin dnd
+		 */
+		inside_pos : 0,
+		/**
+		 * when starting the drag on a node that is selected this setting controls if all selected nodes are dragged or only the single node, default is `true`, which means all selected nodes are dragged when the drag is started on a selected node
+		 * @name $.jstree.defaults.dnd.drag_selection
+		 * @plugin dnd
+		 */
+		drag_selection : true,
+		/**
+		 * controls whether dnd works on touch devices. If left as boolean true dnd will work the same as in desktop browsers, which in some cases may impair scrolling. If set to boolean false dnd will not work on touch devices. There is a special third option - string "selected" which means only selected nodes can be dragged on touch devices.
+		 * @name $.jstree.defaults.dnd.touch
+		 * @plugin dnd
+		 */
+		touch : true,
+		/**
+		 * controls whether items can be dropped anywhere on the node, not just on the anchor, by default only the node anchor is a valid drop target. Works best with the wholerow plugin. If enabled on mobile depending on the interface it might be hard for the user to cancel the drop, since the whole tree container will be a valid drop target.
+		 * @name $.jstree.defaults.dnd.large_drop_target
+		 * @plugin dnd
+		 */
+		large_drop_target : false,
+		/**
+		 * controls whether a drag can be initiated from any part of the node and not just the text/icon part, works best with the wholerow plugin. Keep in mind it can cause problems with tree scrolling on mobile depending on the interface - in that case set the touch option to "selected".
+		 * @name $.jstree.defaults.dnd.large_drag_target
+		 * @plugin dnd
+		 */
+		large_drag_target : false
+	};
+	// TODO: now check works by checking for each node individually, how about max_children, unique, etc?
+	$.jstree.plugins.dnd = function (options, parent) {
+		this.bind = function () {
+			parent.bind.call(this);
+
+			this.element
+				.on('mousedown.jstree touchstart.jstree', this.settings.dnd.large_drag_target ? '.jstree-node' : '.jstree-anchor', $.proxy(function (e) {
+					if(this.settings.dnd.large_drag_target && $(e.target).closest('.jstree-node')[0] !== e.currentTarget) {
+						return true;
+					}
+					if(e.type === "touchstart" && (!this.settings.dnd.touch || (this.settings.dnd.touch === 'selected' && !$(e.currentTarget).closest('.jstree-node').children('.jstree-anchor').hasClass('jstree-clicked')))) {
+						return true;
+					}
+					var obj = this.get_node(e.target),
+						mlt = this.is_selected(obj) && this.settings.dnd.drag_selection ? this.get_top_selected().length : 1,
+						txt = (mlt > 1 ? mlt + ' ' + this.get_string('nodes') : this.get_text(e.currentTarget));
+					if(this.settings.core.force_text) {
+						txt = $.vakata.html.escape(txt);
+					}
+					if(obj && obj.id && obj.id !== $.jstree.root && (e.which === 1 || e.type === "touchstart") &&
+						(this.settings.dnd.is_draggable === true || ($.isFunction(this.settings.dnd.is_draggable) && this.settings.dnd.is_draggable.call(this, (mlt > 1 ? this.get_top_selected(true) : [obj]), e)))
+					) {
+						this.element.trigger('mousedown.jstree');
+						return $.vakata.dnd.start(e, { 'jstree' : true, 'origin' : this, 'obj' : this.get_node(obj,true), 'nodes' : mlt > 1 ? this.get_top_selected() : [obj.id] }, '<div id="jstree-dnd" class="jstree-' + this.get_theme() + ' jstree-' + this.get_theme() + '-' + this.get_theme_variant() + ' ' + ( this.settings.core.themes.responsive ? ' jstree-dnd-responsive' : '' ) + '"><i class="jstree-icon jstree-er"></i>' + txt + '<ins class="jstree-copy" style="display:none;">+</ins></div>');
+					}
+				}, this));
+		};
+	};
+
+	$(function() {
+		// bind only once for all instances
+		var lastmv = false,
+			laster = false,
+			lastev = false,
+			opento = false,
+			marker = $('<div id="jstree-marker">&#160;</div>').hide(); //.appendTo('body');
+
+		$(document)
+			.on('dnd_start.vakata.jstree', function (e, data) {
+				lastmv = false;
+				lastev = false;
+				if(!data || !data.data || !data.data.jstree) { return; }
+				marker.appendTo('body'); //.show();
+			})
+			.on('dnd_move.vakata.jstree', function (e, data) {
+				if(opento) { clearTimeout(opento); }
+				if(!data || !data.data || !data.data.jstree) { return; }
+
+				// if we are hovering the marker image do nothing (can happen on "inside" drags)
+				if(data.event.target.id && data.event.target.id === 'jstree-marker') {
+					return;
+				}
+				lastev = data.event;
+
+				var ins = $.jstree.reference(data.event.target),
+					ref = false,
+					off = false,
+					rel = false,
+					tmp, l, t, h, p, i, o, ok, t1, t2, op, ps, pr, ip, tm;
+				// if we are over an instance
+				if(ins && ins._data && ins._data.dnd) {
+					marker.attr('class', 'jstree-' + ins.get_theme() + ( ins.settings.core.themes.responsive ? ' jstree-dnd-responsive' : '' ));
+					data.helper
+						.children().attr('class', 'jstree-' + ins.get_theme() + ' jstree-' + ins.get_theme() + '-' + ins.get_theme_variant() + ' ' + ( ins.settings.core.themes.responsive ? ' jstree-dnd-responsive' : '' ))
+						.find('.jstree-copy').first()[ data.data.origin && (data.data.origin.settings.dnd.always_copy || (data.data.origin.settings.dnd.copy && (data.event.metaKey || data.event.ctrlKey))) ? 'show' : 'hide' ]();
+
+
+					// if are hovering the container itself add a new root node
+					if( (data.event.target === ins.element[0] || data.event.target === ins.get_container_ul()[0]) && ins.get_container_ul().children().length === 0) {
+						ok = true;
+						for(t1 = 0, t2 = data.data.nodes.length; t1 < t2; t1++) {
+							ok = ok && ins.check( (data.data.origin && (data.data.origin.settings.dnd.always_copy || (data.data.origin.settings.dnd.copy && (data.event.metaKey || data.event.ctrlKey)) ) ? "copy_node" : "move_node"), (data.data.origin && data.data.origin !== ins ? data.data.origin.get_node(data.data.nodes[t1]) : data.data.nodes[t1]), $.jstree.root, 'last', { 'dnd' : true, 'ref' : ins.get_node($.jstree.root), 'pos' : 'i', 'origin' : data.data.origin, 'is_multi' : (data.data.origin && data.data.origin !== ins), 'is_foreign' : (!data.data.origin) });
+							if(!ok) { break; }
+						}
+						if(ok) {
+							lastmv = { 'ins' : ins, 'par' : $.jstree.root, 'pos' : 'last' };
+							marker.hide();
+							data.helper.find('.jstree-icon').first().removeClass('jstree-er').addClass('jstree-ok');
+							return;
+						}
+					}
+					else {
+						// if we are hovering a tree node
+						ref = ins.settings.dnd.large_drop_target ? $(data.event.target).closest('.jstree-node').children('.jstree-anchor') : $(data.event.target).closest('.jstree-anchor');
+						if(ref && ref.length && ref.parent().is('.jstree-closed, .jstree-open, .jstree-leaf')) {
+							off = ref.offset();
+							rel = data.event.pageY - off.top;
+							h = ref.outerHeight();
+							if(rel < h / 3) {
+								o = ['b', 'i', 'a'];
+							}
+							else if(rel > h - h / 3) {
+								o = ['a', 'i', 'b'];
+							}
+							else {
+								o = rel > h / 2 ? ['i', 'a', 'b'] : ['i', 'b', 'a'];
+							}
+							$.each(o, function (j, v) {
+								switch(v) {
+									case 'b':
+										l = off.left - 6;
+										t = off.top;
+										p = ins.get_parent(ref);
+										i = ref.parent().index();
+										break;
+									case 'i':
+										ip = ins.settings.dnd.inside_pos;
+										tm = ins.get_node(ref.parent());
+										l = off.left - 2;
+										t = off.top + h / 2 + 1;
+										p = tm.id;
+										i = ip === 'first' ? 0 : (ip === 'last' ? tm.children.length : Math.min(ip, tm.children.length));
+										break;
+									case 'a':
+										l = off.left - 6;
+										t = off.top + h;
+										p = ins.get_parent(ref);
+										i = ref.parent().index() + 1;
+										break;
+								}
+								ok = true;
+								for(t1 = 0, t2 = data.data.nodes.length; t1 < t2; t1++) {
+									op = data.data.origin && (data.data.origin.settings.dnd.always_copy || (data.data.origin.settings.dnd.copy && (data.event.metaKey || data.event.ctrlKey))) ? "copy_node" : "move_node";
+									ps = i;
+									if(op === "move_node" && v === 'a' && (data.data.origin && data.data.origin === ins) && p === ins.get_parent(data.data.nodes[t1])) {
+										pr = ins.get_node(p);
+										if(ps > $.inArray(data.data.nodes[t1], pr.children)) {
+											ps -= 1;
+										}
+									}
+									ok = ok && ( (ins && ins.settings && ins.settings.dnd && ins.settings.dnd.check_while_dragging === false) || ins.check(op, (data.data.origin && data.data.origin !== ins ? data.data.origin.get_node(data.data.nodes[t1]) : data.data.nodes[t1]), p, ps, { 'dnd' : true, 'ref' : ins.get_node(ref.parent()), 'pos' : v, 'origin' : data.data.origin, 'is_multi' : (data.data.origin && data.data.origin !== ins), 'is_foreign' : (!data.data.origin) }) );
+									if(!ok) {
+										if(ins && ins.last_error) { laster = ins.last_error(); }
+										break;
+									}
+								}
+								if(v === 'i' && ref.parent().is('.jstree-closed') && ins.settings.dnd.open_timeout) {
+									opento = setTimeout((function (x, z) { return function () { x.open_node(z); }; }(ins, ref)), ins.settings.dnd.open_timeout);
+								}
+								if(ok) {
+									lastmv = { 'ins' : ins, 'par' : p, 'pos' : v === 'i' && ip === 'last' && i === 0 && !ins.is_loaded(tm) ? 'last' : i };
+									marker.css({ 'left' : l + 'px', 'top' : t + 'px' }).show();
+									data.helper.find('.jstree-icon').first().removeClass('jstree-er').addClass('jstree-ok');
+									laster = {};
+									o = true;
+									return false;
+								}
+							});
+							if(o === true) { return; }
+						}
+					}
+				}
+				lastmv = false;
+				data.helper.find('.jstree-icon').removeClass('jstree-ok').addClass('jstree-er');
+				marker.hide();
+			})
+			.on('dnd_scroll.vakata.jstree', function (e, data) {
+				if(!data || !data.data || !data.data.jstree) { return; }
+				marker.hide();
+				lastmv = false;
+				lastev = false;
+				data.helper.find('.jstree-icon').first().removeClass('jstree-ok').addClass('jstree-er');
+			})
+			.on('dnd_stop.vakata.jstree', function (e, data) {
+				if(opento) { clearTimeout(opento); }
+				if(!data || !data.data || !data.data.jstree) { return; }
+				marker.hide().detach();
+				var i, j, nodes = [];
+				if(lastmv) {
+					for(i = 0, j = data.data.nodes.length; i < j; i++) {
+						nodes[i] = data.data.origin ? data.data.origin.get_node(data.data.nodes[i]) : data.data.nodes[i];
+					}
+					lastmv.ins[ data.data.origin && (data.data.origin.settings.dnd.always_copy || (data.data.origin.settings.dnd.copy && (data.event.metaKey || data.event.ctrlKey))) ? 'copy_node' : 'move_node' ](nodes, lastmv.par, lastmv.pos, false, false, false, data.data.origin);
+				}
+				else {
+					i = $(data.event.target).closest('.jstree');
+					if(i.length && laster && laster.error && laster.error === 'check') {
+						i = i.jstree(true);
+						if(i) {
+							i.settings.core.error.call(this, laster);
+						}
+					}
+				}
+				lastev = false;
+				lastmv = false;
+			})
+			.on('keyup.jstree keydown.jstree', function (e, data) {
+				data = $.vakata.dnd._get();
+				if(data && data.data && data.data.jstree) {
+					data.helper.find('.jstree-copy').first()[ data.data.origin && (data.data.origin.settings.dnd.always_copy || (data.data.origin.settings.dnd.copy && (e.metaKey || e.ctrlKey))) ? 'show' : 'hide' ]();
+					if(lastev) {
+						lastev.metaKey = e.metaKey;
+						lastev.ctrlKey = e.ctrlKey;
+						$.vakata.dnd._trigger('move', lastev);
+					}
+				}
+			});
+	});
+
+	// helpers
+	(function ($) {
+		$.vakata.html = {
+			div : $('<div />'),
+			escape : function (str) {
+				return $.vakata.html.div.text(str).html();
+			},
+			strip : function (str) {
+				return $.vakata.html.div.empty().append($.parseHTML(str)).text();
+			}
+		};
+		// private variable
+		var vakata_dnd = {
+			element	: false,
+			target	: false,
+			is_down	: false,
+			is_drag	: false,
+			helper	: false,
+			helper_w: 0,
+			data	: false,
+			init_x	: 0,
+			init_y	: 0,
+			scroll_l: 0,
+			scroll_t: 0,
+			scroll_e: false,
+			scroll_i: false,
+			is_touch: false
+		};
+		$.vakata.dnd = {
+			settings : {
+				scroll_speed		: 10,
+				scroll_proximity	: 20,
+				helper_left			: 5,
+				helper_top			: 10,
+				threshold			: 5,
+				threshold_touch		: 50
+			},
+			_trigger : function (event_name, e) {
+				var data = $.vakata.dnd._get();
+				data.event = e;
+				$(document).triggerHandler("dnd_" + event_name + ".vakata", data);
+			},
+			_get : function () {
+				return {
+					"data"		: vakata_dnd.data,
+					"element"	: vakata_dnd.element,
+					"helper"	: vakata_dnd.helper
+				};
+			},
+			_clean : function () {
+				if(vakata_dnd.helper) { vakata_dnd.helper.remove(); }
+				if(vakata_dnd.scroll_i) { clearInterval(vakata_dnd.scroll_i); vakata_dnd.scroll_i = false; }
+				vakata_dnd = {
+					element	: false,
+					target	: false,
+					is_down	: false,
+					is_drag	: false,
+					helper	: false,
+					helper_w: 0,
+					data	: false,
+					init_x	: 0,
+					init_y	: 0,
+					scroll_l: 0,
+					scroll_t: 0,
+					scroll_e: false,
+					scroll_i: false,
+					is_touch: false
+				};
+				$(document).off("mousemove.vakata.jstree touchmove.vakata.jstree", $.vakata.dnd.drag);
+				$(document).off("mouseup.vakata.jstree touchend.vakata.jstree", $.vakata.dnd.stop);
+			},
+			_scroll : function (init_only) {
+				if(!vakata_dnd.scroll_e || (!vakata_dnd.scroll_l && !vakata_dnd.scroll_t)) {
+					if(vakata_dnd.scroll_i) { clearInterval(vakata_dnd.scroll_i); vakata_dnd.scroll_i = false; }
+					return false;
+				}
+				if(!vakata_dnd.scroll_i) {
+					vakata_dnd.scroll_i = setInterval($.vakata.dnd._scroll, 100);
+					return false;
+				}
+				if(init_only === true) { return false; }
+
+				var i = vakata_dnd.scroll_e.scrollTop(),
+					j = vakata_dnd.scroll_e.scrollLeft();
+				vakata_dnd.scroll_e.scrollTop(i + vakata_dnd.scroll_t * $.vakata.dnd.settings.scroll_speed);
+				vakata_dnd.scroll_e.scrollLeft(j + vakata_dnd.scroll_l * $.vakata.dnd.settings.scroll_speed);
+				if(i !== vakata_dnd.scroll_e.scrollTop() || j !== vakata_dnd.scroll_e.scrollLeft()) {
+					/**
+					 * triggered on the document when a drag causes an element to scroll
+					 * @event
+					 * @plugin dnd
+					 * @name dnd_scroll.vakata
+					 * @param {Mixed} data any data supplied with the call to $.vakata.dnd.start
+					 * @param {DOM} element the DOM element being dragged
+					 * @param {jQuery} helper the helper shown next to the mouse
+					 * @param {jQuery} event the element that is scrolling
+					 */
+					$.vakata.dnd._trigger("scroll", vakata_dnd.scroll_e);
+				}
+			},
+			start : function (e, data, html) {
+				if(e.type === "touchstart" && e.originalEvent && e.originalEvent.changedTouches && e.originalEvent.changedTouches[0]) {
+					e.pageX = e.originalEvent.changedTouches[0].pageX;
+					e.pageY = e.originalEvent.changedTouches[0].pageY;
+					e.target = document.elementFromPoint(e.originalEvent.changedTouches[0].pageX - window.pageXOffset, e.originalEvent.changedTouches[0].pageY - window.pageYOffset);
+				}
+				if(vakata_dnd.is_drag) { $.vakata.dnd.stop({}); }
+				try {
+					e.currentTarget.unselectable = "on";
+					e.currentTarget.onselectstart = function() { return false; };
+					if(e.currentTarget.style) { e.currentTarget.style.MozUserSelect = "none"; }
+				} catch(ignore) { }
+				vakata_dnd.init_x	= e.pageX;
+				vakata_dnd.init_y	= e.pageY;
+				vakata_dnd.data		= data;
+				vakata_dnd.is_down	= true;
+				vakata_dnd.element	= e.currentTarget;
+				vakata_dnd.target	= e.target;
+				vakata_dnd.is_touch	= e.type === "touchstart";
+				if(html !== false) {
+					vakata_dnd.helper = $("<div id='vakata-dnd'></div>").html(html).css({
+						"display"		: "block",
+						"margin"		: "0",
+						"padding"		: "0",
+						"position"		: "absolute",
+						"top"			: "-2000px",
+						"lineHeight"	: "16px",
+						"zIndex"		: "10000"
+					});
+				}
+				$(document).on("mousemove.vakata.jstree touchmove.vakata.jstree", $.vakata.dnd.drag);
+				$(document).on("mouseup.vakata.jstree touchend.vakata.jstree", $.vakata.dnd.stop);
+				return false;
+			},
+			drag : function (e) {
+				if(e.type === "touchmove" && e.originalEvent && e.originalEvent.changedTouches && e.originalEvent.changedTouches[0]) {
+					e.pageX = e.originalEvent.changedTouches[0].pageX;
+					e.pageY = e.originalEvent.changedTouches[0].pageY;
+					e.target = document.elementFromPoint(e.originalEvent.changedTouches[0].pageX - window.pageXOffset, e.originalEvent.changedTouches[0].pageY - window.pageYOffset);
+				}
+				if(!vakata_dnd.is_down) { return; }
+				if(!vakata_dnd.is_drag) {
+					if(
+						Math.abs(e.pageX - vakata_dnd.init_x) > (vakata_dnd.is_touch ? $.vakata.dnd.settings.threshold_touch : $.vakata.dnd.settings.threshold) ||
+						Math.abs(e.pageY - vakata_dnd.init_y) > (vakata_dnd.is_touch ? $.vakata.dnd.settings.threshold_touch : $.vakata.dnd.settings.threshold)
+					) {
+						if(vakata_dnd.helper) {
+							vakata_dnd.helper.appendTo("body");
+							vakata_dnd.helper_w = vakata_dnd.helper.outerWidth();
+						}
+						vakata_dnd.is_drag = true;
+						/**
+						 * triggered on the document when a drag starts
+						 * @event
+						 * @plugin dnd
+						 * @name dnd_start.vakata
+						 * @param {Mixed} data any data supplied with the call to $.vakata.dnd.start
+						 * @param {DOM} element the DOM element being dragged
+						 * @param {jQuery} helper the helper shown next to the mouse
+						 * @param {Object} event the event that caused the start (probably mousemove)
+						 */
+						$.vakata.dnd._trigger("start", e);
+					}
+					else { return; }
+				}
+
+				var d  = false, w  = false,
+					dh = false, wh = false,
+					dw = false, ww = false,
+					dt = false, dl = false,
+					ht = false, hl = false;
+
+				vakata_dnd.scroll_t = 0;
+				vakata_dnd.scroll_l = 0;
+				vakata_dnd.scroll_e = false;
+				$($(e.target).parentsUntil("body").addBack().get().reverse())
+					.filter(function () {
+						return	(/^auto|scroll$/).test($(this).css("overflow")) &&
+								(this.scrollHeight > this.offsetHeight || this.scrollWidth > this.offsetWidth);
+					})
+					.each(function () {
+						var t = $(this), o = t.offset();
+						if(this.scrollHeight > this.offsetHeight) {
+							if(o.top + t.height() - e.pageY < $.vakata.dnd.settings.scroll_proximity)	{ vakata_dnd.scroll_t = 1; }
+							if(e.pageY - o.top < $.vakata.dnd.settings.scroll_proximity)				{ vakata_dnd.scroll_t = -1; }
+						}
+						if(this.scrollWidth > this.offsetWidth) {
+							if(o.left + t.width() - e.pageX < $.vakata.dnd.settings.scroll_proximity)	{ vakata_dnd.scroll_l = 1; }
+							if(e.pageX - o.left < $.vakata.dnd.settings.scroll_proximity)				{ vakata_dnd.scroll_l = -1; }
+						}
+						if(vakata_dnd.scroll_t || vakata_dnd.scroll_l) {
+							vakata_dnd.scroll_e = $(this);
+							return false;
+						}
+					});
+
+				if(!vakata_dnd.scroll_e) {
+					d  = $(document); w = $(window);
+					dh = d.height(); wh = w.height();
+					dw = d.width(); ww = w.width();
+					dt = d.scrollTop(); dl = d.scrollLeft();
+					if(dh > wh && e.pageY - dt < $.vakata.dnd.settings.scroll_proximity)		{ vakata_dnd.scroll_t = -1;  }
+					if(dh > wh && wh - (e.pageY - dt) < $.vakata.dnd.settings.scroll_proximity)	{ vakata_dnd.scroll_t = 1; }
+					if(dw > ww && e.pageX - dl < $.vakata.dnd.settings.scroll_proximity)		{ vakata_dnd.scroll_l = -1; }
+					if(dw > ww && ww - (e.pageX - dl) < $.vakata.dnd.settings.scroll_proximity)	{ vakata_dnd.scroll_l = 1; }
+					if(vakata_dnd.scroll_t || vakata_dnd.scroll_l) {
+						vakata_dnd.scroll_e = d;
+					}
+				}
+				if(vakata_dnd.scroll_e) { $.vakata.dnd._scroll(true); }
+
+				if(vakata_dnd.helper) {
+					ht = parseInt(e.pageY + $.vakata.dnd.settings.helper_top, 10);
+					hl = parseInt(e.pageX + $.vakata.dnd.settings.helper_left, 10);
+					if(dh && ht + 25 > dh) { ht = dh - 50; }
+					if(dw && hl + vakata_dnd.helper_w > dw) { hl = dw - (vakata_dnd.helper_w + 2); }
+					vakata_dnd.helper.css({
+						left	: hl + "px",
+						top		: ht + "px"
+					});
+				}
+				/**
+				 * triggered on the document when a drag is in progress
+				 * @event
+				 * @plugin dnd
+				 * @name dnd_move.vakata
+				 * @param {Mixed} data any data supplied with the call to $.vakata.dnd.start
+				 * @param {DOM} element the DOM element being dragged
+				 * @param {jQuery} helper the helper shown next to the mouse
+				 * @param {Object} event the event that caused this to trigger (most likely mousemove)
+				 */
+				$.vakata.dnd._trigger("move", e);
+				return false;
+			},
+			stop : function (e) {
+				if(e.type === "touchend" && e.originalEvent && e.originalEvent.changedTouches && e.originalEvent.changedTouches[0]) {
+					e.pageX = e.originalEvent.changedTouches[0].pageX;
+					e.pageY = e.originalEvent.changedTouches[0].pageY;
+					e.target = document.elementFromPoint(e.originalEvent.changedTouches[0].pageX - window.pageXOffset, e.originalEvent.changedTouches[0].pageY - window.pageYOffset);
+				}
+				if(vakata_dnd.is_drag) {
+					/**
+					 * triggered on the document when a drag stops (the dragged element is dropped)
+					 * @event
+					 * @plugin dnd
+					 * @name dnd_stop.vakata
+					 * @param {Mixed} data any data supplied with the call to $.vakata.dnd.start
+					 * @param {DOM} element the DOM element being dragged
+					 * @param {jQuery} helper the helper shown next to the mouse
+					 * @param {Object} event the event that caused the stop
+					 */
+					$.vakata.dnd._trigger("stop", e);
+				}
+				else {
+					if(e.type === "touchend" && e.target === vakata_dnd.target) {
+						var to = setTimeout(function () { $(e.target).click(); }, 100);
+						$(e.target).one('click', function() { if(to) { clearTimeout(to); } });
+					}
+				}
+				$.vakata.dnd._clean();
+				return false;
+			}
+		};
+	}($));
+
+	// include the dnd plugin by default
+	// $.jstree.defaults.plugins.push("dnd");
+
+
+/**
+ * ### Massload plugin
+ *
+ * Adds massload functionality to jsTree, so that multiple nodes can be loaded in a single request (only useful with lazy loading).
+ */
+
+	/**
+	 * massload configuration
+	 *
+	 * It is possible to set this to a standard jQuery-like AJAX config.
+	 * In addition to the standard jQuery ajax options here you can supply functions for `data` and `url`, the functions will be run in the current instance's scope and a param will be passed indicating which node IDs need to be loaded, the return value of those functions will be used.
+	 *
+	 * You can also set this to a function, that function will receive the node IDs being loaded as argument and a second param which is a function (callback) which should be called with the result.
+	 *
+	 * Both the AJAX and the function approach rely on the same return value - an object where the keys are the node IDs, and the value is the children of that node as an array.
+	 *
+	 *	{
+	 *		"id1" : [{ "text" : "Child of ID1", "id" : "c1" }, { "text" : "Another child of ID1", "id" : "c2" }],
+	 *		"id2" : [{ "text" : "Child of ID2", "id" : "c3" }]
+	 *	}
+	 * 
+	 * @name $.jstree.defaults.massload
+	 * @plugin massload
+	 */
+	$.jstree.defaults.massload = null;
+	$.jstree.plugins.massload = function (options, parent) {
+		this.init = function (el, options) {
+			parent.init.call(this, el, options);
+			this._data.massload = {};
+		};
+		this._load_nodes = function (nodes, callback, is_callback) {
+			var s = this.settings.massload;
+			if(is_callback && !$.isEmptyObject(this._data.massload)) {
+				return parent._load_nodes.call(this, nodes, callback, is_callback);
+			}
+			if($.isFunction(s)) {
+				return s.call(this, nodes, $.proxy(function (data) {
+					if(data) {
+						for(var i in data) {
+							if(data.hasOwnProperty(i)) {
+								this._data.massload[i] = data[i];
+							}
+						}
+					}
+					parent._load_nodes.call(this, nodes, callback, is_callback);
+				}, this));
+			}
+			if(typeof s === 'object' && s && s.url) {
+				s = $.extend(true, {}, s);
+				if($.isFunction(s.url)) {
+					s.url = s.url.call(this, nodes);
+				}
+				if($.isFunction(s.data)) {
+					s.data = s.data.call(this, nodes);
+				}
+				return $.ajax(s)
+					.done($.proxy(function (data,t,x) {
+							if(data) {
+								for(var i in data) {
+									if(data.hasOwnProperty(i)) {
+										this._data.massload[i] = data[i];
+									}
+								}
+							}
+							parent._load_nodes.call(this, nodes, callback, is_callback);
+						}, this))
+					.fail($.proxy(function (f) {
+							parent._load_nodes.call(this, nodes, callback, is_callback);
+						}, this));
+			}
+			return parent._load_nodes.call(this, nodes, callback, is_callback);
+		};
+		this._load_node = function (obj, callback) {
+			var d = this._data.massload[obj.id];
+			if(d) {
+				return this[typeof d === 'string' ? '_append_html_data' : '_append_json_data'](obj, typeof d === 'string' ? $($.parseHTML(d)).filter(function () { return this.nodeType !== 3; }) : d, function (status) {
+					callback.call(this, status);
+					delete this._data.massload[obj.id];
+				});
+			}
+			return parent._load_node.call(this, obj, callback);
+		};
+	};
+
+/**
+ * ### Search plugin
+ *
+ * Adds search functionality to jsTree.
+ */
+
+	/**
+	 * stores all defaults for the search plugin
+	 * @name $.jstree.defaults.search
+	 * @plugin search
+	 */
+	$.jstree.defaults.search = {
+		/**
+		 * a jQuery-like AJAX config, which jstree uses if a server should be queried for results. 
+		 * 
+		 * A `str` (which is the search string) parameter will be added with the request, an optional `inside` parameter will be added if the search is limited to a node id. The expected result is a JSON array with nodes that need to be opened so that matching nodes will be revealed.
+		 * Leave this setting as `false` to not query the server. You can also set this to a function, which will be invoked in the instance's scope and receive 3 parameters - the search string, the callback to call with the array of nodes to load, and the optional node ID to limit the search to 
+		 * @name $.jstree.defaults.search.ajax
+		 * @plugin search
+		 */
+		ajax : false,
+		/**
+		 * Indicates if the search should be fuzzy or not (should `chnd3` match `child node 3`). Default is `false`.
+		 * @name $.jstree.defaults.search.fuzzy
+		 * @plugin search
+		 */
+		fuzzy : false,
+		/**
+		 * Indicates if the search should be case sensitive. Default is `false`.
+		 * @name $.jstree.defaults.search.case_sensitive
+		 * @plugin search
+		 */
+		case_sensitive : false,
+		/**
+		 * Indicates if the tree should be filtered (by default) to show only matching nodes (keep in mind this can be a heavy on large trees in old browsers). 
+		 * This setting can be changed at runtime when calling the search method. Default is `false`.
+		 * @name $.jstree.defaults.search.show_only_matches
+		 * @plugin search
+		 */
+		show_only_matches : false,
+		/**
+		 * Indicates if the children of matched element are shown (when show_only_matches is true)
+		 * This setting can be changed at runtime when calling the search method. Default is `false`.
+		 * @name $.jstree.defaults.search.show_only_matches_children
+		 * @plugin search
+		 */
+		show_only_matches_children : false,
+		/**
+		 * Indicates if all nodes opened to reveal the search result, should be closed when the search is cleared or a new search is performed. Default is `true`.
+		 * @name $.jstree.defaults.search.close_opened_onclear
+		 * @plugin search
+		 */
+		close_opened_onclear : true,
+		/**
+		 * Indicates if only leaf nodes should be included in search results. Default is `false`.
+		 * @name $.jstree.defaults.search.search_leaves_only
+		 * @plugin search
+		 */
+		search_leaves_only : false,
+		/**
+		 * If set to a function it wil be called in the instance's scope with two arguments - search string and node (where node will be every node in the structure, so use with caution).
+		 * If the function returns a truthy value the node will be considered a match (it might not be displayed if search_only_leaves is set to true and the node is not a leaf). Default is `false`.
+		 * @name $.jstree.defaults.search.search_callback
+		 * @plugin search
+		 */
+		search_callback : false
+	};
+
+	$.jstree.plugins.search = function (options, parent) {
+		this.bind = function () {
+			parent.bind.call(this);
+
+			this._data.search.str = "";
+			this._data.search.dom = $();
+			this._data.search.res = [];
+			this._data.search.opn = [];
+			this._data.search.som = false;
+			this._data.search.smc = false;
+			this._data.search.hdn = [];
+
+			this.element
+				.on("search.jstree", $.proxy(function (e, data) {
+						if(this._data.search.som && data.res.length) {
+							var m = this._model.data, i, j, p = [];
+							for(i = 0, j = data.res.length; i < j; i++) {
+								if(m[data.res[i]] && !m[data.res[i]].state.hidden) {
+									p.push(data.res[i]);
+									p = p.concat(m[data.res[i]].parents);
+									if(this._data.search.smc) {
+										p = p.concat(m[data.res[i]].children_d);
+									}
+								}
+							}
+							p = $.vakata.array_remove_item($.vakata.array_unique(p), $.jstree.root);
+							this._data.search.hdn = this.hide_all(true);
+							this.show_node(p);
+						}
+					}, this))
+				.on("clear_search.jstree", $.proxy(function (e, data) {
+						if(this._data.search.som && data.res.length) {
+							this.show_node(this._data.search.hdn);
+						}
+					}, this));
+		};
+		/**
+		 * used to search the tree nodes for a given string
+		 * @name search(str [, skip_async])
+		 * @param {String} str the search string
+		 * @param {Boolean} skip_async if set to true server will not be queried even if configured
+		 * @param {Boolean} show_only_matches if set to true only matching nodes will be shown (keep in mind this can be very slow on large trees or old browsers)
+		 * @param {mixed} inside an optional node to whose children to limit the search
+		 * @param {Boolean} append if set to true the results of this search are appended to the previous search
+		 * @plugin search
+		 * @trigger search.jstree
+		 */
+		this.search = function (str, skip_async, show_only_matches, inside, append, show_only_matches_children) {
+			if(str === false || $.trim(str.toString()) === "") {
+				return this.clear_search();
+			}
+			inside = this.get_node(inside);
+			inside = inside && inside.id ? inside.id : null;
+			str = str.toString();
+			var s = this.settings.search,
+				a = s.ajax ? s.ajax : false,
+				m = this._model.data,
+				f = null,
+				r = [],
+				p = [], i, j;
+			if(this._data.search.res.length && !append) {
+				this.clear_search();
+			}
+			if(show_only_matches === undefined) {
+				show_only_matches = s.show_only_matches;
+			}
+			if(show_only_matches_children === undefined) {
+				show_only_matches_children = s.show_only_matches_children;
+			}
+			if(!skip_async && a !== false) {
+				if($.isFunction(a)) {
+					return a.call(this, str, $.proxy(function (d) {
+							if(d && d.d) { d = d.d; }
+							this._load_nodes(!$.isArray(d) ? [] : $.vakata.array_unique(d), function () {
+								this.search(str, true, show_only_matches, inside, append);
+							}, true);
+						}, this), inside);
+				}
+				else {
+					a = $.extend({}, a);
+					if(!a.data) { a.data = {}; }
+					a.data.str = str;
+					if(inside) {
+						a.data.inside = inside;
+					}
+					return $.ajax(a)
+						.fail($.proxy(function () {
+							this._data.core.last_error = { 'error' : 'ajax', 'plugin' : 'search', 'id' : 'search_01', 'reason' : 'Could not load search parents', 'data' : JSON.stringify(a) };
+							this.settings.core.error.call(this, this._data.core.last_error);
+						}, this))
+						.done($.proxy(function (d) {
+							if(d && d.d) { d = d.d; }
+							this._load_nodes(!$.isArray(d) ? [] : $.vakata.array_unique(d), function () {
+								this.search(str, true, show_only_matches, inside, append);
+							}, true);
+						}, this));
+				}
+			}
+			if(!append) {
+				this._data.search.str = str;
+				this._data.search.dom = $();
+				this._data.search.res = [];
+				this._data.search.opn = [];
+				this._data.search.som = show_only_matches;
+				this._data.search.smc = show_only_matches_children;
+			}
+
+			f = new $.vakata.search(str, true, { caseSensitive : s.case_sensitive, fuzzy : s.fuzzy });
+			$.each(m[inside ? inside : $.jstree.root].children_d, function (ii, i) {
+				var v = m[i];
+				if(v.text && (!s.search_leaves_only || (v.state.loaded && v.children.length === 0)) && ( (s.search_callback && s.search_callback.call(this, str, v)) || (!s.search_callback && f.search(v.text).isMatch) ) ) {
+					r.push(i);
+					p = p.concat(v.parents);
+				}
+			});
+			if(r.length) {
+				p = $.vakata.array_unique(p);
+				for(i = 0, j = p.length; i < j; i++) {
+					if(p[i] !== $.jstree.root && m[p[i]] && this.open_node(p[i], null, 0) === true) {
+						this._data.search.opn.push(p[i]);
+					}
+				}
+				if(!append) {
+					this._data.search.dom = $(this.element[0].querySelectorAll('#' + $.map(r, function (v) { return "0123456789".indexOf(v[0]) !== -1 ? '\\3' + v[0] + ' ' + v.substr(1).replace($.jstree.idregex,'\\$&') : v.replace($.jstree.idregex,'\\$&'); }).join(', #')));
+					this._data.search.res = r;
+				}
+				else {
+					this._data.search.dom = this._data.search.dom.add($(this.element[0].querySelectorAll('#' + $.map(r, function (v) { return "0123456789".indexOf(v[0]) !== -1 ? '\\3' + v[0] + ' ' + v.substr(1).replace($.jstree.idregex,'\\$&') : v.replace($.jstree.idregex,'\\$&'); }).join(', #'))));
+					this._data.search.res = $.vakata.array_unique(this._data.search.res.concat(r));
+				}
+				this._data.search.dom.children(".jstree-anchor").addClass('jstree-search');
+			}
+			/**
+			 * triggered after search is complete
+			 * @event
+			 * @name search.jstree
+			 * @param {jQuery} nodes a jQuery collection of matching nodes
+			 * @param {String} str the search string
+			 * @param {Array} res a collection of objects represeing the matching nodes
+			 * @plugin search
+			 */
+			this.trigger('search', { nodes : this._data.search.dom, str : str, res : this._data.search.res, show_only_matches : show_only_matches });
+		};
+		/**
+		 * used to clear the last search (removes classes and shows all nodes if filtering is on)
+		 * @name clear_search()
+		 * @plugin search
+		 * @trigger clear_search.jstree
+		 */
+		this.clear_search = function () {
+			if(this.settings.search.close_opened_onclear) {
+				this.close_node(this._data.search.opn, 0);
+			}
+			/**
+			 * triggered after search is complete
+			 * @event
+			 * @name clear_search.jstree
+			 * @param {jQuery} nodes a jQuery collection of matching nodes (the result from the last search)
+			 * @param {String} str the search string (the last search string)
+			 * @param {Array} res a collection of objects represeing the matching nodes (the result from the last search)
+			 * @plugin search
+			 */
+			this.trigger('clear_search', { 'nodes' : this._data.search.dom, str : this._data.search.str, res : this._data.search.res });
+			if(this._data.search.res.length) {
+				this._data.search.dom = $(this.element[0].querySelectorAll('#' + $.map(this._data.search.res, function (v) {
+					return "0123456789".indexOf(v[0]) !== -1 ? '\\3' + v[0] + ' ' + v.substr(1).replace($.jstree.idregex,'\\$&') : v.replace($.jstree.idregex,'\\$&');
+				}).join(', #')));
+				this._data.search.dom.children(".jstree-anchor").removeClass("jstree-search");
+			}
+			this._data.search.str = "";
+			this._data.search.res = [];
+			this._data.search.opn = [];
+			this._data.search.dom = $();
+		};
+
+		this.redraw_node = function(obj, deep, callback, force_render) {
+			obj = parent.redraw_node.apply(this, arguments);
+			if(obj) {
+				if($.inArray(obj.id, this._data.search.res) !== -1) {
+					var i, j, tmp = null;
+					for(i = 0, j = obj.childNodes.length; i < j; i++) {
+						if(obj.childNodes[i] && obj.childNodes[i].className && obj.childNodes[i].className.indexOf("jstree-anchor") !== -1) {
+							tmp = obj.childNodes[i];
+							break;
+						}
+					}
+					if(tmp) {
+						tmp.className += ' jstree-search';
+					}
+				}
+			}
+			return obj;
+		};
+	};
+
+	// helpers
+	(function ($) {
+		// from http://kiro.me/projects/fuse.html
+		$.vakata.search = function(pattern, txt, options) {
+			options = options || {};
+			options = $.extend({}, $.vakata.search.defaults, options);
+			if(options.fuzzy !== false) {
+				options.fuzzy = true;
+			}
+			pattern = options.caseSensitive ? pattern : pattern.toLowerCase();
+			var MATCH_LOCATION	= options.location,
+				MATCH_DISTANCE	= options.distance,
+				MATCH_THRESHOLD	= options.threshold,
+				patternLen = pattern.length,
+				matchmask, pattern_alphabet, match_bitapScore, search;
+			if(patternLen > 32) {
+				options.fuzzy = false;
+			}
+			if(options.fuzzy) {
+				matchmask = 1 << (patternLen - 1);
+				pattern_alphabet = (function () {
+					var mask = {},
+						i = 0;
+					for (i = 0; i < patternLen; i++) {
+						mask[pattern.charAt(i)] = 0;
+					}
+					for (i = 0; i < patternLen; i++) {
+						mask[pattern.charAt(i)] |= 1 << (patternLen - i - 1);
+					}
+					return mask;
+				}());
+				match_bitapScore = function (e, x) {
+					var accuracy = e / patternLen,
+						proximity = Math.abs(MATCH_LOCATION - x);
+					if(!MATCH_DISTANCE) {
+						return proximity ? 1.0 : accuracy;
+					}
+					return accuracy + (proximity / MATCH_DISTANCE);
+				};
+			}
+			search = function (text) {
+				text = options.caseSensitive ? text : text.toLowerCase();
+				if(pattern === text || text.indexOf(pattern) !== -1) {
+					return {
+						isMatch: true,
+						score: 0
+					};
+				}
+				if(!options.fuzzy) {
+					return {
+						isMatch: false,
+						score: 1
+					};
+				}
+				var i, j,
+					textLen = text.length,
+					scoreThreshold = MATCH_THRESHOLD,
+					bestLoc = text.indexOf(pattern, MATCH_LOCATION),
+					binMin, binMid,
+					binMax = patternLen + textLen,
+					lastRd, start, finish, rd, charMatch,
+					score = 1,
+					locations = [];
+				if (bestLoc !== -1) {
+					scoreThreshold = Math.min(match_bitapScore(0, bestLoc), scoreThreshold);
+					bestLoc = text.lastIndexOf(pattern, MATCH_LOCATION + patternLen);
+					if (bestLoc !== -1) {
+						scoreThreshold = Math.min(match_bitapScore(0, bestLoc), scoreThreshold);
+					}
+				}
+				bestLoc = -1;
+				for (i = 0; i < patternLen; i++) {
+					binMin = 0;
+					binMid = binMax;
+					while (binMin < binMid) {
+						if (match_bitapScore(i, MATCH_LOCATION + binMid) <= scoreThreshold) {
+							binMin = binMid;
+						} else {
+							binMax = binMid;
+						}
+						binMid = Math.floor((binMax - binMin) / 2 + binMin);
+					}
+					binMax = binMid;
+					start = Math.max(1, MATCH_LOCATION - binMid + 1);
+					finish = Math.min(MATCH_LOCATION + binMid, textLen) + patternLen;
+					rd = new Array(finish + 2);
+					rd[finish + 1] = (1 << i) - 1;
+					for (j = finish; j >= start; j--) {
+						charMatch = pattern_alphabet[text.charAt(j - 1)];
+						if (i === 0) {
+							rd[j] = ((rd[j + 1] << 1) | 1) & charMatch;
+						} else {
+							rd[j] = ((rd[j + 1] << 1) | 1) & charMatch | (((lastRd[j + 1] | lastRd[j]) << 1) | 1) | lastRd[j + 1];
+						}
+						if (rd[j] & matchmask) {
+							score = match_bitapScore(i, j - 1);
+							if (score <= scoreThreshold) {
+								scoreThreshold = score;
+								bestLoc = j - 1;
+								locations.push(bestLoc);
+								if (bestLoc > MATCH_LOCATION) {
+									start = Math.max(1, 2 * MATCH_LOCATION - bestLoc);
+								} else {
+									break;
+								}
+							}
+						}
+					}
+					if (match_bitapScore(i + 1, MATCH_LOCATION) > scoreThreshold) {
+						break;
+					}
+					lastRd = rd;
+				}
+				return {
+					isMatch: bestLoc >= 0,
+					score: score
+				};
+			};
+			return txt === true ? { 'search' : search } : search(txt);
+		};
+		$.vakata.search.defaults = {
+			location : 0,
+			distance : 100,
+			threshold : 0.6,
+			fuzzy : false,
+			caseSensitive : false
+		};
+	}($));
+
+	// include the search plugin by default
+	// $.jstree.defaults.plugins.push("search");
+
+
+/**
+ * ### Sort plugin
+ *
+ * Automatically sorts all siblings in the tree according to a sorting function.
+ */
+
+	/**
+	 * the settings function used to sort the nodes.
+	 * It is executed in the tree's context, accepts two nodes as arguments and should return `1` or `-1`.
+	 * @name $.jstree.defaults.sort
+	 * @plugin sort
+	 */
+	$.jstree.defaults.sort = function (a, b) {
+		//return this.get_type(a) === this.get_type(b) ? (this.get_text(a) > this.get_text(b) ? 1 : -1) : this.get_type(a) >= this.get_type(b);
+		return this.get_text(a) > this.get_text(b) ? 1 : -1;
+	};
+	$.jstree.plugins.sort = function (options, parent) {
+		this.bind = function () {
+			parent.bind.call(this);
+			this.element
+				.on("model.jstree", $.proxy(function (e, data) {
+						this.sort(data.parent, true);
+					}, this))
+				.on("rename_node.jstree create_node.jstree", $.proxy(function (e, data) {
+						this.sort(data.parent || data.node.parent, false);
+						this.redraw_node(data.parent || data.node.parent, true);
+					}, this))
+				.on("move_node.jstree copy_node.jstree", $.proxy(function (e, data) {
+						this.sort(data.parent, false);
+						this.redraw_node(data.parent, true);
+					}, this));
+		};
+		/**
+		 * used to sort a node's children
+		 * @private
+		 * @name sort(obj [, deep])
+		 * @param  {mixed} obj the node
+		 * @param {Boolean} deep if set to `true` nodes are sorted recursively.
+		 * @plugin sort
+		 * @trigger search.jstree
+		 */
+		this.sort = function (obj, deep) {
+			var i, j;
+			obj = this.get_node(obj);
+			if(obj && obj.children && obj.children.length) {
+				obj.children.sort($.proxy(this.settings.sort, this));
+				if(deep) {
+					for(i = 0, j = obj.children_d.length; i < j; i++) {
+						this.sort(obj.children_d[i], false);
+					}
+				}
+			}
+		};
+	};
+
+	// include the sort plugin by default
+	// $.jstree.defaults.plugins.push("sort");
+
+/**
+ * ### State plugin
+ *
+ * Saves the state of the tree (selected nodes, opened nodes) on the user's computer using available options (localStorage, cookies, etc)
+ */
+
+	var to = false;
+	/**
+	 * stores all defaults for the state plugin
+	 * @name $.jstree.defaults.state
+	 * @plugin state
+	 */
+	$.jstree.defaults.state = {
+		/**
+		 * A string for the key to use when saving the current tree (change if using multiple trees in your project). Defaults to `jstree`.
+		 * @name $.jstree.defaults.state.key
+		 * @plugin state
+		 */
+		key		: 'jstree',
+		/**
+		 * A space separated list of events that trigger a state save. Defaults to `changed.jstree open_node.jstree close_node.jstree`.
+		 * @name $.jstree.defaults.state.events
+		 * @plugin state
+		 */
+		events	: 'changed.jstree open_node.jstree close_node.jstree check_node.jstree uncheck_node.jstree',
+		/**
+		 * Time in milliseconds after which the state will expire. Defaults to 'false' meaning - no expire.
+		 * @name $.jstree.defaults.state.ttl
+		 * @plugin state
+		 */
+		ttl		: false,
+		/**
+		 * A function that will be executed prior to restoring state with one argument - the state object. Can be used to clear unwanted parts of the state.
+		 * @name $.jstree.defaults.state.filter
+		 * @plugin state
+		 */
+		filter	: false
+	};
+	$.jstree.plugins.state = function (options, parent) {
+		this.bind = function () {
+			parent.bind.call(this);
+			var bind = $.proxy(function () {
+				this.element.on(this.settings.state.events, $.proxy(function () {
+					if(to) { clearTimeout(to); }
+					to = setTimeout($.proxy(function () { this.save_state(); }, this), 100);
+				}, this));
+				/**
+				 * triggered when the state plugin is finished restoring the state (and immediately after ready if there is no state to restore).
+				 * @event
+				 * @name state_ready.jstree
+				 * @plugin state
+				 */
+				this.trigger('state_ready');
+			}, this);
+			this.element
+				.on("ready.jstree", $.proxy(function (e, data) {
+						this.element.one("restore_state.jstree", bind);
+						if(!this.restore_state()) { bind(); }
+					}, this));
+		};
+		/**
+		 * save the state
+		 * @name save_state()
+		 * @plugin state
+		 */
+		this.save_state = function () {
+			var st = { 'state' : this.get_state(), 'ttl' : this.settings.state.ttl, 'sec' : +(new Date()) };
+			$.vakata.storage.set(this.settings.state.key, JSON.stringify(st));
+		};
+		/**
+		 * restore the state from the user's computer
+		 * @name restore_state()
+		 * @plugin state
+		 */
+		this.restore_state = function () {
+			var k = $.vakata.storage.get(this.settings.state.key);
+			if(!!k) { try { k = JSON.parse(k); } catch(ex) { return false; } }
+			if(!!k && k.ttl && k.sec && +(new Date()) - k.sec > k.ttl) { return false; }
+			if(!!k && k.state) { k = k.state; }
+			if(!!k && $.isFunction(this.settings.state.filter)) { k = this.settings.state.filter.call(this, k); }
+			if(!!k) {
+				this.element.one("set_state.jstree", function (e, data) { data.instance.trigger('restore_state', { 'state' : $.extend(true, {}, k) }); });
+				this.set_state(k);
+				return true;
+			}
+			return false;
+		};
+		/**
+		 * clear the state on the user's computer
+		 * @name clear_state()
+		 * @plugin state
+		 */
+		this.clear_state = function () {
+			return $.vakata.storage.del(this.settings.state.key);
+		};
+	};
+
+	(function ($, undefined) {
+		$.vakata.storage = {
+			// simply specifying the functions in FF throws an error
+			set : function (key, val) { return window.localStorage.setItem(key, val); },
+			get : function (key) { return window.localStorage.getItem(key); },
+			del : function (key) { return window.localStorage.removeItem(key); }
+		};
+	}($));
+
+	// include the state plugin by default
+	// $.jstree.defaults.plugins.push("state");
+
+/**
+ * ### Types plugin
+ *
+ * Makes it possible to add predefined types for groups of nodes, which make it possible to easily control nesting rules and icon for each group.
+ */
+
+	/**
+	 * An object storing all types as key value pairs, where the key is the type name and the value is an object that could contain following keys (all optional).
+	 *
+	 * * `max_children` the maximum number of immediate children this node type can have. Do not specify or set to `-1` for unlimited.
+	 * * `max_depth` the maximum number of nesting this node type can have. A value of `1` would mean that the node can have children, but no grandchildren. Do not specify or set to `-1` for unlimited.
+	 * * `valid_children` an array of node type strings, that nodes of this type can have as children. Do not specify or set to `-1` for no limits.
+	 * * `icon` a string - can be a path to an icon or a className, if using an image that is in the current directory use a `./` prefix, otherwise it will be detected as a class. Omit to use the default icon from your theme.
+	 *
+	 * There are two predefined types:
+	 *
+	 * * `#` represents the root of the tree, for example `max_children` would control the maximum number of root nodes.
+	 * * `default` represents the default node - any settings here will be applied to all nodes that do not have a type specified.
+	 *
+	 * @name $.jstree.defaults.types
+	 * @plugin types
+	 */
+	$.jstree.defaults.types = {
+		'default' : {}
+	};
+	$.jstree.defaults.types[$.jstree.root] = {};
+
+	$.jstree.plugins.types = function (options, parent) {
+		this.init = function (el, options) {
+			var i, j;
+			if(options && options.types && options.types['default']) {
+				for(i in options.types) {
+					if(i !== "default" && i !== $.jstree.root && options.types.hasOwnProperty(i)) {
+						for(j in options.types['default']) {
+							if(options.types['default'].hasOwnProperty(j) && options.types[i][j] === undefined) {
+								options.types[i][j] = options.types['default'][j];
+							}
+						}
+					}
+				}
+			}
+			parent.init.call(this, el, options);
+			this._model.data[$.jstree.root].type = $.jstree.root;
+		};
+		this.refresh = function (skip_loading, forget_state) {
+			parent.refresh.call(this, skip_loading, forget_state);
+			this._model.data[$.jstree.root].type = $.jstree.root;
+		};
+		this.bind = function () {
+			this.element
+				.on('model.jstree', $.proxy(function (e, data) {
+						var m = this._model.data,
+							dpc = data.nodes,
+							t = this.settings.types,
+							i, j, c = 'default';
+						for(i = 0, j = dpc.length; i < j; i++) {
+							c = 'default';
+							if(m[dpc[i]].original && m[dpc[i]].original.type && t[m[dpc[i]].original.type]) {
+								c = m[dpc[i]].original.type;
+							}
+							if(m[dpc[i]].data && m[dpc[i]].data.jstree && m[dpc[i]].data.jstree.type && t[m[dpc[i]].data.jstree.type]) {
+								c = m[dpc[i]].data.jstree.type;
+							}
+							m[dpc[i]].type = c;
+							if(m[dpc[i]].icon === true && t[c].icon !== undefined) {
+								m[dpc[i]].icon = t[c].icon;
+							}
+						}
+						m[$.jstree.root].type = $.jstree.root;
+					}, this));
+			parent.bind.call(this);
+		};
+		this.get_json = function (obj, options, flat) {
+			var i, j,
+				m = this._model.data,
+				opt = options ? $.extend(true, {}, options, {no_id:false}) : {},
+				tmp = parent.get_json.call(this, obj, opt, flat);
+			if(tmp === false) { return false; }
+			if($.isArray(tmp)) {
+				for(i = 0, j = tmp.length; i < j; i++) {
+					tmp[i].type = tmp[i].id && m[tmp[i].id] && m[tmp[i].id].type ? m[tmp[i].id].type : "default";
+					if(options && options.no_id) {
+						delete tmp[i].id;
+						if(tmp[i].li_attr && tmp[i].li_attr.id) {
+							delete tmp[i].li_attr.id;
+						}
+						if(tmp[i].a_attr && tmp[i].a_attr.id) {
+							delete tmp[i].a_attr.id;
+						}
+					}
+				}
+			}
+			else {
+				tmp.type = tmp.id && m[tmp.id] && m[tmp.id].type ? m[tmp.id].type : "default";
+				if(options && options.no_id) {
+					tmp = this._delete_ids(tmp);
+				}
+			}
+			return tmp;
+		};
+		this._delete_ids = function (tmp) {
+			if($.isArray(tmp)) {
+				for(var i = 0, j = tmp.length; i < j; i++) {
+					tmp[i] = this._delete_ids(tmp[i]);
+				}
+				return tmp;
+			}
+			delete tmp.id;
+			if(tmp.li_attr && tmp.li_attr.id) {
+				delete tmp.li_attr.id;
+			}
+			if(tmp.a_attr && tmp.a_attr.id) {
+				delete tmp.a_attr.id;
+			}
+			if(tmp.children && $.isArray(tmp.children)) {
+				tmp.children = this._delete_ids(tmp.children);
+			}
+			return tmp;
+		};
+		this.check = function (chk, obj, par, pos, more) {
+			if(parent.check.call(this, chk, obj, par, pos, more) === false) { return false; }
+			obj = obj && obj.id ? obj : this.get_node(obj);
+			par = par && par.id ? par : this.get_node(par);
+			var m = obj && obj.id ? (more && more.origin ? more.origin : $.jstree.reference(obj.id)) : null, tmp, d, i, j;
+			m = m && m._model && m._model.data ? m._model.data : null;
+			switch(chk) {
+				case "create_node":
+				case "move_node":
+				case "copy_node":
+					if(chk !== 'move_node' || $.inArray(obj.id, par.children) === -1) {
+						tmp = this.get_rules(par);
+						if(tmp.max_children !== undefined && tmp.max_children !== -1 && tmp.max_children === par.children.length) {
+							this._data.core.last_error = { 'error' : 'check', 'plugin' : 'types', 'id' : 'types_01', 'reason' : 'max_children prevents function: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
+							return false;
+						}
+						if(tmp.valid_children !== undefined && tmp.valid_children !== -1 && $.inArray((obj.type || 'default'), tmp.valid_children) === -1) {
+							this._data.core.last_error = { 'error' : 'check', 'plugin' : 'types', 'id' : 'types_02', 'reason' : 'valid_children prevents function: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
+							return false;
+						}
+						if(m && obj.children_d && obj.parents) {
+							d = 0;
+							for(i = 0, j = obj.children_d.length; i < j; i++) {
+								d = Math.max(d, m[obj.children_d[i]].parents.length);
+							}
+							d = d - obj.parents.length + 1;
+						}
+						if(d <= 0 || d === undefined) { d = 1; }
+						do {
+							if(tmp.max_depth !== undefined && tmp.max_depth !== -1 && tmp.max_depth < d) {
+								this._data.core.last_error = { 'error' : 'check', 'plugin' : 'types', 'id' : 'types_03', 'reason' : 'max_depth prevents function: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
+								return false;
+							}
+							par = this.get_node(par.parent);
+							tmp = this.get_rules(par);
+							d++;
+						} while(par);
+					}
+					break;
+			}
+			return true;
+		};
+		/**
+		 * used to retrieve the type settings object for a node
+		 * @name get_rules(obj)
+		 * @param {mixed} obj the node to find the rules for
+		 * @return {Object}
+		 * @plugin types
+		 */
+		this.get_rules = function (obj) {
+			obj = this.get_node(obj);
+			if(!obj) { return false; }
+			var tmp = this.get_type(obj, true);
+			if(tmp.max_depth === undefined) { tmp.max_depth = -1; }
+			if(tmp.max_children === undefined) { tmp.max_children = -1; }
+			if(tmp.valid_children === undefined) { tmp.valid_children = -1; }
+			return tmp;
+		};
+		/**
+		 * used to retrieve the type string or settings object for a node
+		 * @name get_type(obj [, rules])
+		 * @param {mixed} obj the node to find the rules for
+		 * @param {Boolean} rules if set to `true` instead of a string the settings object will be returned
+		 * @return {String|Object}
+		 * @plugin types
+		 */
+		this.get_type = function (obj, rules) {
+			obj = this.get_node(obj);
+			return (!obj) ? false : ( rules ? $.extend({ 'type' : obj.type }, this.settings.types[obj.type]) : obj.type);
+		};
+		/**
+		 * used to change a node's type
+		 * @name set_type(obj, type)
+		 * @param {mixed} obj the node to change
+		 * @param {String} type the new type
+		 * @plugin types
+		 */
+		this.set_type = function (obj, type) {
+			var t, t1, t2, old_type, old_icon;
+			if($.isArray(obj)) {
+				obj = obj.slice();
+				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+					this.set_type(obj[t1], type);
+				}
+				return true;
+			}
+			t = this.settings.types;
+			obj = this.get_node(obj);
+			if(!t[type] || !obj) { return false; }
+			old_type = obj.type;
+			old_icon = this.get_icon(obj);
+			obj.type = type;
+			if(old_icon === true || (t[old_type] && t[old_type].icon !== undefined && old_icon === t[old_type].icon)) {
+				this.set_icon(obj, t[type].icon !== undefined ? t[type].icon : true);
+			}
+			return true;
+		};
+	};
+	// include the types plugin by default
+	// $.jstree.defaults.plugins.push("types");
+
+/**
+ * ### Unique plugin
+ *
+ * Enforces that no nodes with the same name can coexist as siblings.
+ */
+
+	/**
+	 * stores all defaults for the unique plugin
+	 * @name $.jstree.defaults.unique
+	 * @plugin unique
+	 */
+	$.jstree.defaults.unique = {
+		/**
+		 * Indicates if the comparison should be case sensitive. Default is `false`.
+		 * @name $.jstree.defaults.unique.case_sensitive
+		 * @plugin unique
+		 */
+		case_sensitive : false,
+		/**
+		 * A callback executed in the instance's scope when a new node is created and the name is already taken, the two arguments are the conflicting name and the counter. The default will produce results like `New node (2)`.
+		 * @name $.jstree.defaults.unique.duplicate
+		 * @plugin unique
+		 */
+		duplicate : function (name, counter) {
+			return name + ' (' + counter + ')';
+		}
+	};
+
+	$.jstree.plugins.unique = function (options, parent) {
+		this.check = function (chk, obj, par, pos, more) {
+			if(parent.check.call(this, chk, obj, par, pos, more) === false) { return false; }
+			obj = obj && obj.id ? obj : this.get_node(obj);
+			par = par && par.id ? par : this.get_node(par);
+			if(!par || !par.children) { return true; }
+			var n = chk === "rename_node" ? pos : obj.text,
+				c = [],
+				s = this.settings.unique.case_sensitive,
+				m = this._model.data, i, j;
+			for(i = 0, j = par.children.length; i < j; i++) {
+				c.push(s ? m[par.children[i]].text : m[par.children[i]].text.toLowerCase());
+			}
+			if(!s) { n = n.toLowerCase(); }
+			switch(chk) {
+				case "delete_node":
+					return true;
+				case "rename_node":
+					i = ($.inArray(n, c) === -1 || (obj.text && obj.text[ s ? 'toString' : 'toLowerCase']() === n));
+					if(!i) {
+						this._data.core.last_error = { 'error' : 'check', 'plugin' : 'unique', 'id' : 'unique_01', 'reason' : 'Child with name ' + n + ' already exists. Preventing: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
+					}
+					return i;
+				case "create_node":
+					i = ($.inArray(n, c) === -1);
+					if(!i) {
+						this._data.core.last_error = { 'error' : 'check', 'plugin' : 'unique', 'id' : 'unique_04', 'reason' : 'Child with name ' + n + ' already exists. Preventing: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
+					}
+					return i;
+				case "copy_node":
+					i = ($.inArray(n, c) === -1);
+					if(!i) {
+						this._data.core.last_error = { 'error' : 'check', 'plugin' : 'unique', 'id' : 'unique_02', 'reason' : 'Child with name ' + n + ' already exists. Preventing: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
+					}
+					return i;
+				case "move_node":
+					i = ( (obj.parent === par.id && (!more || !more.is_multi)) || $.inArray(n, c) === -1);
+					if(!i) {
+						this._data.core.last_error = { 'error' : 'check', 'plugin' : 'unique', 'id' : 'unique_03', 'reason' : 'Child with name ' + n + ' already exists. Preventing: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
+					}
+					return i;
+			}
+			return true;
+		};
+		this.create_node = function (par, node, pos, callback, is_loaded) {
+			if(!node || node.text === undefined) {
+				if(par === null) {
+					par = $.jstree.root;
+				}
+				par = this.get_node(par);
+				if(!par) {
+					return parent.create_node.call(this, par, node, pos, callback, is_loaded);
+				}
+				pos = pos === undefined ? "last" : pos;
+				if(!pos.toString().match(/^(before|after)$/) && !is_loaded && !this.is_loaded(par)) {
+					return parent.create_node.call(this, par, node, pos, callback, is_loaded);
+				}
+				if(!node) { node = {}; }
+				var tmp, n, dpc, i, j, m = this._model.data, s = this.settings.unique.case_sensitive, cb = this.settings.unique.duplicate;
+				n = tmp = this.get_string('New node');
+				dpc = [];
+				for(i = 0, j = par.children.length; i < j; i++) {
+					dpc.push(s ? m[par.children[i]].text : m[par.children[i]].text.toLowerCase());
+				}
+				i = 1;
+				while($.inArray(s ? n : n.toLowerCase(), dpc) !== -1) {
+					n = cb.call(this, tmp, (++i)).toString();
+				}
+				node.text = n;
+			}
+			return parent.create_node.call(this, par, node, pos, callback, is_loaded);
+		};
+	};
+
+	// include the unique plugin by default
+	// $.jstree.defaults.plugins.push("unique");
+
+
+/**
+ * ### Wholerow plugin
+ *
+ * Makes each node appear block level. Making selection easier. May cause slow down for large trees in old browsers.
+ */
+
+	var div = document.createElement('DIV');
+	div.setAttribute('unselectable','on');
+	div.setAttribute('role','presentation');
+	div.className = 'jstree-wholerow';
+	div.innerHTML = '&#160;';
+	$.jstree.plugins.wholerow = function (options, parent) {
+		this.bind = function () {
+			parent.bind.call(this);
+
+			this.element
+				.on('ready.jstree set_state.jstree', $.proxy(function () {
+						this.hide_dots();
+					}, this))
+				.on("init.jstree loading.jstree ready.jstree", $.proxy(function () {
+						//div.style.height = this._data.core.li_height + 'px';
+						this.get_container_ul().addClass('jstree-wholerow-ul');
+					}, this))
+				.on("deselect_all.jstree", $.proxy(function (e, data) {
+						this.element.find('.jstree-wholerow-clicked').removeClass('jstree-wholerow-clicked');
+					}, this))
+				.on("changed.jstree", $.proxy(function (e, data) {
+						this.element.find('.jstree-wholerow-clicked').removeClass('jstree-wholerow-clicked');
+						var tmp = false, i, j;
+						for(i = 0, j = data.selected.length; i < j; i++) {
+							tmp = this.get_node(data.selected[i], true);
+							if(tmp && tmp.length) {
+								tmp.children('.jstree-wholerow').addClass('jstree-wholerow-clicked');
+							}
+						}
+					}, this))
+				.on("open_node.jstree", $.proxy(function (e, data) {
+						this.get_node(data.node, true).find('.jstree-clicked').parent().children('.jstree-wholerow').addClass('jstree-wholerow-clicked');
+					}, this))
+				.on("hover_node.jstree dehover_node.jstree", $.proxy(function (e, data) {
+						if(e.type === "hover_node" && this.is_disabled(data.node)) { return; }
+						this.get_node(data.node, true).children('.jstree-wholerow')[e.type === "hover_node"?"addClass":"removeClass"]('jstree-wholerow-hovered');
+					}, this))
+				.on("contextmenu.jstree", ".jstree-wholerow", $.proxy(function (e) {
+						e.preventDefault();
+						var tmp = $.Event('contextmenu', { metaKey : e.metaKey, ctrlKey : e.ctrlKey, altKey : e.altKey, shiftKey : e.shiftKey, pageX : e.pageX, pageY : e.pageY });
+						$(e.currentTarget).closest(".jstree-node").children(".jstree-anchor").first().trigger(tmp);
+					}, this))
+				/*!
+				.on("mousedown.jstree touchstart.jstree", ".jstree-wholerow", function (e) {
+						if(e.target === e.currentTarget) {
+							var a = $(e.currentTarget).closest(".jstree-node").children(".jstree-anchor");
+							e.target = a[0];
+							a.trigger(e);
+						}
+					})
+				*/
+				.on("click.jstree", ".jstree-wholerow", function (e) {
+						e.stopImmediatePropagation();
+						var tmp = $.Event('click', { metaKey : e.metaKey, ctrlKey : e.ctrlKey, altKey : e.altKey, shiftKey : e.shiftKey });
+						$(e.currentTarget).closest(".jstree-node").children(".jstree-anchor").first().trigger(tmp).focus();
+					})
+				.on("click.jstree", ".jstree-leaf > .jstree-ocl", $.proxy(function (e) {
+						e.stopImmediatePropagation();
+						var tmp = $.Event('click', { metaKey : e.metaKey, ctrlKey : e.ctrlKey, altKey : e.altKey, shiftKey : e.shiftKey });
+						$(e.currentTarget).closest(".jstree-node").children(".jstree-anchor").first().trigger(tmp).focus();
+					}, this))
+				.on("mouseover.jstree", ".jstree-wholerow, .jstree-icon", $.proxy(function (e) {
+						e.stopImmediatePropagation();
+						if(!this.is_disabled(e.currentTarget)) {
+							this.hover_node(e.currentTarget);
+						}
+						return false;
+					}, this))
+				.on("mouseleave.jstree", ".jstree-node", $.proxy(function (e) {
+						this.dehover_node(e.currentTarget);
+					}, this));
+		};
+		this.teardown = function () {
+			if(this.settings.wholerow) {
+				this.element.find(".jstree-wholerow").remove();
+			}
+			parent.teardown.call(this);
+		};
+		this.redraw_node = function(obj, deep, callback, force_render) {
+			obj = parent.redraw_node.apply(this, arguments);
+			if(obj) {
+				var tmp = div.cloneNode(true);
+				//tmp.style.height = this._data.core.li_height + 'px';
+				if($.inArray(obj.id, this._data.core.selected) !== -1) { tmp.className += ' jstree-wholerow-clicked'; }
+				if(this._data.core.focused && this._data.core.focused === obj.id) { tmp.className += ' jstree-wholerow-hovered'; }
+				obj.insertBefore(tmp, obj.childNodes[0]);
+			}
+			return obj;
+		};
+	};
+	// include the wholerow plugin by default
+	// $.jstree.defaults.plugins.push("wholerow");
+	if(document.registerElement && Object && Object.create) {
+		var proto = Object.create(HTMLElement.prototype);
+		proto.createdCallback = function () {
+			var c = { core : {}, plugins : [] }, i;
+			for(i in $.jstree.plugins) {
+				if($.jstree.plugins.hasOwnProperty(i) && this.attributes[i]) {
+					c.plugins.push(i);
+					if(this.getAttribute(i) && JSON.parse(this.getAttribute(i))) {
+						c[i] = JSON.parse(this.getAttribute(i));
+					}
+				}
+			}
+			for(i in $.jstree.defaults.core) {
+				if($.jstree.defaults.core.hasOwnProperty(i) && this.attributes[i]) {
+					c.core[i] = JSON.parse(this.getAttribute(i)) || this.getAttribute(i);
+				}
+			}
+			$(this).jstree(c);
+		};
+		// proto.attributeChangedCallback = function (name, previous, value) { };
+		try {
+			document.registerElement("vakata-jstree", { prototype: proto });
+		} catch(ignore) { }
+	}
+
+}));
\ No newline at end of file
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/jstree.min.js b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/jstree.min.js
new file mode 100755
index 00000000000..30b73e79c79
--- /dev/null
+++ b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/jstree.min.js
@@ -0,0 +1,5 @@
+/*! jsTree - v3.2.1 - 2015-08-24 - (MIT) */
+!function(a){"use strict";"function"==typeof define&&define.amd?define(["jquery"],a):"undefined"!=typeof module&&module.exports?module.exports=a(require("jquery")):a(jQuery)}(function(a,b){"use strict";if(!a.jstree){var c=0,d=!1,e=!1,f=!1,g=[],h=a("script:last").attr("src"),i=window.document,j=i.createElement("LI"),k,l;j.setAttribute("role","treeitem"),k=i.createElement("I"),k.className="jstree-icon jstree-ocl",k.setAttribute("role","presentation"),j.appendChild(k),k=i.createElement("A"),k.className="jstree-anchor",k.setAttribute("href","#"),k.setAttribute("tabindex","-1"),l=i.createElement("I"),l.className="jstree-icon jstree-themeicon",l.setAttribute("role","presentation"),k.appendChild(l),j.appendChild(k),k=l=null,a.jstree={version:"3.2.1",defaults:{plugins:[]},plugins:{},path:h&&-1!==h.indexOf("/")?h.replace(/\/[^\/]+$/,""):"",idregex:/[\\:&!^|()\[\]<>@*'+~#";.,=\- \/${}%?`]/g,root:"#"},a.jstree.create=function(b,d){var e=new a.jstree.core(++c),f=d;return d=a.extend(!0,{},a.jstree.defaults,d),f&&f.plugins&&(d.plugins=f.plugins),a.each(d.plugins,function(a,b){"core"!==a&&(e=e.plugin(b,d[b]))}),a(b).data("jstree",e),e.init(b,d),e},a.jstree.destroy=function(){a(".jstree:jstree").jstree("destroy"),a(i).off(".jstree")},a.jstree.core=function(a){this._id=a,this._cnt=0,this._wrk=null,this._data={core:{themes:{name:!1,dots:!1,icons:!1},selected:[],last_error:{},working:!1,worker_queue:[],focused:null}}},a.jstree.reference=function(b){var c=null,d=null;if(!b||!b.id||b.tagName&&b.nodeType||(b=b.id),!d||!d.length)try{d=a(b)}catch(e){}if(!d||!d.length)try{d=a("#"+b.replace(a.jstree.idregex,"\\$&"))}catch(e){}return d&&d.length&&(d=d.closest(".jstree")).length&&(d=d.data("jstree"))?c=d:a(".jstree").each(function(){var d=a(this).data("jstree");return d&&d._model.data[b]?(c=d,!1):void 0}),c},a.fn.jstree=function(c){var d="string"==typeof c,e=Array.prototype.slice.call(arguments,1),f=null;return c!==!0||this.length?(this.each(function(){var g=a.jstree.reference(this),h=d&&g?g[c]:null;return f=d&&h?h.apply(g,e):null,g||d||c!==b&&!a.isPlainObject(c)||a.jstree.create(this,c),(g&&!d||c===!0)&&(f=g||!1),null!==f&&f!==b?!1:void 0}),null!==f&&f!==b?f:this):!1},a.expr[":"].jstree=a.expr.createPseudo(function(c){return function(c){return a(c).hasClass("jstree")&&a(c).data("jstree")!==b}}),a.jstree.defaults.core={data:!1,strings:!1,check_callback:!1,error:a.noop,animation:200,multiple:!0,themes:{name:!1,url:!1,dir:!1,dots:!0,icons:!0,stripes:!1,variant:!1,responsive:!1},expand_selected_onload:!0,worker:!0,force_text:!1,dblclick_toggle:!0},a.jstree.core.prototype={plugin:function(b,c){var d=a.jstree.plugins[b];return d?(this._data[b]={},d.prototype=this,new d(c,this)):this},init:function(b,c){this._model={data:{},changed:[],force_full_redraw:!1,redraw_timeout:!1,default_state:{loaded:!0,opened:!1,selected:!1,disabled:!1}},this._model.data[a.jstree.root]={id:a.jstree.root,parent:null,parents:[],children:[],children_d:[],state:{loaded:!1}},this.element=a(b).addClass("jstree jstree-"+this._id),this.settings=c,this._data.core.ready=!1,this._data.core.loaded=!1,this._data.core.rtl="rtl"===this.element.css("direction"),this.element[this._data.core.rtl?"addClass":"removeClass"]("jstree-rtl"),this.element.attr("role","tree"),this.settings.core.multiple&&this.element.attr("aria-multiselectable",!0),this.element.attr("tabindex")||this.element.attr("tabindex","0"),this.bind(),this.trigger("init"),this._data.core.original_container_html=this.element.find(" > ul > li").clone(!0),this._data.core.original_container_html.find("li").addBack().contents().filter(function(){return 3===this.nodeType&&(!this.nodeValue||/^\s+$/.test(this.nodeValue))}).remove(),this.element.html("<ul class='jstree-container-ul jstree-children' role='group'><li id='j"+this._id+"_loading' class='jstree-initial-node jstree-loading jstree-leaf jstree-last' role='tree-item'><i class='jstree-icon jstree-ocl'></i><a class='jstree-anchor' href='#'><i class='jstree-icon jstree-themeicon-hidden'></i>"+this.get_string("Loading ...")+"</a></li></ul>"),this.element.attr("aria-activedescendant","j"+this._id+"_loading"),this._data.core.li_height=this.get_container_ul().children("li").first().height()||24,this.trigger("loading"),this.load_node(a.jstree.root)},destroy:function(a){if(this._wrk)try{window.URL.revokeObjectURL(this._wrk),this._wrk=null}catch(b){}a||this.element.empty(),this.teardown()},teardown:function(){this.unbind(),this.element.removeClass("jstree").removeData("jstree").find("[class^='jstree']").addBack().attr("class",function(){return this.className.replace(/jstree[^ ]*|$/gi,"")}),this.element=null},bind:function(){var b="",c=null,d=0;this.element.on("dblclick.jstree",function(a){if(a.target.tagName&&"input"===a.target.tagName.toLowerCase())return!0;if(i.selection&&i.selection.empty)i.selection.empty();else if(window.getSelection){var b=window.getSelection();try{b.removeAllRanges(),b.collapse()}catch(c){}}}).on("mousedown.jstree",a.proxy(function(a){a.target===this.element[0]&&(a.preventDefault(),d=+new Date)},this)).on("mousedown.jstree",".jstree-ocl",function(a){a.preventDefault()}).on("click.jstree",".jstree-ocl",a.proxy(function(a){this.toggle_node(a.target)},this)).on("dblclick.jstree",".jstree-anchor",a.proxy(function(a){return a.target.tagName&&"input"===a.target.tagName.toLowerCase()?!0:void(this.settings.core.dblclick_toggle&&this.toggle_node(a.target))},this)).on("click.jstree",".jstree-anchor",a.proxy(function(b){b.preventDefault(),b.currentTarget!==i.activeElement&&a(b.currentTarget).focus(),this.activate_node(b.currentTarget,b)},this)).on("keydown.jstree",".jstree-anchor",a.proxy(function(b){if(b.target.tagName&&"input"===b.target.tagName.toLowerCase())return!0;if(32!==b.which&&13!==b.which&&(b.shiftKey||b.ctrlKey||b.altKey||b.metaKey))return!0;var c=null;switch(this._data.core.rtl&&(37===b.which?b.which=39:39===b.which&&(b.which=37)),b.which){case 32:b.ctrlKey&&(b.type="click",a(b.currentTarget).trigger(b));break;case 13:b.type="click",a(b.currentTarget).trigger(b);break;case 37:b.preventDefault(),this.is_open(b.currentTarget)?this.close_node(b.currentTarget):(c=this.get_parent(b.currentTarget),c&&c.id!==a.jstree.root&&this.get_node(c,!0).children(".jstree-anchor").focus());break;case 38:b.preventDefault(),c=this.get_prev_dom(b.currentTarget),c&&c.length&&c.children(".jstree-anchor").focus();break;case 39:b.preventDefault(),this.is_closed(b.currentTarget)?this.open_node(b.currentTarget,function(a){this.get_node(a,!0).children(".jstree-anchor").focus()}):this.is_open(b.currentTarget)&&(c=this.get_node(b.currentTarget,!0).children(".jstree-children")[0],c&&a(this._firstChild(c)).children(".jstree-anchor").focus());break;case 40:b.preventDefault(),c=this.get_next_dom(b.currentTarget),c&&c.length&&c.children(".jstree-anchor").focus();break;case 106:this.open_all();break;case 36:b.preventDefault(),c=this._firstChild(this.get_container_ul()[0]),c&&a(c).children(".jstree-anchor").filter(":visible").focus();break;case 35:b.preventDefault(),this.element.find(".jstree-anchor").filter(":visible").last().focus()}},this)).on("load_node.jstree",a.proxy(function(b,c){c.status&&(c.node.id!==a.jstree.root||this._data.core.loaded||(this._data.core.loaded=!0,this._firstChild(this.get_container_ul()[0])&&this.element.attr("aria-activedescendant",this._firstChild(this.get_container_ul()[0]).id),this.trigger("loaded")),this._data.core.ready||setTimeout(a.proxy(function(){if(this.element&&!this.get_container_ul().find(".jstree-loading").length){if(this._data.core.ready=!0,this._data.core.selected.length){if(this.settings.core.expand_selected_onload){var b=[],c,d;for(c=0,d=this._data.core.selected.length;d>c;c++)b=b.concat(this._model.data[this._data.core.selected[c]].parents);for(b=a.vakata.array_unique(b),c=0,d=b.length;d>c;c++)this.open_node(b[c],!1,0)}this.trigger("changed",{action:"ready",selected:this._data.core.selected})}this.trigger("ready")}},this),0))},this)).on("keypress.jstree",a.proxy(function(d){if(d.target.tagName&&"input"===d.target.tagName.toLowerCase())return!0;c&&clearTimeout(c),c=setTimeout(function(){b=""},500);var e=String.fromCharCode(d.which).toLowerCase(),f=this.element.find(".jstree-anchor").filter(":visible"),g=f.index(i.activeElement)||0,h=!1;if(b+=e,b.length>1){if(f.slice(g).each(a.proxy(function(c,d){return 0===a(d).text().toLowerCase().indexOf(b)?(a(d).focus(),h=!0,!1):void 0},this)),h)return;if(f.slice(0,g).each(a.proxy(function(c,d){return 0===a(d).text().toLowerCase().indexOf(b)?(a(d).focus(),h=!0,!1):void 0},this)),h)return}if(new RegExp("^"+e.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")+"+$").test(b)){if(f.slice(g+1).each(a.proxy(function(b,c){return a(c).text().toLowerCase().charAt(0)===e?(a(c).focus(),h=!0,!1):void 0},this)),h)return;if(f.slice(0,g+1).each(a.proxy(function(b,c){return a(c).text().toLowerCase().charAt(0)===e?(a(c).focus(),h=!0,!1):void 0},this)),h)return}},this)).on("init.jstree",a.proxy(function(){var a=this.settings.core.themes;this._data.core.themes.dots=a.dots,this._data.core.themes.stripes=a.stripes,this._data.core.themes.icons=a.icons,this.set_theme(a.name||"default",a.url),this.set_theme_variant(a.variant)},this)).on("loading.jstree",a.proxy(function(){this[this._data.core.themes.dots?"show_dots":"hide_dots"](),this[this._data.core.themes.icons?"show_icons":"hide_icons"](),this[this._data.core.themes.stripes?"show_stripes":"hide_stripes"]()},this)).on("blur.jstree",".jstree-anchor",a.proxy(function(b){this._data.core.focused=null,a(b.currentTarget).filter(".jstree-hovered").mouseleave(),this.element.attr("tabindex","0")},this)).on("focus.jstree",".jstree-anchor",a.proxy(function(b){var c=this.get_node(b.currentTarget);c&&c.id&&(this._data.core.focused=c.id),this.element.find(".jstree-hovered").not(b.currentTarget).mouseleave(),a(b.currentTarget).mouseenter(),this.element.attr("tabindex","-1")},this)).on("focus.jstree",a.proxy(function(){if(+new Date-d>500&&!this._data.core.focused){d=0;var a=this.get_node(this.element.attr("aria-activedescendant"),!0);a&&a.find("> .jstree-anchor").focus()}},this)).on("mouseenter.jstree",".jstree-anchor",a.proxy(function(a){this.hover_node(a.currentTarget)},this)).on("mouseleave.jstree",".jstree-anchor",a.proxy(function(a){this.dehover_node(a.currentTarget)},this))},unbind:function(){this.element.off(".jstree"),a(i).off(".jstree-"+this._id)},trigger:function(a,b){b||(b={}),b.instance=this,this.element.triggerHandler(a.replace(".jstree","")+".jstree",b)},get_container:function(){return this.element},get_container_ul:function(){return this.element.children(".jstree-children").first()},get_string:function(b){var c=this.settings.core.strings;return a.isFunction(c)?c.call(this,b):c&&c[b]?c[b]:b},_firstChild:function(a){a=a?a.firstChild:null;while(null!==a&&1!==a.nodeType)a=a.nextSibling;return a},_nextSibling:function(a){a=a?a.nextSibling:null;while(null!==a&&1!==a.nodeType)a=a.nextSibling;return a},_previousSibling:function(a){a=a?a.previousSibling:null;while(null!==a&&1!==a.nodeType)a=a.previousSibling;return a},get_node:function(b,c){b&&b.id&&(b=b.id);var d;try{if(this._model.data[b])b=this._model.data[b];else if("string"==typeof b&&this._model.data[b.replace(/^#/,"")])b=this._model.data[b.replace(/^#/,"")];else if("string"==typeof b&&(d=a("#"+b.replace(a.jstree.idregex,"\\$&"),this.element)).length&&this._model.data[d.closest(".jstree-node").attr("id")])b=this._model.data[d.closest(".jstree-node").attr("id")];else if((d=a(b,this.element)).length&&this._model.data[d.closest(".jstree-node").attr("id")])b=this._model.data[d.closest(".jstree-node").attr("id")];else{if(!(d=a(b,this.element)).length||!d.hasClass("jstree"))return!1;b=this._model.data[a.jstree.root]}return c&&(b=b.id===a.jstree.root?this.element:a("#"+b.id.replace(a.jstree.idregex,"\\$&"),this.element)),b}catch(e){return!1}},get_path:function(b,c,d){if(b=b.parents?b:this.get_node(b),!b||b.id===a.jstree.root||!b.parents)return!1;var e,f,g=[];for(g.push(d?b.id:b.text),e=0,f=b.parents.length;f>e;e++)g.push(d?b.parents[e]:this.get_text(b.parents[e]));return g=g.reverse().slice(1),c?g.join(c):g},get_next_dom:function(b,c){var d;if(b=this.get_node(b,!0),b[0]===this.element[0]){d=this._firstChild(this.get_container_ul()[0]);while(d&&0===d.offsetHeight)d=this._nextSibling(d);return d?a(d):!1}if(!b||!b.length)return!1;if(c){d=b[0];do d=this._nextSibling(d);while(d&&0===d.offsetHeight);return d?a(d):!1}if(b.hasClass("jstree-open")){d=this._firstChild(b.children(".jstree-children")[0]);while(d&&0===d.offsetHeight)d=this._nextSibling(d);if(null!==d)return a(d)}d=b[0];do d=this._nextSibling(d);while(d&&0===d.offsetHeight);return null!==d?a(d):b.parentsUntil(".jstree",".jstree-node").nextAll(".jstree-node:visible").first()},get_prev_dom:function(b,c){var d;if(b=this.get_node(b,!0),b[0]===this.element[0]){d=this.get_container_ul()[0].lastChild;while(d&&0===d.offsetHeight)d=this._previousSibling(d);return d?a(d):!1}if(!b||!b.length)return!1;if(c){d=b[0];do d=this._previousSibling(d);while(d&&0===d.offsetHeight);return d?a(d):!1}d=b[0];do d=this._previousSibling(d);while(d&&0===d.offsetHeight);if(null!==d){b=a(d);while(b.hasClass("jstree-open"))b=b.children(".jstree-children").first().children(".jstree-node:visible:last");return b}return d=b[0].parentNode.parentNode,d&&d.className&&-1!==d.className.indexOf("jstree-node")?a(d):!1},get_parent:function(b){return b=this.get_node(b),b&&b.id!==a.jstree.root?b.parent:!1},get_children_dom:function(a){return a=this.get_node(a,!0),a[0]===this.element[0]?this.get_container_ul().children(".jstree-node"):a&&a.length?a.children(".jstree-children").children(".jstree-node"):!1},is_parent:function(a){return a=this.get_node(a),a&&(a.state.loaded===!1||a.children.length>0)},is_loaded:function(a){return a=this.get_node(a),a&&a.state.loaded},is_loading:function(a){return a=this.get_node(a),a&&a.state&&a.state.loading},is_open:function(a){return a=this.get_node(a),a&&a.state.opened},is_closed:function(a){return a=this.get_node(a),a&&this.is_parent(a)&&!a.state.opened},is_leaf:function(a){return!this.is_parent(a)},load_node:function(b,c){var d,e,f,g,h;if(a.isArray(b))return this._load_nodes(b.slice(),c),!0;if(b=this.get_node(b),!b)return c&&c.call(this,b,!1),!1;if(b.state.loaded){for(b.state.loaded=!1,d=0,e=b.children_d.length;e>d;d++){for(f=0,g=b.parents.length;g>f;f++)this._model.data[b.parents[f]].children_d=a.vakata.array_remove_item(this._model.data[b.parents[f]].children_d,b.children_d[d]);this._model.data[b.children_d[d]].state.selected&&(h=!0,this._data.core.selected=a.vakata.array_remove_item(this._data.core.selected,b.children_d[d])),delete this._model.data[b.children_d[d]]}b.children=[],b.children_d=[],h&&this.trigger("changed",{action:"load_node",node:b,selected:this._data.core.selected})}return b.state.failed=!1,b.state.loading=!0,this.get_node(b,!0).addClass("jstree-loading").attr("aria-busy",!0),this._load_node(b,a.proxy(function(a){b=this._model.data[b.id],b.state.loading=!1,b.state.loaded=a,b.state.failed=!b.state.loaded;var d=this.get_node(b,!0),e=0,f=0,g=this._model.data,h=!1;for(e=0,f=b.children.length;f>e;e++)if(g[b.children[e]]&&!g[b.children[e]].state.hidden){h=!0;break}b.state.loaded&&!h&&d&&d.length&&!d.hasClass("jstree-leaf")&&d.removeClass("jstree-closed jstree-open").addClass("jstree-leaf"),d.removeClass("jstree-loading").attr("aria-busy",!1),this.trigger("load_node",{node:b,status:a}),c&&c.call(this,b,a)},this)),!0},_load_nodes:function(a,b,c){var d=!0,e=function(){this._load_nodes(a,b,!0)},f=this._model.data,g,h,i=[];for(g=0,h=a.length;h>g;g++)!f[a[g]]||(f[a[g]].state.loaded||f[a[g]].state.failed)&&c||(this.is_loading(a[g])||this.load_node(a[g],e),d=!1);if(d){for(g=0,h=a.length;h>g;g++)f[a[g]]&&f[a[g]].state.loaded&&i.push(a[g]);b&&!b.done&&(b.call(this,i),b.done=!0)}},load_all:function(b,c){if(b||(b=a.jstree.root),b=this.get_node(b),!b)return!1;var d=[],e=this._model.data,f=e[b.id].children_d,g,h;for(b.state&&!b.state.loaded&&d.push(b.id),g=0,h=f.length;h>g;g++)e[f[g]]&&e[f[g]].state&&!e[f[g]].state.loaded&&d.push(f[g]);d.length?this._load_nodes(d,function(){this.load_all(b,c)}):(c&&c.call(this,b),this.trigger("load_all",{node:b}))},_load_node:function(b,c){var d=this.settings.core.data,e;return d?a.isFunction(d)?d.call(this,b,a.proxy(function(d){d===!1&&c.call(this,!1),this["string"==typeof d?"_append_html_data":"_append_json_data"](b,"string"==typeof d?a(a.parseHTML(d)).filter(function(){return 3!==this.nodeType}):d,function(a){c.call(this,a)})},this)):"object"==typeof d?d.url?(d=a.extend(!0,{},d),a.isFunction(d.url)&&(d.url=d.url.call(this,b)),a.isFunction(d.data)&&(d.data=d.data.call(this,b)),a.ajax(d).done(a.proxy(function(d,e,f){var g=f.getResponseHeader("Content-Type");return g&&-1!==g.indexOf("json")||"object"==typeof d?this._append_json_data(b,d,function(a){c.call(this,a)}):g&&-1!==g.indexOf("html")||"string"==typeof d?this._append_html_data(b,a(a.parseHTML(d)).filter(function(){return 3!==this.nodeType}),function(a){c.call(this,a)}):(this._data.core.last_error={error:"ajax",plugin:"core",id:"core_04",reason:"Could not load node",data:JSON.stringify({id:b.id,xhr:f})},this.settings.core.error.call(this,this._data.core.last_error),c.call(this,!1))},this)).fail(a.proxy(function(a){c.call(this,!1),this._data.core.last_error={error:"ajax",plugin:"core",id:"core_04",reason:"Could not load node",data:JSON.stringify({id:b.id,xhr:a})},this.settings.core.error.call(this,this._data.core.last_error)},this))):(e=a.isArray(d)||a.isPlainObject(d)?JSON.parse(JSON.stringify(d)):d,b.id===a.jstree.root?this._append_json_data(b,e,function(a){c.call(this,a)}):(this._data.core.last_error={error:"nodata",plugin:"core",id:"core_05",reason:"Could not load node",data:JSON.stringify({id:b.id})},this.settings.core.error.call(this,this._data.core.last_error),c.call(this,!1))):"string"==typeof d?b.id===a.jstree.root?this._append_html_data(b,a(a.parseHTML(d)).filter(function(){return 3!==this.nodeType}),function(a){c.call(this,a)}):(this._data.core.last_error={error:"nodata",plugin:"core",id:"core_06",reason:"Could not load node",data:JSON.stringify({id:b.id})},this.settings.core.error.call(this,this._data.core.last_error),c.call(this,!1)):c.call(this,!1):b.id===a.jstree.root?this._append_html_data(b,this._data.core.original_container_html.clone(!0),function(a){c.call(this,a)}):c.call(this,!1)},_node_changed:function(a){a=this.get_node(a),a&&this._model.changed.push(a.id)},_append_html_data:function(b,c,d){b=this.get_node(b),b.children=[],b.children_d=[];var e=c.is("ul")?c.children():c,f=b.id,g=[],h=[],i=this._model.data,j=i[f],k=this._data.core.selected.length,l,m,n;for(e.each(a.proxy(function(b,c){l=this._parse_model_from_html(a(c),f,j.parents.concat()),l&&(g.push(l),h.push(l),i[l].children_d.length&&(h=h.concat(i[l].children_d)))},this)),j.children=g,j.children_d=h,m=0,n=j.parents.length;n>m;m++)i[j.parents[m]].children_d=i[j.parents[m]].children_d.concat(h);this.trigger("model",{nodes:h,parent:f}),f!==a.jstree.root?(this._node_changed(f),this.redraw()):(this.get_container_ul().children(".jstree-initial-node").remove(),this.redraw(!0)),this._data.core.selected.length!==k&&this.trigger("changed",{action:"model",selected:this._data.core.selected}),d.call(this,!0)},_append_json_data:function(b,c,d,e){if(null!==this.element){b=this.get_node(b),b.children=[],b.children_d=[],c.d&&(c=c.d,"string"==typeof c&&(c=JSON.parse(c))),a.isArray(c)||(c=[c]);var f=null,g={df:this._model.default_state,dat:c,par:b.id,m:this._model.data,t_id:this._id,t_cnt:this._cnt,sel:this._data.core.selected},h=function(a,b){a.data&&(a=a.data);var c=a.dat,d=a.par,e=[],f=[],g=[],h=a.df,i=a.t_id,j=a.t_cnt,k=a.m,l=k[d],m=a.sel,n,o,p,q,r=function(a,c,d){d=d?d.concat():[],c&&d.unshift(c);var e=a.id.toString(),f,i,j,l,m={id:e,text:a.text||"",icon:a.icon!==b?a.icon:!0,parent:c,parents:d,children:a.children||[],children_d:a.children_d||[],data:a.data,state:{},li_attr:{id:!1},a_attr:{href:"#"},original:!1};for(f in h)h.hasOwnProperty(f)&&(m.state[f]=h[f]);if(a&&a.data&&a.data.jstree&&a.data.jstree.icon&&(m.icon=a.data.jstree.icon),(m.icon===b||null===m.icon||""===m.icon)&&(m.icon=!0),a&&a.data&&(m.data=a.data,a.data.jstree))for(f in a.data.jstree)a.data.jstree.hasOwnProperty(f)&&(m.state[f]=a.data.jstree[f]);if(a&&"object"==typeof a.state)for(f in a.state)a.state.hasOwnProperty(f)&&(m.state[f]=a.state[f]);if(a&&"object"==typeof a.li_attr)for(f in a.li_attr)a.li_attr.hasOwnProperty(f)&&(m.li_attr[f]=a.li_attr[f]);if(m.li_attr.id||(m.li_attr.id=e),a&&"object"==typeof a.a_attr)for(f in a.a_attr)a.a_attr.hasOwnProperty(f)&&(m.a_attr[f]=a.a_attr[f]);for(a&&a.children&&a.children===!0&&(m.state.loaded=!1,m.children=[],m.children_d=[]),k[m.id]=m,f=0,i=m.children.length;i>f;f++)j=r(k[m.children[f]],m.id,d),l=k[j],m.children_d.push(j),l.children_d.length&&(m.children_d=m.children_d.concat(l.children_d));return delete a.data,delete a.children,k[m.id].original=a,m.state.selected&&g.push(m.id),m.id},s=function(a,c,d){d=d?d.concat():[],c&&d.unshift(c);var e=!1,f,l,m,n,o;do e="j"+i+"_"+ ++j;while(k[e]);o={id:!1,text:"string"==typeof a?a:"",icon:"object"==typeof a&&a.icon!==b?a.icon:!0,parent:c,parents:d,children:[],children_d:[],data:null,state:{},li_attr:{id:!1},a_attr:{href:"#"},original:!1};for(f in h)h.hasOwnProperty(f)&&(o.state[f]=h[f]);if(a&&a.id&&(o.id=a.id.toString()),a&&a.text&&(o.text=a.text),a&&a.data&&a.data.jstree&&a.data.jstree.icon&&(o.icon=a.data.jstree.icon),(o.icon===b||null===o.icon||""===o.icon)&&(o.icon=!0),a&&a.data&&(o.data=a.data,a.data.jstree))for(f in a.data.jstree)a.data.jstree.hasOwnProperty(f)&&(o.state[f]=a.data.jstree[f]);if(a&&"object"==typeof a.state)for(f in a.state)a.state.hasOwnProperty(f)&&(o.state[f]=a.state[f]);if(a&&"object"==typeof a.li_attr)for(f in a.li_attr)a.li_attr.hasOwnProperty(f)&&(o.li_attr[f]=a.li_attr[f]);if(o.li_attr.id&&!o.id&&(o.id=o.li_attr.id.toString()),o.id||(o.id=e),o.li_attr.id||(o.li_attr.id=o.id),a&&"object"==typeof a.a_attr)for(f in a.a_attr)a.a_attr.hasOwnProperty(f)&&(o.a_attr[f]=a.a_attr[f]);if(a&&a.children&&a.children.length){for(f=0,l=a.children.length;l>f;f++)m=s(a.children[f],o.id,d),n=k[m],o.children.push(m),n.children_d.length&&(o.children_d=o.children_d.concat(n.children_d));o.children_d=o.children_d.concat(o.children)}return a&&a.children&&a.children===!0&&(o.state.loaded=!1,o.children=[],o.children_d=[]),delete a.data,delete a.children,o.original=a,k[o.id]=o,o.state.selected&&g.push(o.id),o.id};if(c.length&&c[0].id!==b&&c[0].parent!==b){for(o=0,p=c.length;p>o;o++)c[o].children||(c[o].children=[]),k[c[o].id.toString()]=c[o];for(o=0,p=c.length;p>o;o++)k[c[o].parent.toString()].children.push(c[o].id.toString()),l.children_d.push(c[o].id.toString());for(o=0,p=l.children.length;p>o;o++)n=r(k[l.children[o]],d,l.parents.concat()),f.push(n),k[n].children_d.length&&(f=f.concat(k[n].children_d));for(o=0,p=l.parents.length;p>o;o++)k[l.parents[o]].children_d=k[l.parents[o]].children_d.concat(f);q={cnt:j,mod:k,sel:m,par:d,dpc:f,add:g}}else{for(o=0,p=c.length;p>o;o++)n=s(c[o],d,l.parents.concat()),n&&(e.push(n),f.push(n),k[n].children_d.length&&(f=f.concat(k[n].children_d)));for(l.children=e,l.children_d=f,o=0,p=l.parents.length;p>o;o++)k[l.parents[o]].children_d=k[l.parents[o]].children_d.concat(f);q={cnt:j,mod:k,sel:m,par:d,dpc:f,add:g}}return"undefined"!=typeof window&&"undefined"!=typeof window.document?q:void postMessage(q)},i=function(b,c){if(null!==this.element){if(this._cnt=b.cnt,this._model.data=b.mod,c){var e,f,g=b.add,h=b.sel,i=this._data.core.selected.slice(),j=this._model.data;if(h.length!==i.length||a.vakata.array_unique(h.concat(i)).length!==h.length){for(e=0,f=h.length;f>e;e++)-1===a.inArray(h[e],g)&&-1===a.inArray(h[e],i)&&(j[h[e]].state.selected=!1);for(e=0,f=i.length;f>e;e++)-1===a.inArray(i[e],h)&&(j[i[e]].state.selected=!0)}}b.add.length&&(this._data.core.selected=this._data.core.selected.concat(b.add)),this.trigger("model",{nodes:b.dpc,parent:b.par}),b.par!==a.jstree.root?(this._node_changed(b.par),this.redraw()):this.redraw(!0),b.add.length&&this.trigger("changed",{action:"model",selected:this._data.core.selected}),d.call(this,!0)}};if(this.settings.core.worker&&window.Blob&&window.URL&&window.Worker)try{null===this._wrk&&(this._wrk=window.URL.createObjectURL(new window.Blob(["self.onmessage = "+h.toString()],{type:"text/javascript"}))),!this._data.core.working||e?(this._data.core.working=!0,f=new window.Worker(this._wrk),f.onmessage=a.proxy(function(a){i.call(this,a.data,!0);try{f.terminate(),f=null}catch(b){}this._data.core.worker_queue.length?this._append_json_data.apply(this,this._data.core.worker_queue.shift()):this._data.core.working=!1},this),g.par?f.postMessage(g):this._data.core.worker_queue.length?this._append_json_data.apply(this,this._data.core.worker_queue.shift()):this._data.core.working=!1):this._data.core.worker_queue.push([b,c,d,!0])}catch(j){i.call(this,h(g),!1),this._data.core.worker_queue.length?this._append_json_data.apply(this,this._data.core.worker_queue.shift()):this._data.core.working=!1}else i.call(this,h(g),!1)}},_parse_model_from_html:function(c,d,e){e=e?[].concat(e):[],d&&e.unshift(d);var f,g,h=this._model.data,i={id:!1,text:!1,icon:!0,parent:d,parents:e,children:[],children_d:[],data:null,state:{},li_attr:{id:!1},a_attr:{href:"#"},original:!1},j,k,l;for(j in this._model.default_state)this._model.default_state.hasOwnProperty(j)&&(i.state[j]=this._model.default_state[j]);if(k=a.vakata.attributes(c,!0),a.each(k,function(b,c){return c=a.trim(c),c.length?(i.li_attr[b]=c,void("id"===b&&(i.id=c.toString()))):!0}),k=c.children("a").first(),k.length&&(k=a.vakata.attributes(k,!0),a.each(k,function(b,c){c=a.trim(c),c.length&&(i.a_attr[b]=c)})),k=c.children("a").first().length?c.children("a").first().clone():c.clone(),k.children("ins, i, ul").remove(),k=k.html(),k=a("<div />").html(k),i.text=this.settings.core.force_text?k.text():k.html(),k=c.data(),i.data=k?a.extend(!0,{},k):null,i.state.opened=c.hasClass("jstree-open"),i.state.selected=c.children("a").hasClass("jstree-clicked"),i.state.disabled=c.children("a").hasClass("jstree-disabled"),i.data&&i.data.jstree)for(j in i.data.jstree)i.data.jstree.hasOwnProperty(j)&&(i.state[j]=i.data.jstree[j]);k=c.children("a").children(".jstree-themeicon"),k.length&&(i.icon=k.hasClass("jstree-themeicon-hidden")?!1:k.attr("rel")),i.state.icon!==b&&(i.icon=i.state.icon),(i.icon===b||null===i.icon||""===i.icon)&&(i.icon=!0),k=c.children("ul").children("li");do l="j"+this._id+"_"+ ++this._cnt;while(h[l]);return i.id=i.li_attr.id?i.li_attr.id.toString():l,k.length?(k.each(a.proxy(function(b,c){f=this._parse_model_from_html(a(c),i.id,e),g=this._model.data[f],i.children.push(f),g.children_d.length&&(i.children_d=i.children_d.concat(g.children_d))},this)),i.children_d=i.children_d.concat(i.children)):c.hasClass("jstree-closed")&&(i.state.loaded=!1),i.li_attr["class"]&&(i.li_attr["class"]=i.li_attr["class"].replace("jstree-closed","").replace("jstree-open","")),i.a_attr["class"]&&(i.a_attr["class"]=i.a_attr["class"].replace("jstree-clicked","").replace("jstree-disabled","")),h[i.id]=i,i.state.selected&&this._data.core.selected.push(i.id),i.id},_parse_model_from_flat_json:function(a,c,d){d=d?d.concat():[],c&&d.unshift(c);var e=a.id.toString(),f=this._model.data,g=this._model.default_state,h,i,j,k,l={id:e,text:a.text||"",icon:a.icon!==b?a.icon:!0,parent:c,parents:d,children:a.children||[],children_d:a.children_d||[],data:a.data,state:{},li_attr:{id:!1},a_attr:{href:"#"},original:!1};for(h in g)g.hasOwnProperty(h)&&(l.state[h]=g[h]);if(a&&a.data&&a.data.jstree&&a.data.jstree.icon&&(l.icon=a.data.jstree.icon),(l.icon===b||null===l.icon||""===l.icon)&&(l.icon=!0),a&&a.data&&(l.data=a.data,a.data.jstree))for(h in a.data.jstree)a.data.jstree.hasOwnProperty(h)&&(l.state[h]=a.data.jstree[h]);if(a&&"object"==typeof a.state)for(h in a.state)a.state.hasOwnProperty(h)&&(l.state[h]=a.state[h]);if(a&&"object"==typeof a.li_attr)for(h in a.li_attr)a.li_attr.hasOwnProperty(h)&&(l.li_attr[h]=a.li_attr[h]);if(l.li_attr.id||(l.li_attr.id=e),a&&"object"==typeof a.a_attr)for(h in a.a_attr)a.a_attr.hasOwnProperty(h)&&(l.a_attr[h]=a.a_attr[h]);for(a&&a.children&&a.children===!0&&(l.state.loaded=!1,l.children=[],l.children_d=[]),f[l.id]=l,h=0,i=l.children.length;i>h;h++)j=this._parse_model_from_flat_json(f[l.children[h]],l.id,d),k=f[j],l.children_d.push(j),k.children_d.length&&(l.children_d=l.children_d.concat(k.children_d));return delete a.data,delete a.children,f[l.id].original=a,l.state.selected&&this._data.core.selected.push(l.id),l.id},_parse_model_from_json:function(a,c,d){d=d?d.concat():[],c&&d.unshift(c);var e=!1,f,g,h,i,j=this._model.data,k=this._model.default_state,l;do e="j"+this._id+"_"+ ++this._cnt;while(j[e]);l={id:!1,text:"string"==typeof a?a:"",icon:"object"==typeof a&&a.icon!==b?a.icon:!0,parent:c,parents:d,children:[],children_d:[],data:null,state:{},li_attr:{id:!1},a_attr:{href:"#"},original:!1};for(f in k)k.hasOwnProperty(f)&&(l.state[f]=k[f]);if(a&&a.id&&(l.id=a.id.toString()),a&&a.text&&(l.text=a.text),a&&a.data&&a.data.jstree&&a.data.jstree.icon&&(l.icon=a.data.jstree.icon),(l.icon===b||null===l.icon||""===l.icon)&&(l.icon=!0),a&&a.data&&(l.data=a.data,a.data.jstree))for(f in a.data.jstree)a.data.jstree.hasOwnProperty(f)&&(l.state[f]=a.data.jstree[f]);if(a&&"object"==typeof a.state)for(f in a.state)a.state.hasOwnProperty(f)&&(l.state[f]=a.state[f]);if(a&&"object"==typeof a.li_attr)for(f in a.li_attr)a.li_attr.hasOwnProperty(f)&&(l.li_attr[f]=a.li_attr[f]);if(l.li_attr.id&&!l.id&&(l.id=l.li_attr.id.toString()),l.id||(l.id=e),l.li_attr.id||(l.li_attr.id=l.id),a&&"object"==typeof a.a_attr)for(f in a.a_attr)a.a_attr.hasOwnProperty(f)&&(l.a_attr[f]=a.a_attr[f]);if(a&&a.children&&a.children.length){for(f=0,g=a.children.length;g>f;f++)h=this._parse_model_from_json(a.children[f],l.id,d),i=j[h],l.children.push(h),i.children_d.length&&(l.children_d=l.children_d.concat(i.children_d));l.children_d=l.children_d.concat(l.children)}return a&&a.children&&a.children===!0&&(l.state.loaded=!1,l.children=[],l.children_d=[]),delete a.data,delete a.children,l.original=a,j[l.id]=l,l.state.selected&&this._data.core.selected.push(l.id),l.id},_redraw:function(){var b=this._model.force_full_redraw?this._model.data[a.jstree.root].children.concat([]):this._model.changed.concat([]),c=i.createElement("UL"),d,e,f,g=this._data.core.focused;for(e=0,f=b.length;f>e;e++)d=this.redraw_node(b[e],!0,this._model.force_full_redraw),d&&this._model.force_full_redraw&&c.appendChild(d);this._model.force_full_redraw&&(c.className=this.get_container_ul()[0].className,c.setAttribute("role","group"),this.element.empty().append(c)),null!==g&&(d=this.get_node(g,!0),d&&d.length&&d.children(".jstree-anchor")[0]!==i.activeElement?d.children(".jstree-anchor").focus():this._data.core.focused=null),this._model.force_full_redraw=!1,this._model.changed=[],this.trigger("redraw",{nodes:b})},redraw:function(a){a&&(this._model.force_full_redraw=!0),this._redraw()},draw_children:function(b){var c=this.get_node(b),d=!1,e=!1,f=!1,g=i;if(!c)return!1;if(c.id===a.jstree.root)return this.redraw(!0);if(b=this.get_node(b,!0),!b||!b.length)return!1;if(b.children(".jstree-children").remove(),b=b[0],c.children.length&&c.state.loaded){for(f=g.createElement("UL"),f.setAttribute("role","group"),f.className="jstree-children",d=0,e=c.children.length;e>d;d++)f.appendChild(this.redraw_node(c.children[d],!0,!0));b.appendChild(f)}},redraw_node:function(b,c,d,e){var f=this.get_node(b),g=!1,h=!1,k=!1,l=!1,m=!1,n=!1,o="",p=i,q=this._model.data,r=!1,s=!1,t=null,u=0,v=0,w=!1,x=!1;if(!f)return!1;if(f.id===a.jstree.root)return this.redraw(!0);if(c=c||0===f.children.length,b=i.querySelector?this.element[0].querySelector("#"+(-1!=="0123456789".indexOf(f.id[0])?"\\3"+f.id[0]+" "+f.id.substr(1).replace(a.jstree.idregex,"\\$&"):f.id.replace(a.jstree.idregex,"\\$&"))):i.getElementById(f.id))b=a(b),d||(g=b.parent().parent()[0],g===this.element[0]&&(g=null),h=b.index()),c||!f.children.length||b.children(".jstree-children").length||(c=!0),
+c||(k=b.children(".jstree-children")[0]),r=b.children(".jstree-anchor")[0]===i.activeElement,b.remove();else if(c=!0,!d){if(g=f.parent!==a.jstree.root?a("#"+f.parent.replace(a.jstree.idregex,"\\$&"),this.element)[0]:null,!(null===g||g&&q[f.parent].state.opened))return!1;h=a.inArray(f.id,null===g?q[a.jstree.root].children:q[f.parent].children)}b=j.cloneNode(!0),o="jstree-node ";for(l in f.li_attr)if(f.li_attr.hasOwnProperty(l)){if("id"===l)continue;"class"!==l?b.setAttribute(l,f.li_attr[l]):o+=f.li_attr[l]}for(f.a_attr.id||(f.a_attr.id=f.id+"_anchor"),b.setAttribute("aria-selected",!!f.state.selected),b.setAttribute("aria-level",f.parents.length),b.setAttribute("aria-labelledby",f.a_attr.id),f.state.disabled&&b.setAttribute("aria-disabled",!0),l=0,m=f.children.length;m>l;l++)if(!q[f.children[l]].state.hidden){w=!0;break}if(null!==f.parent&&q[f.parent]&&!f.state.hidden&&(l=a.inArray(f.id,q[f.parent].children),x=f.id,-1!==l))for(l++,m=q[f.parent].children.length;m>l;l++)if(q[q[f.parent].children[l]].state.hidden||(x=q[f.parent].children[l]),x!==f.id)break;f.state.hidden&&(o+=" jstree-hidden"),f.state.loaded&&!w?o+=" jstree-leaf":(o+=f.state.opened&&f.state.loaded?" jstree-open":" jstree-closed",b.setAttribute("aria-expanded",f.state.opened&&f.state.loaded)),x===f.id&&(o+=" jstree-last"),b.id=f.id,b.className=o,o=(f.state.selected?" jstree-clicked":"")+(f.state.disabled?" jstree-disabled":"");for(m in f.a_attr)if(f.a_attr.hasOwnProperty(m)){if("href"===m&&"#"===f.a_attr[m])continue;"class"!==m?b.childNodes[1].setAttribute(m,f.a_attr[m]):o+=" "+f.a_attr[m]}if(o.length&&(b.childNodes[1].className="jstree-anchor "+o),(f.icon&&f.icon!==!0||f.icon===!1)&&(f.icon===!1?b.childNodes[1].childNodes[0].className+=" jstree-themeicon-hidden":-1===f.icon.indexOf("/")&&-1===f.icon.indexOf(".")?b.childNodes[1].childNodes[0].className+=" "+f.icon+" jstree-themeicon-custom":(b.childNodes[1].childNodes[0].style.backgroundImage="url("+f.icon+")",b.childNodes[1].childNodes[0].style.backgroundPosition="center center",b.childNodes[1].childNodes[0].style.backgroundSize="auto",b.childNodes[1].childNodes[0].className+=" jstree-themeicon-custom")),this.settings.core.force_text?b.childNodes[1].appendChild(p.createTextNode(f.text)):b.childNodes[1].innerHTML+=f.text,c&&f.children.length&&(f.state.opened||e)&&f.state.loaded){for(n=p.createElement("UL"),n.setAttribute("role","group"),n.className="jstree-children",l=0,m=f.children.length;m>l;l++)n.appendChild(this.redraw_node(f.children[l],c,!0));b.appendChild(n)}if(k&&b.appendChild(k),!d){for(g||(g=this.element[0]),l=0,m=g.childNodes.length;m>l;l++)if(g.childNodes[l]&&g.childNodes[l].className&&-1!==g.childNodes[l].className.indexOf("jstree-children")){t=g.childNodes[l];break}t||(t=p.createElement("UL"),t.setAttribute("role","group"),t.className="jstree-children",g.appendChild(t)),g=t,h<g.childNodes.length?g.insertBefore(b,g.childNodes[h]):g.appendChild(b),r&&(u=this.element[0].scrollTop,v=this.element[0].scrollLeft,b.childNodes[1].focus(),this.element[0].scrollTop=u,this.element[0].scrollLeft=v)}return f.state.opened&&!f.state.loaded&&(f.state.opened=!1,setTimeout(a.proxy(function(){this.open_node(f.id,!1,0)},this),0)),b},open_node:function(c,d,e){var f,g,h,i;if(a.isArray(c)){for(c=c.slice(),f=0,g=c.length;g>f;f++)this.open_node(c[f],d,e);return!0}return c=this.get_node(c),c&&c.id!==a.jstree.root?(e=e===b?this.settings.core.animation:e,this.is_closed(c)?this.is_loaded(c)?(h=this.get_node(c,!0),i=this,h.length&&(e&&h.children(".jstree-children").length&&h.children(".jstree-children").stop(!0,!0),c.children.length&&!this._firstChild(h.children(".jstree-children")[0])&&this.draw_children(c),e?(this.trigger("before_open",{node:c}),h.children(".jstree-children").css("display","none").end().removeClass("jstree-closed").addClass("jstree-open").attr("aria-expanded",!0).children(".jstree-children").stop(!0,!0).slideDown(e,function(){this.style.display="",i.trigger("after_open",{node:c})})):(this.trigger("before_open",{node:c}),h[0].className=h[0].className.replace("jstree-closed","jstree-open"),h[0].setAttribute("aria-expanded",!0))),c.state.opened=!0,d&&d.call(this,c,!0),h.length||this.trigger("before_open",{node:c}),this.trigger("open_node",{node:c}),e&&h.length||this.trigger("after_open",{node:c}),!0):this.is_loading(c)?setTimeout(a.proxy(function(){this.open_node(c,d,e)},this),500):void this.load_node(c,function(a,b){return b?this.open_node(a,d,e):d?d.call(this,a,!1):!1}):(d&&d.call(this,c,!1),!1)):!1},_open_to:function(b){if(b=this.get_node(b),!b||b.id===a.jstree.root)return!1;var c,d,e=b.parents;for(c=0,d=e.length;d>c;c+=1)c!==a.jstree.root&&this.open_node(e[c],!1,0);return a("#"+b.id.replace(a.jstree.idregex,"\\$&"),this.element)},close_node:function(c,d){var e,f,g,h;if(a.isArray(c)){for(c=c.slice(),e=0,f=c.length;f>e;e++)this.close_node(c[e],d);return!0}return c=this.get_node(c),c&&c.id!==a.jstree.root?this.is_closed(c)?!1:(d=d===b?this.settings.core.animation:d,g=this,h=this.get_node(c,!0),h.length&&(d?h.children(".jstree-children").attr("style","display:block !important").end().removeClass("jstree-open").addClass("jstree-closed").attr("aria-expanded",!1).children(".jstree-children").stop(!0,!0).slideUp(d,function(){this.style.display="",h.children(".jstree-children").remove(),g.trigger("after_close",{node:c})}):(h[0].className=h[0].className.replace("jstree-open","jstree-closed"),h.attr("aria-expanded",!1).children(".jstree-children").remove())),c.state.opened=!1,this.trigger("close_node",{node:c}),void(d&&h.length||this.trigger("after_close",{node:c}))):!1},toggle_node:function(b){var c,d;if(a.isArray(b)){for(b=b.slice(),c=0,d=b.length;d>c;c++)this.toggle_node(b[c]);return!0}return this.is_closed(b)?this.open_node(b):this.is_open(b)?this.close_node(b):void 0},open_all:function(b,c,d){if(b||(b=a.jstree.root),b=this.get_node(b),!b)return!1;var e=b.id===a.jstree.root?this.get_container_ul():this.get_node(b,!0),f,g,h;if(!e.length){for(f=0,g=b.children_d.length;g>f;f++)this.is_closed(this._model.data[b.children_d[f]])&&(this._model.data[b.children_d[f]].state.opened=!0);return this.trigger("open_all",{node:b})}d=d||e,h=this,e=this.is_closed(b)?e.find(".jstree-closed").addBack():e.find(".jstree-closed"),e.each(function(){h.open_node(this,function(a,b){b&&this.is_parent(a)&&this.open_all(a,c,d)},c||0)}),0===d.find(".jstree-closed").length&&this.trigger("open_all",{node:this.get_node(d)})},close_all:function(b,c){if(b||(b=a.jstree.root),b=this.get_node(b),!b)return!1;var d=b.id===a.jstree.root?this.get_container_ul():this.get_node(b,!0),e=this,f,g;for(d.length&&(d=this.is_open(b)?d.find(".jstree-open").addBack():d.find(".jstree-open"),a(d.get().reverse()).each(function(){e.close_node(this,c||0)})),f=0,g=b.children_d.length;g>f;f++)this._model.data[b.children_d[f]].state.opened=!1;this.trigger("close_all",{node:b})},is_disabled:function(a){return a=this.get_node(a),a&&a.state&&a.state.disabled},enable_node:function(b){var c,d;if(a.isArray(b)){for(b=b.slice(),c=0,d=b.length;d>c;c++)this.enable_node(b[c]);return!0}return b=this.get_node(b),b&&b.id!==a.jstree.root?(b.state.disabled=!1,this.get_node(b,!0).children(".jstree-anchor").removeClass("jstree-disabled").attr("aria-disabled",!1),void this.trigger("enable_node",{node:b})):!1},disable_node:function(b){var c,d;if(a.isArray(b)){for(b=b.slice(),c=0,d=b.length;d>c;c++)this.disable_node(b[c]);return!0}return b=this.get_node(b),b&&b.id!==a.jstree.root?(b.state.disabled=!0,this.get_node(b,!0).children(".jstree-anchor").addClass("jstree-disabled").attr("aria-disabled",!0),void this.trigger("disable_node",{node:b})):!1},hide_node:function(b,c){var d,e;if(a.isArray(b)){for(b=b.slice(),d=0,e=b.length;e>d;d++)this.hide_node(b[d],!0);return this.redraw(),!0}return b=this.get_node(b),b&&b.id!==a.jstree.root?void(b.state.hidden||(b.state.hidden=!0,this._node_changed(b.parent),c||this.redraw(),this.trigger("hide_node",{node:b}))):!1},show_node:function(b,c){var d,e;if(a.isArray(b)){for(b=b.slice(),d=0,e=b.length;e>d;d++)this.show_node(b[d],!0);return this.redraw(),!0}return b=this.get_node(b),b&&b.id!==a.jstree.root?void(b.state.hidden&&(b.state.hidden=!1,this._node_changed(b.parent),c||this.redraw(),this.trigger("show_node",{node:b}))):!1},hide_all:function(b){var c,d=this._model.data,e=[];for(c in d)d.hasOwnProperty(c)&&c!==a.jstree.root&&!d[c].state.hidden&&(d[c].state.hidden=!0,e.push(c));return this._model.force_full_redraw=!0,b||this.redraw(),this.trigger("hide_all",{nodes:e}),e},show_all:function(b){var c,d=this._model.data,e=[];for(c in d)d.hasOwnProperty(c)&&c!==a.jstree.root&&d[c].state.hidden&&(d[c].state.hidden=!1,e.push(c));return this._model.force_full_redraw=!0,b||this.redraw(),this.trigger("show_all",{nodes:e}),e},activate_node:function(a,c){if(this.is_disabled(a))return!1;if(c&&"object"==typeof c||(c={}),this._data.core.last_clicked=this._data.core.last_clicked&&this._data.core.last_clicked.id!==b?this.get_node(this._data.core.last_clicked.id):null,this._data.core.last_clicked&&!this._data.core.last_clicked.state.selected&&(this._data.core.last_clicked=null),!this._data.core.last_clicked&&this._data.core.selected.length&&(this._data.core.last_clicked=this.get_node(this._data.core.selected[this._data.core.selected.length-1])),this.settings.core.multiple&&(c.metaKey||c.ctrlKey||c.shiftKey)&&(!c.shiftKey||this._data.core.last_clicked&&this.get_parent(a)&&this.get_parent(a)===this._data.core.last_clicked.parent))if(c.shiftKey){var d=this.get_node(a).id,e=this._data.core.last_clicked.id,f=this.get_node(this._data.core.last_clicked.parent).children,g=!1,h,i;for(h=0,i=f.length;i>h;h+=1)f[h]===d&&(g=!g),f[h]===e&&(g=!g),this.is_disabled(f[h])||!g&&f[h]!==d&&f[h]!==e?this.deselect_node(f[h],!0,c):this.select_node(f[h],!0,!1,c);this.trigger("changed",{action:"select_node",node:this.get_node(a),selected:this._data.core.selected,event:c})}else this.is_selected(a)?this.deselect_node(a,!1,c):this.select_node(a,!1,!1,c);else!this.settings.core.multiple&&(c.metaKey||c.ctrlKey||c.shiftKey)&&this.is_selected(a)?this.deselect_node(a,!1,c):(this.deselect_all(!0),this.select_node(a,!1,!1,c),this._data.core.last_clicked=this.get_node(a));this.trigger("activate_node",{node:this.get_node(a),event:c})},hover_node:function(a){if(a=this.get_node(a,!0),!a||!a.length||a.children(".jstree-hovered").length)return!1;var b=this.element.find(".jstree-hovered"),c=this.element;b&&b.length&&this.dehover_node(b),a.children(".jstree-anchor").addClass("jstree-hovered"),this.trigger("hover_node",{node:this.get_node(a)}),setTimeout(function(){c.attr("aria-activedescendant",a[0].id)},0)},dehover_node:function(a){return a=this.get_node(a,!0),a&&a.length&&a.children(".jstree-hovered").length?(a.children(".jstree-anchor").removeClass("jstree-hovered"),void this.trigger("dehover_node",{node:this.get_node(a)})):!1},select_node:function(b,c,d,e){var f,g,h,i;if(a.isArray(b)){for(b=b.slice(),g=0,h=b.length;h>g;g++)this.select_node(b[g],c,d,e);return!0}return b=this.get_node(b),b&&b.id!==a.jstree.root?(f=this.get_node(b,!0),void(b.state.selected||(b.state.selected=!0,this._data.core.selected.push(b.id),d||(f=this._open_to(b)),f&&f.length&&f.attr("aria-selected",!0).children(".jstree-anchor").addClass("jstree-clicked"),this.trigger("select_node",{node:b,selected:this._data.core.selected,event:e}),c||this.trigger("changed",{action:"select_node",node:b,selected:this._data.core.selected,event:e})))):!1},deselect_node:function(b,c,d){var e,f,g;if(a.isArray(b)){for(b=b.slice(),e=0,f=b.length;f>e;e++)this.deselect_node(b[e],c,d);return!0}return b=this.get_node(b),b&&b.id!==a.jstree.root?(g=this.get_node(b,!0),void(b.state.selected&&(b.state.selected=!1,this._data.core.selected=a.vakata.array_remove_item(this._data.core.selected,b.id),g.length&&g.attr("aria-selected",!1).children(".jstree-anchor").removeClass("jstree-clicked"),this.trigger("deselect_node",{node:b,selected:this._data.core.selected,event:d}),c||this.trigger("changed",{action:"deselect_node",node:b,selected:this._data.core.selected,event:d})))):!1},select_all:function(b){var c=this._data.core.selected.concat([]),d,e;for(this._data.core.selected=this._model.data[a.jstree.root].children_d.concat(),d=0,e=this._data.core.selected.length;e>d;d++)this._model.data[this._data.core.selected[d]]&&(this._model.data[this._data.core.selected[d]].state.selected=!0);this.redraw(!0),this.trigger("select_all",{selected:this._data.core.selected}),b||this.trigger("changed",{action:"select_all",selected:this._data.core.selected,old_selection:c})},deselect_all:function(a){var b=this._data.core.selected.concat([]),c,d;for(c=0,d=this._data.core.selected.length;d>c;c++)this._model.data[this._data.core.selected[c]]&&(this._model.data[this._data.core.selected[c]].state.selected=!1);this._data.core.selected=[],this.element.find(".jstree-clicked").removeClass("jstree-clicked").parent().attr("aria-selected",!1),this.trigger("deselect_all",{selected:this._data.core.selected,node:b}),a||this.trigger("changed",{action:"deselect_all",selected:this._data.core.selected,old_selection:b})},is_selected:function(b){return b=this.get_node(b),b&&b.id!==a.jstree.root?b.state.selected:!1},get_selected:function(b){return b?a.map(this._data.core.selected,a.proxy(function(a){return this.get_node(a)},this)):this._data.core.selected.slice()},get_top_selected:function(b){var c=this.get_selected(!0),d={},e,f,g,h;for(e=0,f=c.length;f>e;e++)d[c[e].id]=c[e];for(e=0,f=c.length;f>e;e++)for(g=0,h=c[e].children_d.length;h>g;g++)d[c[e].children_d[g]]&&delete d[c[e].children_d[g]];c=[];for(e in d)d.hasOwnProperty(e)&&c.push(e);return b?a.map(c,a.proxy(function(a){return this.get_node(a)},this)):c},get_bottom_selected:function(b){var c=this.get_selected(!0),d=[],e,f;for(e=0,f=c.length;f>e;e++)c[e].children.length||d.push(c[e].id);return b?a.map(d,a.proxy(function(a){return this.get_node(a)},this)):d},get_state:function(){var b={core:{open:[],scroll:{left:this.element.scrollLeft(),top:this.element.scrollTop()},selected:[]}},c;for(c in this._model.data)this._model.data.hasOwnProperty(c)&&c!==a.jstree.root&&(this._model.data[c].state.opened&&b.core.open.push(c),this._model.data[c].state.selected&&b.core.selected.push(c));return b},set_state:function(c,d){if(c){if(c.core){var e,f,g,h,i;if(c.core.open)return a.isArray(c.core.open)&&c.core.open.length?this._load_nodes(c.core.open,function(a){this.open_node(a,!1,0),delete c.core.open,this.set_state(c,d)},!0):(delete c.core.open,this.set_state(c,d)),!1;if(c.core.scroll)return c.core.scroll&&c.core.scroll.left!==b&&this.element.scrollLeft(c.core.scroll.left),c.core.scroll&&c.core.scroll.top!==b&&this.element.scrollTop(c.core.scroll.top),delete c.core.scroll,this.set_state(c,d),!1;if(c.core.selected)return h=this,this.deselect_all(),a.each(c.core.selected,function(a,b){h.select_node(b,!1,!0)}),delete c.core.selected,this.set_state(c,d),!1;for(i in c)c.hasOwnProperty(i)&&"core"!==i&&-1===a.inArray(i,this.settings.plugins)&&delete c[i];if(a.isEmptyObject(c.core))return delete c.core,this.set_state(c,d),!1}return a.isEmptyObject(c)?(c=null,d&&d.call(this),this.trigger("set_state"),!1):!0}return!1},refresh:function(b,c){this._data.core.state=c===!0?{}:this.get_state(),c&&a.isFunction(c)&&(this._data.core.state=c.call(this,this._data.core.state)),this._cnt=0,this._model.data={},this._model.data[a.jstree.root]={id:a.jstree.root,parent:null,parents:[],children:[],children_d:[],state:{loaded:!1}},this._data.core.selected=[],this._data.core.last_clicked=null,this._data.core.focused=null;var d=this.get_container_ul()[0].className;b||(this.element.html("<ul class='"+d+"' role='group'><li class='jstree-initial-node jstree-loading jstree-leaf jstree-last' role='treeitem' id='j"+this._id+"_loading'><i class='jstree-icon jstree-ocl'></i><a class='jstree-anchor' href='#'><i class='jstree-icon jstree-themeicon-hidden'></i>"+this.get_string("Loading ...")+"</a></li></ul>"),this.element.attr("aria-activedescendant","j"+this._id+"_loading")),this.load_node(a.jstree.root,function(b,c){c&&(this.get_container_ul()[0].className=d,this._firstChild(this.get_container_ul()[0])&&this.element.attr("aria-activedescendant",this._firstChild(this.get_container_ul()[0]).id),this.set_state(a.extend(!0,{},this._data.core.state),function(){this.trigger("refresh")})),this._data.core.state=null})},refresh_node:function(b){if(b=this.get_node(b),!b||b.id===a.jstree.root)return!1;var c=[],d=[],e=this._data.core.selected.concat([]);d.push(b.id),b.state.opened===!0&&c.push(b.id),this.get_node(b,!0).find(".jstree-open").each(function(){c.push(this.id)}),this._load_nodes(d,a.proxy(function(a){this.open_node(c,!1,0),this.select_node(this._data.core.selected),this.trigger("refresh_node",{node:b,nodes:a})},this))},set_id:function(b,c){if(b=this.get_node(b),!b||b.id===a.jstree.root)return!1;var d,e,f=this._model.data;for(c=c.toString(),f[b.parent].children[a.inArray(b.id,f[b.parent].children)]=c,d=0,e=b.parents.length;e>d;d++)f[b.parents[d]].children_d[a.inArray(b.id,f[b.parents[d]].children_d)]=c;for(d=0,e=b.children.length;e>d;d++)f[b.children[d]].parent=c;for(d=0,e=b.children_d.length;e>d;d++)f[b.children_d[d]].parents[a.inArray(b.id,f[b.children_d[d]].parents)]=c;return d=a.inArray(b.id,this._data.core.selected),-1!==d&&(this._data.core.selected[d]=c),d=this.get_node(b.id,!0),d&&(d.attr("id",c).children(".jstree-anchor").attr("id",c+"_anchor").end().attr("aria-labelledby",c+"_anchor"),this.element.attr("aria-activedescendant")===b.id&&this.element.attr("aria-activedescendant",c)),delete f[b.id],b.id=c,b.li_attr.id=c,f[c]=b,!0},get_text:function(b){return b=this.get_node(b),b&&b.id!==a.jstree.root?b.text:!1},set_text:function(b,c){var d,e;if(a.isArray(b)){for(b=b.slice(),d=0,e=b.length;e>d;d++)this.set_text(b[d],c);return!0}return b=this.get_node(b),b&&b.id!==a.jstree.root?(b.text=c,this.get_node(b,!0).length&&this.redraw_node(b.id),this.trigger("set_text",{obj:b,text:c}),!0):!1},get_json:function(b,c,d){if(b=this.get_node(b||a.jstree.root),!b)return!1;c&&c.flat&&!d&&(d=[]);var e={id:b.id,text:b.text,icon:this.get_icon(b),li_attr:a.extend(!0,{},b.li_attr),a_attr:a.extend(!0,{},b.a_attr),state:{},data:c&&c.no_data?!1:a.extend(!0,{},b.data)},f,g;if(c&&c.flat?e.parent=b.parent:e.children=[],!c||!c.no_state)for(f in b.state)b.state.hasOwnProperty(f)&&(e.state[f]=b.state[f]);if(c&&c.no_id&&(delete e.id,e.li_attr&&e.li_attr.id&&delete e.li_attr.id,e.a_attr&&e.a_attr.id&&delete e.a_attr.id),c&&c.flat&&b.id!==a.jstree.root&&d.push(e),!c||!c.no_children)for(f=0,g=b.children.length;g>f;f++)c&&c.flat?this.get_json(b.children[f],c,d):e.children.push(this.get_json(b.children[f],c));return c&&c.flat?d:b.id===a.jstree.root?e.children:e},create_node:function(c,d,e,f,g){if(null===c&&(c=a.jstree.root),c=this.get_node(c),!c)return!1;if(e=e===b?"last":e,!e.toString().match(/^(before|after)$/)&&!g&&!this.is_loaded(c))return this.load_node(c,function(){this.create_node(c,d,e,f,!0)});d||(d={text:this.get_string("New node")}),"string"==typeof d&&(d={text:d}),d.text===b&&(d.text=this.get_string("New node"));var h,i,j,k;switch(c.id===a.jstree.root&&("before"===e&&(e="first"),"after"===e&&(e="last")),e){case"before":h=this.get_node(c.parent),e=a.inArray(c.id,h.children),c=h;break;case"after":h=this.get_node(c.parent),e=a.inArray(c.id,h.children)+1,c=h;break;case"inside":case"first":e=0;break;case"last":e=c.children.length;break;default:e||(e=0)}if(e>c.children.length&&(e=c.children.length),d.id||(d.id=!0),!this.check("create_node",d,c,e))return this.settings.core.error.call(this,this._data.core.last_error),!1;if(d.id===!0&&delete d.id,d=this._parse_model_from_json(d,c.id,c.parents.concat()),!d)return!1;for(h=this.get_node(d),i=[],i.push(d),i=i.concat(h.children_d),this.trigger("model",{nodes:i,parent:c.id}),c.children_d=c.children_d.concat(i),j=0,k=c.parents.length;k>j;j++)this._model.data[c.parents[j]].children_d=this._model.data[c.parents[j]].children_d.concat(i);for(d=h,h=[],j=0,k=c.children.length;k>j;j++)h[j>=e?j+1:j]=c.children[j];return h[e]=d.id,c.children=h,this.redraw_node(c,!0),f&&f.call(this,this.get_node(d)),this.trigger("create_node",{node:this.get_node(d),parent:c.id,position:e}),d.id},rename_node:function(b,c){var d,e,f;if(a.isArray(b)){for(b=b.slice(),d=0,e=b.length;e>d;d++)this.rename_node(b[d],c);return!0}return b=this.get_node(b),b&&b.id!==a.jstree.root?(f=b.text,this.check("rename_node",b,this.get_parent(b),c)?(this.set_text(b,c),this.trigger("rename_node",{node:b,text:c,old:f}),!0):(this.settings.core.error.call(this,this._data.core.last_error),!1)):!1},delete_node:function(b){var c,d,e,f,g,h,i,j,k,l,m,n;if(a.isArray(b)){for(b=b.slice(),c=0,d=b.length;d>c;c++)this.delete_node(b[c]);return!0}if(b=this.get_node(b),!b||b.id===a.jstree.root)return!1;if(e=this.get_node(b.parent),f=a.inArray(b.id,e.children),l=!1,!this.check("delete_node",b,e,f))return this.settings.core.error.call(this,this._data.core.last_error),!1;for(-1!==f&&(e.children=a.vakata.array_remove(e.children,f)),g=b.children_d.concat([]),g.push(b.id),j=0,k=g.length;k>j;j++){for(h=0,i=b.parents.length;i>h;h++)f=a.inArray(g[j],this._model.data[b.parents[h]].children_d),-1!==f&&(this._model.data[b.parents[h]].children_d=a.vakata.array_remove(this._model.data[b.parents[h]].children_d,f));this._model.data[g[j]].state.selected&&(l=!0,f=a.inArray(g[j],this._data.core.selected),-1!==f&&(this._data.core.selected=a.vakata.array_remove(this._data.core.selected,f)))}for(this.trigger("delete_node",{node:b,parent:e.id}),l&&this.trigger("changed",{action:"delete_node",node:b,selected:this._data.core.selected,parent:e.id}),j=0,k=g.length;k>j;j++)delete this._model.data[g[j]];return-1!==a.inArray(this._data.core.focused,g)&&(this._data.core.focused=null,m=this.element[0].scrollTop,n=this.element[0].scrollLeft,e.id===a.jstree.root?this.get_node(this._model.data[a.jstree.root].children[0],!0).children(".jstree-anchor").focus():this.get_node(e,!0).children(".jstree-anchor").focus(),this.element[0].scrollTop=m,this.element[0].scrollLeft=n),this.redraw_node(e,!0),!0},check:function(b,c,d,e,f){c=c&&c.id?c:this.get_node(c),d=d&&d.id?d:this.get_node(d);var g=b.match(/^move_node|copy_node|create_node$/i)?d:c,h=this.settings.core.check_callback;return"move_node"!==b&&"copy_node"!==b||f&&f.is_multi||c.id!==d.id&&a.inArray(c.id,d.children)!==e&&-1===a.inArray(d.id,c.children_d)?(g&&g.data&&(g=g.data),g&&g.functions&&(g.functions[b]===!1||g.functions[b]===!0)?(g.functions[b]===!1&&(this._data.core.last_error={error:"check",plugin:"core",id:"core_02",reason:"Node data prevents function: "+b,data:JSON.stringify({chk:b,pos:e,obj:c&&c.id?c.id:!1,par:d&&d.id?d.id:!1})}),g.functions[b]):h===!1||a.isFunction(h)&&h.call(this,b,c,d,e,f)===!1||h&&h[b]===!1?(this._data.core.last_error={error:"check",plugin:"core",id:"core_03",reason:"User config for core.check_callback prevents function: "+b,data:JSON.stringify({chk:b,pos:e,obj:c&&c.id?c.id:!1,par:d&&d.id?d.id:!1})},!1):!0):(this._data.core.last_error={error:"check",plugin:"core",id:"core_01",reason:"Moving parent inside child",data:JSON.stringify({chk:b,pos:e,obj:c&&c.id?c.id:!1,par:d&&d.id?d.id:!1})},!1)},last_error:function(){return this._data.core.last_error},move_node:function(c,d,e,f,g,h,i){var j,k,l,m,n,o,p,q,r,s,t,u,v,w;if(d=this.get_node(d),e=e===b?0:e,!d)return!1;if(!e.toString().match(/^(before|after)$/)&&!g&&!this.is_loaded(d))return this.load_node(d,function(){this.move_node(c,d,e,f,!0,!1,i)});if(a.isArray(c)){if(1!==c.length){for(j=0,k=c.length;k>j;j++)(r=this.move_node(c[j],d,e,f,g,!1,i))&&(d=r,e="after");return this.redraw(),!0}c=c[0]}if(c=c&&c.id?c:this.get_node(c),!c||c.id===a.jstree.root)return!1;if(l=(c.parent||a.jstree.root).toString(),n=e.toString().match(/^(before|after)$/)&&d.id!==a.jstree.root?this.get_node(d.parent):d,o=i?i:this._model.data[c.id]?this:a.jstree.reference(c.id),p=!o||!o._id||this._id!==o._id,m=o&&o._id&&l&&o._model.data[l]&&o._model.data[l].children?a.inArray(c.id,o._model.data[l].children):-1,o&&o._id&&(c=o._model.data[c.id]),p)return(r=this.copy_node(c,d,e,f,g,!1,i))?(o&&o.delete_node(c),r):!1;switch(d.id===a.jstree.root&&("before"===e&&(e="first"),"after"===e&&(e="last")),e){case"before":e=a.inArray(d.id,n.children);break;case"after":e=a.inArray(d.id,n.children)+1;break;case"inside":case"first":e=0;break;case"last":e=n.children.length;break;default:e||(e=0)}if(e>n.children.length&&(e=n.children.length),!this.check("move_node",c,n,e,{core:!0,origin:i,is_multi:o&&o._id&&o._id!==this._id,is_foreign:!o||!o._id}))return this.settings.core.error.call(this,this._data.core.last_error),!1;if(c.parent===n.id){for(q=n.children.concat(),r=a.inArray(c.id,q),-1!==r&&(q=a.vakata.array_remove(q,r),e>r&&e--),r=[],s=0,t=q.length;t>s;s++)r[s>=e?s+1:s]=q[s];r[e]=c.id,n.children=r,this._node_changed(n.id),this.redraw(n.id===a.jstree.root)}else{for(r=c.children_d.concat(),r.push(c.id),s=0,t=c.parents.length;t>s;s++){for(q=[],w=o._model.data[c.parents[s]].children_d,u=0,v=w.length;v>u;u++)-1===a.inArray(w[u],r)&&q.push(w[u]);o._model.data[c.parents[s]].children_d=q}for(o._model.data[l].children=a.vakata.array_remove_item(o._model.data[l].children,c.id),s=0,t=n.parents.length;t>s;s++)this._model.data[n.parents[s]].children_d=this._model.data[n.parents[s]].children_d.concat(r);for(q=[],s=0,t=n.children.length;t>s;s++)q[s>=e?s+1:s]=n.children[s];for(q[e]=c.id,n.children=q,n.children_d.push(c.id),n.children_d=n.children_d.concat(c.children_d),c.parent=n.id,r=n.parents.concat(),r.unshift(n.id),w=c.parents.length,c.parents=r,r=r.concat(),s=0,t=c.children_d.length;t>s;s++)this._model.data[c.children_d[s]].parents=this._model.data[c.children_d[s]].parents.slice(0,-1*w),Array.prototype.push.apply(this._model.data[c.children_d[s]].parents,r);(l===a.jstree.root||n.id===a.jstree.root)&&(this._model.force_full_redraw=!0),this._model.force_full_redraw||(this._node_changed(l),this._node_changed(n.id)),h||this.redraw()}return f&&f.call(this,c,n,e),this.trigger("move_node",{node:c,parent:n.id,position:e,old_parent:l,old_position:m,is_multi:o&&o._id&&o._id!==this._id,is_foreign:!o||!o._id,old_instance:o,new_instance:this}),c.id},copy_node:function(c,d,e,f,g,h,i){var j,k,l,m,n,o,p,q,r,s,t;if(d=this.get_node(d),e=e===b?0:e,!d)return!1;if(!e.toString().match(/^(before|after)$/)&&!g&&!this.is_loaded(d))return this.load_node(d,function(){this.copy_node(c,d,e,f,!0,!1,i)});if(a.isArray(c)){if(1!==c.length){for(j=0,k=c.length;k>j;j++)(m=this.copy_node(c[j],d,e,f,g,!0,i))&&(d=m,e="after");return this.redraw(),!0}c=c[0]}if(c=c&&c.id?c:this.get_node(c),!c||c.id===a.jstree.root)return!1;switch(q=(c.parent||a.jstree.root).toString(),r=e.toString().match(/^(before|after)$/)&&d.id!==a.jstree.root?this.get_node(d.parent):d,s=i?i:this._model.data[c.id]?this:a.jstree.reference(c.id),t=!s||!s._id||this._id!==s._id,s&&s._id&&(c=s._model.data[c.id]),d.id===a.jstree.root&&("before"===e&&(e="first"),"after"===e&&(e="last")),e){case"before":e=a.inArray(d.id,r.children);break;case"after":e=a.inArray(d.id,r.children)+1;break;case"inside":case"first":e=0;break;case"last":e=r.children.length;break;default:e||(e=0)}if(e>r.children.length&&(e=r.children.length),!this.check("copy_node",c,r,e,{core:!0,origin:i,is_multi:s&&s._id&&s._id!==this._id,is_foreign:!s||!s._id}))return this.settings.core.error.call(this,this._data.core.last_error),!1;if(p=s?s.get_json(c,{no_id:!0,no_data:!0,no_state:!0}):c,!p)return!1;if(p.id===!0&&delete p.id,p=this._parse_model_from_json(p,r.id,r.parents.concat()),!p)return!1;for(m=this.get_node(p),c&&c.state&&c.state.loaded===!1&&(m.state.loaded=!1),l=[],l.push(p),l=l.concat(m.children_d),this.trigger("model",{nodes:l,parent:r.id}),n=0,o=r.parents.length;o>n;n++)this._model.data[r.parents[n]].children_d=this._model.data[r.parents[n]].children_d.concat(l);for(l=[],n=0,o=r.children.length;o>n;n++)l[n>=e?n+1:n]=r.children[n];return l[e]=m.id,r.children=l,r.children_d.push(m.id),r.children_d=r.children_d.concat(m.children_d),r.id===a.jstree.root&&(this._model.force_full_redraw=!0),this._model.force_full_redraw||this._node_changed(r.id),h||this.redraw(r.id===a.jstree.root),f&&f.call(this,m,r,e),this.trigger("copy_node",{node:m,original:c,parent:r.id,position:e,old_parent:q,old_position:s&&s._id&&q&&s._model.data[q]&&s._model.data[q].children?a.inArray(c.id,s._model.data[q].children):-1,is_multi:s&&s._id&&s._id!==this._id,is_foreign:!s||!s._id,old_instance:s,new_instance:this}),m.id},cut:function(b){if(b||(b=this._data.core.selected.concat()),a.isArray(b)||(b=[b]),!b.length)return!1;var c=[],g,h,i;for(h=0,i=b.length;i>h;h++)g=this.get_node(b[h]),g&&g.id&&g.id!==a.jstree.root&&c.push(g);return c.length?(d=c,f=this,e="move_node",void this.trigger("cut",{node:b})):!1},copy:function(b){if(b||(b=this._data.core.selected.concat()),a.isArray(b)||(b=[b]),!b.length)return!1;var c=[],g,h,i;for(h=0,i=b.length;i>h;h++)g=this.get_node(b[h]),g&&g.id&&g.id!==a.jstree.root&&c.push(g);return c.length?(d=c,f=this,e="copy_node",void this.trigger("copy",{node:b})):!1},get_buffer:function(){return{mode:e,node:d,inst:f}},can_paste:function(){return e!==!1&&d!==!1},paste:function(a,b){return a=this.get_node(a),a&&e&&e.match(/^(copy_node|move_node)$/)&&d?(this[e](d,a,b,!1,!1,!1,f)&&this.trigger("paste",{parent:a.id,node:d,mode:e}),d=!1,e=!1,void(f=!1)):!1},clear_buffer:function(){d=!1,e=!1,f=!1,this.trigger("clear_buffer")},edit:function(b,c,d){var e,f,g,h,i,j,k,l,m,n=!1;return(b=this.get_node(b))?this.settings.core.check_callback===!1?(this._data.core.last_error={error:"check",plugin:"core",id:"core_07",reason:"Could not edit node because of check_callback"},this.settings.core.error.call(this,this._data.core.last_error),!1):(m=b,c="string"==typeof c?c:b.text,this.set_text(b,""),b=this._open_to(b),m.text=c,e=this._data.core.rtl,f=this.element.width(),this._data.core.focused=m.id,g=b.children(".jstree-anchor").focus(),h=a("<span>"),i=c,j=a("<div />",{css:{position:"absolute",top:"-200px",left:e?"0px":"-1000px",visibility:"hidden"}}).appendTo("body"),k=a("<input />",{value:i,"class":"jstree-rename-input",css:{padding:"0",border:"1px solid silver","box-sizing":"border-box",display:"inline-block",height:this._data.core.li_height+"px",lineHeight:this._data.core.li_height+"px",width:"150px"},blur:a.proxy(function(c){c.stopImmediatePropagation(),c.preventDefault();var e=h.children(".jstree-rename-input"),f=e.val(),k=this.settings.core.force_text,l;""===f&&(f=i),j.remove(),h.replaceWith(g),h.remove(),i=k?i:a("<div></div>").append(a.parseHTML(i)).html(),this.set_text(b,i),l=!!this.rename_node(b,k?a("<div></div>").text(f).text():a("<div></div>").append(a.parseHTML(f)).html()),l||this.set_text(b,i),this._data.core.focused=m.id,setTimeout(a.proxy(function(){var a=this.get_node(m.id,!0);a.length&&(this._data.core.focused=m.id,a.children(".jstree-anchor").focus())},this),0),d&&d.call(this,m,l,n)},this),keydown:function(a){var b=a.which;27===b&&(n=!0,this.value=i),(27===b||13===b||37===b||38===b||39===b||40===b||32===b)&&a.stopImmediatePropagation(),(27===b||13===b)&&(a.preventDefault(),this.blur())},click:function(a){a.stopImmediatePropagation()},mousedown:function(a){a.stopImmediatePropagation()},keyup:function(a){k.width(Math.min(j.text("pW"+this.value).width(),f))},keypress:function(a){return 13===a.which?!1:void 0}}),l={fontFamily:g.css("fontFamily")||"",fontSize:g.css("fontSize")||"",fontWeight:g.css("fontWeight")||"",fontStyle:g.css("fontStyle")||"",fontStretch:g.css("fontStretch")||"",fontVariant:g.css("fontVariant")||"",letterSpacing:g.css("letterSpacing")||"",wordSpacing:g.css("wordSpacing")||""},h.attr("class",g.attr("class")).append(g.contents().clone()).append(k),g.replaceWith(h),j.css(l),void k.css(l).width(Math.min(j.text("pW"+k[0].value).width(),f))[0].select()):!1},set_theme:function(b,c){if(!b)return!1;if(c===!0){var d=this.settings.core.themes.dir;d||(d=a.jstree.path+"/themes"),c=d+"/"+b+"/style.css"}c&&-1===a.inArray(c,g)&&(a("head").append('<link rel="stylesheet" href="'+c+'" type="text/css" />'),g.push(c)),this._data.core.themes.name&&this.element.removeClass("jstree-"+this._data.core.themes.name),
+this._data.core.themes.name=b,this.element.addClass("jstree-"+b),this.element[this.settings.core.themes.responsive?"addClass":"removeClass"]("jstree-"+b+"-responsive"),this.trigger("set_theme",{theme:b})},get_theme:function(){return this._data.core.themes.name},set_theme_variant:function(a){this._data.core.themes.variant&&this.element.removeClass("jstree-"+this._data.core.themes.name+"-"+this._data.core.themes.variant),this._data.core.themes.variant=a,a&&this.element.addClass("jstree-"+this._data.core.themes.name+"-"+this._data.core.themes.variant)},get_theme_variant:function(){return this._data.core.themes.variant},show_stripes:function(){this._data.core.themes.stripes=!0,this.get_container_ul().addClass("jstree-striped")},hide_stripes:function(){this._data.core.themes.stripes=!1,this.get_container_ul().removeClass("jstree-striped")},toggle_stripes:function(){this._data.core.themes.stripes?this.hide_stripes():this.show_stripes()},show_dots:function(){this._data.core.themes.dots=!0,this.get_container_ul().removeClass("jstree-no-dots")},hide_dots:function(){this._data.core.themes.dots=!1,this.get_container_ul().addClass("jstree-no-dots")},toggle_dots:function(){this._data.core.themes.dots?this.hide_dots():this.show_dots()},show_icons:function(){this._data.core.themes.icons=!0,this.get_container_ul().removeClass("jstree-no-icons")},hide_icons:function(){this._data.core.themes.icons=!1,this.get_container_ul().addClass("jstree-no-icons")},toggle_icons:function(){this._data.core.themes.icons?this.hide_icons():this.show_icons()},set_icon:function(c,d){var e,f,g,h;if(a.isArray(c)){for(c=c.slice(),e=0,f=c.length;f>e;e++)this.set_icon(c[e],d);return!0}return c=this.get_node(c),c&&c.id!==a.jstree.root?(h=c.icon,c.icon=d===!0||null===d||d===b||""===d?!0:d,g=this.get_node(c,!0).children(".jstree-anchor").children(".jstree-themeicon"),d===!1?this.hide_icon(c):d===!0||null===d||d===b||""===d?(g.removeClass("jstree-themeicon-custom "+h).css("background","").removeAttr("rel"),h===!1&&this.show_icon(c)):-1===d.indexOf("/")&&-1===d.indexOf(".")?(g.removeClass(h).css("background",""),g.addClass(d+" jstree-themeicon-custom").attr("rel",d),h===!1&&this.show_icon(c)):(g.removeClass(h).css("background",""),g.addClass("jstree-themeicon-custom").css("background","url('"+d+"') center center no-repeat").attr("rel",d),h===!1&&this.show_icon(c)),!0):!1},get_icon:function(b){return b=this.get_node(b),b&&b.id!==a.jstree.root?b.icon:!1},hide_icon:function(b){var c,d;if(a.isArray(b)){for(b=b.slice(),c=0,d=b.length;d>c;c++)this.hide_icon(b[c]);return!0}return b=this.get_node(b),b&&b!==a.jstree.root?(b.icon=!1,this.get_node(b,!0).children(".jstree-anchor").children(".jstree-themeicon").addClass("jstree-themeicon-hidden"),!0):!1},show_icon:function(b){var c,d,e;if(a.isArray(b)){for(b=b.slice(),c=0,d=b.length;d>c;c++)this.show_icon(b[c]);return!0}return b=this.get_node(b),b&&b!==a.jstree.root?(e=this.get_node(b,!0),b.icon=e.length?e.children(".jstree-anchor").children(".jstree-themeicon").attr("rel"):!0,b.icon||(b.icon=!0),e.children(".jstree-anchor").children(".jstree-themeicon").removeClass("jstree-themeicon-hidden"),!0):!1}},a.vakata={},a.vakata.attributes=function(b,c){b=a(b)[0];var d=c?{}:[];return b&&b.attributes&&a.each(b.attributes,function(b,e){-1===a.inArray(e.name.toLowerCase(),["style","contenteditable","hasfocus","tabindex"])&&null!==e.value&&""!==a.trim(e.value)&&(c?d[e.name]=e.value:d.push(e.name))}),d},a.vakata.array_unique=function(a){var c=[],d,e,f,g={};for(d=0,f=a.length;f>d;d++)g[a[d]]===b&&(c.push(a[d]),g[a[d]]=!0);return c},a.vakata.array_remove=function(a,b,c){var d=a.slice((c||b)+1||a.length);return a.length=0>b?a.length+b:b,a.push.apply(a,d),a},a.vakata.array_remove_item=function(b,c){var d=a.inArray(c,b);return-1!==d?a.vakata.array_remove(b,d):b},a.jstree.plugins.changed=function(a,b){var c=[];this.trigger=function(a,d){var e,f;if(d||(d={}),"changed"===a.replace(".jstree","")){d.changed={selected:[],deselected:[]};var g={};for(e=0,f=c.length;f>e;e++)g[c[e]]=1;for(e=0,f=d.selected.length;f>e;e++)g[d.selected[e]]?g[d.selected[e]]=2:d.changed.selected.push(d.selected[e]);for(e=0,f=c.length;f>e;e++)1===g[c[e]]&&d.changed.deselected.push(c[e]);c=d.selected.slice()}b.trigger.call(this,a,d)},this.refresh=function(a,d){return c=[],b.refresh.apply(this,arguments)}};var m=i.createElement("I");m.className="jstree-icon jstree-checkbox",m.setAttribute("role","presentation"),a.jstree.defaults.checkbox={visible:!0,three_state:!0,whole_node:!0,keep_selected_style:!0,cascade:"",tie_selection:!0},a.jstree.plugins.checkbox=function(c,d){this.bind=function(){d.bind.call(this),this._data.checkbox.uto=!1,this._data.checkbox.selected=[],this.settings.checkbox.three_state&&(this.settings.checkbox.cascade="up+down+undetermined"),this.element.on("init.jstree",a.proxy(function(){this._data.checkbox.visible=this.settings.checkbox.visible,this.settings.checkbox.keep_selected_style||this.element.addClass("jstree-checkbox-no-clicked"),this.settings.checkbox.tie_selection&&this.element.addClass("jstree-checkbox-selection")},this)).on("loading.jstree",a.proxy(function(){this[this._data.checkbox.visible?"show_checkboxes":"hide_checkboxes"]()},this)),-1!==this.settings.checkbox.cascade.indexOf("undetermined")&&this.element.on("changed.jstree uncheck_node.jstree check_node.jstree uncheck_all.jstree check_all.jstree move_node.jstree copy_node.jstree redraw.jstree open_node.jstree",a.proxy(function(){this._data.checkbox.uto&&clearTimeout(this._data.checkbox.uto),this._data.checkbox.uto=setTimeout(a.proxy(this._undetermined,this),50)},this)),this.settings.checkbox.tie_selection||this.element.on("model.jstree",a.proxy(function(a,b){var c=this._model.data,d=c[b.parent],e=b.nodes,f,g;for(f=0,g=e.length;g>f;f++)c[e[f]].state.checked=c[e[f]].state.checked||c[e[f]].original&&c[e[f]].original.state&&c[e[f]].original.state.checked,c[e[f]].state.checked&&this._data.checkbox.selected.push(e[f])},this)),(-1!==this.settings.checkbox.cascade.indexOf("up")||-1!==this.settings.checkbox.cascade.indexOf("down"))&&this.element.on("model.jstree",a.proxy(function(b,c){var d=this._model.data,e=d[c.parent],f=c.nodes,g=[],h,i,j,k,l,m,n=this.settings.checkbox.cascade,o=this.settings.checkbox.tie_selection;if(-1!==n.indexOf("down"))if(e.state[o?"selected":"checked"]){for(i=0,j=f.length;j>i;i++)d[f[i]].state[o?"selected":"checked"]=!0;this._data[o?"core":"checkbox"].selected=this._data[o?"core":"checkbox"].selected.concat(f)}else for(i=0,j=f.length;j>i;i++)if(d[f[i]].state[o?"selected":"checked"]){for(k=0,l=d[f[i]].children_d.length;l>k;k++)d[d[f[i]].children_d[k]].state[o?"selected":"checked"]=!0;this._data[o?"core":"checkbox"].selected=this._data[o?"core":"checkbox"].selected.concat(d[f[i]].children_d)}if(-1!==n.indexOf("up")){for(i=0,j=e.children_d.length;j>i;i++)d[e.children_d[i]].children.length||g.push(d[e.children_d[i]].parent);for(g=a.vakata.array_unique(g),k=0,l=g.length;l>k;k++){e=d[g[k]];while(e&&e.id!==a.jstree.root){for(h=0,i=0,j=e.children.length;j>i;i++)h+=d[e.children[i]].state[o?"selected":"checked"];if(h!==j)break;e.state[o?"selected":"checked"]=!0,this._data[o?"core":"checkbox"].selected.push(e.id),m=this.get_node(e,!0),m&&m.length&&m.attr("aria-selected",!0).children(".jstree-anchor").addClass(o?"jstree-clicked":"jstree-checked"),e=this.get_node(e.parent)}}}this._data[o?"core":"checkbox"].selected=a.vakata.array_unique(this._data[o?"core":"checkbox"].selected)},this)).on(this.settings.checkbox.tie_selection?"select_node.jstree":"check_node.jstree",a.proxy(function(b,c){var d=c.node,e=this._model.data,f=this.get_node(d.parent),g=this.get_node(d,!0),h,i,j,k,l=this.settings.checkbox.cascade,m=this.settings.checkbox.tie_selection;if(-1!==l.indexOf("down"))for(this._data[m?"core":"checkbox"].selected=a.vakata.array_unique(this._data[m?"core":"checkbox"].selected.concat(d.children_d)),h=0,i=d.children_d.length;i>h;h++)k=e[d.children_d[h]],k.state[m?"selected":"checked"]=!0,k&&k.original&&k.original.state&&k.original.state.undetermined&&(k.original.state.undetermined=!1);if(-1!==l.indexOf("up"))while(f&&f.id!==a.jstree.root){for(j=0,h=0,i=f.children.length;i>h;h++)j+=e[f.children[h]].state[m?"selected":"checked"];if(j!==i)break;f.state[m?"selected":"checked"]=!0,this._data[m?"core":"checkbox"].selected.push(f.id),k=this.get_node(f,!0),k&&k.length&&k.attr("aria-selected",!0).children(".jstree-anchor").addClass(m?"jstree-clicked":"jstree-checked"),f=this.get_node(f.parent)}-1!==l.indexOf("down")&&g.length&&g.find(".jstree-anchor").addClass(m?"jstree-clicked":"jstree-checked").parent().attr("aria-selected",!0)},this)).on(this.settings.checkbox.tie_selection?"deselect_all.jstree":"uncheck_all.jstree",a.proxy(function(b,c){var d=this.get_node(a.jstree.root),e=this._model.data,f,g,h;for(f=0,g=d.children_d.length;g>f;f++)h=e[d.children_d[f]],h&&h.original&&h.original.state&&h.original.state.undetermined&&(h.original.state.undetermined=!1)},this)).on(this.settings.checkbox.tie_selection?"deselect_node.jstree":"uncheck_node.jstree",a.proxy(function(b,c){var d=c.node,e=this.get_node(d,!0),f,g,h,i=this.settings.checkbox.cascade,j=this.settings.checkbox.tie_selection;if(d&&d.original&&d.original.state&&d.original.state.undetermined&&(d.original.state.undetermined=!1),-1!==i.indexOf("down"))for(f=0,g=d.children_d.length;g>f;f++)h=this._model.data[d.children_d[f]],h.state[j?"selected":"checked"]=!1,h&&h.original&&h.original.state&&h.original.state.undetermined&&(h.original.state.undetermined=!1);if(-1!==i.indexOf("up"))for(f=0,g=d.parents.length;g>f;f++)h=this._model.data[d.parents[f]],h.state[j?"selected":"checked"]=!1,h&&h.original&&h.original.state&&h.original.state.undetermined&&(h.original.state.undetermined=!1),h=this.get_node(d.parents[f],!0),h&&h.length&&h.attr("aria-selected",!1).children(".jstree-anchor").removeClass(j?"jstree-clicked":"jstree-checked");for(h=[],f=0,g=this._data[j?"core":"checkbox"].selected.length;g>f;f++)-1!==i.indexOf("down")&&-1!==a.inArray(this._data[j?"core":"checkbox"].selected[f],d.children_d)||-1!==i.indexOf("up")&&-1!==a.inArray(this._data[j?"core":"checkbox"].selected[f],d.parents)||h.push(this._data[j?"core":"checkbox"].selected[f]);this._data[j?"core":"checkbox"].selected=a.vakata.array_unique(h),-1!==i.indexOf("down")&&e.length&&e.find(".jstree-anchor").removeClass(j?"jstree-clicked":"jstree-checked").parent().attr("aria-selected",!1)},this)),-1!==this.settings.checkbox.cascade.indexOf("up")&&this.element.on("delete_node.jstree",a.proxy(function(b,c){var d=this.get_node(c.parent),e=this._model.data,f,g,h,i,j=this.settings.checkbox.tie_selection;while(d&&d.id!==a.jstree.root&&!d.state[j?"selected":"checked"]){for(h=0,f=0,g=d.children.length;g>f;f++)h+=e[d.children[f]].state[j?"selected":"checked"];if(!(g>0&&h===g))break;d.state[j?"selected":"checked"]=!0,this._data[j?"core":"checkbox"].selected.push(d.id),i=this.get_node(d,!0),i&&i.length&&i.attr("aria-selected",!0).children(".jstree-anchor").addClass(j?"jstree-clicked":"jstree-checked"),d=this.get_node(d.parent)}},this)).on("move_node.jstree",a.proxy(function(b,c){var d=c.is_multi,e=c.old_parent,f=this.get_node(c.parent),g=this._model.data,h,i,j,k,l,m=this.settings.checkbox.tie_selection;if(!d){h=this.get_node(e);while(h&&h.id!==a.jstree.root&&!h.state[m?"selected":"checked"]){for(i=0,j=0,k=h.children.length;k>j;j++)i+=g[h.children[j]].state[m?"selected":"checked"];if(!(k>0&&i===k))break;h.state[m?"selected":"checked"]=!0,this._data[m?"core":"checkbox"].selected.push(h.id),l=this.get_node(h,!0),l&&l.length&&l.attr("aria-selected",!0).children(".jstree-anchor").addClass(m?"jstree-clicked":"jstree-checked"),h=this.get_node(h.parent)}}h=f;while(h&&h.id!==a.jstree.root){for(i=0,j=0,k=h.children.length;k>j;j++)i+=g[h.children[j]].state[m?"selected":"checked"];if(i===k)h.state[m?"selected":"checked"]||(h.state[m?"selected":"checked"]=!0,this._data[m?"core":"checkbox"].selected.push(h.id),l=this.get_node(h,!0),l&&l.length&&l.attr("aria-selected",!0).children(".jstree-anchor").addClass(m?"jstree-clicked":"jstree-checked"));else{if(!h.state[m?"selected":"checked"])break;h.state[m?"selected":"checked"]=!1,this._data[m?"core":"checkbox"].selected=a.vakata.array_remove_item(this._data[m?"core":"checkbox"].selected,h.id),l=this.get_node(h,!0),l&&l.length&&l.attr("aria-selected",!1).children(".jstree-anchor").removeClass(m?"jstree-clicked":"jstree-checked")}h=this.get_node(h.parent)}},this))},this._undetermined=function(){if(null!==this.element){var c,d,e,f,g={},h=this._model.data,i=this.settings.checkbox.tie_selection,j=this._data[i?"core":"checkbox"].selected,k=[],l=this;for(c=0,d=j.length;d>c;c++)if(h[j[c]]&&h[j[c]].parents)for(e=0,f=h[j[c]].parents.length;f>e;e++)g[h[j[c]].parents[e]]===b&&h[j[c]].parents[e]!==a.jstree.root&&(g[h[j[c]].parents[e]]=!0,k.push(h[j[c]].parents[e]));for(this.element.find(".jstree-closed").not(":has(.jstree-children)").each(function(){var i=l.get_node(this),j;if(i.state.loaded){for(c=0,d=i.children_d.length;d>c;c++)if(j=h[i.children_d[c]],!j.state.loaded&&j.original&&j.original.state&&j.original.state.undetermined&&j.original.state.undetermined===!0)for(g[j.id]===b&&j.id!==a.jstree.root&&(g[j.id]=!0,k.push(j.id)),e=0,f=j.parents.length;f>e;e++)g[j.parents[e]]===b&&j.parents[e]!==a.jstree.root&&(g[j.parents[e]]=!0,k.push(j.parents[e]))}else if(i.original&&i.original.state&&i.original.state.undetermined&&i.original.state.undetermined===!0)for(g[i.id]===b&&i.id!==a.jstree.root&&(g[i.id]=!0,k.push(i.id)),e=0,f=i.parents.length;f>e;e++)g[i.parents[e]]===b&&i.parents[e]!==a.jstree.root&&(g[i.parents[e]]=!0,k.push(i.parents[e]))}),this.element.find(".jstree-undetermined").removeClass("jstree-undetermined"),c=0,d=k.length;d>c;c++)h[k[c]].state[i?"selected":"checked"]||(j=this.get_node(k[c],!0),j&&j.length&&j.children(".jstree-anchor").children(".jstree-checkbox").addClass("jstree-undetermined"))}},this.redraw_node=function(b,c,e,f){if(b=d.redraw_node.apply(this,arguments)){var g,h,i=null,j=null;for(g=0,h=b.childNodes.length;h>g;g++)if(b.childNodes[g]&&b.childNodes[g].className&&-1!==b.childNodes[g].className.indexOf("jstree-anchor")){i=b.childNodes[g];break}i&&(!this.settings.checkbox.tie_selection&&this._model.data[b.id].state.checked&&(i.className+=" jstree-checked"),j=m.cloneNode(!1),this._model.data[b.id].state.checkbox_disabled&&(j.className+=" jstree-checkbox-disabled"),i.insertBefore(j,i.childNodes[0]))}return e||-1===this.settings.checkbox.cascade.indexOf("undetermined")||(this._data.checkbox.uto&&clearTimeout(this._data.checkbox.uto),this._data.checkbox.uto=setTimeout(a.proxy(this._undetermined,this),50)),b},this.show_checkboxes=function(){this._data.core.themes.checkboxes=!0,this.get_container_ul().removeClass("jstree-no-checkboxes")},this.hide_checkboxes=function(){this._data.core.themes.checkboxes=!1,this.get_container_ul().addClass("jstree-no-checkboxes")},this.toggle_checkboxes=function(){this._data.core.themes.checkboxes?this.hide_checkboxes():this.show_checkboxes()},this.is_undetermined=function(b){b=this.get_node(b);var c=this.settings.checkbox.cascade,d,e,f=this.settings.checkbox.tie_selection,g=this._data[f?"core":"checkbox"].selected,h=this._model.data;if(!b||b.state[f?"selected":"checked"]===!0||-1===c.indexOf("undetermined")||-1===c.indexOf("down")&&-1===c.indexOf("up"))return!1;if(!b.state.loaded&&b.original.state.undetermined===!0)return!0;for(d=0,e=b.children_d.length;e>d;d++)if(-1!==a.inArray(b.children_d[d],g)||!h[b.children_d[d]].state.loaded&&h[b.children_d[d]].original.state.undetermined)return!0;return!1},this.disable_checkbox=function(b){var c,d,e;if(a.isArray(b)){for(b=b.slice(),c=0,d=b.length;d>c;c++)this.disable_checkbox(b[c]);return!0}return b=this.get_node(b),b&&b.id!==a.jstree.root?(e=this.get_node(b,!0),void(b.state.checkbox_disabled||(b.state.checkbox_disabled=!0,e&&e.length&&e.children(".jstree-anchor").children(".jstree-checkbox").addClass("jstree-checkbox-disabled"),this.trigger("disable_checkbox",{node:b})))):!1},this.enable_checkbox=function(b){var c,d,e;if(a.isArray(b)){for(b=b.slice(),c=0,d=b.length;d>c;c++)this.enable_checkbox(b[c]);return!0}return b=this.get_node(b),b&&b.id!==a.jstree.root?(e=this.get_node(b,!0),void(b.state.checkbox_disabled&&(b.state.checkbox_disabled=!1,e&&e.length&&e.children(".jstree-anchor").children(".jstree-checkbox").removeClass("jstree-checkbox-disabled"),this.trigger("enable_checkbox",{node:b})))):!1},this.activate_node=function(b,c){return a(c.target).hasClass("jstree-checkbox-disabled")?!1:(this.settings.checkbox.tie_selection&&(this.settings.checkbox.whole_node||a(c.target).hasClass("jstree-checkbox"))&&(c.ctrlKey=!0),this.settings.checkbox.tie_selection||!this.settings.checkbox.whole_node&&!a(c.target).hasClass("jstree-checkbox")?d.activate_node.call(this,b,c):this.is_disabled(b)?!1:(this.is_checked(b)?this.uncheck_node(b,c):this.check_node(b,c),void this.trigger("activate_node",{node:this.get_node(b)})))},this.check_node=function(b,c){if(this.settings.checkbox.tie_selection)return this.select_node(b,!1,!0,c);var d,e,f,g;if(a.isArray(b)){for(b=b.slice(),e=0,f=b.length;f>e;e++)this.check_node(b[e],c);return!0}return b=this.get_node(b),b&&b.id!==a.jstree.root?(d=this.get_node(b,!0),void(b.state.checked||(b.state.checked=!0,this._data.checkbox.selected.push(b.id),d&&d.length&&d.children(".jstree-anchor").addClass("jstree-checked"),this.trigger("check_node",{node:b,selected:this._data.checkbox.selected,event:c})))):!1},this.uncheck_node=function(b,c){if(this.settings.checkbox.tie_selection)return this.deselect_node(b,!1,c);var d,e,f;if(a.isArray(b)){for(b=b.slice(),d=0,e=b.length;e>d;d++)this.uncheck_node(b[d],c);return!0}return b=this.get_node(b),b&&b.id!==a.jstree.root?(f=this.get_node(b,!0),void(b.state.checked&&(b.state.checked=!1,this._data.checkbox.selected=a.vakata.array_remove_item(this._data.checkbox.selected,b.id),f.length&&f.children(".jstree-anchor").removeClass("jstree-checked"),this.trigger("uncheck_node",{node:b,selected:this._data.checkbox.selected,event:c})))):!1},this.check_all=function(){if(this.settings.checkbox.tie_selection)return this.select_all();var b=this._data.checkbox.selected.concat([]),c,d;for(this._data.checkbox.selected=this._model.data[a.jstree.root].children_d.concat(),c=0,d=this._data.checkbox.selected.length;d>c;c++)this._model.data[this._data.checkbox.selected[c]]&&(this._model.data[this._data.checkbox.selected[c]].state.checked=!0);this.redraw(!0),this.trigger("check_all",{selected:this._data.checkbox.selected})},this.uncheck_all=function(){if(this.settings.checkbox.tie_selection)return this.deselect_all();var a=this._data.checkbox.selected.concat([]),b,c;for(b=0,c=this._data.checkbox.selected.length;c>b;b++)this._model.data[this._data.checkbox.selected[b]]&&(this._model.data[this._data.checkbox.selected[b]].state.checked=!1);this._data.checkbox.selected=[],this.element.find(".jstree-checked").removeClass("jstree-checked"),this.trigger("uncheck_all",{selected:this._data.checkbox.selected,node:a})},this.is_checked=function(b){return this.settings.checkbox.tie_selection?this.is_selected(b):(b=this.get_node(b),b&&b.id!==a.jstree.root?b.state.checked:!1)},this.get_checked=function(b){return this.settings.checkbox.tie_selection?this.get_selected(b):b?a.map(this._data.checkbox.selected,a.proxy(function(a){return this.get_node(a)},this)):this._data.checkbox.selected},this.get_top_checked=function(b){if(this.settings.checkbox.tie_selection)return this.get_top_selected(b);var c=this.get_checked(!0),d={},e,f,g,h;for(e=0,f=c.length;f>e;e++)d[c[e].id]=c[e];for(e=0,f=c.length;f>e;e++)for(g=0,h=c[e].children_d.length;h>g;g++)d[c[e].children_d[g]]&&delete d[c[e].children_d[g]];c=[];for(e in d)d.hasOwnProperty(e)&&c.push(e);return b?a.map(c,a.proxy(function(a){return this.get_node(a)},this)):c},this.get_bottom_checked=function(b){if(this.settings.checkbox.tie_selection)return this.get_bottom_selected(b);var c=this.get_checked(!0),d=[],e,f;for(e=0,f=c.length;f>e;e++)c[e].children.length||d.push(c[e].id);return b?a.map(d,a.proxy(function(a){return this.get_node(a)},this)):d},this.load_node=function(b,c){var e,f,g,h,i,j;if(!a.isArray(b)&&!this.settings.checkbox.tie_selection&&(j=this.get_node(b),j&&j.state.loaded))for(e=0,f=j.children_d.length;f>e;e++)this._model.data[j.children_d[e]].state.checked&&(i=!0,this._data.checkbox.selected=a.vakata.array_remove_item(this._data.checkbox.selected,j.children_d[e]));return d.load_node.apply(this,arguments)},this.get_state=function(){var a=d.get_state.apply(this,arguments);return this.settings.checkbox.tie_selection?a:(a.checkbox=this._data.checkbox.selected.slice(),a)},this.set_state=function(b,c){var e=d.set_state.apply(this,arguments);if(e&&b.checkbox){if(!this.settings.checkbox.tie_selection){this.uncheck_all();var f=this;a.each(b.checkbox,function(a,b){f.check_node(b)})}return delete b.checkbox,this.set_state(b,c),!1}return e},this.refresh=function(a,b){return this.settings.checkbox.tie_selection||(this._data.checkbox.selected=[]),d.refresh.apply(this,arguments)}},a.jstree.defaults.conditionalselect=function(){return!0},a.jstree.plugins.conditionalselect=function(a,b){this.activate_node=function(a,c){this.settings.conditionalselect.call(this,this.get_node(a),c)&&b.activate_node.call(this,a,c)}},a.jstree.defaults.contextmenu={select_node:!0,show_at_node:!0,items:function(b,c){return{create:{separator_before:!1,separator_after:!0,_disabled:!1,label:"Create",action:function(b){var c=a.jstree.reference(b.reference),d=c.get_node(b.reference);c.create_node(d,{},"last",function(a){setTimeout(function(){c.edit(a)},0)})}},rename:{separator_before:!1,separator_after:!1,_disabled:!1,label:"Rename",action:function(b){var c=a.jstree.reference(b.reference),d=c.get_node(b.reference);c.edit(d)}},remove:{separator_before:!1,icon:!1,separator_after:!1,_disabled:!1,label:"Delete",action:function(b){var c=a.jstree.reference(b.reference),d=c.get_node(b.reference);c.is_selected(d)?c.delete_node(c.get_selected()):c.delete_node(d)}},ccp:{separator_before:!0,icon:!1,separator_after:!1,label:"Edit",action:!1,submenu:{cut:{separator_before:!1,separator_after:!1,label:"Cut",action:function(b){var c=a.jstree.reference(b.reference),d=c.get_node(b.reference);c.is_selected(d)?c.cut(c.get_top_selected()):c.cut(d)}},copy:{separator_before:!1,icon:!1,separator_after:!1,label:"Copy",action:function(b){var c=a.jstree.reference(b.reference),d=c.get_node(b.reference);c.is_selected(d)?c.copy(c.get_top_selected()):c.copy(d)}},paste:{separator_before:!1,icon:!1,_disabled:function(b){return!a.jstree.reference(b.reference).can_paste()},separator_after:!1,label:"Paste",action:function(b){var c=a.jstree.reference(b.reference),d=c.get_node(b.reference);c.paste(d)}}}}}}},a.jstree.plugins.contextmenu=function(c,d){this.bind=function(){d.bind.call(this);var b=0,c=null,e,f;this.element.on("contextmenu.jstree",".jstree-anchor",a.proxy(function(a,d){a.preventDefault(),b=a.ctrlKey?+new Date:0,(d||c)&&(b=+new Date+1e4),c&&clearTimeout(c),this.is_loading(a.currentTarget)||this.show_contextmenu(a.currentTarget,a.pageX,a.pageY,a)},this)).on("click.jstree",".jstree-anchor",a.proxy(function(c){this._data.contextmenu.visible&&(!b||+new Date-b>250)&&a.vakata.context.hide(),b=0},this)).on("touchstart.jstree",".jstree-anchor",function(b){b.originalEvent&&b.originalEvent.changedTouches&&b.originalEvent.changedTouches[0]&&(e=b.pageX,f=b.pageY,c=setTimeout(function(){a(b.currentTarget).trigger("contextmenu",!0)},750))}).on("touchmove.vakata.jstree",function(a){c&&a.originalEvent&&a.originalEvent.changedTouches&&a.originalEvent.changedTouches[0]&&(Math.abs(e-a.pageX)>50||Math.abs(f-a.pageY)>50)&&clearTimeout(c)}).on("touchend.vakata.jstree",function(a){c&&clearTimeout(c)}),a(i).on("context_hide.vakata.jstree",a.proxy(function(){this._data.contextmenu.visible=!1},this))},this.teardown=function(){this._data.contextmenu.visible&&a.vakata.context.hide(),d.teardown.call(this)},this.show_contextmenu=function(c,d,e,f){if(c=this.get_node(c),!c||c.id===a.jstree.root)return!1;var g=this.settings.contextmenu,h=this.get_node(c,!0),i=h.children(".jstree-anchor"),j=!1,k=!1;(g.show_at_node||d===b||e===b)&&(j=i.offset(),d=j.left,e=j.top+this._data.core.li_height),this.settings.contextmenu.select_node&&!this.is_selected(c)&&this.activate_node(c,f),k=g.items,a.isFunction(k)&&(k=k.call(this,c,a.proxy(function(a){this._show_contextmenu(c,d,e,a)},this))),a.isPlainObject(k)&&this._show_contextmenu(c,d,e,k)},this._show_contextmenu=function(b,c,d,e){var f=this.get_node(b,!0),g=f.children(".jstree-anchor");a(i).one("context_show.vakata.jstree",a.proxy(function(b,c){var d="jstree-contextmenu jstree-"+this.get_theme()+"-contextmenu";a(c.element).addClass(d)},this)),this._data.contextmenu.visible=!0,a.vakata.context.show(g,{x:c,y:d},e),this.trigger("show_contextmenu",{node:b,x:c,y:d})}},function(a){var b=!1,c={element:!1,reference:!1,position_x:0,position_y:0,items:[],html:"",is_visible:!1};a.vakata.context={settings:{hide_onmouseleave:0,icons:!0},_trigger:function(b){a(i).triggerHandler("context_"+b+".vakata",{reference:c.reference,element:c.element,position:{x:c.position_x,y:c.position_y}})},_execute:function(b){return b=c.items[b],b&&(!b._disabled||a.isFunction(b._disabled)&&!b._disabled({item:b,reference:c.reference,element:c.element}))&&b.action?b.action.call(null,{item:b,reference:c.reference,element:c.element,position:{x:c.position_x,y:c.position_y}}):!1},_parse:function(b,d){if(!b)return!1;d||(c.html="",c.items=[]);var e="",f=!1,g;return d&&(e+="<ul>"),a.each(b,function(b,d){return d?(c.items.push(d),!f&&d.separator_before&&(e+="<li class='vakata-context-separator'><a href='#' "+(a.vakata.context.settings.icons?"":'style="margin-left:0px;"')+">&#160;</a></li>"),f=!1,e+="<li class='"+(d._class||"")+(d._disabled===!0||a.isFunction(d._disabled)&&d._disabled({item:d,reference:c.reference,element:c.element})?" vakata-contextmenu-disabled ":"")+"' "+(d.shortcut?" data-shortcut='"+d.shortcut+"' ":"")+">",e+="<a href='#' rel='"+(c.items.length-1)+"'>",a.vakata.context.settings.icons&&(e+="<i ",d.icon&&(e+=-1!==d.icon.indexOf("/")||-1!==d.icon.indexOf(".")?" style='background:url(\""+d.icon+"\") center center no-repeat' ":" class='"+d.icon+"' "),e+="></i><span class='vakata-contextmenu-sep'>&#160;</span>"),e+=(a.isFunction(d.label)?d.label({item:b,reference:c.reference,element:c.element}):d.label)+(d.shortcut?' <span class="vakata-contextmenu-shortcut vakata-contextmenu-shortcut-'+d.shortcut+'">'+(d.shortcut_label||"")+"</span>":"")+"</a>",d.submenu&&(g=a.vakata.context._parse(d.submenu,!0),g&&(e+=g)),e+="</li>",void(d.separator_after&&(e+="<li class='vakata-context-separator'><a href='#' "+(a.vakata.context.settings.icons?"":'style="margin-left:0px;"')+">&#160;</a></li>",f=!0))):!0}),e=e.replace(/<li class\='vakata-context-separator'\><\/li\>$/,""),d&&(e+="</ul>"),d||(c.html=e,a.vakata.context._trigger("parse")),e.length>10?e:!1},_show_submenu:function(c){if(c=a(c),c.length&&c.children("ul").length){var d=c.children("ul"),e=c.offset().left+c.outerWidth(),f=c.offset().top,g=d.width(),h=d.height(),i=a(window).width()+a(window).scrollLeft(),j=a(window).height()+a(window).scrollTop();b?c[e-(g+10+c.outerWidth())<0?"addClass":"removeClass"]("vakata-context-left"):c[e+g+10>i?"addClass":"removeClass"]("vakata-context-right"),f+h+10>j&&d.css("bottom","-1px"),d.show()}},show:function(d,e,f){var g,h,i,j,k,l,m,n,o=!0;switch(c.element&&c.element.length&&c.element.width(""),o){case!e&&!d:return!1;case!!e&&!!d:c.reference=d,c.position_x=e.x,c.position_y=e.y;break;case!e&&!!d:c.reference=d,g=d.offset(),c.position_x=g.left+d.outerHeight(),c.position_y=g.top;break;case!!e&&!d:c.position_x=e.x,c.position_y=e.y}d&&!f&&a(d).data("vakata_contextmenu")&&(f=a(d).data("vakata_contextmenu")),a.vakata.context._parse(f)&&c.element.html(c.html),c.items.length&&(c.element.appendTo("body"),h=c.element,i=c.position_x,j=c.position_y,k=h.width(),l=h.height(),m=a(window).width()+a(window).scrollLeft(),n=a(window).height()+a(window).scrollTop(),b&&(i-=h.outerWidth()-a(d).outerWidth(),i<a(window).scrollLeft()+20&&(i=a(window).scrollLeft()+20)),i+k+20>m&&(i=m-(k+20)),j+l+20>n&&(j=n-(l+20)),c.element.css({left:i,top:j}).show().find("a").first().focus().parent().addClass("vakata-context-hover"),c.is_visible=!0,a.vakata.context._trigger("show"))},hide:function(){c.is_visible&&(c.element.hide().find("ul").hide().end().find(":focus").blur().end().detach(),c.is_visible=!1,a.vakata.context._trigger("hide"))}},a(function(){b="rtl"===a("body").css("direction");var d=!1;c.element=a("<ul class='vakata-context'></ul>"),c.element.on("mouseenter","li",function(b){b.stopImmediatePropagation(),a.contains(this,b.relatedTarget)||(d&&clearTimeout(d),c.element.find(".vakata-context-hover").removeClass("vakata-context-hover").end(),a(this).siblings().find("ul").hide().end().end().parentsUntil(".vakata-context","li").addBack().addClass("vakata-context-hover"),a.vakata.context._show_submenu(this))}).on("mouseleave","li",function(b){a.contains(this,b.relatedTarget)||a(this).find(".vakata-context-hover").addBack().removeClass("vakata-context-hover")}).on("mouseleave",function(b){a(this).find(".vakata-context-hover").removeClass("vakata-context-hover"),a.vakata.context.settings.hide_onmouseleave&&(d=setTimeout(function(b){return function(){a.vakata.context.hide()}}(this),a.vakata.context.settings.hide_onmouseleave))}).on("click","a",function(b){b.preventDefault(),a(this).blur().parent().hasClass("vakata-context-disabled")||a.vakata.context._execute(a(this).attr("rel"))===!1||a.vakata.context.hide()}).on("keydown","a",function(b){var d=null;switch(b.which){case 13:case 32:b.type="mouseup",b.preventDefault(),a(b.currentTarget).trigger(b);break;case 37:c.is_visible&&(c.element.find(".vakata-context-hover").last().closest("li").first().find("ul").hide().find(".vakata-context-hover").removeClass("vakata-context-hover").end().end().children("a").focus(),b.stopImmediatePropagation(),b.preventDefault());break;case 38:c.is_visible&&(d=c.element.find("ul:visible").addBack().last().children(".vakata-context-hover").removeClass("vakata-context-hover").prevAll("li:not(.vakata-context-separator)").first(),d.length||(d=c.element.find("ul:visible").addBack().last().children("li:not(.vakata-context-separator)").last()),d.addClass("vakata-context-hover").children("a").focus(),b.stopImmediatePropagation(),b.preventDefault());break;case 39:c.is_visible&&(c.element.find(".vakata-context-hover").last().children("ul").show().children("li:not(.vakata-context-separator)").removeClass("vakata-context-hover").first().addClass("vakata-context-hover").children("a").focus(),b.stopImmediatePropagation(),b.preventDefault());break;case 40:c.is_visible&&(d=c.element.find("ul:visible").addBack().last().children(".vakata-context-hover").removeClass("vakata-context-hover").nextAll("li:not(.vakata-context-separator)").first(),d.length||(d=c.element.find("ul:visible").addBack().last().children("li:not(.vakata-context-separator)").first()),d.addClass("vakata-context-hover").children("a").focus(),b.stopImmediatePropagation(),b.preventDefault());break;case 27:a.vakata.context.hide(),b.preventDefault()}}).on("keydown",function(a){a.preventDefault();var b=c.element.find(".vakata-contextmenu-shortcut-"+a.which).parent();b.parent().not(".vakata-context-disabled")&&b.click()}),a(i).on("mousedown.vakata.jstree",function(b){c.is_visible&&!a.contains(c.element[0],b.target)&&a.vakata.context.hide()}).on("context_show.vakata.jstree",function(a,d){c.element.find("li:has(ul)").children("a").addClass("vakata-context-parent"),b&&c.element.addClass("vakata-context-rtl").css("direction","rtl"),c.element.find("ul").hide().end()})})}(a),a.jstree.defaults.dnd={copy:!0,open_timeout:500,is_draggable:!0,check_while_dragging:!0,always_copy:!1,inside_pos:0,drag_selection:!0,touch:!0,large_drop_target:!1,large_drag_target:!1},a.jstree.plugins.dnd=function(b,c){this.bind=function(){c.bind.call(this),this.element.on("mousedown.jstree touchstart.jstree",this.settings.dnd.large_drag_target?".jstree-node":".jstree-anchor",a.proxy(function(b){
+if(this.settings.dnd.large_drag_target&&a(b.target).closest(".jstree-node")[0]!==b.currentTarget)return!0;if("touchstart"===b.type&&(!this.settings.dnd.touch||"selected"===this.settings.dnd.touch&&!a(b.currentTarget).closest(".jstree-node").children(".jstree-anchor").hasClass("jstree-clicked")))return!0;var c=this.get_node(b.target),d=this.is_selected(c)&&this.settings.dnd.drag_selection?this.get_top_selected().length:1,e=d>1?d+" "+this.get_string("nodes"):this.get_text(b.currentTarget);return this.settings.core.force_text&&(e=a.vakata.html.escape(e)),c&&c.id&&c.id!==a.jstree.root&&(1===b.which||"touchstart"===b.type)&&(this.settings.dnd.is_draggable===!0||a.isFunction(this.settings.dnd.is_draggable)&&this.settings.dnd.is_draggable.call(this,d>1?this.get_top_selected(!0):[c],b))?(this.element.trigger("mousedown.jstree"),a.vakata.dnd.start(b,{jstree:!0,origin:this,obj:this.get_node(c,!0),nodes:d>1?this.get_top_selected():[c.id]},'<div id="jstree-dnd" class="jstree-'+this.get_theme()+" jstree-"+this.get_theme()+"-"+this.get_theme_variant()+" "+(this.settings.core.themes.responsive?" jstree-dnd-responsive":"")+'"><i class="jstree-icon jstree-er"></i>'+e+'<ins class="jstree-copy" style="display:none;">+</ins></div>')):void 0},this))}},a(function(){var b=!1,c=!1,d=!1,e=!1,f=a('<div id="jstree-marker">&#160;</div>').hide();a(i).on("dnd_start.vakata.jstree",function(a,c){b=!1,d=!1,c&&c.data&&c.data.jstree&&f.appendTo("body")}).on("dnd_move.vakata.jstree",function(g,h){if(e&&clearTimeout(e),h&&h.data&&h.data.jstree&&(!h.event.target.id||"jstree-marker"!==h.event.target.id)){d=h.event;var i=a.jstree.reference(h.event.target),j=!1,k=!1,l=!1,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A;if(i&&i._data&&i._data.dnd)if(f.attr("class","jstree-"+i.get_theme()+(i.settings.core.themes.responsive?" jstree-dnd-responsive":"")),h.helper.children().attr("class","jstree-"+i.get_theme()+" jstree-"+i.get_theme()+"-"+i.get_theme_variant()+" "+(i.settings.core.themes.responsive?" jstree-dnd-responsive":"")).find(".jstree-copy").first()[h.data.origin&&(h.data.origin.settings.dnd.always_copy||h.data.origin.settings.dnd.copy&&(h.event.metaKey||h.event.ctrlKey))?"show":"hide"](),h.event.target!==i.element[0]&&h.event.target!==i.get_container_ul()[0]||0!==i.get_container_ul().children().length){if(j=i.settings.dnd.large_drop_target?a(h.event.target).closest(".jstree-node").children(".jstree-anchor"):a(h.event.target).closest(".jstree-anchor"),j&&j.length&&j.parent().is(".jstree-closed, .jstree-open, .jstree-leaf")&&(k=j.offset(),l=h.event.pageY-k.top,p=j.outerHeight(),s=p/3>l?["b","i","a"]:l>p-p/3?["a","i","b"]:l>p/2?["i","a","b"]:["i","b","a"],a.each(s,function(d,g){switch(g){case"b":n=k.left-6,o=k.top,q=i.get_parent(j),r=j.parent().index();break;case"i":z=i.settings.dnd.inside_pos,A=i.get_node(j.parent()),n=k.left-2,o=k.top+p/2+1,q=A.id,r="first"===z?0:"last"===z?A.children.length:Math.min(z,A.children.length);break;case"a":n=k.left-6,o=k.top+p,q=i.get_parent(j),r=j.parent().index()+1}for(t=!0,u=0,v=h.data.nodes.length;v>u;u++)if(w=h.data.origin&&(h.data.origin.settings.dnd.always_copy||h.data.origin.settings.dnd.copy&&(h.event.metaKey||h.event.ctrlKey))?"copy_node":"move_node",x=r,"move_node"===w&&"a"===g&&h.data.origin&&h.data.origin===i&&q===i.get_parent(h.data.nodes[u])&&(y=i.get_node(q),x>a.inArray(h.data.nodes[u],y.children)&&(x-=1)),t=t&&(i&&i.settings&&i.settings.dnd&&i.settings.dnd.check_while_dragging===!1||i.check(w,h.data.origin&&h.data.origin!==i?h.data.origin.get_node(h.data.nodes[u]):h.data.nodes[u],q,x,{dnd:!0,ref:i.get_node(j.parent()),pos:g,origin:h.data.origin,is_multi:h.data.origin&&h.data.origin!==i,is_foreign:!h.data.origin})),!t){i&&i.last_error&&(c=i.last_error());break}return"i"===g&&j.parent().is(".jstree-closed")&&i.settings.dnd.open_timeout&&(e=setTimeout(function(a,b){return function(){a.open_node(b)}}(i,j),i.settings.dnd.open_timeout)),t?(b={ins:i,par:q,pos:"i"!==g||"last"!==z||0!==r||i.is_loaded(A)?r:"last"},f.css({left:n+"px",top:o+"px"}).show(),h.helper.find(".jstree-icon").first().removeClass("jstree-er").addClass("jstree-ok"),c={},s=!0,!1):void 0}),s===!0))return}else{for(t=!0,u=0,v=h.data.nodes.length;v>u;u++)if(t=t&&i.check(h.data.origin&&(h.data.origin.settings.dnd.always_copy||h.data.origin.settings.dnd.copy&&(h.event.metaKey||h.event.ctrlKey))?"copy_node":"move_node",h.data.origin&&h.data.origin!==i?h.data.origin.get_node(h.data.nodes[u]):h.data.nodes[u],a.jstree.root,"last",{dnd:!0,ref:i.get_node(a.jstree.root),pos:"i",origin:h.data.origin,is_multi:h.data.origin&&h.data.origin!==i,is_foreign:!h.data.origin}),!t)break;if(t)return b={ins:i,par:a.jstree.root,pos:"last"},f.hide(),void h.helper.find(".jstree-icon").first().removeClass("jstree-er").addClass("jstree-ok")}b=!1,h.helper.find(".jstree-icon").removeClass("jstree-ok").addClass("jstree-er"),f.hide()}}).on("dnd_scroll.vakata.jstree",function(a,c){c&&c.data&&c.data.jstree&&(f.hide(),b=!1,d=!1,c.helper.find(".jstree-icon").first().removeClass("jstree-ok").addClass("jstree-er"))}).on("dnd_stop.vakata.jstree",function(g,h){if(e&&clearTimeout(e),h&&h.data&&h.data.jstree){f.hide().detach();var i,j,k=[];if(b){for(i=0,j=h.data.nodes.length;j>i;i++)k[i]=h.data.origin?h.data.origin.get_node(h.data.nodes[i]):h.data.nodes[i];b.ins[h.data.origin&&(h.data.origin.settings.dnd.always_copy||h.data.origin.settings.dnd.copy&&(h.event.metaKey||h.event.ctrlKey))?"copy_node":"move_node"](k,b.par,b.pos,!1,!1,!1,h.data.origin)}else i=a(h.event.target).closest(".jstree"),i.length&&c&&c.error&&"check"===c.error&&(i=i.jstree(!0),i&&i.settings.core.error.call(this,c));d=!1,b=!1}}).on("keyup.jstree keydown.jstree",function(b,c){c=a.vakata.dnd._get(),c&&c.data&&c.data.jstree&&(c.helper.find(".jstree-copy").first()[c.data.origin&&(c.data.origin.settings.dnd.always_copy||c.data.origin.settings.dnd.copy&&(b.metaKey||b.ctrlKey))?"show":"hide"](),d&&(d.metaKey=b.metaKey,d.ctrlKey=b.ctrlKey,a.vakata.dnd._trigger("move",d)))})}),function(a){a.vakata.html={div:a("<div />"),escape:function(b){return a.vakata.html.div.text(b).html()},strip:function(b){return a.vakata.html.div.empty().append(a.parseHTML(b)).text()}};var b={element:!1,target:!1,is_down:!1,is_drag:!1,helper:!1,helper_w:0,data:!1,init_x:0,init_y:0,scroll_l:0,scroll_t:0,scroll_e:!1,scroll_i:!1,is_touch:!1};a.vakata.dnd={settings:{scroll_speed:10,scroll_proximity:20,helper_left:5,helper_top:10,threshold:5,threshold_touch:50},_trigger:function(b,c){var d=a.vakata.dnd._get();d.event=c,a(i).triggerHandler("dnd_"+b+".vakata",d)},_get:function(){return{data:b.data,element:b.element,helper:b.helper}},_clean:function(){b.helper&&b.helper.remove(),b.scroll_i&&(clearInterval(b.scroll_i),b.scroll_i=!1),b={element:!1,target:!1,is_down:!1,is_drag:!1,helper:!1,helper_w:0,data:!1,init_x:0,init_y:0,scroll_l:0,scroll_t:0,scroll_e:!1,scroll_i:!1,is_touch:!1},a(i).off("mousemove.vakata.jstree touchmove.vakata.jstree",a.vakata.dnd.drag),a(i).off("mouseup.vakata.jstree touchend.vakata.jstree",a.vakata.dnd.stop)},_scroll:function(c){if(!b.scroll_e||!b.scroll_l&&!b.scroll_t)return b.scroll_i&&(clearInterval(b.scroll_i),b.scroll_i=!1),!1;if(!b.scroll_i)return b.scroll_i=setInterval(a.vakata.dnd._scroll,100),!1;if(c===!0)return!1;var d=b.scroll_e.scrollTop(),e=b.scroll_e.scrollLeft();b.scroll_e.scrollTop(d+b.scroll_t*a.vakata.dnd.settings.scroll_speed),b.scroll_e.scrollLeft(e+b.scroll_l*a.vakata.dnd.settings.scroll_speed),(d!==b.scroll_e.scrollTop()||e!==b.scroll_e.scrollLeft())&&a.vakata.dnd._trigger("scroll",b.scroll_e)},start:function(c,d,e){"touchstart"===c.type&&c.originalEvent&&c.originalEvent.changedTouches&&c.originalEvent.changedTouches[0]&&(c.pageX=c.originalEvent.changedTouches[0].pageX,c.pageY=c.originalEvent.changedTouches[0].pageY,c.target=i.elementFromPoint(c.originalEvent.changedTouches[0].pageX-window.pageXOffset,c.originalEvent.changedTouches[0].pageY-window.pageYOffset)),b.is_drag&&a.vakata.dnd.stop({});try{c.currentTarget.unselectable="on",c.currentTarget.onselectstart=function(){return!1},c.currentTarget.style&&(c.currentTarget.style.MozUserSelect="none")}catch(f){}return b.init_x=c.pageX,b.init_y=c.pageY,b.data=d,b.is_down=!0,b.element=c.currentTarget,b.target=c.target,b.is_touch="touchstart"===c.type,e!==!1&&(b.helper=a("<div id='vakata-dnd'></div>").html(e).css({display:"block",margin:"0",padding:"0",position:"absolute",top:"-2000px",lineHeight:"16px",zIndex:"10000"})),a(i).on("mousemove.vakata.jstree touchmove.vakata.jstree",a.vakata.dnd.drag),a(i).on("mouseup.vakata.jstree touchend.vakata.jstree",a.vakata.dnd.stop),!1},drag:function(c){if("touchmove"===c.type&&c.originalEvent&&c.originalEvent.changedTouches&&c.originalEvent.changedTouches[0]&&(c.pageX=c.originalEvent.changedTouches[0].pageX,c.pageY=c.originalEvent.changedTouches[0].pageY,c.target=i.elementFromPoint(c.originalEvent.changedTouches[0].pageX-window.pageXOffset,c.originalEvent.changedTouches[0].pageY-window.pageYOffset)),b.is_down){if(!b.is_drag){if(!(Math.abs(c.pageX-b.init_x)>(b.is_touch?a.vakata.dnd.settings.threshold_touch:a.vakata.dnd.settings.threshold)||Math.abs(c.pageY-b.init_y)>(b.is_touch?a.vakata.dnd.settings.threshold_touch:a.vakata.dnd.settings.threshold)))return;b.helper&&(b.helper.appendTo("body"),b.helper_w=b.helper.outerWidth()),b.is_drag=!0,a.vakata.dnd._trigger("start",c)}var d=!1,e=!1,f=!1,g=!1,h=!1,j=!1,k=!1,l=!1,m=!1,n=!1;return b.scroll_t=0,b.scroll_l=0,b.scroll_e=!1,a(a(c.target).parentsUntil("body").addBack().get().reverse()).filter(function(){return/^auto|scroll$/.test(a(this).css("overflow"))&&(this.scrollHeight>this.offsetHeight||this.scrollWidth>this.offsetWidth)}).each(function(){var d=a(this),e=d.offset();return this.scrollHeight>this.offsetHeight&&(e.top+d.height()-c.pageY<a.vakata.dnd.settings.scroll_proximity&&(b.scroll_t=1),c.pageY-e.top<a.vakata.dnd.settings.scroll_proximity&&(b.scroll_t=-1)),this.scrollWidth>this.offsetWidth&&(e.left+d.width()-c.pageX<a.vakata.dnd.settings.scroll_proximity&&(b.scroll_l=1),c.pageX-e.left<a.vakata.dnd.settings.scroll_proximity&&(b.scroll_l=-1)),b.scroll_t||b.scroll_l?(b.scroll_e=a(this),!1):void 0}),b.scroll_e||(d=a(i),e=a(window),f=d.height(),g=e.height(),h=d.width(),j=e.width(),k=d.scrollTop(),l=d.scrollLeft(),f>g&&c.pageY-k<a.vakata.dnd.settings.scroll_proximity&&(b.scroll_t=-1),f>g&&g-(c.pageY-k)<a.vakata.dnd.settings.scroll_proximity&&(b.scroll_t=1),h>j&&c.pageX-l<a.vakata.dnd.settings.scroll_proximity&&(b.scroll_l=-1),h>j&&j-(c.pageX-l)<a.vakata.dnd.settings.scroll_proximity&&(b.scroll_l=1),(b.scroll_t||b.scroll_l)&&(b.scroll_e=d)),b.scroll_e&&a.vakata.dnd._scroll(!0),b.helper&&(m=parseInt(c.pageY+a.vakata.dnd.settings.helper_top,10),n=parseInt(c.pageX+a.vakata.dnd.settings.helper_left,10),f&&m+25>f&&(m=f-50),h&&n+b.helper_w>h&&(n=h-(b.helper_w+2)),b.helper.css({left:n+"px",top:m+"px"})),a.vakata.dnd._trigger("move",c),!1}},stop:function(c){if("touchend"===c.type&&c.originalEvent&&c.originalEvent.changedTouches&&c.originalEvent.changedTouches[0]&&(c.pageX=c.originalEvent.changedTouches[0].pageX,c.pageY=c.originalEvent.changedTouches[0].pageY,c.target=i.elementFromPoint(c.originalEvent.changedTouches[0].pageX-window.pageXOffset,c.originalEvent.changedTouches[0].pageY-window.pageYOffset)),b.is_drag)a.vakata.dnd._trigger("stop",c);else if("touchend"===c.type&&c.target===b.target){var d=setTimeout(function(){a(c.target).click()},100);a(c.target).one("click",function(){d&&clearTimeout(d)})}return a.vakata.dnd._clean(),!1}}}(a),a.jstree.defaults.massload=null,a.jstree.plugins.massload=function(b,c){this.init=function(a,b){c.init.call(this,a,b),this._data.massload={}},this._load_nodes=function(b,d,e){var f=this.settings.massload;return e&&!a.isEmptyObject(this._data.massload)?c._load_nodes.call(this,b,d,e):a.isFunction(f)?f.call(this,b,a.proxy(function(a){if(a)for(var f in a)a.hasOwnProperty(f)&&(this._data.massload[f]=a[f]);c._load_nodes.call(this,b,d,e)},this)):"object"==typeof f&&f&&f.url?(f=a.extend(!0,{},f),a.isFunction(f.url)&&(f.url=f.url.call(this,b)),a.isFunction(f.data)&&(f.data=f.data.call(this,b)),a.ajax(f).done(a.proxy(function(a,f,g){if(a)for(var h in a)a.hasOwnProperty(h)&&(this._data.massload[h]=a[h]);c._load_nodes.call(this,b,d,e)},this)).fail(a.proxy(function(a){c._load_nodes.call(this,b,d,e)},this))):c._load_nodes.call(this,b,d,e)},this._load_node=function(b,d){var e=this._data.massload[b.id];return e?this["string"==typeof e?"_append_html_data":"_append_json_data"](b,"string"==typeof e?a(a.parseHTML(e)).filter(function(){return 3!==this.nodeType}):e,function(a){d.call(this,a),delete this._data.massload[b.id]}):c._load_node.call(this,b,d)}},a.jstree.defaults.search={ajax:!1,fuzzy:!1,case_sensitive:!1,show_only_matches:!1,show_only_matches_children:!1,close_opened_onclear:!0,search_leaves_only:!1,search_callback:!1},a.jstree.plugins.search=function(c,d){this.bind=function(){d.bind.call(this),this._data.search.str="",this._data.search.dom=a(),this._data.search.res=[],this._data.search.opn=[],this._data.search.som=!1,this._data.search.smc=!1,this._data.search.hdn=[],this.element.on("search.jstree",a.proxy(function(b,c){if(this._data.search.som&&c.res.length){var d=this._model.data,e,f,g=[];for(e=0,f=c.res.length;f>e;e++)d[c.res[e]]&&!d[c.res[e]].state.hidden&&(g.push(c.res[e]),g=g.concat(d[c.res[e]].parents),this._data.search.smc&&(g=g.concat(d[c.res[e]].children_d)));g=a.vakata.array_remove_item(a.vakata.array_unique(g),a.jstree.root),this._data.search.hdn=this.hide_all(!0),this.show_node(g)}},this)).on("clear_search.jstree",a.proxy(function(a,b){this._data.search.som&&b.res.length&&this.show_node(this._data.search.hdn)},this))},this.search=function(c,d,e,f,g,h){if(c===!1||""===a.trim(c.toString()))return this.clear_search();f=this.get_node(f),f=f&&f.id?f.id:null,c=c.toString();var i=this.settings.search,j=i.ajax?i.ajax:!1,k=this._model.data,l=null,m=[],n=[],o,p;if(this._data.search.res.length&&!g&&this.clear_search(),e===b&&(e=i.show_only_matches),h===b&&(h=i.show_only_matches_children),!d&&j!==!1)return a.isFunction(j)?j.call(this,c,a.proxy(function(b){b&&b.d&&(b=b.d),this._load_nodes(a.isArray(b)?a.vakata.array_unique(b):[],function(){this.search(c,!0,e,f,g)},!0)},this),f):(j=a.extend({},j),j.data||(j.data={}),j.data.str=c,f&&(j.data.inside=f),a.ajax(j).fail(a.proxy(function(){this._data.core.last_error={error:"ajax",plugin:"search",id:"search_01",reason:"Could not load search parents",data:JSON.stringify(j)},this.settings.core.error.call(this,this._data.core.last_error)},this)).done(a.proxy(function(b){b&&b.d&&(b=b.d),this._load_nodes(a.isArray(b)?a.vakata.array_unique(b):[],function(){this.search(c,!0,e,f,g)},!0)},this)));if(g||(this._data.search.str=c,this._data.search.dom=a(),this._data.search.res=[],this._data.search.opn=[],this._data.search.som=e,this._data.search.smc=h),l=new a.vakata.search(c,!0,{caseSensitive:i.case_sensitive,fuzzy:i.fuzzy}),a.each(k[f?f:a.jstree.root].children_d,function(a,b){var d=k[b];d.text&&(!i.search_leaves_only||d.state.loaded&&0===d.children.length)&&(i.search_callback&&i.search_callback.call(this,c,d)||!i.search_callback&&l.search(d.text).isMatch)&&(m.push(b),n=n.concat(d.parents))}),m.length){for(n=a.vakata.array_unique(n),o=0,p=n.length;p>o;o++)n[o]!==a.jstree.root&&k[n[o]]&&this.open_node(n[o],null,0)===!0&&this._data.search.opn.push(n[o]);g?(this._data.search.dom=this._data.search.dom.add(a(this.element[0].querySelectorAll("#"+a.map(m,function(b){return-1!=="0123456789".indexOf(b[0])?"\\3"+b[0]+" "+b.substr(1).replace(a.jstree.idregex,"\\$&"):b.replace(a.jstree.idregex,"\\$&")}).join(", #")))),this._data.search.res=a.vakata.array_unique(this._data.search.res.concat(m))):(this._data.search.dom=a(this.element[0].querySelectorAll("#"+a.map(m,function(b){return-1!=="0123456789".indexOf(b[0])?"\\3"+b[0]+" "+b.substr(1).replace(a.jstree.idregex,"\\$&"):b.replace(a.jstree.idregex,"\\$&")}).join(", #"))),this._data.search.res=m),this._data.search.dom.children(".jstree-anchor").addClass("jstree-search")}this.trigger("search",{nodes:this._data.search.dom,str:c,res:this._data.search.res,show_only_matches:e})},this.clear_search=function(){this.settings.search.close_opened_onclear&&this.close_node(this._data.search.opn,0),this.trigger("clear_search",{nodes:this._data.search.dom,str:this._data.search.str,res:this._data.search.res}),this._data.search.res.length&&(this._data.search.dom=a(this.element[0].querySelectorAll("#"+a.map(this._data.search.res,function(b){return-1!=="0123456789".indexOf(b[0])?"\\3"+b[0]+" "+b.substr(1).replace(a.jstree.idregex,"\\$&"):b.replace(a.jstree.idregex,"\\$&")}).join(", #"))),this._data.search.dom.children(".jstree-anchor").removeClass("jstree-search")),this._data.search.str="",this._data.search.res=[],this._data.search.opn=[],this._data.search.dom=a()},this.redraw_node=function(b,c,e,f){if(b=d.redraw_node.apply(this,arguments),b&&-1!==a.inArray(b.id,this._data.search.res)){var g,h,i=null;for(g=0,h=b.childNodes.length;h>g;g++)if(b.childNodes[g]&&b.childNodes[g].className&&-1!==b.childNodes[g].className.indexOf("jstree-anchor")){i=b.childNodes[g];break}i&&(i.className+=" jstree-search")}return b}},function(a){a.vakata.search=function(b,c,d){d=d||{},d=a.extend({},a.vakata.search.defaults,d),d.fuzzy!==!1&&(d.fuzzy=!0),b=d.caseSensitive?b:b.toLowerCase();var e=d.location,f=d.distance,g=d.threshold,h=b.length,i,j,k,l;return h>32&&(d.fuzzy=!1),d.fuzzy&&(i=1<<h-1,j=function(){var a={},c=0;for(c=0;h>c;c++)a[b.charAt(c)]=0;for(c=0;h>c;c++)a[b.charAt(c)]|=1<<h-c-1;return a}(),k=function(a,b){var c=a/h,d=Math.abs(e-b);return f?c+d/f:d?1:c}),l=function(a){if(a=d.caseSensitive?a:a.toLowerCase(),b===a||-1!==a.indexOf(b))return{isMatch:!0,score:0};if(!d.fuzzy)return{isMatch:!1,score:1};var c,f,l=a.length,m=g,n=a.indexOf(b,e),o,p,q=h+l,r,s,t,u,v,w=1,x=[];for(-1!==n&&(m=Math.min(k(0,n),m),n=a.lastIndexOf(b,e+h),-1!==n&&(m=Math.min(k(0,n),m))),n=-1,c=0;h>c;c++){o=0,p=q;while(p>o)k(c,e+p)<=m?o=p:q=p,p=Math.floor((q-o)/2+o);for(q=p,s=Math.max(1,e-p+1),t=Math.min(e+p,l)+h,u=new Array(t+2),u[t+1]=(1<<c)-1,f=t;f>=s;f--)if(v=j[a.charAt(f-1)],0===c?u[f]=(u[f+1]<<1|1)&v:u[f]=(u[f+1]<<1|1)&v|((r[f+1]|r[f])<<1|1)|r[f+1],u[f]&i&&(w=k(c,f-1),m>=w)){if(m=w,n=f-1,x.push(n),!(n>e))break;s=Math.max(1,2*e-n)}if(k(c+1,e)>m)break;r=u}return{isMatch:n>=0,score:w}},c===!0?{search:l}:l(c)},a.vakata.search.defaults={location:0,distance:100,threshold:.6,fuzzy:!1,caseSensitive:!1}}(a),a.jstree.defaults.sort=function(a,b){return this.get_text(a)>this.get_text(b)?1:-1},a.jstree.plugins.sort=function(b,c){this.bind=function(){c.bind.call(this),this.element.on("model.jstree",a.proxy(function(a,b){this.sort(b.parent,!0)},this)).on("rename_node.jstree create_node.jstree",a.proxy(function(a,b){this.sort(b.parent||b.node.parent,!1),this.redraw_node(b.parent||b.node.parent,!0)},this)).on("move_node.jstree copy_node.jstree",a.proxy(function(a,b){this.sort(b.parent,!1),this.redraw_node(b.parent,!0)},this))},this.sort=function(b,c){var d,e;if(b=this.get_node(b),b&&b.children&&b.children.length&&(b.children.sort(a.proxy(this.settings.sort,this)),c))for(d=0,e=b.children_d.length;e>d;d++)this.sort(b.children_d[d],!1)}};var n=!1;a.jstree.defaults.state={key:"jstree",events:"changed.jstree open_node.jstree close_node.jstree check_node.jstree uncheck_node.jstree",ttl:!1,filter:!1},a.jstree.plugins.state=function(b,c){this.bind=function(){c.bind.call(this);var b=a.proxy(function(){this.element.on(this.settings.state.events,a.proxy(function(){n&&clearTimeout(n),n=setTimeout(a.proxy(function(){this.save_state()},this),100)},this)),this.trigger("state_ready")},this);this.element.on("ready.jstree",a.proxy(function(a,c){this.element.one("restore_state.jstree",b),this.restore_state()||b()},this))},this.save_state=function(){var b={state:this.get_state(),ttl:this.settings.state.ttl,sec:+new Date};a.vakata.storage.set(this.settings.state.key,JSON.stringify(b))},this.restore_state=function(){var b=a.vakata.storage.get(this.settings.state.key);if(b)try{b=JSON.parse(b)}catch(c){return!1}return b&&b.ttl&&b.sec&&+new Date-b.sec>b.ttl?!1:(b&&b.state&&(b=b.state),b&&a.isFunction(this.settings.state.filter)&&(b=this.settings.state.filter.call(this,b)),b?(this.element.one("set_state.jstree",function(c,d){d.instance.trigger("restore_state",{state:a.extend(!0,{},b)})}),this.set_state(b),!0):!1)},this.clear_state=function(){return a.vakata.storage.del(this.settings.state.key)}},function(a,b){a.vakata.storage={set:function(a,b){return window.localStorage.setItem(a,b)},get:function(a){return window.localStorage.getItem(a)},del:function(a){return window.localStorage.removeItem(a)}}}(a),a.jstree.defaults.types={"default":{}},a.jstree.defaults.types[a.jstree.root]={},a.jstree.plugins.types=function(c,d){this.init=function(c,e){var f,g;if(e&&e.types&&e.types["default"])for(f in e.types)if("default"!==f&&f!==a.jstree.root&&e.types.hasOwnProperty(f))for(g in e.types["default"])e.types["default"].hasOwnProperty(g)&&e.types[f][g]===b&&(e.types[f][g]=e.types["default"][g]);d.init.call(this,c,e),this._model.data[a.jstree.root].type=a.jstree.root},this.refresh=function(b,c){d.refresh.call(this,b,c),this._model.data[a.jstree.root].type=a.jstree.root},this.bind=function(){this.element.on("model.jstree",a.proxy(function(c,d){var e=this._model.data,f=d.nodes,g=this.settings.types,h,i,j="default";for(h=0,i=f.length;i>h;h++)j="default",e[f[h]].original&&e[f[h]].original.type&&g[e[f[h]].original.type]&&(j=e[f[h]].original.type),e[f[h]].data&&e[f[h]].data.jstree&&e[f[h]].data.jstree.type&&g[e[f[h]].data.jstree.type]&&(j=e[f[h]].data.jstree.type),e[f[h]].type=j,e[f[h]].icon===!0&&g[j].icon!==b&&(e[f[h]].icon=g[j].icon);e[a.jstree.root].type=a.jstree.root},this)),d.bind.call(this)},this.get_json=function(b,c,e){var f,g,h=this._model.data,i=c?a.extend(!0,{},c,{no_id:!1}):{},j=d.get_json.call(this,b,i,e);if(j===!1)return!1;if(a.isArray(j))for(f=0,g=j.length;g>f;f++)j[f].type=j[f].id&&h[j[f].id]&&h[j[f].id].type?h[j[f].id].type:"default",c&&c.no_id&&(delete j[f].id,j[f].li_attr&&j[f].li_attr.id&&delete j[f].li_attr.id,j[f].a_attr&&j[f].a_attr.id&&delete j[f].a_attr.id);else j.type=j.id&&h[j.id]&&h[j.id].type?h[j.id].type:"default",c&&c.no_id&&(j=this._delete_ids(j));return j},this._delete_ids=function(b){if(a.isArray(b)){for(var c=0,d=b.length;d>c;c++)b[c]=this._delete_ids(b[c]);return b}return delete b.id,b.li_attr&&b.li_attr.id&&delete b.li_attr.id,b.a_attr&&b.a_attr.id&&delete b.a_attr.id,b.children&&a.isArray(b.children)&&(b.children=this._delete_ids(b.children)),b},this.check=function(c,e,f,g,h){if(d.check.call(this,c,e,f,g,h)===!1)return!1;e=e&&e.id?e:this.get_node(e),f=f&&f.id?f:this.get_node(f);var i=e&&e.id?h&&h.origin?h.origin:a.jstree.reference(e.id):null,j,k,l,m;switch(i=i&&i._model&&i._model.data?i._model.data:null,c){case"create_node":case"move_node":case"copy_node":if("move_node"!==c||-1===a.inArray(e.id,f.children)){if(j=this.get_rules(f),j.max_children!==b&&-1!==j.max_children&&j.max_children===f.children.length)return this._data.core.last_error={error:"check",plugin:"types",id:"types_01",reason:"max_children prevents function: "+c,data:JSON.stringify({chk:c,pos:g,obj:e&&e.id?e.id:!1,par:f&&f.id?f.id:!1})},!1;if(j.valid_children!==b&&-1!==j.valid_children&&-1===a.inArray(e.type||"default",j.valid_children))return this._data.core.last_error={error:"check",plugin:"types",id:"types_02",reason:"valid_children prevents function: "+c,data:JSON.stringify({chk:c,pos:g,obj:e&&e.id?e.id:!1,par:f&&f.id?f.id:!1})},!1;if(i&&e.children_d&&e.parents){for(k=0,l=0,m=e.children_d.length;m>l;l++)k=Math.max(k,i[e.children_d[l]].parents.length);k=k-e.parents.length+1}(0>=k||k===b)&&(k=1);do{if(j.max_depth!==b&&-1!==j.max_depth&&j.max_depth<k)return this._data.core.last_error={error:"check",plugin:"types",id:"types_03",reason:"max_depth prevents function: "+c,data:JSON.stringify({chk:c,pos:g,obj:e&&e.id?e.id:!1,par:f&&f.id?f.id:!1})},!1;f=this.get_node(f.parent),j=this.get_rules(f),k++}while(f)}}return!0},this.get_rules=function(a){if(a=this.get_node(a),!a)return!1;var c=this.get_type(a,!0);return c.max_depth===b&&(c.max_depth=-1),c.max_children===b&&(c.max_children=-1),c.valid_children===b&&(c.valid_children=-1),c},this.get_type=function(b,c){return b=this.get_node(b),b?c?a.extend({type:b.type},this.settings.types[b.type]):b.type:!1},this.set_type=function(c,d){var e,f,g,h,i;if(a.isArray(c)){for(c=c.slice(),f=0,g=c.length;g>f;f++)this.set_type(c[f],d);return!0}return e=this.settings.types,c=this.get_node(c),e[d]&&c?(h=c.type,i=this.get_icon(c),c.type=d,(i===!0||e[h]&&e[h].icon!==b&&i===e[h].icon)&&this.set_icon(c,e[d].icon!==b?e[d].icon:!0),!0):!1}},a.jstree.defaults.unique={case_sensitive:!1,duplicate:function(a,b){return a+" ("+b+")"}},a.jstree.plugins.unique=function(c,d){this.check=function(b,c,e,f,g){if(d.check.call(this,b,c,e,f,g)===!1)return!1;if(c=c&&c.id?c:this.get_node(c),e=e&&e.id?e:this.get_node(e),!e||!e.children)return!0;var h="rename_node"===b?f:c.text,i=[],j=this.settings.unique.case_sensitive,k=this._model.data,l,m;for(l=0,m=e.children.length;m>l;l++)i.push(j?k[e.children[l]].text:k[e.children[l]].text.toLowerCase());switch(j||(h=h.toLowerCase()),b){case"delete_node":return!0;case"rename_node":return l=-1===a.inArray(h,i)||c.text&&c.text[j?"toString":"toLowerCase"]()===h,l||(this._data.core.last_error={error:"check",plugin:"unique",id:"unique_01",reason:"Child with name "+h+" already exists. Preventing: "+b,data:JSON.stringify({chk:b,pos:f,obj:c&&c.id?c.id:!1,par:e&&e.id?e.id:!1})}),l;case"create_node":return l=-1===a.inArray(h,i),l||(this._data.core.last_error={error:"check",plugin:"unique",id:"unique_04",reason:"Child with name "+h+" already exists. Preventing: "+b,data:JSON.stringify({chk:b,pos:f,obj:c&&c.id?c.id:!1,par:e&&e.id?e.id:!1})}),l;case"copy_node":return l=-1===a.inArray(h,i),l||(this._data.core.last_error={error:"check",plugin:"unique",id:"unique_02",reason:"Child with name "+h+" already exists. Preventing: "+b,data:JSON.stringify({chk:b,pos:f,obj:c&&c.id?c.id:!1,par:e&&e.id?e.id:!1})}),l;case"move_node":return l=c.parent===e.id&&(!g||!g.is_multi)||-1===a.inArray(h,i),l||(this._data.core.last_error={error:"check",plugin:"unique",id:"unique_03",reason:"Child with name "+h+" already exists. Preventing: "+b,data:JSON.stringify({chk:b,pos:f,obj:c&&c.id?c.id:!1,par:e&&e.id?e.id:!1})}),l}return!0},this.create_node=function(c,e,f,g,h){if(!e||e.text===b){if(null===c&&(c=a.jstree.root),c=this.get_node(c),!c)return d.create_node.call(this,c,e,f,g,h);if(f=f===b?"last":f,!f.toString().match(/^(before|after)$/)&&!h&&!this.is_loaded(c))return d.create_node.call(this,c,e,f,g,h);e||(e={});var i,j,k,l,m,n=this._model.data,o=this.settings.unique.case_sensitive,p=this.settings.unique.duplicate;for(j=i=this.get_string("New node"),k=[],l=0,m=c.children.length;m>l;l++)k.push(o?n[c.children[l]].text:n[c.children[l]].text.toLowerCase());l=1;while(-1!==a.inArray(o?j:j.toLowerCase(),k))j=p.call(this,i,++l).toString();e.text=j}return d.create_node.call(this,c,e,f,g,h)}};var o=i.createElement("DIV");if(o.setAttribute("unselectable","on"),o.setAttribute("role","presentation"),o.className="jstree-wholerow",o.innerHTML="&#160;",a.jstree.plugins.wholerow=function(b,c){this.bind=function(){c.bind.call(this),this.element.on("ready.jstree set_state.jstree",a.proxy(function(){this.hide_dots()},this)).on("init.jstree loading.jstree ready.jstree",a.proxy(function(){this.get_container_ul().addClass("jstree-wholerow-ul")},this)).on("deselect_all.jstree",a.proxy(function(a,b){this.element.find(".jstree-wholerow-clicked").removeClass("jstree-wholerow-clicked")},this)).on("changed.jstree",a.proxy(function(a,b){this.element.find(".jstree-wholerow-clicked").removeClass("jstree-wholerow-clicked");var c=!1,d,e;for(d=0,e=b.selected.length;e>d;d++)c=this.get_node(b.selected[d],!0),c&&c.length&&c.children(".jstree-wholerow").addClass("jstree-wholerow-clicked")},this)).on("open_node.jstree",a.proxy(function(a,b){this.get_node(b.node,!0).find(".jstree-clicked").parent().children(".jstree-wholerow").addClass("jstree-wholerow-clicked")},this)).on("hover_node.jstree dehover_node.jstree",a.proxy(function(a,b){"hover_node"===a.type&&this.is_disabled(b.node)||this.get_node(b.node,!0).children(".jstree-wholerow")["hover_node"===a.type?"addClass":"removeClass"]("jstree-wholerow-hovered")},this)).on("contextmenu.jstree",".jstree-wholerow",a.proxy(function(b){b.preventDefault();var c=a.Event("contextmenu",{metaKey:b.metaKey,ctrlKey:b.ctrlKey,altKey:b.altKey,shiftKey:b.shiftKey,pageX:b.pageX,pageY:b.pageY});a(b.currentTarget).closest(".jstree-node").children(".jstree-anchor").first().trigger(c)},this)).on("click.jstree",".jstree-wholerow",function(b){b.stopImmediatePropagation();var c=a.Event("click",{metaKey:b.metaKey,ctrlKey:b.ctrlKey,altKey:b.altKey,shiftKey:b.shiftKey});a(b.currentTarget).closest(".jstree-node").children(".jstree-anchor").first().trigger(c).focus()}).on("click.jstree",".jstree-leaf > .jstree-ocl",a.proxy(function(b){b.stopImmediatePropagation();var c=a.Event("click",{metaKey:b.metaKey,ctrlKey:b.ctrlKey,altKey:b.altKey,shiftKey:b.shiftKey});a(b.currentTarget).closest(".jstree-node").children(".jstree-anchor").first().trigger(c).focus()},this)).on("mouseover.jstree",".jstree-wholerow, .jstree-icon",a.proxy(function(a){return a.stopImmediatePropagation(),this.is_disabled(a.currentTarget)||this.hover_node(a.currentTarget),!1},this)).on("mouseleave.jstree",".jstree-node",a.proxy(function(a){this.dehover_node(a.currentTarget)},this))},this.teardown=function(){this.settings.wholerow&&this.element.find(".jstree-wholerow").remove(),c.teardown.call(this)},this.redraw_node=function(b,d,e,f){if(b=c.redraw_node.apply(this,arguments)){var g=o.cloneNode(!0);-1!==a.inArray(b.id,this._data.core.selected)&&(g.className+=" jstree-wholerow-clicked"),this._data.core.focused&&this._data.core.focused===b.id&&(g.className+=" jstree-wholerow-hovered"),b.insertBefore(g,b.childNodes[0])}return b}},i.registerElement&&Object&&Object.create){var p=Object.create(HTMLElement.prototype);p.createdCallback=function(){var b={core:{},plugins:[]},c;for(c in a.jstree.plugins)a.jstree.plugins.hasOwnProperty(c)&&this.attributes[c]&&(b.plugins.push(c),this.getAttribute(c)&&JSON.parse(this.getAttribute(c))&&(b[c]=JSON.parse(this.getAttribute(c))));for(c in a.jstree.defaults.core)a.jstree.defaults.core.hasOwnProperty(c)&&this.attributes[c]&&(b.core[c]=JSON.parse(this.getAttribute(c))||this.getAttribute(c));a(this).jstree(b)};try{i.registerElement("vakata-jstree",{prototype:p})}catch(q){}}}});
\ No newline at end of file
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/apple/bg.jpg b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/apple/bg.jpg
deleted file mode 100644
index 3aad05d8fadd75f8d9e02866f695b486f0b46343..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 331
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5JQfx!kS^p1hgF(p4Kl_BK-
zP=xXSZH5*GHWn5ZRu(o^RyIyHAm-*^W8>iF;o{=v;^GnD0RsUZK7IjyJ|1CV5fNcw
z8EI*08F@HhWM^mR<>8eO5Ri}(6%>_%OAyQWe}F-dgF%IXk(p7Dfk}{&S&;Gn5r#;h
zvzdX8L;}n#9E^<UqRfm;ECP%SOsHxZ7X~ql2m)0zBIyVESWxKyEe0NDpn5@OK?Zw<
XOYd45;+|jbJ!N~<NG0n8|Nol+zjH3u

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/apple/d.png b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/apple/d.png
deleted file mode 100644
index 2463ba6df91e1668434abdd623bbca914a4fcbe6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7765
zcmV-b9;)GqP)<h;3K|Lk000e1NJLTq003+N002k`1^@s66I&4N00009a7bBm000XU
z000XU0RWnu7ytkYPiaF#P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)XH-+^7Crag
z^g>IBfRsybQWXdwQbLP>6p<z>Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh<iVD~V
z<RPMtgQJLw%KPDaqifc@_vX$1wbwr9tn;0-&j-K=43<bUQ8j=JsX`tR;Dg7+#^K~H
zK!FM*Z~zbpvt%K2{UZSY_<lS*D<Z%Lz5oGu(+dayz)hRLFdT>f59&ghTmgWD0l;*T
zI7<kC6aYYajzXpYKt=(8otP$50H6c_V9R4-;{Z@C0AMG7=F<Rxo%or10RUT+Ar%3j
zkpLhQWr#!oXgdI`&sK^>09Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p
z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-<?i
z0%4j!F2Z@488U%158(66005wo6%pWr^Zj_v4zAA5HjcIqUoGmt2LB>rV&neh&#Q1i
z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_<lS*MWK+n+1cgf
z<k(8YLR(?VSAG6x!e78w{cQPuJpA|d;J)G{fihizM+Erb!p!tcr5w+a34~(Y=8s4G
zw+sLL9n&JjNn*KJDiq^U5^;`1nvC-@r6P$!k}1U{(*I=Q-z@tBKHoI}uxdU5dyy@u
zU1J0GOD7Ombim^G008p4Z^6_k2m^p<gW=D2|L;HjN1!DDfM!XOaR2~bL?kX$%CkSm
z2mk;?pn)o|K^yeJ7%adB9Ki+L!3+FgHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_v
zKpix|QD}yfa1JiQRk#j4a1Z)n2%f<xynzV>LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW
zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifq<Ex{*7`05XF7hP+2Hl!3BQJ=6@fL%FCo
z8iYoo3(#bAF`ADSpqtQgv>H8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X
zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ<AYmRsNLWl*PS{AOARHt#5!wki2?K;t
z!Y3k=s7tgax)J%r7-BLphge7~Bi0g+6E6^Zh(p9TBoc{3GAFr^0!gu?RMHaCM$&Fl
zBk3%un>0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4
z<uv66WtcKSRim0x-Ke2d5jBrmLam{;Qm;{ms1r1GnmNsb7D-E`t)i9F8fX`2_i3-_
zbh;7Ul^#x)&{xvS=|||7=mYe33=M`AgU5(xC>fg=2N-7=cNnjjOr{yriy6mMFgG#l
znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U
zt5vF<Q0r40Q)j6=sE4X&sBct1q<&fbi3VB2Ov6t@q*0);U*o*SAPZv|vv@2aYYnT0
zb%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KOarm5cP6_8Ir<e17iry6O
zDdH&`rZh~sF=bq9s+O0QSgS~@QL9Jmy*94xr=6y~MY~!1fet~(N+(<=M`w@D1)b+p
z*;C!83a1uLJv#NSE~;y#8=<>IcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya?
z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y
zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB
zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt
z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a<fJbF^|4I#xQ~n$Dc=
zKYhjYmgz5NSkDm8*fZm{6U!;YX`NG>(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C
z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB
zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe
zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0
z?2xS?_ve_-k<Mujg;0Lz*3buG=3$G&ehepthlN*$KaOySSQ^nWmo<0M+(UEUMEXRQ
zMBbZcF;6+KElM>iKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$
z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4
z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu
zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu
z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E
ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw
zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX
z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&
z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01
z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R
z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw
zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD
zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3|
zawq-H%e&ckC+@AhPrP6BK<z=<L*0kfKU@CX*zeqbYQT4(^U>T#_XdT7&;F71j}Joy
zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z
zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot<a{81DF0~rvGr5Xr~8u`lav1h
z1DNytV>2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F}
z000w!Nkl<Zc-riodvsk@oyR|WpL6cLdB1Lwwj_N^U(iCOIAU8W0uGinI6lfiLFMUU
zL>^*s4daZ03Oaxe3mlzQ5adw?c_SdSC{-$0DbSWa(o#a3q)C(B=6xUMwfFpSZ{9b_
zO(@!?*=wD3lXK7cW&iefe}B)DBed3xkE3VEqiw>ICs*iWS&kTI*f_(+88*(a@i833
zih)8P56A^_fb7)g(af-Jz2?lBr4NT*lP6c`$&)Moz6`tn{`>X9g$r4*U_m~hfZi9y
zGMvM-C!c(>IueNt_#zMpaLFZ?lmN|tOR&d+US_(Jj^ohS)X4q!-`~Du$r5JHoSB<a
zPK-ddfA-mDM|SVt9qxVdQ1c<m%gRYD*r;}5O--E`&AnqmuR(*3lHwBP&!5k>ZQHo_
z-g`S68XBS_R7~aN<(-(5+t=FcuiM|X!~M}HHd?U8ieAG;iItU=ELgCBb?esg=9_PJ
zj9?BL(3KUH`?^ll*4DCQ$r93-qY>Ns!9Ft`{q^edMH$E$Qm;94X0>N1XH-5cqp-fP
zu#goiR;*dHXi?Ef0n5qBS(u-nk5Y<AB+}aq=?}9L2m2h!=%-hva)#7v=gwWZqnS^p
z*PBCqnUkACWkuz_oSdA6A0}_BtgKw~#v5;3xP19?dI9x!%O{RRy)yM-X#op|!yJG7
z@sYf|yc1IsFh9%!g+ifk%$YOi!if_n=B0M>NFDuQ8AIt+Q&V@?^csz<Oc^#<;yf+o
zJXIR=Reu!coky%*nKEp=(lJIV9pmE&t>BC^Y@A`^W1L~*W1L|}J;PS7Uac+5!Z3`!
zY5fokv~8O!uDGI4D7t#}Y8?y)F{FtQV$k~q0*#Na)R1zdl!MMi2!X@^0iN%sl_SL9
zk@C8A>k5jBio(Fe?CfBLX$GfgX?<+Z{)XV^mVWZ$ku3PCf4f=Fox6bAx_avB>nJOo
zNFWem<7>a=g%_SXY&mCl;us7DS-f~L;cz&k8)LB;YuBz#mrQcrdFNqS773NWkVe}3
zedUv7W#c4lo_+S&LFI%(p|lHcNQqK{4yP?Se;wqhXPz2%-rKfqyP>?i{Ih{TU{W9u
zC^by8*fLEs;c4PNNJDVQp=P8DIb-@%UR}SA=~Je0)n(u0jyrFnJ?fHQI{BlibVw=5
z&CNwAh3mQ)hKZB{DJ4P(3}GM)fiNV7keH^KcJ~@0De{e)^(2f2N((BmbT$SS011&?
z;EraW9Ky_*I14ETg4!j!v$Ycd4=*_n!^AWV0y4<1$Zp=VHv({S?q|??_>EjzTDmeE
z4xilnT-<g!5QD623)6>$>m>%e|KdxoN^3Ga&!?rWovFu_6OYBIt#77s%2cFw_}bTR
z)DQgce~H6U>F85(>H^DkU3}l~0n0G)rH@n+;R&>9;``~l2vP_f&t*?y6Y~~?z%j@&
z$_a?9<o7yC%x|Z>IG>$+wlKq+jv-`Pz)Wefvt<`iBFxGCIEJP1eGdbZEeE%<N3N$d
zTmZoD>mEkCrNb)h`+l^`yb2+39fy~;M3^%@jP$@mV|zo(c<BCL3^?aFE*+gwetyp{
zab3tS$mfw?-NlzKxRmTb{^4g>FNL}f!!R&S6W{mH7$~JNO#|)gLH&ae5-l{1(K@nP
z4B!Jos*s==00g#YlO+m(1MF)*h%VERMvhYOUgUi?v_D36p1?UESU71B!q8M5tYS;z
zCCu<4stzW*9Q&I(sZ@o-E{sxr`-`sU0UB3<@IY#f?GEq%jZX|T<Nn6;k}_Q|Q?Y<y
z7$|@Ep5}-d*0uOu4C@_yNGZE_B!IBQFp-R)GiuWmYbV>tp_2}9Q@+wKfe>tN+(^rz
zEW`|fNK*%Hvzxhh$1Q}WHV{xj_NyAGhoamP)*iZ-dh4%vHOV<zZ4>yX(yM7|Xc|^w
z&-3Wbux{Xdh4wVU_i>dPbx@#m5-=%KYei<|`%yDYDb>9T`$uI`N_^i#N--dsOg9d+
zH4z|)X-cw<g4EeM-f661Yx7%7vCkMXiaQu>qNRRwaxR8LQ?wq_EZ}`}JuR^)jt6<s
zN^Y3(eU{Ez%F|U(4?CycI%%y_ziT{S;W-{cc_bWv)PQLXp4TTF&S;FfALjc$uInPD
z>;^?C)&0Aa5@{I20v2<lG`H51W#nQ>11X!aJ(oj?CK@{qV!I0M1qQvpI27jk`FHSx
zbzi5Z^c_M0*vtlSlM9mYAiLu@u07!{K0W(%eC?A-5y102-5a>BPuubF(HKJ067xn6
zn9_X#8$lj6YKHX>D7s8yH>jQmmNmFZ6oS@hjD21ML8IroxQ?cP0#Eg%?P*CSH4BcL
z&(~(%%<VgGB9gm}kO^9Wt)R#|j_ar2!P03<vAsAUGn63%w9(%rYORST9E3EnJw@Ax
z0W4(_GtC7L3&VQb`L1)l**2vAO8wb*!lR)hfk^_>?0J+(C~!S+d}zyx4{5p_WwT(?
zY*ukAx9_}(I=Kzg5ac8#an;;g`Siz@VS6zQZDh2VcinZ@m6es1Cv|N|r4*j$p?sg(
zrWkqoSu{sI9LF6#+Dru)>B4)@gJ`tpsX5CsKU#)$IcL)}2ka0jWuNLp`YMK`Kup53
z1qg}udz`QDgYPPoZ&I2w1%YHJOBQvb%qgADDsJV0UEkxN>vF~H8#sOHVq$J*YC)_a
z1G?0qvO}R|p-?E>ahxPrDc}}QF?hDhqwY{5S%2}=P$9jz=!zQ$opCrfgyTR>T>}?i
z`5mlKA^CZ^A6=Aa+cvgscmEs=29p=2a<ATIBpuZ~?O~Y)XH57kuImv~?N~-HUuA(8
z@F@<JbI#P|gscF*PVeMR(<B%SqP1q>l)2;<-%7&vm|s2*!;m17KGm|UK|z~5d2)Ur
z5Gal}H`}h~89Jp`m-UcRBBY=>1{fZu1ff-6s73qHe_l7>+?_xEF<MUL)J2yN2o&-8
zbG}7&^-C-}{X|xrf8pV0m{JPEFql1e4$AWffFTTtOoco`2t3bA>*PJpBN~me{FHy>
zoQ0o74-(W0Au$a}duKbI@1{#|IdI?rMMXUiYAq~WIH*}}XlO`#zNV(8W7gEEWmr~N
zDV5a|8TM?tP$&x_JY3hM%~r8PUcru`7Hvx9qyY=t(A1=tExVj|-+cm2BX;6A7B0Mz
z-#&jG`Nb1i`7d8MybO!S<GlRx%LD>}A&a)Xfr-cCX$!(@*RI7hO-wPg?e>)4U9?Rn
zXTydKeWKCc?Cw85l`0~q`!o1{hf->aWtv4YrCT%_B^r(5dEVY#+qZ5yWS_9~)%TqZ
zt?ixL9Vve~(qQBA%f7~APd|W`K`hH6C##l?Z~uVONi%3|Yd>rZ8}t3JE|8~}mzT|$
zH}8z=zy0ltrca;lM5EDHv$C@O{MciU?YQ~on-kYOxP8Y{ukU?St^eu&)K~rf(2=?>
z#|&V@jaet3HYw2@jqTgFrFFQr(nr+~8)w)U9OE75BV>%Y<GknRE48#j2-E6UY8gBy
zQFfG>-*}`CjjJEJP|H9zLYfF^ptb5L0rW3xXpL4L%84=k;xz;0h(HcPn!PSp10qc!
zKnnxy*=Q#^K+aejJq^rY4rR+OBUm;qqZ_?w3k@&aIWS8N<}&G=TaZ=`%IQED!9i+n
zE;5jZayqI1-G2<+Nx?iS&bb96RFHnB8Ob`87i$ItLYmaQ_}!zLVI#`JgfuYoO3=QC
zauZ0y0%;(OBvX=$lsqR*3t<Eh=_($nYyY@!Lq;9vg_9;j+6HFwoZHcm0@z1LBgtID
zLYN`;*6(Dqx1DT5vNU+o00tgSV^seirj?I!6DT`|pXfl@QIs7^9<GgY6KFSqa%~u-
zIw6Eadp3I#n<$uh2nrg=D(NIQoFF%xAiFpU1r3zXOi;@fw3q1K5dCYCLYlPJSJArr
zFKFLID<7>qv{LM?-^oU`f&8$-Eb@41|2llTbIkj&0hz7#U9|520lK=5S}R1iFH(J~
zh67hxqP5Dn<4oCEX&I(9G&Stz(fIGlE)<+v7i8X)`2e)kZs8C9ram2K-PXbho-^hd
zX7*la0PVSGFI6h)s)B2kI&{+H31gVtM`qk{W+rL-D~Zksckcda-;VP>m}*J>ui<g3
zig)zsIR8i9xg@eS9Xmd(hhYx7tF|XqSKSAs4~9l-g_K6ppA9oI={TojS9f_z9borh
z9p{Fgj`Q8quA=m$&$GW_%Q3{TF2Fn&<=P0Xl1^T$R7BRpHa!$zDYksrj&oLCm>*2N
zl*`ut`;Z;yyXSt7xhI~}Cv!Nq7^XbXKH39}UO7}RwrM#`!%)Z(b)3_N{lcJR#wWR_
z;e4*%1v|6f8PIXQt#TE!XP=I8V`&4IV}oJ7i*gdkK&U$q><+0@Y}4NG1(FZjaTeM~
zdp5;WPT?Nl>Rs>-?{s&ZZ=1b}Pc8T~Uc4P?m>9vlqrTEHN*|VLpZ5XH@545o!EVm9
z<2<x2)3}KaiYA=QJ-~l&6ugn|@Wa`c^AEEY;wO?ho%;K~QR#2bu&yLn*-;!fnmp-7
z30OUgAp;>023mPo==1@D@{wjJ<BqemvXf>w9m~uRRw&7wl9`M7PIduytc~#Tp8y$1
z<>|>pT3Xr17Q?jfAq<QB6F!6X+@2~%SI8}7cl7}w(4NyTCrjbw*?6&LR-C$&FQ4+M
zwAXaYGc3Glq$euvBgZAtR7Ie$=fzt^v(D_^6n%3xMZ9r)S~+8uVSc=whUafb2D6jZ
zilNFpTBCgzKR&RNs+<@HUcDV@2D{5tgNpIpl+PUaUM}s%IQW<QkcQbO5b5@BdSI}m
z-Po9C*myteC>!Jbu%oP&IL@$fhV_h}3Q;`Rci$Ic*k`MS5F<K{1%`cOfW0(h#<gGi
z{`a^3ZsNp?`hWLYMa9L}+;-br>x+uc&2WxElCQGOP5nIPOnJs{f9rb2FVmy=`ifJ3
zw)MKrAHU<{mk)N$Gg(>J99XqV>nEPj&G+2nyjWJYvg^A)Oq{qfwq}i^tE+YF@y9#X
z6&9X5n4HuI0;RymfZ0Gr3OM;;bvcrb%F5$(CfAKfX!g~m3s%2()4?6_SM+lYck5}l
z%)F@oHNSzYw;6_RC@j=1XPu?J+i%w`cirXuuB_~WwPj@&MDM=a(a$}n^)t_Cy>X+C
zKlWJXtL5eA4gpv`FfS5`=tv}@fir;_=|DT00n7C0qj1Tp>1TfRx#drXE-jzlfA^ML
zSMiA-U3KBh<@w?8rUS1NOT@YEOUoZBxPH>vy|43Op5yy?t*yk@t)t^7KOuMPR%_{v
zH?CQ7-F0iSJ<np_J~(s;_U<KAP>_>TSoo<SjDVE_jaN3UB@&6O1C9sENxl(#Oqj<J
zcbv1ne%vRoz3kK{7R{PnP*zxQytt_JO#Se|27ugut(gD4D?k5SULIvTBU@2^(#db!
zxx2c()o<t(B#7U@ZB<Ze!WT;cHxeOw-+g2+UW|F#Y3Q~#gk?cq9?Efe`_@~Z+`DVn
zFBT2&!}!$;_W=-zL|zPs!=Foi-$?R}*y>pDVJ3ie`Giydc}3}3vRiXst6opZ#NxSE
zes$3+;)3v51%<igS6p<`OV#SnWn1<|F?9|B8Dx7^%Z}Io(6UlL()4aGlca?ZwZDOH
z?EpP537YVL_=XJxBN5CcOE3Zf9M{!vKlIR(wcEDcumWl`O)mO@b{1fh>}T7@OfAuK
z3}atoqvHk|@qC|mBW)C97tOtJ<-9)y14iyH=TBvkLmiNMN}#zeu%~)s$;JASrp;*_
zzXoa^72?``ra7y~_fOPXC!hYPszN&s#+hgG-qx*KKiIbI+6%O<A897o3$%6NaQFnE
z^=JodL{ClW2lv16*LBwUo8N7&KiJt!XVj<eV1zpH#*AHwKbAK&cc5(WT{uu3+)@2{
z=@<3G^=}U;*|N?k4~3>VTH~fD-~x7aHTG+-F=6uL>4g&}oH3pXk1`L_5AJ_u@5TvN
z)_-6&xi&a)Xl--p>`*vyux)6lw%)6IyZkHq(Ymce30)(^%85eUm)+T!Yxe@nOMS+6
z?j+~UH}g(ezWl!DCrw&8QspjPei>(;ayBWG*hcpwKF0{dx<Pxm?uFV-r5D##n~in?
z;!%jlAd!Ij>R?sF*3uRFk$rCsCGb(hxS&vo2eKR|5bp(4ED)eWh;C=oxqUm?Z@m>b
zW!bU^UYs!D{851QIpBkoIdqRXhV_6}zxLqHvdbH5tw!aU_^wIQzTocWs?x9ONA_<X
zHW9b1xuT@Rbfm;dfz=TVvdu7_e@p8Z4kkl?61GjOx*DphO=+5Qh7hT`{8K-$c8`?^
zanua!Wgeez*;RT`pmR#I(K_Y*w(64e^_tqhW>EVRmTmts($Vqjj^bjJVbCrmdwl;1
zKOVnE!Z)|U6OAMv7id<BH>;|C-LZfF>LJ9sKs(Ue42~(V4okIO2qCy|;%Nxt!v+}r
z?t2s}ykPK$Iayg>iMO^sWx@4d*187ZaUmw#@Usf|LW>X&+FF120;tnzCXy=X22+W1
zA<4G^bf(PU0I-gQ&chMiUP%EaQ`HWu7vtP?%sQF@8xtMpk+w{Z1%@5bb-0lhMvny_
b_WuI_=b@>S5J7qt00000NkvXXu0mjf{8{<q

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/apple/dot_for_ie.gif b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/apple/dot_for_ie.gif
deleted file mode 100644
index c0cc5fda7cfb9539720de442a3caca9c9a3fc4cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 43
vcmZ?wbhEHbWMW`qXkcKFla>7c|G(l-7DfgJMg|=QAOOiQFfqBrF<1it%E1S(

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/apple/style.css b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/apple/style.css
deleted file mode 100644
index d0c4163cef0..00000000000
--- a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/apple/style.css
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * jsTree apple theme 1.0
- * Supported features: dots/no-dots, icons/no-icons, focused, loading
- * Supported plugins: ui (hovered, clicked), checkbox, contextmenu, search
- */
-
-.jstree-apple > ul { background:url("bg.jpg") left top repeat; }
-.jstree-apple li, 
-.jstree-apple ins { background-image:url("d.png"); background-repeat:no-repeat; background-color:transparent; }
-.jstree-apple li { background-position:-90px 0; background-repeat:repeat-y;  }
-.jstree-apple li.jstree-last { background:transparent; }
-.jstree-apple .jstree-open > ins { background-position:-72px 0; }
-.jstree-apple .jstree-closed > ins { background-position:-54px 0; }
-.jstree-apple .jstree-leaf > ins { background-position:-36px 0; }
-
-.jstree-apple a { border-radius:4px; -moz-border-radius:4px; -webkit-border-radius:4px; text-shadow:1px 1px 1px white; }
-.jstree-apple .jstree-hovered { background:#e7f4f9; border:1px solid #d8f0fa; padding:0 3px 0 1px; text-shadow:1px 1px 1px silver; }
-.jstree-apple .jstree-clicked { background:#beebff; border:1px solid #99defd; padding:0 3px 0 1px; }
-.jstree-apple a .jstree-icon { background-position:-56px -20px; }
-.jstree-apple a.jstree-loading .jstree-icon { background:url("throbber.gif") center center no-repeat !important; }
-
-.jstree-apple.jstree-focused { background:white; }
-
-.jstree-apple .jstree-no-dots li, 
-.jstree-apple .jstree-no-dots .jstree-leaf > ins { background:transparent; }
-.jstree-apple .jstree-no-dots .jstree-open > ins { background-position:-18px 0; }
-.jstree-apple .jstree-no-dots .jstree-closed > ins { background-position:0 0; }
-
-.jstree-apple .jstree-no-icons a .jstree-icon { display:none; }
-
-.jstree-apple .jstree-search { font-style:italic; }
-
-.jstree-apple .jstree-no-icons .jstree-checkbox { display:inline-block; }
-.jstree-apple .jstree-no-checkboxes .jstree-checkbox { display:none !important; }
-.jstree-apple .jstree-checked > a > .jstree-checkbox { background-position:-38px -19px; }
-.jstree-apple .jstree-unchecked > a > .jstree-checkbox { background-position:-2px -19px; }
-.jstree-apple .jstree-undetermined > a > .jstree-checkbox { background-position:-20px -19px; }
-.jstree-apple .jstree-checked > a > .checkbox:hover { background-position:-38px -37px; }
-.jstree-apple .jstree-unchecked > a > .jstree-checkbox:hover { background-position:-2px -37px; }
-.jstree-apple .jstree-undetermined > a > .jstree-checkbox:hover { background-position:-20px -37px; }
-
-#vakata-dragged.jstree-apple ins { background:transparent !important; }
-#vakata-dragged.jstree-apple .jstree-ok { background:url("d.png") -2px -53px no-repeat !important; }
-#vakata-dragged.jstree-apple .jstree-invalid { background:url("d.png") -18px -53px no-repeat !important; }
-#jstree-marker.jstree-apple { background:url("d.png") -41px -57px no-repeat !important; text-indent:-100px; }
-
-.jstree-apple a.jstree-search { color:aqua; }
-.jstree-apple .jstree-locked a { color:silver; cursor:default; }
-
-#vakata-contextmenu.jstree-apple-context, 
-#vakata-contextmenu.jstree-apple-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; }
-#vakata-contextmenu.jstree-apple-context li { }
-#vakata-contextmenu.jstree-apple-context a { color:black; }
-#vakata-contextmenu.jstree-apple-context a:hover, 
-#vakata-contextmenu.jstree-apple-context .vakata-hover > a { padding:0 5px; background:#e8eff7; border:1px solid #aecff7; color:black; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; }
-#vakata-contextmenu.jstree-apple-context li.jstree-contextmenu-disabled a, 
-#vakata-contextmenu.jstree-apple-context li.jstree-contextmenu-disabled a:hover { color:silver; background:transparent; border:0; padding:1px 4px; }
-#vakata-contextmenu.jstree-apple-context li.vakata-separator { background:white; border-top:1px solid #e0e0e0; margin:0; }
-#vakata-contextmenu.jstree-apple-context li ul { margin-left:-4px; }
-
-/* TODO: IE6 support - the `>` selectors */
\ No newline at end of file
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/apple/throbber.gif b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/apple/throbber.gif
deleted file mode 100644
index 5b33f7e54f4e55b6b8774d86d96895db9af044b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1849
zcma*odr(tX9tZI2z31lM+(&YVk%mZ}5P~KlG2s=WSbGzm0!x7^P##Mnh7t-jP!X0Q
zk_SQ}Po-L1tlDK;6l?(>v)e5ZBQx4|Y-Q?nr@Px3?9h(3ZWr3^tj=`TP57gKr87N$
zp2wWee1GRRCwo_xahnw)5cxNPJbCg2L6DV|6`#+yw6v6!mDS$f9-JvFD^n;GQ&UrZ
zzh5jCkByB101O60U0q#p_1BM>Cv-vP?&s4@g_((4_1L=L$(a91)0=J91Gas#R{McE
znYG^9*0A5YZ>#;~+Wkn(W5B0^yELIYLP!K}mB~<)AM@1&nqekynuaEGqP<JE0#l+(
z*R9joTN$nZ{F;;f_Nv(QpzP65;W)SYC;1+?>rzoH|KodRXJy)%+w_fu3nE5>@Bd_b
zqC$EQ;{c`T&?EsNO|igL9gC7Ygxv?aQUEXMq?~>wg{EyW;VcJ37CUF#HjrT=KQO_*
zS>M9yydXk18D(+QDJ1>r);Lav_uYKp$T?4vr{Q$lTo&pKv^?(>L-)G2*lwH!Ah7k?
z7oH<8h-(KTKt5V6$8gF)C7Io&P5=SjTh)=zV=E2EUhQZ<Wjvi)ks6lL7NUI41Suec
z%#@RZvp$b|KCxLd`PA8_!Ub^;+J%TE^_K&d6(i&k---epB#nC`b3_`MdhtuWMEe%I
z(wJ2$`EGgJTz=trW>P##L8S{d%UK>>+y82>+FV+#^BzW7u3F)Bb>=lYQ%%j`F>ASe
zo*cw@V#u6T`A2He;70mR(V&iV&-7{qP~=SRf&jm9-T{*ZeZ}$rd0#6c&fLG^xJcf5
z+p<`wJYgW+_s*V{uI$nMB;%8`S_3>PfGOj3Rq}@Cx^+j?rk92fANSFDBYnOqQ>Vdj
z)(|$AhP4t&Lb=Gvo2#3Gl%9<=Gv`Mz?Po@P4iLF!x}GUWJICDlFk-hS^Whyh7x~VH
z@0vD1>HYD4&e+~yzS*-sFR{9`{QEEZO1zg7>R&7cHts-6j!xHVdA8eI+ZlVzd%`es
zJT@$#GX(gvCJ1oJN%yLBK}{V=V;seo;!w|Yte!W1%5qLNFWqvZW>h&IiH+oPT=b@E
zPhGzv5=(Un*X>v`><w7vN-j#h05gB-F9AZf<&Z~SLlC&Nz^-G6DuPj|`n3d!<l7n!
z^9j1qeh2{s+i0tZ4@>%8h_nj^NdY<en;#4d>cE6NHS_ifkCV$*D)Tqrbu`s;<=t<4
zAHNqNV?6(g<1PY-w@#I-WYFViz?9TrkMr)u0g`O`u|>T;k|2sV*YF^pun<C(O34ry
z@yg-q+#%4rv$|41Y!PHPrjmV%@S3%TUelmz%~6?hLG4%mWKO9NB}mrI%KlhB`{^!g
zT?{Y#<ON%sq<!{buD;iH%`hL}N;>vT;$SuTy{j3Gv)yqD!R_CF>yR)MzmmYS5v+~R
zXAdD<Jm>%ng9?df;wd8GxR#%3O+gz};Vo;)sK%Bj-q>Oq%R7JU-KD?vYu>#2UjaDo
z&8$>5xW~?KPD_#XFToU1hIb*VOMidUr6iYiO0N|i-7s`T8!cFT`rN!^1Pt78J93i6
z5HI1wIM$94m{3SLDvISDe6$ZG1;eq_D9RTaaC>=cO{@Bs>$IlP<c+8wUtK_tPUz3j
z)>CPJJ$h$)-3vzNUQ6<Wm&Z5JfeG_o#I^S?ZP9*QGjsiJM3jH{?94}z{@d%97nOVw
zacge+X&InNUL3U(BUlor87ff?2qEf2c|yCI=Id~LI~<KyVA#R%nwHS3S<^IBTu|Jj
zW^-Xv#UBDqOwy>OsN#_zWxey!_9%hxwH2_dEJi=yY|1c7nDm2_Lm!Cof8-R_+9UkS
zcBE(o47yE)oMR(Q=dp1a2wTX5Kv<M)VDKP@wb$5DNEX!VTUn1Pd`taYrL9bpe}d9v
zqx3tu5NTGv8=X63WXPWMm1T8=ujh#QvSw5|(EZJ3$quU9*?0NxQKGsTrnFNF-ygOt
zYWPggi66%$nuj|v6!Ow2)>vGyLqlWTa7V&!A*|w|)ax~1_~aJ0=_Lilg*0iQk7#ZD
EAHN$8j{pDw

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/classic/d.gif b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/classic/d.gif
deleted file mode 100644
index 6eb0004ce3544f9973ddbd5a2c450fc0e1a354b1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3003
zcmV;s3q<rsNk%w1VQc_M0QUd@|NsC0|Cs;)0Dypi9UU9p+1%RH+SJd~?dk2Qrm3f-
zr}gvo>*?$F^Z2Nxspa73@a^*3*xl*o?4_ipq@$(g<msKA<aBhWu&~|0z}<g;hoYjS
z?d|T)&*pl4mU4B3YHfIdhnPJ=PGDtm0yeN!Sz=30RiUM>C@(!<XLnp+XqTFxT4Quu
zWOZ6$Zj_jxSYK=4;^q4L{O#`V?CtH};NbW9`0MTLt--SD?(3YlpwQpa$k@tbq+{;%
z?(z2VSDsX-xu!;KLlJ)lD2pF9kt~y&lDgBj8;k{*otGVz0W+B!S*b@Nod6=01SOgR
zI-wm_tvxHG04bmVC!GLGlQC?yRCc>wF|7bGssJvh0BX5QjLLI0uK+r-1cJq8jnZzJ
z(1Jv`3|Yb@WVJo4+Lz1fyh6MKOT7?KzZFoy7GlRPXvs2&(_xX<Y?|76bksY0(?^Kj
zQnl=nmgiib=xnX-d)W2C&-<su|B9=}h>*BiZ-X-1+{XX^o&W#3%*?I#@QMHUle)H$
z|L=+a>x9?1K>p)@+P`ei!<@#N8OE9#%%LRQxl;ezb>g!_{nc>))Nh+<1E6jQrE?9d
zc@wdJ8MuWYz>O%zlP<}YG0d4X+qZG$+s5Czh~~tX=+n0M>)ZJ4-udt1`ts-9qFLUk
zW8kW0-l=Bbt7zY<XyL4C;jL`ntZU(}ZS2vn@!7of<<a)&*7xby`R?HQ^62~X>ihKU
z*_c=8$ENe(%=z!-`}Obq_wxSy`j(ZH^4i1t@#)>0W!{}=-kxgTplslza`4l;@z%ie
z+{yLg()Q%l_U734=-c<{-T3R^?#!|I?Be?I>izll@Bjeh008O%0oDQn$^rtW0s_1P
z1L+SBuMG|F6cn}=7WXSF$tx@HJw4P(N%m`N_Kb}DtE>OX$^YKo{rvp6x3{FDqx$;#
z_V)Jj^78TV@$c{N?Ck97>gws~>F4L?<>lq#;^N)i-P+pP)z#I_&CRK)sidT&qobpt
zp`n_Zn*aa*A^8LW00930EC2ui0BitA000R80RIUbNU)&6g9sBUT*$DY!-o(d5{Nia
zBE^UpGiuz(vE#;y4?#K<*^s2ilPFU<9Kf<=%Y-gtmTVZ)CCr*EXEGcBpr=m&17QC2
z85AYYp+JQqEqd}O00Bgm4rQv)<UyxUdr~dv^ygNDRt;i}im)r$rarSKEsJz5S^;q3
zx)u90F4V6FC+huYm8adie6QAxn>6e|!vx1_mFhL6;<;Sg;??+g@;|eSjix<Icd5>W
zm?0;Y?3grL&qi@tR&5z0>zg<~tDH@{w(Z-q5#!#?ySML?x_=8FPMo-IfBpC==hv^f
z^M3vaBBwBcg7xbY)Ipb?e7W}t6SmL){%|4$2oE7lZ0u*xo%{Fj=k+7V&mB7-Kl1DM
zVZ$9i`tGbF;DG4J;DZkf{AbW63~HhYMk}bGK?fz607F8$@gvVW@o?~tJMApMjt%Ru
zqo6<&xN}4qX0+(y5j?m<0e}b~AWw(xG_XS%Wz?|2f<FE62PO-tVC0b%4v>KeE~t=#
zM*PeZ4?XkT=pl&gv~%J=3fvGz9(dd#CLUy#af1Q`?Xv(6M^tbl1U!^6#~fiKQP3uw
zG@_@ToM3XvC6-uXkP1Vs!+{1Fm;gWtPv*5yl=IY64?Q>1z=1mpXi1O*Iebw^9d?9j
z$DCZ`faX9O?7+nvM@YZ`4`I~*;f5Pm7;$G?KUFd)03`I<D*%X=uqX=}?GvdzHB4G%
zhwW%OkOMbdAqO4Q(gA85TioCPK}J{sM;vj$_yrr}ZgIqX1Zfh0AMCc<ZUB@BP!OTM
z{;B~6!j?d+qY4>Y!#&6<d*eIK3Iy#H-^L-w!fc$u1P$8`WJDBVh;arPTZqvG7Es`@
zz&-_K62QnLmkh7G1kqbBu=oyJ>^%11bI(0BBuga?1^)xB6=SSH?iy-%fyKiSqsT)Q
zT6Cdw7E&yM0|Yt$BeEb=S6y`glb}41%D%Fk@4g1<X6!xq$PBQ}^5pCQ4NQ1Zu^2*U
zp~b@q5HvvpI26&u6jL<+u|yCO$m3r@m;^w`;fN!SwblZ0ZEwpZwD9sh`IJ2~%{9=I
za{_EPK?UD@KcPevG}JxNKJFNhw-QPap~C}{4o*<vhtzJn?Ey%__&<aq^??P7G78p0
z#^RGt<(30n&*n4qpo9}oMDK(WNc1p6(f^>H&jC18QG^Z=%v^))0~PMb`RJpc`|kg=
z;Qsq9fM5X%?th@s1oIrPKl1pr2l7A@Xh#r$K)?b5p$8tDK$_T5wgMah2gpj+JWN!O
zO9UVi7|dV>*JqFzc+i6&_?-nVP=a4@V0a4QM?7r6juy6%L;|AVK>9I{cW{6PILzS;
z+#w%=uxB1Xl!rY3fJj7ppo<`YvP2~+L5U_#LK3=ThzTs<fe%~&cqh<^Klq`KE_(5c
z6Nt`0kTZb<nDLBe438KEf}DN05j^|wj(8067rQhh9V19V2um=67oe~>fDEJ{cN3gJ
z8uE~c#Lz-;A&g--au~vhq$Gub3xbrw6sK54DpGNZQ*4rxrYMCaO`(cXqT-aOP(><Q
z5z2!wXcG<+q%e{Zj9S|Amdp?aK~6!6UXbDzzzk+DYjFyKprRJjNTxD<;R{mK;ufj^
zQcq+c10vZ*H^XSgE}RjKT?7M|z37E6crgruq=FPHa?y);Kum(Dq86eMMJPlu3R3W*
z4?NNZDsJWfE<XUkPe~NcFqq*CWh|o^&*<hidvS|$4rCRy_)?h0R3=)i!ko7NMJ{A9
z&t2eiPI?d}K{f$^ezMCax=IN)nZXQQ7_=GAc*ZV%*-(P8LKL0?m8eKX3s$(Z6RQHm
zJV6nwS?!^c=>mY&mg<Li{e~FKP)0Ibx(sF@G#b*7hC>Cy3R+03TGp}ywrJrBg5bhi
z-~z-e_CPK+Y~d58Ac!L7O4qt7q7j8~DoS(%Rb2oh8Ocz_OP#R`t=iP930s&P8pecC
zlyxAuAVbA2ma&aNArZGog<RKV(f}Yr5r@dyQ<;&BV<6+NRAt693_B24(1K?^V*}8H
z*4W4Y3M3VvK$_CJz_cYKVi(ZdtRI#t2tNcu5s(n=UKavYU>w7=e+{fMn!#FuxMCD-
zdt2P*=2(KXf)}2s!ruC}gh7NN6t#%vW)p`vKQQ7EQS=Q|kpYe8BIC4ET}E~Paa|^O
z4s=rxT@<=IkW|zH7U5+b5e5+pUBn{21yRJhZdW@$7=jV;1rBqWaSUkG*S>#M#(uBs
zJm^V}dOaA0PYX<nR~*9=d?>;ofI(wjKsdqyNFVwRv4{-wrWnkCMlOcz;SU2N7{nmR
zDr_-80}>E{nKdUbU;ztYe8LmD$Z{-X(F^s;wTWP!gqWeoK8|418NJ{|IM=MqUTpRM
zAEuZEDMmqyI@`IPvxw_JOreWe`1!nk_OmQ>p=UbQ5iY~Q#W0M)=teub7)TY!C0F5!
zN?W?psc7XuF8Rq;v?3LyETyIaS;$11`qY9fHL6$5YTl?iBIGbgtXpjxFd$?c<(RcV
z%5jcz(E5)UdBYv%V32EUBOK(IH95*r4s-Y#A@G35uM@%qgMeWUZzzKs2$BtKRHGW*
z7)P>`&Fpf31KL55wyA>?2RmGWAYiCN8|EE_f@I?w)vyLN!Z8kUC;Qyc7DBqGO^`9b
z;agh}$QIbpGd4isAosS0zQ57$aR5Bv0$2ATbpwSopy3Q^hyoeVuv;f2L>u3jrUo@A
zE{=u3LkKV*IKltngxz`}ZdpKrLcE>tiI2nOFwZz53yB1|X+a7|*ZIk>f$yHL{O1XI
zxzJ}mkRebZdQTXFLbQPmY%rba-?qj#S{`tj5B(uSaDo%Go{(&KgX>-A#=XCNY;T}j
x<5VXI5s1JLw_`&a*$_y#t8oo(L>=#Er%g8G&TYWw{qcc(HRLA`dBX$*06T}^)2ILd

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/classic/d.png b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/classic/d.png
deleted file mode 100644
index 275daeca2d6ae2ba9cf59bd23a194d13a35a825d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7535
zcmV-#9gyOQP)<h;3K|Lk000e1NJLTq003+N002k`1^@s66I&4N00009a7bBm000XU
z000XU0RWnu7ytkYPiaF#P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)XH-+^7Crag
z^g>IBfRsybQWXdwQbLP>6p<z>Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh<iVD~V
z<RPMtgQJLw%KPDaqifc@_vX$1wbwr9tn;0-&j-K=43<bUQ8j=JsX`tR;Dg7+#^K~H
zK!FM*Z~zbpvt%K2{UZSY_<lS*D<Z%Lz5oGu(+dayz)hRLFdT>f59&ghTmgWD0l;*T
zI7<kC6aYYajzXpYKt=(8otP$50H6c_V9R4-;{Z@C0AMG7=F<Rxo%or10RUT+Ar%3j
zkpLhQWr#!oXgdI`&sK^>09Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p
z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-<?i
z0%4j!F2Z@488U%158(66005wo6%pWr^Zj_v4zAA5HjcIqUoGmt2LB>rV&neh&#Q1i
z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_<lS*MWK+n+1cgf
z<k(8YLR(?VSAG6x!e78w{cQPuJpA|d;J)G{fihizM+Erb!p!tcr5w+a34~(Y=8s4G
zw+sLL9n&JjNn*KJDiq^U5^;`1nvC-@r6P$!k}1U{(*I=Q-z@tBKHoI}uxdU5dyy@u
zU1J0GOD7Ombim^G008p4Z^6_k2m^p<gW=D2|L;HjN1!DDfM!XOaR2~bL?kX$%CkSm
z2mk;?pn)o|K^yeJ7%adB9Ki+L!3+FgHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_v
zKpix|QD}yfa1JiQRk#j4a1Z)n2%f<xynzV>LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW
zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifq<Ex{*7`05XF7hP+2Hl!3BQJ=6@fL%FCo
z8iYoo3(#bAF`ADSpqtQgv>H8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X
zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ<AYmRsNLWl*PS{AOARHt#5!wki2?K;t
z!Y3k=s7tgax)J%r7-BLphge7~Bi0g+6E6^Zh(p9TBoc{3GAFr^0!gu?RMHaCM$&Fl
zBk3%un>0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4
z<uv66WtcKSRim0x-Ke2d5jBrmLam{;Qm;{ms1r1GnmNsb7D-E`t)i9F8fX`2_i3-_
zbh;7Ul^#x)&{xvS=|||7=mYe33=M`AgU5(xC>fg=2N-7=cNnjjOr{yriy6mMFgG#l
znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U
zt5vF<Q0r40Q)j6=sE4X&sBct1q<&fbi3VB2Ov6t@q*0);U*o*SAPZv|vv@2aYYnT0
zb%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KOarm5cP6_8Ir<e17iry6O
zDdH&`rZh~sF=bq9s+O0QSgS~@QL9Jmy*94xr=6y~MY~!1fet~(N+(<=M`w@D1)b+p
z*;C!83a1uLJv#NSE~;y#8=<>IcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya?
z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y
zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB
zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt
z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a<fJbF^|4I#xQ~n$Dc=
zKYhjYmgz5NSkDm8*fZm{6U!;YX`NG>(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C
z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB
zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe
zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0
z?2xS?_ve_-k<Mujg;0Lz*3buG=3$G&ehepthlN*$KaOySSQ^nWmo<0M+(UEUMEXRQ
zMBbZcF;6+KElM>iKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$
z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4
z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu
zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu
z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E
ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw
zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX
z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&
z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01
z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R
z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw
zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD
zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3|
zawq-H%e&ckC+@AhPrP6BK<z=<L*0kfKU@CX*zeqbYQT4(^U>T#_XdT7&;F71j}Joy
zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z
zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot<a{81DF0~rvGr5Xr~8u`lav1h
z1DNytV>2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F}
z000u2Nkl<Zc-riod6ZPey~jUQ_ulTFjTvATmSG1$FfNE15s?^-F?gQ7Ecy`5B7(;k
z6EO+q#3WBNi6&8#<B^=i5E2s=pHZVRViYtXO7sy?5fFwYqrfn0Giz_R?^5rNUS{cK
zdSF-vrp~!%dg|W$o2vTO_qW!xP)ae_22PU$ZNOv4R;p83ju>RvAj1Y3HpsBSmS}p<
zj=S%^yH^D7y6Y~{+cW(oC*4lmzrUu>@0~33(lh+QYy-}D5d9^mYdajUPNsSFYQuyO
zCzML)FPkw?=QZG*jw4~%$uKXOZ3iZHVb{-xvy*#X{jn1>{mgYdnda43Ihp3wS51)X
z^LnNm3GYz|!I5~9{q2P&c4DTVxsE5(y!tAqzcfL=*|5Pjz--vb8mFCT^U9TBdVjj6
zM@vqBwG(+>xyE6GnT`S025r~?vtfe_8)VpE8)VpE8)VpkXV|J$tCV3FXquLDykeRr
zOO`C@=8CRbwMu!tUNos^&5{TN3J1q^v&xZDW*mzU0*M9!Y{yC~=UBDn-?>{&pMDkx
zYHF#et)aYZBp#2CO>g{#wQFDKw=pH-Ft69koH=tSEiKLI#ZV~3x^?SP`h7khS6y`#
zhG7tKBWO}f`@Z8k<Qe%yBPM_T^Pe-y@%em7aJn{4N?cda5p9c&UwQe{^M6XeIpXhb
zeq@$P0PngkN+~}6)h$zidLVElLH4AH<N5oB^-LT$fm;@TjRzjQllGv+kg~D;8iyqT
zlTuPxScvPoSeAvR=}0M%QX+&v6B<Gj2u-31iLUEu6S<m*iF|AS1|nJ=WyO^kDjy94
zfQX1Ka7VL40i~Qiaw<}285cRw8e2yjJ2nnYN7pqx(#tOYZuXd)063@clPHyWzMCJJ
zrOsXYc9)*@0K6VuwrB3`J1z#cWCJbHZurVAY0<N7hnBW>#*eNb913%wwwW>G#v@gf
zFW-EJdi0T>ihj>@B*3yP3&(Lf!P0ab=^$N+umwujaU3VTQ51rxZLv49nHgvKAgYn4
zRp1eMvHL1W$Z4ly*bsK^eV<A8L^L7O0;Wryoh`cv;^*|jbI}Zi<Jf5Eyx+8yy>bI(
zrNsceR`WQ@D$58~@z{&m`|{^f?v0#wIj{ZHdc$!XEX%@GE{@}H^*!|&nfKW5ewiXC
z8nx&M1o_3vUtw7=q<9EV{PrO}zwk!#Jwy7RVM$fxILS-XG<03ZacmSCuB*^>4dtk`
zYAV(zQ9{uWtRb&O13tv(mf+PrfWWj(@<cIE&%X91RJnpQa$Fbo`2Wqu_NT}%5=83-
zGe@0=&=gfoRlFa08NKunRZaT<IM^6qj9ZdXrA_|y&oVAT&wI~)w+!HN;1ytRx_7h-
zQq{P#=_&v$3-q`zplKSe<Mw|pF|qgwhIMs5q?9P7I_pS==*5!}1cD}wp?31M0s?e^
z6}OenaPYyFhE22_%0o;N2vX&>na%uW$36JQ*Wq!!9CY_XEetIj&bmXtq1N~p_Wsxy
zjkXc|N7=13)-|RbkL$X?uK_KGC5bT&m<;^0uTFuhVt`2*Un@Wz4I9>Va<K`f8e1tP
zj$<RGNbx4qwfeS3Jb2M{NxoJb@2%mzhW%`9eur`9rCAG_O~FQ5YPZD3qD5&8)}rgh
z{9E5ZODIUxhN9pYzBy?HbEnSbxvJ-~02TuymuB1cVS8~(LATd)^bZd^Tc6P7QpzMK
zuIna$mr^1%tyjQ8R*>e_TJp3)45=YyGp22EDAGtnM-!&yqHIsb_lNmPx&6!s_`&*{
z*<bb^J`ZeRBUrHoiP(_eF`C=Xc!*C-y97r$8NInAU}m)U74dp9+UJ}Aa}|e!_YpCy
z=YSI`F$t<|gJEP=i9*mC46)Cy!>e^Z7goVIP++^AVS8GVNyS;C&*aNf@8<rUcj7PH
zj!y^Wg6YCgdo;ICe1N$V=3?4me7Y~Ql1t1d9Lfo>PDUOc!z?Sk$9vQmmQV=^kP;3^
zclDA9toYhQZ0b59=tR(UNW3LnuxyAr(3Te_TkI2cP0kuMjpf|S{X6fZMs7#f1O<^%
z+%o-MJ~3q;rX504TBeQTQA$OVV-Ds3SV>7vfF&G^bnd-vL$J%=G7SCbGAyCTbzM){
zAyUe2*@yI53`wyVg>4ED66JInU&jH*a&aA<vVw64B-!H9pcUlwvWYC`ULM_b7fqJM
zl4;-MlJRp0S%LV1WMq38aIjAd>t$0u_Pbw->zCY-am1yCKB7_BUsJ~oOTUfbD`7}c
z;nDLFP1D3Q&E#jV*Bg5<9(yI8>*_Uj+hNMa&^0a{aXFS{6LQ-zv@W*F0Ndj*%vZq`
z;}_sFJUA-7&Cqonuh)xGikai4Q#kBiBBsrm6*JH@2_j}w4a3L;n%hk!=3>Kg$ZY)R
zf0m{6J^14vqvUwbKkqAeJVUwqif>R|{W9||`54z+dtLuC%ynHfO=H^h({XJl1q`7{
zB%Q~@Y}-ydG26BY27@e^^=Yn{c{wVBQ!9i-*Cg$Mc5KH=Yj^7F>lr$9XtHl+$;^xl
zsH>|>*B=1*)OV_<thIi)ClM4U>~!Kv{BGMej^l9iBkIL$>8f#KMx`ulU1Ot~H}594
zZF>eq17>72GiTnxUtV0skYOWP^k1LtUxtOlVP1LV6+9kKPDk5p+a??ir%ed2Tel8f
z*U?3G-EF&0GHIJm&c=-!yLqEs+1+z|Zaj(HgDD+}2xGzj9Jm;`2pEyWy41&Gu=-q`
zjhhyKnWvt66eYbFhCxBz0XDt+1Ik8CqP4BP-xzjE)WhOH7skOV%;A+lSB9NPYji3B
zb_A~a(O;uMhMlBsu;P4zv_4my_x@s$l7<hV8$D7jnPU>y3^MtvPjsVk^<&p5>B&b(
z9U(Q8aywH1J<}RWp<Ej`8e-xNYf|J0PXR*eT^@H+JWU}$2@PeNsAw=nPFHn!Gz*x=
zs&y7Hy#<udTa34SLT(AtU<-9?A57`jyoHRq;vS??fE(>VXx<DtHw)=0!i@%~{p<Hr
zcapb=$}8?c^A)GxX<95#Wrvypfsi^iFMTiLczYHwEjt#Qy&gTYPX)~5ZNoYPXQ`nV
z4M#aPt`$LQ21pH|#h4OXq*$NS4TR=Fq|123pZ&+ajX71EXO0>RX$zRKKC7cH4zPoe
zT8z1xfzW+?RJ)Tc_6Ou^lDXcqQy7>E*6PmqJwEe`mwmu%)@gkzU>=QjSh+;yI=EH@
z*9@Vgj4h02!~l~TBED#@av?)@LI{bn&73RF=h)@R4bd|vDWpzoZ50Gs88YGQuJmGG
z?M^ni8{-vcmzVdf=WH`@7%FWwmoEP{usGS1O9At^Gb}kd$3i(#z(b<ysFaIH+9J1G
z)-ZLYB}%zDSDY!oEG@&7g2uYtJQ;qC{1U<WHC|?nI}?DG1Ml-UXLGlTvubPM3_F@V
zH)w{lEXB&$4{zQP6)=w-!{UpkYzt+_Q$>j^xN_r{im5!I^%D2UoGZ>uCT)Es67cij
z?w@t9IPZh;hU9<io~CNpj&2p_?-yN3ByV$yoHu_xQaRM~)~ZpxE=J|l3m7wf))5sj
zj|0P^s6=j0x`{0c(g97Ol#7&F%%1g@-^rokoQ_?|^psoA?o1Wuy3UI8!xL_y?Ch&K
zSoeNfITtQjLH6ST4tq9iqh{B$j47XWL<P)aYQqu?b1f60+?bJ9Zrmg5WShzcSez|K
zT5--RD&+^`Z)EX??`EwyKRo>|rhn{;ZjnRg9gsmKdh-}_&KUfAz;*pcRKPs;40CNz
z4$20!E-_RWwkg@mc@81_RB=x0C<u+=lP+Xs-L>4h3wGwemr`-QZ_IM0O}hlw3Z->i
z0A??(oAM?r_FTARMdo@~IE1gH63ye|VD+}+0@&d*%&~Bz5v0eLbOe(wb)0R=?ma<r
zq!nkO9F%P`Y}_nX0=Mph_joT^alUWbaxOaS6WHN)q^6^Ji!y5F<foG1aPUC-r%GVR
zh;bZhJa9rYOr`=BL&=RsVoY<Km?PrEulVQQTB71?M>Q-{!!<P=Q^SmCSYd%1HYk(h
z$gay2R-}WWBhF#v)NA=d>r6&iGk9p)ay~wFCQhUcWd(7atWH8;_R_j3Z>?GZI5C!`
zyY_Bj<QcOGM*_zsv(fj8b36!k%^*=L7*7WT@fZc2=z4r0G?Z&&pwc@Gu7lKlIai#e
zksnjT=~$-wFnlrQ44*uQZ|4_dhT14S?E;XVc$^*!q@|Ic)&Bul^Q~{C#Ak_PeO<5K
z3YaH^4O5Pd&<uv0@kx|zb!IUVF1L`$>;poe>}ZdeERL6LVuzZ!=KQ&QVb(=ypGnHo
z4D6skEn{8VBGOoer=&93H+1U!<fiDp@Gjwo53(^oFnej;lz1>aIfwP@a{=?1Gt3FM
zQ}^QiNN;{DTcNV(aivg>g%eJ#q`J`%^?$z~se6-Ys*GadYSxXWIs?iI(e!_-k(%Dk
z5lPxNmFg@hE7ThZujCjE2ToLmo%Hpv{`eBG6KRc3`g&O6{Kt`8$BJP&ZNR~b^T29H
zm0>><VpyhoD}?anqR#qq4diy*zc2CSNt15-{E8J@|2lHy^*!&sQCWGz*YCUUoee{W
zUYX+<y~IvC6~;fGbgDe(Z-48nJ|A{_<@rC~x@^n251e~bre~hd%lmr$^5sfB^Nea<
zxib1vdHJHmy}ykdxhS+|O;lA^tI*R=cdRcdxw04A;U#wDdI~TNsEh+AkA}TEUe}m0
zqg77!v@b&QZ!J4()t)<>c7$J5FVsD(Cfqam`kv4H5pLbCX{xTIM73OYnX>P{U$s2+
zQ1q|m<qOx9moE%H{BTsg@Pbm$Kd;oLO)C7<Q-Qx%R9u+_upz(<zu&L?e!l|d1C!E$
zHjn|!_3Ad^;maq^|I!N!p7Y&UF|p_F9loscf*;*--76JCN=rA_zey+(X4&T#JXU=B
zs84k-R4^mzIM}VNgx9a9<0n6%aO+lM?j3imxp>*KHTkw}ux}q6Is_kmgs-@`prEAW
zqAW_lh=azfo7ds@`_}`f0Tn?0$)X<n{Eeh}H;=yXw#DZ^bKcZx#pNZ%r-|#!=Bvk>
z>HrG=yYkGtmR|irQ4!@k{abOJn33PKb9Z%nt5es-Nf3X8`>LQ!htHJ(mfufs^=k6x
z%t4<$8`ai^FbpUv!i`3G_uhM-{b<*&U!K>y4db_KV`nn_e*a6QrKO*V-){gybmo^&
zY8$2l7&nbL|39xOTStCt;TzQ(7(Q~?^rc@q?^Us|^s?fT!ipu=pZ#*R`_J<C_XW{a
z0Uqh)gQ}JtZ~m=ik$R$WTNjn2gb)Y*2;bNNYDNq+VFTff8}a)6=oep%=J61<EcNbV
zk3D-}`}S{M0|#;qE_#4=8DJ8tXPX0^VL9g#?Wm^hYiNjCo(62kVVl2=;{2i0uUj<Z
zb+1P&+!cMj+<&M8;->_fYdm|aHx0i*J<+%&jp0|o{wIaFZJ(}B9qKqAQ%c27e^gbW
zqEWQ@^Vzd?>(&pqZ@+D!Qnh`J1iOH?zO=OT44`$O1J<YS{8fKA_}0JH8`o~x)?C{Z
zXeJPJsA=+3Bi@>{EAo$u#^w%O6C4ZbtGzp_-z@u_dc5}Ctdb4m(h8q%LR2ZNI0Y=g
ztggm<;|)fP9XqjP#E44=L*c`W!_*%RzWULo5ld@7)Eg}mqG4!lvj}v!M8ja3P*-j2
zsd=~Ji|Wamt=WXG5n|CuAy(%H0)=K5u<ZEH(9WF{y#033tOW~Jzc^~tqP|Y<#s!O+
zKkHM(Rbm^-BR;1H!;+vqUbFVV=CT`Vs`Uml0^wk+wik&&ZMC<mZfn^!>WO{tWE1$L
zrY$TH;?cZl)D!LkRLJ9@Lx`lY34HJY`R}~rnKf_Tqc4pZaqVG%^%>y9xH_~>IfiwD
zR=cigXZcMH2aE>S)^RMI#(m!1%~fSzQcoP*(rX}Y7}Le@;d)d`qH(Y~yk53z+KcZf
zwYDkd`V%otLe<q!U9C%9KRt^`H({T8fVKN%@emK2VO`YYi!Hm#uJ;7SHEXTo{@qqR
z{93i<z`t_H{RzV~f93D!_<hH)VYr$`yOiv8oM)VH`0EnBwjG{nAodUH&92MaRaL+5
zICyYX7O@u44s=z6Cly%zlC2j)2(BAB8$q~N2cyS(PeP^b_5QFRFYk-t*4956aQhdO
z+7Ixw5MxdFc_n<dMTkF`N_}r3)TlHAi6?Zu@xZx+*x|xJTn(mxbxQnm;)y)TIAAiK
z?J&A9&PvCufehG5QE~2T$>daE*a@A7I}t0x$J>Ve{{Xp2fQpdFwm$#>002ovPDHLk
FV1ky2eG>ox

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/classic/dot_for_ie.gif b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/classic/dot_for_ie.gif
deleted file mode 100644
index c0cc5fda7cfb9539720de442a3caca9c9a3fc4cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 43
vcmZ?wbhEHbWMW`qXkcKFla>7c|G(l-7DfgJMg|=QAOOiQFfqBrF<1it%E1S(

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/classic/style.css b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/classic/style.css
deleted file mode 100644
index 0351b4cef5d..00000000000
--- a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/classic/style.css
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * jsTree classic theme 1.0
- * Supported features: dots/no-dots, icons/no-icons, focused, loading
- * Supported plugins: ui (hovered, clicked), checkbox, contextmenu, search
- */
-
-.jstree-classic li, 
-.jstree-classic ins { background-image:url("d.png"); background-repeat:no-repeat; background-color:transparent; }
-.jstree-classic li { background-position:-90px 0; background-repeat:repeat-y;  }
-.jstree-classic li.jstree-last { background:transparent; }
-.jstree-classic .jstree-open > ins { background-position:-72px 0; }
-.jstree-classic .jstree-closed > ins { background-position:-54px 0; }
-.jstree-classic .jstree-leaf > ins { background-position:-36px 0; }
-
-.jstree-classic .jstree-hovered { background:#e7f4f9; border:1px solid #e7f4f9; padding:0 2px 0 1px; }
-.jstree-classic .jstree-clicked { background:navy; border:1px solid navy; padding:0 2px 0 1px; color:white; }
-.jstree-classic a .jstree-icon { background-position:-56px -19px; }
-.jstree-classic .jstree-open > a .jstree-icon { background-position:-56px -36px; }
-.jstree-classic a.jstree-loading .jstree-icon { background:url("throbber.gif") center center no-repeat !important; }
-
-.jstree-classic.jstree-focused { background:white; }
-
-.jstree-classic .jstree-no-dots li, 
-.jstree-classic .jstree-no-dots .jstree-leaf > ins { background:transparent; }
-.jstree-classic .jstree-no-dots .jstree-open > ins { background-position:-18px 0; }
-.jstree-classic .jstree-no-dots .jstree-closed > ins { background-position:0 0; }
-
-.jstree-classic .jstree-no-icons a .jstree-icon { display:none; }
-
-.jstree-classic .jstree-search { font-style:italic; }
-
-.jstree-classic .jstree-no-icons .jstree-checkbox { display:inline-block; }
-.jstree-classic .jstree-no-checkboxes .jstree-checkbox { display:none !important; }
-.jstree-classic .jstree-checked > a > .jstree-checkbox { background-position:-38px -19px; }
-.jstree-classic .jstree-unchecked > a > .jstree-checkbox { background-position:-2px -19px; }
-.jstree-classic .jstree-undetermined > a > .jstree-checkbox { background-position:-20px -19px; }
-.jstree-classic .jstree-checked > a > .jstree-checkbox:hover { background-position:-38px -37px; }
-.jstree-classic .jstree-unchecked > a > .jstree-checkbox:hover { background-position:-2px -37px; }
-.jstree-classic .jstree-undetermined > a > .jstree-checkbox:hover { background-position:-20px -37px; }
-
-#vakata-dragged.jstree-classic ins { background:transparent !important; }
-#vakata-dragged.jstree-classic .jstree-ok { background:url("d.png") -2px -53px no-repeat !important; }
-#vakata-dragged.jstree-classic .jstree-invalid { background:url("d.png") -18px -53px no-repeat !important; }
-#jstree-marker.jstree-classic { background:url("d.png") -41px -57px no-repeat !important; text-indent:-100px; }
-
-.jstree-classic a.jstree-search { color:aqua; }
-.jstree-classic .jstree-locked a { color:silver; cursor:default; }
-
-#vakata-contextmenu.jstree-classic-context, 
-#vakata-contextmenu.jstree-classic-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; }
-#vakata-contextmenu.jstree-classic-context li { }
-#vakata-contextmenu.jstree-classic-context a { color:black; }
-#vakata-contextmenu.jstree-classic-context a:hover, 
-#vakata-contextmenu.jstree-classic-context .vakata-hover > a { padding:0 5px; background:#e8eff7; border:1px solid #aecff7; color:black; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; }
-#vakata-contextmenu.jstree-classic-context li.jstree-contextmenu-disabled a, 
-#vakata-contextmenu.jstree-classic-context li.jstree-contextmenu-disabled a:hover { color:silver; background:transparent; border:0; padding:1px 4px; }
-#vakata-contextmenu.jstree-classic-context li.vakata-separator { background:white; border-top:1px solid #e0e0e0; margin:0; }
-#vakata-contextmenu.jstree-classic-context li ul { margin-left:-4px; }
-
-/* IE6 BEGIN */
-.jstree-classic li, 
-.jstree-classic ins,
-#vakata-dragged.jstree-classic .jstree-invalid, 
-#vakata-dragged.jstree-classic .jstree-ok, 
-#jstree-marker.jstree-classic { _background-image:url("d.gif"); }
-.jstree-classic .jstree-open ins { _background-position:-72px 0; }
-.jstree-classic .jstree-closed ins { _background-position:-54px 0; }
-.jstree-classic .jstree-leaf ins { _background-position:-36px 0; }
-.jstree-classic .jstree-open a ins.jstree-icon { _background-position:-56px -36px; }
-.jstree-classic .jstree-closed a ins.jstree-icon { _background-position:-56px -19px; }
-.jstree-classic .jstree-leaf a ins.jstree-icon { _background-position:-56px -19px; }
-#vakata-contextmenu.jstree-classic-context ins { _display:none; }
-#vakata-contextmenu.jstree-classic-context li { _zoom:1; }
-.jstree-classic .jstree-undetermined a .jstree-checkbox { _background-position:-20px -19px; }
-.jstree-classic .jstree-checked a .jstree-checkbox { _background-position:-38px -19px; }
-.jstree-classic .jstree-unchecked a .jstree-checkbox { _background-position:-2px -19px; }
-/* IE6 END */
\ No newline at end of file
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/classic/throbber.gif b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/classic/throbber.gif
deleted file mode 100644
index 5b33f7e54f4e55b6b8774d86d96895db9af044b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1849
zcma*odr(tX9tZI2z31lM+(&YVk%mZ}5P~KlG2s=WSbGzm0!x7^P##Mnh7t-jP!X0Q
zk_SQ}Po-L1tlDK;6l?(>v)e5ZBQx4|Y-Q?nr@Px3?9h(3ZWr3^tj=`TP57gKr87N$
zp2wWee1GRRCwo_xahnw)5cxNPJbCg2L6DV|6`#+yw6v6!mDS$f9-JvFD^n;GQ&UrZ
zzh5jCkByB101O60U0q#p_1BM>Cv-vP?&s4@g_((4_1L=L$(a91)0=J91Gas#R{McE
znYG^9*0A5YZ>#;~+Wkn(W5B0^yELIYLP!K}mB~<)AM@1&nqekynuaEGqP<JE0#l+(
z*R9joTN$nZ{F;;f_Nv(QpzP65;W)SYC;1+?>rzoH|KodRXJy)%+w_fu3nE5>@Bd_b
zqC$EQ;{c`T&?EsNO|igL9gC7Ygxv?aQUEXMq?~>wg{EyW;VcJ37CUF#HjrT=KQO_*
zS>M9yydXk18D(+QDJ1>r);Lav_uYKp$T?4vr{Q$lTo&pKv^?(>L-)G2*lwH!Ah7k?
z7oH<8h-(KTKt5V6$8gF)C7Io&P5=SjTh)=zV=E2EUhQZ<Wjvi)ks6lL7NUI41Suec
z%#@RZvp$b|KCxLd`PA8_!Ub^;+J%TE^_K&d6(i&k---epB#nC`b3_`MdhtuWMEe%I
z(wJ2$`EGgJTz=trW>P##L8S{d%UK>>+y82>+FV+#^BzW7u3F)Bb>=lYQ%%j`F>ASe
zo*cw@V#u6T`A2He;70mR(V&iV&-7{qP~=SRf&jm9-T{*ZeZ}$rd0#6c&fLG^xJcf5
z+p<`wJYgW+_s*V{uI$nMB;%8`S_3>PfGOj3Rq}@Cx^+j?rk92fANSFDBYnOqQ>Vdj
z)(|$AhP4t&Lb=Gvo2#3Gl%9<=Gv`Mz?Po@P4iLF!x}GUWJICDlFk-hS^Whyh7x~VH
z@0vD1>HYD4&e+~yzS*-sFR{9`{QEEZO1zg7>R&7cHts-6j!xHVdA8eI+ZlVzd%`es
zJT@$#GX(gvCJ1oJN%yLBK}{V=V;seo;!w|Yte!W1%5qLNFWqvZW>h&IiH+oPT=b@E
zPhGzv5=(Un*X>v`><w7vN-j#h05gB-F9AZf<&Z~SLlC&Nz^-G6DuPj|`n3d!<l7n!
z^9j1qeh2{s+i0tZ4@>%8h_nj^NdY<en;#4d>cE6NHS_ifkCV$*D)Tqrbu`s;<=t<4
zAHNqNV?6(g<1PY-w@#I-WYFViz?9TrkMr)u0g`O`u|>T;k|2sV*YF^pun<C(O34ry
z@yg-q+#%4rv$|41Y!PHPrjmV%@S3%TUelmz%~6?hLG4%mWKO9NB}mrI%KlhB`{^!g
zT?{Y#<ON%sq<!{buD;iH%`hL}N;>vT;$SuTy{j3Gv)yqD!R_CF>yR)MzmmYS5v+~R
zXAdD<Jm>%ng9?df;wd8GxR#%3O+gz};Vo;)sK%Bj-q>Oq%R7JU-KD?vYu>#2UjaDo
z&8$>5xW~?KPD_#XFToU1hIb*VOMidUr6iYiO0N|i-7s`T8!cFT`rN!^1Pt78J93i6
z5HI1wIM$94m{3SLDvISDe6$ZG1;eq_D9RTaaC>=cO{@Bs>$IlP<c+8wUtK_tPUz3j
z)>CPJJ$h$)-3vzNUQ6<Wm&Z5JfeG_o#I^S?ZP9*QGjsiJM3jH{?94}z{@d%97nOVw
zacge+X&InNUL3U(BUlor87ff?2qEf2c|yCI=Id~LI~<KyVA#R%nwHS3S<^IBTu|Jj
zW^-Xv#UBDqOwy>OsN#_zWxey!_9%hxwH2_dEJi=yY|1c7nDm2_Lm!Cof8-R_+9UkS
zcBE(o47yE)oMR(Q=dp1a2wTX5Kv<M)VDKP@wb$5DNEX!VTUn1Pd`taYrL9bpe}d9v
zqx3tu5NTGv8=X63WXPWMm1T8=ujh#QvSw5|(EZJ3$quU9*?0NxQKGsTrnFNF-ygOt
zYWPggi66%$nuj|v6!Ow2)>vGyLqlWTa7V&!A*|w|)ax~1_~aJ0=_Lilg*0iQk7#ZD
EAHN$8j{pDw

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/32px.png b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/32px.png
new file mode 100755
index 0000000000000000000000000000000000000000..d6fd72114f8205ace7579894ec50cc37739b1471
GIT binary patch
literal 1562
zcmZ8heKga182_1NL)y?Sx!97DWU52*G8;`HFB3{gC^fx#KelDfGF0oNTV6Y2ZdXn(
zW?q&;2$$7yGo_jk?dL78m$BH`?oapJf9~_g^E}_rdCuo~&i8zt=LXs5u#T3Y761S`
z9`2;00H8*M@^GX&<U?{o453g+_6l%=A{-7^S6{;+Q&Us>H~F9M=;#m#1Z8Dq5Z>6>
z$mjF#-n~0GIQa47M*@KWf$i<>91aJI#ZoAgjEs!d)>f5DH9kIGP*5;GKd(?ICMG77
zO6APVj7%n*nwnZ#T3T3GSX^A}>+6GfKoAs(L}IbHv$Inu6lP^*QK{7Q%Q;&hYLmpH
zKK_8EZ-l{ijlJvfy6TRlf7~;9DPVu?BhfnV*dK~6$QQ=l0)TZW50Xm&^~-c2Cs^XJ
zG2LRnx7N-)T||;kWH254-Gre^cGMJXz<XQYvjIiD7d8@lTX&sU^}k;gWixTyH+S+>
zIbn5~l}bdTk#HD`I8<!jmGrl-J@0b@gLG#%c3%K&-~yd@p>|A;99ehHfebTtaNb7o
zGG3K;76(qcr3!~V^z!nRWo5aU&-H`AEDPT1G+30PS2S8u73QQ}EU)%_Ff^AV5?k+1
zM3Q=9yvY~Cu9z1rB_q)cA94?xD+WqIPvh>Y8jTwk4}SYJ7x;XDhSF61*rcj;P;F3?
zbajJrz<1dK)~3=%Pol3!i&})y(x5z|zRCoajmUH&{JC+)Al#Bw6USa2^+xu{>`<{g
zZZj?y70(;=YP0^@W~My$HkHU=N`a0Rxu=|Co@%A%{y4<3F|mV|yI(&@SvJpn`gpT)
z_K5>-<ff$s=SnPkc3;u71b8|DV%<L+&>7wk&=XZjzOO-tYaC5tql=~NO7^5aWhm>&
z!4?-=;8r!;7<D-JOi*C)@`)X?u4w5^dgntvx$QI__F({5{vd)^b5;_fuxW3@<YlnI
z^MJwODL%6o6U5F*k{tHSjtTS2L*dM<YLLT)c19&+sr}hZKxZXR(<}6KK!2Kn{#K(l
ztD~RRfm5d;>Ub&*w-E2Xfb`NE9F6<}appJs<#6A7k^%`KZWa^Yl*@~Qp%q;UGKbjq
zZ1mjlEW1>2d3+(XqXhf6Z60<{k178{uvivcKZB&TzDojSp_`?u7tA*T!p(<3C~8F@
zA6v1*i_$dccr+Y-jYz~Ik#NQwj$Su)a{Zc2*4}E6S}NYsnL{GYny;7xiLmk?2-%|y
zJ6v5uS+{2phdBUVf{;Vu{;E@XO6L&ebA|d9Fy@o!cv|$8YgYBw8)}!Dz9T3-7_mO9
z#hGHn-I^x<StO}=sj3h(Rb1M<WvOolHI?3+lA@#Df3@cGmT3&0*|*AiCA{?Asx7*m
zR@(HWayvhO=`UA3YqDJB#7@f)GSbjvR)uqO12b!KA4L*VPvBRa=1vVgT|9)*Nhwh%
zR@df|?dqg45Km~C+{UJ9WwX-2OE2W>p`ZOjZ|t$Dy3Z|I!w0K2DLvO(#^PglepW~D
z%&$Y&;~KOuKfeGA?F|g(g2keH+{T#iQ!1HV{WqGwpV{ljSYKjSAe?+r<k($T$hk!@
zns&8G8heAPz0b|$+1<7?rQ(yz3>(Eu_i}J)&5spU+}>Ib+a~+cBQ~@br7nUmR?V}=
z%^6Mofa6H*FYNwfUj?QK9`DXK<PtU!xuy=TP6fqAgVQHRcFy8)QQNca5`M(!@aIaw
zISgrdC2-UnotV2kR4YyYQS0+f1NLTsg*&&r^2)y`in^2?9$S$!IHVcMc0pe>jZ08)
zosVpzCY<*Tv8StD?y@1m2E6M)zqV>a<)h&U<8y`5lMOwdXhihh^bg^waQeGlk+;$(
z>kXAxpC$Xn_nYZv<po=tR*DHPsZMRjBT(h8?VoI=$u=)Xojhk&bKLJt?l#+l>YWn~
zCkqiYlbw2Jl2$xi$2{Vju$1jrDY^!gky_Q1d`sO*G1W}x<F7QOq+}$eM3AlB3eLsK
zwOUy`l9R-i<R9vlPYLrnFxz!7%}m78h_lyDeEpw3)mU8TMNFyVa8x>e!WufFfQOq8
JiRT)A?H?ng_znO7

literal 0
HcmV?d00001

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/40px.png b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/40px.png
new file mode 100755
index 0000000000000000000000000000000000000000..4fc88e41e66508e4657b3ec6e5ec185a6084b7a9
GIT binary patch
literal 5717
zcmZu#cU)7;wx*+i1Ocf67MfH61(BvGa3J&+IuTH+(xjJAM5L-9Rf@Eu5FpeLN+{Bi
zVvrVkk90x_O_H}g_uc!>J-;`9Oun`D%v#^K_RQY16Qi%IafyzLj*N`#lI9<e4T0ZX
zGBWb{3zPsV6=8ZyMn<8ouWhUbnBLyrrlzI<_<vhiSlGY(Ha0c@aCdjt)z$r%heRTo
zn3xzF8ygxL=H=z->+1u4IyyQdBO?Il>FL2>u$7e+YinyDJ_G_WFfed%Z~!jdzI_|$
zLqbA=f`WW}d|tkM>F4Jc5D;KxWo2n;X<=buZf<U7W(JILa&iKCpoNBp`uh3?2M1G8
zQ3VDDva+)J`}=EaYoDK=gTY{c#`N?wFE1|+hr{FX2L}hIr>7?;Cre99XJ=;shohsT
z{r!Ccfv~l;wX?Icv9YnXwzjaaFgG_hGcz+eImyn>zPh>!BwAct1p0)81Wry)Kw5r&
zK49|m^8>_+i;DpacmQtP+}wctjEoE-kqD$1A0IzHK5lDktFEpF2mmpGIEROa03RSD
z8jb$>^CysNaBy&UcXwc5U}9pTr>6&?2aw#{-2D3W>+<q4Kzn|E9u9~9`0)ea{Oi{*
z6bc1!1~d*25AW^m0XzXAU0q!Oc|gw8)D$3Oc6JsJTVG%Q{rmUw^78KP?uv>EK+E>_
z_WJsIdwV+qffyMX>F@7vZf-6qDFIZEj*eDURrU4t0j2o%?HdMz85<j`t*tFBEp2LQ
z0xH?i(D3EUm&V4%y1F_*b!TU1OG^tDi*0Rf9U2<y=;)}asp;+Qt*oppD=R}Hk;^ic
zEI?_TUmEHfkx^J_QZNfhF(}bcP~SEt*RbNaOb*=HBrA}N6{8geIZ#zA4M8v~#a|7u
zjE$8wo|piZGQ}kdC!&)vQ4Of-KieZB6Hz!%*6cmEhE)Jn(tUZ|bkTccWGp6{j~^QQ
zPj1b`*m5~%(s~5d)F)-@N@pJkPC=5^GL%0Ltzk2=vGRoGowMdNVJ_WU59%G%47MLd
zgq3l|UvT#HNx;a?kg(0uCi+D_P5P3%in)3)3;37lBk&ddw3hgUOPVv>Y!|}F8K7j8
z9Ia$Dw|~RbOjK}y-G^3|A=~=BUmZWggmOrkre}Ax7s<)Sn<hGzBe`v?>=xU^B?YC{
zpqcD%(>-pt$Ek_&lo|>f+pWgzE;4~>;3F1g76QRJ!jd$2B?cRb(SZHOfwhyOX-}!g
zbv8@(S7Qi$3@<V#jBx`jJ1Kt2FFrPy;0BU0q8GL0d`bpC3Vnvqr90dGMsNrP>c?Y9
zww#^~f~q1v=&_DT9RzOjZlRO@#T#ssYAgD{Zl;jiZjh7T-!s(dF4Q4NDpdTgOK_Hx
zWHZm({n%@gNb7G8@r(EUTbFqngVo^Ko27g$F+*_+yB=Ooot<L~Qd3O@skgkWnx$h-
zeGZOqX+rsJGQD*4qRm|bC-2tszhvJy?KAF+;zIVNWH#sy3R<&#{`#kx{+vl$`mHSH
zW|j~hbm&4@u}OFZ{b!DLO~sVJz=yfjD3*9HORv)?XQ^n-@eE1mmQSN@*SI10>UYch
z)zVy3bMKLS&>ID&W~t|Nliu=Rw3mF)_d6kxUtGZ=KK*uwY+oGUUn0g`Vq%m=J#RAg
z*Y6v+qVog%BsfqHM`{I9Ecko`A9**Z4@4ymezE!0TgojM^fmJ^Xk%r_g2ng8rTlX7
z;t~0lhjnIJxu3Ms*nDVUx_xVXX|5mR-<G5ykmx4u-(l_>q>IY?4zA*ce6JSOtEx_3
zTuVC)KnyW~Mnzxj2JD}v#WWxb4K+mJjT$)_oI{vx7lD#g|K5e7{CfQiQTK7UBIH(j
zoaAMn=bA->yb6gqn_EiqURNE90$lCl#y?Gor3{aXq{#ZvAXWsJ%f&Grvs=}lX=(L_
zkZ42nUC(@vCYPznnc}hS)aQq&`A|)wE103uQ%XiA+5C>yk!j~#ykOmP$BZ6>+8Y_!
zEZLREI`s%~pIAAbL>;l&%!#X#Tc6%WeICuk_GG;(?cA{uyb#~<ELM66Z`vt$-i_?}
zfkjgq2Z59t8{87bJPwmZ<Gxw41btJGq5T$Z8{&g%!g;>hlZ%-w>@KvW*kR_DlL4i*
zpkSo9mFNte9i4pTnm~P)p_X;g?Cm)iVUtL7?mZGQumz);jgT2D8gEk_-A3T;Fe9)@
z@aTLxb}rYGqdf8JbFhzRV5o9Jw*p5Uug#&U$Sl0TYvYMd)_@I9_D3*$QErx_XewG`
zhsHCD`tKX?Z+r2-AgUW0&whuNB3=gX!qjTUf-t5NDD#-by}lHG7q8_K{DAMbv#^Wy
zfIMCfuXSBq`4b4L9RnHg+dgV&n=|rFIrbwcmD*qyV=Qx>s7HnB1eeL}wVFzZGZhug
z+^R1@)sRB7eV@E}gsTI2bs4ABVz_yGDdm;xIjBSNqEDx(+B*xg(X8_ln|v09ah@>o
z7*<ffU;<e2HlGEmgL1$26<E;>%CJaI31$aznN|7Ew;Fav(xwXYKB%~ZzZTIgIQz>J
z!pb(sLq(OtYU~gOn|xmyHC!Wj5;3H?VmGjM<4JOJVp7G=hi1YTU85YelU51L_E`G9
z6pIFNQZyUgSG!fH&OYet@U*TDtv0>lH`a9B-b<+*kwx`e($t5(IYppMtGbn0{5!UY
zq5zevViwbi-wYXE&!q*78`@E&u7(&%J-NFt=9=#mXgeE8TTE`235s}8{iCNk>zUs!
zr8x*B&~59iTw$60A>7eG7jCV7J8@TZAX;8U%WBCyuTbSE&kZVufn<Vay1o-`3{5g}
z&Qyitsen1Ey;{z+Lt5@a1$@0!>Nb9mO%qj*&6L%ftfe&yL)E@u&uVQbE4j&?bzNVJ
zJcy(0!8$z%Jsi9_{+uVke+-j4NUGExPi?lWd95qWozNpXgkcQCtGx<#R`!(`RLNd3
z*Tb=ASA~0<&y?eyDB)cQ&K<s+?8$Em>o>r;+v5AB=pQvZ<yIdL27-GQuy7$8p8m}b
zodOS>w*`6hKs)=T?Vl5ut+C2AF9O$MAnKkmkj%!E>PQWc|5!m}b)WS~bE*fwjq~;^
z>2ILW!D?PHM^!(EX?*KD|Dt-M3|mVQUrueatZn^GTzSz!hv-0dgicS;gemIgMqA`E
zU=Q_Q?_OgVy6^L<UnTiySKnoEbVaTTtNKTGwQ7_bA>o^JM3IoqrD1CPYYy8*6L<O-
zOnd~2zg{{2waowXBKo@*Ec}cr_28P=^!aWC=4Tg{cwgU5j1|)2DYhCkT)$)m0|k_w
zymJ*1JAY?>-&_Qxumg9!R1m#ui^Uxz*I?%<_V@SraB4Pdi$NjyJsw=AP48mRIew2@
zh!0_mM=J-M#3$!M^3CYXu6Ilkzq4Tw1+05vCQDoHe-J{bULSou{5pd$*g6q0Z;g!;
z{@SE^ddq=aRMH<!9Voe}F-7yiD@-!bH_t|ytLWglg(9k!TBOona=n`jJn?5|WQsMV
z@vX_mh6uFSd56-Uu=x^$GUg2)MUNS??wDQ1t0?Evy$*lcOVhF?CizW~G=FZfCBBWD
z+~KjR=sEutK2zAqJI+9cdha%R`hC5x$t6S+FJC;0(L1mYq%9YK<~hK}#)tXES?G0g
z-C(!$L|z@SoTbl(yIwRC#+IO$DkCUrt;&SUkbY4^WR0gW!P+~mM#ALu0+u?pe&VA8
zkINoR+#MxIh~qh-ekz`C*LWtL#;zSoCBx5`MSMh>nCNNj=@*Qr6rxP)42@L`fC2Ze
zidu+unxzw#Meb^isxCbFa}CK}mQ0pQUUkT_59Ef&7>;t>I!%U;EJQ&)u1^#4p%r$w
zKe1x<Isno(73pZ3YK1QUz4iNlBId%BE)U??KG>c4C<?BYD|c00qrdk?x=7g3cqrJ*
zfuV*V$4VYF;(8!tr-eCBe~Zz`W~D>W^-&_(7Cl8QH~qa%oynexx!>WS8~bD!tkPv4
zYc9fz8wV+vU9L9tzW>3^XO_%+Fm^k=s*5%KG;c(F=4wmmL|cg`{7H~cb&`^M*lHhP
z9og20E96FmV*3Q=fUEX>O;0eshJ<WCi&2Pjr8w7~mi*}xT2Zf&#j!*k+_JLg_6XJ&
z$yS`Dn)p{RSb(UE`=gClOT%vvZXbu-QqF%NA55QDM0T^XJ-T1zS(7|w5<Ihz+#D-`
z_O7|C$t^|~00e}OJY(f0EXN2{RX^P*Da-!DXSRH>pR}hk3q&228-2FgOWd1O)&g&Q
zK}Vj~uAB>H=zM<1t+-2QXH>s=M?(D>sKx)lE#zEAy$qoebkMor=714)2u7Vfp&cLV
zRqO*>!gg112OaRCmf(s+=8@H?a?o#D@SVnY;(HFHT`8Hpb^HP``HeXL@%igUK3|VR
zb!m4eA33k}JRzF^-J6Z@>xehpy&gyHjOBA8Kh-oFfCs>bw2do4@N3(@OI6_Oy#~GV
zkAvjj_wWB5FaPqcmh#T#Ke&dfJArhB2W7+5xKOwg$gA+6T$mag3UmT_9Dep5rpAnt
zJc00spC!T6m{2Mw5UTLAWB{h89(Gi^#@r;uUcIf;p5dIw@BXnX>2uNiX{ljSosRuQ
z34^N0lzS2CWdAwXilS1U7j4E4ucu30o%cniB(W8$(T^A|_O#r%Fg=JYA@zt&GHCwJ
zz>PJ%wXBuL$IhYl@wyZ#*7lHcx(Au5UhaHQkZn-IIlPCsV9}o7Cd$fF#PEr4CO&`Q
zUFvUs@1IBI=X{|5sUcI~BvZIzdztFRvTfe-&8JM~J=!x5@*uUGN&AQk6molr&7LB?
zV|vyCIwBQam*J!U&h|Z3InLJHMO50=AtC`gSyK1MV9O2K>HZc~j7BVVkn)Cuv8=o8
zgU|kZK#U%8xqZa1(PaO&8>b%mkbI8PoQ{3)|4zssRL}uy0>*{uo)!^ylwJpW-@o%-
zUEv=uN_D_qmnX$u^H3m_T$R%|PBLJ9`X<eD8Q`!DCSK8;Z(g>&Ouel^ykb7D3_zOg
z5aJc*`5c_>W!h~Y;+63EN`uDwmlbsX{$TjWeWp}-@DESbfqgx5;)&|LCs4JaM`9N!
zMa@YRpw>qqQ){CHHnY6*<*^RoaLh97bc$V_PO<o$ASxNp?5`H5srUe@xcHF5{xXQw
z>}&%O&tY~po-~dR3$G=Km?%0yx9VD?q?qS>#}Fi6SE|<df-V>*d4(1pJaD>03Vce{
z`o+d+q@#nrosqcA9dCHvT@guI$c4Q(C7tZJGb*5}iJ={>$t}0-=5rZ1{rB>@q;G?h
zOf^c!b}q4}3uwl1!tWkVwNvMKMH$$!IZ}TupL>5nP*4xf=u6EO5x7k!K}CGP#o?z(
zt=GLNPw%&~S*gM$;qkz|SEF9k9YY%P2xs>SsLpNdKbhuZWWSf*!xb|9v|ljP8`bLT
z+Qx*Fc+_?()J`pNn%sSVn@->yrf3C?ld3`YSx;SG$^~XTO!>jMt(8`+!Y$!ZQ`Mj_
zWZei)nd6YC2pCMo&X>n;9Un#0Z_dr)6_+K31_?Wi>=X4|8P-eX*q-%V5If3a(LAW%
z`Yh+bmVrHeGVs_xyOCGr<*yZw@JkA`L&~^vM_PpzS*v-iXD8oCE9H`DGO)W2uE%a$
z)ug4;To}?<*1>fmK-&BGO(Ub@Fig%tf!A{i!{En*U4+RPL)B#C_M+-VU-UoIjKyzu
zURr!5^to*g^pD;CukXsgFAC6&<4$F9neX%OE!ztiLp?`Y)Bd12vZEK|3cmQ)vZAFd
zH8gg&X1;$f(MqYyLAp(()-;YdFb0lDvpb8n$w-c&f}l<C0t;ZDI0eDv3*|u=VHm$%
zv92f1fuc<ZVR|Miav3buX`S3lS%<a|C&7X;kgOqj+r1s(Yc@o?F2k)TGr?q<XMrcN
z3aKs<9kLm>JwB)9qFjqlRZEk5Dg1(JCtcYk$9T-Giz@FJG0{BR-!pHgLv~JNUZ!E&
zcxvqtoQ39m2*ubC)Z{bYQ>M<Z2nlYw#ysz#Ak;{(u^^Y)8bV?GmE==hH$bRRRL}w;
z*qPy@*=%HV*TQzxj_u{>X!d}o<Z>WC$zM$kcV26X?OY5STPR=8AHsp{{X1OD_3$+s
zqa3tHN0=fhF}tqD&pXf*uA*OMpHxZkgu=Ud<^!De_K1typ<71kaEnGg&Y&g4A!n%}
zLQJQ~Py!-yx3(q%dU&zi^sZnWcb3+`&(WXVX6+#~1()+Kw0e-4_;X!S57AK?&HA1-
z!8`97(Wr+Bti7*`={%=~XuM*^ufO+i<DmO>#!5}mWpO#c$?)DN@2n*KRu0{d%t|Ed
zq|uFI3y~`?1Qu7kd_$NPw(1G5KJ}_`Pg_!;C5$RYORrRpV-CuiBjEN`1&<Y7%kocx
zZ@llRgZZ#WJ~>@IO0Ae(fMRCc#>x|s=hOuT)CU*ga~q{8;~R$sB(9d@vWtx|c=CP9
zhuJy=U!2R%m|lFB%1=p-1kqJlg%Hh0jshXNz!5@`H`vl`j$iF0m^H=0`P?_R&B@`k
zDLIyJNNVGruKfOK;?i85ny*qKq*wFN*^%#lb0lU0I3F0#S`~JF6@QWX$QU^h&_sGf
zRN7iK)f?HIn3v%SdA&sV!1NS3K1r(Bf!?_vC)1pblt*T+R20=M>4L{k5_WdCIqq<0
z^1ugFqc)HIkxcn|GU<_{LdUwKHmBf=xe{oF+?WwjnU;@ZC(JWA?_);YJU^q4iPhS0
z&MRd(wef~!j=fp(vbXANu7fyY3SM{4^t}GeHn50&vnj!qFNQ;erbwdF5g!J1mHM9@
zIO4N%QbbPjBVc-^&^v72Kl!C)8vQ&xD&!Pc<S%Am2glLfjn)$8ea2H#nYFppI)fjQ
z>erW#9LNhQk9`_*(6#Ld#&LpT<9(Hllink$rZDeO-*5fT1{{lZa^Nit(%~4htdAMk
z_OrL!e1p$qvo~?}Es_;8dk|odSaORb3r9kc{-jwWX_GjqUfk+QJmGn=rF%3+(9IZV
z5Nf%}&XLfWM%d)b?^od)KOy+Nsug`ID=lD)<00coUZEWCV#dDta1U+2Ll>Of|9nus
zaR(384TUJ*=88M=Kb!a#qO@WizSaLsX3APIzSk=PV^)RTlplYa!!n(Ct}K4Kj9aEE
z5M?6y+nA+)Z^PHK=-GH2&VAr&r(HEVr)nW)r3Z$1v<+{lk<rh+fL;P|AN!Djm^dDx
km0jkg{{86Dp!h|);!ZS4OrTl<{?#MXRMUN2t_qF#A79W+tN;K2

literal 0
HcmV?d00001

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/style.css b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/style.css
new file mode 100755
index 00000000000..36224a019cb
--- /dev/null
+++ b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/style.css
@@ -0,0 +1,1105 @@
+/* jsTree default dark theme */
+.jstree-node,
+.jstree-children,
+.jstree-container-ul {
+  display: block;
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
+  list-style-image: none;
+}
+.jstree-node {
+  white-space: nowrap;
+}
+.jstree-anchor {
+  display: inline-block;
+  color: black;
+  white-space: nowrap;
+  padding: 0 4px 0 1px;
+  margin: 0;
+  vertical-align: top;
+}
+.jstree-anchor:focus {
+  outline: 0;
+}
+.jstree-anchor,
+.jstree-anchor:link,
+.jstree-anchor:visited,
+.jstree-anchor:hover,
+.jstree-anchor:active {
+  text-decoration: none;
+  color: inherit;
+}
+.jstree-icon {
+  display: inline-block;
+  text-decoration: none;
+  margin: 0;
+  padding: 0;
+  vertical-align: top;
+  text-align: center;
+}
+.jstree-icon:empty {
+  display: inline-block;
+  text-decoration: none;
+  margin: 0;
+  padding: 0;
+  vertical-align: top;
+  text-align: center;
+}
+.jstree-ocl {
+  cursor: pointer;
+}
+.jstree-leaf > .jstree-ocl {
+  cursor: default;
+}
+.jstree .jstree-open > .jstree-children {
+  display: block;
+}
+.jstree .jstree-closed > .jstree-children,
+.jstree .jstree-leaf > .jstree-children {
+  display: none;
+}
+.jstree-anchor > .jstree-themeicon {
+  margin-right: 2px;
+}
+.jstree-no-icons .jstree-themeicon,
+.jstree-anchor > .jstree-themeicon-hidden {
+  display: none;
+}
+.jstree-hidden {
+  display: none;
+}
+.jstree-rtl .jstree-anchor {
+  padding: 0 1px 0 4px;
+}
+.jstree-rtl .jstree-anchor > .jstree-themeicon {
+  margin-left: 2px;
+  margin-right: 0;
+}
+.jstree-rtl .jstree-node {
+  margin-left: 0;
+}
+.jstree-rtl .jstree-container-ul > .jstree-node {
+  margin-right: 0;
+}
+.jstree-wholerow-ul {
+  position: relative;
+  display: inline-block;
+  min-width: 100%;
+}
+.jstree-wholerow-ul .jstree-leaf > .jstree-ocl {
+  cursor: pointer;
+}
+.jstree-wholerow-ul .jstree-anchor,
+.jstree-wholerow-ul .jstree-icon {
+  position: relative;
+}
+.jstree-wholerow-ul .jstree-wholerow {
+  width: 100%;
+  cursor: pointer;
+  position: absolute;
+  left: 0;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+.vakata-context {
+  display: none;
+}
+.vakata-context,
+.vakata-context ul {
+  margin: 0;
+  padding: 2px;
+  position: absolute;
+  background: #f5f5f5;
+  border: 1px solid #979797;
+  box-shadow: 2px 2px 2px #999999;
+}
+.vakata-context ul {
+  list-style: none;
+  left: 100%;
+  margin-top: -2.7em;
+  margin-left: -4px;
+}
+.vakata-context .vakata-context-right ul {
+  left: auto;
+  right: 100%;
+  margin-left: auto;
+  margin-right: -4px;
+}
+.vakata-context li {
+  list-style: none;
+  display: inline;
+}
+.vakata-context li > a {
+  display: block;
+  padding: 0 2em 0 2em;
+  text-decoration: none;
+  width: auto;
+  color: black;
+  white-space: nowrap;
+  line-height: 2.4em;
+  text-shadow: 1px 1px 0 white;
+  border-radius: 1px;
+}
+.vakata-context li > a:hover {
+  position: relative;
+  background-color: #e8eff7;
+  box-shadow: 0 0 2px #0a6aa1;
+}
+.vakata-context li > a.vakata-context-parent {
+  background-image: url("data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAIORI4JlrqN1oMSnmmZDQUAOw==");
+  background-position: right center;
+  background-repeat: no-repeat;
+}
+.vakata-context li > a:focus {
+  outline: 0;
+}
+.vakata-context .vakata-context-hover > a {
+  position: relative;
+  background-color: #e8eff7;
+  box-shadow: 0 0 2px #0a6aa1;
+}
+.vakata-context .vakata-context-separator > a,
+.vakata-context .vakata-context-separator > a:hover {
+  background: white;
+  border: 0;
+  border-top: 1px solid #e2e3e3;
+  height: 1px;
+  min-height: 1px;
+  max-height: 1px;
+  padding: 0;
+  margin: 0 0 0 2.4em;
+  border-left: 1px solid #e0e0e0;
+  text-shadow: 0 0 0 transparent;
+  box-shadow: 0 0 0 transparent;
+  border-radius: 0;
+}
+.vakata-context .vakata-contextmenu-disabled a,
+.vakata-context .vakata-contextmenu-disabled a:hover {
+  color: silver;
+  background-color: transparent;
+  border: 0;
+  box-shadow: 0 0 0;
+}
+.vakata-context li > a > i {
+  text-decoration: none;
+  display: inline-block;
+  width: 2.4em;
+  height: 2.4em;
+  background: transparent;
+  margin: 0 0 0 -2em;
+  vertical-align: top;
+  text-align: center;
+  line-height: 2.4em;
+}
+.vakata-context li > a > i:empty {
+  width: 2.4em;
+  line-height: 2.4em;
+}
+.vakata-context li > a .vakata-contextmenu-sep {
+  display: inline-block;
+  width: 1px;
+  height: 2.4em;
+  background: white;
+  margin: 0 0.5em 0 0;
+  border-left: 1px solid #e2e3e3;
+}
+.vakata-context .vakata-contextmenu-shortcut {
+  font-size: 0.8em;
+  color: silver;
+  opacity: 0.5;
+  display: none;
+}
+.vakata-context-rtl ul {
+  left: auto;
+  right: 100%;
+  margin-left: auto;
+  margin-right: -4px;
+}
+.vakata-context-rtl li > a.vakata-context-parent {
+  background-image: url("data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAINjI+AC7rWHIsPtmoxLAA7");
+  background-position: left center;
+  background-repeat: no-repeat;
+}
+.vakata-context-rtl .vakata-context-separator > a {
+  margin: 0 2.4em 0 0;
+  border-left: 0;
+  border-right: 1px solid #e2e3e3;
+}
+.vakata-context-rtl .vakata-context-left ul {
+  right: auto;
+  left: 100%;
+  margin-left: -4px;
+  margin-right: auto;
+}
+.vakata-context-rtl li > a > i {
+  margin: 0 -2em 0 0;
+}
+.vakata-context-rtl li > a .vakata-contextmenu-sep {
+  margin: 0 0 0 0.5em;
+  border-left-color: white;
+  background: #e2e3e3;
+}
+#jstree-marker {
+  position: absolute;
+  top: 0;
+  left: 0;
+  margin: -5px 0 0 0;
+  padding: 0;
+  border-right: 0;
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-left: 5px solid;
+  width: 0;
+  height: 0;
+  font-size: 0;
+  line-height: 0;
+}
+#jstree-dnd {
+  line-height: 16px;
+  margin: 0;
+  padding: 4px;
+}
+#jstree-dnd .jstree-icon,
+#jstree-dnd .jstree-copy {
+  display: inline-block;
+  text-decoration: none;
+  margin: 0 2px 0 0;
+  padding: 0;
+  width: 16px;
+  height: 16px;
+}
+#jstree-dnd .jstree-ok {
+  background: green;
+}
+#jstree-dnd .jstree-er {
+  background: red;
+}
+#jstree-dnd .jstree-copy {
+  margin: 0 2px 0 2px;
+}
+.jstree-default-dark .jstree-node,
+.jstree-default-dark .jstree-icon {
+  background-repeat: no-repeat;
+  background-color: transparent;
+}
+.jstree-default-dark .jstree-anchor,
+.jstree-default-dark .jstree-wholerow {
+  transition: background-color 0.15s, box-shadow 0.15s;
+}
+.jstree-default-dark .jstree-hovered {
+  background: #555555;
+  border-radius: 2px;
+  box-shadow: inset 0 0 1px #555555;
+}
+.jstree-default-dark .jstree-clicked {
+  background: #5fa2db;
+  border-radius: 2px;
+  box-shadow: inset 0 0 1px #666666;
+}
+.jstree-default-dark .jstree-no-icons .jstree-anchor > .jstree-themeicon {
+  display: none;
+}
+.jstree-default-dark .jstree-disabled {
+  background: transparent;
+  color: #666666;
+}
+.jstree-default-dark .jstree-disabled.jstree-hovered {
+  background: transparent;
+  box-shadow: none;
+}
+.jstree-default-dark .jstree-disabled.jstree-clicked {
+  background: #333333;
+}
+.jstree-default-dark .jstree-disabled > .jstree-icon {
+  opacity: 0.8;
+  filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");
+  /* Firefox 10+ */
+  filter: gray;
+  /* IE6-9 */
+  -webkit-filter: grayscale(100%);
+  /* Chrome 19+ & Safari 6+ */
+}
+.jstree-default-dark .jstree-search {
+  font-style: italic;
+  color: #ffffff;
+  font-weight: bold;
+}
+.jstree-default-dark .jstree-no-checkboxes .jstree-checkbox {
+  display: none !important;
+}
+.jstree-default-dark.jstree-checkbox-no-clicked .jstree-clicked {
+  background: transparent;
+  box-shadow: none;
+}
+.jstree-default-dark.jstree-checkbox-no-clicked .jstree-clicked.jstree-hovered {
+  background: #555555;
+}
+.jstree-default-dark.jstree-checkbox-no-clicked > .jstree-wholerow-ul .jstree-wholerow-clicked {
+  background: transparent;
+}
+.jstree-default-dark.jstree-checkbox-no-clicked > .jstree-wholerow-ul .jstree-wholerow-clicked.jstree-wholerow-hovered {
+  background: #555555;
+}
+.jstree-default-dark > .jstree-striped {
+  min-width: 100%;
+  display: inline-block;
+  background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAMAAAB/qqA+AAAABlBMVEUAAAAAAAClZ7nPAAAAAnRSTlMNAMM9s3UAAAAXSURBVHjajcEBAQAAAIKg/H/aCQZ70AUBjAATb6YPDgAAAABJRU5ErkJggg==") left top repeat;
+}
+.jstree-default-dark > .jstree-wholerow-ul .jstree-hovered,
+.jstree-default-dark > .jstree-wholerow-ul .jstree-clicked {
+  background: transparent;
+  box-shadow: none;
+  border-radius: 0;
+}
+.jstree-default-dark .jstree-wholerow {
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+}
+.jstree-default-dark .jstree-wholerow-hovered {
+  background: #555555;
+}
+.jstree-default-dark .jstree-wholerow-clicked {
+  background: #5fa2db;
+  background: -webkit-linear-gradient(top, #5fa2db 0%, #5fa2db 100%);
+  background: linear-gradient(to bottom, #5fa2db 0%, #5fa2db 100%);
+}
+.jstree-default-dark .jstree-node {
+  min-height: 24px;
+  line-height: 24px;
+  margin-left: 24px;
+  min-width: 24px;
+}
+.jstree-default-dark .jstree-anchor {
+  line-height: 24px;
+  height: 24px;
+}
+.jstree-default-dark .jstree-icon {
+  width: 24px;
+  height: 24px;
+  line-height: 24px;
+}
+.jstree-default-dark .jstree-icon:empty {
+  width: 24px;
+  height: 24px;
+  line-height: 24px;
+}
+.jstree-default-dark.jstree-rtl .jstree-node {
+  margin-right: 24px;
+}
+.jstree-default-dark .jstree-wholerow {
+  height: 24px;
+}
+.jstree-default-dark .jstree-node,
+.jstree-default-dark .jstree-icon {
+  background-image: url("32px.png");
+}
+.jstree-default-dark .jstree-node {
+  background-position: -292px -4px;
+  background-repeat: repeat-y;
+}
+.jstree-default-dark .jstree-last {
+  background: transparent;
+}
+.jstree-default-dark .jstree-open > .jstree-ocl {
+  background-position: -132px -4px;
+}
+.jstree-default-dark .jstree-closed > .jstree-ocl {
+  background-position: -100px -4px;
+}
+.jstree-default-dark .jstree-leaf > .jstree-ocl {
+  background-position: -68px -4px;
+}
+.jstree-default-dark .jstree-themeicon {
+  background-position: -260px -4px;
+}
+.jstree-default-dark > .jstree-no-dots .jstree-node,
+.jstree-default-dark > .jstree-no-dots .jstree-leaf > .jstree-ocl {
+  background: transparent;
+}
+.jstree-default-dark > .jstree-no-dots .jstree-open > .jstree-ocl {
+  background-position: -36px -4px;
+}
+.jstree-default-dark > .jstree-no-dots .jstree-closed > .jstree-ocl {
+  background-position: -4px -4px;
+}
+.jstree-default-dark .jstree-disabled {
+  background: transparent;
+}
+.jstree-default-dark .jstree-disabled.jstree-hovered {
+  background: transparent;
+}
+.jstree-default-dark .jstree-disabled.jstree-clicked {
+  background: #efefef;
+}
+.jstree-default-dark .jstree-checkbox {
+  background-position: -164px -4px;
+}
+.jstree-default-dark .jstree-checkbox:hover {
+  background-position: -164px -36px;
+}
+.jstree-default-dark.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox,
+.jstree-default-dark .jstree-checked > .jstree-checkbox {
+  background-position: -228px -4px;
+}
+.jstree-default-dark.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox:hover,
+.jstree-default-dark .jstree-checked > .jstree-checkbox:hover {
+  background-position: -228px -36px;
+}
+.jstree-default-dark .jstree-anchor > .jstree-undetermined {
+  background-position: -196px -4px;
+}
+.jstree-default-dark .jstree-anchor > .jstree-undetermined:hover {
+  background-position: -196px -36px;
+}
+.jstree-default-dark .jstree-checkbox-disabled {
+  opacity: 0.8;
+  filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");
+  /* Firefox 10+ */
+  filter: gray;
+  /* IE6-9 */
+  -webkit-filter: grayscale(100%);
+  /* Chrome 19+ & Safari 6+ */
+}
+.jstree-default-dark > .jstree-striped {
+  background-size: auto 48px;
+}
+.jstree-default-dark.jstree-rtl .jstree-node {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==");
+  background-position: 100% 1px;
+  background-repeat: repeat-y;
+}
+.jstree-default-dark.jstree-rtl .jstree-last {
+  background: transparent;
+}
+.jstree-default-dark.jstree-rtl .jstree-open > .jstree-ocl {
+  background-position: -132px -36px;
+}
+.jstree-default-dark.jstree-rtl .jstree-closed > .jstree-ocl {
+  background-position: -100px -36px;
+}
+.jstree-default-dark.jstree-rtl .jstree-leaf > .jstree-ocl {
+  background-position: -68px -36px;
+}
+.jstree-default-dark.jstree-rtl > .jstree-no-dots .jstree-node,
+.jstree-default-dark.jstree-rtl > .jstree-no-dots .jstree-leaf > .jstree-ocl {
+  background: transparent;
+}
+.jstree-default-dark.jstree-rtl > .jstree-no-dots .jstree-open > .jstree-ocl {
+  background-position: -36px -36px;
+}
+.jstree-default-dark.jstree-rtl > .jstree-no-dots .jstree-closed > .jstree-ocl {
+  background-position: -4px -36px;
+}
+.jstree-default-dark .jstree-themeicon-custom {
+  background-color: transparent;
+  background-image: none;
+  background-position: 0 0;
+}
+.jstree-default-dark > .jstree-container-ul .jstree-loading > .jstree-ocl {
+  background: url("throbber.gif") center center no-repeat;
+}
+.jstree-default-dark .jstree-file {
+  background: url("32px.png") -100px -68px no-repeat;
+}
+.jstree-default-dark .jstree-folder {
+  background: url("32px.png") -260px -4px no-repeat;
+}
+.jstree-default-dark > .jstree-container-ul > .jstree-node {
+  margin-left: 0;
+  margin-right: 0;
+}
+#jstree-dnd.jstree-default-dark {
+  line-height: 24px;
+  padding: 0 4px;
+}
+#jstree-dnd.jstree-default-dark .jstree-ok,
+#jstree-dnd.jstree-default-dark .jstree-er {
+  background-image: url("32px.png");
+  background-repeat: no-repeat;
+  background-color: transparent;
+}
+#jstree-dnd.jstree-default-dark i {
+  background: transparent;
+  width: 24px;
+  height: 24px;
+  line-height: 24px;
+}
+#jstree-dnd.jstree-default-dark .jstree-ok {
+  background-position: -4px -68px;
+}
+#jstree-dnd.jstree-default-dark .jstree-er {
+  background-position: -36px -68px;
+}
+.jstree-default-dark.jstree-rtl .jstree-node {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==");
+}
+.jstree-default-dark.jstree-rtl .jstree-last {
+  background: transparent;
+}
+.jstree-default-dark-small .jstree-node {
+  min-height: 18px;
+  line-height: 18px;
+  margin-left: 18px;
+  min-width: 18px;
+}
+.jstree-default-dark-small .jstree-anchor {
+  line-height: 18px;
+  height: 18px;
+}
+.jstree-default-dark-small .jstree-icon {
+  width: 18px;
+  height: 18px;
+  line-height: 18px;
+}
+.jstree-default-dark-small .jstree-icon:empty {
+  width: 18px;
+  height: 18px;
+  line-height: 18px;
+}
+.jstree-default-dark-small.jstree-rtl .jstree-node {
+  margin-right: 18px;
+}
+.jstree-default-dark-small .jstree-wholerow {
+  height: 18px;
+}
+.jstree-default-dark-small .jstree-node,
+.jstree-default-dark-small .jstree-icon {
+  background-image: url("32px.png");
+}
+.jstree-default-dark-small .jstree-node {
+  background-position: -295px -7px;
+  background-repeat: repeat-y;
+}
+.jstree-default-dark-small .jstree-last {
+  background: transparent;
+}
+.jstree-default-dark-small .jstree-open > .jstree-ocl {
+  background-position: -135px -7px;
+}
+.jstree-default-dark-small .jstree-closed > .jstree-ocl {
+  background-position: -103px -7px;
+}
+.jstree-default-dark-small .jstree-leaf > .jstree-ocl {
+  background-position: -71px -7px;
+}
+.jstree-default-dark-small .jstree-themeicon {
+  background-position: -263px -7px;
+}
+.jstree-default-dark-small > .jstree-no-dots .jstree-node,
+.jstree-default-dark-small > .jstree-no-dots .jstree-leaf > .jstree-ocl {
+  background: transparent;
+}
+.jstree-default-dark-small > .jstree-no-dots .jstree-open > .jstree-ocl {
+  background-position: -39px -7px;
+}
+.jstree-default-dark-small > .jstree-no-dots .jstree-closed > .jstree-ocl {
+  background-position: -7px -7px;
+}
+.jstree-default-dark-small .jstree-disabled {
+  background: transparent;
+}
+.jstree-default-dark-small .jstree-disabled.jstree-hovered {
+  background: transparent;
+}
+.jstree-default-dark-small .jstree-disabled.jstree-clicked {
+  background: #efefef;
+}
+.jstree-default-dark-small .jstree-checkbox {
+  background-position: -167px -7px;
+}
+.jstree-default-dark-small .jstree-checkbox:hover {
+  background-position: -167px -39px;
+}
+.jstree-default-dark-small.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox,
+.jstree-default-dark-small .jstree-checked > .jstree-checkbox {
+  background-position: -231px -7px;
+}
+.jstree-default-dark-small.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox:hover,
+.jstree-default-dark-small .jstree-checked > .jstree-checkbox:hover {
+  background-position: -231px -39px;
+}
+.jstree-default-dark-small .jstree-anchor > .jstree-undetermined {
+  background-position: -199px -7px;
+}
+.jstree-default-dark-small .jstree-anchor > .jstree-undetermined:hover {
+  background-position: -199px -39px;
+}
+.jstree-default-dark-small .jstree-checkbox-disabled {
+  opacity: 0.8;
+  filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");
+  /* Firefox 10+ */
+  filter: gray;
+  /* IE6-9 */
+  -webkit-filter: grayscale(100%);
+  /* Chrome 19+ & Safari 6+ */
+}
+.jstree-default-dark-small > .jstree-striped {
+  background-size: auto 36px;
+}
+.jstree-default-dark-small.jstree-rtl .jstree-node {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==");
+  background-position: 100% 1px;
+  background-repeat: repeat-y;
+}
+.jstree-default-dark-small.jstree-rtl .jstree-last {
+  background: transparent;
+}
+.jstree-default-dark-small.jstree-rtl .jstree-open > .jstree-ocl {
+  background-position: -135px -39px;
+}
+.jstree-default-dark-small.jstree-rtl .jstree-closed > .jstree-ocl {
+  background-position: -103px -39px;
+}
+.jstree-default-dark-small.jstree-rtl .jstree-leaf > .jstree-ocl {
+  background-position: -71px -39px;
+}
+.jstree-default-dark-small.jstree-rtl > .jstree-no-dots .jstree-node,
+.jstree-default-dark-small.jstree-rtl > .jstree-no-dots .jstree-leaf > .jstree-ocl {
+  background: transparent;
+}
+.jstree-default-dark-small.jstree-rtl > .jstree-no-dots .jstree-open > .jstree-ocl {
+  background-position: -39px -39px;
+}
+.jstree-default-dark-small.jstree-rtl > .jstree-no-dots .jstree-closed > .jstree-ocl {
+  background-position: -7px -39px;
+}
+.jstree-default-dark-small .jstree-themeicon-custom {
+  background-color: transparent;
+  background-image: none;
+  background-position: 0 0;
+}
+.jstree-default-dark-small > .jstree-container-ul .jstree-loading > .jstree-ocl {
+  background: url("throbber.gif") center center no-repeat;
+}
+.jstree-default-dark-small .jstree-file {
+  background: url("32px.png") -103px -71px no-repeat;
+}
+.jstree-default-dark-small .jstree-folder {
+  background: url("32px.png") -263px -7px no-repeat;
+}
+.jstree-default-dark-small > .jstree-container-ul > .jstree-node {
+  margin-left: 0;
+  margin-right: 0;
+}
+#jstree-dnd.jstree-default-dark-small {
+  line-height: 18px;
+  padding: 0 4px;
+}
+#jstree-dnd.jstree-default-dark-small .jstree-ok,
+#jstree-dnd.jstree-default-dark-small .jstree-er {
+  background-image: url("32px.png");
+  background-repeat: no-repeat;
+  background-color: transparent;
+}
+#jstree-dnd.jstree-default-dark-small i {
+  background: transparent;
+  width: 18px;
+  height: 18px;
+  line-height: 18px;
+}
+#jstree-dnd.jstree-default-dark-small .jstree-ok {
+  background-position: -7px -71px;
+}
+#jstree-dnd.jstree-default-dark-small .jstree-er {
+  background-position: -39px -71px;
+}
+.jstree-default-dark-small.jstree-rtl .jstree-node {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAACAQMAAABv1h6PAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMHBgAAiABBI4gz9AAAAABJRU5ErkJggg==");
+}
+.jstree-default-dark-small.jstree-rtl .jstree-last {
+  background: transparent;
+}
+.jstree-default-dark-large .jstree-node {
+  min-height: 32px;
+  line-height: 32px;
+  margin-left: 32px;
+  min-width: 32px;
+}
+.jstree-default-dark-large .jstree-anchor {
+  line-height: 32px;
+  height: 32px;
+}
+.jstree-default-dark-large .jstree-icon {
+  width: 32px;
+  height: 32px;
+  line-height: 32px;
+}
+.jstree-default-dark-large .jstree-icon:empty {
+  width: 32px;
+  height: 32px;
+  line-height: 32px;
+}
+.jstree-default-dark-large.jstree-rtl .jstree-node {
+  margin-right: 32px;
+}
+.jstree-default-dark-large .jstree-wholerow {
+  height: 32px;
+}
+.jstree-default-dark-large .jstree-node,
+.jstree-default-dark-large .jstree-icon {
+  background-image: url("32px.png");
+}
+.jstree-default-dark-large .jstree-node {
+  background-position: -288px 0px;
+  background-repeat: repeat-y;
+}
+.jstree-default-dark-large .jstree-last {
+  background: transparent;
+}
+.jstree-default-dark-large .jstree-open > .jstree-ocl {
+  background-position: -128px 0px;
+}
+.jstree-default-dark-large .jstree-closed > .jstree-ocl {
+  background-position: -96px 0px;
+}
+.jstree-default-dark-large .jstree-leaf > .jstree-ocl {
+  background-position: -64px 0px;
+}
+.jstree-default-dark-large .jstree-themeicon {
+  background-position: -256px 0px;
+}
+.jstree-default-dark-large > .jstree-no-dots .jstree-node,
+.jstree-default-dark-large > .jstree-no-dots .jstree-leaf > .jstree-ocl {
+  background: transparent;
+}
+.jstree-default-dark-large > .jstree-no-dots .jstree-open > .jstree-ocl {
+  background-position: -32px 0px;
+}
+.jstree-default-dark-large > .jstree-no-dots .jstree-closed > .jstree-ocl {
+  background-position: 0px 0px;
+}
+.jstree-default-dark-large .jstree-disabled {
+  background: transparent;
+}
+.jstree-default-dark-large .jstree-disabled.jstree-hovered {
+  background: transparent;
+}
+.jstree-default-dark-large .jstree-disabled.jstree-clicked {
+  background: #efefef;
+}
+.jstree-default-dark-large .jstree-checkbox {
+  background-position: -160px 0px;
+}
+.jstree-default-dark-large .jstree-checkbox:hover {
+  background-position: -160px -32px;
+}
+.jstree-default-dark-large.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox,
+.jstree-default-dark-large .jstree-checked > .jstree-checkbox {
+  background-position: -224px 0px;
+}
+.jstree-default-dark-large.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox:hover,
+.jstree-default-dark-large .jstree-checked > .jstree-checkbox:hover {
+  background-position: -224px -32px;
+}
+.jstree-default-dark-large .jstree-anchor > .jstree-undetermined {
+  background-position: -192px 0px;
+}
+.jstree-default-dark-large .jstree-anchor > .jstree-undetermined:hover {
+  background-position: -192px -32px;
+}
+.jstree-default-dark-large .jstree-checkbox-disabled {
+  opacity: 0.8;
+  filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");
+  /* Firefox 10+ */
+  filter: gray;
+  /* IE6-9 */
+  -webkit-filter: grayscale(100%);
+  /* Chrome 19+ & Safari 6+ */
+}
+.jstree-default-dark-large > .jstree-striped {
+  background-size: auto 64px;
+}
+.jstree-default-dark-large.jstree-rtl .jstree-node {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==");
+  background-position: 100% 1px;
+  background-repeat: repeat-y;
+}
+.jstree-default-dark-large.jstree-rtl .jstree-last {
+  background: transparent;
+}
+.jstree-default-dark-large.jstree-rtl .jstree-open > .jstree-ocl {
+  background-position: -128px -32px;
+}
+.jstree-default-dark-large.jstree-rtl .jstree-closed > .jstree-ocl {
+  background-position: -96px -32px;
+}
+.jstree-default-dark-large.jstree-rtl .jstree-leaf > .jstree-ocl {
+  background-position: -64px -32px;
+}
+.jstree-default-dark-large.jstree-rtl > .jstree-no-dots .jstree-node,
+.jstree-default-dark-large.jstree-rtl > .jstree-no-dots .jstree-leaf > .jstree-ocl {
+  background: transparent;
+}
+.jstree-default-dark-large.jstree-rtl > .jstree-no-dots .jstree-open > .jstree-ocl {
+  background-position: -32px -32px;
+}
+.jstree-default-dark-large.jstree-rtl > .jstree-no-dots .jstree-closed > .jstree-ocl {
+  background-position: 0px -32px;
+}
+.jstree-default-dark-large .jstree-themeicon-custom {
+  background-color: transparent;
+  background-image: none;
+  background-position: 0 0;
+}
+.jstree-default-dark-large > .jstree-container-ul .jstree-loading > .jstree-ocl {
+  background: url("throbber.gif") center center no-repeat;
+}
+.jstree-default-dark-large .jstree-file {
+  background: url("32px.png") -96px -64px no-repeat;
+}
+.jstree-default-dark-large .jstree-folder {
+  background: url("32px.png") -256px 0px no-repeat;
+}
+.jstree-default-dark-large > .jstree-container-ul > .jstree-node {
+  margin-left: 0;
+  margin-right: 0;
+}
+#jstree-dnd.jstree-default-dark-large {
+  line-height: 32px;
+  padding: 0 4px;
+}
+#jstree-dnd.jstree-default-dark-large .jstree-ok,
+#jstree-dnd.jstree-default-dark-large .jstree-er {
+  background-image: url("32px.png");
+  background-repeat: no-repeat;
+  background-color: transparent;
+}
+#jstree-dnd.jstree-default-dark-large i {
+  background: transparent;
+  width: 32px;
+  height: 32px;
+  line-height: 32px;
+}
+#jstree-dnd.jstree-default-dark-large .jstree-ok {
+  background-position: 0px -64px;
+}
+#jstree-dnd.jstree-default-dark-large .jstree-er {
+  background-position: -32px -64px;
+}
+.jstree-default-dark-large.jstree-rtl .jstree-node {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAACAQMAAAAD0EyKAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjgIIGBgABCgCBvVLXcAAAAABJRU5ErkJggg==");
+}
+.jstree-default-dark-large.jstree-rtl .jstree-last {
+  background: transparent;
+}
+@media (max-width: 768px) {
+  #jstree-dnd.jstree-dnd-responsive {
+    line-height: 40px;
+    font-weight: bold;
+    font-size: 1.1em;
+    text-shadow: 1px 1px white;
+  }
+  #jstree-dnd.jstree-dnd-responsive > i {
+    background: transparent;
+    width: 40px;
+    height: 40px;
+  }
+  #jstree-dnd.jstree-dnd-responsive > .jstree-ok {
+    background-image: url("40px.png");
+    background-position: 0 -200px;
+    background-size: 120px 240px;
+  }
+  #jstree-dnd.jstree-dnd-responsive > .jstree-er {
+    background-image: url("40px.png");
+    background-position: -40px -200px;
+    background-size: 120px 240px;
+  }
+  #jstree-marker.jstree-dnd-responsive {
+    border-left-width: 10px;
+    border-top-width: 10px;
+    border-bottom-width: 10px;
+    margin-top: -10px;
+  }
+}
+@media (max-width: 768px) {
+  .jstree-default-dark-responsive {
+    /*
+	.jstree-open > .jstree-ocl,
+	.jstree-closed > .jstree-ocl { border-radius:20px; background-color:white; }
+	*/
+  }
+  .jstree-default-dark-responsive .jstree-icon {
+    background-image: url("40px.png");
+  }
+  .jstree-default-dark-responsive .jstree-node,
+  .jstree-default-dark-responsive .jstree-leaf > .jstree-ocl {
+    background: transparent;
+  }
+  .jstree-default-dark-responsive .jstree-node {
+    min-height: 40px;
+    line-height: 40px;
+    margin-left: 40px;
+    min-width: 40px;
+    white-space: nowrap;
+  }
+  .jstree-default-dark-responsive .jstree-anchor {
+    line-height: 40px;
+    height: 40px;
+  }
+  .jstree-default-dark-responsive .jstree-icon,
+  .jstree-default-dark-responsive .jstree-icon:empty {
+    width: 40px;
+    height: 40px;
+    line-height: 40px;
+  }
+  .jstree-default-dark-responsive > .jstree-container-ul > .jstree-node {
+    margin-left: 0;
+  }
+  .jstree-default-dark-responsive.jstree-rtl .jstree-node {
+    margin-left: 0;
+    margin-right: 40px;
+  }
+  .jstree-default-dark-responsive.jstree-rtl .jstree-container-ul > .jstree-node {
+    margin-right: 0;
+  }
+  .jstree-default-dark-responsive .jstree-ocl,
+  .jstree-default-dark-responsive .jstree-themeicon,
+  .jstree-default-dark-responsive .jstree-checkbox {
+    background-size: 120px 240px;
+  }
+  .jstree-default-dark-responsive .jstree-leaf > .jstree-ocl {
+    background: transparent;
+  }
+  .jstree-default-dark-responsive .jstree-open > .jstree-ocl {
+    background-position: 0 0px !important;
+  }
+  .jstree-default-dark-responsive .jstree-closed > .jstree-ocl {
+    background-position: 0 -40px !important;
+  }
+  .jstree-default-dark-responsive.jstree-rtl .jstree-closed > .jstree-ocl {
+    background-position: -40px 0px !important;
+  }
+  .jstree-default-dark-responsive .jstree-themeicon {
+    background-position: -40px -40px;
+  }
+  .jstree-default-dark-responsive .jstree-checkbox,
+  .jstree-default-dark-responsive .jstree-checkbox:hover {
+    background-position: -40px -80px;
+  }
+  .jstree-default-dark-responsive.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox,
+  .jstree-default-dark-responsive.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox:hover,
+  .jstree-default-dark-responsive .jstree-checked > .jstree-checkbox,
+  .jstree-default-dark-responsive .jstree-checked > .jstree-checkbox:hover {
+    background-position: 0 -80px;
+  }
+  .jstree-default-dark-responsive .jstree-anchor > .jstree-undetermined,
+  .jstree-default-dark-responsive .jstree-anchor > .jstree-undetermined:hover {
+    background-position: 0 -120px;
+  }
+  .jstree-default-dark-responsive .jstree-anchor {
+    font-weight: bold;
+    font-size: 1.1em;
+    text-shadow: 1px 1px white;
+  }
+  .jstree-default-dark-responsive > .jstree-striped {
+    background: transparent;
+  }
+  .jstree-default-dark-responsive .jstree-wholerow {
+    border-top: 1px solid #666666;
+    border-bottom: 1px solid #000000;
+    background: #333333;
+    height: 40px;
+  }
+  .jstree-default-dark-responsive .jstree-wholerow-hovered {
+    background: #555555;
+  }
+  .jstree-default-dark-responsive .jstree-wholerow-clicked {
+    background: #5fa2db;
+  }
+  .jstree-default-dark-responsive .jstree-children .jstree-last > .jstree-wholerow {
+    box-shadow: inset 0 -6px 3px -5px #111111;
+  }
+  .jstree-default-dark-responsive .jstree-children .jstree-open > .jstree-wholerow {
+    box-shadow: inset 0 6px 3px -5px #111111;
+    border-top: 0;
+  }
+  .jstree-default-dark-responsive .jstree-children .jstree-open + .jstree-open {
+    box-shadow: none;
+  }
+  .jstree-default-dark-responsive .jstree-node,
+  .jstree-default-dark-responsive .jstree-icon,
+  .jstree-default-dark-responsive .jstree-node > .jstree-ocl,
+  .jstree-default-dark-responsive .jstree-themeicon,
+  .jstree-default-dark-responsive .jstree-checkbox {
+    background-image: url("40px.png");
+    background-size: 120px 240px;
+  }
+  .jstree-default-dark-responsive .jstree-node {
+    background-position: -80px 0;
+    background-repeat: repeat-y;
+  }
+  .jstree-default-dark-responsive .jstree-last {
+    background: transparent;
+  }
+  .jstree-default-dark-responsive .jstree-leaf > .jstree-ocl {
+    background-position: -40px -120px;
+  }
+  .jstree-default-dark-responsive .jstree-last > .jstree-ocl {
+    background-position: -40px -160px;
+  }
+  .jstree-default-dark-responsive .jstree-themeicon-custom {
+    background-color: transparent;
+    background-image: none;
+    background-position: 0 0;
+  }
+  .jstree-default-dark-responsive .jstree-file {
+    background: url("40px.png") 0 -160px no-repeat;
+    background-size: 120px 240px;
+  }
+  .jstree-default-dark-responsive .jstree-folder {
+    background: url("40px.png") -40px -40px no-repeat;
+    background-size: 120px 240px;
+  }
+  .jstree-default-dark-responsive > .jstree-container-ul > .jstree-node {
+    margin-left: 0;
+    margin-right: 0;
+  }
+}
+.jstree-default-dark {
+  background: #333;
+}
+.jstree-default-dark .jstree-anchor {
+  color: #999;
+  text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.5);
+}
+.jstree-default-dark .jstree-clicked,
+.jstree-default-dark .jstree-checked {
+  color: white;
+}
+.jstree-default-dark .jstree-hovered {
+  color: white;
+}
+#jstree-marker.jstree-default-dark {
+  border-left-color: #999;
+  background: transparent;
+}
+.jstree-default-dark .jstree-anchor > .jstree-icon {
+  opacity: 0.75;
+}
+.jstree-default-dark .jstree-clicked > .jstree-icon,
+.jstree-default-dark .jstree-hovered > .jstree-icon,
+.jstree-default-dark .jstree-checked > .jstree-icon {
+  opacity: 1;
+}
+.jstree-default-dark.jstree-rtl .jstree-node {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAACZmZl+9SADAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==");
+}
+.jstree-default-dark.jstree-rtl .jstree-last {
+  background: transparent;
+}
+.jstree-default-dark-small.jstree-rtl .jstree-node {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAACAQMAAABv1h6PAAAABlBMVEUAAACZmZl+9SADAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMHBgAAiABBI4gz9AAAAABJRU5ErkJggg==");
+}
+.jstree-default-dark-small.jstree-rtl .jstree-last {
+  background: transparent;
+}
+.jstree-default-dark-large.jstree-rtl .jstree-node {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAACAQMAAAAD0EyKAAAABlBMVEUAAACZmZl+9SADAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjgIIGBgABCgCBvVLXcAAAAABJRU5ErkJggg==");
+}
+.jstree-default-dark-large.jstree-rtl .jstree-last {
+  background: transparent;
+}
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/style.min.css b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/style.min.css
new file mode 100755
index 00000000000..eea330acfe2
--- /dev/null
+++ b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/style.min.css
@@ -0,0 +1 @@
+.jstree-node,.jstree-children,.jstree-container-ul{display:block;margin:0;padding:0;list-style-type:none;list-style-image:none}.jstree-node{white-space:nowrap}.jstree-anchor{display:inline-block;color:#000;white-space:nowrap;padding:0 4px 0 1px;margin:0;vertical-align:top}.jstree-anchor:focus{outline:0}.jstree-anchor,.jstree-anchor:link,.jstree-anchor:visited,.jstree-anchor:hover,.jstree-anchor:active{text-decoration:none;color:inherit}.jstree-icon{display:inline-block;text-decoration:none;margin:0;padding:0;vertical-align:top;text-align:center}.jstree-icon:empty{display:inline-block;text-decoration:none;margin:0;padding:0;vertical-align:top;text-align:center}.jstree-ocl{cursor:pointer}.jstree-leaf>.jstree-ocl{cursor:default}.jstree .jstree-open>.jstree-children{display:block}.jstree .jstree-closed>.jstree-children,.jstree .jstree-leaf>.jstree-children{display:none}.jstree-anchor>.jstree-themeicon{margin-right:2px}.jstree-no-icons .jstree-themeicon,.jstree-anchor>.jstree-themeicon-hidden{display:none}.jstree-hidden{display:none}.jstree-rtl .jstree-anchor{padding:0 1px 0 4px}.jstree-rtl .jstree-anchor>.jstree-themeicon{margin-left:2px;margin-right:0}.jstree-rtl .jstree-node{margin-left:0}.jstree-rtl .jstree-container-ul>.jstree-node{margin-right:0}.jstree-wholerow-ul{position:relative;display:inline-block;min-width:100%}.jstree-wholerow-ul .jstree-leaf>.jstree-ocl{cursor:pointer}.jstree-wholerow-ul .jstree-anchor,.jstree-wholerow-ul .jstree-icon{position:relative}.jstree-wholerow-ul .jstree-wholerow{width:100%;cursor:pointer;position:absolute;left:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vakata-context{display:none}.vakata-context,.vakata-context ul{margin:0;padding:2px;position:absolute;background:#f5f5f5;border:1px solid #979797;box-shadow:2px 2px 2px #999}.vakata-context ul{list-style:none;left:100%;margin-top:-2.7em;margin-left:-4px}.vakata-context .vakata-context-right ul{left:auto;right:100%;margin-left:auto;margin-right:-4px}.vakata-context li{list-style:none;display:inline}.vakata-context li>a{display:block;padding:0 2em;text-decoration:none;width:auto;color:#000;white-space:nowrap;line-height:2.4em;text-shadow:1px 1px 0 #fff;border-radius:1px}.vakata-context li>a:hover{position:relative;background-color:#e8eff7;box-shadow:0 0 2px #0a6aa1}.vakata-context li>a.vakata-context-parent{background-image:url(data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAIORI4JlrqN1oMSnmmZDQUAOw==);background-position:right center;background-repeat:no-repeat}.vakata-context li>a:focus{outline:0}.vakata-context .vakata-context-hover>a{position:relative;background-color:#e8eff7;box-shadow:0 0 2px #0a6aa1}.vakata-context .vakata-context-separator>a,.vakata-context .vakata-context-separator>a:hover{background:#fff;border:0;border-top:1px solid #e2e3e3;height:1px;min-height:1px;max-height:1px;padding:0;margin:0 0 0 2.4em;border-left:1px solid #e0e0e0;text-shadow:0 0 0 transparent;box-shadow:0 0 0 transparent;border-radius:0}.vakata-context .vakata-contextmenu-disabled a,.vakata-context .vakata-contextmenu-disabled a:hover{color:silver;background-color:transparent;border:0;box-shadow:0 0 0}.vakata-context li>a>i{text-decoration:none;display:inline-block;width:2.4em;height:2.4em;background:0 0;margin:0 0 0 -2em;vertical-align:top;text-align:center;line-height:2.4em}.vakata-context li>a>i:empty{width:2.4em;line-height:2.4em}.vakata-context li>a .vakata-contextmenu-sep{display:inline-block;width:1px;height:2.4em;background:#fff;margin:0 .5em 0 0;border-left:1px solid #e2e3e3}.vakata-context .vakata-contextmenu-shortcut{font-size:.8em;color:silver;opacity:.5;display:none}.vakata-context-rtl ul{left:auto;right:100%;margin-left:auto;margin-right:-4px}.vakata-context-rtl li>a.vakata-context-parent{background-image:url(data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAINjI+AC7rWHIsPtmoxLAA7);background-position:left center;background-repeat:no-repeat}.vakata-context-rtl .vakata-context-separator>a{margin:0 2.4em 0 0;border-left:0;border-right:1px solid #e2e3e3}.vakata-context-rtl .vakata-context-left ul{right:auto;left:100%;margin-left:-4px;margin-right:auto}.vakata-context-rtl li>a>i{margin:0 -2em 0 0}.vakata-context-rtl li>a .vakata-contextmenu-sep{margin:0 0 0 .5em;border-left-color:#fff;background:#e2e3e3}#jstree-marker{position:absolute;top:0;left:0;margin:-5px 0 0 0;padding:0;border-right:0;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid;width:0;height:0;font-size:0;line-height:0}#jstree-dnd{line-height:16px;margin:0;padding:4px}#jstree-dnd .jstree-icon,#jstree-dnd .jstree-copy{display:inline-block;text-decoration:none;margin:0 2px 0 0;padding:0;width:16px;height:16px}#jstree-dnd .jstree-ok{background:green}#jstree-dnd .jstree-er{background:red}#jstree-dnd .jstree-copy{margin:0 2px}.jstree-default-dark .jstree-node,.jstree-default-dark .jstree-icon{background-repeat:no-repeat;background-color:transparent}.jstree-default-dark .jstree-anchor,.jstree-default-dark .jstree-wholerow{transition:background-color .15s,box-shadow .15s}.jstree-default-dark .jstree-hovered{background:#555;border-radius:2px;box-shadow:inset 0 0 1px #555}.jstree-default-dark .jstree-clicked{background:#5fa2db;border-radius:2px;box-shadow:inset 0 0 1px #666}.jstree-default-dark .jstree-no-icons .jstree-anchor>.jstree-themeicon{display:none}.jstree-default-dark .jstree-disabled{background:0 0;color:#666}.jstree-default-dark .jstree-disabled.jstree-hovered{background:0 0;box-shadow:none}.jstree-default-dark .jstree-disabled.jstree-clicked{background:#333}.jstree-default-dark .jstree-disabled>.jstree-icon{opacity:.8;filter:url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default-dark .jstree-search{font-style:italic;color:#fff;font-weight:700}.jstree-default-dark .jstree-no-checkboxes .jstree-checkbox{display:none!important}.jstree-default-dark.jstree-checkbox-no-clicked .jstree-clicked{background:0 0;box-shadow:none}.jstree-default-dark.jstree-checkbox-no-clicked .jstree-clicked.jstree-hovered{background:#555}.jstree-default-dark.jstree-checkbox-no-clicked>.jstree-wholerow-ul .jstree-wholerow-clicked{background:0 0}.jstree-default-dark.jstree-checkbox-no-clicked>.jstree-wholerow-ul .jstree-wholerow-clicked.jstree-wholerow-hovered{background:#555}.jstree-default-dark>.jstree-striped{min-width:100%;display:inline-block;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAMAAAB/qqA+AAAABlBMVEUAAAAAAAClZ7nPAAAAAnRSTlMNAMM9s3UAAAAXSURBVHjajcEBAQAAAIKg/H/aCQZ70AUBjAATb6YPDgAAAABJRU5ErkJggg==) left top repeat}.jstree-default-dark>.jstree-wholerow-ul .jstree-hovered,.jstree-default-dark>.jstree-wholerow-ul .jstree-clicked{background:0 0;box-shadow:none;border-radius:0}.jstree-default-dark .jstree-wholerow{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.jstree-default-dark .jstree-wholerow-hovered{background:#555}.jstree-default-dark .jstree-wholerow-clicked{background:#5fa2db;background:-webkit-linear-gradient(top,#5fa2db 0,#5fa2db 100%);background:linear-gradient(to bottom,#5fa2db 0,#5fa2db 100%)}.jstree-default-dark .jstree-node{min-height:24px;line-height:24px;margin-left:24px;min-width:24px}.jstree-default-dark .jstree-anchor{line-height:24px;height:24px}.jstree-default-dark .jstree-icon{width:24px;height:24px;line-height:24px}.jstree-default-dark .jstree-icon:empty{width:24px;height:24px;line-height:24px}.jstree-default-dark.jstree-rtl .jstree-node{margin-right:24px}.jstree-default-dark .jstree-wholerow{height:24px}.jstree-default-dark .jstree-node,.jstree-default-dark .jstree-icon{background-image:url(32px.png)}.jstree-default-dark .jstree-node{background-position:-292px -4px;background-repeat:repeat-y}.jstree-default-dark .jstree-last{background:0 0}.jstree-default-dark .jstree-open>.jstree-ocl{background-position:-132px -4px}.jstree-default-dark .jstree-closed>.jstree-ocl{background-position:-100px -4px}.jstree-default-dark .jstree-leaf>.jstree-ocl{background-position:-68px -4px}.jstree-default-dark .jstree-themeicon{background-position:-260px -4px}.jstree-default-dark>.jstree-no-dots .jstree-node,.jstree-default-dark>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-dark>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-36px -4px}.jstree-default-dark>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-4px -4px}.jstree-default-dark .jstree-disabled{background:0 0}.jstree-default-dark .jstree-disabled.jstree-hovered{background:0 0}.jstree-default-dark .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default-dark .jstree-checkbox{background-position:-164px -4px}.jstree-default-dark .jstree-checkbox:hover{background-position:-164px -36px}.jstree-default-dark.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-dark .jstree-checked>.jstree-checkbox{background-position:-228px -4px}.jstree-default-dark.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default-dark .jstree-checked>.jstree-checkbox:hover{background-position:-228px -36px}.jstree-default-dark .jstree-anchor>.jstree-undetermined{background-position:-196px -4px}.jstree-default-dark .jstree-anchor>.jstree-undetermined:hover{background-position:-196px -36px}.jstree-default-dark .jstree-checkbox-disabled{opacity:.8;filter:url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default-dark>.jstree-striped{background-size:auto 48px}.jstree-default-dark.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==);background-position:100% 1px;background-repeat:repeat-y}.jstree-default-dark.jstree-rtl .jstree-last{background:0 0}.jstree-default-dark.jstree-rtl .jstree-open>.jstree-ocl{background-position:-132px -36px}.jstree-default-dark.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-100px -36px}.jstree-default-dark.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-68px -36px}.jstree-default-dark.jstree-rtl>.jstree-no-dots .jstree-node,.jstree-default-dark.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-dark.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-36px -36px}.jstree-default-dark.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-4px -36px}.jstree-default-dark .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-dark>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(throbber.gif) center center no-repeat}.jstree-default-dark .jstree-file{background:url(32px.png) -100px -68px no-repeat}.jstree-default-dark .jstree-folder{background:url(32px.png) -260px -4px no-repeat}.jstree-default-dark>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default-dark{line-height:24px;padding:0 4px}#jstree-dnd.jstree-default-dark .jstree-ok,#jstree-dnd.jstree-default-dark .jstree-er{background-image:url(32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default-dark i{background:0 0;width:24px;height:24px;line-height:24px}#jstree-dnd.jstree-default-dark .jstree-ok{background-position:-4px -68px}#jstree-dnd.jstree-default-dark .jstree-er{background-position:-36px -68px}.jstree-default-dark.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==)}.jstree-default-dark.jstree-rtl .jstree-last{background:0 0}.jstree-default-dark-small .jstree-node{min-height:18px;line-height:18px;margin-left:18px;min-width:18px}.jstree-default-dark-small .jstree-anchor{line-height:18px;height:18px}.jstree-default-dark-small .jstree-icon{width:18px;height:18px;line-height:18px}.jstree-default-dark-small .jstree-icon:empty{width:18px;height:18px;line-height:18px}.jstree-default-dark-small.jstree-rtl .jstree-node{margin-right:18px}.jstree-default-dark-small .jstree-wholerow{height:18px}.jstree-default-dark-small .jstree-node,.jstree-default-dark-small .jstree-icon{background-image:url(32px.png)}.jstree-default-dark-small .jstree-node{background-position:-295px -7px;background-repeat:repeat-y}.jstree-default-dark-small .jstree-last{background:0 0}.jstree-default-dark-small .jstree-open>.jstree-ocl{background-position:-135px -7px}.jstree-default-dark-small .jstree-closed>.jstree-ocl{background-position:-103px -7px}.jstree-default-dark-small .jstree-leaf>.jstree-ocl{background-position:-71px -7px}.jstree-default-dark-small .jstree-themeicon{background-position:-263px -7px}.jstree-default-dark-small>.jstree-no-dots .jstree-node,.jstree-default-dark-small>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-dark-small>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-39px -7px}.jstree-default-dark-small>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-7px -7px}.jstree-default-dark-small .jstree-disabled{background:0 0}.jstree-default-dark-small .jstree-disabled.jstree-hovered{background:0 0}.jstree-default-dark-small .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default-dark-small .jstree-checkbox{background-position:-167px -7px}.jstree-default-dark-small .jstree-checkbox:hover{background-position:-167px -39px}.jstree-default-dark-small.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-dark-small .jstree-checked>.jstree-checkbox{background-position:-231px -7px}.jstree-default-dark-small.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default-dark-small .jstree-checked>.jstree-checkbox:hover{background-position:-231px -39px}.jstree-default-dark-small .jstree-anchor>.jstree-undetermined{background-position:-199px -7px}.jstree-default-dark-small .jstree-anchor>.jstree-undetermined:hover{background-position:-199px -39px}.jstree-default-dark-small .jstree-checkbox-disabled{opacity:.8;filter:url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default-dark-small>.jstree-striped{background-size:auto 36px}.jstree-default-dark-small.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==);background-position:100% 1px;background-repeat:repeat-y}.jstree-default-dark-small.jstree-rtl .jstree-last{background:0 0}.jstree-default-dark-small.jstree-rtl .jstree-open>.jstree-ocl{background-position:-135px -39px}.jstree-default-dark-small.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-103px -39px}.jstree-default-dark-small.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-71px -39px}.jstree-default-dark-small.jstree-rtl>.jstree-no-dots .jstree-node,.jstree-default-dark-small.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-dark-small.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-39px -39px}.jstree-default-dark-small.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-7px -39px}.jstree-default-dark-small .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-dark-small>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(throbber.gif) center center no-repeat}.jstree-default-dark-small .jstree-file{background:url(32px.png) -103px -71px no-repeat}.jstree-default-dark-small .jstree-folder{background:url(32px.png) -263px -7px no-repeat}.jstree-default-dark-small>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default-dark-small{line-height:18px;padding:0 4px}#jstree-dnd.jstree-default-dark-small .jstree-ok,#jstree-dnd.jstree-default-dark-small .jstree-er{background-image:url(32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default-dark-small i{background:0 0;width:18px;height:18px;line-height:18px}#jstree-dnd.jstree-default-dark-small .jstree-ok{background-position:-7px -71px}#jstree-dnd.jstree-default-dark-small .jstree-er{background-position:-39px -71px}.jstree-default-dark-small.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAACAQMAAABv1h6PAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMHBgAAiABBI4gz9AAAAABJRU5ErkJggg==)}.jstree-default-dark-small.jstree-rtl .jstree-last{background:0 0}.jstree-default-dark-large .jstree-node{min-height:32px;line-height:32px;margin-left:32px;min-width:32px}.jstree-default-dark-large .jstree-anchor{line-height:32px;height:32px}.jstree-default-dark-large .jstree-icon{width:32px;height:32px;line-height:32px}.jstree-default-dark-large .jstree-icon:empty{width:32px;height:32px;line-height:32px}.jstree-default-dark-large.jstree-rtl .jstree-node{margin-right:32px}.jstree-default-dark-large .jstree-wholerow{height:32px}.jstree-default-dark-large .jstree-node,.jstree-default-dark-large .jstree-icon{background-image:url(32px.png)}.jstree-default-dark-large .jstree-node{background-position:-288px 0;background-repeat:repeat-y}.jstree-default-dark-large .jstree-last{background:0 0}.jstree-default-dark-large .jstree-open>.jstree-ocl{background-position:-128px 0}.jstree-default-dark-large .jstree-closed>.jstree-ocl{background-position:-96px 0}.jstree-default-dark-large .jstree-leaf>.jstree-ocl{background-position:-64px 0}.jstree-default-dark-large .jstree-themeicon{background-position:-256px 0}.jstree-default-dark-large>.jstree-no-dots .jstree-node,.jstree-default-dark-large>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-dark-large>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-32px 0}.jstree-default-dark-large>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:0 0}.jstree-default-dark-large .jstree-disabled{background:0 0}.jstree-default-dark-large .jstree-disabled.jstree-hovered{background:0 0}.jstree-default-dark-large .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default-dark-large .jstree-checkbox{background-position:-160px 0}.jstree-default-dark-large .jstree-checkbox:hover{background-position:-160px -32px}.jstree-default-dark-large.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-dark-large .jstree-checked>.jstree-checkbox{background-position:-224px 0}.jstree-default-dark-large.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default-dark-large .jstree-checked>.jstree-checkbox:hover{background-position:-224px -32px}.jstree-default-dark-large .jstree-anchor>.jstree-undetermined{background-position:-192px 0}.jstree-default-dark-large .jstree-anchor>.jstree-undetermined:hover{background-position:-192px -32px}.jstree-default-dark-large .jstree-checkbox-disabled{opacity:.8;filter:url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default-dark-large>.jstree-striped{background-size:auto 64px}.jstree-default-dark-large.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==);background-position:100% 1px;background-repeat:repeat-y}.jstree-default-dark-large.jstree-rtl .jstree-last{background:0 0}.jstree-default-dark-large.jstree-rtl .jstree-open>.jstree-ocl{background-position:-128px -32px}.jstree-default-dark-large.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-96px -32px}.jstree-default-dark-large.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-64px -32px}.jstree-default-dark-large.jstree-rtl>.jstree-no-dots .jstree-node,.jstree-default-dark-large.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-dark-large.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-32px -32px}.jstree-default-dark-large.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:0 -32px}.jstree-default-dark-large .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-dark-large>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(throbber.gif) center center no-repeat}.jstree-default-dark-large .jstree-file{background:url(32px.png) -96px -64px no-repeat}.jstree-default-dark-large .jstree-folder{background:url(32px.png) -256px 0 no-repeat}.jstree-default-dark-large>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default-dark-large{line-height:32px;padding:0 4px}#jstree-dnd.jstree-default-dark-large .jstree-ok,#jstree-dnd.jstree-default-dark-large .jstree-er{background-image:url(32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default-dark-large i{background:0 0;width:32px;height:32px;line-height:32px}#jstree-dnd.jstree-default-dark-large .jstree-ok{background-position:0 -64px}#jstree-dnd.jstree-default-dark-large .jstree-er{background-position:-32px -64px}.jstree-default-dark-large.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAACAQMAAAAD0EyKAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjgIIGBgABCgCBvVLXcAAAAABJRU5ErkJggg==)}.jstree-default-dark-large.jstree-rtl .jstree-last{background:0 0}@media (max-width:768px){#jstree-dnd.jstree-dnd-responsive{line-height:40px;font-weight:700;font-size:1.1em;text-shadow:1px 1px #fff}#jstree-dnd.jstree-dnd-responsive>i{background:0 0;width:40px;height:40px}#jstree-dnd.jstree-dnd-responsive>.jstree-ok{background-image:url(40px.png);background-position:0 -200px;background-size:120px 240px}#jstree-dnd.jstree-dnd-responsive>.jstree-er{background-image:url(40px.png);background-position:-40px -200px;background-size:120px 240px}#jstree-marker.jstree-dnd-responsive{border-left-width:10px;border-top-width:10px;border-bottom-width:10px;margin-top:-10px}}@media (max-width:768px){.jstree-default-dark-responsive .jstree-icon{background-image:url(40px.png)}.jstree-default-dark-responsive .jstree-node,.jstree-default-dark-responsive .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-dark-responsive .jstree-node{min-height:40px;line-height:40px;margin-left:40px;min-width:40px;white-space:nowrap}.jstree-default-dark-responsive .jstree-anchor{line-height:40px;height:40px}.jstree-default-dark-responsive .jstree-icon,.jstree-default-dark-responsive .jstree-icon:empty{width:40px;height:40px;line-height:40px}.jstree-default-dark-responsive>.jstree-container-ul>.jstree-node{margin-left:0}.jstree-default-dark-responsive.jstree-rtl .jstree-node{margin-left:0;margin-right:40px}.jstree-default-dark-responsive.jstree-rtl .jstree-container-ul>.jstree-node{margin-right:0}.jstree-default-dark-responsive .jstree-ocl,.jstree-default-dark-responsive .jstree-themeicon,.jstree-default-dark-responsive .jstree-checkbox{background-size:120px 240px}.jstree-default-dark-responsive .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-dark-responsive .jstree-open>.jstree-ocl{background-position:0 0!important}.jstree-default-dark-responsive .jstree-closed>.jstree-ocl{background-position:0 -40px!important}.jstree-default-dark-responsive.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-40px 0!important}.jstree-default-dark-responsive .jstree-themeicon{background-position:-40px -40px}.jstree-default-dark-responsive .jstree-checkbox,.jstree-default-dark-responsive .jstree-checkbox:hover{background-position:-40px -80px}.jstree-default-dark-responsive.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-dark-responsive.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default-dark-responsive .jstree-checked>.jstree-checkbox,.jstree-default-dark-responsive .jstree-checked>.jstree-checkbox:hover{background-position:0 -80px}.jstree-default-dark-responsive .jstree-anchor>.jstree-undetermined,.jstree-default-dark-responsive .jstree-anchor>.jstree-undetermined:hover{background-position:0 -120px}.jstree-default-dark-responsive .jstree-anchor{font-weight:700;font-size:1.1em;text-shadow:1px 1px #fff}.jstree-default-dark-responsive>.jstree-striped{background:0 0}.jstree-default-dark-responsive .jstree-wholerow{border-top:1px solid #666;border-bottom:1px solid #000;background:#333;height:40px}.jstree-default-dark-responsive .jstree-wholerow-hovered{background:#555}.jstree-default-dark-responsive .jstree-wholerow-clicked{background:#5fa2db}.jstree-default-dark-responsive .jstree-children .jstree-last>.jstree-wholerow{box-shadow:inset 0 -6px 3px -5px #111}.jstree-default-dark-responsive .jstree-children .jstree-open>.jstree-wholerow{box-shadow:inset 0 6px 3px -5px #111;border-top:0}.jstree-default-dark-responsive .jstree-children .jstree-open+.jstree-open{box-shadow:none}.jstree-default-dark-responsive .jstree-node,.jstree-default-dark-responsive .jstree-icon,.jstree-default-dark-responsive .jstree-node>.jstree-ocl,.jstree-default-dark-responsive .jstree-themeicon,.jstree-default-dark-responsive .jstree-checkbox{background-image:url(40px.png);background-size:120px 240px}.jstree-default-dark-responsive .jstree-node{background-position:-80px 0;background-repeat:repeat-y}.jstree-default-dark-responsive .jstree-last{background:0 0}.jstree-default-dark-responsive .jstree-leaf>.jstree-ocl{background-position:-40px -120px}.jstree-default-dark-responsive .jstree-last>.jstree-ocl{background-position:-40px -160px}.jstree-default-dark-responsive .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-dark-responsive .jstree-file{background:url(40px.png) 0 -160px no-repeat;background-size:120px 240px}.jstree-default-dark-responsive .jstree-folder{background:url(40px.png) -40px -40px no-repeat;background-size:120px 240px}.jstree-default-dark-responsive>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}}.jstree-default-dark{background:#333}.jstree-default-dark .jstree-anchor{color:#999;text-shadow:1px 1px 0 rgba(0,0,0,.5)}.jstree-default-dark .jstree-clicked,.jstree-default-dark .jstree-checked{color:#fff}.jstree-default-dark .jstree-hovered{color:#fff}#jstree-marker.jstree-default-dark{border-left-color:#999;background:0 0}.jstree-default-dark .jstree-anchor>.jstree-icon{opacity:.75}.jstree-default-dark .jstree-clicked>.jstree-icon,.jstree-default-dark .jstree-hovered>.jstree-icon,.jstree-default-dark .jstree-checked>.jstree-icon{opacity:1}.jstree-default-dark.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAACZmZl+9SADAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==)}.jstree-default-dark.jstree-rtl .jstree-last{background:0 0}.jstree-default-dark-small.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAACAQMAAABv1h6PAAAABlBMVEUAAACZmZl+9SADAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMHBgAAiABBI4gz9AAAAABJRU5ErkJggg==)}.jstree-default-dark-small.jstree-rtl .jstree-last{background:0 0}.jstree-default-dark-large.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAACAQMAAAAD0EyKAAAABlBMVEUAAACZmZl+9SADAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjgIIGBgABCgCBvVLXcAAAAABJRU5ErkJggg==)}.jstree-default-dark-large.jstree-rtl .jstree-last{background:0 0}
\ No newline at end of file
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/throbber.gif b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/throbber.gif
new file mode 100755
index 0000000000000000000000000000000000000000..cd75035ce8086b233c62c3775de4696007ba7950
GIT binary patch
literal 1720
zcmZ|OYfMvT7zgm4p2O+ea@rnBg#%t_w^9y@rd%z;T+7W;EEIuRP@n~of>p{*LD94n
zD#dD%>4eQ7(f}2w1Jp&gxD-%9@q$L8PU8@DI@}hSaq0)%%HqfF!~5+?{=fX6_gR&k
zB#zeL6rA#kLJ1EKkB*MkYPAxH#A31N_4>ZPK7+x~*4Cy{sgz1(XJ@Bct?upZwb^Vn
zH8uQyJW~@hGvcMn#IR)|7@|-p{15)|6-An=q7A%lB~@CUrc_g-E7NRPR<dPd8HN82
zp)*`lA+G0&#3>Y{9GBtGW2#F<6Tlp*{3e2sO*9QTn07T-ayS_ZHC-#O>$xhqqdcpZ
ztmi!vPe)MeZRuUe$#kkQ=ZCx#&BIF_bl`&&kBftO#70Qh(%BzvH^%Q*V^7k&A({sT
z%Y^lTu*avnIgG+U1|!SMokH(YXlu`0j~)X}p;*dbvgwiG8ou~G0H`U%D%A}cX`Z7O
z)ni(eb`a})TPHM1hAVH$IJP)wYgYnn9eF%-V%K@toW*&nV8eM+!Cp9L>Vhol^Gh@~
z%&1Z5Vm+|c!un0R(q?jRP)d+nM1>1Mdb<!00m4C22b1F~4bvL(K24Ow5uy;LR~``5
zOQu8^f<FFpK#ZYe4kw9DF7mew^V&!=_Pit^m3#em=(!cL4S{wAZ`L^mhtchw{eR!7
z@ef;-7EoITVWKo{ZN-+Dg7Toy0{4u$F33U`Lk?)O3$F;7`+QMbdTM|(MD8Hik;>t4
zq+z&G4Mf-;dC=>aU>rU4#Qsu;p3RpG$pl+_MhkB8a)~L$l9^5fWiX2+H!!5_T5s^9
z4>JK<{X^Fo%S_uDF%5Ow6`@;%!WN<1E;i0BB-n*W1?E{l7sBj|dY;=Uk(#XoO1L_N
z@qGP~b}*65jDQozoGo?S4(63|3?uFyzC7?Gm+`Y=Q}V!~<?@+(&6BbN{6Aic9m8Wq
z51v(;f10WNVvBcuty$P$@^%|t<BE2yIdk1_4TzhaHzM?C3<A706_YQq7yTg9kGxC?
zJ5*n|o40{WwF*UIV!?MeoTunG5%8O{m?~n?>eW9^>IiUQTB_L<1=H*gdQy5&m_IYV
z%Li4Uo_>Bi7os#uY}WcRfHHEkH&b8~%gsue?-o<(!aOHjm`s4Z3LOy|RiA_<T+TA#
z4tT%HCu)iBtEz@0jc=lvi}sjacsq4e8&cVKPq4^l(v?yLfVIkaD<l=AmCRNiV{uW_
zMA*_;9CZxszpVB_sc2zY+6n_)vn*{j6ZK^-&kds0aos!qJJUIbUMa@~Bf_1;+s^{m
zGWp_I#=+|8>cGTpV7aX)L(k3WdLrb3z#~FKmqZa8IsfA0m#1pKiYPj1TEN53e>tkg
z0RTNlJq#uQVrLpQqdM5r6JnuD=hIQXX(5PA4}{kHxmV1!p*>qQvt#tEygNOAs@+Oz
zdfw4ZMdhbk+u}+OPG5|*-o?V{NXcn0HBbAn)h^Y1-B04pOzSBDfelR>`teLE(^ROI
zh&b$euUUs^kZN*1k{J%gadZHxgJ?{nH{AjOmJrF77iSdv|L<1j9OLgC{;#V|RJlr&
zcSW6j{0-Aeuhh1H@4Gt=_&ggRSH>Bn1;_M62O`)zlyTGNWU^sE&gnQmJ~HG$aPw$;
zKX(DOIsRy?o{m{z>42;$0!CTTcF2R3?au%K2(p-Mna`zCH@bI}ee7d=$K>rPkFF?8
zv$nvf0d|7yp7!sKocJY+u<ZT)F9{LAbEZmTB7FA5RkY(44su(dd`hxUK1h5i%cQd6
z`4X|n&z5aWKME1f;le4<y4n+QF|h26Y=});nZql_s{Gua%g3FRp1JhC4JBQlsv`<>
zY6SVs9!-4A?3JGvc^gfN8$7Nen2o=3aWO!QO@le}aMdx8^`2yXn=H9`9ATLE&9>s?
q)n(GDbX6ch9<^Oe2Q%ytegccF@POz|8L)A;FQ!??rHkeqG5-P<(jCG8

literal 0
HcmV?d00001

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-rtl/d.gif b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-rtl/d.gif
deleted file mode 100644
index d85aba049b5c45649fcbb889a3765c39f3a3678a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2872
zcmV-83&-?FNk%w1VOju40QUd@|NsBp+1%RH+SJd~?dk2Qrm3f-r}gvo>*?$F^Z2Nx
zspa73@a^*3*xl*o?4_ipq@$(g<mvnR{hgiUb#<b!u-(AG-F|+CN=i+GgNCA_r0wnQ
z&d=s@b%bhdcz=bKJwi@kWpM&Fut!W+O;TM|Sz@83t|%`(UuSn*U}%?`pju;eTV!=w
zVQ!R|pIBdO;Ns=&?(gjF?cd<w_xbqi?d+|=vg+>ZoVTFR-_pp~%44Ks?)2{Q_VHJq
zRHwP7Mr}h8e+DRvA2yLJlbe#d)3zIo1(=<e9hCtynHyQDM<Sg7B9#OsngTkZ9agP9
zE2ID^pa3VG085iGY_(K&yIwJ^05PfnE~fx$xl4@7b2YC3I<f?U#b%AtZbY~YS;8e`
zwLP5AgRI(@&g#HIyaP+U5KzArP{9^r$1Z5eGKkY*k=JaR+Ie);JA2bdh~84Q?2(q|
zT%YJ{t?qlz`={Idy~O{DkhofJgEHIP#vL6S|NF<fwvhe!*8ch2{`%zm^UVD9(e~}g
z`0&m4;g|U8y6D%T@Zqx0!<^a8r}*#F`t#hOjaS64bl%B|+{lpC#hLTwz@Lg!yQF8q
zscfs5X3MsJ<j$DUzKrGD#^1V#=+n0M>)ZJ4-udt1`ts-9qFLXlW8SA@;HqZcsb%1+
zXy2-6;jC)mt!&?{YvHbK@!7of<<a-)*!k|@`ts=e^XmKb?Ae%C=*On?;m!H)<@@#T
z{P*(y{QC0R!}Hz9`tj-AnPT0WW!{}=-kxgTplslza_-Hs@YB2T*1+}R()Q%l_U734
z=-c<{-T3R^`RwBQ@#_8g_V54z<NyHb0Rh$m0?GmcrUC-I0|V<35w8smwiXunCML-%
zEAurq<4sNYZf^FCjr^;t|H;Y!-rl&kx1^(^mX($K{QUa*`u6tr^78WW@$v8P@9gaC
z>gww0>FMX^=jG+);^N}n-QC*S+SS$7&CSiJsi~)@r=_K(qobptp`o9jpPHJQSy@>o
zCMG2%CIA2bA^8LW00930EC2ui09pV@000R80RIUbNU)&6g9sBUT*$DY!-o&|K>Q~W
zV#SFVGiuz(u_MKa7afN5NV25Kf%h8r%Q%vu#FPwIwq$4z=0blfPa>?@5GO``>})FR
z$1i8Zi9m%WBx<xFId<igA|zT=C&8ytRr0IaFoU~tSz~VHdQhU-j|$Iv1uJ#nS*m0g
zVr^@%pWS{wt<F_>H!nkd?dV!<2v{&ldk_Y1M64KPV~vI%OP)-*vgON|Gi%<=x${6p
zphHK>l<88(efsdJ#+R?P>wNnN?#l<^0fgJQAB=-7JKyTx_#QmqT~HCA<H!O1`QwKY
z!wx1sc=+%E!@zv;(rMq$-CaI{_|l#K<I$tMc^)*<;RBz}ocs6XB=F#IV102wj2Qh<
z6lrwnOO`C8LJAjfPyz`r41`ZR>aeqcI_aQuz&SLSbB=uiJ&;ZjW02wDheha+PGSnC
zLjVEoIG9cXIgByJ3>p}u$RCR^Vw`fz`Qb-^1f}5Pk0p$7fdwG6kOB$<;o}ZF@3@oV
zgAtyC4u=02P=gqE)M3Y#b#ysK4F(Vd!2voH5kZO!=rBecafoq*L6OkNNF;y=;)fuM
z5JCu#1Em1KpMRROK?W9(06+;y{-dNj@WAs<iZX1F&H+;rq`(bb%rOTYoYKLj7B_@B
zkOnzu(MAytAfSU7bFjfi6-2=Q=?5W;#3_g%f#^91p91+Q!mqyqK&YW5tRN5sjK(vA
zqfR=APNf4WP(u}P$YHG<o4%1n4GIuM1Ql+)@kWSUs9|mvMSNFKCV~t?NG5;an(H9D
z7UV0iA^>nf1tlD6>_5oPAdj-lrl=0I0!dp%xNpGWuo`73Aw#zV5%I(qUz8C>7GG>(
zg%dU$Kq5hx1R}{Gm-rEgA%;leGOz#K3#`8U`g^Q9@ysKSJTolYqznlEBP|tRq+xCv
zXmDYL#1v<!!xUI-A@vndBw+&sK?`(=A&5wl^2&&WjYuQ*0)TJ6`}SMx&GO8n^T0m0
z6SM*{D8U8BUnqSA77`c#K+ru2*f7KrQADvs5<fW5j(P<-!p9+DJEC&fhg42>k7nab
zv)U}MO^@3<^E|^lK^IW>5>gaicoRrGA%ouoL6D9Bf+K;15I8L0DB}cGVhARfR9=Z7
zl>?8-<$VIGd<PSZaA=~)&O^`VpbrdB=`rkp1QShk&jb=i><~lK0H;IG05(i91P%@C
zJOl3oQGy60^kXtS@bo`|{6H-9?>`G3n7|48*8zdt!yVI0Aob>voss?H9_aXi4<<-K
zAM7Ax4-nHi+!lZ$*g#p!a>s=VLWx3Lf;5nzgdp<w2>lrZ1~7!72bebj3Y35x8%Pp6
zXmE}m_OL?k8R2#R+@X#Q$l!=bj6piQLlEq^<B9EP#}lU*4|T=QgpRnxB`6Vy7J6|K
z3*ko%J3xU6V88?d*#|!A!NxYa@gA`m$ZYOWfI8Z-j>Cy#8fkNzd)xy8zab7m8bQcH
zcF~KE0HZ?05dsv<ummA+foCQ%iAq{>l9<e-CO4UxS@hx;p!|g|MoCIv%z_}H5Cthv
zVG2`_f)uTEr6@vyN>QBRmZivLDNbPuRm}1-zSspXhDpp~BEuI1Aq6OK0SZ|-^O?(p
z1t|zp3RpPfn%K-mE<gbbS)AfBzet8Hl)(&J@WPq6z(p=@@e6{O0u&tj5QuajO@f>P
z7M}1#Cp_{02~gZZ4=$=jDZq&gWf<ca$yi1?&xs3Jv~wV+cm<ZU#3e7i0u}C*1t)0X
zihbGwpllKYEiLm4WFVs!2Tg`DmSKx#I+P%(@I<CI)u~UtA{F-3gsBv<PfoDPRd_h1
zWq^SUW9$N@$3R9xnbC}9JX9d5cm=htg)KU0>lLdY$SlAmE=3Fj59U%s7BDf2%Mi5|
zy4b}ojFD1h*utqWl`6v=1_y{K;S*UM$SlHuF^zG|V@^nfEKFfmWbA?%#Yihsk+BT8
z4rCRtAezzCfHbAuHLn6O1t*{;wJlIB35l?UHw&u^VjwoHYc)nP94nAje8O&c(;MIL
zN)T25++q_`Ae`Zn(1%WR0v6vKDl&>O4AT}Pu}3`yYyaU|C7@1qQDEH@Xgd&7z=9RH
zwVe?9(282L0=R`G#xRO&+_V~Fxvte7_q+$b9ee_()dfXyH<5=S^g$Q+tp#{36AWYw
zgBAcDFL`yr3t$ig6|s<D1t)mH!MgJntYC#MFtLfFde;@W2ySJ5p$uHyBAp<{CN7@(
z4^g-R6rXs7idWoESBQcjqu7NjX6)M;+jtjcwahGjA&egT_{YHzsz6eSid7i-$VN8B
zF9(v!SgJx5rnu!Tm(0m3TlvaZ&a#$G;thjzdCLp&0z$g+jV}x28{zl{m=n?lJH)~N
zAkwe~H@xv>Z+zn$;7~I|*0GMxD8V3Jh(jC3zy^X)V;azahBdlDXFA{c8`@aNI)2dS
z&AfpQRUn8L=CFoNKcOJhkOnlO@r-SB<J5GHv_d8ggi2=y3~mTl76g(7H55$^PB=)Y
zqe1FyoVpvTP6(@8y%{H*!3<?U!xO?_hR!k}A=OCqGoImVZb<qEK*+YMGsA?=azSrb
zFoHr5J?dU}<J#FKHfM~mH!MKm-QtF}G(=tQQlER(*j6`Zf*^(NH6aKJsm3&>G4FXN
zIvU%sHoo<}ZzeDS;0d7yHUvKKYlJ${*4PF%uDxx}2tf!8k@z&KK@EW%8XD3SxJE<x
Wyk?VI+|VR%xy)xy^O_GNAOJf<b&a<G

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-rtl/d.png b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-rtl/d.png
deleted file mode 100644
index 6ef7d30b6912bedd11ca499b643a5187cdab8e51..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5437
zcmaJ_cT`hZzomyNO=;4kOG^TQ(2=V2mZ1beLK2FQ5FkM40s@LiFA7qXBE1Mm6A%#)
zqzWP(X;P$1FAwLNneYAa=G}GgX>0HO+vl9$I_s?a*x2wk9W@6v5fKrc&K*tD%i8tw
zyF*EFSu$HQ{JgB#@miL6GdBmk55faYq=s^{NAv1n5RPb5Gy>)8-i=lwA|mB;hFRh*
z4fGX|ZWu|#Z;T`XgS%uC5h<w>a0sLe8qaHwc67!n^KCY^@bNmMl=&=V3_u1r4YZT<
z9X}7WnV%sH>F0u!NAanu@G21$E(I`XJc5^iam9Kn5S01;)K$1_{~iYN@%{<HyD0Ph
z$CRakF|UT32bxz#Qd$BD0)u&FWhKE78ChAdIIk24ECmEzzOoWvh=Po)f)teZuZQn4
zng_~3!BkWGuUMBoWj-f79;W~V`uO-r`bbN<c{l>W^78V(HKe2@E)f!*zF0hhAc6Jd
z|64&5?TPeo#^Igau)Mz&5%z9gcxApzr~jD(2KSFF*7L7rx?C_I0f7U8B|*QZ^f%DJ
z;QxnWF#n)E@uuki`u#tJJz>5$G|&|7>E`8uyxcek{@<Z+3K|}01m4X9=H}-5_bM7Y
zx#8VBo!oG|8fLP*A{NeAl$(#|%|G!51`0Y@PdoyPMC)iO^Ia-PIy<8jWYpxr5NWWM
znlw}s4AzoT13~5FL0VGk>grHAu)Or&TunEm7Y2>R|IJ1Hm#h7++~28y!CgkyM0+@U
zqfy!(ZW!J_r>x-o?_M<iRqrn@>fgO+{wo)FX$JUvWB=Di|2=e>J-?g(r0r$rpTtLF
zFSFg_GOh7W>()d>jFmc?YB0k1x(y8;wpcUmxYX;PK()X{A_8l>#gMc`D`Tp8)7y&2
z0!UKBH@0ZQQX%=ar_8_ku60f6qPK6QO!K6rRtNg2h2|FVWbUIqZQdaU0kZ2M4<9~^
z>qSjFa$iiHWJ$LRJQp^+>)RU}DZO0dcyUqJ(tOZzAuR&>$U7BbXhtg&-uYC_f!``7
z&cQMb;T%B+X}`j)<n+FONnpV-IW^V#I8#6Q1q}K{Y)(xp@L@>Gu0a~xX*NtWr=&!D
zgEW$!ha#(=^_O4K!iTC4p3CqAj%XDASau;GG3fCeAgD!E&^%65J|13WN0<CgaJ<|W
z94)RA;Q#%x@NtITt6zaaL;IM{=(g!P&68`X2n%}?jc`QRYq!VyVtjV#vKZ<N|DA5(
zlMKB#X7QOi+J@rycraPfhVjQNMz*<uda!c0tL>rq=_X(48P)T{`J8@-YWbT7%#y-Q
zg8afMg4z?pMP_f_btI-b%`lCuMX_tI1P=H$G&HC~9|m8UW-ZoAWL|maR!kTEE>A#D
zKx}n=of8HY|Kr<~-P!~+3eh$?I0*hRbPOYw9Xn2ewBL#U`0-;Bt-k2OD~^)irrA>@
z&#xq;h_nwqpsUQkL*F)wupAf6XHUU~MIfx}uxQcbDBukN1uA^wRE5LmG~1Ab1t$oH
zv8W~k*^Sj*l5@l?DUXBg;KD0)p8HQPls8ikzZ|>=KGgB0s{13f<k}hQ>6M}2p;e8#
zIrmAKMmnQYMX{Up+-cVEoV*(H9S<6{(oyx#1)FUfQ;KG_vMjo5&T&0GJvW4fg>wL0
zR{-nZstaa(OU-F~Cfxx8c8#Z!WQOeZu!VyV!#qIuVua63VBO3w*b0B$rUCp{AEyo|
zB+Z$DivF<suH-5ExDl)${P`^nZNBUKC{lKn2D<g<^zKmT^nuX}+_m)!0#KhVSVn1Q
zz-X>6J@|^UH$7@8=K3?=XX-gbF9*ApIk;m164oC)NmPwe@~<ZGio~<(k_VYT5TRiE
zQg<`_K^JLO0Lc<J%~*-7$}?;?UGFl0TuQstJj}KrGFqR1(tCo*nDR``Ks!qVpc*Fc
zxup3;*p8F<BWT8dR_KnLD2da~AK7cq0J@5X5z_3ctmVCLcG_<9nNF_#Qme}YlyM}|
z8%8pxSvT6P9~R$g6FA&9lC4U;IJ}OyCCUYndt(wW4Uv<xR3Ya+*&cgRM%xxuyYaI1
zM6etnuB>dgA*&JFL1LaxCxExGMI}Fq9(Izk1F^NO?e6$@6XhDf=2y(>^Ae04VmakW
z!o$PkiC?M}%(ZTQ7w7B0-Ckze`eTUiE$l1x)UVA?WeMQ{LUWO4@?#d$#le1+Gd_0`
z04L6oGcCrCkNM8?^$BNr%X69N;#=i?`pWI<88p_9ULM}?z%>=NFahG`Dw!mHRmE<y
zrsKBQV<JZGFWPyfH|7AWmhcL#vF3%X%fA%3ygyxMW4%#@7S1(7qXi*QXnQ5H^DRxD
z3nQ9<4phcodB*$lhA&%e-pjHUiln?)5)F;GuBY=nI=6ri!252&g(9&6X7Y_K*AGS}
z+YZQ{iFDcyecOC;uTM7((bh%}#}g`qdxX9+G~G6)a+hKcX;ixoe^Jv(!SduePvTt@
zSO_Z4IFm^9RR4gQf$DJV*v|BQTke4{i?}6`v_tRgGJk^@N|d=Fo}$nAeNG%Rt-_X1
zeO!1suJOjn_I#!fcnupD&~4z~b;4w~@NN-8VM&dA#+PtCS7Nd%Y?%^LwV|2PCa6P_
zx<FFUL+sti<u{-O?^1^Qx5muYZz-X@LK&=YAD58=uIvpJ6ctfR>~I2H&QFg(fyel_
zyM2l;KWz~P-z#4LNLDqnsj!YjO5=^|A)ef<wgt_Jn{7X-Lo)RFH`jjc>qeTv^`d_;
zb?0`&!^{or$YY(29&60t8+o==NTy;xosd>i6AR29@@5B64{bjXCiPu?U9e>fd?D{i
zVP0ZMJW-38?>+wh1ZcN0Sr5XDL*AYNR3BlK77~mB;S-FHO!OTpT+h`c$(ks;q8(>_
zeri@E`ri(_(cwp&@*SSb_81Wekov&{>?Hd_IlNye$>?92?P{v?O#sVwT}1j-j&boH
zlh;JS)5c0PlRQ>^!q1$C_Oi>$Vmb?IT)wKCm@vj#RXg@a3=NrDR-tt61~Q1Dk`-HD
zsgx-`w8RPDb%>gc=hbOC^ju)#uRkD0KC_UG=e^VRfQJm?aGKC!UTPX<UfSmS{ED>t
z<JbsRX1XYZUl{iu!S=~x^%8RvlQs))o!Ielcu>q}<&UY>*JcIpzjr*Thd%nMbf`4H
zF~HSzCA_Cv;^XOEXOh^l0tQrtC9lr5whmh;mG-N>%!q!h&%?ggu<xx>;#(cl#-rD;
zHzox|?JeHK-Q&FavWM*x#my%#`xv$qGFX=F*zF)}hs~9ro<nB>Ji8uHzIiU~=uyEU
zdAF-yIF~*USg934G>}?Z5f#B8j_ayd0Z^07&XsT@+1ApBXv9Wcql?^QOrC7;un!MW
zi1C~|8ar3>O1I15toQ^;-jJ)hpjaO5Oo|ci5k|*caL-t6G82saj&9Kq(|G2HtAekU
zJ44{84B}-`p#eVTz+P4vJprz+vv_f-{DcIiOeeBshwVKo0%emSRbSzHPcm&xtWw?<
zU<i1l$w6xew{Vl<0Ar+D|8A!KbIb8HP{$vj;&nCr$;;VDy&wt$10MAbgFM`3;6Xtq
z0>XwmOVlfy-_3iMQ4kf%$CkOxL1*`>fjgsM;rpny+v2V)i{R_LqqIj-{;tYDyp<S*
zKhGT-d$^w-x^veh3`UNBm6%ejRk9&h_|h3G87H(Ft@T8L7Ss*k>g#wx;96c%Je~#z
zxtg>9CKMDdFAn#=RB{NuK_<vkVBaG6o9bMYQ8AJa7cU4F_t`H`mARL(D&M=+N^&uB
zpgsLpB;q4`kK%I~CVb2m!&<4O6q>Y#Bda=4dpWgbtEW6&={AVwkp^#<({yvyJtSc_
zBQ+k)ktxEC|7>h_LenLYM(Lnu^ocFSmR_$sGH;@;iaQ1C9FaG1OKLqccq&*6R(#&^
zxtV0qE>U_CUJluS(#IIx4?h^3$%-cY%%g(})qHPSt$)e5sgta7c|*{#P;jbBfByVA
z+mQWwl1;%dvFGd7rM(AJi==f6^I|Q!c|;t^B(!je!uhLl%p=QT{qI849j?+jFWuda
zsy4E{K$x(4kc@;_CVRuRY8#vEDs=`h$*uOOts$MZ_lQ6*&B>orTmzmIhX1H()!chs
za?YusP&z=!5A5o!5GxY&J0v2vNLp0?fi64_jG}zq+8WclTHBD*z8<Q_0^O5SYU<S(
zIni&Xp5&Hjfda*9ODvC1w}0{vU@F@y%`mw31rlSanJ#-a9^Rsi@S<<xr$|dK$@8e{
z&p$OBeB~@z8(!FH=hrI-ZCuG<zaNyvp}L%I-`L@F3~TmG3j4#q>e{FLnDFnXw1sYK
z?EAE4d%*1h5~1c(zD@U5fl0kL3@hjWu<_1^I#iU^0!1k$9NM6554TPwJunP%^&+&*
z?SHfp^N<r9t8B?hRk4n@O6?`Cz`ii0)$+B%^}lzyZA&{(`jnLK@|3eLVf|#4oz*E$
zPb_}a_IQ?|2ede=KTpB197xqruv6OqmX9m7q#|I2mVh~6wX2oOE@PaU^+INYpfo8#
zK1|QYyP^>v@*f;f?S>QIX2ltJ>_I;eiEoK={4r1d?u&YvQ2}E;Z3aawIA%~t)PAk5
zWnbyuT9M)ib>7#jt-}{J^oiFbI8_6Q^Nl1!PnDP_WiQ};gfMDtk#<Uu-M~T3lC4e}
z!?D=?;liZsuTgP1tO&?Q@sOVV8w6dp@J{@6_ETk<w_c-`6%Bp6x@YbvSVgj}HRX}K
zkR{}VLsFVCFhZhTWPk57gy20YR$SmRm`D!S5(4RKdx=c1fRhVY;jpeI+E*I2I$^FR
zom@*%&za|fT@2fkHi=#w7SSD$$E9LI(?1DOwCdi<LiB;$*s>lz0*+EqiXaDj;ua`m
zL>ZAuX{vf9xxVZYPD3Ytocd%KSU$%a_q*&XW<l*_hlgD=a|!_}fVNy@-GY&27NQ3P
zpUd#@(ta=2H^@;c=Tf6GAj)?2nG^HLH;QhCWZNH=^0}X=z80YF-sCKD3HKe2N*Hw<
zlUk3zC^70zEhx%o)yZP@$q1Vp8xrelf0OsMor1BQsUG;b0@5y7cfs&*aIg%+M25NR
zk_+`n9MdLgKYWGft)&;zxAgHI&QCd@p*G)Z_O|PNmYkXyxc}k2q+|lwO(`wvmp&rm
zmgW>8YaGa~Z#_gG9aKUX-CP~zY22=Zmc@AYU&+A!45z!!R$S&_18m}L&PuIQBK!n~
zhxc$z)ajMHek?!j*V6!{aB9n?!q&gF37bGoMxke~wo_GHURElSNb`ds2gjua!9m-4
z%PO_i7@Ef8*PDCD{w#2DxrL~ewK>b$yG53zzzzA)v(w!nfUj@Q{;b1Hm6pAtk5nxZ
zfRvHxJz7eyJv%z8>m-U!c~OA(_Ldso+U1)R(k8(OfJ!VPtD*Xqd#!zWn@$#sMn7Dd
zzpXuSR6XlD<5_fETHvh5QF2NOm$W#p6z6wFu^bc)&ClxY(Xdsszwkc@{q?nl0%?=6
z+ISs`y;l)*=H2|YIJDZ4Skfl<D?!agik;TVY8NR%+m+q+j^F=BR`0|U9%l)`EK%Eb
z!C`~rnbVOoRPUr0{pTXdbjY`)RCI&6WqjkKX76~5yH77*N<U|~&*%E0X}c7^SpkCX
z@pgTE;p(~yJ{f<XKt{~I?@HPLx*7mI0vkCBj};f)x@UXkdy{XgI17Ulh9dk(km`Px
z@6u1{0>frY7De#)mM(&`&o$MM?B=Y*#NEInh34zG7MU)LDa2pvM&9>oD^cA1JVokP
zy*->Cd!rGD?{240`pKNKIBEY$YN^}`eAX^>;piKz=mLmmzg0TW`Z!_(NPm{+FYn(x
zPk5$h|Hw)@biW$7jngH9ghXlgg#pyUW*^hAJTNuTLeLin{u-%EUt8m8Va=8w?AGEL
zz~*@He+zHoVXx6Fe+A3LxTPwsdT-?_Do#5SCkDZ~&w2_t2MUuvnhk|C_34>o+poeK
z;9u^^jG)RjD`K=LPa*ru(+m&29JSnsM6${udx|9y6n0&ri@933hO)Aawc}&29yS*P
zZy`2{aa%HsDA~E&)s6U8(8k5L+TGx@fb!LM$j(MMaJ-?_;XtjY!_bNGTwyzDE%7u)
zQtZ%O?uUgMYZ~O9EZ3*z^yX3cb+ann8qmGsX1IEVk`%cdU0Pb}*-C*i2s`<(Bs4U9
z<u%R&EPl0u@lBxPeQIv(8GL<<Ea(cY!xMn3dGIXYfKXPd<JFKSdvSaHX-b2odL7OC
z9d)(Bp$S)QA2v%{-%UARCfZ1P$KJaQZ|+-|4DO&5>+Y{;R5&f!$Jyj+vC!~GAZ`rU
zx_p}o5b#0kC5{<htcDE7T#xW%4Z>oEAa6z%r+aKw{UIr>(4<djtI(|~!-Ow=plnXI
zx{_ywWMNN#exMrQQ7+1~GTD|gEZb}(sSsH?gnLJ3GImz<WY=ue6Qta{{Hu$mHm?oR
zMGd%{508z+oe=q-omRe0W=<~B?CN6?3?~s_7cbT(m4i-rB~?zblD<~GpeiMu;)lpQ
zrZ#DkjJOjFQu#$(?EV(@$fCCbbnv$L1hzq4g9%6-QaayE$zMMi+h6KuE<B?Wt!u0r
zz8~13;0HNO*8QP2`)=o`D9~^jep;0^N(vhmNtE|GI>WuqnY*@jv|AZ8e`kFT$Qe=J
zh9EcBE&2sH#0AeO>2JPpXO33sZzeWgA8`tD9#{!lfTUjl9BpFHNRa`H+Y)MQk@zDU
zaI4K!XvOExV=dyOP6)=U@iYw_zTaPvhp<9jtFEsDM(<eqvVG|hld_|(AJ3siz7S@r
zj*zlzx9^buCYTuCTA^kWspq$XAp1~p!D>gen_BZ|v^MeP?;n~vT85fs>UN?31N}(o
AMF0Q*

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-rtl/dots.gif b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-rtl/dots.gif
deleted file mode 100644
index 00433648c0769d3b473e6c972e6314f16e5a29f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 132
zcmZ?wbhEHb6k^C>XkcKFm6iVg|G(l-7DfgJMg|=QAOOiQFh%$DujG2o@7!&2t}F81
zi%)NALp7pQE0R)nt;u<`&t1p+tMlofyEoVVvS#&m4*XdBM8(|u%G$3jZi&HJrDaFc
ka&IroI(@dv{ej`poLAGXzuGqAZ(00B0V}?F8Vn590H|{~1^@s6

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-rtl/style.css b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-rtl/style.css
deleted file mode 100644
index 1343cf343e0..00000000000
--- a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-rtl/style.css
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * jsTree default-rtl theme 1.0
- * Supported features: dots/no-dots, icons/no-icons, focused, loading
- * Supported plugins: ui (hovered, clicked), checkbox, contextmenu, search
- */
-
-.jstree-default-rtl li, 
-.jstree-default-rtl ins { background-image:url("d.png"); background-repeat:no-repeat; background-color:transparent; }
-.jstree-default-rtl li { background-position:-90px 0; background-repeat:repeat-y; }
-.jstree-default-rtl li.jstree-last { background:transparent; }
-.jstree-default-rtl .jstree-open > ins { background-position:-72px 0; }
-.jstree-default-rtl .jstree-closed > ins { background-position:-54px 0; }
-.jstree-default-rtl .jstree-leaf > ins { background-position:-36px 0; }
-
-.jstree-default-rtl .jstree-hovered { background:#e7f4f9; border:1px solid #d8f0fa; padding:0 2px 0 1px; }
-.jstree-default-rtl .jstree-clicked { background:#beebff; border:1px solid #99defd; padding:0 2px 0 1px; }
-.jstree-default-rtl a .jstree-icon { background-position:-56px -19px; }
-.jstree-default-rtl a.jstree-loading .jstree-icon { background:url("throbber.gif") center center no-repeat !important; }
-
-.jstree-default-rtl.jstree-focused { background:#ffffee; }
-
-.jstree-default-rtl .jstree-no-dots li, 
-.jstree-default-rtl .jstree-no-dots .jstree-leaf > ins { background:transparent; }
-.jstree-default-rtl .jstree-no-dots .jstree-open > ins { background-position:-18px 0; }
-.jstree-default-rtl .jstree-no-dots .jstree-closed > ins { background-position:0 0; }
-
-.jstree-default-rtl .jstree-no-icons a .jstree-icon { display:none; }
-
-.jstree-default-rtl .jstree-search { font-style:italic; }
-
-.jstree-default-rtl .jstree-no-icons .jstree-checkbox { display:inline-block; }
-.jstree-default-rtl .jstree-no-checkboxes .jstree-checkbox { display:none !important; }
-.jstree-default-rtl .jstree-checked > a > .jstree-checkbox { background-position:-38px -19px; }
-.jstree-default-rtl .jstree-unchecked > a > .jstree-checkbox { background-position:-2px -19px; }
-.jstree-default-rtl .jstree-undetermined > a > .jstree-checkbox { background-position:-20px -19px; }
-.jstree-default-rtl .jstree-checked > a > .jstree-checkbox:hover { background-position:-38px -37px; }
-.jstree-default-rtl .jstree-unchecked > a > .jstree-checkbox:hover { background-position:-2px -37px; }
-.jstree-default-rtl .jstree-undetermined > a > .jstree-checkbox:hover { background-position:-20px -37px; }
-
-#vakata-dragged.jstree-default-rtl ins { background:transparent !important; }
-#vakata-dragged.jstree-default-rtl .jstree-ok { background:url("d.png") -2px -53px no-repeat !important; }
-#vakata-dragged.jstree-default-rtl .jstree-invalid { background:url("d.png") -18px -53px no-repeat !important; }
-#jstree-marker.jstree-default-rtl { background:url("d.png") -41px -57px no-repeat !important; text-indent:-100px; }
-
-.jstree-default-rtl a.jstree-search { color:aqua; }
-.jstree-default-rtl .jstree-locked a { color:silver; cursor:default; }
-
-#vakata-contextmenu.jstree-default-rtl-context, 
-#vakata-contextmenu.jstree-default-rtl-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; }
-#vakata-contextmenu.jstree-default-rtl-context li { }
-#vakata-contextmenu.jstree-default-rtl-context a { color:black; }
-#vakata-contextmenu.jstree-default-rtl-context a:hover, 
-#vakata-contextmenu.jstree-default-rtl-context .vakata-hover > a { padding:0 5px; background:#e8eff7; border:1px solid #aecff7; color:black; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; }
-#vakata-contextmenu.jstree-default-rtl-context li.jstree-contextmenu-disabled a, 
-#vakata-contextmenu.jstree-default-rtl-context li.jstree-contextmenu-disabled a:hover { color:silver; background:transparent; border:0; padding:1px 4px; }
-#vakata-contextmenu.jstree-default-rtl-context li.vakata-separator { background:white; border-top:1px solid #e0e0e0; margin:0; }
-#vakata-contextmenu.jstree-default-rtl-context li ul { margin-left:-4px; }
-
-/* IE6 BEGIN */
-.jstree-default-rtl li, 
-.jstree-default-rtl ins,
-#vakata-dragged.jstree-default-rtl .jstree-invalid, 
-#vakata-dragged.jstree-default-rtl .jstree-ok, 
-#jstree-marker.jstree-default-rtl { _background-image:url("d.gif"); }
-.jstree-default-rtl .jstree-open ins { _background-position:-72px 0; }
-.jstree-default-rtl .jstree-closed ins { _background-position:-54px 0; }
-.jstree-default-rtl .jstree-leaf ins { _background-position:-36px 0; }
-.jstree-default-rtl a ins.jstree-icon { _background-position:-56px -19px; }
-#vakata-contextmenu.jstree-default-rtl-context ins { _display:none; }
-#vakata-contextmenu.jstree-default-rtl-context li { _zoom:1; }
-.jstree-default-rtl .jstree-undetermined a .jstree-checkbox { _background-position:-18px -19px; }
-.jstree-default-rtl .jstree-checked a .jstree-checkbox { _background-position:-36px -19px; }
-.jstree-default-rtl .jstree-unchecked a .jstree-checkbox { _background-position:0px -19px; }
-/* IE6 END */
-
-/* RTL part */
-.jstree-default-rtl .jstree-hovered, .jstree-default-rtl .jstree-clicked { padding:0 1px 0 2px; }
-.jstree-default-rtl li { background-image:url("dots.gif"); background-position: 100% 0px; }
-.jstree-default-rtl .jstree-checked > a > .jstree-checkbox { background-position:-36px -19px; margin-left:2px; }
-.jstree-default-rtl .jstree-unchecked > a > .jstree-checkbox { background-position:0px -19px; margin-left:2px; }
-.jstree-default-rtl .jstree-undetermined > a > .jstree-checkbox { background-position:-18px -19px; margin-left:2px; }
-.jstree-default-rtl .jstree-checked > a > .jstree-checkbox:hover { background-position:-36px -37px; }
-.jstree-default-rtl .jstree-unchecked > a > .jstree-checkbox:hover { background-position:0px -37px; }
-.jstree-default-rtl .jstree-undetermined > a > .jstree-checkbox:hover { background-position:-18px -37px; }
\ No newline at end of file
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-rtl/throbber.gif b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-rtl/throbber.gif
deleted file mode 100644
index 5b33f7e54f4e55b6b8774d86d96895db9af044b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1849
zcma*odr(tX9tZI2z31lM+(&YVk%mZ}5P~KlG2s=WSbGzm0!x7^P##Mnh7t-jP!X0Q
zk_SQ}Po-L1tlDK;6l?(>v)e5ZBQx4|Y-Q?nr@Px3?9h(3ZWr3^tj=`TP57gKr87N$
zp2wWee1GRRCwo_xahnw)5cxNPJbCg2L6DV|6`#+yw6v6!mDS$f9-JvFD^n;GQ&UrZ
zzh5jCkByB101O60U0q#p_1BM>Cv-vP?&s4@g_((4_1L=L$(a91)0=J91Gas#R{McE
znYG^9*0A5YZ>#;~+Wkn(W5B0^yELIYLP!K}mB~<)AM@1&nqekynuaEGqP<JE0#l+(
z*R9joTN$nZ{F;;f_Nv(QpzP65;W)SYC;1+?>rzoH|KodRXJy)%+w_fu3nE5>@Bd_b
zqC$EQ;{c`T&?EsNO|igL9gC7Ygxv?aQUEXMq?~>wg{EyW;VcJ37CUF#HjrT=KQO_*
zS>M9yydXk18D(+QDJ1>r);Lav_uYKp$T?4vr{Q$lTo&pKv^?(>L-)G2*lwH!Ah7k?
z7oH<8h-(KTKt5V6$8gF)C7Io&P5=SjTh)=zV=E2EUhQZ<Wjvi)ks6lL7NUI41Suec
z%#@RZvp$b|KCxLd`PA8_!Ub^;+J%TE^_K&d6(i&k---epB#nC`b3_`MdhtuWMEe%I
z(wJ2$`EGgJTz=trW>P##L8S{d%UK>>+y82>+FV+#^BzW7u3F)Bb>=lYQ%%j`F>ASe
zo*cw@V#u6T`A2He;70mR(V&iV&-7{qP~=SRf&jm9-T{*ZeZ}$rd0#6c&fLG^xJcf5
z+p<`wJYgW+_s*V{uI$nMB;%8`S_3>PfGOj3Rq}@Cx^+j?rk92fANSFDBYnOqQ>Vdj
z)(|$AhP4t&Lb=Gvo2#3Gl%9<=Gv`Mz?Po@P4iLF!x}GUWJICDlFk-hS^Whyh7x~VH
z@0vD1>HYD4&e+~yzS*-sFR{9`{QEEZO1zg7>R&7cHts-6j!xHVdA8eI+ZlVzd%`es
zJT@$#GX(gvCJ1oJN%yLBK}{V=V;seo;!w|Yte!W1%5qLNFWqvZW>h&IiH+oPT=b@E
zPhGzv5=(Un*X>v`><w7vN-j#h05gB-F9AZf<&Z~SLlC&Nz^-G6DuPj|`n3d!<l7n!
z^9j1qeh2{s+i0tZ4@>%8h_nj^NdY<en;#4d>cE6NHS_ifkCV$*D)Tqrbu`s;<=t<4
zAHNqNV?6(g<1PY-w@#I-WYFViz?9TrkMr)u0g`O`u|>T;k|2sV*YF^pun<C(O34ry
z@yg-q+#%4rv$|41Y!PHPrjmV%@S3%TUelmz%~6?hLG4%mWKO9NB}mrI%KlhB`{^!g
zT?{Y#<ON%sq<!{buD;iH%`hL}N;>vT;$SuTy{j3Gv)yqD!R_CF>yR)MzmmYS5v+~R
zXAdD<Jm>%ng9?df;wd8GxR#%3O+gz};Vo;)sK%Bj-q>Oq%R7JU-KD?vYu>#2UjaDo
z&8$>5xW~?KPD_#XFToU1hIb*VOMidUr6iYiO0N|i-7s`T8!cFT`rN!^1Pt78J93i6
z5HI1wIM$94m{3SLDvISDe6$ZG1;eq_D9RTaaC>=cO{@Bs>$IlP<c+8wUtK_tPUz3j
z)>CPJJ$h$)-3vzNUQ6<Wm&Z5JfeG_o#I^S?ZP9*QGjsiJM3jH{?94}z{@d%97nOVw
zacge+X&InNUL3U(BUlor87ff?2qEf2c|yCI=Id~LI~<KyVA#R%nwHS3S<^IBTu|Jj
zW^-Xv#UBDqOwy>OsN#_zWxey!_9%hxwH2_dEJi=yY|1c7nDm2_Lm!Cof8-R_+9UkS
zcBE(o47yE)oMR(Q=dp1a2wTX5Kv<M)VDKP@wb$5DNEX!VTUn1Pd`taYrL9bpe}d9v
zqx3tu5NTGv8=X63WXPWMm1T8=ujh#QvSw5|(EZJ3$quU9*?0NxQKGsTrnFNF-ygOt
zYWPggi66%$nuj|v6!Ow2)>vGyLqlWTa7V&!A*|w|)ax~1_~aJ0=_Lilg*0iQk7#ZD
EAHN$8j{pDw

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/32px.png b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/32px.png
new file mode 100755
index 0000000000000000000000000000000000000000..15327152481789306eadef88393cd1c748dc31a7
GIT binary patch
literal 3121
zcmd7U`8U-69tZG`S&Ttp2wAdCqGXM%-z>#gDk)iGP*Pd5FU3%4q{tQ_Lo{TYq8P+T
z5f#GN%GeTPjAdk><<7nLm-{E&_xqgZdpqwR-se2d>%6h{=dAYeOYs8$u+JKG+5rG~
zOu2J3ADEkN*=|w*00!*sE}h{nU5gzdXvqoyFfcHHKp@<m``4`C007|!%~ajGd-rZx
z*{ia$GNPoUTZtpD_rccyP>!$I+1Y6afnM?O0B%x~Mb|(c2l@8#hDXMUCqv2rKqy4I
z6@l2QsK7&^+`G<=>TiUFIV{dwI6NXUP9q(8;688n@#F0Z3P+RG9BWO&y3Wd_@m4~i
zfQ#s{=Yr)R(0o!-H6PzfW~NXatPBR*Sl{p>ntc@%+{n!IZL)@WiKq143Tt=C{~6=)
z#wLv%lr|8&bp85}we>p*iFp^7MIWDf2;?yUERGkpN=p-*^qJcXSy}1Q($eY58ypU2
zX^F0^tjuPzD1|<|%hQfdZrn#9^MUR8Vb&(u-6wc+W0SQ_Ut_FIPEJu57WNp_sV|SW
z=$*NFxy7lDy0rjEkH9@092{C5XjuQ%{CA?0I`X2sF1DfgdM_zs;v3#Fz#<_LySlof
zSHrtCH&jL}+g+Yoq|u)Lx!yb5F+DRA77=^=C7@ji>@gOud^)P}3b-?ZYFJC{+pKl1
zF=y`W4FJFb0MM4`1M{5*1m5}i`OVq>SpcB(@Kk&)F>QeAK9f!yJzKZ(@O+y%d5Fx~
zqSe;U+I$e&S{!@3@bojOP%#G*HDo?FH^=zPn4nOG$iqE6JRgU;aFm3n!@+*vv^=UU
zkGufTU1~}x2=XAAlbbsRg>FvutN{Sq*O#@uwD;)IQLJp>N88449|~pzhqs%SR+eJB
zTzA%g*Z#_T@--l`)itEqDL%fD@cG^F@EE7QegXhkk&)ZV%4@?-t0pEiVc`p(#IAih
znLOb2aL^k|Mwd^fRINq@_3C%`H4?s8Z_z35#l*ac7MogHly4QB%F3jiWL#6}g_nlk
z$gPk1{7XiYAG8LZDv_zobIhLgC?Lm{P=nfjyfb=o;=@|D)?-y-OU|=5MQT|h4y}hc
z6bh%in-do|(OW_2c>i^*qoKfMAv`=hH=>}xKI&<FX-nnnrC0*-NqNmf|E*zfu6TNw
z!?}w9OI^m*OqmBR&Prf&+}OH`Y&P57YR5o=MXfqxw^_{E3*@kvV`EkK&=d60`h(QU
ziGtm+q}_$}U9uvTOsie!XY@Pm?F=ApW<pt9WZcI7@9_VYJMVl`F985--TJiIrKoXw
zLA3LruS}N!bUa30CA61#R(WxMt?Y8^%B+yvN58KZUewsT*tn4{D3+_}Tbf}X^1qP3
z*iSqgk}^^N^T=NgYx-#rX*6+XawWgs?$BLp7xN>XTi_GMefcdn{)x+M3EIZkkl&>W
z+}@+UYHm9PvX;jn)BoFXpCC6I`x5++Z98xoB9S;IbW{@)ac9Nj&6^J~RG(PdMnt)+
z=%ZngTU%Z*R@n~9y88kev~gJoMlZf`S*U(cJZ;|KUYAdCdqi#8E1%>Ig6T`G$LG-z
zPZ)@DjZ#(q?mA~R4*?ZF#`|ua>%9f32~Y>gafc7yUo$+-FsiDZaChLamHi|(9B~zC
zH;IMt|E<La<hH-nA(%_qIeRYFJs;>2@%*PX;K9MstygLL>rm*8p2NpHJfnFCkKB=g
zAiRc>g*Ry94~dQVU5c{gyxF&urRuLBp=ghu-n1?n$;!zY9`e_KY_7A1libqmFKr~}
zd&bU@9gA_K)U018s?Iy3ao|$WHO+S9F^u+ZS^&Yd`l8e!Oa2=|D#2YX=Z`4p_5Hjs
z+F%hn^x1YYw_y#n(Rswy#)Ca|=YX0f7_Vtz3Hp#_LR!nadf48Q<2<E(Rrr4T1B9RY
zuN_HWYUX4W2(o{>G2%zTvmS~^R$iV#1Dt8#s}wR82k3O#nwV<jAGsUHBRa|kFM2i>
zuE+&ifu5~c^5O|<a~SAwj`0--2P6FL17ZA}e<UjMFB$}l*Avg4P}A(_hKDJ3!VY8L
zGVQiFKTgc>V(^m31F^Sa1*Er3W=~HKlgZRxRenpOQ3vto3k}09L>o;Q^S!ryec}Tf
zV&e!k80}<5?cI^O{mDM;n_}k21o%sLk%teP+;7e3Q9;SG$U2ST9m>J6)klwjv7y)T
zjT2NV)j`znGSmr|$~M4^Dl|PKfh;oO?vX&Uo+cMP+or9eVhh!~u%C#bpP&)#`t~`d
z+3uLiXSFX@2p_?7SOtYU{Z^<i>cO~x5Pi0ONSr963q)^Pm5Gc942(Hv6Vvn;5<$!3
zyEbi>sbw$x^}Oz?sYt=1i_3eji=vO-fbg2)5BcO*1v_g_`s~g~V3MJ}av6t|{ggUG
zRrD|%i5AP5=@TXaioz%m9EpK&t?!6HD+-b6rU;Zg90^CJLl7vC5pG%@4zc!!^#^K7
z#suSnAmcw#VwCew4K#E$`bt|M%1!<Onh8Ksz@7H>hcnR6H}t?m%e6wrF;(O8Ox~r6
z=>3_hju^O_rlNmi;!r*>T<s4H9D+e>sq}w|OrU||lQz?PytEZCeyXg(6c$6TSOB3y
zX$uA&^wG|ACmFa4!PQnrV1Z+o0XTE!Wu~CEio0B{RN9(Dw7}UlbCIRfpzkHHTzMmF
z#NG%}yIXKphmSvQ&`HkOwN4hX-OZ&;OYJnA-X#rfTWPL&gN&Y@`oYM)mp~4fO&n_b
z^ULL%D^in)Bl#WUg={)6RSGdfDd$Y(J>{I8x<+8^stgrPG>D$%#01VVv{i`lYW;K1
z?;ntQ3<5o4Y+&A9>wE(GNrthn+Cx<_(N!n=c_Q@9*D^?(bbAi|y?})L&E6}tm>*PE
zBLQg$<YtT-W#{|g!|@(F6mBsyo(4{Pb?}@UXzntf&9dC#{_Hs&XFz%NyW@^b9>KK3
z%k$3EFAGbze#Gb<TgX$>>z6O*3{r1v*=a?IQfD=SlAz=485&qfD>dEpMTtD+elvh&
zy=)E^hw1r&leGds7HEu1{Om5tu*JkU{SPd$;*5Z3zin_Q=1PVc7JNgQHW3*=CDUYz
zd5?7uk*^WDR}=E!1b+QDb~fBk?GtIlH2Xjj^SHn6m@2gQ^niGkXM$;_R<QC%N!F+&
zO5SiIPh-DVe5&o$qt|Z+9KRW$o9Aeww3dbE!6FWchi!U&RF6aCJJ5ee%NHA&|A!S9
z6(3hyhAD_!S^q699r8lgn50pU#0*H@c0_ud_6RQ~@w?vpvf1=P#w(>kCVYMl*XBu)
zek5q=@t1yvU{<ZJXnw?7Gj*@J@;<#{74m@c{u&$|jM~Alj{7Jn1^ud<HyXw1C6;_t
zs-NK&9Hmygc2Z<J{bcA)Gq|RxxvAy#45=w6Cr9@d<!9)@sFVj6ML!EN;H9$l4S0m8
zKKggNTNjQwkw}}j3@a}hEQe(~T{3QtpKM)m8+Ly!F1%fyYvzG_7NIXQ&EK**y-UpR
zy!YhOMra3S*W&SR4<lu)uayuu(P~SUQoxMj`oq&DB<IUi4eg@gGQrTABIytlZXAHt
zl(e>`=tMQRPN_eFDkh1PfI|2_*tCdlwSDwFb@Hf~$83T0=55}Ulq{81g|>EmsIu@u
z<D%N4W~2?t(=J*^Pk*m)Pth^soYy(DyG+c5Kh6ZsPUGEWL@{$;fWKN$AjR#1)?Q)k
z%F{5>wN8`Y8zp@@&Qpy5FO60!@}+2Tyun-QtF%>`dhKgNf@hDWrRZ=U2d}<nQ~3Dr
zDJ|nm3#;U$$rLP6+c3u7$8nu}(;7^rsj)d|d_Uy%32@21pF>H>`^{&DlDv64I&u>(
z8uW=uGK=c7Psu$Hv@8;>zTt+7$`u~2m9z0|)7cfv+3PCBtFeuy&wye3rS%AWA~lN4
q$a=%VWn+k|UtiDv&>%>!2^rk(<mU}sN#*`~0P8d7PS=>D6aNK_^-%!;

literal 0
HcmV?d00001

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/40px.png b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/40px.png
new file mode 100755
index 0000000000000000000000000000000000000000..1959347aea041d75a58d0584ea7ec51714797983
GIT binary patch
literal 1880
zcmZ`)do<fw9*<}e@1Q2_D)Bn4dY2-m9$9UbNQ(-Cs6<n0F-g-_Oim3EEY)_HF~y9G
z)y~u--ik^|h*GAbm`0I$#INeHCDEW2(qOY^dv<o(v-h9R_k8a?-}||r`~BRT8x-KH
ztzoDE0)ezKekX&KC<TF305w%*RBNr9uLN|^=@1_!9{pqp1cKe&-A~dV5)z5zKaq!r
zM+znSqO!!^q~HJ?NM{Fn4!mumqEL%4HZ#zOf(9+)csn2vv=wvGJA^(VnO-iKI;5L@
zo@7~cB}so{r@<xXw__KUvw#yxBM!T#@N9a5Gq@!COngBBt`WTdNHjlPMHQ;G{|LbD
z9?;k1&T&tIcO`|n&HEbsf10NI%!>PK^x}L8xo#<I*1cfr5N*+#3%-n?=ZD5ER&yn@
zwNfN|XejhrPUg(=W!co>OE#OkB~$LGr;}=FbpxeWUvbGmLn1DXa;HsQK~D7_{^sq2
z^fni3chvJ5$YKUAlPB<%YYsGqZ3*PyX7OjPSmNI*c<p)p5sq_(G&>$WG!up*Jd*}3
zyaNUJH)Q(CkAGRYx9(QF6|av~uGv)1Y;;XvzcpOJ6RwjX&Aq_Aw}!?@ks55jzGfWq
zHi2b^qzQ-8bl-&6a#)X#NWKfdin__%Ol?}CAS&@2z3m-#8{JmeH=J<Bz4_RtZNZYA
z&bMp24(x-3iC}JT3!R;_T7Z334!3bX^+BrtYW8u!VcTMDrRIddSYxi=`1u&}0u9#a
z+H_cEkcfL&tV3vWv*DG*_^n5umB)34LNi>{JF%S+MQ5YWYP20_w8qRF6(+-b#Trf>
zo_2Ahj>H8mS@~xq^k9LXSkqS5UA65dkI8zx!mlGSfKyE;s4Src2P4*>GKW637{uPZ
zn41TS!b0I%aCMOGtR7_5i0R^u?Z1kp6{@2~AH^7slz&0Qj|5)78I0s6dlVU{)cQrP
zeNGP#HlU^~-R%ecwQ5d4f89gT`1oM|(<dLMHs@Rg472*KGDNM&w5q4*gg@0=azER~
zY|)bY)zS+x(Mpf=G?Fl!=N^yYmx~0~lBeBIgY0ERqs{A-_(8y3RB$bM#v}k@Z?3k2
zGE}sLnIqCeMFrz5vUHkQN~6AZSgAm@?F=54O4_PVP-!W11`7GzpGT8mY1<(qSSd7Z
zJABmU3N-ED*gNoaMq&z&VDfs2&^c24#dcL+T=R3?=T}~=x)~Y_PqcoiG5b)AHGz08
z7<)MHu`A6h+F*<yg~MwyTPXcKDQ_fdDj@z!_u3uS`>Ofc=m=oyYg2-k3n{hQ$7?G#
z&FPF6FFv(B1kEI;9zR$1bF}BYcUcz6lkHP>F~*Z@^?L7<Tb32ZW6uQJbJ1wXAD;TZ
zGP>Dwi265tsN>ESDZo%}%mSZ>gVZrQEHe#NWr4C*NSf*0NrTPY+o|6J6YC;=zHNu2
z8bz_U4ETk(5(4ZKzU=r-bX5C~YoQu69_!<yls;DOxd_V9oc+7@NS}Id4l5xS^&^7P
z?kvipb8qL+F?OqhqF_#MOVU{DPY7`(=-=M|h^M$N<4>Kg_;tIz@|bcZeUDp?>LM|N
ziJp5yVxnWe6Y7OqZ0sqz9>rV_e8%6p;7r{y(w<VdZ;a@46%#Yxw$v&Pysw19(cI$v
zE=N3AY@}G1HO$M<m9WIF%M1YijE@FGwcMPQ4#f|r<616#LPkqyx`}g^#!Py&+x&^u
zN4z~V#{2Epv;xvEFvIxC{F-lA%EHQLO$sO~Y9n3YLt7@R_{%Tm&wmdv*5NahafvB;
zb-4%8y&HS3vo5qa%E(o%{<M=PXKAu$gI^fm3JW9auvEwGpU-q9qzDZ;PBb}CUE0&f
zFMKi!3zHZ>fYhJK>k?%R9^#}q@<oO3ziQq?iBJS_Lvzijlcan>xkWO6(y$(5^<ZpO
z$bMOpMM{hs;3*T9NDsPD;o)NE_e9WO1`KLq#xl-1&<?1GLXMAR+*>YBRpql1{)zuK
zbrtwwtit>e;@%w>h7p&2<37Z3Q~Of2IoVshosA0BYcm}a31kTD@b5Y^cq1>Lz~v#*
z=I3$&3b7mLgtwj%M~`+Qvt=#z{qJiwXm0kiXWM^#JaGk!bF6zb=stF+fn62*;^IMV
z;8jniInrmfUG6KNlUC^lV!pmFFQ+Bb!%x?kA|oelOOeQZy&ZYzuw;)RIQ$l#&^K8*
z0OFJoe{kr3Me>S$Wc!cxtzZ7K-m>EtO!YQ<*Jwhovtf3=v?o4fP-T|cmxOL~h!|$H
iV&_@$q2+YC87j9T{b5}<wiwF)4TSLtI9Y!@I^$o<n_Kw+

literal 0
HcmV?d00001

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/d.gif b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/d.gif
deleted file mode 100644
index 0e958d38716d93d4050a993398dec77490f836c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2944
zcmV-`3xD)SNk%w1VQc_M0QUd@|Ns9T9UI-*+}hOI)X&uI>Fueesi&l;_4D=X>Ff9N
z_^73+<>2S=?eg2$-Rb7+rKF~$qowBL>HGTqot@-$b)vAa-N3-zetw2ZN=<`<hN7aR
z?d|T)&*pM<glcVge}$GkLQY_1aRN55M@&~uQe9P9Vxgt3C@(!<XLnp+XqTFxT4Quu
zWOZ6$Zj_jxSYK=4;^pn`@9gdE-{9c)`S|PY?5)AF>h9~Dx1iA9(#Y7#W29s5^zQNY
z@mHQyr@5v^Z9@@%1}KXkHjyloo07WIwi}EEn4Om$l>sxE8(FDGBAoytl>{Z40y?1`
zR;@iNqyQ<P04JRQOOr8dwN!SyUNNlzF{%JArvPfXON`2MHLn0VvIK&~W{uKrM7RuD
z!X;$2J)F;jtlF2(>cB$0153RSP`?#W!4_i2E@;Uzh|^(_*KC^Fd34k}d(%gV-cq&f
zk(TFNpXh9@?t9Psr`!C!#Q%zrxLR+6GTYq7|NF<fwvhe!*8ch2{`%zm^UVD9(fQ|>
z_U*{{@Xh$@y6D%T@Zqx0!<^a8r}*#F`t#hOjaS64bn@Dk-pPvG$dJ{=ne*nrpNdnv
zq-VjYY^#`N%eH^y&Y01@jOE+L-@1tC)3*2P+xYF?`S0TT^5@;6S>C8);HqZcsb=7-
zXy2-6;jC)mt!&?{YvHbK@!7of<<a-)*!k|@`ts=e^XmKb?Ae%C=*On?;m!H)<@@#T
z{P*(y{QC0R!}Hz9`tj-AnPT0WW!{}=-kxgTplslza_-Hs@YB2T*1+}R()Q%l_U734
z=-c<{-T3R^`RwBQ@#_8g_V54z<NyHb0Rh$m0?GmcrUC-I0|V<35w8smwiXunCML-%
zEAurq<4sNYZf^FCjr^;t|H;Y!-rl&kx1^(^mX($K{QUa*`u6tr^78WW@$v8P@9gaC
z>gww0>FMX^=jG+);^N}n-QC*S+SS$7&CSiJsi~)@r=_K(qobptp`o9jpPHJQSy@>o
zCMG2%CIA2bA^8LW00930EC2ui0BitA000R80RIUbNU)&6g9sBUT*$DY!-o(d28cLO
zBE^UpGiuz(vE#;y4?#K<*^s2ilPFU{ytlDm$cHRVE}ZCcBusl5`}tEj@E%T#I(Z7b
z$4+0we*9{dgjw`x(w7eJm19TlA=0NprBb!Z4=Ycp<=km#c-1SziD>`H99k~y*t7`C
zx`dl>?Ln<o8S3oESE)+8Wc~H^oAO>eqe3+rMx0onU4s#RHpUovaz>VxF=EdAIJ4)^
zphIiyEV{Jm)1XPCUd@`PqSvq`Y0`v=XXkzT@ae{vuea}f`v~sK7Xd<q<H#Y511>z@
z?&tU*Kww@_5uoeX0sZ;orxHUCCqR7v00APy#(eS8sbA0DT|R>N(w*z!qrUwfHPYdO
zpU#~B|K&{3Lk|e-R~;aXF!F~YlE_9ICYLO<f(jUPU_uEn)U^;k?Wn^J2kNAQ4g%-Y
zV9q%P3IstqMvzg)i!d6oLpl-gS3m*ne3*^`I*>sI4I3Dw$RCR^Vx4x|`Qb-|1gYTU
zlO~XW!380>ph5~7;o}ZF@3@mAh$5bYPKy5=V8a-A*m1|2cC<-`4F?bu0RlT1AwiA}
z>_CPba*Tn5L6Q*3h$Mgr;)fuM6jBJ21E~POqmP=yfd&_p0DuWt9@LqZ?!W`jJ2}q4
zK{^PGNzei~ctHmpb+lRspIhMn5a&P}=&*$wMm&(f4r9>KMjKWX0jM8^EE1?7f&`){
zA&d&-=m^k43jn2-n!tia5p)_44WD}XAv&fGw15p(#4*RYbFd1B7B(zEP!UzU0S6p1
zda=g6S{U(OL7E6cNFkd1k*u<WFk8^G(T)HB1{Rob>9v|Jlr0VNY};*)>VzxMxK_vu
zM;supVa5_OxI0i0P=Eo38DeMw1{YU6aRUN17KBM4lMsT5AAuNR$Rt2F`wzm=F5K|L
z*t!$XJo3mx1Ginypz%NBRuP68_o|Ub7gvyMvWh!Ukp&lIV-bZCH#9J{K$sYU$Rs=W
zjL6)GG;%Ni2`kL7!`34I)LFLj%)@lWP`5Mn0y8Yph00)XjYSqD8$i%K3fw>h6H-XQ
zgc3kJ(2jluIl{*wb34NG+=rxYcawN0Y&733BrOj;f;a6n4ev~CK;leHk$L7$Bmu<?
zk`EL?Is;gqL=r>fz`&=V6J&`YnPif>C4!`0eI~0n3hDPAP(Z?^nHu!BJM+*(d+im&
zqq__|B+-Nu^f!^j5j@E7^*_hcL%<DGAVLlt&@>uEZy=RGL?jlN3G7vGfsp9lKw3b-
z3bx<_6hHw5J)jtOsPBX8n@4(THWYLK;Rh&8;SYE)GYH7(9D);o5pJ+8Zn*<R1*ya%
zFfp4*R6-CCghT}Y4HAPQ7V!h&qd)~rKn@Q0ZA0v+!8xWlMHBf4hXcunJJi8}8F=xF
zGDwGe2!bAWn6Vx0Frymdu`dJ;0uzqF1STpG2qD^$5)0vn5<O4>3S{5}8rcUv>Osgt
z8uA{&8OU(%VSq+DvXRqCq(Fv)oO|3O0?(liK^noyPS(+mkiert#36zdAkhROc)=4}
za}r9p@|CQNWoT3*%UaqpmYtbJFMh$xU-;se!1To|2qKD6kOCE^Fa;?{kxXTdLKMUt
z#VMv)ifWeP6sAzcGjCZCU+jVx;0&iYk>Lx1kRlYg2!$-x$xd{_f)oTP1uUFF&wAz}
z7omWKEKb4yn$G+p8MaUcGi<?&b>adSxwyqI2x5v*v<OBq+QB;satc^{;uD_u1Smpr
zi#_<L7Ny`OL4JV@Wf<ca$ymlf3yKR_EOa2Kcm<l&#3nbr0u>CEMJH(Cij3OAqkI|z
zG*{zKWFVs!CrySjmSGEZx|ATP_=Kuh<tkXcA{7+f#H|#O(N6U0S9utwNCg56WEf)?
zNIeEJQp${GG~=ZLNyRJ5g|2kfVO_6S1wm#JuX!nA7<stY8nlp!QS@^mWvzuScCia%
zBvl!<cq>%r>M@YTL1aq+g<c0T3o)pSWiEr+6A~c{Q;e0Y$k+ujim}+VB4Zhn9mpzP
zVKuD(twC#C%j{+aVv0_Pjci;nn-UUXi+vteA!XGCF;=_S#u_6Tu@%TFK%qFsISz7~
zC5S3+!3ip0PIF4=gC{%z3x1xqti>3{a*M%Qv>qe6|CsI)diOgi1P=<?9f&Dl!HVuK
zZwP&8MJ-xU-s2{uti%|Gde^&HW59R1@ta@$?#BaAU{$}NP%kI+K!iT%;={El@M(jA
zjA78?#0p-pE_eY9f}kQ6CsZK{Sy)<z-hvgZ&_yOVfz|=L0vF~*jX#xvi(4G@$o0ep
zT>mi&SA+r-uZXggH|h$*4rCO&aD|q~tK}~5!pdWv#V>?G<}#Z(7-AJjF;TIKHoLk1
z&8FDqK#JK+Rj9%g)10Q9g?!pR`?)l<{Ij43jgde{#2W@dG@()Q1%!0t8;TalH^T9a
zMLT9AZn%RS3?dC{aKjsl_Qp590gg%|WF70U^gxzikT1x=4P<BoL8vheXh6dn-2gSH
zNBs?LoEiwJwk2ucPzNgz<O_6QgR-Ge5Nb#R8qs*hHo8G=Q2YASK>+rm!|(=qX+a=b
zSi{xU@PvanI~vi>2DQ6!ZER;d*tlHC6VPx5Go%3uVmJeEn~;!d*!mgIP&YRgvW_4a
zT-$?g0&u(FI4m4NA+?5fy1PMegTGsrsyV{rvJi!iKfK@4c(%l)P4R>j{Nk2f7Qz(h
z=L8`rq#DzhM#w{M>u79a;Mhhu#vdYtCN#n2384lyU>@^pINR3N*akL!4R2NdV+ccF
qh|s4|4QdF4*3gi~HB8?0oePB;MxS-nolf>ymi_E#FNj?N0suQ%s<;XO

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/d.png b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/d.png
deleted file mode 100644
index cd503e1383e88b0e0c2ad6423dbfea20af659aaf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5437
zcmaJ_cQjmE-_}QsmS_<~k2W(5ql=p8ZLTsxjG0lwjKN^^AWB5^lISE#^b$l1B7zV#
zM0C-jL<!N$C-=SgzTY3;{mwdPxAi>F@7a6*)?Ry^$3_Ns=%_iUiHL~kwC`$|T-Gj^
z-(5<I%aYlO;m2jgj@Puno4VTLy%FwcB2|>D9hyfQgK$8bpb;n^w;r@25fLe`6U+i{
zp|2;8bj3&@eq$sE7~CbBh)7X|fI}di(Rdy^w1X2?iFd21m6yi}rNnD4tq;=2siPg8
z?)ti;O??euNMC299Ew*(nMaWze<^@L;}JXrj0@I7o}k40r>^{E`}Z)Am*-Ci-dTzF
zKc+17jd;{u-O)VK5>nzw5E#rOBO?KZNXy88#dst^U`Zh8@|6(>L*%7p<Rzgze?7dH
z(cDq?@+KNuf5p1&De*eu@i=)P(A(Qv!dpth)!hLImXnkFtsyBXeu)tG@WJ8{1aYhf
z-`@%vXb+^j6Atg>iskvOh_G|@#4GV$I{nWSFt~qYu^xXd)8&Ez2?!hzECKpGrN4pt
z`u{%^gZT&Tfj2?_*YE!+>;dz^p@Al74_8lj<mJZM^ZgEmlUH{~Bk->7FjrTXzgN-7
z(G~CN;pmFvQ8$(05jJ<iqFlW_ZvBbZ*O%AEdf*XQBwAZTiT6@L!pR9GFAdSu(1d~|
zRi&UBV6dj792BalCMTt-B_k=P36j?Mo2%i9^u(aC_`kWR|8k}NmHRstFu2Re8fbSX
zFEmQa-4(<0=al80{@n}cU-katqW;|r_+PoeOEbXV8~eXD`tPC3?D^gNCv7h~|0F&d
zdztO-muX#=nh`=o#8{=Rp$a2RY*^FaVN10$4$FOh2~>+WNQ7bSw;7VQX{AjxZh2X9
zn*&K|dB>NmSt=#o^p^Xz+_S1JTk`U$l5Ux@(CkD%HP_fCp2~~d)8ZLs;3vBt{OHl6
zxIWa31J}j$Nw!o6|8pUOdp>=!5mGC)4i^{ott|(w7gEBY4?NT12Bx&qVO>u}?fEQY
z;_NNb5KiHAkd7-{ijMCFmiZSQl2cQyj<fWVGhooqqVuYn0gr-HcJ<TPPIF))xuvCI
zo1_u++!WaZtiODV7vERE_gH}^a73f<$1;oliGh#j0fDV50%ma{a`EtLTe{@80uvQB
z;Ak;rf4^^!g^n|IU;YXZ9Nx!tMYqq?Yn)t5MVQ+etA`;%U%5Ws7v;50m%&hH`u*$?
zI?2?1Z5p4Ytz{r~pBs}MZ4iIVVrY{WpbM*Tz1k6ipK11ynpHVJT*w`;uaUcTz$_uu
zEWjs}BA_)XRBZbCZD(St<1EwYdKA0XYQUgxV`HNl^ij~28P*cbMCR4Et|fF~Z}a(e
z`9;?@HaKBmu|K{}+pbSSqY&+5Lqp*2!^bdUnepQkNXOmy4<9}x(dvmTzT_zVZJIqr
z;`~ZNig3s9L%OPhyY%gI2#X1U0`?SaXgI>E9*Y)9jso7~m#4xvO;_4~O0x-0SagJN
z7>Q^wklkF{B{@gTk#gJH3@yG?<9_h;LTM}Y@bket;3I7xs`@`dO0S)<o?aOa8eUVc
zpLd&*ZlW_hRS><^z?EhN&&{tT|LIPnS~jNksc@@(b6UZ)PKHHi-6^iOxA&%ykWen*
z#udQE*P6mvpE5HV?<qIHpl#Es1epPQ18ngi*dQO!vlQ+<8&E&{3%1HvzoifV)z7I7
z3QlukprSwQxhHYTK4AzO0DpQzLtEhTE{c?0xsh(;IlUVcI&)x{fxEVGK>+Hp1xYLZ
z95kG-PY=4H<VBBKj=BEK=b2hA(Tkz(6%MXgfVkCr4-yr_l!B{CJi_s;I^=<74}~e%
zKG)w0d)Q5y?N74IMKfM1qx=lpL)W(gAeYoCGYhpTjEL6boAR1uGNL?F)z`{a2dIR~
zc`R#u7P93e{s5Zwn-jb%D?;M<^N*bMX8;`qgK#N!71oNr*FW3u@S04m|5B~b2b6Op
z(i=oDr&%@GZXA}}Zs$MTF_fuJy*Rv%xGi!6BKz7nUJ4>BYoSceb+R-5q@1=rs&4Z|
z+lfF0Kuk%=c2h<@wv)sxosJ)GZi7mWj2>~6wgs`ZukZf!>mkb1hb^p{HsmK5+Q)Lr
zk%WbX#S_0!Eu3%L`X<IZaHpf(r0x4K?;F?`>giuwAIlTM`~~MD&g90;XG(&6t7g6L
zCIC*HB4%5S9v}0b7w8er@>k}w&?UDk`t_7L)G}$TB3~TdbjLLpwK4(X=Bt>*e^tkB
zv8Lm;*<->-A1v8=rZ?pRESK@}ZLwxWZ7aXzZ+LyY&c=GP8ZDG(h(-%QpwNygWY-&-
zd}l^90Ue-(z4DCb#Z4c!*!&metrSW5u_Ws1aotZBxV3KsAA<K?gNlS>`Ay}TTCX3B
zPPHG9JrnM-8UDKU<bJ<S8lt_O9*!qe3iS$pVQ9W%MCB&Q9^9mQ9iCC!MZxmqId|ec
zV^}aM&M1pW<W%o~nt|$Y{MgpyU3=bv5Q~@vk(7Pk+zMZ#C`yF6F`lB|=v{6cGp+o#
zcSBrQ1+MAl$<9KSH+UTz=ij66*L}idyZCkqLSaFTe8!t_Jx_e9I&_5+QoX5>(k`G)
zlDbGz*h}oybi;R06W*-^_iKxpYuHvqdxkJr-8n8N1zg!1E-Wsl7XQf!a6Ugh0tFo7
z-|Y4)y!g0H7<#940U%jZ&!NIP5GhVHZ3KI8vDy^2ByP3;pbpN|<J(&QwXYLl3fGPP
z&eW6F0}nORw<V8tGJLE)i*MrIRwkK_{dhuJMNP~<cgU0DPd&WzP>9rL?N#Bn4KPE_
zgTk!Tf_SnHv(R_^?FrC!bE*M^nSi`G1E@q|6c-bW0AZ7ik;Z!Vl`iM15@gMk-O&zn
z-aj-d6aDUl-t6=xPWcAUV|$DU07!mk0(OyorX1NXl3?^J%W*N${>qPKyDlvCGS{f&
zkEv@S;29%DnkjC}exYYh!+Sa9<uP4_wa#DEjExy%Eo&SG!iR@VEUHo3_W~G1QOOEz
zFO|y`9$Dao?%7Ap#q(%4A9^e@@iiO}BcGYe#Pi&3f5=S+u|G{{H7hd-H7jfPd45Go
z?Qv{4D>Gdb!Z(y_k6`oUv0AB_v2nY(mv-#L1UxWitm^x8+bh$;ci%dnG(aQ2C>|;<
zY!2S&z7p13BmUv^o)byzcp(F-(t<~OM@yS6gi7n>URL-3*85TaE7-R-NwMwD8Kbdl
z*qc)VB6jAl<L+}_ebLMIk>b{q7yS&|@|i3vw(PbLw!@aHkI$jA{vO>ADPKRAa&WI?
zk+|1AAe2WR0IbpsCK^nws*DO}5W{shC<CZT=H^SekZkMe!!)8}F44tqF~(0ex!FgC
zDMY!?9gLi6c%(XHahALSB(KR;oKY;1Kc_?q_X%U;&bVi+)>#RLzDKudh-o}>#Z<u8
zDx4s2R3`C?h~OYEb3h-fv@ZXR?z4C?$%2FgrYuLY75kk%DgtG*0abs|MsG50Osr!5
zHeeWdv)NwrCvNc;#R0}prQz*t!>88cYoN|QKqVWh_>&iN5xRjC`uf~zo%;E>t$>5V
zEChrNb(W}GzObABHnT7)gqJOAhl9@cWg}N+;o`S3E7zr685V(8`A2Dyl722q-@OzW
zg+9$68@aok9=dVWCk#bQd=Z~ks8h5im;c-qD-kES7OnY2oEFprxY6I4LAbH9tZ+O7
z4s<bY1x(7zUtSy@e6HdUc#TYuqrkpF@HN*vE1_Z}9xYuE%pb5{o+|S%VwJ!3sFvno
zWI=m+FG<8k_afu-7$&_<mqOd9CFPqnM<S{_QG2;{<!h(h-RahdmeEEp=hJjEl|3Y3
zH#0RJ&5<R{j{jt2dP37Jo<?b}Yxt2Z#fDzDA|ijXzM3lq>lB_pd0TQLD`+}M6IOEG
z`Kg6u$u?1H3SI%(gwn?tJ_tJ)n$3<T{K%(+3f6vWUTb*4xTT$}e0f9AHkWs-PJjOV
zIoq(^Mv`^m2(ibjw&lHt(@UiFiwmNyI{8E#$t1LJ@uG#Ram=GDp#yJ2((SL(IW6DY
ziK;QQxj-1Rx|56sTO@nIHS3z1ZL72gG0AOqscpesHus4@FU-iFQ(Oa{6oq}SZPVC$
zReH`TFJCrDC<y58suV32@I53VH&0qp`;IO;4v3<B)z%i%w^rAf+p!U%%L3h#Rc!84
zA3f1)p`PLrZ-oLy>q;$-Pj`Os4PvS~s!TDsjztn9$=Pl@Hg2Bc%&_9GVy8%p8xrSH
zHJ^T{+xy5`ur_AcY85mn1#Vu+WPcEt&7rcAZr9Z5cnoXtNDBSKulm}@f|#&xr?f?`
z>+JiqrhCAhK@!21Q{FANHvTEy*9@y@f3VTd_w}eK%SDPZN;tGp%MNapN_t=r=;BFe
zpWpvrE$S{SFkaP~o2qOTZ<*RhT#3yvq1E)U#0|W2zGFkXK>C!F_wtmpD`ov?nUmcm
zMo%nu)c$ymp%=6?r?)`Cuo6JkSopJS;0^DM)Y3}-Raye(fYr86Hm96%dd?G>1A@||
z1bQ<)pXiQ8yf1ioK(!l2e1{dM@4g3pPb9W2!tuuf`P<KG<%Wff4YZjQvEY~?K@q$4
z`qq8L`|HIDqty9duC|R_)Y2zj6X#S3ATBVJ2su?`o|3tM_Y*>?wS+q;LAHYjwaYfz
zX$;4r4@QcTa=t{x<+36mAH;%t_iqw(*uuK-GdWL{q~CasSyVRm@9Lbnp<tECHdd5J
za)K6+6AlR}#(;3~4&nX1PY{CFm}p6%^H3r=TvHIFr{yU;vkFcwWQD`Jn`vLF*J+2k
z7<b)Rj(W~KALMM%k+emWaac@uKpvNh2}%DbNYSQqI~&mta%IbY6bT%oq7+6B^~Nny
zNQ*EclhRalOY?l##T|!Fd^z>VFt7rS*KYUNS4{&u$PN#?XXoYpl>zN}$ofS?i)=(M
z2tJ?b?y2=ow10@BOxC$pc~FGy>N7{?ldlv#49Pa%tK{-NQhg~z-MhtE>>TDZ5|uFK
zFfO?fe^F}KlUi6@z^a|i>YW)nKRztl-|;&CO9usG2U7#^QzfKBqW*&6(a=yihKUSw
z&p8k3o;a>W(sB3_&r?S)sAu8rHByjrKtpY|*WzW{_bfRzD`5Zqd1>h+vWHSi#5a9Z
z*fq^DT*fGXUC(NmK02_JFt)We#@)124=s=J8n}{){SiiYovozY-Wu4<(~_N9uSoa-
z3=8YMF<Gx$`s%UVjBjrvl)|w+j|$uH#yWHoH5G-PyV^ljd3jl>Od>4^f*c%|6$S<F
z=&mT&)nI6vj$du<AqTR-B^Bl(mR4pg>u;A>mIF5B#?DT6hXFo5z58?av(=h*3f_`+
zNB~k=y6<Q?z3%MjsJ@FRIwhkJ@8u;qvAxSXC8$M$;RltPN7O*|EcV*^^S2z$mkhr<
zw|rfH;-GTYea5}yu)N6GfTQG;5GrkTSS=~&iefn^9$uK!*`r~rVbAb82>JD;l>%v<
zxz=<YioIVMc;?mer6i=rfmp&i?+ZcIS(2UB(sCCmPTQT+{+7@0dv@RC6K*GQfou_*
z4uKK<<Jr^EGgRM{C;g{liFC-<q*QdHnMHh4WQ$k4`MswXFvTCUT<7!s(X`zPUo8QF
z_j$U%WVpDjflnshC6E!b@4JvTg0A{QkHCfwLgOXHx9{6r`PS^yCdR_xh@l8O5}<mJ
z?X&zts?eatf<*!Rt+kur<b6#gIHx5$F>yEGNWSIz?IorQBMPxsIuQ>%+e;O;K24MQ
z*6fTF#NKSe;d?shlYTI#EKS*clw7W`1fO*XUO4y!DL4b-*>9H(wmlBt1k#`7`^ovW
zED)aQ+C^GQh3wY=cW^pHkl-k-{!oBw=-gu(mWL+#nh5%mfM28a>Fev<t*kk6Lp_?@
zgV<bmzOP};-0Za)6)#~~7}r$AHLvYF1%(+W;>18$&slFF=U`Ft2h-u;=6+o>Y{yl2
zBmDDy=}}aLMrDj9<tb!;WrpFAr-P>3uyA$-WKW?qoWizSWGPP**H~V@xqf`?*~{jv
z?<L4aF=0c75g|Kwy}B9S2HL#%TDKc?=3lY)7TMJV2TnA$*&nF(b{aS`p3CnfttXzw
zNQfS~$$mFiWle+Jm$~t=CB0<~e%-WMrxtX-qy?^4sVGS<OP7|`cD7n*1j0@|Dh&w<
zTYZId2a8>;WPBaq@PL{Ndj{XwCJVemYySk`Viq(9I3SdlX?r&2%Us;qc$(5^p;k}x
z?x&h+(eR{;mN%P)jn9^>4-;(!y+hx<#@7$bjfZ}s6zU(Ws#iKL+r?SuX|mApg(Geb
z+Bkom_UHFT>n4sHT&x9;#9R;eU=74#h9R#<mu7lxRQw<*ZP28TXv>i8YJ-H&{h%C9
zw))a%MP#8*f4rv}<W?%qvNYb2G$`L{BB>N!J%oEjWHEMC_U6=XHV`CTJ^gBmr?;*R
z(M1iqnT?E(#+?xPot;*_NoGzi*68kM5eOsUXBR8cB9(<sdL~s(vy#42xu7Z|o#ul`
zKc+TrmI%Ka1XBJ*T;lcy6=~jA2|9RFasu0=uEqGL4lAB-r4($OjPEZGFc+OsiPSe$
zk30zIl=p=kChL4xoqPN9s5ro21%6tcJw^%}5l)ozJUYX@$(_HpezaQ^xNvu49>^Kq
z(2gKC(<%N1Im89cE9z}!xG_g753~>)ZHzhwIt{J{E<(~T01no%XQW8~r5$lqwg~)@
zHMq@sI;8T`r}0)XQbz>i)p(jl4xeus<iV^^m+I>qfU&z4K5U<RMI~*i8zyq8kr_fv
zHQ|!B9d?~^Uj-85+bUJ9BXoUN5oGTxFIa7fc2jF3$LbPq{r;h;t!bc9u4WtZKmM=j
ATmS$7

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/style.css b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/style.css
old mode 100644
new mode 100755
index edcaf9a7433..85bd0d8d316
--- a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/style.css
+++ b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/style.css
@@ -1,77 +1,1061 @@
-/*
- * jsTree default theme 1.0
- * Supported features: dots/no-dots, icons/no-icons, focused, loading
- * Supported plugins: ui (hovered, clicked), checkbox, contextmenu, search
- */
-
-.jstree-default li, 
-.jstree-default ins { background-image:url("d.png"); background-repeat:no-repeat; background-color:transparent; }
-.jstree-default li { background-position:-90px 0; background-repeat:repeat-y; }
-.jstree-default li.jstree-last { background:transparent; }
-.jstree-default .jstree-open > ins { background-position:-72px 0; }
-.jstree-default .jstree-closed > ins { background-position:-54px 0; }
-.jstree-default .jstree-leaf > ins { background-position:-36px 0; }
-
-.jstree-default .jstree-hovered { background:#e7f4f9; border:1px solid #d8f0fa; padding:0 2px 0 1px; }
-.jstree-default .jstree-clicked { background:#beebff; border:1px solid #99defd; padding:0 2px 0 1px; }
-.jstree-default a .jstree-icon {
-    background-position: -56px -19px;
-    width: 18px;
-}
-.jstree-default a.jstree-loading .jstree-icon { background:url("throbber.gif") center center no-repeat !important; }
-
-.jstree-default.jstree-focused { }
-
-.jstree-default .jstree-no-dots li, 
-.jstree-default .jstree-no-dots .jstree-leaf > ins { background:transparent; }
-.jstree-default .jstree-no-dots .jstree-open > ins { background-position:-18px 0; }
-.jstree-default .jstree-no-dots .jstree-closed > ins { background-position:0 0; }
-
-.jstree-default .jstree-no-icons a .jstree-icon { display:none; }
-
-.jstree-default .jstree-search { font-style:italic; }
-
-.jstree-default .jstree-no-icons .jstree-checkbox { display:inline-block; }
-.jstree-default .jstree-no-checkboxes .jstree-checkbox { display:none !important; }
-.jstree-default .jstree-checked > a > .jstree-checkbox { background-position:-38px -19px; }
-.jstree-default .jstree-unchecked > a > .jstree-checkbox { background-position:-2px -19px; }
-.jstree-default .jstree-undetermined > a > .jstree-checkbox { background-position:-20px -19px; }
-.jstree-default .jstree-checked > a > .jstree-checkbox:hover { background-position:-38px -37px; }
-.jstree-default .jstree-unchecked > a > .jstree-checkbox:hover { background-position:-2px -37px; }
-.jstree-default .jstree-undetermined > a > .jstree-checkbox:hover { background-position:-20px -37px; }
-
-#vakata-dragged.jstree-default ins { background:transparent !important; }
-#vakata-dragged.jstree-default .jstree-ok { background:url("d.png") -2px -53px no-repeat !important; }
-#vakata-dragged.jstree-default .jstree-invalid { background:url("d.png") -18px -53px no-repeat !important; }
-#jstree-marker.jstree-default { background:url("d.png") -41px -57px no-repeat !important; text-indent:-100px; }
-
-.jstree-default a.jstree-search { color:aqua; }
-.jstree-default .jstree-locked a { color:silver; cursor:default; }
-
-#vakata-contextmenu.jstree-default-context, 
-#vakata-contextmenu.jstree-default-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; }
-#vakata-contextmenu.jstree-default-context li { }
-#vakata-contextmenu.jstree-default-context a { color:black; }
-#vakata-contextmenu.jstree-default-context a:hover, 
-#vakata-contextmenu.jstree-default-context .vakata-hover > a { padding:0 5px; background:#e8eff7; border:1px solid #aecff7; color:black; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; }
-#vakata-contextmenu.jstree-default-context li.jstree-contextmenu-disabled a, 
-#vakata-contextmenu.jstree-default-context li.jstree-contextmenu-disabled a:hover { color:silver; background:transparent; border:0; padding:1px 4px; }
-#vakata-contextmenu.jstree-default-context li.vakata-separator { background:white; border-top:1px solid #e0e0e0; margin:0; }
-#vakata-contextmenu.jstree-default-context li ul { margin-left:-4px; }
-
-/* IE6 BEGIN */
-.jstree-default li, 
-.jstree-default ins,
-#vakata-dragged.jstree-default .jstree-invalid, 
-#vakata-dragged.jstree-default .jstree-ok, 
-#jstree-marker.jstree-default { _background-image:url("d.gif"); }
-.jstree-default .jstree-open ins { _background-position:-72px 0; }
-.jstree-default .jstree-closed ins { _background-position:-54px 0; }
-.jstree-default .jstree-leaf ins { _background-position:-36px 0; }
-.jstree-default a ins.jstree-icon { _background-position:-56px -19px; }
-#vakata-contextmenu.jstree-default-context ins { _display:none; }
-#vakata-contextmenu.jstree-default-context li { _zoom:1; }
-.jstree-default .jstree-undetermined a .jstree-checkbox { _background-position:-20px -19px; }
-.jstree-default .jstree-checked a .jstree-checkbox { _background-position:-38px -19px; }
-.jstree-default .jstree-unchecked a .jstree-checkbox { _background-position:-2px -19px; }
-/* IE6 END */
\ No newline at end of file
+/* jsTree default theme */
+.jstree-node,
+.jstree-children,
+.jstree-container-ul {
+  display: block;
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
+  list-style-image: none;
+}
+.jstree-node {
+  white-space: nowrap;
+}
+.jstree-anchor {
+  display: inline-block;
+  color: black;
+  white-space: nowrap;
+  padding: 0 4px 0 1px;
+  margin: 0;
+  vertical-align: top;
+}
+.jstree-anchor:focus {
+  outline: 0;
+}
+.jstree-anchor,
+.jstree-anchor:link,
+.jstree-anchor:visited,
+.jstree-anchor:hover,
+.jstree-anchor:active {
+  text-decoration: none;
+  color: inherit;
+}
+.jstree-icon {
+  display: inline-block;
+  text-decoration: none;
+  margin: 0;
+  padding: 0;
+  vertical-align: top;
+  text-align: center;
+}
+.jstree-icon:empty {
+  display: inline-block;
+  text-decoration: none;
+  margin: 0;
+  padding: 0;
+  vertical-align: top;
+  text-align: center;
+}
+.jstree-ocl {
+  cursor: pointer;
+}
+.jstree-leaf > .jstree-ocl {
+  cursor: default;
+}
+.jstree .jstree-open > .jstree-children {
+  display: block;
+}
+.jstree .jstree-closed > .jstree-children,
+.jstree .jstree-leaf > .jstree-children {
+  display: none;
+}
+.jstree-anchor > .jstree-themeicon {
+  margin-right: 2px;
+}
+.jstree-no-icons .jstree-themeicon,
+.jstree-anchor > .jstree-themeicon-hidden {
+  display: none;
+}
+.jstree-hidden {
+  display: none;
+}
+.jstree-rtl .jstree-anchor {
+  padding: 0 1px 0 4px;
+}
+.jstree-rtl .jstree-anchor > .jstree-themeicon {
+  margin-left: 2px;
+  margin-right: 0;
+}
+.jstree-rtl .jstree-node {
+  margin-left: 0;
+}
+.jstree-rtl .jstree-container-ul > .jstree-node {
+  margin-right: 0;
+}
+.jstree-wholerow-ul {
+  position: relative;
+  display: inline-block;
+  min-width: 100%;
+}
+.jstree-wholerow-ul .jstree-leaf > .jstree-ocl {
+  cursor: pointer;
+}
+.jstree-wholerow-ul .jstree-anchor,
+.jstree-wholerow-ul .jstree-icon {
+  position: relative;
+}
+.jstree-wholerow-ul .jstree-wholerow {
+  width: 100%;
+  cursor: pointer;
+  position: absolute;
+  left: 0;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+.vakata-context {
+  display: none;
+}
+.vakata-context,
+.vakata-context ul {
+  margin: 0;
+  padding: 2px;
+  position: absolute;
+  background: #f5f5f5;
+  border: 1px solid #979797;
+  box-shadow: 2px 2px 2px #999999;
+}
+.vakata-context ul {
+  list-style: none;
+  left: 100%;
+  margin-top: -2.7em;
+  margin-left: -4px;
+}
+.vakata-context .vakata-context-right ul {
+  left: auto;
+  right: 100%;
+  margin-left: auto;
+  margin-right: -4px;
+}
+.vakata-context li {
+  list-style: none;
+  display: inline;
+}
+.vakata-context li > a {
+  display: block;
+  padding: 0 2em 0 2em;
+  text-decoration: none;
+  width: auto;
+  color: black;
+  white-space: nowrap;
+  line-height: 2.4em;
+  text-shadow: 1px 1px 0 white;
+  border-radius: 1px;
+}
+.vakata-context li > a:hover {
+  position: relative;
+  background-color: #e8eff7;
+  box-shadow: 0 0 2px #0a6aa1;
+}
+.vakata-context li > a.vakata-context-parent {
+  background-image: url("data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAIORI4JlrqN1oMSnmmZDQUAOw==");
+  background-position: right center;
+  background-repeat: no-repeat;
+}
+.vakata-context li > a:focus {
+  outline: 0;
+}
+.vakata-context .vakata-context-hover > a {
+  position: relative;
+  background-color: #e8eff7;
+  box-shadow: 0 0 2px #0a6aa1;
+}
+.vakata-context .vakata-context-separator > a,
+.vakata-context .vakata-context-separator > a:hover {
+  background: white;
+  border: 0;
+  border-top: 1px solid #e2e3e3;
+  height: 1px;
+  min-height: 1px;
+  max-height: 1px;
+  padding: 0;
+  margin: 0 0 0 2.4em;
+  border-left: 1px solid #e0e0e0;
+  text-shadow: 0 0 0 transparent;
+  box-shadow: 0 0 0 transparent;
+  border-radius: 0;
+}
+.vakata-context .vakata-contextmenu-disabled a,
+.vakata-context .vakata-contextmenu-disabled a:hover {
+  color: silver;
+  background-color: transparent;
+  border: 0;
+  box-shadow: 0 0 0;
+}
+.vakata-context li > a > i {
+  text-decoration: none;
+  display: inline-block;
+  width: 2.4em;
+  height: 2.4em;
+  background: transparent;
+  margin: 0 0 0 -2em;
+  vertical-align: top;
+  text-align: center;
+  line-height: 2.4em;
+}
+.vakata-context li > a > i:empty {
+  width: 2.4em;
+  line-height: 2.4em;
+}
+.vakata-context li > a .vakata-contextmenu-sep {
+  display: inline-block;
+  width: 1px;
+  height: 2.4em;
+  background: white;
+  margin: 0 0.5em 0 0;
+  border-left: 1px solid #e2e3e3;
+}
+.vakata-context .vakata-contextmenu-shortcut {
+  font-size: 0.8em;
+  color: silver;
+  opacity: 0.5;
+  display: none;
+}
+.vakata-context-rtl ul {
+  left: auto;
+  right: 100%;
+  margin-left: auto;
+  margin-right: -4px;
+}
+.vakata-context-rtl li > a.vakata-context-parent {
+  background-image: url("data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAINjI+AC7rWHIsPtmoxLAA7");
+  background-position: left center;
+  background-repeat: no-repeat;
+}
+.vakata-context-rtl .vakata-context-separator > a {
+  margin: 0 2.4em 0 0;
+  border-left: 0;
+  border-right: 1px solid #e2e3e3;
+}
+.vakata-context-rtl .vakata-context-left ul {
+  right: auto;
+  left: 100%;
+  margin-left: -4px;
+  margin-right: auto;
+}
+.vakata-context-rtl li > a > i {
+  margin: 0 -2em 0 0;
+}
+.vakata-context-rtl li > a .vakata-contextmenu-sep {
+  margin: 0 0 0 0.5em;
+  border-left-color: white;
+  background: #e2e3e3;
+}
+#jstree-marker {
+  position: absolute;
+  top: 0;
+  left: 0;
+  margin: -5px 0 0 0;
+  padding: 0;
+  border-right: 0;
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-left: 5px solid;
+  width: 0;
+  height: 0;
+  font-size: 0;
+  line-height: 0;
+}
+#jstree-dnd {
+  line-height: 16px;
+  margin: 0;
+  padding: 4px;
+}
+#jstree-dnd .jstree-icon,
+#jstree-dnd .jstree-copy {
+  display: inline-block;
+  text-decoration: none;
+  margin: 0 2px 0 0;
+  padding: 0;
+  width: 16px;
+  height: 16px;
+}
+#jstree-dnd .jstree-ok {
+  background: green;
+}
+#jstree-dnd .jstree-er {
+  background: red;
+}
+#jstree-dnd .jstree-copy {
+  margin: 0 2px 0 2px;
+}
+.jstree-default .jstree-node,
+.jstree-default .jstree-icon {
+  background-repeat: no-repeat;
+  background-color: transparent;
+}
+.jstree-default .jstree-anchor,
+.jstree-default .jstree-wholerow {
+  transition: background-color 0.15s, box-shadow 0.15s;
+}
+.jstree-default .jstree-hovered {
+  background: #e7f4f9;
+  border-radius: 2px;
+  box-shadow: inset 0 0 1px #cccccc;
+}
+.jstree-default .jstree-clicked {
+  background: #beebff;
+  border-radius: 2px;
+  box-shadow: inset 0 0 1px #999999;
+}
+.jstree-default .jstree-no-icons .jstree-anchor > .jstree-themeicon {
+  display: none;
+}
+.jstree-default .jstree-disabled {
+  background: transparent;
+  color: #666666;
+}
+.jstree-default .jstree-disabled.jstree-hovered {
+  background: transparent;
+  box-shadow: none;
+}
+.jstree-default .jstree-disabled.jstree-clicked {
+  background: #efefef;
+}
+.jstree-default .jstree-disabled > .jstree-icon {
+  opacity: 0.8;
+  filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");
+  /* Firefox 10+ */
+  filter: gray;
+  /* IE6-9 */
+  -webkit-filter: grayscale(100%);
+  /* Chrome 19+ & Safari 6+ */
+}
+.jstree-default .jstree-search {
+  font-style: italic;
+  color: #8b0000;
+  font-weight: bold;
+}
+.jstree-default .jstree-no-checkboxes .jstree-checkbox {
+  display: none !important;
+}
+.jstree-default.jstree-checkbox-no-clicked .jstree-clicked {
+  background: transparent;
+  box-shadow: none;
+}
+.jstree-default.jstree-checkbox-no-clicked .jstree-clicked.jstree-hovered {
+  background: #e7f4f9;
+}
+.jstree-default.jstree-checkbox-no-clicked > .jstree-wholerow-ul .jstree-wholerow-clicked {
+  background: transparent;
+}
+.jstree-default.jstree-checkbox-no-clicked > .jstree-wholerow-ul .jstree-wholerow-clicked.jstree-wholerow-hovered {
+  background: #e7f4f9;
+}
+.jstree-default > .jstree-striped {
+  min-width: 100%;
+  display: inline-block;
+  background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAMAAAB/qqA+AAAABlBMVEUAAAAAAAClZ7nPAAAAAnRSTlMNAMM9s3UAAAAXSURBVHjajcEBAQAAAIKg/H/aCQZ70AUBjAATb6YPDgAAAABJRU5ErkJggg==") left top repeat;
+}
+.jstree-default > .jstree-wholerow-ul .jstree-hovered,
+.jstree-default > .jstree-wholerow-ul .jstree-clicked {
+  background: transparent;
+  box-shadow: none;
+  border-radius: 0;
+}
+.jstree-default .jstree-wholerow {
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+}
+.jstree-default .jstree-wholerow-hovered {
+  background: #e7f4f9;
+}
+.jstree-default .jstree-wholerow-clicked {
+  background: #beebff;
+  background: -webkit-linear-gradient(top, #beebff 0%, #a8e4ff 100%);
+  background: linear-gradient(to bottom, #beebff 0%, #a8e4ff 100%);
+}
+.jstree-default .jstree-node {
+  min-height: 24px;
+  line-height: 24px;
+  margin-left: 24px;
+  min-width: 24px;
+}
+.jstree-default .jstree-anchor {
+  line-height: 24px;
+  height: 24px;
+}
+.jstree-default .jstree-icon {
+  width: 24px;
+  height: 24px;
+  line-height: 24px;
+}
+.jstree-default .jstree-icon:empty {
+  width: 24px;
+  height: 24px;
+  line-height: 24px;
+}
+.jstree-default.jstree-rtl .jstree-node {
+  margin-right: 24px;
+}
+.jstree-default .jstree-wholerow {
+  height: 24px;
+}
+.jstree-default .jstree-node,
+.jstree-default .jstree-icon {
+  background-image: url("32px.png");
+}
+.jstree-default .jstree-node {
+  background-position: -292px -4px;
+  background-repeat: repeat-y;
+}
+.jstree-default .jstree-last {
+  background: transparent;
+}
+.jstree-default .jstree-open > .jstree-ocl {
+  background-position: -132px -4px;
+}
+.jstree-default .jstree-closed > .jstree-ocl {
+  background-position: -100px -4px;
+}
+.jstree-default .jstree-leaf > .jstree-ocl {
+  background-position: -68px -4px;
+}
+.jstree-default .jstree-themeicon {
+  background-position: -260px -4px;
+}
+.jstree-default > .jstree-no-dots .jstree-node,
+.jstree-default > .jstree-no-dots .jstree-leaf > .jstree-ocl {
+  background: transparent;
+}
+.jstree-default > .jstree-no-dots .jstree-open > .jstree-ocl {
+  background-position: -36px -4px;
+}
+.jstree-default > .jstree-no-dots .jstree-closed > .jstree-ocl {
+  background-position: -4px -4px;
+}
+.jstree-default .jstree-disabled {
+  background: transparent;
+}
+.jstree-default .jstree-disabled.jstree-hovered {
+  background: transparent;
+}
+.jstree-default .jstree-disabled.jstree-clicked {
+  background: #efefef;
+}
+.jstree-default .jstree-checkbox {
+  background-position: -164px -4px;
+}
+.jstree-default .jstree-checkbox:hover {
+  background-position: -164px -36px;
+}
+.jstree-default.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox,
+.jstree-default .jstree-checked > .jstree-checkbox {
+  background-position: -228px -4px;
+}
+.jstree-default.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox:hover,
+.jstree-default .jstree-checked > .jstree-checkbox:hover {
+  background-position: -228px -36px;
+}
+.jstree-default .jstree-anchor > .jstree-undetermined {
+  background-position: -196px -4px;
+}
+.jstree-default .jstree-anchor > .jstree-undetermined:hover {
+  background-position: -196px -36px;
+}
+.jstree-default .jstree-checkbox-disabled {
+  opacity: 0.8;
+  filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");
+  /* Firefox 10+ */
+  filter: gray;
+  /* IE6-9 */
+  -webkit-filter: grayscale(100%);
+  /* Chrome 19+ & Safari 6+ */
+}
+.jstree-default > .jstree-striped {
+  background-size: auto 48px;
+}
+.jstree-default.jstree-rtl .jstree-node {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==");
+  background-position: 100% 1px;
+  background-repeat: repeat-y;
+}
+.jstree-default.jstree-rtl .jstree-last {
+  background: transparent;
+}
+.jstree-default.jstree-rtl .jstree-open > .jstree-ocl {
+  background-position: -132px -36px;
+}
+.jstree-default.jstree-rtl .jstree-closed > .jstree-ocl {
+  background-position: -100px -36px;
+}
+.jstree-default.jstree-rtl .jstree-leaf > .jstree-ocl {
+  background-position: -68px -36px;
+}
+.jstree-default.jstree-rtl > .jstree-no-dots .jstree-node,
+.jstree-default.jstree-rtl > .jstree-no-dots .jstree-leaf > .jstree-ocl {
+  background: transparent;
+}
+.jstree-default.jstree-rtl > .jstree-no-dots .jstree-open > .jstree-ocl {
+  background-position: -36px -36px;
+}
+.jstree-default.jstree-rtl > .jstree-no-dots .jstree-closed > .jstree-ocl {
+  background-position: -4px -36px;
+}
+.jstree-default .jstree-themeicon-custom {
+  background-color: transparent;
+  background-image: none;
+  background-position: 0 0;
+}
+.jstree-default > .jstree-container-ul .jstree-loading > .jstree-ocl {
+  background: url("throbber.gif") center center no-repeat;
+}
+.jstree-default .jstree-file {
+  background: url("32px.png") -100px -68px no-repeat;
+}
+.jstree-default .jstree-folder {
+  background: url("32px.png") -260px -4px no-repeat;
+}
+.jstree-default > .jstree-container-ul > .jstree-node {
+  margin-left: 0;
+  margin-right: 0;
+}
+#jstree-dnd.jstree-default {
+  line-height: 24px;
+  padding: 0 4px;
+}
+#jstree-dnd.jstree-default .jstree-ok,
+#jstree-dnd.jstree-default .jstree-er {
+  background-image: url("32px.png");
+  background-repeat: no-repeat;
+  background-color: transparent;
+}
+#jstree-dnd.jstree-default i {
+  background: transparent;
+  width: 24px;
+  height: 24px;
+  line-height: 24px;
+}
+#jstree-dnd.jstree-default .jstree-ok {
+  background-position: -4px -68px;
+}
+#jstree-dnd.jstree-default .jstree-er {
+  background-position: -36px -68px;
+}
+.jstree-default.jstree-rtl .jstree-node {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==");
+}
+.jstree-default.jstree-rtl .jstree-last {
+  background: transparent;
+}
+.jstree-default-small .jstree-node {
+  min-height: 18px;
+  line-height: 18px;
+  margin-left: 18px;
+  min-width: 18px;
+}
+.jstree-default-small .jstree-anchor {
+  line-height: 18px;
+  height: 18px;
+}
+.jstree-default-small .jstree-icon {
+  width: 18px;
+  height: 18px;
+  line-height: 18px;
+}
+.jstree-default-small .jstree-icon:empty {
+  width: 18px;
+  height: 18px;
+  line-height: 18px;
+}
+.jstree-default-small.jstree-rtl .jstree-node {
+  margin-right: 18px;
+}
+.jstree-default-small .jstree-wholerow {
+  height: 18px;
+}
+.jstree-default-small .jstree-node,
+.jstree-default-small .jstree-icon {
+  background-image: url("32px.png");
+}
+.jstree-default-small .jstree-node {
+  background-position: -295px -7px;
+  background-repeat: repeat-y;
+}
+.jstree-default-small .jstree-last {
+  background: transparent;
+}
+.jstree-default-small .jstree-open > .jstree-ocl {
+  background-position: -135px -7px;
+}
+.jstree-default-small .jstree-closed > .jstree-ocl {
+  background-position: -103px -7px;
+}
+.jstree-default-small .jstree-leaf > .jstree-ocl {
+  background-position: -71px -7px;
+}
+.jstree-default-small .jstree-themeicon {
+  background-position: -263px -7px;
+}
+.jstree-default-small > .jstree-no-dots .jstree-node,
+.jstree-default-small > .jstree-no-dots .jstree-leaf > .jstree-ocl {
+  background: transparent;
+}
+.jstree-default-small > .jstree-no-dots .jstree-open > .jstree-ocl {
+  background-position: -39px -7px;
+}
+.jstree-default-small > .jstree-no-dots .jstree-closed > .jstree-ocl {
+  background-position: -7px -7px;
+}
+.jstree-default-small .jstree-disabled {
+  background: transparent;
+}
+.jstree-default-small .jstree-disabled.jstree-hovered {
+  background: transparent;
+}
+.jstree-default-small .jstree-disabled.jstree-clicked {
+  background: #efefef;
+}
+.jstree-default-small .jstree-checkbox {
+  background-position: -167px -7px;
+}
+.jstree-default-small .jstree-checkbox:hover {
+  background-position: -167px -39px;
+}
+.jstree-default-small.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox,
+.jstree-default-small .jstree-checked > .jstree-checkbox {
+  background-position: -231px -7px;
+}
+.jstree-default-small.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox:hover,
+.jstree-default-small .jstree-checked > .jstree-checkbox:hover {
+  background-position: -231px -39px;
+}
+.jstree-default-small .jstree-anchor > .jstree-undetermined {
+  background-position: -199px -7px;
+}
+.jstree-default-small .jstree-anchor > .jstree-undetermined:hover {
+  background-position: -199px -39px;
+}
+.jstree-default-small .jstree-checkbox-disabled {
+  opacity: 0.8;
+  filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");
+  /* Firefox 10+ */
+  filter: gray;
+  /* IE6-9 */
+  -webkit-filter: grayscale(100%);
+  /* Chrome 19+ & Safari 6+ */
+}
+.jstree-default-small > .jstree-striped {
+  background-size: auto 36px;
+}
+.jstree-default-small.jstree-rtl .jstree-node {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==");
+  background-position: 100% 1px;
+  background-repeat: repeat-y;
+}
+.jstree-default-small.jstree-rtl .jstree-last {
+  background: transparent;
+}
+.jstree-default-small.jstree-rtl .jstree-open > .jstree-ocl {
+  background-position: -135px -39px;
+}
+.jstree-default-small.jstree-rtl .jstree-closed > .jstree-ocl {
+  background-position: -103px -39px;
+}
+.jstree-default-small.jstree-rtl .jstree-leaf > .jstree-ocl {
+  background-position: -71px -39px;
+}
+.jstree-default-small.jstree-rtl > .jstree-no-dots .jstree-node,
+.jstree-default-small.jstree-rtl > .jstree-no-dots .jstree-leaf > .jstree-ocl {
+  background: transparent;
+}
+.jstree-default-small.jstree-rtl > .jstree-no-dots .jstree-open > .jstree-ocl {
+  background-position: -39px -39px;
+}
+.jstree-default-small.jstree-rtl > .jstree-no-dots .jstree-closed > .jstree-ocl {
+  background-position: -7px -39px;
+}
+.jstree-default-small .jstree-themeicon-custom {
+  background-color: transparent;
+  background-image: none;
+  background-position: 0 0;
+}
+.jstree-default-small > .jstree-container-ul .jstree-loading > .jstree-ocl {
+  background: url("throbber.gif") center center no-repeat;
+}
+.jstree-default-small .jstree-file {
+  background: url("32px.png") -103px -71px no-repeat;
+}
+.jstree-default-small .jstree-folder {
+  background: url("32px.png") -263px -7px no-repeat;
+}
+.jstree-default-small > .jstree-container-ul > .jstree-node {
+  margin-left: 0;
+  margin-right: 0;
+}
+#jstree-dnd.jstree-default-small {
+  line-height: 18px;
+  padding: 0 4px;
+}
+#jstree-dnd.jstree-default-small .jstree-ok,
+#jstree-dnd.jstree-default-small .jstree-er {
+  background-image: url("32px.png");
+  background-repeat: no-repeat;
+  background-color: transparent;
+}
+#jstree-dnd.jstree-default-small i {
+  background: transparent;
+  width: 18px;
+  height: 18px;
+  line-height: 18px;
+}
+#jstree-dnd.jstree-default-small .jstree-ok {
+  background-position: -7px -71px;
+}
+#jstree-dnd.jstree-default-small .jstree-er {
+  background-position: -39px -71px;
+}
+.jstree-default-small.jstree-rtl .jstree-node {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAACAQMAAABv1h6PAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMHBgAAiABBI4gz9AAAAABJRU5ErkJggg==");
+}
+.jstree-default-small.jstree-rtl .jstree-last {
+  background: transparent;
+}
+.jstree-default-large .jstree-node {
+  min-height: 32px;
+  line-height: 32px;
+  margin-left: 32px;
+  min-width: 32px;
+}
+.jstree-default-large .jstree-anchor {
+  line-height: 32px;
+  height: 32px;
+}
+.jstree-default-large .jstree-icon {
+  width: 32px;
+  height: 32px;
+  line-height: 32px;
+}
+.jstree-default-large .jstree-icon:empty {
+  width: 32px;
+  height: 32px;
+  line-height: 32px;
+}
+.jstree-default-large.jstree-rtl .jstree-node {
+  margin-right: 32px;
+}
+.jstree-default-large .jstree-wholerow {
+  height: 32px;
+}
+.jstree-default-large .jstree-node,
+.jstree-default-large .jstree-icon {
+  background-image: url("32px.png");
+}
+.jstree-default-large .jstree-node {
+  background-position: -288px 0px;
+  background-repeat: repeat-y;
+}
+.jstree-default-large .jstree-last {
+  background: transparent;
+}
+.jstree-default-large .jstree-open > .jstree-ocl {
+  background-position: -128px 0px;
+}
+.jstree-default-large .jstree-closed > .jstree-ocl {
+  background-position: -96px 0px;
+}
+.jstree-default-large .jstree-leaf > .jstree-ocl {
+  background-position: -64px 0px;
+}
+.jstree-default-large .jstree-themeicon {
+  background-position: -256px 0px;
+}
+.jstree-default-large > .jstree-no-dots .jstree-node,
+.jstree-default-large > .jstree-no-dots .jstree-leaf > .jstree-ocl {
+  background: transparent;
+}
+.jstree-default-large > .jstree-no-dots .jstree-open > .jstree-ocl {
+  background-position: -32px 0px;
+}
+.jstree-default-large > .jstree-no-dots .jstree-closed > .jstree-ocl {
+  background-position: 0px 0px;
+}
+.jstree-default-large .jstree-disabled {
+  background: transparent;
+}
+.jstree-default-large .jstree-disabled.jstree-hovered {
+  background: transparent;
+}
+.jstree-default-large .jstree-disabled.jstree-clicked {
+  background: #efefef;
+}
+.jstree-default-large .jstree-checkbox {
+  background-position: -160px 0px;
+}
+.jstree-default-large .jstree-checkbox:hover {
+  background-position: -160px -32px;
+}
+.jstree-default-large.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox,
+.jstree-default-large .jstree-checked > .jstree-checkbox {
+  background-position: -224px 0px;
+}
+.jstree-default-large.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox:hover,
+.jstree-default-large .jstree-checked > .jstree-checkbox:hover {
+  background-position: -224px -32px;
+}
+.jstree-default-large .jstree-anchor > .jstree-undetermined {
+  background-position: -192px 0px;
+}
+.jstree-default-large .jstree-anchor > .jstree-undetermined:hover {
+  background-position: -192px -32px;
+}
+.jstree-default-large .jstree-checkbox-disabled {
+  opacity: 0.8;
+  filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");
+  /* Firefox 10+ */
+  filter: gray;
+  /* IE6-9 */
+  -webkit-filter: grayscale(100%);
+  /* Chrome 19+ & Safari 6+ */
+}
+.jstree-default-large > .jstree-striped {
+  background-size: auto 64px;
+}
+.jstree-default-large.jstree-rtl .jstree-node {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==");
+  background-position: 100% 1px;
+  background-repeat: repeat-y;
+}
+.jstree-default-large.jstree-rtl .jstree-last {
+  background: transparent;
+}
+.jstree-default-large.jstree-rtl .jstree-open > .jstree-ocl {
+  background-position: -128px -32px;
+}
+.jstree-default-large.jstree-rtl .jstree-closed > .jstree-ocl {
+  background-position: -96px -32px;
+}
+.jstree-default-large.jstree-rtl .jstree-leaf > .jstree-ocl {
+  background-position: -64px -32px;
+}
+.jstree-default-large.jstree-rtl > .jstree-no-dots .jstree-node,
+.jstree-default-large.jstree-rtl > .jstree-no-dots .jstree-leaf > .jstree-ocl {
+  background: transparent;
+}
+.jstree-default-large.jstree-rtl > .jstree-no-dots .jstree-open > .jstree-ocl {
+  background-position: -32px -32px;
+}
+.jstree-default-large.jstree-rtl > .jstree-no-dots .jstree-closed > .jstree-ocl {
+  background-position: 0px -32px;
+}
+.jstree-default-large .jstree-themeicon-custom {
+  background-color: transparent;
+  background-image: none;
+  background-position: 0 0;
+}
+.jstree-default-large > .jstree-container-ul .jstree-loading > .jstree-ocl {
+  background: url("throbber.gif") center center no-repeat;
+}
+.jstree-default-large .jstree-file {
+  background: url("32px.png") -96px -64px no-repeat;
+}
+.jstree-default-large .jstree-folder {
+  background: url("32px.png") -256px 0px no-repeat;
+}
+.jstree-default-large > .jstree-container-ul > .jstree-node {
+  margin-left: 0;
+  margin-right: 0;
+}
+#jstree-dnd.jstree-default-large {
+  line-height: 32px;
+  padding: 0 4px;
+}
+#jstree-dnd.jstree-default-large .jstree-ok,
+#jstree-dnd.jstree-default-large .jstree-er {
+  background-image: url("32px.png");
+  background-repeat: no-repeat;
+  background-color: transparent;
+}
+#jstree-dnd.jstree-default-large i {
+  background: transparent;
+  width: 32px;
+  height: 32px;
+  line-height: 32px;
+}
+#jstree-dnd.jstree-default-large .jstree-ok {
+  background-position: 0px -64px;
+}
+#jstree-dnd.jstree-default-large .jstree-er {
+  background-position: -32px -64px;
+}
+.jstree-default-large.jstree-rtl .jstree-node {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAACAQMAAAAD0EyKAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjgIIGBgABCgCBvVLXcAAAAABJRU5ErkJggg==");
+}
+.jstree-default-large.jstree-rtl .jstree-last {
+  background: transparent;
+}
+@media (max-width: 768px) {
+  #jstree-dnd.jstree-dnd-responsive {
+    line-height: 40px;
+    font-weight: bold;
+    font-size: 1.1em;
+    text-shadow: 1px 1px white;
+  }
+  #jstree-dnd.jstree-dnd-responsive > i {
+    background: transparent;
+    width: 40px;
+    height: 40px;
+  }
+  #jstree-dnd.jstree-dnd-responsive > .jstree-ok {
+    background-image: url("40px.png");
+    background-position: 0 -200px;
+    background-size: 120px 240px;
+  }
+  #jstree-dnd.jstree-dnd-responsive > .jstree-er {
+    background-image: url("40px.png");
+    background-position: -40px -200px;
+    background-size: 120px 240px;
+  }
+  #jstree-marker.jstree-dnd-responsive {
+    border-left-width: 10px;
+    border-top-width: 10px;
+    border-bottom-width: 10px;
+    margin-top: -10px;
+  }
+}
+@media (max-width: 768px) {
+  .jstree-default-responsive {
+    /*
+	.jstree-open > .jstree-ocl,
+	.jstree-closed > .jstree-ocl { border-radius:20px; background-color:white; }
+	*/
+  }
+  .jstree-default-responsive .jstree-icon {
+    background-image: url("40px.png");
+  }
+  .jstree-default-responsive .jstree-node,
+  .jstree-default-responsive .jstree-leaf > .jstree-ocl {
+    background: transparent;
+  }
+  .jstree-default-responsive .jstree-node {
+    min-height: 40px;
+    line-height: 40px;
+    margin-left: 40px;
+    min-width: 40px;
+    white-space: nowrap;
+  }
+  .jstree-default-responsive .jstree-anchor {
+    line-height: 40px;
+    height: 40px;
+  }
+  .jstree-default-responsive .jstree-icon,
+  .jstree-default-responsive .jstree-icon:empty {
+    width: 40px;
+    height: 40px;
+    line-height: 40px;
+  }
+  .jstree-default-responsive > .jstree-container-ul > .jstree-node {
+    margin-left: 0;
+  }
+  .jstree-default-responsive.jstree-rtl .jstree-node {
+    margin-left: 0;
+    margin-right: 40px;
+  }
+  .jstree-default-responsive.jstree-rtl .jstree-container-ul > .jstree-node {
+    margin-right: 0;
+  }
+  .jstree-default-responsive .jstree-ocl,
+  .jstree-default-responsive .jstree-themeicon,
+  .jstree-default-responsive .jstree-checkbox {
+    background-size: 120px 240px;
+  }
+  .jstree-default-responsive .jstree-leaf > .jstree-ocl {
+    background: transparent;
+  }
+  .jstree-default-responsive .jstree-open > .jstree-ocl {
+    background-position: 0 0px !important;
+  }
+  .jstree-default-responsive .jstree-closed > .jstree-ocl {
+    background-position: 0 -40px !important;
+  }
+  .jstree-default-responsive.jstree-rtl .jstree-closed > .jstree-ocl {
+    background-position: -40px 0px !important;
+  }
+  .jstree-default-responsive .jstree-themeicon {
+    background-position: -40px -40px;
+  }
+  .jstree-default-responsive .jstree-checkbox,
+  .jstree-default-responsive .jstree-checkbox:hover {
+    background-position: -40px -80px;
+  }
+  .jstree-default-responsive.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox,
+  .jstree-default-responsive.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox:hover,
+  .jstree-default-responsive .jstree-checked > .jstree-checkbox,
+  .jstree-default-responsive .jstree-checked > .jstree-checkbox:hover {
+    background-position: 0 -80px;
+  }
+  .jstree-default-responsive .jstree-anchor > .jstree-undetermined,
+  .jstree-default-responsive .jstree-anchor > .jstree-undetermined:hover {
+    background-position: 0 -120px;
+  }
+  .jstree-default-responsive .jstree-anchor {
+    font-weight: bold;
+    font-size: 1.1em;
+    text-shadow: 1px 1px white;
+  }
+  .jstree-default-responsive > .jstree-striped {
+    background: transparent;
+  }
+  .jstree-default-responsive .jstree-wholerow {
+    border-top: 1px solid rgba(255, 255, 255, 0.7);
+    border-bottom: 1px solid rgba(64, 64, 64, 0.2);
+    background: #ebebeb;
+    height: 40px;
+  }
+  .jstree-default-responsive .jstree-wholerow-hovered {
+    background: #e7f4f9;
+  }
+  .jstree-default-responsive .jstree-wholerow-clicked {
+    background: #beebff;
+  }
+  .jstree-default-responsive .jstree-children .jstree-last > .jstree-wholerow {
+    box-shadow: inset 0 -6px 3px -5px #666666;
+  }
+  .jstree-default-responsive .jstree-children .jstree-open > .jstree-wholerow {
+    box-shadow: inset 0 6px 3px -5px #666666;
+    border-top: 0;
+  }
+  .jstree-default-responsive .jstree-children .jstree-open + .jstree-open {
+    box-shadow: none;
+  }
+  .jstree-default-responsive .jstree-node,
+  .jstree-default-responsive .jstree-icon,
+  .jstree-default-responsive .jstree-node > .jstree-ocl,
+  .jstree-default-responsive .jstree-themeicon,
+  .jstree-default-responsive .jstree-checkbox {
+    background-image: url("40px.png");
+    background-size: 120px 240px;
+  }
+  .jstree-default-responsive .jstree-node {
+    background-position: -80px 0;
+    background-repeat: repeat-y;
+  }
+  .jstree-default-responsive .jstree-last {
+    background: transparent;
+  }
+  .jstree-default-responsive .jstree-leaf > .jstree-ocl {
+    background-position: -40px -120px;
+  }
+  .jstree-default-responsive .jstree-last > .jstree-ocl {
+    background-position: -40px -160px;
+  }
+  .jstree-default-responsive .jstree-themeicon-custom {
+    background-color: transparent;
+    background-image: none;
+    background-position: 0 0;
+  }
+  .jstree-default-responsive .jstree-file {
+    background: url("40px.png") 0 -160px no-repeat;
+    background-size: 120px 240px;
+  }
+  .jstree-default-responsive .jstree-folder {
+    background: url("40px.png") -40px -40px no-repeat;
+    background-size: 120px 240px;
+  }
+  .jstree-default-responsive > .jstree-container-ul > .jstree-node {
+    margin-left: 0;
+    margin-right: 0;
+  }
+}
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/style.min.css b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/style.min.css
new file mode 100755
index 00000000000..a24ff301362
--- /dev/null
+++ b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/style.min.css
@@ -0,0 +1 @@
+.jstree-node,.jstree-children,.jstree-container-ul{display:block;margin:0;padding:0;list-style-type:none;list-style-image:none}.jstree-node{white-space:nowrap}.jstree-anchor{display:inline-block;color:#000;white-space:nowrap;padding:0 4px 0 1px;margin:0;vertical-align:top}.jstree-anchor:focus{outline:0}.jstree-anchor,.jstree-anchor:link,.jstree-anchor:visited,.jstree-anchor:hover,.jstree-anchor:active{text-decoration:none;color:inherit}.jstree-icon{display:inline-block;text-decoration:none;margin:0;padding:0;vertical-align:top;text-align:center}.jstree-icon:empty{display:inline-block;text-decoration:none;margin:0;padding:0;vertical-align:top;text-align:center}.jstree-ocl{cursor:pointer}.jstree-leaf>.jstree-ocl{cursor:default}.jstree .jstree-open>.jstree-children{display:block}.jstree .jstree-closed>.jstree-children,.jstree .jstree-leaf>.jstree-children{display:none}.jstree-anchor>.jstree-themeicon{margin-right:2px}.jstree-no-icons .jstree-themeicon,.jstree-anchor>.jstree-themeicon-hidden{display:none}.jstree-hidden{display:none}.jstree-rtl .jstree-anchor{padding:0 1px 0 4px}.jstree-rtl .jstree-anchor>.jstree-themeicon{margin-left:2px;margin-right:0}.jstree-rtl .jstree-node{margin-left:0}.jstree-rtl .jstree-container-ul>.jstree-node{margin-right:0}.jstree-wholerow-ul{position:relative;display:inline-block;min-width:100%}.jstree-wholerow-ul .jstree-leaf>.jstree-ocl{cursor:pointer}.jstree-wholerow-ul .jstree-anchor,.jstree-wholerow-ul .jstree-icon{position:relative}.jstree-wholerow-ul .jstree-wholerow{width:100%;cursor:pointer;position:absolute;left:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vakata-context{display:none}.vakata-context,.vakata-context ul{margin:0;padding:2px;position:absolute;background:#f5f5f5;border:1px solid #979797;box-shadow:2px 2px 2px #999}.vakata-context ul{list-style:none;left:100%;margin-top:-2.7em;margin-left:-4px}.vakata-context .vakata-context-right ul{left:auto;right:100%;margin-left:auto;margin-right:-4px}.vakata-context li{list-style:none;display:inline}.vakata-context li>a{display:block;padding:0 2em;text-decoration:none;width:auto;color:#000;white-space:nowrap;line-height:2.4em;text-shadow:1px 1px 0 #fff;border-radius:1px}.vakata-context li>a:hover{position:relative;background-color:#e8eff7;box-shadow:0 0 2px #0a6aa1}.vakata-context li>a.vakata-context-parent{background-image:url(data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAIORI4JlrqN1oMSnmmZDQUAOw==);background-position:right center;background-repeat:no-repeat}.vakata-context li>a:focus{outline:0}.vakata-context .vakata-context-hover>a{position:relative;background-color:#e8eff7;box-shadow:0 0 2px #0a6aa1}.vakata-context .vakata-context-separator>a,.vakata-context .vakata-context-separator>a:hover{background:#fff;border:0;border-top:1px solid #e2e3e3;height:1px;min-height:1px;max-height:1px;padding:0;margin:0 0 0 2.4em;border-left:1px solid #e0e0e0;text-shadow:0 0 0 transparent;box-shadow:0 0 0 transparent;border-radius:0}.vakata-context .vakata-contextmenu-disabled a,.vakata-context .vakata-contextmenu-disabled a:hover{color:silver;background-color:transparent;border:0;box-shadow:0 0 0}.vakata-context li>a>i{text-decoration:none;display:inline-block;width:2.4em;height:2.4em;background:0 0;margin:0 0 0 -2em;vertical-align:top;text-align:center;line-height:2.4em}.vakata-context li>a>i:empty{width:2.4em;line-height:2.4em}.vakata-context li>a .vakata-contextmenu-sep{display:inline-block;width:1px;height:2.4em;background:#fff;margin:0 .5em 0 0;border-left:1px solid #e2e3e3}.vakata-context .vakata-contextmenu-shortcut{font-size:.8em;color:silver;opacity:.5;display:none}.vakata-context-rtl ul{left:auto;right:100%;margin-left:auto;margin-right:-4px}.vakata-context-rtl li>a.vakata-context-parent{background-image:url(data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAINjI+AC7rWHIsPtmoxLAA7);background-position:left center;background-repeat:no-repeat}.vakata-context-rtl .vakata-context-separator>a{margin:0 2.4em 0 0;border-left:0;border-right:1px solid #e2e3e3}.vakata-context-rtl .vakata-context-left ul{right:auto;left:100%;margin-left:-4px;margin-right:auto}.vakata-context-rtl li>a>i{margin:0 -2em 0 0}.vakata-context-rtl li>a .vakata-contextmenu-sep{margin:0 0 0 .5em;border-left-color:#fff;background:#e2e3e3}#jstree-marker{position:absolute;top:0;left:0;margin:-5px 0 0 0;padding:0;border-right:0;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid;width:0;height:0;font-size:0;line-height:0}#jstree-dnd{line-height:16px;margin:0;padding:4px}#jstree-dnd .jstree-icon,#jstree-dnd .jstree-copy{display:inline-block;text-decoration:none;margin:0 2px 0 0;padding:0;width:16px;height:16px}#jstree-dnd .jstree-ok{background:green}#jstree-dnd .jstree-er{background:red}#jstree-dnd .jstree-copy{margin:0 2px}.jstree-default .jstree-node,.jstree-default .jstree-icon{background-repeat:no-repeat;background-color:transparent}.jstree-default .jstree-anchor,.jstree-default .jstree-wholerow{transition:background-color .15s,box-shadow .15s}.jstree-default .jstree-hovered{background:#e7f4f9;border-radius:2px;box-shadow:inset 0 0 1px #ccc}.jstree-default .jstree-clicked{background:#beebff;border-radius:2px;box-shadow:inset 0 0 1px #999}.jstree-default .jstree-no-icons .jstree-anchor>.jstree-themeicon{display:none}.jstree-default .jstree-disabled{background:0 0;color:#666}.jstree-default .jstree-disabled.jstree-hovered{background:0 0;box-shadow:none}.jstree-default .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default .jstree-disabled>.jstree-icon{opacity:.8;filter:url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default .jstree-search{font-style:italic;color:#8b0000;font-weight:700}.jstree-default .jstree-no-checkboxes .jstree-checkbox{display:none!important}.jstree-default.jstree-checkbox-no-clicked .jstree-clicked{background:0 0;box-shadow:none}.jstree-default.jstree-checkbox-no-clicked .jstree-clicked.jstree-hovered{background:#e7f4f9}.jstree-default.jstree-checkbox-no-clicked>.jstree-wholerow-ul .jstree-wholerow-clicked{background:0 0}.jstree-default.jstree-checkbox-no-clicked>.jstree-wholerow-ul .jstree-wholerow-clicked.jstree-wholerow-hovered{background:#e7f4f9}.jstree-default>.jstree-striped{min-width:100%;display:inline-block;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAMAAAB/qqA+AAAABlBMVEUAAAAAAAClZ7nPAAAAAnRSTlMNAMM9s3UAAAAXSURBVHjajcEBAQAAAIKg/H/aCQZ70AUBjAATb6YPDgAAAABJRU5ErkJggg==) left top repeat}.jstree-default>.jstree-wholerow-ul .jstree-hovered,.jstree-default>.jstree-wholerow-ul .jstree-clicked{background:0 0;box-shadow:none;border-radius:0}.jstree-default .jstree-wholerow{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.jstree-default .jstree-wholerow-hovered{background:#e7f4f9}.jstree-default .jstree-wholerow-clicked{background:#beebff;background:-webkit-linear-gradient(top,#beebff 0,#a8e4ff 100%);background:linear-gradient(to bottom,#beebff 0,#a8e4ff 100%)}.jstree-default .jstree-node{min-height:24px;line-height:24px;margin-left:24px;min-width:24px}.jstree-default .jstree-anchor{line-height:24px;height:24px}.jstree-default .jstree-icon{width:24px;height:24px;line-height:24px}.jstree-default .jstree-icon:empty{width:24px;height:24px;line-height:24px}.jstree-default.jstree-rtl .jstree-node{margin-right:24px}.jstree-default .jstree-wholerow{height:24px}.jstree-default .jstree-node,.jstree-default .jstree-icon{background-image:url(32px.png)}.jstree-default .jstree-node{background-position:-292px -4px;background-repeat:repeat-y}.jstree-default .jstree-last{background:0 0}.jstree-default .jstree-open>.jstree-ocl{background-position:-132px -4px}.jstree-default .jstree-closed>.jstree-ocl{background-position:-100px -4px}.jstree-default .jstree-leaf>.jstree-ocl{background-position:-68px -4px}.jstree-default .jstree-themeicon{background-position:-260px -4px}.jstree-default>.jstree-no-dots .jstree-node,.jstree-default>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-36px -4px}.jstree-default>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-4px -4px}.jstree-default .jstree-disabled{background:0 0}.jstree-default .jstree-disabled.jstree-hovered{background:0 0}.jstree-default .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default .jstree-checkbox{background-position:-164px -4px}.jstree-default .jstree-checkbox:hover{background-position:-164px -36px}.jstree-default.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default .jstree-checked>.jstree-checkbox{background-position:-228px -4px}.jstree-default.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default .jstree-checked>.jstree-checkbox:hover{background-position:-228px -36px}.jstree-default .jstree-anchor>.jstree-undetermined{background-position:-196px -4px}.jstree-default .jstree-anchor>.jstree-undetermined:hover{background-position:-196px -36px}.jstree-default .jstree-checkbox-disabled{opacity:.8;filter:url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default>.jstree-striped{background-size:auto 48px}.jstree-default.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==);background-position:100% 1px;background-repeat:repeat-y}.jstree-default.jstree-rtl .jstree-last{background:0 0}.jstree-default.jstree-rtl .jstree-open>.jstree-ocl{background-position:-132px -36px}.jstree-default.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-100px -36px}.jstree-default.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-68px -36px}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-node,.jstree-default.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-36px -36px}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-4px -36px}.jstree-default .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(throbber.gif) center center no-repeat}.jstree-default .jstree-file{background:url(32px.png) -100px -68px no-repeat}.jstree-default .jstree-folder{background:url(32px.png) -260px -4px no-repeat}.jstree-default>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default{line-height:24px;padding:0 4px}#jstree-dnd.jstree-default .jstree-ok,#jstree-dnd.jstree-default .jstree-er{background-image:url(32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default i{background:0 0;width:24px;height:24px;line-height:24px}#jstree-dnd.jstree-default .jstree-ok{background-position:-4px -68px}#jstree-dnd.jstree-default .jstree-er{background-position:-36px -68px}.jstree-default.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==)}.jstree-default.jstree-rtl .jstree-last{background:0 0}.jstree-default-small .jstree-node{min-height:18px;line-height:18px;margin-left:18px;min-width:18px}.jstree-default-small .jstree-anchor{line-height:18px;height:18px}.jstree-default-small .jstree-icon{width:18px;height:18px;line-height:18px}.jstree-default-small .jstree-icon:empty{width:18px;height:18px;line-height:18px}.jstree-default-small.jstree-rtl .jstree-node{margin-right:18px}.jstree-default-small .jstree-wholerow{height:18px}.jstree-default-small .jstree-node,.jstree-default-small .jstree-icon{background-image:url(32px.png)}.jstree-default-small .jstree-node{background-position:-295px -7px;background-repeat:repeat-y}.jstree-default-small .jstree-last{background:0 0}.jstree-default-small .jstree-open>.jstree-ocl{background-position:-135px -7px}.jstree-default-small .jstree-closed>.jstree-ocl{background-position:-103px -7px}.jstree-default-small .jstree-leaf>.jstree-ocl{background-position:-71px -7px}.jstree-default-small .jstree-themeicon{background-position:-263px -7px}.jstree-default-small>.jstree-no-dots .jstree-node,.jstree-default-small>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-small>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-39px -7px}.jstree-default-small>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-7px -7px}.jstree-default-small .jstree-disabled{background:0 0}.jstree-default-small .jstree-disabled.jstree-hovered{background:0 0}.jstree-default-small .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default-small .jstree-checkbox{background-position:-167px -7px}.jstree-default-small .jstree-checkbox:hover{background-position:-167px -39px}.jstree-default-small.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-small .jstree-checked>.jstree-checkbox{background-position:-231px -7px}.jstree-default-small.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default-small .jstree-checked>.jstree-checkbox:hover{background-position:-231px -39px}.jstree-default-small .jstree-anchor>.jstree-undetermined{background-position:-199px -7px}.jstree-default-small .jstree-anchor>.jstree-undetermined:hover{background-position:-199px -39px}.jstree-default-small .jstree-checkbox-disabled{opacity:.8;filter:url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default-small>.jstree-striped{background-size:auto 36px}.jstree-default-small.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==);background-position:100% 1px;background-repeat:repeat-y}.jstree-default-small.jstree-rtl .jstree-last{background:0 0}.jstree-default-small.jstree-rtl .jstree-open>.jstree-ocl{background-position:-135px -39px}.jstree-default-small.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-103px -39px}.jstree-default-small.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-71px -39px}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-node,.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-39px -39px}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-7px -39px}.jstree-default-small .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-small>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(throbber.gif) center center no-repeat}.jstree-default-small .jstree-file{background:url(32px.png) -103px -71px no-repeat}.jstree-default-small .jstree-folder{background:url(32px.png) -263px -7px no-repeat}.jstree-default-small>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default-small{line-height:18px;padding:0 4px}#jstree-dnd.jstree-default-small .jstree-ok,#jstree-dnd.jstree-default-small .jstree-er{background-image:url(32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default-small i{background:0 0;width:18px;height:18px;line-height:18px}#jstree-dnd.jstree-default-small .jstree-ok{background-position:-7px -71px}#jstree-dnd.jstree-default-small .jstree-er{background-position:-39px -71px}.jstree-default-small.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAACAQMAAABv1h6PAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMHBgAAiABBI4gz9AAAAABJRU5ErkJggg==)}.jstree-default-small.jstree-rtl .jstree-last{background:0 0}.jstree-default-large .jstree-node{min-height:32px;line-height:32px;margin-left:32px;min-width:32px}.jstree-default-large .jstree-anchor{line-height:32px;height:32px}.jstree-default-large .jstree-icon{width:32px;height:32px;line-height:32px}.jstree-default-large .jstree-icon:empty{width:32px;height:32px;line-height:32px}.jstree-default-large.jstree-rtl .jstree-node{margin-right:32px}.jstree-default-large .jstree-wholerow{height:32px}.jstree-default-large .jstree-node,.jstree-default-large .jstree-icon{background-image:url(32px.png)}.jstree-default-large .jstree-node{background-position:-288px 0;background-repeat:repeat-y}.jstree-default-large .jstree-last{background:0 0}.jstree-default-large .jstree-open>.jstree-ocl{background-position:-128px 0}.jstree-default-large .jstree-closed>.jstree-ocl{background-position:-96px 0}.jstree-default-large .jstree-leaf>.jstree-ocl{background-position:-64px 0}.jstree-default-large .jstree-themeicon{background-position:-256px 0}.jstree-default-large>.jstree-no-dots .jstree-node,.jstree-default-large>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-large>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-32px 0}.jstree-default-large>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:0 0}.jstree-default-large .jstree-disabled{background:0 0}.jstree-default-large .jstree-disabled.jstree-hovered{background:0 0}.jstree-default-large .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default-large .jstree-checkbox{background-position:-160px 0}.jstree-default-large .jstree-checkbox:hover{background-position:-160px -32px}.jstree-default-large.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-large .jstree-checked>.jstree-checkbox{background-position:-224px 0}.jstree-default-large.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default-large .jstree-checked>.jstree-checkbox:hover{background-position:-224px -32px}.jstree-default-large .jstree-anchor>.jstree-undetermined{background-position:-192px 0}.jstree-default-large .jstree-anchor>.jstree-undetermined:hover{background-position:-192px -32px}.jstree-default-large .jstree-checkbox-disabled{opacity:.8;filter:url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default-large>.jstree-striped{background-size:auto 64px}.jstree-default-large.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==);background-position:100% 1px;background-repeat:repeat-y}.jstree-default-large.jstree-rtl .jstree-last{background:0 0}.jstree-default-large.jstree-rtl .jstree-open>.jstree-ocl{background-position:-128px -32px}.jstree-default-large.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-96px -32px}.jstree-default-large.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-64px -32px}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-node,.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-32px -32px}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:0 -32px}.jstree-default-large .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-large>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(throbber.gif) center center no-repeat}.jstree-default-large .jstree-file{background:url(32px.png) -96px -64px no-repeat}.jstree-default-large .jstree-folder{background:url(32px.png) -256px 0 no-repeat}.jstree-default-large>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default-large{line-height:32px;padding:0 4px}#jstree-dnd.jstree-default-large .jstree-ok,#jstree-dnd.jstree-default-large .jstree-er{background-image:url(32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default-large i{background:0 0;width:32px;height:32px;line-height:32px}#jstree-dnd.jstree-default-large .jstree-ok{background-position:0 -64px}#jstree-dnd.jstree-default-large .jstree-er{background-position:-32px -64px}.jstree-default-large.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAACAQMAAAAD0EyKAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjgIIGBgABCgCBvVLXcAAAAABJRU5ErkJggg==)}.jstree-default-large.jstree-rtl .jstree-last{background:0 0}@media (max-width:768px){#jstree-dnd.jstree-dnd-responsive{line-height:40px;font-weight:700;font-size:1.1em;text-shadow:1px 1px #fff}#jstree-dnd.jstree-dnd-responsive>i{background:0 0;width:40px;height:40px}#jstree-dnd.jstree-dnd-responsive>.jstree-ok{background-image:url(40px.png);background-position:0 -200px;background-size:120px 240px}#jstree-dnd.jstree-dnd-responsive>.jstree-er{background-image:url(40px.png);background-position:-40px -200px;background-size:120px 240px}#jstree-marker.jstree-dnd-responsive{border-left-width:10px;border-top-width:10px;border-bottom-width:10px;margin-top:-10px}}@media (max-width:768px){.jstree-default-responsive .jstree-icon{background-image:url(40px.png)}.jstree-default-responsive .jstree-node,.jstree-default-responsive .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-responsive .jstree-node{min-height:40px;line-height:40px;margin-left:40px;min-width:40px;white-space:nowrap}.jstree-default-responsive .jstree-anchor{line-height:40px;height:40px}.jstree-default-responsive .jstree-icon,.jstree-default-responsive .jstree-icon:empty{width:40px;height:40px;line-height:40px}.jstree-default-responsive>.jstree-container-ul>.jstree-node{margin-left:0}.jstree-default-responsive.jstree-rtl .jstree-node{margin-left:0;margin-right:40px}.jstree-default-responsive.jstree-rtl .jstree-container-ul>.jstree-node{margin-right:0}.jstree-default-responsive .jstree-ocl,.jstree-default-responsive .jstree-themeicon,.jstree-default-responsive .jstree-checkbox{background-size:120px 240px}.jstree-default-responsive .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-responsive .jstree-open>.jstree-ocl{background-position:0 0!important}.jstree-default-responsive .jstree-closed>.jstree-ocl{background-position:0 -40px!important}.jstree-default-responsive.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-40px 0!important}.jstree-default-responsive .jstree-themeicon{background-position:-40px -40px}.jstree-default-responsive .jstree-checkbox,.jstree-default-responsive .jstree-checkbox:hover{background-position:-40px -80px}.jstree-default-responsive.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-responsive.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default-responsive .jstree-checked>.jstree-checkbox,.jstree-default-responsive .jstree-checked>.jstree-checkbox:hover{background-position:0 -80px}.jstree-default-responsive .jstree-anchor>.jstree-undetermined,.jstree-default-responsive .jstree-anchor>.jstree-undetermined:hover{background-position:0 -120px}.jstree-default-responsive .jstree-anchor{font-weight:700;font-size:1.1em;text-shadow:1px 1px #fff}.jstree-default-responsive>.jstree-striped{background:0 0}.jstree-default-responsive .jstree-wholerow{border-top:1px solid rgba(255,255,255,.7);border-bottom:1px solid rgba(64,64,64,.2);background:#ebebeb;height:40px}.jstree-default-responsive .jstree-wholerow-hovered{background:#e7f4f9}.jstree-default-responsive .jstree-wholerow-clicked{background:#beebff}.jstree-default-responsive .jstree-children .jstree-last>.jstree-wholerow{box-shadow:inset 0 -6px 3px -5px #666}.jstree-default-responsive .jstree-children .jstree-open>.jstree-wholerow{box-shadow:inset 0 6px 3px -5px #666;border-top:0}.jstree-default-responsive .jstree-children .jstree-open+.jstree-open{box-shadow:none}.jstree-default-responsive .jstree-node,.jstree-default-responsive .jstree-icon,.jstree-default-responsive .jstree-node>.jstree-ocl,.jstree-default-responsive .jstree-themeicon,.jstree-default-responsive .jstree-checkbox{background-image:url(40px.png);background-size:120px 240px}.jstree-default-responsive .jstree-node{background-position:-80px 0;background-repeat:repeat-y}.jstree-default-responsive .jstree-last{background:0 0}.jstree-default-responsive .jstree-leaf>.jstree-ocl{background-position:-40px -120px}.jstree-default-responsive .jstree-last>.jstree-ocl{background-position:-40px -160px}.jstree-default-responsive .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-responsive .jstree-file{background:url(40px.png) 0 -160px no-repeat;background-size:120px 240px}.jstree-default-responsive .jstree-folder{background:url(40px.png) -40px -40px no-repeat;background-size:120px 240px}.jstree-default-responsive>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}}
\ No newline at end of file
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/throbber.gif b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/throbber.gif
old mode 100644
new mode 100755
index 5b33f7e54f4e55b6b8774d86d96895db9af044b4..1b5b2fde42f8ea14e6981339196a9d62b681d79e
GIT binary patch
literal 1720
zcmZ|OYfMvT7zgm4p2O+ea@rnBg#)OxTPX)YQxLES+gfgxVz~&+f}$;m6s%Hi3W%nq
zP@z^qrV}=TNF%FL8K5q@MN>cp#S0pVI*qHSli{|&j8i`-D~lhy5AU}p`Tz2N-e*-(
zqBu&8Q*g>F3T19?Zf0i2Y&JU_j>N>onwlC4g`!j{1p>jzlP51;yvXHpJ32ZL1c{7{
z)MzyPIro%=%#1i`T0+<|5ezw}`5%1a$_msK1)F#~iYhcbb+NiiTcX~ytZ3Wj5(@tv
zLT5OqLY&VTiBl*@DK5jOqAQC<<G>V}_H8&J8*d!6F|8^P+>r!@8gG==_FR|TOFO5N
ztmi!uPli+Ln$x?H-gK%V=cf&)%tK3Ubl`;)j){YK#AZm_($yDbHN+iIVb4-MA(|Tn
z%Y=0Su-m75IE?%N1|!SEl|tuKXsXZNj2Z=vp;+=jlJSZD2EODW0H`s<BGnEWXznAI
zRihe|b_nZwTPrk3hRW~AIL)!p_U?GtGW>M#)b0zgDU0)5!G<?Df;@1J<B}}$iz_rX
z%&1amW8ARS!n!TmVl%lfFgegAqRfdPJ)MZh0O24h14(h^`bjnUkS0px2vG>rr5zO1
zNgN^!L7)EBFUC+Zhm%Mr7yC91@!CieHdPd#!o7Jn^!!TMrU0vgH)|h-!|2wozJKmj
z`G&1Z^{+00Fi|SEx@=o?UTI)xo@>T@7i7MZAqTYCMc0JP{oZJEdWye2L~bM45otrq
zk@}$q6%b*2<$<rGgK+flGwX~NJ-1OZC=+b&8OgiN%OxC&;OQ;|WiSgRw=ksb#&<za
zK1};>_YGZVC^6PBqU&pG6rtOM!WN;+E;i3EB*=+K0j60WC&J{7x}V=Ak(w<1X>er-
zV`_bHI~Y%5hQkS?_Lf?1C-Yh<h7tEWuJ%96W&EPplGML=g?##fc|vxO|L1G5ZD_RM
z(Tj4^#p&uVw|Ul8n}qd7PnXeE&S=}3vp0R#fY{ju!$P-)K)_p5HZg;}>;suT<W)-8
z;kx`iyiHuHMJN&z3xBv}KTXF8|KII}R1u3-r}}w9OMpw0QuXdgm}Y&{liY*C{OPgX
zUZ?_f_wm`a2&GYCveuUXl#!dgl>(z!ZdS6NOH8>FGetNtnE-ngIxI9OKM9M!nq|ao
z@ByV)WU%+EiuxlBZ=#rs_ZnY%+O^bXr2P8_g2l~7Z822<SgQ<oLQ+s#(QNr~78f;+
zhb@i4QQP2wt12&)isqN3uGGU-%TiY}QE%po+(23_*R|unGo5$n(&V^cSh$OL`&qzR
zCSM%GI8-@V8IZ68tZ44Z&~bCRp9y&&;D}J)Em6co_+5TFbGrKL@Pc0BLLPSEs}U6r
z0O&F3U@#64D^tG})xz%X5DQ)EM@RX_MIa(Q09x<kS~1^-=3K?}&XIHSW9b_m?G{qq
z^NwyTC_U5K7F&F1@^XyjKDL~W6rJ%<@idQHty1+jeI#yXT22cHY;Z!~hi6im#(b4T
z#9`NY%-Tc)RHOZgOn*3*qXkecL}MB}=}iz|36X4hVMd|v|88a8G4{^p`?}Idl`BOX
zuBoz5ykT1C<(d}o<FU?zUN8E|&tvt{yyH5e6A|ni%((5<o22iTb2=}K4G-E7+%(eO
z$6ZJ@#~p3e(J>1w?Uyx%!zc@?f!tWxz6{`xAWPUyeq1Vbvuj7m$3Dh(PTY04bw^_A
zwRr|LuoC34N#A1;<G*GRP5b`%TSEBr>?zXdaId|wW$kzq2e~Uqdrq=@A0^DlGO4UM
zzC<kYY0fsJAB70}P`(4Su69S93@ke%8)DNw&*2qf6+W)d<>O9@&t7@ohLX-t)ftJ|
z)q;&?w?;l@^4Pc`;x3vPJ8(itFdKg3;$nap8V7O~;L775>pjUjnIyS=0%4f;&$i;^
q^<`2=x-x(uk2YUU2h;2jemsk<aD(WL8L(lGH>O_4rHker(f<M+QXWPC

literal 1849
zcma*odr(tX9tZI2z31lM+(&YVk%mZ}5P~KlG2s=WSbGzm0!x7^P##Mnh7t-jP!X0Q
zk_SQ}Po-L1tlDK;6l?(>v)e5ZBQx4|Y-Q?nr@Px3?9h(3ZWr3^tj=`TP57gKr87N$
zp2wWee1GRRCwo_xahnw)5cxNPJbCg2L6DV|6`#+yw6v6!mDS$f9-JvFD^n;GQ&UrZ
zzh5jCkByB101O60U0q#p_1BM>Cv-vP?&s4@g_((4_1L=L$(a91)0=J91Gas#R{McE
znYG^9*0A5YZ>#;~+Wkn(W5B0^yELIYLP!K}mB~<)AM@1&nqekynuaEGqP<JE0#l+(
z*R9joTN$nZ{F;;f_Nv(QpzP65;W)SYC;1+?>rzoH|KodRXJy)%+w_fu3nE5>@Bd_b
zqC$EQ;{c`T&?EsNO|igL9gC7Ygxv?aQUEXMq?~>wg{EyW;VcJ37CUF#HjrT=KQO_*
zS>M9yydXk18D(+QDJ1>r);Lav_uYKp$T?4vr{Q$lTo&pKv^?(>L-)G2*lwH!Ah7k?
z7oH<8h-(KTKt5V6$8gF)C7Io&P5=SjTh)=zV=E2EUhQZ<Wjvi)ks6lL7NUI41Suec
z%#@RZvp$b|KCxLd`PA8_!Ub^;+J%TE^_K&d6(i&k---epB#nC`b3_`MdhtuWMEe%I
z(wJ2$`EGgJTz=trW>P##L8S{d%UK>>+y82>+FV+#^BzW7u3F)Bb>=lYQ%%j`F>ASe
zo*cw@V#u6T`A2He;70mR(V&iV&-7{qP~=SRf&jm9-T{*ZeZ}$rd0#6c&fLG^xJcf5
z+p<`wJYgW+_s*V{uI$nMB;%8`S_3>PfGOj3Rq}@Cx^+j?rk92fANSFDBYnOqQ>Vdj
z)(|$AhP4t&Lb=Gvo2#3Gl%9<=Gv`Mz?Po@P4iLF!x}GUWJICDlFk-hS^Whyh7x~VH
z@0vD1>HYD4&e+~yzS*-sFR{9`{QEEZO1zg7>R&7cHts-6j!xHVdA8eI+ZlVzd%`es
zJT@$#GX(gvCJ1oJN%yLBK}{V=V;seo;!w|Yte!W1%5qLNFWqvZW>h&IiH+oPT=b@E
zPhGzv5=(Un*X>v`><w7vN-j#h05gB-F9AZf<&Z~SLlC&Nz^-G6DuPj|`n3d!<l7n!
z^9j1qeh2{s+i0tZ4@>%8h_nj^NdY<en;#4d>cE6NHS_ifkCV$*D)Tqrbu`s;<=t<4
zAHNqNV?6(g<1PY-w@#I-WYFViz?9TrkMr)u0g`O`u|>T;k|2sV*YF^pun<C(O34ry
z@yg-q+#%4rv$|41Y!PHPrjmV%@S3%TUelmz%~6?hLG4%mWKO9NB}mrI%KlhB`{^!g
zT?{Y#<ON%sq<!{buD;iH%`hL}N;>vT;$SuTy{j3Gv)yqD!R_CF>yR)MzmmYS5v+~R
zXAdD<Jm>%ng9?df;wd8GxR#%3O+gz};Vo;)sK%Bj-q>Oq%R7JU-KD?vYu>#2UjaDo
z&8$>5xW~?KPD_#XFToU1hIb*VOMidUr6iYiO0N|i-7s`T8!cFT`rN!^1Pt78J93i6
z5HI1wIM$94m{3SLDvISDe6$ZG1;eq_D9RTaaC>=cO{@Bs>$IlP<c+8wUtK_tPUz3j
z)>CPJJ$h$)-3vzNUQ6<Wm&Z5JfeG_o#I^S?ZP9*QGjsiJM3jH{?94}z{@d%97nOVw
zacge+X&InNUL3U(BUlor87ff?2qEf2c|yCI=Id~LI~<KyVA#R%nwHS3S<^IBTu|Jj
zW^-Xv#UBDqOwy>OsN#_zWxey!_9%hxwH2_dEJi=yY|1c7nDm2_Lm!Cof8-R_+9UkS
zcBE(o47yE)oMR(Q=dp1a2wTX5Kv<M)VDKP@wb$5DNEX!VTUn1Pd`taYrL9bpe}d9v
zqx3tu5NTGv8=X63WXPWMm1T8=ujh#QvSw5|(EZJ3$quU9*?0NxQKGsTrnFNF-ygOt
zYWPggi66%$nuj|v6!Ow2)>vGyLqlWTa7V&!A*|w|)ax~1_~aJ0=_Lilg*0iQk7#ZD
EAHN$8j{pDw

diff --git a/src/Oro/Bundle/UIBundle/Resources/translations/jsmessages.en.yml b/src/Oro/Bundle/UIBundle/Resources/translations/jsmessages.en.yml
index c355e0ab8c9..7db22a81b98 100644
--- a/src/Oro/Bundle/UIBundle/Resources/translations/jsmessages.en.yml
+++ b/src/Oro/Bundle/UIBundle/Resources/translations/jsmessages.en.yml
@@ -78,3 +78,6 @@ oro:
             single: Changes are being saved and may be lost
             group_title: Server is being updated and the following changes might be lost
             other: Other
+        jstree:
+            move_category_error: "You can not move node {{ nodeText }} here."
+            add_new_root_warning: "You can not create new root category."

From fb03d8f6028ccd92daf996de1c244776af802410 Mon Sep 17 00:00:00 2001
From: Maksym Perepelytsya <mperepelytsya@magecore.com>
Date: Tue, 29 Dec 2015 12:48:18 +0200
Subject: [PATCH 310/471] BAP-9577:Add option 'Use as default' to views options
   - after merge fix

---
 .../Resources/public/js/datagrid/grid-views/view.js        | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
index 5e78dcedc3f..d655df30905 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
@@ -10,6 +10,7 @@ define(function(require) {
     var ViewNameModal = require('./view-name-modal');
     var mediator = require('oroui/js/mediator');
     var DeleteConfirmation = require('oroui/js/delete-confirmation');
+    var routing = require('routing');
 
     /**
      * Datagrid views widget
@@ -397,10 +398,8 @@ define(function(require) {
                 }),
                 {},
                 function(response) {
-                    // TODO how we can remove this fix with labels?
-                    // for now we need to get label from choices to save specifically built labels(shared, system)
-                    defaultModel.set({is_default:false, label: self._getView(defaultModel.get('name')).label});
-                    currentViewModel.set({is_default:true, label: self._getView(currentViewModel.get('name')).label});
+                    defaultModel.set({is_default:false});
+                    currentViewModel.set({is_default:true});
                     self._showFlashMessage('success', __('oro.datagrid.gridView.updated'));
                 }
             );

From 59eed8bd60499fac61dd4d52ebbac753e77e21c2 Mon Sep 17 00:00:00 2001
From: Hryhorii Hrebiniuk <grebinuk@gmail.com>
Date: Tue, 29 Dec 2015 14:37:36 +0200
Subject: [PATCH 311/471] BAP-9620: Grids have a lot space between checkbox and
 first column

---
 .../DataGridBundle/Resources/public/css/less/oro.grid.less     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/oro.grid.less b/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/oro.grid.less
index fecc7048145..7026c0604a3 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/oro.grid.less
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/oro.grid.less
@@ -328,6 +328,9 @@ td > .nowrap-ellipsis {
     padding: 0;
   }
 }
+.select-all-header-cell {
+  width: 40px;
+}
 .action-cell .more-bar-holder .dropdown-toggle {
   margin-left: 5px;
 }

From 270c59c6c37e786f27cdc7940b0ecb2bdc88794f Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Tue, 29 Dec 2015 14:52:29 +0200
Subject: [PATCH 312/471] BAP-9577:Add option 'Use as default' to views options
  - Code review fixes

---
 .../DataGridBundle/Controller/Api/Rest/GridViewController.php | 4 ++--
 .../Entity/Manager/GridViewApiEntityManager.php               | 2 +-
 .../Resources/public/js/datagrid/grid-views/view.js           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Controller/Api/Rest/GridViewController.php b/src/Oro/Bundle/DataGridBundle/Controller/Api/Rest/GridViewController.php
index ce54b905cae..182c4e5207a 100644
--- a/src/Oro/Bundle/DataGridBundle/Controller/Api/Rest/GridViewController.php
+++ b/src/Oro/Bundle/DataGridBundle/Controller/Api/Rest/GridViewController.php
@@ -129,12 +129,12 @@ public function deleteAction($id)
      *     permission="VIEW"
      * )
      */
-    public function setDefaultAction($id, $default = false)
+    public function defaultAction($id, $default = false)
     {
         /** @var GridView $gridView */
         $manager  = $this->getManager();
         $gridView = $manager->find($id);
-        $manager->setGridViewDefault($this->getUser(), $gridView, $default);
+        $manager->setDefaultGridView($this->getUser(), $gridView, $default);
 
         return new JsonResponse([], Codes::HTTP_NO_CONTENT);
     }
diff --git a/src/Oro/Bundle/DataGridBundle/Entity/Manager/GridViewApiEntityManager.php b/src/Oro/Bundle/DataGridBundle/Entity/Manager/GridViewApiEntityManager.php
index 046e606822f..ba59de13218 100644
--- a/src/Oro/Bundle/DataGridBundle/Entity/Manager/GridViewApiEntityManager.php
+++ b/src/Oro/Bundle/DataGridBundle/Entity/Manager/GridViewApiEntityManager.php
@@ -14,7 +14,7 @@ class GridViewApiEntityManager extends ApiEntityManager
      * @param GridView $gridView
      * @param bool     $default
      */
-    public function setGridViewDefault(User $user, GridView $gridView, $default)
+    public function setDefaultGridView(User $user, GridView $gridView, $default)
     {
         /** @var GridViewRepository $repository */
         $repository = $this->getRepository();
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
index d655df30905..75491b4838c 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
@@ -392,7 +392,7 @@ define(function(require) {
                 id = defaultModel.id;
             }
             return $.post(
-                routing.generate('oro_datagrid_api_rest_gridview_set_default', {
+                routing.generate('oro_datagrid_api_rest_gridview_default', {
                     id: id,
                     default: isDefault
                 }),

From 16ac96231a13dce79d540ab9c8c5291c919d04e3 Mon Sep 17 00:00:00 2001
From: Hryhorii Hrebiniuk <grebinuk@gmail.com>
Date: Tue, 29 Dec 2015 14:55:10 +0200
Subject: [PATCH 313/471] CRM-4836: Mobile version doesn't work in the windows
 phone

---
 src/Oro/Bundle/UIBundle/Provider/UserAgent.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/UIBundle/Provider/UserAgent.php b/src/Oro/Bundle/UIBundle/Provider/UserAgent.php
index 39de47ee1d6..52c991a87c9 100644
--- a/src/Oro/Bundle/UIBundle/Provider/UserAgent.php
+++ b/src/Oro/Bundle/UIBundle/Provider/UserAgent.php
@@ -127,7 +127,7 @@ protected function detectMobile($useragent)
         // @codingStandardsIgnoreStart
         $result =
             // all Android devices considered as mobile
-            preg_match('/android|ipad|kindle|silk/i',$useragent)
+            preg_match('/android|webos|ipad|ipod|blackberry|windows phone|iemobile|kindle|silk/i', $useragent)
             // from http://detectmobilebrowsers.com (Regex updated: 1 August 2014)
             || preg_match('/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i',$useragent)
             || preg_match('/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i',substr($useragent,0,4));

From 080d5210a258540c87a91f2c84d533592e406110 Mon Sep 17 00:00:00 2001
From: Oleg Popadko <oleg@popadko.com>
Date: Tue, 29 Dec 2015 15:53:05 +0200
Subject: [PATCH 314/471] BAP-7696: Update jsTree library - add special
 conditions for moving root node to specific bundles

---
 .../UIBundle/Resources/config/requirejs.yml   |  1 +
 ...nent.js => basic-tree-manage-component.js} | 22 +++++++------------
 .../Resources/translations/jsmessages.en.yml  |  3 +--
 3 files changed, 10 insertions(+), 16 deletions(-)
 rename src/Oro/Bundle/UIBundle/Resources/public/js/app/components/{tree-manage-component.js => basic-tree-manage-component.js} (85%)

diff --git a/src/Oro/Bundle/UIBundle/Resources/config/requirejs.yml b/src/Oro/Bundle/UIBundle/Resources/config/requirejs.yml
index 370d6d0f0fa..fb1ba9b0bb8 100644
--- a/src/Oro/Bundle/UIBundle/Resources/config/requirejs.yml
+++ b/src/Oro/Bundle/UIBundle/Resources/config/requirejs.yml
@@ -184,6 +184,7 @@ config:
         'oroui/js/app/components/view-component': 'bundles/oroui/js/app/components/view-component.js'
         'oroui/js/app/components/widget-component': 'bundles/oroui/js/app/components/widget-component.js'
         'oroui/js/app/components/basic-tree-component': 'bundles/oroui/js/app/components/basic-tree-component.js'
+        'oroui/js/app/components/basic-tree-manage-component': 'bundles/oroui/js/app/components/basic-tree-manage-component.js'
         'oroui/js/widget-manager': 'bundles/oroui/js/widget/widget-manager.js'
         'oroui/js/widget/abstract-widget': 'bundles/oroui/js/widget/abstract-widget.js'
         'oro/block-widget': 'bundles/oroui/js/widget/block-widget.js'
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/tree-manage-component.js b/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/basic-tree-manage-component.js
similarity index 85%
rename from src/Oro/Bundle/UIBundle/Resources/public/js/app/components/tree-manage-component.js
rename to src/Oro/Bundle/UIBundle/Resources/public/js/app/components/basic-tree-manage-component.js
index 2267ff0d35e..d044a04e29b 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/tree-manage-component.js
+++ b/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/basic-tree-manage-component.js
@@ -1,7 +1,7 @@
 define(function(require) {
     'use strict';
 
-    var TreeManageComponent;
+    var BasicTreeManageComponent;
     var $ = require('jquery');
     var _ = require('underscore');
     var __ = require('orotranslation/js/translator');
@@ -12,11 +12,11 @@ define(function(require) {
     var BasicTreeComponent = require('oroui/js/app/components/basic-tree-component');
 
     /**
-     * @export oroui/js/app/components/tree-manage-component
+     * @export oroui/js/app/components/basic-tree-manage-component
      * @extends oroui.app.components.BasicTreeComponent
-     * @class oroui.app.components.TreeManageComponent
+     * @class oroui.app.components.BasicTreeManageComponent
      */
-    TreeManageComponent = BasicTreeComponent.extend({
+    BasicTreeManageComponent = BasicTreeComponent.extend({
         /**
          * @property {Boolean}
          */
@@ -46,7 +46,7 @@ define(function(require) {
          * @param {Object} options
          */
         initialize: function(options) {
-            TreeManageComponent.__super__.initialize.call(this, options);
+            BasicTreeManageComponent.__super__.initialize.call(this, options);
             if (!this.$tree) {
                 return;
             }
@@ -104,12 +104,6 @@ define(function(require) {
                 return;
             }
 
-            if (data.parent === '#' && data.old_parent === '#') {
-                this.rollback(data);
-                messenger.notificationFlashMessage('warning', __('oro.ui.jstree.move_root_page_warning'));
-                return;
-            }
-
             var self = this;
             $.ajax({
                 async: false,
@@ -125,7 +119,7 @@ define(function(require) {
                         self.rollback(data);
                         messenger.notificationFlashMessage(
                             'error',
-                            __('oro.ui.jstree.move_page_error', {nodeText: data.node.text})
+                            __('oro.ui.jstree.move_node_error', {nodeText: data.node.text})
                         );
                     } else if (self.reloadWidget) {
                         widgetManager.getWidgetInstanceByAlias(self.reloadWidget, function(widget) {
@@ -158,9 +152,9 @@ define(function(require) {
                 .off('select_node.jstree')
                 .off('move_node.jstree');
 
-            TreeManageComponent.__super__.dispose.call(this);
+            BasicTreeManageComponent.__super__.dispose.call(this);
         }
     });
 
-    return TreeManageComponent;
+    return BasicTreeManageComponent;
 });
diff --git a/src/Oro/Bundle/UIBundle/Resources/translations/jsmessages.en.yml b/src/Oro/Bundle/UIBundle/Resources/translations/jsmessages.en.yml
index 7db22a81b98..a0ec187ae2a 100644
--- a/src/Oro/Bundle/UIBundle/Resources/translations/jsmessages.en.yml
+++ b/src/Oro/Bundle/UIBundle/Resources/translations/jsmessages.en.yml
@@ -79,5 +79,4 @@ oro:
             group_title: Server is being updated and the following changes might be lost
             other: Other
         jstree:
-            move_category_error: "You can not move node {{ nodeText }} here."
-            add_new_root_warning: "You can not create new root category."
+            move_node_error: "You can not move node {{ nodeText }} here."

From 9cde169cf588d6be24da1cd87bac611bd793e8e5 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Tue, 29 Dec 2015 16:33:26 +0200
Subject: [PATCH 315/471] BAP-9579: Process default filters, sorters from grid
 view

---
 .../Manager/GridViewApiEntityManager.php      | 20 ++++++++-
 .../Entity/Repository/GridViewRepository.php  | 44 +++++++++++++------
 .../EventListener/GridViewsLoadListener.php   |  3 +-
 .../GridViews/GridViewsExtension.php          | 32 +++++++++-----
 .../Resources/config/extensions.yml           |  1 +
 .../Resources/config/services.yml             |  1 +
 6 files changed, 74 insertions(+), 27 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Entity/Manager/GridViewApiEntityManager.php b/src/Oro/Bundle/DataGridBundle/Entity/Manager/GridViewApiEntityManager.php
index ba59de13218..e986dff3f28 100644
--- a/src/Oro/Bundle/DataGridBundle/Entity/Manager/GridViewApiEntityManager.php
+++ b/src/Oro/Bundle/DataGridBundle/Entity/Manager/GridViewApiEntityManager.php
@@ -2,13 +2,31 @@
 
 namespace Oro\Bundle\DataGridBundle\Entity\Manager;
 
+use Doctrine\Common\Persistence\ObjectManager;
+
 use Oro\Bundle\DataGridBundle\Entity\GridView;
 use Oro\Bundle\DataGridBundle\Entity\Repository\GridViewRepository;
+use Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper;
 use Oro\Bundle\SoapBundle\Entity\Manager\ApiEntityManager;
 use Oro\Bundle\UserBundle\Entity\User;
 
 class GridViewApiEntityManager extends ApiEntityManager
 {
+    /** @var AclHelper */
+    protected $aclHelper;
+
+    /**
+     * @param string        $class Entity name
+     * @param ObjectManager $om    Object manager
+     * @param AclHelper     $aclHelper
+     */
+    public function __construct($class, ObjectManager $om, AclHelper $aclHelper)
+    {
+        parent::__construct($class, $om);
+
+        $this->aclHelper = $aclHelper;
+    }
+
     /**
      * @param User     $user
      * @param GridView $gridView
@@ -18,7 +36,7 @@ public function setDefaultGridView(User $user, GridView $gridView, $default)
     {
         /** @var GridViewRepository $repository */
         $repository = $this->getRepository();
-        $gridViews = $repository->findDefaultGridViews($user, $gridView);
+        $gridViews  = $repository->findDefaultGridViews($this->aclHelper, $user, $gridView, false);
 
         foreach ($gridViews as $view) {
             $view->removeUser($user);
diff --git a/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php b/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php
index c401cb85db1..6fd193f725e 100644
--- a/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php
+++ b/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php
@@ -40,51 +40,69 @@ public function findGridViews(AclHelper $aclHelper, UserInterface $user, $gridNa
     }
 
     /**
+     * @param AclHelper $aclHelper
      * @param User   $user
      * @param string $gridName
      *
      * @return GridView|null
      */
-    public function findDefaultGridView(User $user, $gridName)
+    public function findDefaultGridView(AclHelper $aclHelper, User $user, $gridName)
     {
         $qb = $this->getFindDefaultGridViewQb($user, $gridName);
+        $qb->setMaxResults(1);
 
-        return $qb->setMaxResults(1)->getQuery()->getOneOrNullResult();
+        return $aclHelper->apply($qb)->getOneOrNullResult();
     }
 
     /**
+     * @param AclHelper $aclHelper
      * @param User     $user
      * @param GridView $gridView
+     * @param bool     $checkOwner
      *
      * @return GridView[]
      */
-    public function findDefaultGridViews(User $user, GridView $gridView)
+    public function findDefaultGridViews(AclHelper $aclHelper, User $user, GridView $gridView, $checkOwner = true)
     {
         /** @var GridView[] $defaultGridViews */
-        $defaultGridViews = $this
-            ->getFindDefaultGridViewQb($user, $gridView->getGridName())
-            ->getQuery()
-            ->getResult();
+        $qb = $this->getFindDefaultGridViewQb($user, $gridView->getGridName(), $checkOwner);
 
-        return $defaultGridViews;
+        return $aclHelper->apply($qb)->getOneOrNullResult()->getResult();
     }
 
     /**
      * @param User   $user
      * @param string $gridName
+     * @param bool   $checkOwner
      *
      * @return QueryBuilder
      */
-    protected function getFindDefaultGridViewQb(User $user, $gridName)
+    protected function getFindDefaultGridViewQb(User $user, $gridName, $checkOwner = true)
     {
         $qb = $this->createQueryBuilder('gv');
         $qb->innerJoin('gv.users', 'u')
             ->where('gv.gridName = :gridName')
             ->andWhere('u = :user')
-            ->setParameters([
-                'gridName' => $gridName,
-                'user'     => $user
-            ]);
+            ->setParameters(
+                [
+                    'gridName' => $gridName,
+                    'user'     => $user,
+                ]
+            );
+
+        if ($checkOwner) {
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    'gv.owner = :owner',
+                    'gv.type = :public'
+                )
+            )->setParameters(
+                [
+                    'owner'  => $user,
+                    'public' => GridView::TYPE_PUBLIC
+                ]
+            );
+        }
 
         return $qb;
     }
diff --git a/src/Oro/Bundle/DataGridBundle/EventListener/GridViewsLoadListener.php b/src/Oro/Bundle/DataGridBundle/EventListener/GridViewsLoadListener.php
index 284143609ee..cbb1f3f3336 100644
--- a/src/Oro/Bundle/DataGridBundle/EventListener/GridViewsLoadListener.php
+++ b/src/Oro/Bundle/DataGridBundle/EventListener/GridViewsLoadListener.php
@@ -57,7 +57,7 @@ public function onViewsLoad(GridViewsLoadEvent $event)
 
         $gridViewRepository = $this->getGridViewRepository();
         $gridViews          = $gridViewRepository->findGridViews($this->aclHelper, $currentUser, $gridName);
-        $defaultGridView    = $gridViewRepository->findDefaultGridView($currentUser, $gridName);
+        $defaultGridView    = $gridViewRepository->findDefaultGridView($this->aclHelper, $currentUser, $gridName);
         if (!$gridViews) {
             return;
         }
@@ -76,6 +76,7 @@ public function onViewsLoad(GridViewsLoadEvent $event)
             ];
         }
 
+        /** @var array $newGridViews */
         $newGridViews            = $event->getGridViews();
         $newGridViews['choices'] = array_merge($newGridViews['choices'], $choices);
         $newGridViews['views']   = array_merge($newGridViews['views'], $views);
diff --git a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
index 0ea6281e7a8..9836c0f5220 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
@@ -7,6 +7,7 @@
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 
+use Oro\Bundle\DataGridBundle\Entity\GridView;
 use Oro\Bundle\DataGridBundle\Event\GridViewsLoadEvent;
 use Oro\Bundle\DataGridBundle\Extension\AbstractExtension;
 use Oro\Bundle\DataGridBundle\Datagrid\ParameterBag;
@@ -14,7 +15,7 @@
 use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
 
 use Oro\Bundle\SecurityBundle\SecurityFacade;
-use Oro\Bundle\DataGridBundle\Entity\GridView;
+use Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper;
 
 class GridViewsExtension extends AbstractExtension
 {
@@ -38,6 +39,9 @@ class GridViewsExtension extends AbstractExtension
     /** @var ManagerRegistry */
     protected $registry;
 
+    /** @var AclHelper */
+    protected $aclHelper;
+
     /** @var GridView|null */
     protected $defaultGridView;
 
@@ -46,17 +50,20 @@ class GridViewsExtension extends AbstractExtension
      * @param SecurityFacade           $securityFacade
      * @param TranslatorInterface      $translator
      * @param ManagerRegistry          $registry
+     * @param AclHelper                $aclHelper
      */
     public function __construct(
         EventDispatcherInterface $eventDispatcher,
         SecurityFacade $securityFacade,
         TranslatorInterface $translator,
-        ManagerRegistry $registry
+        ManagerRegistry $registry,
+        AclHelper $aclHelper
     ) {
         $this->eventDispatcher = $eventDispatcher;
         $this->securityFacade  = $securityFacade;
         $this->translator      = $translator;
         $this->registry        = $registry;
+        $this->aclHelper       = $aclHelper;
     }
 
     /**
@@ -102,26 +109,26 @@ public function visitMetadata(DatagridConfiguration $config, MetadataObject $dat
         }
 
         /** @var AbstractViewsList $list */
-        $list          = $config->offsetGetOr(self::VIEWS_LIST_KEY, false);
-        $systemAllView = new View(self::DEFAULT_VIEW_ID);
-        $systemAllView->setDefault($currentViewId === self::DEFAULT_VIEW_ID);
+        $list           = $config->offsetGetOr(self::VIEWS_LIST_KEY, false);
+        $systemGridView = new View(self::DEFAULT_VIEW_ID);
+        $systemGridView->setDefault($currentViewId === self::DEFAULT_VIEW_ID);
 
-        $gridViews     = [
+        $gridViews = [
             'choices' => [
                 [
                     'label' => $allLabel,
                     'value' => self::DEFAULT_VIEW_ID,
                 ],
             ],
-            'views' => [
-                $systemAllView->getMetadata()
+            'views'   => [
+                $systemGridView->getMetadata()
             ],
         ];
         if ($list !== false) {
-            $configuredGridViews = $list->getMetadata();
-            $configuredGridViews['views'] = array_merge($gridViews['views'], $configuredGridViews['views']);
+            $configuredGridViews            = $list->getMetadata();
+            $configuredGridViews['views']   = array_merge($gridViews['views'], $configuredGridViews['views']);
             $configuredGridViews['choices'] = array_merge($gridViews['choices'], $configuredGridViews['choices']);
-            $gridViews = $configuredGridViews;
+            $gridViews                      = $configuredGridViews;
         }
 
         if ($this->eventDispatcher->hasListeners(GridViewsLoadEvent::EVENT_NAME)) {
@@ -130,7 +137,7 @@ public function visitMetadata(DatagridConfiguration $config, MetadataObject $dat
             $gridViews = $event->getGridViews();
         }
 
-        $gridViews['gridName'] = $config->getName();
+        $gridViews['gridName']    = $config->getName();
         $gridViews['permissions'] = $this->getPermissions();
         $data->offsetAddToArray('gridViews', $gridViews);
     }
@@ -182,6 +189,7 @@ protected function getDefaultView($gridName)
         ) {
             $repository      = $this->registry->getRepository('OroDataGridBundle:GridView');
             $defaultGridView = $repository->findDefaultGridView(
+                $this->aclHelper,
                 $this->securityFacade->getLoggedUser(),
                 $gridName
             );
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/config/extensions.yml b/src/Oro/Bundle/DataGridBundle/Resources/config/extensions.yml
index 36db2fc128b..e3e81770057 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/config/extensions.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/config/extensions.yml
@@ -90,6 +90,7 @@ services:
             - @oro_security.security_facade
             - @translator
             - @doctrine
+            - @oro_security.acl_helper
         tags:
             - { name: oro_datagrid.extension }
 
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/config/services.yml b/src/Oro/Bundle/DataGridBundle/Resources/config/services.yml
index 2868192bbf0..c9213c89983 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/config/services.yml
@@ -155,6 +155,7 @@ services:
         arguments:
             - %oro_datagrid.grid_view.entity.class%
             - @doctrine.orm.entity_manager
+            - @oro_security.acl_helper
 
     oro_datagrid.form.grid_view.api:
         class:                        Symfony\Component\Form\Form

From 8433cc6069c8c77e207e004289bd695719a92dc0 Mon Sep 17 00:00:00 2001
From: Oleg Popadko <oleg@popadko.com>
Date: Tue, 29 Dec 2015 17:28:34 +0200
Subject: [PATCH 316/471] BAP-7696: Update jsTree library - remove
 self._fixContainerHeight

---
 .../js/app/components/basic-tree-component.js | 37 -------------------
 .../components/basic-tree-manage-component.js |  2 -
 2 files changed, 39 deletions(-)

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/basic-tree-component.js b/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/basic-tree-component.js
index acf353ae212..13da6f451b5 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/basic-tree-component.js
+++ b/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/basic-tree-component.js
@@ -72,8 +72,6 @@ define(function(require) {
                 self._resolveDeferredInit();
                 self.initialization = false;
             });
-
-            self._fixContainerHeight();
         },
 
         /**
@@ -100,41 +98,6 @@ define(function(require) {
                 state.core.selected = [];
             }
             return state;
-        },
-
-        /**
-         * Fix scrollable container height
-         * TODO: This method should be removed during fixing of https://magecore.atlassian.net/browse/BB-336
-         *
-         */
-        _fixContainerHeight: function() {
-            var tree = this.$tree.parent();
-            if (!tree.hasClass('category-tree')) {
-                return;
-            }
-
-            var container = tree.parent();
-            if (!container.hasClass('category-container')) {
-                return;
-            }
-
-            var fixHeight = function() {
-                var anchor = $('#bottom-anchor').position().top;
-                var container = container.position().top;
-                var debugBarHeight = $('.sf-toolbar:visible').height() || 0;
-                var footerHeight = $('#footer:visible').height() || 0;
-                var fixContent = 1;
-
-                tree.height(anchor - container - debugBarHeight - footerHeight + fixContent);
-            };
-
-            layout.onPageRendered(fixHeight);
-            $(window).on('resize', _.debounce(fixHeight, 50));
-            mediator.on('page:afterChange', fixHeight);
-            mediator.on('layout:adjustReloaded', fixHeight);
-            mediator.on('layout:adjustHeight', fixHeight);
-
-            fixHeight();
         }
     });
 
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/basic-tree-manage-component.js b/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/basic-tree-manage-component.js
index d044a04e29b..657ca136e26 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/basic-tree-manage-component.js
+++ b/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/basic-tree-manage-component.js
@@ -58,8 +58,6 @@ define(function(require) {
 
             this.$tree.on('select_node.jstree', _.bind(this.onSelect, this));
             this.$tree.on('move_node.jstree', _.bind(this.onMove, this));
-
-            this._fixContainerHeight();
         },
 
         /**

From fa9b5b81291ea7c59995ce03b6dc35d0281b25fd Mon Sep 17 00:00:00 2001
From: Vladimir Polischuk <vladimir.polischuk@eltrino.com>
Date: Tue, 29 Dec 2015 17:35:57 +0200
Subject: [PATCH 317/471] Text correction in the Tag block

---
 src/Oro/Bundle/TagBundle/Resources/translations/messages.en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/TagBundle/Resources/translations/messages.en.yml b/src/Oro/Bundle/TagBundle/Resources/translations/messages.en.yml
index a936aba36d7..a254727c3e8 100644
--- a/src/Oro/Bundle/TagBundle/Resources/translations/messages.en.yml
+++ b/src/Oro/Bundle/TagBundle/Resources/translations/messages.en.yml
@@ -11,7 +11,7 @@ oro:
             tag.saved.message: "Tag saved"
         form:
             choose_tag: "Choose a tag"
-            choose_or_create_tag: "Select an existing tag or create new"
+            choose_or_create_tag: "Select an existing tag or create a new one"
         datagrid:
             usage_count: Usage Count
             search:      Search by tag

From 7700e6753a4077ca8075a8fab5230b2460ed3a1e Mon Sep 17 00:00:00 2001
From: Hryhorii Hrebiniuk <hhrebiniuk@magecore.com>
Date: Tue, 29 Dec 2015 17:25:27 +0200
Subject: [PATCH 318/471] CRM-4838: Broken context view on mobile

---
 .../Resources/config/assets.yml               |  2 +-
 .../{style.less => activity-context.less}     |  3 --
 .../Resources/public/css/less/main.less       |  3 ++
 .../css/less/mobile/activity-context.less     | 49 +++++++++++++++++++
 .../public/css/less/mobile/main.less          |  4 ++
 .../public/css/less/mobile/activity-list.less |  3 --
 6 files changed, 57 insertions(+), 7 deletions(-)
 rename src/Oro/Bundle/ActivityBundle/Resources/public/css/less/{style.less => activity-context.less} (96%)
 create mode 100644 src/Oro/Bundle/ActivityBundle/Resources/public/css/less/main.less
 create mode 100644 src/Oro/Bundle/ActivityBundle/Resources/public/css/less/mobile/activity-context.less
 create mode 100644 src/Oro/Bundle/ActivityBundle/Resources/public/css/less/mobile/main.less

diff --git a/src/Oro/Bundle/ActivityBundle/Resources/config/assets.yml b/src/Oro/Bundle/ActivityBundle/Resources/config/assets.yml
index fca15891bf9..1882abb6b81 100644
--- a/src/Oro/Bundle/ActivityBundle/Resources/config/assets.yml
+++ b/src/Oro/Bundle/ActivityBundle/Resources/config/assets.yml
@@ -1,3 +1,3 @@
 css:
     'oroactivity':
-        - 'bundles/oroactivity/css/less/style.less'
+        - 'bundles/oroactivity/css/less/main.less'
diff --git a/src/Oro/Bundle/ActivityBundle/Resources/public/css/less/style.less b/src/Oro/Bundle/ActivityBundle/Resources/public/css/less/activity-context.less
similarity index 96%
rename from src/Oro/Bundle/ActivityBundle/Resources/public/css/less/style.less
rename to src/Oro/Bundle/ActivityBundle/Resources/public/css/less/activity-context.less
index b5c0819ad79..9f6c7da9686 100644
--- a/src/Oro/Bundle/ActivityBundle/Resources/public/css/less/style.less
+++ b/src/Oro/Bundle/ActivityBundle/Resources/public/css/less/activity-context.less
@@ -1,5 +1,3 @@
-@import "oroui/css/less/mixins";
-
 .activity-list-widget {
   .activity-context-activity-list {
     padding: 0 @horizontalPadding;
@@ -23,7 +21,6 @@
 .context-item {
   list-style: none;
   cursor: pointer;
-  padding: 0 7px 0 7px;
   white-space: nowrap;
 }
 
diff --git a/src/Oro/Bundle/ActivityBundle/Resources/public/css/less/main.less b/src/Oro/Bundle/ActivityBundle/Resources/public/css/less/main.less
new file mode 100644
index 00000000000..d46d55814c3
--- /dev/null
+++ b/src/Oro/Bundle/ActivityBundle/Resources/public/css/less/main.less
@@ -0,0 +1,3 @@
+@import "oroui/css/less/mixins";
+@import "./activity-context";
+@import "./mobile/main";
diff --git a/src/Oro/Bundle/ActivityBundle/Resources/public/css/less/mobile/activity-context.less b/src/Oro/Bundle/ActivityBundle/Resources/public/css/less/mobile/activity-context.less
new file mode 100644
index 00000000000..1966bc4cb88
--- /dev/null
+++ b/src/Oro/Bundle/ActivityBundle/Resources/public/css/less/mobile/activity-context.less
@@ -0,0 +1,49 @@
+// e.g. inside a page header
+.activity-context-activity-block {
+  .activity-context-activity {
+    width: 100%;
+    .activity-context-activity-label,
+    .activity-context-activity-items {
+      font-size: inherit;
+      line-height: inherit;
+    }
+    .activity-context-activity-items .context-item {
+      font-size: inherit;
+    }
+  }
+}
+
+// e.g. inside activity list widget
+.activity-context-activity-list {
+  margin-bottom: 7px;
+  .activity-context-activity-label,
+  .activity-context-activity-items {
+    font-size: 13px;
+    line-height: 1.2em;
+  }
+  .activity-context-activity-label {
+    margin-bottom: 5px;
+    color: #777;
+    float: none;
+    text-align: left;
+  }
+  .activity-context-activity-items {
+    margin-left: 0;
+    padding-left: 5px;
+    .context-item {
+      font-size: inherit;
+      line-height: inherit;
+    }
+  }
+}
+
+.activity-list-widget {
+  .activity-context-activity-list {
+    padding: 0 @contentPadding;
+  }
+  .responsive-cell {
+    .activity-context-activity-list {
+      padding: 0;
+    }
+  }
+}
diff --git a/src/Oro/Bundle/ActivityBundle/Resources/public/css/less/mobile/main.less b/src/Oro/Bundle/ActivityBundle/Resources/public/css/less/mobile/main.less
new file mode 100644
index 00000000000..83096550294
--- /dev/null
+++ b/src/Oro/Bundle/ActivityBundle/Resources/public/css/less/mobile/main.less
@@ -0,0 +1,4 @@
+.mobile-version {
+  @import "oroui/css/less/mobile/variables";
+  @import "./activity-context";
+}
diff --git a/src/Oro/Bundle/ActivityListBundle/Resources/public/css/less/mobile/activity-list.less b/src/Oro/Bundle/ActivityListBundle/Resources/public/css/less/mobile/activity-list.less
index 93333ccb0c5..326f32a09eb 100644
--- a/src/Oro/Bundle/ActivityListBundle/Resources/public/css/less/mobile/activity-list.less
+++ b/src/Oro/Bundle/ActivityListBundle/Resources/public/css/less/mobile/activity-list.less
@@ -1,7 +1,4 @@
 .activity-list-widget {
-  .activity-context-activity-list {
-    padding: 0 @contentPadding;
-  }
   .activity-list {
     .info {
       margin-bottom: @contentPadding;

From 85692092a2ac73994a564101d41068303dd6a522 Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Tue, 29 Dec 2015 17:39:50 +0200
Subject: [PATCH 319/471] CRM-4318: fix delete and add functionality

---
 .../Resources/public/css/less/dashboard.less  |  2 +-
 .../Resources/public/js/items/view.js         | 12 +++++++-----
 .../Resources/views/Js/items.html.twig        | 19 +++++++++++--------
 .../public/js/items-manager/table.js          |  5 +++--
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
index fbb575ab012..7986ccb2792 100644
--- a/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
+++ b/src/Oro/Bundle/DashboardBundle/Resources/public/css/less/dashboard.less
@@ -576,7 +576,7 @@
       width: initial;
     }
     .action-column {
-      width: 110px;
+      width: 116px;
       text-align: center;
     }
     .action-cell .btn {
diff --git a/src/Oro/Bundle/DashboardBundle/Resources/public/js/items/view.js b/src/Oro/Bundle/DashboardBundle/Resources/public/js/items/view.js
index 2d64c41c9f2..8049a2e7e15 100644
--- a/src/Oro/Bundle/DashboardBundle/Resources/public/js/items/view.js
+++ b/src/Oro/Bundle/DashboardBundle/Resources/public/js/items/view.js
@@ -29,6 +29,7 @@ define([
         ],
 
         items: null,
+        filteredItems: null,
         itemSelect: null,
 
         initialize: function(options) {
@@ -92,10 +93,8 @@ define([
                 return model.get('order');
             };
             var $itemContainer = this.$('.item-container');
-            var showedItems    = items.where({show: true}).map(function(model) {
-                return model.toJSON();
-            });
-            var filteredItems  = new ItemCollection(showedItems, {comparator: comparator});
+            var showedItems    = items.where({show: true});
+            var filteredItems = this.filteredItems  = new ItemCollection(showedItems, {comparator: comparator});
 
             $itemContainer.itemsManagerTable({
                 itemTemplate: Backbone.$(this.itemTplSelector).html(),
@@ -119,6 +118,8 @@ define([
             items.on('change:show', function(model) {
                 if (model.get('show')) {
                     filteredItems.add(model);
+                    filteredItems.trigger('reset');
+                    filteredItems.trigger('sort');
                 } else {
                     filteredItems.remove(model);
                 }
@@ -171,7 +172,7 @@ define([
         _moveModel: function(model, shift) {
             var order;
             var targetModel;
-            var collection = model.collection;
+            var collection = this.filteredItems;
             var targetIndex = collection.indexOf(model) + shift;
             if (targetIndex >= 0 && targetIndex < collection.length) {
                 targetModel = collection.at(targetIndex);
@@ -180,6 +181,7 @@ define([
                 targetModel.set('order', order);
                 collection.sort();
                 collection.trigger('reset');
+                collection.trigger('sort');
             }
         }
     });
diff --git a/src/Oro/Bundle/DashboardBundle/Resources/views/Js/items.html.twig b/src/Oro/Bundle/DashboardBundle/Resources/views/Js/items.html.twig
index 55388a75f38..20b29606333 100644
--- a/src/Oro/Bundle/DashboardBundle/Resources/views/Js/items.html.twig
+++ b/src/Oro/Bundle/DashboardBundle/Resources/views/Js/items.html.twig
@@ -16,22 +16,25 @@
             <input type="hidden" name="<%= namePrefix %>[id]" value="<%= id %>">
             <input data-name="order" type="hidden" class="order" name="<%= namePrefix %>[order]" value="<%= order %>">
             <input class="hide" data-name="show" type="checkbox" name="<%= namePrefix %>[show]" <%= show ? 'checked' : '' %>>
-            <a href="javascript: void(0);" class="action no-hash delete-button"
-                    title="{{ 'oro.dashboard.datagrid.actions.delete.label'|trans }}"
-                    data-collection-action="delete">
+            <% if (_.isMobile()) { %>
+            <span class="btn delete-button" data-collection-action="delete" title="{{ 'oro.dashboard.datagrid.actions.move_column_up.label'|trans }}">
                 <i class="icon-trash hide-text"></i>
-            </a>
-            <% if (!_.isMobile()) { %>
-            <span title="{{ 'oro.dashboard.datagrid.actions.move_column.label'|trans }}">
-                <i class="icon-resize-vertical handle"></i>
             </span>
-            <% } else { %>
             <span class="btn move-up<% if (isFirst) { %> disabled<% } %>" data-collection-action="moveUp" title="{{ 'oro.dashboard.datagrid.actions.move_column_up.label'|trans }}">
                 <i class="icon-chevron-up"></i>
             </span>
             <span class="btn move-down<% if (isLast) { %> disabled<% } %>" data-collection-action="moveDown" title="{{ 'oro.dashboard.datagrid.actions.move_column_down.label'|trans }}">
                 <i class="icon-chevron-down"></i>
             </span>
+            <% } else { %>
+            <a href="javascript: void(0);" class="action no-hash delete-button"
+               title="{{ 'oro.dashboard.datagrid.actions.delete.label'|trans }}"
+               data-collection-action="delete">
+                <i class="icon-trash hide-text"></i>
+            </a>
+            <span title="{{ 'oro.dashboard.datagrid.actions.move_column.label'|trans }}">
+                <i class="icon-resize-vertical handle"></i>
+            </span>
             <% } %>
         </td>
     </tr>
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/items-manager/table.js b/src/Oro/Bundle/UIBundle/Resources/public/js/items-manager/table.js
index 1f50486e1a1..4fae8d40601 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/js/items-manager/table.js
+++ b/src/Oro/Bundle/UIBundle/Resources/public/js/items-manager/table.js
@@ -161,11 +161,12 @@ define(['jquery', 'underscore', 'oroui/js/mediator', 'jquery-ui'], function($, _
         },
 
         _renderModel: function(model) {
-            var index = model.collection.indexOf(model);
+            var collection = this.options.collection;
+            var index = collection.indexOf(model);
             var data = _.extend({
                 cid: model.cid,
                 isFirst: index === 0,
-                isLast: index === model.collection.length -1
+                isLast: index === collection.length -1
             }, model.toJSON());
             return this._itemRender(this.itemTemplate, data);
         },

From 8260538aadb6b61540ec165e1ba66c8b90079c32 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Tue, 29 Dec 2015 17:59:38 +0200
Subject: [PATCH 320/471] BAP-9579: Process default filters, sorters from grid
 view

---
 .../Entity/Repository/GridViewRepository.php  | 58 +++++++++++--------
 .../GridViews/GridViewsExtension.php          | 44 +++++++-------
 2 files changed, 55 insertions(+), 47 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php b/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php
index 6fd193f725e..7af06d760cd 100644
--- a/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php
+++ b/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php
@@ -14,9 +14,9 @@
 class GridViewRepository extends EntityRepository
 {
     /**
-     * @param AclHelper $aclHelper
+     * @param AclHelper     $aclHelper
      * @param UserInterface $user
-     * @param string $gridName
+     * @param string        $gridName
      *
      * @return GridView[]
      */
@@ -25,15 +25,19 @@ public function findGridViews(AclHelper $aclHelper, UserInterface $user, $gridNa
         $qb = $this->createQueryBuilder('gv');
         $qb
             ->andWhere('gv.gridName = :gridName')
-            ->andWhere($qb->expr()->orX(
-                'gv.owner = :owner',
-                'gv.type = :public'
-            ))
-            ->setParameters([
-                'gridName' => $gridName,
-                'owner'    => $user,
-                'public'   => GridView::TYPE_PUBLIC,
-            ])
+            ->andWhere(
+                $qb->expr()->orX(
+                    'gv.owner = :owner',
+                    'gv.type = :public'
+                )
+            )
+            ->setParameters(
+                [
+                    'gridName' => $gridName,
+                    'owner'    => $user,
+                    'public'   => GridView::TYPE_PUBLIC,
+                ]
+            )
             ->orderBy('gv.gridName');
 
         return $aclHelper->apply($qb)->getResult();
@@ -41,8 +45,8 @@ public function findGridViews(AclHelper $aclHelper, UserInterface $user, $gridNa
 
     /**
      * @param AclHelper $aclHelper
-     * @param User   $user
-     * @param string $gridName
+     * @param User      $user
+     * @param string    $gridName
      *
      * @return GridView|null
      */
@@ -56,9 +60,9 @@ public function findDefaultGridView(AclHelper $aclHelper, User $user, $gridName)
 
     /**
      * @param AclHelper $aclHelper
-     * @param User     $user
-     * @param GridView $gridView
-     * @param bool     $checkOwner
+     * @param User      $user
+     * @param GridView  $gridView
+     * @param bool      $checkOwner
      *
      * @return GridView[]
      */
@@ -67,7 +71,7 @@ public function findDefaultGridViews(AclHelper $aclHelper, User $user, GridView
         /** @var GridView[] $defaultGridViews */
         $qb = $this->getFindDefaultGridViewQb($user, $gridView->getGridName(), $checkOwner);
 
-        return $aclHelper->apply($qb)->getOneOrNullResult()->getResult();
+        return $aclHelper->apply($qb)->getResult();
     }
 
     /**
@@ -79,16 +83,15 @@ public function findDefaultGridViews(AclHelper $aclHelper, User $user, GridView
      */
     protected function getFindDefaultGridViewQb(User $user, $gridName, $checkOwner = true)
     {
+        $parameters = [
+            'gridName' => $gridName,
+            'user'     => $user,
+        ];
+
         $qb = $this->createQueryBuilder('gv');
         $qb->innerJoin('gv.users', 'u')
             ->where('gv.gridName = :gridName')
-            ->andWhere('u = :user')
-            ->setParameters(
-                [
-                    'gridName' => $gridName,
-                    'user'     => $user,
-                ]
-            );
+            ->andWhere('u = :user');
 
         if ($checkOwner) {
             $qb->andWhere(
@@ -96,7 +99,10 @@ protected function getFindDefaultGridViewQb(User $user, $gridName, $checkOwner =
                     'gv.owner = :owner',
                     'gv.type = :public'
                 )
-            )->setParameters(
+            );
+
+            $parameters = array_merge(
+                $parameters,
                 [
                     'owner'  => $user,
                     'public' => GridView::TYPE_PUBLIC
@@ -104,6 +110,8 @@ protected function getFindDefaultGridViewQb(User $user, $gridName, $checkOwner =
             );
         }
 
+        $qb->setParameters($parameters);
+
         return $qb;
     }
 }
diff --git a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
index 9836c0f5220..a2ce3b183a2 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
@@ -97,8 +97,8 @@ protected function isDisabled()
      */
     public function visitMetadata(DatagridConfiguration $config, MetadataObject $data)
     {
-        $currentViewId = $this->getCurrentViewId($config);
-        $this->setDefaultParams($config);
+        $currentViewId = $this->getCurrentViewId($config->getName());
+        $this->setDefaultParams($config->getName());
 
         $data->offsetAddToArray('initialState', ['gridView' => self::DEFAULT_VIEW_ID]);
         $data->offsetAddToArray('state', ['gridView' => $currentViewId]);
@@ -111,7 +111,7 @@ public function visitMetadata(DatagridConfiguration $config, MetadataObject $dat
         /** @var AbstractViewsList $list */
         $list           = $config->offsetGetOr(self::VIEWS_LIST_KEY, false);
         $systemGridView = new View(self::DEFAULT_VIEW_ID);
-        $systemGridView->setDefault($currentViewId === self::DEFAULT_VIEW_ID);
+        $systemGridView->setDefault($this->getDefaultViewId($config->getName()) === null);
 
         $gridViews = [
             'choices' => [
@@ -145,33 +145,34 @@ public function visitMetadata(DatagridConfiguration $config, MetadataObject $dat
     /**
      * Gets id for current grid view
      *
-     * @param DatagridConfiguration $config
+     * @param string $gridName
      *
      * @return int|string
      */
-    protected function getCurrentViewId(DatagridConfiguration $config)
+    protected function getCurrentViewId($gridName)
     {
         $params = $this->getParameters()->get(ParameterBag::ADDITIONAL_PARAMETERS, []);
         if (isset($params[self::VIEWS_PARAM_KEY])) {
             return (int)$params[self::VIEWS_PARAM_KEY];
         } else {
-            return $this->getDefaultViewId($config->getName());
+            $defaultViewId = $this->getDefaultViewId($gridName);
+
+            return $defaultViewId ? $defaultViewId : self::DEFAULT_VIEW_ID;
         }
     }
 
     /**
      * Gets id for defined as default grid view for current logged user.
-     * If is not defined returns id for raw configured grid.
      *
      * @param string $gridName
      *
-     * @return int|string
+     * @return int|null
      */
     protected function getDefaultViewId($gridName)
     {
         $defaultGridView = $this->getDefaultView($gridName);
 
-        return $defaultGridView ? $defaultGridView->getId() : self::DEFAULT_VIEW_ID;
+        return $defaultGridView ? $defaultGridView->getId() : null;
     }
 
     /**
@@ -183,10 +184,7 @@ protected function getDefaultViewId($gridName)
      */
     protected function getDefaultView($gridName)
     {
-
-        if ($this->defaultGridView === null &&
-            $this->securityFacade->isGranted('oro_datagrid_gridview_view')
-        ) {
+        if ($this->defaultGridView === null) {
             $repository      = $this->registry->getRepository('OroDataGridBundle:GridView');
             $defaultGridView = $repository->findDefaultGridView(
                 $this->aclHelper,
@@ -204,18 +202,20 @@ protected function getDefaultView($gridName)
      * Sets default parameters.
      * Added filters and sorters for defined as default grid view for current logged user.
      *
-     * @param DatagridConfiguration $config
+     * @param string $gridName
      */
-    protected function setDefaultParams(DatagridConfiguration $config)
+    protected function setDefaultParams($gridName)
     {
         $params = $this->getParameters()->get(ParameterBag::ADDITIONAL_PARAMETERS, []);
-
-        $params[self::VIEWS_PARAM_KEY] = $this->getDefaultViewId($config->getName());
-
-        $defaultGridView = $this->getDefaultView($config->getName());
-        if ($defaultGridView) {
-            $this->getParameters()->mergeKey('_filter', $defaultGridView->getFiltersData());
-            $this->getParameters()->mergeKey('_sort_by', $defaultGridView->getSortersData());
+        if (!isset($params[self::VIEWS_PARAM_KEY])) {
+            $currentViewId                 = $this->getCurrentViewId($gridName);
+            $params[self::VIEWS_PARAM_KEY] = $currentViewId;
+
+            $defaultGridView = $this->getDefaultView($gridName);
+            if ($defaultGridView) {
+                $this->getParameters()->mergeKey('_filter', $defaultGridView->getFiltersData());
+                $this->getParameters()->mergeKey('_sort_by', $defaultGridView->getSortersData());
+            }
         }
         $this->getParameters()->set(ParameterBag::ADDITIONAL_PARAMETERS, $params);
     }

From 2d50f27c15d3e68da0fe5eb9a7f0c2aacbe8623b Mon Sep 17 00:00:00 2001
From: Oleg Popadko <oleg@popadko.com>
Date: Tue, 29 Dec 2015 18:37:58 +0200
Subject: [PATCH 321/471] BAP-7696: Update jsTree library - add
 _fixContainerHeight

---
 .../js/app/components/basic-tree-component.js | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/basic-tree-component.js b/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/basic-tree-component.js
index 13da6f451b5..28775dfb2d8 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/basic-tree-component.js
+++ b/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/basic-tree-component.js
@@ -72,6 +72,8 @@ define(function(require) {
                 self._resolveDeferredInit();
                 self.initialization = false;
             });
+
+            self._fixContainerHeight();
         },
 
         /**
@@ -98,6 +100,43 @@ define(function(require) {
                 state.core.selected = [];
             }
             return state;
+        },
+
+        /**
+         * Fix scrollable container height
+         * TODO: This method should be removed during fixing of https://magecore.atlassian.net/browse/BB-336
+         *
+         */
+        _fixContainerHeight: function() {
+            var tree = this.$tree.parent();
+            if (!tree.hasClass('tree-component')) {
+                return;
+            }
+
+            var container = tree.parent();
+            if (!container.hasClass('tree-component-container')) {
+                return;
+            }
+
+            console.log(container);
+
+            var fixHeight = function() {
+                var anchor = $('#bottom-anchor').position().top;
+                var containerTop = container.position().top;
+                var debugBarHeight = $('.sf-toolbar:visible').height() || 0;
+                var footerHeight = $('#footer:visible').height() || 0;
+                var fixContent = 1;
+
+                tree.height(anchor - containerTop - debugBarHeight - footerHeight + fixContent);
+            };
+
+            layout.onPageRendered(fixHeight);
+            $(window).on('resize', _.debounce(fixHeight, 50));
+            mediator.on('page:afterChange', fixHeight);
+            mediator.on('layout:adjustReloaded', fixHeight);
+            mediator.on('layout:adjustHeight', fixHeight);
+
+            fixHeight();
         }
     });
 

From 49d4f89363d7336d82b4c7de4a2ea60b9c3f63eb Mon Sep 17 00:00:00 2001
From: AlexandrDmitriev <admitriev@magecore.com>
Date: Tue, 29 Dec 2015 18:48:36 +0200
Subject: [PATCH 322/471] Add helper methods to grid configuration - fix cs

---
 .../DataGridBundle/Datagrid/Common/DatagridConfiguration.php   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Oro/Bundle/DataGridBundle/Datagrid/Common/DatagridConfiguration.php b/src/Oro/Bundle/DataGridBundle/Datagrid/Common/DatagridConfiguration.php
index 2ce3314d429..d0c85f2c4da 100644
--- a/src/Oro/Bundle/DataGridBundle/Datagrid/Common/DatagridConfiguration.php
+++ b/src/Oro/Bundle/DataGridBundle/Datagrid/Common/DatagridConfiguration.php
@@ -7,6 +7,9 @@
 use Oro\Bundle\DataGridBundle\Common\Object;
 use Oro\Bundle\EntityExtendBundle\Tools\ExtendHelper;
 
+/**
+ * @SuppressWarnings(PHPMD.TooManyPublicMethods)
+ */
 class DatagridConfiguration extends Object
 {
     const COLUMN_PATH = '[columns][%s]';

From 2f7ec8c205774d4427dcaad31a9f0991ecf93f65 Mon Sep 17 00:00:00 2001
From: Oleg Popadko <oleg@popadko.com>
Date: Tue, 29 Dec 2015 18:59:09 +0200
Subject: [PATCH 323/471] BAP-7696: Update jsTree library - remove console.log

---
 .../Resources/public/js/app/components/basic-tree-component.js  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/basic-tree-component.js b/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/basic-tree-component.js
index 28775dfb2d8..916e50bebe7 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/basic-tree-component.js
+++ b/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/basic-tree-component.js
@@ -118,8 +118,6 @@ define(function(require) {
                 return;
             }
 
-            console.log(container);
-
             var fixHeight = function() {
                 var anchor = $('#bottom-anchor').position().top;
                 var containerTop = container.position().top;

From cb6915a745467bbe1b596bbecc49ffd86179c2bd Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Tue, 29 Dec 2015 21:24:36 +0200
Subject: [PATCH 324/471] BAP-9579: Process default filters, sorters from grid
 view  - Process columns order

---
 .../Entity/Repository/GridViewRepository.php  | 33 ++++++++++---------
 .../Extension/Columns/ColumnsExtension.php    | 18 ++++++++--
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php b/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php
index 7af06d760cd..e6f72db6c2b 100644
--- a/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php
+++ b/src/Oro/Bundle/DataGridBundle/Entity/Repository/GridViewRepository.php
@@ -7,7 +7,6 @@
 
 use Symfony\Component\Security\Core\User\UserInterface;
 
-use Oro\Bundle\UserBundle\Entity\User;
 use Oro\Bundle\DataGridBundle\Entity\GridView;
 use Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper;
 
@@ -44,13 +43,13 @@ public function findGridViews(AclHelper $aclHelper, UserInterface $user, $gridNa
     }
 
     /**
-     * @param AclHelper $aclHelper
-     * @param User      $user
-     * @param string    $gridName
+     * @param AclHelper     $aclHelper
+     * @param UserInterface $user
+     * @param string        $gridName
      *
      * @return GridView|null
      */
-    public function findDefaultGridView(AclHelper $aclHelper, User $user, $gridName)
+    public function findDefaultGridView(AclHelper $aclHelper, UserInterface $user, $gridName)
     {
         $qb = $this->getFindDefaultGridViewQb($user, $gridName);
         $qb->setMaxResults(1);
@@ -59,15 +58,19 @@ public function findDefaultGridView(AclHelper $aclHelper, User $user, $gridName)
     }
 
     /**
-     * @param AclHelper $aclHelper
-     * @param User      $user
-     * @param GridView  $gridView
-     * @param bool      $checkOwner
+     * @param AclHelper     $aclHelper
+     * @param UserInterface $user
+     * @param GridView      $gridView
+     * @param bool          $checkOwner
      *
      * @return GridView[]
      */
-    public function findDefaultGridViews(AclHelper $aclHelper, User $user, GridView $gridView, $checkOwner = true)
-    {
+    public function findDefaultGridViews(
+        AclHelper $aclHelper,
+        UserInterface $user,
+        GridView $gridView,
+        $checkOwner = true
+    ) {
         /** @var GridView[] $defaultGridViews */
         $qb = $this->getFindDefaultGridViewQb($user, $gridView->getGridName(), $checkOwner);
 
@@ -75,13 +78,13 @@ public function findDefaultGridViews(AclHelper $aclHelper, User $user, GridView
     }
 
     /**
-     * @param User   $user
-     * @param string $gridName
-     * @param bool   $checkOwner
+     * @param UserInterface $user
+     * @param string        $gridName
+     * @param bool          $checkOwner
      *
      * @return QueryBuilder
      */
-    protected function getFindDefaultGridViewQb(User $user, $gridName, $checkOwner = true)
+    protected function getFindDefaultGridViewQb(UserInterface $user, $gridName, $checkOwner = true)
     {
         $parameters = [
             'gridName' => $gridName,
diff --git a/src/Oro/Bundle/DataGridBundle/Extension/Columns/ColumnsExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/Columns/ColumnsExtension.php
index ef707eb2b58..5927c3983b6 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/Columns/ColumnsExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/Columns/ColumnsExtension.php
@@ -259,11 +259,25 @@ protected function setColumnsOrder(DatagridConfiguration $config, MetadataObject
 
     /**
      * @param DatagridConfiguration $config
+     * @param bool                  $default
      *
      * @return array
      */
-    protected function getColumnsWithOrder(DatagridConfiguration $config)
+    protected function getColumnsWithOrder(DatagridConfiguration $config, $default = false)
     {
+        if (!$default) {
+            $defaultGridView = $this->getGridViewRepository()->findDefaultGridView(
+                $this->aclHelper,
+                $this->getCurrentUser(),
+                $config->getName()
+            );
+
+            $params = $this->getParameters()->get(ParameterBag::ADDITIONAL_PARAMETERS, []);
+            if (isset($params['view']) && $defaultGridView && $params['view'] === $defaultGridView->getId()) {
+                return $defaultGridView->getColumnsData();
+            }
+        }
+
         $columnsData  = $config->offsetGet(self::COLUMNS_PATH);
         $columnsOrder = $this->columnsHelper->buildColumnsOrder($columnsData);
         $columns      = $this->applyColumnsOrderAndRender($columnsData, $columnsOrder);
@@ -282,7 +296,7 @@ protected function getColumnsWithOrder(DatagridConfiguration $config)
     protected function createNewGridView(DatagridConfiguration $config, MetadataObject $data)
     {
         $newGridView = new View(GridViewsExtension::DEFAULT_VIEW_ID);
-        $columns     = $this->getColumnsWithOrder($config);
+        $columns     = $this->getColumnsWithOrder($config, true);
 
         /** Set config columns state to __all__ grid view */
         $newGridView->setColumnsData($columns);

From 57c33e6199467a9764ffe816ce3a3d8f19bea6f2 Mon Sep 17 00:00:00 2001
From: Maksym Perepelytsya <mperepelytsya@magecore.com>
Date: Tue, 29 Dec 2015 21:28:36 +0200
Subject: [PATCH 325/471] BAP-9581: Check test cases, prepare to merge, demo. 
 - 404 set default grid view

---
 .../Controller/Api/Rest/GridViewController.php           | 9 +++++++--
 .../Resources/public/js/datagrid/grid-views/view.js      | 6 ++++++
 .../Resources/translations/jsmessages.en.yml             | 1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Controller/Api/Rest/GridViewController.php b/src/Oro/Bundle/DataGridBundle/Controller/Api/Rest/GridViewController.php
index 182c4e5207a..88a53dbeb36 100644
--- a/src/Oro/Bundle/DataGridBundle/Controller/Api/Rest/GridViewController.php
+++ b/src/Oro/Bundle/DataGridBundle/Controller/Api/Rest/GridViewController.php
@@ -134,9 +134,14 @@ public function defaultAction($id, $default = false)
         /** @var GridView $gridView */
         $manager  = $this->getManager();
         $gridView = $manager->find($id);
-        $manager->setDefaultGridView($this->getUser(), $gridView, $default);
+        if ($gridView) {
+            $manager->setDefaultGridView($this->getUser(), $gridView, $default);
+            $view = $this->view(null, Codes::HTTP_NO_CONTENT);
+        } else {
+            $view = $this->view(null, Codes::HTTP_NOT_FOUND);
+        }
 
-        return new JsonResponse([], Codes::HTTP_NO_CONTENT);
+        return $this->buildResponse($view, self::ACTION_UPDATE, ['id' => $id, 'entity' => $gridView]);
     }
 
     /**
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
index 75491b4838c..3f9ebe15d9d 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
@@ -402,6 +402,12 @@ define(function(require) {
                     currentViewModel.set({is_default:true});
                     self._showFlashMessage('success', __('oro.datagrid.gridView.updated'));
                 }
+            ).fail(
+                function(response) {
+                    if (response.status === 404) {
+                        self._showFlashMessage('error', __('oro.datagrid.gridView.error.not_found'));
+                    }
+                }
             );
         },
 
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml b/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
index 223b8adedf8..2e784514745 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
@@ -64,6 +64,7 @@ oro_datagrid.action.refresh: "Refresh"
 "oro.datagrid.gridView.actions": "Options"
 "oro.datagrid.gridView.data_edited": "Edited"
 "oro.datagrid.gridView.save_name": "Save"
+"oro.datagrid.gridView.error.not_found": "View not found"
 "Unexpected format": Unexpected format
 oro:
     datagrid:

From b0b3ee1a20e985b4114e7831aeacf25090e06b9b Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Tue, 29 Dec 2015 21:40:16 +0200
Subject: [PATCH 326/471] BAP-9579: Process default filters, sorters from grid
 view  - Add comments

---
 src/Oro/Bundle/DataGridBundle/Entity/GridView.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Entity/GridView.php b/src/Oro/Bundle/DataGridBundle/Entity/GridView.php
index e29cffaf28e..856d7fa1872 100644
--- a/src/Oro/Bundle/DataGridBundle/Entity/GridView.php
+++ b/src/Oro/Bundle/DataGridBundle/Entity/GridView.php
@@ -82,14 +82,16 @@ class GridView
     protected $filtersData = [];
 
     /**
-     * @var array
+     * @var array of ['column name' => -1|1, ... ].
+     * Contains information about sorters ('-1' for 'ASC', '1' for 'DESC').
      *
      * @ORM\Column(type="array")
      */
     protected $sortersData = [];
 
     /**
-     * @var array
+     * @var array of ['column name' => ['renderable' => true|false, 'order' = int(0)], ... ].
+     * Contains information about columns orders in the grid.
      *
      * @ORM\Column(type="array", nullable=true)
      */

From 0ae868dc148fb90bf3cb664b0c3cc155cd6689a0 Mon Sep 17 00:00:00 2001
From: Maksym Perepelytsya <mperepelytsya@magecore.com>
Date: Tue, 29 Dec 2015 22:06:37 +0200
Subject: [PATCH 327/471] BAP-9581: Check test cases, prepare to merge, demo. 
 - add unexpected error

---
 .../Resources/public/js/datagrid/grid-views/view.js             | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
index 3f9ebe15d9d..100db8a14cc 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
@@ -406,6 +406,8 @@ define(function(require) {
                 function(response) {
                     if (response.status === 404) {
                         self._showFlashMessage('error', __('oro.datagrid.gridView.error.not_found'));
+                    } else {
+                        self._showFlashMessage('error', __('oro.ui.unexpected_error'));
                     }
                 }
             );

From 0871ebed27ed12536143f08973fef66eecadb721 Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Tue, 29 Dec 2015 22:55:19 +0200
Subject: [PATCH 328/471] CRM-4318: improve implementation

---
 .../Resources/public/js/items/view.js         | 14 ++----
 .../public/js/items-manager/table.js          | 43 +++++++------------
 2 files changed, 20 insertions(+), 37 deletions(-)

diff --git a/src/Oro/Bundle/DashboardBundle/Resources/public/js/items/view.js b/src/Oro/Bundle/DashboardBundle/Resources/public/js/items/view.js
index 8049a2e7e15..b96e2ad1a53 100644
--- a/src/Oro/Bundle/DashboardBundle/Resources/public/js/items/view.js
+++ b/src/Oro/Bundle/DashboardBundle/Resources/public/js/items/view.js
@@ -89,12 +89,9 @@ define([
         },
 
         _initializeItemGrid: function(items) {
-            var comparator = function(model) {
-                return model.get('order');
-            };
             var $itemContainer = this.$('.item-container');
             var showedItems    = items.where({show: true});
-            var filteredItems = this.filteredItems  = new ItemCollection(showedItems, {comparator: comparator});
+            var filteredItems = this.filteredItems  = new ItemCollection(showedItems, {comparator: 'order'});
 
             $itemContainer.itemsManagerTable({
                 itemTemplate: Backbone.$(this.itemTplSelector).html(),
@@ -104,8 +101,9 @@ define([
             });
 
             filteredItems.on('sort add', function() {
-                $itemContainer.find('input.order').each(function(index) {
-                    Backbone.$(this)
+                this.each(function(model, index) {
+                    model.set('order', index, {silent: true});
+                    $itemContainer.find('[data-cid="' + model.cid + '"] input.order')
                         .val(index)
                         .trigger('change');
                 });
@@ -118,8 +116,6 @@ define([
             items.on('change:show', function(model) {
                 if (model.get('show')) {
                     filteredItems.add(model);
-                    filteredItems.trigger('reset');
-                    filteredItems.trigger('sort');
                 } else {
                     filteredItems.remove(model);
                 }
@@ -180,8 +176,6 @@ define([
                 model.set('order', targetModel.get('order'));
                 targetModel.set('order', order);
                 collection.sort();
-                collection.trigger('reset');
-                collection.trigger('sort');
             }
         }
     });
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/items-manager/table.js b/src/Oro/Bundle/UIBundle/Resources/public/js/items-manager/table.js
index 4fae8d40601..c588823ffd0 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/js/items-manager/table.js
+++ b/src/Oro/Bundle/UIBundle/Resources/public/js/items-manager/table.js
@@ -44,6 +44,7 @@ define(['jquery', 'underscore', 'oroui/js/mediator', 'jquery-ui'], function($, _
             options.collection.on('remove', this._onModelDeleted, this);
             options.collection.on('change', this._onModelChanged, this);
             options.collection.on('reset', this._onResetCollection, this);
+            options.collection.on('sort', this._renderCollection, this);
 
             this._initSorting();
             this._onResetCollection();
@@ -85,32 +86,16 @@ define(['jquery', 'underscore', 'oroui/js/mediator', 'jquery-ui'], function($, _
         },
 
         _sortCollection: function() {
-            var collectionChanged = false;
             var collection = this.options.collection;
-
-            _.each(this.element.find('tr'), function(el, index) {
-                var cid = $(el).data('cid');
-                var model = collection.at(index);
-                if (cid === model.cid) {
-                    return;
-                }
-                var anotherModel = collection.get(cid);
-                var anotherIndex = collection.indexOf(anotherModel);
-                collection.remove(model, {silent: true});
-                collection.remove(anotherModel, {silent: true});
-                if (index < anotherIndex) {
-                    collection.add(anotherModel, {silent: true, at: index});
-                    collection.add(model, {silent: true, at: anotherIndex});
-                } else {
-                    collection.add(model, {silent: true, at: anotherIndex});
-                    collection.add(anotherModel, {silent: true, at: index});
-                }
-                collectionChanged = true;
+            var positions = {};
+            this.element.find('tr').each(function(index) {
+                positions[$(this).data('cid')] = index;
             });
-
-            if (collectionChanged) {
-                collection.trigger('sort');
-            }
+            collection.models.sort(function(left, right) {
+                var diff = positions[left.cid] - positions[right.cid];
+                return diff > 0 ? 1 : (diff < 0 ? -1 : 0);
+            });
+            collection.trigger('sort');
         },
 
         _onModelAdded: function(model) {
@@ -150,8 +135,7 @@ define(['jquery', 'underscore', 'oroui/js/mediator', 'jquery-ui'], function($, _
         },
 
         _onResetCollection: function() {
-            this.element.empty();
-            this.options.collection.each(this._onModelAdded, this);
+            this._renderCollection();
 
             mediator.trigger(
                 'items-manager:table:reset:' + this._getIdentifier(),
@@ -160,13 +144,18 @@ define(['jquery', 'underscore', 'oroui/js/mediator', 'jquery-ui'], function($, _
             );
         },
 
+        _renderCollection: function() {
+            this.element.empty();
+            this.options.collection.each(this._onModelAdded, this);
+        },
+
         _renderModel: function(model) {
             var collection = this.options.collection;
             var index = collection.indexOf(model);
             var data = _.extend({
                 cid: model.cid,
                 isFirst: index === 0,
-                isLast: index === collection.length -1
+                isLast: index === collection.length - 1
             }, model.toJSON());
             return this._itemRender(this.itemTemplate, data);
         },

From 8dd62e8ebbe9e57e28a253305b7e544080570514 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Wed, 30 Dec 2015 12:41:09 +0200
Subject: [PATCH 329/471] BAP-9579: Process default filters, sorters from grid
 view  - Fix code styles

---
 .../Resources/public/js/datagrid/grid-views/view.js       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
index 75491b4838c..5d7e83ba70b 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
@@ -398,8 +398,8 @@ define(function(require) {
                 }),
                 {},
                 function(response) {
-                    defaultModel.set({is_default:false});
-                    currentViewModel.set({is_default:true});
+                    defaultModel.set({is_default: false});
+                    currentViewModel.set({is_default: true});
                     self._showFlashMessage('success', __('oro.datagrid.gridView.updated'));
                 }
             );
@@ -430,7 +430,7 @@ define(function(require) {
 
             if (model.get('is_default')) {
                 var systemModel = this._getDefaultSystemViewModel();
-                systemModel.set({is_default:true, label: this._getView(this.DEFAULT_GRID_VIEW_ID).label});
+                systemModel.set({is_default: true, label: this._getView(this.DEFAULT_GRID_VIEW_ID).label});
             }
 
             this.render();
@@ -639,7 +639,7 @@ define(function(require) {
          */
         _getDefaultSystemViewModel: function() {
             return this.viewsCollection.findWhere({
-                name:this.DEFAULT_GRID_VIEW_ID
+                name: this.DEFAULT_GRID_VIEW_ID
             });
         },
 

From 53d077fa389e2f74da32069585df4fb8f0516871 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Wed, 30 Dec 2015 12:47:23 +0200
Subject: [PATCH 330/471] BAP-9579: Process default filters, sorters from grid
 view  - Fix tests

---
 .../Tests/Unit/EventListener/GridViewsLoadListenerTest.php   | 2 ++
 .../Unit/Extension/GridViews/GridViewsExtensionTest.php      | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Tests/Unit/EventListener/GridViewsLoadListenerTest.php b/src/Oro/Bundle/DataGridBundle/Tests/Unit/EventListener/GridViewsLoadListenerTest.php
index 0649675c22e..53c69e5e672 100644
--- a/src/Oro/Bundle/DataGridBundle/Tests/Unit/EventListener/GridViewsLoadListenerTest.php
+++ b/src/Oro/Bundle/DataGridBundle/Tests/Unit/EventListener/GridViewsLoadListenerTest.php
@@ -128,6 +128,7 @@ public function testListenerShouldAddViewsIntoEvent()
                     'deletable' => true,
                     'editable'  => true,
                     'columns'   => [],
+                    'is_default' => false
                 ],
                 [
                     'label'     => 'view2',
@@ -138,6 +139,7 @@ public function testListenerShouldAddViewsIntoEvent()
                     'deletable' => true,
                     'editable'  => true,
                     'columns'   => [],
+                    'is_default' => false
                 ],
             ]
         ];
diff --git a/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/GridViews/GridViewsExtensionTest.php b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/GridViews/GridViewsExtensionTest.php
index 15bbfa99a1f..024e555bfa0 100644
--- a/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/GridViews/GridViewsExtensionTest.php
+++ b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/GridViews/GridViewsExtensionTest.php
@@ -44,11 +44,14 @@ public function setUp()
             ->method('getRepository')
             ->willReturn($repo);
 
+        $aclHelper = $this->getMock('Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper');
+
         $this->gridViewsExtension = new GridViewsExtension(
             $this->eventDispatcher,
             $securityFacade,
             $translator,
-            $registry
+            $registry,
+            $aclHelper
         );
     }
 

From 2fb56ea9e0103871c0c8c57fcaa26cb12f563bca Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Wed, 30 Dec 2015 13:00:05 +0200
Subject: [PATCH 331/471] BAP-9579: Process default filters, sorters from grid
 view  - Fix tests

---
 .../Bundle/DataGridBundle/Resources/translations/messages.en.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/translations/messages.en.yml b/src/Oro/Bundle/DataGridBundle/Resources/translations/messages.en.yml
index ef7d2c28631..bacb58d1968 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/translations/messages.en.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/translations/messages.en.yml
@@ -15,6 +15,7 @@ oro:
             id.label: Id
             name.label: Name
             owner.label: Owner
+            users.label: Users
             organization.label: Organization
             sorters_data.label: Sorters
             type.label: Type

From 328c620bb67cf967efc6e3ce25a48426060432e7 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Wed, 30 Dec 2015 15:16:55 +0200
Subject: [PATCH 332/471] BAP-9579: Process default filters, sorters from grid
 view  - Fix tests

---
 .../Extension/Columns/ColumnsExtension.php    | 33 +++++++++++++++----
 .../Columns/ColumnsExtensionTest.php          |  7 ++--
 .../GridViews/GridViewsExtensionTest.php      |  4 ++-
 3 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Extension/Columns/ColumnsExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/Columns/ColumnsExtension.php
index 5927c3983b6..d120914a602 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/Columns/ColumnsExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/Columns/ColumnsExtension.php
@@ -2,6 +2,7 @@
 
 namespace Oro\Bundle\DataGridBundle\Extension\Columns;
 
+use Oro\Bundle\DataGridBundle\Entity\GridView;
 use Symfony\Component\Security\Core\User\UserInterface;
 
 use Doctrine\Bundle\DoctrineBundle\Registry;
@@ -40,6 +41,9 @@ class ColumnsExtension extends AbstractExtension
     /** @var ColumnsHelper */
     protected $columnsHelper;
 
+    /** @var GridView|null */
+    protected $defaultGridView;
+
     /**
      * @param Registry       $registry
      * @param SecurityFacade $securityFacade
@@ -266,13 +270,8 @@ protected function setColumnsOrder(DatagridConfiguration $config, MetadataObject
     protected function getColumnsWithOrder(DatagridConfiguration $config, $default = false)
     {
         if (!$default) {
-            $defaultGridView = $this->getGridViewRepository()->findDefaultGridView(
-                $this->aclHelper,
-                $this->getCurrentUser(),
-                $config->getName()
-            );
-
-            $params = $this->getParameters()->get(ParameterBag::ADDITIONAL_PARAMETERS, []);
+            $params          = $this->getParameters()->get(ParameterBag::ADDITIONAL_PARAMETERS, []);
+            $defaultGridView = $this->getDefaultGridView($config->getName());
             if (isset($params['view']) && $defaultGridView && $params['view'] === $defaultGridView->getId()) {
                 return $defaultGridView->getColumnsData();
             }
@@ -285,6 +284,26 @@ protected function getColumnsWithOrder(DatagridConfiguration $config, $default =
         return $columns;
     }
 
+    /**
+     * @param string $gridName
+     *
+     * @return GridView|null
+     */
+    protected function getDefaultGridView($gridName)
+    {
+        if ($this->defaultGridView === null) {
+            $defaultGridView = $this->getGridViewRepository()->findDefaultGridView(
+                $this->aclHelper,
+                $this->getCurrentUser(),
+                $gridName
+            );
+
+            $this->defaultGridView = $defaultGridView;
+        }
+
+        return $this->defaultGridView;
+    }
+
     /**
      * Create grid view for default grid state __all__
      *
diff --git a/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/Columns/ColumnsExtensionTest.php b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/Columns/ColumnsExtensionTest.php
index 6173b4fb986..a2a03895c50 100644
--- a/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/Columns/ColumnsExtensionTest.php
+++ b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/Columns/ColumnsExtensionTest.php
@@ -118,6 +118,7 @@ public function testVisitMetadata(
         $dataInitialState,
         $isGridView = true
     ) {
+        $this->extension->setParameters(new ParameterBag([]));
         $user = $this->getMockBuilder('Oro\Bundle\UserBundle\Entity\User')
             ->disableOriginalConstructor()
             ->getMock();
@@ -137,7 +138,7 @@ public function testVisitMetadata(
             ->with('columns')
             ->will(static::returnValue($columnsConfigArray));
         $config
-            ->expects(static::once())
+            ->expects(static::any())
             ->method('getName')
             ->will(static::returnValue('test-grid'));
 
@@ -155,12 +156,12 @@ public function testVisitMetadata(
         );
 
         $repository = $this->getMockBuilder('Oro\Bundle\DataGridBundle\Entity\Repository\GridViewRepository')
-            ->setMethods(['findGridViews'])
+            ->setMethods(['findGridViews', 'findDefaultGridView'])
             ->disableOriginalConstructor()
             ->getMock();
 
         $this->registry
-            ->expects(static::once())
+            ->expects(static::any())
             ->method('getRepository')
             ->with('OroDataGridBundle:GridView')
             ->will(static::returnValue($repository));
diff --git a/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/GridViews/GridViewsExtensionTest.php b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/GridViews/GridViewsExtensionTest.php
index 024e555bfa0..244e2b63fbf 100644
--- a/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/GridViews/GridViewsExtensionTest.php
+++ b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/GridViews/GridViewsExtensionTest.php
@@ -44,7 +44,9 @@ public function setUp()
             ->method('getRepository')
             ->willReturn($repo);
 
-        $aclHelper = $this->getMock('Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper');
+        $aclHelper = $this->getMockBuilder('Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper')
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->gridViewsExtension = new GridViewsExtension(
             $this->eventDispatcher,

From 19ba885296150ff3597db1a43a47c9687b6bd048 Mon Sep 17 00:00:00 2001
From: zebimax <zebimax@gmail.com>
Date: Wed, 30 Dec 2015 18:41:01 +0200
Subject: [PATCH 333/471] BAP-9579: Process default filters, sorters from grid
 view  - remove label passing on remove default label

---
 .../Resources/public/js/datagrid/grid-views/view.js             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
index a6ce4365367..5dde3212be8 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
@@ -438,7 +438,7 @@ define(function(require) {
 
             if (model.get('is_default')) {
                 var systemModel = this._getDefaultSystemViewModel();
-                systemModel.set({is_default: true, label: this._getView(this.DEFAULT_GRID_VIEW_ID).label});
+                systemModel.set({is_default: true});
             }
 
             this.render();

From fd2ea9a44bcbeee827876c50bbc2bba250d24c5a Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Wed, 30 Dec 2015 19:33:46 +0200
Subject: [PATCH 334/471] BAP-9581: add checkbox "Use as default" to the save
 grid view form.  - Refactoring API

---
 .../Api/Rest/GridViewController.php           |  1 -
 .../Form/Handler/GridViewApiHandler.php       | 61 ++++++++++++++++---
 .../DataGridBundle/Form/Type/GridViewType.php |  4 ++
 .../Resources/config/services.yml             |  2 +
 .../public/js/datagrid/grid-views/model.js    |  2 +-
 .../js/datagrid/grid-views/view-name-modal.js |  3 +-
 .../public/js/datagrid/grid-views/view.js     |  7 ++-
 .../views/js/view-name-modal.html.twig        |  5 ++
 8 files changed, 73 insertions(+), 12 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Controller/Api/Rest/GridViewController.php b/src/Oro/Bundle/DataGridBundle/Controller/Api/Rest/GridViewController.php
index 88a53dbeb36..d533417d7e6 100644
--- a/src/Oro/Bundle/DataGridBundle/Controller/Api/Rest/GridViewController.php
+++ b/src/Oro/Bundle/DataGridBundle/Controller/Api/Rest/GridViewController.php
@@ -10,7 +10,6 @@
 
 use Nelmio\ApiDocBundle\Annotation\ApiDoc;
 
-use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 
diff --git a/src/Oro/Bundle/DataGridBundle/Form/Handler/GridViewApiHandler.php b/src/Oro/Bundle/DataGridBundle/Form/Handler/GridViewApiHandler.php
index e81be763ed5..572818d08d2 100644
--- a/src/Oro/Bundle/DataGridBundle/Form/Handler/GridViewApiHandler.php
+++ b/src/Oro/Bundle/DataGridBundle/Form/Handler/GridViewApiHandler.php
@@ -6,8 +6,11 @@
 
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
 use Oro\Bundle\DataGridBundle\Entity\GridView;
+use Oro\Bundle\DataGridBundle\Entity\Repository\GridViewRepository;
+use Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper;
 
 class GridViewApiHandler
 {
@@ -20,16 +23,31 @@ class GridViewApiHandler
     /** @var Registry */
     protected $registry;
 
+    /** @var AclHelper */
+    protected $aclHelper;
+
+    /** @var TokenStorageInterface */
+    protected $tokenStorage;
+
     /**
-     * @param FormInterface $form
-     * @param Request $request
-     * @param Registry $registry
+     * @param FormInterface         $form
+     * @param Request               $request
+     * @param Registry              $registry
+     * @param AclHelper             $aclHelper
+     * @param TokenStorageInterface $tokenStorage
      */
-    public function __construct(FormInterface $form, Request $request, Registry $registry)
-    {
-        $this->form = $form;
-        $this->request = $request;
-        $this->registry = $registry;
+    public function __construct(
+        FormInterface $form,
+        Request $request,
+        Registry $registry,
+        AclHelper $aclHelper,
+        TokenStorageInterface $tokenStorage
+    ) {
+        $this->form         = $form;
+        $this->request      = $request;
+        $this->registry     = $registry;
+        $this->aclHelper    = $aclHelper;
+        $this->tokenStorage = $tokenStorage;
     }
 
     /**
@@ -67,12 +85,39 @@ public function process(GridView $entity)
      */
     protected function onSuccess(GridView $entity)
     {
+        $default = $this->form->get('is_default')->getData();
+        $this->setDefaultGridView($entity, $default);
+
         $this->fixFilters($entity);
         $om = $this->registry->getManagerForClass('OroDataGridBundle:GridView');
         $om->persist($entity);
         $om->flush();
     }
 
+    /**
+     * @param GridView $gridView
+     * @param bool     $default
+     */
+    protected function setDefaultGridView(GridView $gridView, $default)
+    {
+        $om = $this->registry->getManagerForClass('OroDataGridBundle:GridView');
+
+        /** @var GridViewRepository $repository */
+        $repository = $om->getRepository('OroDataGridBundle:GridView');
+        $user       = $this->tokenStorage->getToken()->getUser();
+        if ($gridView->getUsers()->contains($user) !== $default) {
+
+            $gridViews = $repository->findDefaultGridViews($this->aclHelper, $user, $gridView, false);
+            foreach ($gridViews as $view) {
+                $view->removeUser($user);
+            }
+
+            if ($default) {
+                $gridView->addUser($user);
+            }
+        }
+    }
+
     /**
      * @todo Remove once https://github.com/symfony/symfony/issues/5906 is fixed
      *
diff --git a/src/Oro/Bundle/DataGridBundle/Form/Type/GridViewType.php b/src/Oro/Bundle/DataGridBundle/Form/Type/GridViewType.php
index e2fc70a69fe..64954391bd4 100644
--- a/src/Oro/Bundle/DataGridBundle/Form/Type/GridViewType.php
+++ b/src/Oro/Bundle/DataGridBundle/Form/Type/GridViewType.php
@@ -24,6 +24,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('label', 'text', [
                 'property_path' => 'name',
             ])
+            ->add('is_default', 'checkbox', [
+                'required' => false,
+                'mapped'   => false,
+            ])
             ->add('type', 'choice', [
                 'choices' => GridView::getTypes(),
             ])
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/config/services.yml b/src/Oro/Bundle/DataGridBundle/Resources/config/services.yml
index c9213c89983..3e4cd37ba3a 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/config/services.yml
@@ -171,6 +171,8 @@ services:
             - @oro_datagrid.form.grid_view.api
             - @request
             - @doctrine
+            - @oro_security.acl_helper
+            - @security.token_storage
         scope: request
 
     oro_datagrid.datagrid.inline_edit_column_options_guesser:
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/model.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/model.js
index 96d03f981c2..276c6c97577 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/model.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/model.js
@@ -78,7 +78,7 @@ define([
          * @returns {Array}
          */
         toJSON: function() {
-            return _.omit(this.attributes, ['editable', 'deletable', 'is_default']);
+            return _.omit(this.attributes, ['editable', 'deletable']);
         }
     });
 
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view-name-modal.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view-name-modal.js
index 322561ff251..d5a2e6caa9f 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view-name-modal.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view-name-modal.js
@@ -20,7 +20,8 @@ define([
             options.title = options.title || __('oro.datagrid.name_modal.title');
             options.content = options.content || this.contentTemplate({
                 value: options.defaultValue || '',
-                label: __('oro.datagrid.gridView.name')
+                label: __('oro.datagrid.gridView.name'),
+                defaultLabel: __('oro.datagrid.action.use_as_default_grid_view')
             });
             options.okText =  __('oro.datagrid.gridView.save_name');
 
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
index a6ce4365367..df00222d4d3 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
@@ -232,6 +232,7 @@ define(function(require) {
             modal.on('ok', function(e) {
                 var model = self._createViewModel({
                     label: this.$('input[name=name]').val(),
+                    is_default: this.$('input[name=is_default]').is(':checked'),
                     type: 'private',
                     grid_name: self.gridName,
                     filters: self.collection.state.filters,
@@ -252,6 +253,10 @@ define(function(require) {
                         self._updateTitle();
                         self._showFlashMessage('success', __('oro.datagrid.gridView.created'));
                         mediator.trigger('datagrid:' + self.gridName + ':views:add', model);
+
+                        if(model.get('is_default')) {
+                            self._getCurrentDefaultViewModel().set({is_default: false});
+                        }
                     },
                     error: function(model, response, options) {
                         modal.open();
@@ -438,7 +443,7 @@ define(function(require) {
 
             if (model.get('is_default')) {
                 var systemModel = this._getDefaultSystemViewModel();
-                systemModel.set({is_default: true, label: this._getView(this.DEFAULT_GRID_VIEW_ID).label});
+                systemModel.set({is_default: true});
             }
 
             this.render();
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/views/js/view-name-modal.html.twig b/src/Oro/Bundle/DataGridBundle/Resources/views/js/view-name-modal.html.twig
index 27d3923b466..d2b415e8133 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/views/js/view-name-modal.html.twig
+++ b/src/Oro/Bundle/DataGridBundle/Resources/views/js/view-name-modal.html.twig
@@ -5,6 +5,11 @@
             <div class="controls">
                 <input id="gridViewName" name="name" type="text" value="<%= value %>">
             </div>
+
+            <label class="control-label" for="gridViewDefault"><%= defaultLabel %>:</label>
+            <div class="controls">
+                <input id="gridViewDefault" name="is_default" type="checkbox">
+            </div>
         </div>
     </div>
 </script>

From 5d8d7c93c9ccd2bd469056646e2d6e620f3048b3 Mon Sep 17 00:00:00 2001
From: Hryhorii Hrebiniuk <grebinuk@gmail.com>
Date: Wed, 30 Dec 2015 19:50:29 +0200
Subject: [PATCH 335/471] BAP-9621: Failed selenium tests

---
 src/Oro/Bundle/UIBundle/Resources/public/js/init-layout.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/init-layout.js b/src/Oro/Bundle/UIBundle/Resources/public/js/init-layout.js
index 384886a0ffb..d381c83225a 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/js/init-layout.js
+++ b/src/Oro/Bundle/UIBundle/Resources/public/js/init-layout.js
@@ -264,7 +264,7 @@ require(['jquery', 'underscore', 'orotranslation/js/translator', 'oroui/js/tools
                 $main.width(realWidth($topPage) - realWidth($leftPanel) - realWidth($rightPanel));
                 layout.updateResponsiveLayout();
 
-                var debugBarHeight = layout.getDevToolbarHeight();
+                var debugBarHeight = $('.sf-toolbarreset').height();
                 var anchorTop = anchor.position().top;
                 var footerHeight = $('#footer:visible').height() || 0;
                 var fixContent = 1;

From e30943a6ef3d3d772e2cacf2379464674a81cf16 Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Wed, 30 Dec 2015 20:06:43 +0200
Subject: [PATCH 336/471] CRM-4789: fixed except baloon corner appearance for
 multiselects on mobile

---
 .../js/groupedActivityItemTemplate.js.twig    |  2 +-
 .../Resources/public/js/datafilter-builder.js |  8 +++-
 .../Resources/public/js/filters-manager.js    | 48 ++++++++-----------
 .../public/css/less/mobile/filter.less        |  2 +-
 .../Resources/public/js/extend/multiselect.js | 18 +++++++
 5 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/src/Oro/Bundle/EmailBundle/Resources/views/Email/js/groupedActivityItemTemplate.js.twig b/src/Oro/Bundle/EmailBundle/Resources/views/Email/js/groupedActivityItemTemplate.js.twig
index b72dc3ac850..2c6eaa1292f 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/views/Email/js/groupedActivityItemTemplate.js.twig
+++ b/src/Oro/Bundle/EmailBundle/Resources/views/Email/js/groupedActivityItemTemplate.js.twig
@@ -43,7 +43,7 @@
     {% set action %}
         {% if resource_granted('oro_email_email_user_edit') %}
             <a href="#" title="{{ 'oro.activity.contexts.placeholder'|trans|raw }}"
-               data-url="<%= routing.generate('oro_activity_context', {'id': relatedActivityId, 'activity': '{{ entityClass }}' }) %>"
+               data-url="<%= routing.generate('oro_activity_context', {'id': relatedActivityId, 'activity': '{{ entityClass|replace({'\\': '_'}) }}' }) %>"
                     {{ UI.renderWidgetDataAttributes({
                     'type' : 'dialog',
                     'multiple' : true,
diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/datafilter-builder.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/datafilter-builder.js
index 21e86e72fd0..445839e0b82 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/js/datafilter-builder.js
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/datafilter-builder.js
@@ -43,6 +43,7 @@ define([
             options.collection = this.collection;
             var filtersList = new FiltersManager(options);
             this.$el.prepend(filtersList.render().$el);
+            filtersList.refreshSelectWidget();
             mediator.trigger('datagrid_filters:rendered', this.collection, this.$el);
             this.metadata.state.filters = this.metadata.state.filters || [];
             if (this.collection.length === 0 && this.metadata.state.filters.length === 0) {
@@ -64,7 +65,7 @@ define([
             var filters = {};
             var modules = this.modules;
             var collection = this.collection;
-            var container = this.$el;
+            var container = tools.isMobile() ? 'body' : this.$el;
             _.each(this.metadata.filters, function(options) {
                 if (_.has(options, 'name') && _.has(options, 'type')) {
                     // @TODO pass collection only for specific filters
@@ -75,7 +76,10 @@ define([
                     filters[options.name] = new Filter({container: container});
                 }
             });
-            return {filters: filters};
+            return {
+                filters: filters,
+                container: container
+            };
         }
     };
 
diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/filters-manager.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/filters-manager.js
index c597275e80d..68a40c998cb 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/js/filters-manager.js
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/filters-manager.js
@@ -91,6 +91,13 @@ define(function(require) {
          */
         buttonSelector: '.ui-multiselect.filter-list',
 
+        /**
+         * Selector, jQuery object or HTML element that will be target for append multiselect dropdown menu
+         *
+         * @property
+         */
+        container: 'body',
+
         /** @property */
         events: {
             'change [data-action=add-filter-select]': '_onChangeFilterSelect',
@@ -112,6 +119,8 @@ define(function(require) {
 
             this.filters = {};
 
+            _.extend(this, _.pick(options, ['addButtonHint', 'container']));
+
             if (options.filters) {
                 _.extend(this.filters, options.filters);
             }
@@ -134,10 +143,6 @@ define(function(require) {
                 this.listenTo(filter, filterListeners);
             }, this);
 
-            if (options.addButtonHint) {
-                this.addButtonHint = options.addButtonHint;
-            }
-
             FiltersManager.__super__.initialize.apply(this, arguments);
         },
 
@@ -340,11 +345,15 @@ define(function(require) {
                     selectedList: 0,
                     selectedText: this.addButtonHint,
                     classes: 'filter-list select-filter-widget',
+                    position: {
+                        my: 'left top+2',
+                        at: 'left bottom'
+                    },
                     open: $.proxy(function() {
                         this.selectWidget.onOpenDropdown();
                         this._setDropdownWidth();
-                        this._updateDropdownPosition();
-                    }, this)
+                    }, this),
+                    appendTo: this.container
                 }
             });
 
@@ -355,6 +364,10 @@ define(function(require) {
             );
         },
 
+        refreshSelectWidget: function() {
+            this.selectWidget.multiselect('refresh');
+        },
+
         /**
          * Set design for select dropdown
          *
@@ -382,29 +395,6 @@ define(function(require) {
                     this.disableFilter(filter);
                 }
             }, this);
-
-            this._updateDropdownPosition();
-        },
-
-        /**
-         * Set dropdown position according to current element
-         *
-         * @protected
-         */
-        _updateDropdownPosition: function() {
-            var button = this.$(this.buttonSelector);
-            var buttonPosition = button.offset();
-            var widgetWidth = this.selectWidget.getWidget().outerWidth();
-            var windowWidth = $(window).width();
-            var widgetLeftOffset = buttonPosition.left;
-            if (buttonPosition.left + widgetWidth > windowWidth) {
-                widgetLeftOffset = buttonPosition.left + button.outerWidth() - widgetWidth;
-            }
-
-            this.selectWidget.getWidget().css({
-                top: buttonPosition.top + button.outerHeight(),
-                left: widgetLeftOffset
-            });
         },
 
         /**
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/filter.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/filter.less
index 19d55c80c8a..2cacbb917d8 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/filter.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/filter.less
@@ -24,7 +24,7 @@
     margin: 10px auto 0;
     max-width: 506px;
     width: 100%;
-    z-index: @zindexPopover; // to show over grid's loading mask
+    z-index: @oroZindexDropdown; // to show over grid's loading mask
     @media only screen and (min-width: 527px) {
       left: 50%;
       margin-left: -253px;
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/extend/multiselect.js b/src/Oro/Bundle/UIBundle/Resources/public/js/extend/multiselect.js
index e790f089f0a..d9afe9d4ea4 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/js/extend/multiselect.js
+++ b/src/Oro/Bundle/UIBundle/Resources/public/js/extend/multiselect.js
@@ -13,8 +13,26 @@ define([
          * @override
          */
         open: function() {
+            var rect;
+            var parentRect;
+            var overlap;
+            var value;
             this._superApply(arguments);
             mask.show().onhide($.proxy(this.close, this));
+            rect = this.menu.get(0).getBoundingClientRect();
+            parentRect = this.menu.parent().get(0).getBoundingClientRect();
+            overlap =  rect.right - parentRect.right;
+            if (overlap > 0) {
+                value = parseInt(this.menu.css('left'));
+                if (!isNaN(value)) {
+                    this.menu.css('left', value - overlap + 'px');
+                } else {
+                    value = parseInt(this.menu.css('right'));
+                    if (!isNaN(value)) {
+                        this.menu.css('right', value + overlap + 'px');
+                    }
+                }
+            }
         },
 
         /**

From a68b6d223e969f892932e09b8872539a00ac0fa0 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Wed, 30 Dec 2015 20:09:41 +0200
Subject: [PATCH 337/471] BAP-9581: add checkbox "Use as default" to the save
 grid view form.  - Code review fixes

---
 .../Resources/public/js/datagrid/grid-views/view.js         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
index df00222d4d3..3f82ef3a583 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
@@ -338,10 +338,14 @@ define(function(require) {
             });
             modal.on('ok', function() {
                 model.save({
-                    label: this.$('input[name=name]').val()
+                    label: this.$('input[name=name]').val(),
+                    is_default: this.$('input[name=is_default]').is(':checked')
                 }, {
                     wait: true,
                     success: function() {
+                        if(model.get('is_default')) {
+                            self._getCurrentDefaultViewModel().set({is_default: false});
+                        }
                         self._showFlashMessage('success', __('oro.datagrid.gridView.updated'));
                     },
                     error: function(model, response, options) {

From e9a19d84d33c59ac08f3bc7dcf5afd0ab7ba33f0 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Wed, 30 Dec 2015 20:18:11 +0200
Subject: [PATCH 338/471] BAP-9581: add checkbox "Use as default" to the save
 grid view form.  - Code review fixes

---
 .../Resources/public/js/datagrid/grid-views/view-name-modal.js | 3 ++-
 .../Resources/public/js/datagrid/grid-views/view.js            | 3 ++-
 .../Resources/views/js/view-name-modal.html.twig               | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view-name-modal.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view-name-modal.js
index d5a2e6caa9f..45dd572085d 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view-name-modal.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view-name-modal.js
@@ -21,7 +21,8 @@ define([
             options.content = options.content || this.contentTemplate({
                 value: options.defaultValue || '',
                 label: __('oro.datagrid.gridView.name'),
-                defaultLabel: __('oro.datagrid.action.use_as_default_grid_view')
+                defaultLabel: __('oro.datagrid.action.use_as_default_grid_view'),
+                defaultChecked: options.defaultChecked || false
             });
             options.okText =  __('oro.datagrid.gridView.save_name');
 
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
index 3f82ef3a583..a1de3590a84 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
@@ -334,7 +334,8 @@ define(function(require) {
             var self = this;
 
             var modal = new ViewNameModal({
-                defaultValue: model.get('label')
+                defaultValue: model.get('label'),
+                defaultChecked: model.get('is_default'),
             });
             modal.on('ok', function() {
                 model.save({
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/views/js/view-name-modal.html.twig b/src/Oro/Bundle/DataGridBundle/Resources/views/js/view-name-modal.html.twig
index d2b415e8133..c2b7b943946 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/views/js/view-name-modal.html.twig
+++ b/src/Oro/Bundle/DataGridBundle/Resources/views/js/view-name-modal.html.twig
@@ -8,7 +8,7 @@
 
             <label class="control-label" for="gridViewDefault"><%= defaultLabel %>:</label>
             <div class="controls">
-                <input id="gridViewDefault" name="is_default" type="checkbox">
+                <input id="gridViewDefault" name="is_default" type="checkbox" <% if(defaultChecked) { %> checked <% } %> >
             </div>
         </div>
     </div>

From 25de7457a26b0e8eda4a0da1b5c4f70c47fc53b0 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Wed, 30 Dec 2015 21:13:17 +0200
Subject: [PATCH 339/471] BAP-9581: add checkbox "Use as default" to the save
 grid view form.  - Code review fixes

---
 .../Resources/public/js/datagrid/grid-views/view.js         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
index a1de3590a84..61ca45cd253 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid-views/view.js
@@ -254,7 +254,7 @@ define(function(require) {
                         self._showFlashMessage('success', __('oro.datagrid.gridView.created'));
                         mediator.trigger('datagrid:' + self.gridName + ':views:add', model);
 
-                        if(model.get('is_default')) {
+                        if (model.get('is_default')) {
                             self._getCurrentDefaultViewModel().set({is_default: false});
                         }
                     },
@@ -344,8 +344,10 @@ define(function(require) {
                 }, {
                     wait: true,
                     success: function() {
-                        if(model.get('is_default')) {
+                        if (model.get('is_default')) {
                             self._getCurrentDefaultViewModel().set({is_default: false});
+                        } else {
+                            self._getDefaultSystemViewModel().set({is_default: true});
                         }
                         self._showFlashMessage('success', __('oro.datagrid.gridView.updated'));
                     },

From 3f6e184ef1a8be3fa61eadf8f23fe6a287c8e605 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Wed, 30 Dec 2015 21:29:40 +0200
Subject: [PATCH 340/471] BAP-9581: add checkbox "Use as default" to the save
 grid view form.  - Code review fixes

---
 .../Form/Handler/GridViewApiHandler.php          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Form/Handler/GridViewApiHandler.php b/src/Oro/Bundle/DataGridBundle/Form/Handler/GridViewApiHandler.php
index 572818d08d2..fe6386d92f5 100644
--- a/src/Oro/Bundle/DataGridBundle/Form/Handler/GridViewApiHandler.php
+++ b/src/Oro/Bundle/DataGridBundle/Form/Handler/GridViewApiHandler.php
@@ -100,14 +100,14 @@ protected function onSuccess(GridView $entity)
      */
     protected function setDefaultGridView(GridView $gridView, $default)
     {
-        $om = $this->registry->getManagerForClass('OroDataGridBundle:GridView');
-
-        /** @var GridViewRepository $repository */
-        $repository = $om->getRepository('OroDataGridBundle:GridView');
-        $user       = $this->tokenStorage->getToken()->getUser();
-        if ($gridView->getUsers()->contains($user) !== $default) {
-
-            $gridViews = $repository->findDefaultGridViews($this->aclHelper, $user, $gridView, false);
+        $user              = $this->tokenStorage->getToken()->getUser();
+        $isGridViewDefault = $gridView->getUsers()->contains($user);
+        // Checks if default grid view changed
+        if ($isGridViewDefault !== $default) {
+            $om = $this->registry->getManagerForClass('OroDataGridBundle:GridView');
+            /** @var GridViewRepository $repository */
+            $repository = $om->getRepository('OroDataGridBundle:GridView');
+            $gridViews  = $repository->findDefaultGridViews($this->aclHelper, $user, $gridView, false);
             foreach ($gridViews as $view) {
                 $view->removeUser($user);
             }

From 005bce58d103a869c73e28b79be283bc6eb4701e Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Wed, 30 Dec 2015 22:08:28 +0200
Subject: [PATCH 341/471] BAP-9581: add checkbox "Use as default" to the save
 grid view form.  - Code review fixes

---
 .../Manager/GridViewApiEntityManager.php      | 27 +++-------
 .../Entity/Manager/GridViewManager.php        | 53 +++++++++++++++++++
 .../Form/Handler/GridViewApiHandler.php       | 39 +++++---------
 .../Resources/config/services.yml             | 10 +++-
 4 files changed, 81 insertions(+), 48 deletions(-)
 create mode 100644 src/Oro/Bundle/DataGridBundle/Entity/Manager/GridViewManager.php

diff --git a/src/Oro/Bundle/DataGridBundle/Entity/Manager/GridViewApiEntityManager.php b/src/Oro/Bundle/DataGridBundle/Entity/Manager/GridViewApiEntityManager.php
index e986dff3f28..71e57ef9f82 100644
--- a/src/Oro/Bundle/DataGridBundle/Entity/Manager/GridViewApiEntityManager.php
+++ b/src/Oro/Bundle/DataGridBundle/Entity/Manager/GridViewApiEntityManager.php
@@ -5,26 +5,24 @@
 use Doctrine\Common\Persistence\ObjectManager;
 
 use Oro\Bundle\DataGridBundle\Entity\GridView;
-use Oro\Bundle\DataGridBundle\Entity\Repository\GridViewRepository;
-use Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper;
 use Oro\Bundle\SoapBundle\Entity\Manager\ApiEntityManager;
 use Oro\Bundle\UserBundle\Entity\User;
 
 class GridViewApiEntityManager extends ApiEntityManager
 {
-    /** @var AclHelper */
-    protected $aclHelper;
+    /** @var GridViewManager */
+    protected $gridViewManager;
 
     /**
-     * @param string        $class Entity name
-     * @param ObjectManager $om    Object manager
-     * @param AclHelper     $aclHelper
+     * @param string          $class Entity name
+     * @param ObjectManager   $om    Object manager
+     * @param GridViewManager $gridViewManager
      */
-    public function __construct($class, ObjectManager $om, AclHelper $aclHelper)
+    public function __construct($class, ObjectManager $om, GridViewManager $gridViewManager)
     {
         parent::__construct($class, $om);
 
-        $this->aclHelper = $aclHelper;
+        $this->gridViewManager = $gridViewManager;
     }
 
     /**
@@ -34,16 +32,7 @@ public function __construct($class, ObjectManager $om, AclHelper $aclHelper)
      */
     public function setDefaultGridView(User $user, GridView $gridView, $default)
     {
-        /** @var GridViewRepository $repository */
-        $repository = $this->getRepository();
-        $gridViews  = $repository->findDefaultGridViews($this->aclHelper, $user, $gridView, false);
-
-        foreach ($gridViews as $view) {
-            $view->removeUser($user);
-        }
-        if ($default) {
-            $gridView->addUser($user);
-        }
+        $this->gridViewManager->setDefaultGridView($user, $gridView, $default);
 
         $this->getObjectManager()->flush();
     }
diff --git a/src/Oro/Bundle/DataGridBundle/Entity/Manager/GridViewManager.php b/src/Oro/Bundle/DataGridBundle/Entity/Manager/GridViewManager.php
new file mode 100644
index 00000000000..e27b7a2231b
--- /dev/null
+++ b/src/Oro/Bundle/DataGridBundle/Entity/Manager/GridViewManager.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Oro\Bundle\DataGridBundle\Entity\Manager;
+
+use Doctrine\Bundle\DoctrineBundle\Registry;
+
+use Oro\Bundle\DataGridBundle\Entity\GridView;
+use Oro\Bundle\DataGridBundle\Entity\Repository\GridViewRepository;
+use Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper;
+use Oro\Bundle\UserBundle\Entity\User;
+
+class GridViewManager
+{
+    /** @var AclHelper */
+    protected $aclHelper;
+
+    /** @var Registry */
+    protected $registry;
+
+    /**
+     * @param AclHelper $aclHelper
+     * @param Registry  $registry
+     */
+    public function __construct(AclHelper $aclHelper, Registry $registry)
+    {
+        $this->aclHelper = $aclHelper;
+        $this->registry  = $registry;
+    }
+
+    /**
+     * @param User     $user
+     * @param GridView $gridView
+     * @param bool     $default
+     */
+    public function setDefaultGridView(User $user, GridView $gridView, $default)
+    {
+        $isGridViewDefault = $gridView->getUsers()->contains($user);
+        // Checks if default grid view changed
+        if ($isGridViewDefault !== $default) {
+            $om = $this->registry->getManagerForClass('OroDataGridBundle:GridView');
+            /** @var GridViewRepository $repository */
+            $repository = $om->getRepository('OroDataGridBundle:GridView');
+            $gridViews  = $repository->findDefaultGridViews($this->aclHelper, $user, $gridView, false);
+            foreach ($gridViews as $view) {
+                $view->removeUser($user);
+            }
+
+            if ($default) {
+                $gridView->addUser($user);
+            }
+        }
+    }
+}
diff --git a/src/Oro/Bundle/DataGridBundle/Form/Handler/GridViewApiHandler.php b/src/Oro/Bundle/DataGridBundle/Form/Handler/GridViewApiHandler.php
index fe6386d92f5..09e7530f6d9 100644
--- a/src/Oro/Bundle/DataGridBundle/Form/Handler/GridViewApiHandler.php
+++ b/src/Oro/Bundle/DataGridBundle/Form/Handler/GridViewApiHandler.php
@@ -9,8 +9,7 @@
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
 use Oro\Bundle\DataGridBundle\Entity\GridView;
-use Oro\Bundle\DataGridBundle\Entity\Repository\GridViewRepository;
-use Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper;
+use Oro\Bundle\DataGridBundle\Entity\Manager\GridViewManager;
 
 class GridViewApiHandler
 {
@@ -23,8 +22,8 @@ class GridViewApiHandler
     /** @var Registry */
     protected $registry;
 
-    /** @var AclHelper */
-    protected $aclHelper;
+    /** @var GridViewManager */
+    protected $gridViewManager;
 
     /** @var TokenStorageInterface */
     protected $tokenStorage;
@@ -33,21 +32,21 @@ class GridViewApiHandler
      * @param FormInterface         $form
      * @param Request               $request
      * @param Registry              $registry
-     * @param AclHelper             $aclHelper
+     * @param GridViewManager       $gridViewManager
      * @param TokenStorageInterface $tokenStorage
      */
     public function __construct(
         FormInterface $form,
         Request $request,
         Registry $registry,
-        AclHelper $aclHelper,
+        GridViewManager $gridViewManager,
         TokenStorageInterface $tokenStorage
     ) {
-        $this->form         = $form;
-        $this->request      = $request;
-        $this->registry     = $registry;
-        $this->aclHelper    = $aclHelper;
-        $this->tokenStorage = $tokenStorage;
+        $this->form            = $form;
+        $this->request         = $request;
+        $this->registry        = $registry;
+        $this->gridViewManager = $gridViewManager;
+        $this->tokenStorage    = $tokenStorage;
     }
 
     /**
@@ -100,22 +99,8 @@ protected function onSuccess(GridView $entity)
      */
     protected function setDefaultGridView(GridView $gridView, $default)
     {
-        $user              = $this->tokenStorage->getToken()->getUser();
-        $isGridViewDefault = $gridView->getUsers()->contains($user);
-        // Checks if default grid view changed
-        if ($isGridViewDefault !== $default) {
-            $om = $this->registry->getManagerForClass('OroDataGridBundle:GridView');
-            /** @var GridViewRepository $repository */
-            $repository = $om->getRepository('OroDataGridBundle:GridView');
-            $gridViews  = $repository->findDefaultGridViews($this->aclHelper, $user, $gridView, false);
-            foreach ($gridViews as $view) {
-                $view->removeUser($user);
-            }
-
-            if ($default) {
-                $gridView->addUser($user);
-            }
-        }
+        $user = $this->tokenStorage->getToken()->getUser();
+        $this->gridViewManager->setDefaultGridView($user, $gridView, $default);
     }
 
     /**
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/config/services.yml b/src/Oro/Bundle/DataGridBundle/Resources/config/services.yml
index 3e4cd37ba3a..db42de59ea2 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/config/services.yml
@@ -149,13 +149,19 @@ services:
         tags:
             - { name: form.type, alias: oro_datagrid_sorting }
 
+    oro_datagrid.grid_view.manager:
+        class: Oro\Bundle\DataGridBundle\Entity\Manager\GridViewManager
+        arguments:
+            - @oro_security.acl_helper
+            - @doctrine
+
     oro_datagrid.grid_view.manager.api:
         class: %oro_datagrid.grid_view.manager.api.class%
         parent: oro_soap.manager.entity_manager.abstract
         arguments:
             - %oro_datagrid.grid_view.entity.class%
             - @doctrine.orm.entity_manager
-            - @oro_security.acl_helper
+            - @oro_datagrid.grid_view.manager
 
     oro_datagrid.form.grid_view.api:
         class:                        Symfony\Component\Form\Form
@@ -171,7 +177,7 @@ services:
             - @oro_datagrid.form.grid_view.api
             - @request
             - @doctrine
-            - @oro_security.acl_helper
+            - @oro_datagrid.grid_view.manager
             - @security.token_storage
         scope: request
 

From 96ec6085051ea13f6cb69ac559f9387eb022bcdd Mon Sep 17 00:00:00 2001
From: Yurii Muratov <yurio@ua.fm>
Date: Mon, 4 Jan 2016 14:11:51 +0200
Subject: [PATCH 342/471] BAP-9626: Fix Search ACL Helper

---
 .../ORM/Walker/OwnershipConditionDataBuilder.php            | 6 +++---
 src/Oro/Bundle/SecurityBundle/Search/AclHelper.php          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Oro/Bundle/SecurityBundle/ORM/Walker/OwnershipConditionDataBuilder.php b/src/Oro/Bundle/SecurityBundle/ORM/Walker/OwnershipConditionDataBuilder.php
index ab7090ce683..b62b4e9bb98 100644
--- a/src/Oro/Bundle/SecurityBundle/ORM/Walker/OwnershipConditionDataBuilder.php
+++ b/src/Oro/Bundle/SecurityBundle/ORM/Walker/OwnershipConditionDataBuilder.php
@@ -83,13 +83,13 @@ public function setAclGroupProvider($aclGroupProvider)
 
     /**
      * Get data for query acl access level check
-     * Return empty array if entity has full access, null if user does't have access to the entity
-     *  and array with entity field and field values which user have access.
      *
      * @param $entityClassName
      * @param $permissions
      *
-     * @return null|array
+     * @return array Returns empty array if entity has full access,
+     *               array with null values if user does't have access to the entity
+     *               and array with entity field and field values which user have access.
      */
     public function getAclConditionData($entityClassName, $permissions = 'VIEW')
     {
diff --git a/src/Oro/Bundle/SecurityBundle/Search/AclHelper.php b/src/Oro/Bundle/SecurityBundle/Search/AclHelper.php
index 9f9f6b06861..3d83cdb5f14 100644
--- a/src/Oro/Bundle/SecurityBundle/Search/AclHelper.php
+++ b/src/Oro/Bundle/SecurityBundle/Search/AclHelper.php
@@ -62,7 +62,7 @@ public function apply(Query $query, $permission = 'VIEW')
                 if ($className) {
                     $ownerField = sprintf('%s_owner', $entityAlias);
                     $condition  = $this->ownershipDataBuilder->getAclConditionData($className, $permission);
-                    if ($condition !== null) {
+                    if (count($condition) === 0 || !($condition[0] === null && $condition[3] === null)) {
                         $allowedAliases[] = $entityAlias;
 
                         // in case if we should not limit data for entity

From fa4a3cd1a1d36367ffc265497254d18f4004b6e3 Mon Sep 17 00:00:00 2001
From: Yurii Muratov <yurio@ua.fm>
Date: Mon, 4 Jan 2016 14:23:54 +0200
Subject: [PATCH 343/471] BAP-9626: Fix Search ACL Helper

---
 .../SecurityBundle/ORM/Walker/OwnershipConditionDataBuilder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/SecurityBundle/ORM/Walker/OwnershipConditionDataBuilder.php b/src/Oro/Bundle/SecurityBundle/ORM/Walker/OwnershipConditionDataBuilder.php
index b62b4e9bb98..b7a8257ca39 100644
--- a/src/Oro/Bundle/SecurityBundle/ORM/Walker/OwnershipConditionDataBuilder.php
+++ b/src/Oro/Bundle/SecurityBundle/ORM/Walker/OwnershipConditionDataBuilder.php
@@ -89,7 +89,7 @@ public function setAclGroupProvider($aclGroupProvider)
      *
      * @return array Returns empty array if entity has full access,
      *               array with null values if user does't have access to the entity
-     *               and array with entity field and field values which user have access.
+     *               and array with entity field and field values which user has access to.
      */
     public function getAclConditionData($entityClassName, $permissions = 'VIEW')
     {

From 00121699071bc492948acc16adf3faee95f5a6f0 Mon Sep 17 00:00:00 2001
From: Yurii Muratov <yurio@ua.fm>
Date: Mon, 4 Jan 2016 14:28:50 +0200
Subject: [PATCH 344/471] BAP-9626: Fix Search ACL Helper

---
 .../ORM/Walker/OwnershipConditionDataBuilder.php          | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Oro/Bundle/SecurityBundle/ORM/Walker/OwnershipConditionDataBuilder.php b/src/Oro/Bundle/SecurityBundle/ORM/Walker/OwnershipConditionDataBuilder.php
index b7a8257ca39..c1825a78ec8 100644
--- a/src/Oro/Bundle/SecurityBundle/ORM/Walker/OwnershipConditionDataBuilder.php
+++ b/src/Oro/Bundle/SecurityBundle/ORM/Walker/OwnershipConditionDataBuilder.php
@@ -90,6 +90,14 @@ public function setAclGroupProvider($aclGroupProvider)
      * @return array Returns empty array if entity has full access,
      *               array with null values if user does't have access to the entity
      *               and array with entity field and field values which user has access to.
+     *               Array structure:
+     *               0 - owner field name
+     *               1 - owner values
+     *               2 - owner association type
+     *               3 - organization field name
+     *               4 - organization values
+     *               5 - should owners be checked
+     *                  (for example, in case of Organization ownership type, owners should not be checked)
      */
     public function getAclConditionData($entityClassName, $permissions = 'VIEW')
     {

From c268952aef1a9081d68d4cc2e82717c52b9ea114 Mon Sep 17 00:00:00 2001
From: zebimax <zebimax@gmail.com>
Date: Mon, 4 Jan 2016 15:22:24 +0200
Subject: [PATCH 345/471] BAP-9579: Process default filters, sorters from grid
 view  - remove label passing on remove default label

---
 .../Resources/views/Report/table/view.html.twig             | 2 +-
 .../SegmentBundle/Resources/views/Segment/view.html.twig    | 2 +-
 .../Bundle/UIBundle/Resources/views/actions/index.html.twig | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Oro/Bundle/ReportBundle/Resources/views/Report/table/view.html.twig b/src/Oro/Bundle/ReportBundle/Resources/views/Report/table/view.html.twig
index 22166fbaf91..611f73a193c 100644
--- a/src/Oro/Bundle/ReportBundle/Resources/views/Report/table/view.html.twig
+++ b/src/Oro/Bundle/ReportBundle/Resources/views/Report/table/view.html.twig
@@ -40,7 +40,7 @@
                 {{ chartView.render()|raw }}
             </div>
         {% endif %}
-        {% set renderParams = renderParams|default({})|merge({enableFullScreenLayout: true}) %}
+        {% set renderParams = renderParams|default({})|merge({enableFullScreenLayout: true, enableViews: false}) %}
         {% set params = params|default({})|merge({
                 '_grid_view': {
                     '_disabled': true
diff --git a/src/Oro/Bundle/SegmentBundle/Resources/views/Segment/view.html.twig b/src/Oro/Bundle/SegmentBundle/Resources/views/Segment/view.html.twig
index 1bea9b8bbd9..42172436033 100644
--- a/src/Oro/Bundle/SegmentBundle/Resources/views/Segment/view.html.twig
+++ b/src/Oro/Bundle/SegmentBundle/Resources/views/Segment/view.html.twig
@@ -37,7 +37,7 @@
 
 {% block content_data %}
     {% if gridName is defined and gridName %}
-        {% set renderParams = renderParams|default({})|merge({enableFullScreenLayout: true}) %}
+        {% set renderParams = renderParams|default({})|merge({enableFullScreenLayout: true, enableViews: false}) %}
         {% set params = params|default({})|merge({
                 '_grid_view': {
                     '_disabled': true
diff --git a/src/Oro/Bundle/UIBundle/Resources/views/actions/index.html.twig b/src/Oro/Bundle/UIBundle/Resources/views/actions/index.html.twig
index 1a7f553d3ee..3b1730e7e06 100644
--- a/src/Oro/Bundle/UIBundle/Resources/views/actions/index.html.twig
+++ b/src/Oro/Bundle/UIBundle/Resources/views/actions/index.html.twig
@@ -35,12 +35,12 @@
             {% if gridScope is defined %}
                 {% set gridName = oro_datagrid_build_fullname(gridName, gridScope) %}
             {% endif %}
-            {% set renderParams = renderParams|default({})|merge({
+            {% set renderParams = {
                 'enableFullScreenLayout': true,
                 'enableViews': true,
                 'showViewsInNavbar': true,
-            }) %}
-
+            }
+            |merge(renderParams|default({})) %}
             {{ dataGrid.renderGrid(gridName, params|default({}), renderParams) }}
 
             {# Only grids on index pages will be tagged #}

From a3633aa1099154e406265643240fba9092cb7f4b Mon Sep 17 00:00:00 2001
From: zebimax <zebimax@gmail.com>
Date: Mon, 4 Jan 2016 17:58:43 +0200
Subject: [PATCH 346/471] BAP-9633: Failed selenium tests  - suppress warning
 ColumnsExtension

---
 .../DataGridBundle/Extension/Columns/ColumnsExtension.php    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Extension/Columns/ColumnsExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/Columns/ColumnsExtension.php
index d120914a602..65e9c5afcbf 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/Columns/ColumnsExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/Columns/ColumnsExtension.php
@@ -2,7 +2,6 @@
 
 namespace Oro\Bundle\DataGridBundle\Extension\Columns;
 
-use Oro\Bundle\DataGridBundle\Entity\GridView;
 use Symfony\Component\Security\Core\User\UserInterface;
 
 use Doctrine\Bundle\DoctrineBundle\Registry;
@@ -17,7 +16,11 @@
 use Oro\Bundle\DataGridBundle\Tools\ColumnsHelper;
 use Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper;
 use Oro\Bundle\SecurityBundle\SecurityFacade;
+use Oro\Bundle\DataGridBundle\Entity\GridView;
 
+/**
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ */
 class ColumnsExtension extends AbstractExtension
 {
     /**

From 2b9d7be34197a7503bb2364063776c19f7d5934e Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Mon, 4 Jan 2016 17:56:47 +0200
Subject: [PATCH 347/471] BAP-9633: Failed selenium tests  - Fix code styles

---
 .../DataGridBundle/Extension/Columns/ColumnsExtension.php   | 6 +++---
 .../Extension/GridViews/GridViewsExtension.php              | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Extension/Columns/ColumnsExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/Columns/ColumnsExtension.php
index 65e9c5afcbf..8273f1ab8a7 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/Columns/ColumnsExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/Columns/ColumnsExtension.php
@@ -44,8 +44,8 @@ class ColumnsExtension extends AbstractExtension
     /** @var ColumnsHelper */
     protected $columnsHelper;
 
-    /** @var GridView|null */
-    protected $defaultGridView;
+    /** @var GridView|null|bool */
+    protected $defaultGridView = false;
 
     /**
      * @param Registry       $registry
@@ -294,7 +294,7 @@ protected function getColumnsWithOrder(DatagridConfiguration $config, $default =
      */
     protected function getDefaultGridView($gridName)
     {
-        if ($this->defaultGridView === null) {
+        if ($this->defaultGridView === false) {
             $defaultGridView = $this->getGridViewRepository()->findDefaultGridView(
                 $this->aclHelper,
                 $this->getCurrentUser(),
diff --git a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
index a2ce3b183a2..33fd0eb8ab6 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/GridViews/GridViewsExtension.php
@@ -42,8 +42,8 @@ class GridViewsExtension extends AbstractExtension
     /** @var AclHelper */
     protected $aclHelper;
 
-    /** @var GridView|null */
-    protected $defaultGridView;
+    /** @var GridView|null|bool */
+    protected $defaultGridView = false;
 
     /**
      * @param EventDispatcherInterface $eventDispatcher
@@ -184,7 +184,7 @@ protected function getDefaultViewId($gridName)
      */
     protected function getDefaultView($gridName)
     {
-        if ($this->defaultGridView === null) {
+        if ($this->defaultGridView === false) {
             $repository      = $this->registry->getRepository('OroDataGridBundle:GridView');
             $defaultGridView = $repository->findDefaultGridView(
                 $this->aclHelper,

From b4abfac63ff59a3206be6610363168edbabc36bd Mon Sep 17 00:00:00 2001
From: Oleg Popadko <oleg@popadko.com>
Date: Mon, 4 Jan 2016 19:42:04 +0200
Subject: [PATCH 348/471] BAP-7696: Update jsTree library - use composer jstree
 package

---
 .../UIBundle/Resources/config/assets.yml      |    2 +-
 .../UIBundle/Resources/config/oro/app.yml     |   23 +
 .../UIBundle/Resources/config/requirejs.yml   |    5 +-
 .../js/app/components/basic-tree-component.js |    2 +-
 .../Resources/public/lib/jstree/jstree.js     | 7781 -----------------
 .../Resources/public/lib/jstree/jstree.min.js |    5 -
 .../lib/jstree/themes/default-dark/32px.png   |  Bin 1562 -> 0 bytes
 .../lib/jstree/themes/default-dark/40px.png   |  Bin 5717 -> 0 bytes
 .../lib/jstree/themes/default-dark/style.css  | 1105 ---
 .../jstree/themes/default-dark/style.min.css  |    1 -
 .../jstree/themes/default-dark/throbber.gif   |  Bin 1720 -> 0 bytes
 .../public/lib/jstree/themes/default/32px.png |  Bin 3121 -> 0 bytes
 .../public/lib/jstree/themes/default/40px.png |  Bin 1880 -> 0 bytes
 .../lib/jstree/themes/default/style.css       | 1061 ---
 .../lib/jstree/themes/default/style.min.css   |    1 -
 .../lib/jstree/themes/default/throbber.gif    |  Bin 1720 -> 0 bytes
 src/Oro/Bundle/UIBundle/composer.json         |    3 +-
 17 files changed, 29 insertions(+), 9960 deletions(-)
 delete mode 100755 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/jstree.js
 delete mode 100755 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/jstree.min.js
 delete mode 100755 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/32px.png
 delete mode 100755 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/40px.png
 delete mode 100755 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/style.css
 delete mode 100755 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/style.min.css
 delete mode 100755 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/throbber.gif
 delete mode 100755 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/32px.png
 delete mode 100755 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/40px.png
 delete mode 100755 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/style.css
 delete mode 100755 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/style.min.css
 delete mode 100755 src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/throbber.gif

diff --git a/src/Oro/Bundle/UIBundle/Resources/config/assets.yml b/src/Oro/Bundle/UIBundle/Resources/config/assets.yml
index 362422c6155..2133f7cc99f 100644
--- a/src/Oro/Bundle/UIBundle/Resources/config/assets.yml
+++ b/src/Oro/Bundle/UIBundle/Resources/config/assets.yml
@@ -2,9 +2,9 @@ css:
     'timepicker':
         - 'bundles/oroui/lib/jquery.timepicker-1.4.13/jquery.timepicker.css'
     'oroui':
+        - 'bundles/jstree/themes/default/style.min.css'
         # libraries' styles
         - 'bundles/oroui/lib/bootstrap/bootstrap.less'
-        - 'bundles/oroui/lib/jstree/themes/default/style.min.css'
         - 'bundles/oroui/lib/font-awesome/css/font-awesome.css'
         - 'bundles/oroui/lib/simplecolorpicker/jquery.simplecolorpicker.css'
         - 'bundles/oroui/lib/simplecolorpicker/jquery.simplecolorpicker-fontawesome.css'
diff --git a/src/Oro/Bundle/UIBundle/Resources/config/oro/app.yml b/src/Oro/Bundle/UIBundle/Resources/config/oro/app.yml
index 423b0f8d25b..91fa55ef02e 100644
--- a/src/Oro/Bundle/UIBundle/Resources/config/oro/app.yml
+++ b/src/Oro/Bundle/UIBundle/Resources/config/oro/app.yml
@@ -14,3 +14,26 @@ liip_imagine:
 twig:
     globals:
         assets_version:       "%assets_version%"
+
+assetic:
+    assets:
+        jstree:
+            inputs:
+                - %kernel.root_dir%/../vendor/vakata/jstree/dist/jstree.min.js
+            output: bundles/jstree/jquery.jstree.min.js
+        jstree_default_theme_style:
+            inputs:
+                - %kernel.root_dir%/../vendor/vakata/jstree/dist/themes/default/style.min.css
+            output: bundles/jstree/themes/default/style.min.css
+        jstree_default_theme_32px_png:
+            inputs:
+                - %kernel.root_dir%/../vendor/vakata/jstree/dist/themes/default/32px.png
+            output: bundles/jstree/themes/default/32px.png
+        jstree_default_theme_40px_png:
+            inputs:
+                - %kernel.root_dir%/../vendor/vakata/jstree/dist/themes/default/40px.png
+            output: bundles/jstree/themes/default/40px.png
+        jstree_default_theme_throbber_gif:
+            inputs:
+                - %kernel.root_dir%/../vendor/vakata/jstree/dist/themes/default/throbber.gif
+            output: bundles/jstree/themes/default/throbber.gif
diff --git a/src/Oro/Bundle/UIBundle/Resources/config/requirejs.yml b/src/Oro/Bundle/UIBundle/Resources/config/requirejs.yml
index fb1ba9b0bb8..b30578695fa 100644
--- a/src/Oro/Bundle/UIBundle/Resources/config/requirejs.yml
+++ b/src/Oro/Bundle/UIBundle/Resources/config/requirejs.yml
@@ -19,10 +19,9 @@ config:
         'jquery.minicolors':
             deps:
                 - 'jquery'
-        'jquery.jstree':
+        'jstree/jquery.jstree.min':
             deps:
                 - 'jquery'
-                - 'jquery.cookie'
         'jquery.cookie':
             deps:
                 - 'jquery'
@@ -129,7 +128,6 @@ config:
         'jquery.simplecolorpicker': 'bundles/oroui/lib/simplecolorpicker/jquery.simplecolorpicker.js'
         'jquery.minicolors': 'bundles/oroui/lib/minicolors/jquery.minicolors.js'
         'jquery.cookie': 'bundles/oroui/lib/jquery/jquery.cookie.js'
-        'jquery.jstree': 'bundles/oroui/lib/jstree/jstree.min.js'
         'jquery.ajax.queue': 'bundles/oroui/lib/jquery/jquery.ajaxQueue.min.js'
         'bootstrap': 'bundles/oroui/lib/bootstrap.min.js'
 #        'bootstrap': 'bundles/oroui/js/bootstrap-dev.js'
@@ -210,6 +208,7 @@ config:
 
 build:
     paths:
+        'jstree/jquery.jstree.min': 'empty:'
 #       Backbone after v.1.1.1 started to support AMD. And that broke a js-build with
 #       files which does not support AMD. backbone-bootstrap-modal use AMD without dependency,
 #       therefore it's excluded
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/basic-tree-component.js b/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/basic-tree-component.js
index 916e50bebe7..db01a07af53 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/basic-tree-component.js
+++ b/src/Oro/Bundle/UIBundle/Resources/public/js/app/components/basic-tree-component.js
@@ -8,7 +8,7 @@ define(function(require) {
     var layout = require('oroui/js/layout');
     var BaseComponent = require('oroui/js/app/components/base/component');
 
-    require('jquery.jstree');
+    require('jstree/jquery.jstree.min');
 
     /**
      * Options:
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/jstree.js b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/jstree.js
deleted file mode 100755
index 48ee5ce0144..00000000000
--- a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/jstree.js
+++ /dev/null
@@ -1,7781 +0,0 @@
-/*globals jQuery, define, module, exports, require, window, document, postMessage */
-(function (factory) {
-	"use strict";
-	if (typeof define === 'function' && define.amd) {
-		define(['jquery'], factory);
-	}
-	else if(typeof module !== 'undefined' && module.exports) {
-		module.exports = factory(require('jquery'));
-	}
-	else {
-		factory(jQuery);
-	}
-}(function ($, undefined) {
-	"use strict";
-/*!
- * jsTree 3.2.1
- * http://jstree.com/
- *
- * Copyright (c) 2014 Ivan Bozhanov (http://vakata.com)
- *
- * Licensed same as jquery - under the terms of the MIT License
- *   http://www.opensource.org/licenses/mit-license.php
- */
-/*!
- * if using jslint please allow for the jQuery global and use following options:
- * jslint: browser: true, ass: true, bitwise: true, continue: true, nomen: true, plusplus: true, regexp: true, unparam: true, todo: true, white: true
- */
-
-	// prevent another load? maybe there is a better way?
-	if($.jstree) {
-		return;
-	}
-
-	/**
-	 * ### jsTree core functionality
-	 */
-
-	// internal variables
-	var instance_counter = 0,
-		ccp_node = false,
-		ccp_mode = false,
-		ccp_inst = false,
-		themes_loaded = [],
-		src = $('script:last').attr('src'),
-		document = window.document, // local variable is always faster to access then a global
-		_node = document.createElement('LI'), _temp1, _temp2;
-
-	_node.setAttribute('role', 'treeitem');
-	_temp1 = document.createElement('I');
-	_temp1.className = 'jstree-icon jstree-ocl';
-	_temp1.setAttribute('role', 'presentation');
-	_node.appendChild(_temp1);
-	_temp1 = document.createElement('A');
-	_temp1.className = 'jstree-anchor';
-	_temp1.setAttribute('href','#');
-	_temp1.setAttribute('tabindex','-1');
-	_temp2 = document.createElement('I');
-	_temp2.className = 'jstree-icon jstree-themeicon';
-	_temp2.setAttribute('role', 'presentation');
-	_temp1.appendChild(_temp2);
-	_node.appendChild(_temp1);
-	_temp1 = _temp2 = null;
-
-
-	/**
-	 * holds all jstree related functions and variables, including the actual class and methods to create, access and manipulate instances.
-	 * @name $.jstree
-	 */
-	$.jstree = {
-		/**
-		 * specifies the jstree version in use
-		 * @name $.jstree.version
-		 */
-		version : '3.2.1',
-		/**
-		 * holds all the default options used when creating new instances
-		 * @name $.jstree.defaults
-		 */
-		defaults : {
-			/**
-			 * configure which plugins will be active on an instance. Should be an array of strings, where each element is a plugin name. The default is `[]`
-			 * @name $.jstree.defaults.plugins
-			 */
-			plugins : []
-		},
-		/**
-		 * stores all loaded jstree plugins (used internally)
-		 * @name $.jstree.plugins
-		 */
-		plugins : {},
-		path : src && src.indexOf('/') !== -1 ? src.replace(/\/[^\/]+$/,'') : '',
-		idregex : /[\\:&!^|()\[\]<>@*'+~#";.,=\- \/${}%?`]/g,
-		root : '#'
-	};
-	/**
-	 * creates a jstree instance
-	 * @name $.jstree.create(el [, options])
-	 * @param {DOMElement|jQuery|String} el the element to create the instance on, can be jQuery extended or a selector
-	 * @param {Object} options options for this instance (extends `$.jstree.defaults`)
-	 * @return {jsTree} the new instance
-	 */
-	$.jstree.create = function (el, options) {
-		var tmp = new $.jstree.core(++instance_counter),
-			opt = options;
-		options = $.extend(true, {}, $.jstree.defaults, options);
-		if(opt && opt.plugins) {
-			options.plugins = opt.plugins;
-		}
-		$.each(options.plugins, function (i, k) {
-			if(i !== 'core') {
-				tmp = tmp.plugin(k, options[k]);
-			}
-		});
-		$(el).data('jstree', tmp);
-		tmp.init(el, options);
-		return tmp;
-	};
-	/**
-	 * remove all traces of jstree from the DOM and destroy all instances
-	 * @name $.jstree.destroy()
-	 */
-	$.jstree.destroy = function () {
-		$('.jstree:jstree').jstree('destroy');
-		$(document).off('.jstree');
-	};
-	/**
-	 * the jstree class constructor, used only internally
-	 * @private
-	 * @name $.jstree.core(id)
-	 * @param {Number} id this instance's index
-	 */
-	$.jstree.core = function (id) {
-		this._id = id;
-		this._cnt = 0;
-		this._wrk = null;
-		this._data = {
-			core : {
-				themes : {
-					name : false,
-					dots : false,
-					icons : false
-				},
-				selected : [],
-				last_error : {},
-				working : false,
-				worker_queue : [],
-				focused : null
-			}
-		};
-	};
-	/**
-	 * get a reference to an existing instance
-	 *
-	 * __Examples__
-	 *
-	 *	// provided a container with an ID of "tree", and a nested node with an ID of "branch"
-	 *	// all of there will return the same instance
-	 *	$.jstree.reference('tree');
-	 *	$.jstree.reference('#tree');
-	 *	$.jstree.reference($('#tree'));
-	 *	$.jstree.reference(document.getElementByID('tree'));
-	 *	$.jstree.reference('branch');
-	 *	$.jstree.reference('#branch');
-	 *	$.jstree.reference($('#branch'));
-	 *	$.jstree.reference(document.getElementByID('branch'));
-	 *
-	 * @name $.jstree.reference(needle)
-	 * @param {DOMElement|jQuery|String} needle
-	 * @return {jsTree|null} the instance or `null` if not found
-	 */
-	$.jstree.reference = function (needle) {
-		var tmp = null,
-			obj = null;
-		if(needle && needle.id && (!needle.tagName || !needle.nodeType)) { needle = needle.id; }
-
-		if(!obj || !obj.length) {
-			try { obj = $(needle); } catch (ignore) { }
-		}
-		if(!obj || !obj.length) {
-			try { obj = $('#' + needle.replace($.jstree.idregex,'\\$&')); } catch (ignore) { }
-		}
-		if(obj && obj.length && (obj = obj.closest('.jstree')).length && (obj = obj.data('jstree'))) {
-			tmp = obj;
-		}
-		else {
-			$('.jstree').each(function () {
-				var inst = $(this).data('jstree');
-				if(inst && inst._model.data[needle]) {
-					tmp = inst;
-					return false;
-				}
-			});
-		}
-		return tmp;
-	};
-	/**
-	 * Create an instance, get an instance or invoke a command on a instance.
-	 *
-	 * If there is no instance associated with the current node a new one is created and `arg` is used to extend `$.jstree.defaults` for this new instance. There would be no return value (chaining is not broken).
-	 *
-	 * If there is an existing instance and `arg` is a string the command specified by `arg` is executed on the instance, with any additional arguments passed to the function. If the function returns a value it will be returned (chaining could break depending on function).
-	 *
-	 * If there is an existing instance and `arg` is not a string the instance itself is returned (similar to `$.jstree.reference`).
-	 *
-	 * In any other case - nothing is returned and chaining is not broken.
-	 *
-	 * __Examples__
-	 *
-	 *	$('#tree1').jstree(); // creates an instance
-	 *	$('#tree2').jstree({ plugins : [] }); // create an instance with some options
-	 *	$('#tree1').jstree('open_node', '#branch_1'); // call a method on an existing instance, passing additional arguments
-	 *	$('#tree2').jstree(); // get an existing instance (or create an instance)
-	 *	$('#tree2').jstree(true); // get an existing instance (will not create new instance)
-	 *	$('#branch_1').jstree().select_node('#branch_1'); // get an instance (using a nested element and call a method)
-	 *
-	 * @name $().jstree([arg])
-	 * @param {String|Object} arg
-	 * @return {Mixed}
-	 */
-	$.fn.jstree = function (arg) {
-		// check for string argument
-		var is_method	= (typeof arg === 'string'),
-			args		= Array.prototype.slice.call(arguments, 1),
-			result		= null;
-		if(arg === true && !this.length) { return false; }
-		this.each(function () {
-			// get the instance (if there is one) and method (if it exists)
-			var instance = $.jstree.reference(this),
-				method = is_method && instance ? instance[arg] : null;
-			// if calling a method, and method is available - execute on the instance
-			result = is_method && method ?
-				method.apply(instance, args) :
-				null;
-			// if there is no instance and no method is being called - create one
-			if(!instance && !is_method && (arg === undefined || $.isPlainObject(arg))) {
-				$.jstree.create(this, arg);
-			}
-			// if there is an instance and no method is called - return the instance
-			if( (instance && !is_method) || arg === true ) {
-				result = instance || false;
-			}
-			// if there was a method call which returned a result - break and return the value
-			if(result !== null && result !== undefined) {
-				return false;
-			}
-		});
-		// if there was a method call with a valid return value - return that, otherwise continue the chain
-		return result !== null && result !== undefined ?
-			result : this;
-	};
-	/**
-	 * used to find elements containing an instance
-	 *
-	 * __Examples__
-	 *
-	 *	$('div:jstree').each(function () {
-	 *		$(this).jstree('destroy');
-	 *	});
-	 *
-	 * @name $(':jstree')
-	 * @return {jQuery}
-	 */
-	$.expr[':'].jstree = $.expr.createPseudo(function(search) {
-		return function(a) {
-			return $(a).hasClass('jstree') &&
-				$(a).data('jstree') !== undefined;
-		};
-	});
-
-	/**
-	 * stores all defaults for the core
-	 * @name $.jstree.defaults.core
-	 */
-	$.jstree.defaults.core = {
-		/**
-		 * data configuration
-		 *
-		 * If left as `false` the HTML inside the jstree container element is used to populate the tree (that should be an unordered list with list items).
-		 *
-		 * You can also pass in a HTML string or a JSON array here.
-		 *
-		 * It is possible to pass in a standard jQuery-like AJAX config and jstree will automatically determine if the response is JSON or HTML and use that to populate the tree.
-		 * In addition to the standard jQuery ajax options here you can suppy functions for `data` and `url`, the functions will be run in the current instance's scope and a param will be passed indicating which node is being loaded, the return value of those functions will be used.
-		 *
-		 * The last option is to specify a function, that function will receive the node being loaded as argument and a second param which is a function which should be called with the result.
-		 *
-		 * __Examples__
-		 *
-		 *	// AJAX
-		 *	$('#tree').jstree({
-		 *		'core' : {
-		 *			'data' : {
-		 *				'url' : '/get/children/',
-		 *				'data' : function (node) {
-		 *					return { 'id' : node.id };
-		 *				}
-		 *			}
-		 *		});
-		 *
-		 *	// direct data
-		 *	$('#tree').jstree({
-		 *		'core' : {
-		 *			'data' : [
-		 *				'Simple root node',
-		 *				{
-		 *					'id' : 'node_2',
-		 *					'text' : 'Root node with options',
-		 *					'state' : { 'opened' : true, 'selected' : true },
-		 *					'children' : [ { 'text' : 'Child 1' }, 'Child 2']
-		 *				}
-		 *			]
-		 *		});
-		 *
-		 *	// function
-		 *	$('#tree').jstree({
-		 *		'core' : {
-		 *			'data' : function (obj, callback) {
-		 *				callback.call(this, ['Root 1', 'Root 2']);
-		 *			}
-		 *		});
-		 *
-		 * @name $.jstree.defaults.core.data
-		 */
-		data			: false,
-		/**
-		 * configure the various strings used throughout the tree
-		 *
-		 * You can use an object where the key is the string you need to replace and the value is your replacement.
-		 * Another option is to specify a function which will be called with an argument of the needed string and should return the replacement.
-		 * If left as `false` no replacement is made.
-		 *
-		 * __Examples__
-		 *
-		 *	$('#tree').jstree({
-		 *		'core' : {
-		 *			'strings' : {
-		 *				'Loading ...' : 'Please wait ...'
-		 *			}
-		 *		}
-		 *	});
-		 *
-		 * @name $.jstree.defaults.core.strings
-		 */
-		strings			: false,
-		/**
-		 * determines what happens when a user tries to modify the structure of the tree
-		 * If left as `false` all operations like create, rename, delete, move or copy are prevented.
-		 * You can set this to `true` to allow all interactions or use a function to have better control.
-		 *
-		 * __Examples__
-		 *
-		 *	$('#tree').jstree({
-		 *		'core' : {
-		 *			'check_callback' : function (operation, node, node_parent, node_position, more) {
-		 *				// operation can be 'create_node', 'rename_node', 'delete_node', 'move_node' or 'copy_node'
-		 *				// in case of 'rename_node' node_position is filled with the new node name
-		 *				return operation === 'rename_node' ? true : false;
-		 *			}
-		 *		}
-		 *	});
-		 *
-		 * @name $.jstree.defaults.core.check_callback
-		 */
-		check_callback	: false,
-		/**
-		 * a callback called with a single object parameter in the instance's scope when something goes wrong (operation prevented, ajax failed, etc)
-		 * @name $.jstree.defaults.core.error
-		 */
-		error			: $.noop,
-		/**
-		 * the open / close animation duration in milliseconds - set this to `false` to disable the animation (default is `200`)
-		 * @name $.jstree.defaults.core.animation
-		 */
-		animation		: 200,
-		/**
-		 * a boolean indicating if multiple nodes can be selected
-		 * @name $.jstree.defaults.core.multiple
-		 */
-		multiple		: true,
-		/**
-		 * theme configuration object
-		 * @name $.jstree.defaults.core.themes
-		 */
-		themes			: {
-			/**
-			 * the name of the theme to use (if left as `false` the default theme is used)
-			 * @name $.jstree.defaults.core.themes.name
-			 */
-			name			: false,
-			/**
-			 * the URL of the theme's CSS file, leave this as `false` if you have manually included the theme CSS (recommended). You can set this to `true` too which will try to autoload the theme.
-			 * @name $.jstree.defaults.core.themes.url
-			 */
-			url				: false,
-			/**
-			 * the location of all jstree themes - only used if `url` is set to `true`
-			 * @name $.jstree.defaults.core.themes.dir
-			 */
-			dir				: false,
-			/**
-			 * a boolean indicating if connecting dots are shown
-			 * @name $.jstree.defaults.core.themes.dots
-			 */
-			dots			: true,
-			/**
-			 * a boolean indicating if node icons are shown
-			 * @name $.jstree.defaults.core.themes.icons
-			 */
-			icons			: true,
-			/**
-			 * a boolean indicating if the tree background is striped
-			 * @name $.jstree.defaults.core.themes.stripes
-			 */
-			stripes			: false,
-			/**
-			 * a string (or boolean `false`) specifying the theme variant to use (if the theme supports variants)
-			 * @name $.jstree.defaults.core.themes.variant
-			 */
-			variant			: false,
-			/**
-			 * a boolean specifying if a reponsive version of the theme should kick in on smaller screens (if the theme supports it). Defaults to `false`.
-			 * @name $.jstree.defaults.core.themes.responsive
-			 */
-			responsive		: false
-		},
-		/**
-		 * if left as `true` all parents of all selected nodes will be opened once the tree loads (so that all selected nodes are visible to the user)
-		 * @name $.jstree.defaults.core.expand_selected_onload
-		 */
-		expand_selected_onload : true,
-		/**
-		 * if left as `true` web workers will be used to parse incoming JSON data where possible, so that the UI will not be blocked by large requests. Workers are however about 30% slower. Defaults to `true`
-		 * @name $.jstree.defaults.core.worker
-		 */
-		worker : true,
-		/**
-		 * Force node text to plain text (and escape HTML). Defaults to `false`
-		 * @name $.jstree.defaults.core.force_text
-		 */
-		force_text : false,
-		/**
-		 * Should the node should be toggled if the text is double clicked . Defaults to `true`
-		 * @name $.jstree.defaults.core.dblclick_toggle
-		 */
-		dblclick_toggle : true
-	};
-	$.jstree.core.prototype = {
-		/**
-		 * used to decorate an instance with a plugin. Used internally.
-		 * @private
-		 * @name plugin(deco [, opts])
-		 * @param  {String} deco the plugin to decorate with
-		 * @param  {Object} opts options for the plugin
-		 * @return {jsTree}
-		 */
-		plugin : function (deco, opts) {
-			var Child = $.jstree.plugins[deco];
-			if(Child) {
-				this._data[deco] = {};
-				Child.prototype = this;
-				return new Child(opts, this);
-			}
-			return this;
-		},
-		/**
-		 * initialize the instance. Used internally.
-		 * @private
-		 * @name init(el, optons)
-		 * @param {DOMElement|jQuery|String} el the element we are transforming
-		 * @param {Object} options options for this instance
-		 * @trigger init.jstree, loading.jstree, loaded.jstree, ready.jstree, changed.jstree
-		 */
-		init : function (el, options) {
-			this._model = {
-				data : {},
-				changed : [],
-				force_full_redraw : false,
-				redraw_timeout : false,
-				default_state : {
-					loaded : true,
-					opened : false,
-					selected : false,
-					disabled : false
-				}
-			};
-			this._model.data[$.jstree.root] = {
-				id : $.jstree.root,
-				parent : null,
-				parents : [],
-				children : [],
-				children_d : [],
-				state : { loaded : false }
-			};
-
-			this.element = $(el).addClass('jstree jstree-' + this._id);
-			this.settings = options;
-
-			this._data.core.ready = false;
-			this._data.core.loaded = false;
-			this._data.core.rtl = (this.element.css("direction") === "rtl");
-			this.element[this._data.core.rtl ? 'addClass' : 'removeClass']("jstree-rtl");
-			this.element.attr('role','tree');
-			if(this.settings.core.multiple) {
-				this.element.attr('aria-multiselectable', true);
-			}
-			if(!this.element.attr('tabindex')) {
-				this.element.attr('tabindex','0');
-			}
-
-			this.bind();
-			/**
-			 * triggered after all events are bound
-			 * @event
-			 * @name init.jstree
-			 */
-			this.trigger("init");
-
-			this._data.core.original_container_html = this.element.find(" > ul > li").clone(true);
-			this._data.core.original_container_html
-				.find("li").addBack()
-				.contents().filter(function() {
-					return this.nodeType === 3 && (!this.nodeValue || /^\s+$/.test(this.nodeValue));
-				})
-				.remove();
-			this.element.html("<"+"ul class='jstree-container-ul jstree-children' role='group'><"+"li id='j"+this._id+"_loading' class='jstree-initial-node jstree-loading jstree-leaf jstree-last' role='tree-item'><i class='jstree-icon jstree-ocl'></i><"+"a class='jstree-anchor' href='#'><i class='jstree-icon jstree-themeicon-hidden'></i>" + this.get_string("Loading ...") + "</a></li></ul>");
-			this.element.attr('aria-activedescendant','j' + this._id + '_loading');
-			this._data.core.li_height = this.get_container_ul().children("li").first().height() || 24;
-			/**
-			 * triggered after the loading text is shown and before loading starts
-			 * @event
-			 * @name loading.jstree
-			 */
-			this.trigger("loading");
-			this.load_node($.jstree.root);
-		},
-		/**
-		 * destroy an instance
-		 * @name destroy()
-		 * @param  {Boolean} keep_html if not set to `true` the container will be emptied, otherwise the current DOM elements will be kept intact
-		 */
-		destroy : function (keep_html) {
-			if(this._wrk) {
-				try {
-					window.URL.revokeObjectURL(this._wrk);
-					this._wrk = null;
-				}
-				catch (ignore) { }
-			}
-			if(!keep_html) { this.element.empty(); }
-			this.teardown();
-		},
-		/**
-		 * part of the destroying of an instance. Used internally.
-		 * @private
-		 * @name teardown()
-		 */
-		teardown : function () {
-			this.unbind();
-			this.element
-				.removeClass('jstree')
-				.removeData('jstree')
-				.find("[class^='jstree']")
-					.addBack()
-					.attr("class", function () { return this.className.replace(/jstree[^ ]*|$/ig,''); });
-			this.element = null;
-		},
-		/**
-		 * bind all events. Used internally.
-		 * @private
-		 * @name bind()
-		 */
-		bind : function () {
-			var word = '',
-				tout = null,
-				was_click = 0;
-			this.element
-				.on("dblclick.jstree", function (e) {
-						if(e.target.tagName && e.target.tagName.toLowerCase() === "input") { return true; }
-						if(document.selection && document.selection.empty) {
-							document.selection.empty();
-						}
-						else {
-							if(window.getSelection) {
-								var sel = window.getSelection();
-								try {
-									sel.removeAllRanges();
-									sel.collapse();
-								} catch (ignore) { }
-							}
-						}
-					})
-				.on("mousedown.jstree", $.proxy(function (e) {
-						if(e.target === this.element[0]) {
-							e.preventDefault(); // prevent losing focus when clicking scroll arrows (FF, Chrome)
-							was_click = +(new Date()); // ie does not allow to prevent losing focus
-						}
-					}, this))
-				.on("mousedown.jstree", ".jstree-ocl", function (e) {
-						e.preventDefault(); // prevent any node inside from losing focus when clicking the open/close icon
-					})
-				.on("click.jstree", ".jstree-ocl", $.proxy(function (e) {
-						this.toggle_node(e.target);
-					}, this))
-				.on("dblclick.jstree", ".jstree-anchor", $.proxy(function (e) {
-						if(e.target.tagName && e.target.tagName.toLowerCase() === "input") { return true; }
-						if(this.settings.core.dblclick_toggle) {
-							this.toggle_node(e.target);
-						}
-					}, this))
-				.on("click.jstree", ".jstree-anchor", $.proxy(function (e) {
-						e.preventDefault();
-						if(e.currentTarget !== document.activeElement) { $(e.currentTarget).focus(); }
-						this.activate_node(e.currentTarget, e);
-					}, this))
-				.on('keydown.jstree', '.jstree-anchor', $.proxy(function (e) {
-						if(e.target.tagName && e.target.tagName.toLowerCase() === "input") { return true; }
-						if(e.which !== 32 && e.which !== 13 && (e.shiftKey || e.ctrlKey || e.altKey || e.metaKey)) { return true; }
-						var o = null;
-						if(this._data.core.rtl) {
-							if(e.which === 37) { e.which = 39; }
-							else if(e.which === 39) { e.which = 37; }
-						}
-						switch(e.which) {
-							case 32: // aria defines space only with Ctrl
-								if(e.ctrlKey) {
-									e.type = "click";
-									$(e.currentTarget).trigger(e);
-								}
-								break;
-							case 13: // enter
-								e.type = "click";
-								$(e.currentTarget).trigger(e);
-								break;
-							case 37: // right
-								e.preventDefault();
-								if(this.is_open(e.currentTarget)) {
-									this.close_node(e.currentTarget);
-								}
-								else {
-									o = this.get_parent(e.currentTarget);
-									if(o && o.id !== $.jstree.root) { this.get_node(o, true).children('.jstree-anchor').focus(); }
-								}
-								break;
-							case 38: // up
-								e.preventDefault();
-								o = this.get_prev_dom(e.currentTarget);
-								if(o && o.length) { o.children('.jstree-anchor').focus(); }
-								break;
-							case 39: // left
-								e.preventDefault();
-								if(this.is_closed(e.currentTarget)) {
-									this.open_node(e.currentTarget, function (o) { this.get_node(o, true).children('.jstree-anchor').focus(); });
-								}
-								else if (this.is_open(e.currentTarget)) {
-									o = this.get_node(e.currentTarget, true).children('.jstree-children')[0];
-									if(o) { $(this._firstChild(o)).children('.jstree-anchor').focus(); }
-								}
-								break;
-							case 40: // down
-								e.preventDefault();
-								o = this.get_next_dom(e.currentTarget);
-								if(o && o.length) { o.children('.jstree-anchor').focus(); }
-								break;
-							case 106: // aria defines * on numpad as open_all - not very common
-								this.open_all();
-								break;
-							case 36: // home
-								e.preventDefault();
-								o = this._firstChild(this.get_container_ul()[0]);
-								if(o) { $(o).children('.jstree-anchor').filter(':visible').focus(); }
-								break;
-							case 35: // end
-								e.preventDefault();
-								this.element.find('.jstree-anchor').filter(':visible').last().focus();
-								break;
-							/*!
-							// delete
-							case 46:
-								e.preventDefault();
-								o = this.get_node(e.currentTarget);
-								if(o && o.id && o.id !== $.jstree.root) {
-									o = this.is_selected(o) ? this.get_selected() : o;
-									this.delete_node(o);
-								}
-								break;
-							// f2
-							case 113:
-								e.preventDefault();
-								o = this.get_node(e.currentTarget);
-								if(o && o.id && o.id !== $.jstree.root) {
-									// this.edit(o);
-								}
-								break;
-							default:
-								// console.log(e.which);
-								break;
-							*/
-						}
-					}, this))
-				.on("load_node.jstree", $.proxy(function (e, data) {
-						if(data.status) {
-							if(data.node.id === $.jstree.root && !this._data.core.loaded) {
-								this._data.core.loaded = true;
-								if(this._firstChild(this.get_container_ul()[0])) {
-									this.element.attr('aria-activedescendant',this._firstChild(this.get_container_ul()[0]).id);
-								}
-								/**
-								 * triggered after the root node is loaded for the first time
-								 * @event
-								 * @name loaded.jstree
-								 */
-								this.trigger("loaded");
-							}
-							if(!this._data.core.ready) {
-								setTimeout($.proxy(function() {
-									if(this.element && !this.get_container_ul().find('.jstree-loading').length) {
-										this._data.core.ready = true;
-										if(this._data.core.selected.length) {
-											if(this.settings.core.expand_selected_onload) {
-												var tmp = [], i, j;
-												for(i = 0, j = this._data.core.selected.length; i < j; i++) {
-													tmp = tmp.concat(this._model.data[this._data.core.selected[i]].parents);
-												}
-												tmp = $.vakata.array_unique(tmp);
-												for(i = 0, j = tmp.length; i < j; i++) {
-													this.open_node(tmp[i], false, 0);
-												}
-											}
-											this.trigger('changed', { 'action' : 'ready', 'selected' : this._data.core.selected });
-										}
-										/**
-										 * triggered after all nodes are finished loading
-										 * @event
-										 * @name ready.jstree
-										 */
-										this.trigger("ready");
-									}
-								}, this), 0);
-							}
-						}
-					}, this))
-				// quick searching when the tree is focused
-				.on('keypress.jstree', $.proxy(function (e) {
-						if(e.target.tagName && e.target.tagName.toLowerCase() === "input") { return true; }
-						if(tout) { clearTimeout(tout); }
-						tout = setTimeout(function () {
-							word = '';
-						}, 500);
-
-						var chr = String.fromCharCode(e.which).toLowerCase(),
-							col = this.element.find('.jstree-anchor').filter(':visible'),
-							ind = col.index(document.activeElement) || 0,
-							end = false;
-						word += chr;
-
-						// match for whole word from current node down (including the current node)
-						if(word.length > 1) {
-							col.slice(ind).each($.proxy(function (i, v) {
-								if($(v).text().toLowerCase().indexOf(word) === 0) {
-									$(v).focus();
-									end = true;
-									return false;
-								}
-							}, this));
-							if(end) { return; }
-
-							// match for whole word from the beginning of the tree
-							col.slice(0, ind).each($.proxy(function (i, v) {
-								if($(v).text().toLowerCase().indexOf(word) === 0) {
-									$(v).focus();
-									end = true;
-									return false;
-								}
-							}, this));
-							if(end) { return; }
-						}
-						// list nodes that start with that letter (only if word consists of a single char)
-						if(new RegExp('^' + chr.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&') + '+$').test(word)) {
-							// search for the next node starting with that letter
-							col.slice(ind + 1).each($.proxy(function (i, v) {
-								if($(v).text().toLowerCase().charAt(0) === chr) {
-									$(v).focus();
-									end = true;
-									return false;
-								}
-							}, this));
-							if(end) { return; }
-
-							// search from the beginning
-							col.slice(0, ind + 1).each($.proxy(function (i, v) {
-								if($(v).text().toLowerCase().charAt(0) === chr) {
-									$(v).focus();
-									end = true;
-									return false;
-								}
-							}, this));
-							if(end) { return; }
-						}
-					}, this))
-				// THEME RELATED
-				.on("init.jstree", $.proxy(function () {
-						var s = this.settings.core.themes;
-						this._data.core.themes.dots			= s.dots;
-						this._data.core.themes.stripes		= s.stripes;
-						this._data.core.themes.icons		= s.icons;
-						this.set_theme(s.name || "default", s.url);
-						this.set_theme_variant(s.variant);
-					}, this))
-				.on("loading.jstree", $.proxy(function () {
-						this[ this._data.core.themes.dots ? "show_dots" : "hide_dots" ]();
-						this[ this._data.core.themes.icons ? "show_icons" : "hide_icons" ]();
-						this[ this._data.core.themes.stripes ? "show_stripes" : "hide_stripes" ]();
-					}, this))
-				.on('blur.jstree', '.jstree-anchor', $.proxy(function (e) {
-						this._data.core.focused = null;
-						$(e.currentTarget).filter('.jstree-hovered').mouseleave();
-						this.element.attr('tabindex', '0');
-					}, this))
-				.on('focus.jstree', '.jstree-anchor', $.proxy(function (e) {
-						var tmp = this.get_node(e.currentTarget);
-						if(tmp && tmp.id) {
-							this._data.core.focused = tmp.id;
-						}
-						this.element.find('.jstree-hovered').not(e.currentTarget).mouseleave();
-						$(e.currentTarget).mouseenter();
-						this.element.attr('tabindex', '-1');
-					}, this))
-				.on('focus.jstree', $.proxy(function () {
-						if(+(new Date()) - was_click > 500 && !this._data.core.focused) {
-							was_click = 0;
-							var act = this.get_node(this.element.attr('aria-activedescendant'), true);
-							if(act) {
-								act.find('> .jstree-anchor').focus();
-							}
-						}
-					}, this))
-				.on('mouseenter.jstree', '.jstree-anchor', $.proxy(function (e) {
-						this.hover_node(e.currentTarget);
-					}, this))
-				.on('mouseleave.jstree', '.jstree-anchor', $.proxy(function (e) {
-						this.dehover_node(e.currentTarget);
-					}, this));
-		},
-		/**
-		 * part of the destroying of an instance. Used internally.
-		 * @private
-		 * @name unbind()
-		 */
-		unbind : function () {
-			this.element.off('.jstree');
-			$(document).off('.jstree-' + this._id);
-		},
-		/**
-		 * trigger an event. Used internally.
-		 * @private
-		 * @name trigger(ev [, data])
-		 * @param  {String} ev the name of the event to trigger
-		 * @param  {Object} data additional data to pass with the event
-		 */
-		trigger : function (ev, data) {
-			if(!data) {
-				data = {};
-			}
-			data.instance = this;
-			this.element.triggerHandler(ev.replace('.jstree','') + '.jstree', data);
-		},
-		/**
-		 * returns the jQuery extended instance container
-		 * @name get_container()
-		 * @return {jQuery}
-		 */
-		get_container : function () {
-			return this.element;
-		},
-		/**
-		 * returns the jQuery extended main UL node inside the instance container. Used internally.
-		 * @private
-		 * @name get_container_ul()
-		 * @return {jQuery}
-		 */
-		get_container_ul : function () {
-			return this.element.children(".jstree-children").first();
-		},
-		/**
-		 * gets string replacements (localization). Used internally.
-		 * @private
-		 * @name get_string(key)
-		 * @param  {String} key
-		 * @return {String}
-		 */
-		get_string : function (key) {
-			var a = this.settings.core.strings;
-			if($.isFunction(a)) { return a.call(this, key); }
-			if(a && a[key]) { return a[key]; }
-			return key;
-		},
-		/**
-		 * gets the first child of a DOM node. Used internally.
-		 * @private
-		 * @name _firstChild(dom)
-		 * @param  {DOMElement} dom
-		 * @return {DOMElement}
-		 */
-		_firstChild : function (dom) {
-			dom = dom ? dom.firstChild : null;
-			while(dom !== null && dom.nodeType !== 1) {
-				dom = dom.nextSibling;
-			}
-			return dom;
-		},
-		/**
-		 * gets the next sibling of a DOM node. Used internally.
-		 * @private
-		 * @name _nextSibling(dom)
-		 * @param  {DOMElement} dom
-		 * @return {DOMElement}
-		 */
-		_nextSibling : function (dom) {
-			dom = dom ? dom.nextSibling : null;
-			while(dom !== null && dom.nodeType !== 1) {
-				dom = dom.nextSibling;
-			}
-			return dom;
-		},
-		/**
-		 * gets the previous sibling of a DOM node. Used internally.
-		 * @private
-		 * @name _previousSibling(dom)
-		 * @param  {DOMElement} dom
-		 * @return {DOMElement}
-		 */
-		_previousSibling : function (dom) {
-			dom = dom ? dom.previousSibling : null;
-			while(dom !== null && dom.nodeType !== 1) {
-				dom = dom.previousSibling;
-			}
-			return dom;
-		},
-		/**
-		 * get the JSON representation of a node (or the actual jQuery extended DOM node) by using any input (child DOM element, ID string, selector, etc)
-		 * @name get_node(obj [, as_dom])
-		 * @param  {mixed} obj
-		 * @param  {Boolean} as_dom
-		 * @return {Object|jQuery}
-		 */
-		get_node : function (obj, as_dom) {
-			if(obj && obj.id) {
-				obj = obj.id;
-			}
-			var dom;
-			try {
-				if(this._model.data[obj]) {
-					obj = this._model.data[obj];
-				}
-				else if(typeof obj === "string" && this._model.data[obj.replace(/^#/, '')]) {
-					obj = this._model.data[obj.replace(/^#/, '')];
-				}
-				else if(typeof obj === "string" && (dom = $('#' + obj.replace($.jstree.idregex,'\\$&'), this.element)).length && this._model.data[dom.closest('.jstree-node').attr('id')]) {
-					obj = this._model.data[dom.closest('.jstree-node').attr('id')];
-				}
-				else if((dom = $(obj, this.element)).length && this._model.data[dom.closest('.jstree-node').attr('id')]) {
-					obj = this._model.data[dom.closest('.jstree-node').attr('id')];
-				}
-				else if((dom = $(obj, this.element)).length && dom.hasClass('jstree')) {
-					obj = this._model.data[$.jstree.root];
-				}
-				else {
-					return false;
-				}
-
-				if(as_dom) {
-					obj = obj.id === $.jstree.root ? this.element : $('#' + obj.id.replace($.jstree.idregex,'\\$&'), this.element);
-				}
-				return obj;
-			} catch (ex) { return false; }
-		},
-		/**
-		 * get the path to a node, either consisting of node texts, or of node IDs, optionally glued together (otherwise an array)
-		 * @name get_path(obj [, glue, ids])
-		 * @param  {mixed} obj the node
-		 * @param  {String} glue if you want the path as a string - pass the glue here (for example '/'), if a falsy value is supplied here, an array is returned
-		 * @param  {Boolean} ids if set to true build the path using ID, otherwise node text is used
-		 * @return {mixed}
-		 */
-		get_path : function (obj, glue, ids) {
-			obj = obj.parents ? obj : this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root || !obj.parents) {
-				return false;
-			}
-			var i, j, p = [];
-			p.push(ids ? obj.id : obj.text);
-			for(i = 0, j = obj.parents.length; i < j; i++) {
-				p.push(ids ? obj.parents[i] : this.get_text(obj.parents[i]));
-			}
-			p = p.reverse().slice(1);
-			return glue ? p.join(glue) : p;
-		},
-		/**
-		 * get the next visible node that is below the `obj` node. If `strict` is set to `true` only sibling nodes are returned.
-		 * @name get_next_dom(obj [, strict])
-		 * @param  {mixed} obj
-		 * @param  {Boolean} strict
-		 * @return {jQuery}
-		 */
-		get_next_dom : function (obj, strict) {
-			var tmp;
-			obj = this.get_node(obj, true);
-			if(obj[0] === this.element[0]) {
-				tmp = this._firstChild(this.get_container_ul()[0]);
-				while (tmp && tmp.offsetHeight === 0) {
-					tmp = this._nextSibling(tmp);
-				}
-				return tmp ? $(tmp) : false;
-			}
-			if(!obj || !obj.length) {
-				return false;
-			}
-			if(strict) {
-				tmp = obj[0];
-				do {
-					tmp = this._nextSibling(tmp);
-				} while (tmp && tmp.offsetHeight === 0);
-				return tmp ? $(tmp) : false;
-			}
-			if(obj.hasClass("jstree-open")) {
-				tmp = this._firstChild(obj.children('.jstree-children')[0]);
-				while (tmp && tmp.offsetHeight === 0) {
-					tmp = this._nextSibling(tmp);
-				}
-				if(tmp !== null) {
-					return $(tmp);
-				}
-			}
-			tmp = obj[0];
-			do {
-				tmp = this._nextSibling(tmp);
-			} while (tmp && tmp.offsetHeight === 0);
-			if(tmp !== null) {
-				return $(tmp);
-			}
-			return obj.parentsUntil(".jstree",".jstree-node").nextAll(".jstree-node:visible").first();
-		},
-		/**
-		 * get the previous visible node that is above the `obj` node. If `strict` is set to `true` only sibling nodes are returned.
-		 * @name get_prev_dom(obj [, strict])
-		 * @param  {mixed} obj
-		 * @param  {Boolean} strict
-		 * @return {jQuery}
-		 */
-		get_prev_dom : function (obj, strict) {
-			var tmp;
-			obj = this.get_node(obj, true);
-			if(obj[0] === this.element[0]) {
-				tmp = this.get_container_ul()[0].lastChild;
-				while (tmp && tmp.offsetHeight === 0) {
-					tmp = this._previousSibling(tmp);
-				}
-				return tmp ? $(tmp) : false;
-			}
-			if(!obj || !obj.length) {
-				return false;
-			}
-			if(strict) {
-				tmp = obj[0];
-				do {
-					tmp = this._previousSibling(tmp);
-				} while (tmp && tmp.offsetHeight === 0);
-				return tmp ? $(tmp) : false;
-			}
-			tmp = obj[0];
-			do {
-				tmp = this._previousSibling(tmp);
-			} while (tmp && tmp.offsetHeight === 0);
-			if(tmp !== null) {
-				obj = $(tmp);
-				while(obj.hasClass("jstree-open")) {
-					obj = obj.children(".jstree-children").first().children(".jstree-node:visible:last");
-				}
-				return obj;
-			}
-			tmp = obj[0].parentNode.parentNode;
-			return tmp && tmp.className && tmp.className.indexOf('jstree-node') !== -1 ? $(tmp) : false;
-		},
-		/**
-		 * get the parent ID of a node
-		 * @name get_parent(obj)
-		 * @param  {mixed} obj
-		 * @return {String}
-		 */
-		get_parent : function (obj) {
-			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
-				return false;
-			}
-			return obj.parent;
-		},
-		/**
-		 * get a jQuery collection of all the children of a node (node must be rendered)
-		 * @name get_children_dom(obj)
-		 * @param  {mixed} obj
-		 * @return {jQuery}
-		 */
-		get_children_dom : function (obj) {
-			obj = this.get_node(obj, true);
-			if(obj[0] === this.element[0]) {
-				return this.get_container_ul().children(".jstree-node");
-			}
-			if(!obj || !obj.length) {
-				return false;
-			}
-			return obj.children(".jstree-children").children(".jstree-node");
-		},
-		/**
-		 * checks if a node has children
-		 * @name is_parent(obj)
-		 * @param  {mixed} obj
-		 * @return {Boolean}
-		 */
-		is_parent : function (obj) {
-			obj = this.get_node(obj);
-			return obj && (obj.state.loaded === false || obj.children.length > 0);
-		},
-		/**
-		 * checks if a node is loaded (its children are available)
-		 * @name is_loaded(obj)
-		 * @param  {mixed} obj
-		 * @return {Boolean}
-		 */
-		is_loaded : function (obj) {
-			obj = this.get_node(obj);
-			return obj && obj.state.loaded;
-		},
-		/**
-		 * check if a node is currently loading (fetching children)
-		 * @name is_loading(obj)
-		 * @param  {mixed} obj
-		 * @return {Boolean}
-		 */
-		is_loading : function (obj) {
-			obj = this.get_node(obj);
-			return obj && obj.state && obj.state.loading;
-		},
-		/**
-		 * check if a node is opened
-		 * @name is_open(obj)
-		 * @param  {mixed} obj
-		 * @return {Boolean}
-		 */
-		is_open : function (obj) {
-			obj = this.get_node(obj);
-			return obj && obj.state.opened;
-		},
-		/**
-		 * check if a node is in a closed state
-		 * @name is_closed(obj)
-		 * @param  {mixed} obj
-		 * @return {Boolean}
-		 */
-		is_closed : function (obj) {
-			obj = this.get_node(obj);
-			return obj && this.is_parent(obj) && !obj.state.opened;
-		},
-		/**
-		 * check if a node has no children
-		 * @name is_leaf(obj)
-		 * @param  {mixed} obj
-		 * @return {Boolean}
-		 */
-		is_leaf : function (obj) {
-			return !this.is_parent(obj);
-		},
-		/**
-		 * loads a node (fetches its children using the `core.data` setting). Multiple nodes can be passed to by using an array.
-		 * @name load_node(obj [, callback])
-		 * @param  {mixed} obj
-		 * @param  {function} callback a function to be executed once loading is complete, the function is executed in the instance's scope and receives two arguments - the node and a boolean status
-		 * @return {Boolean}
-		 * @trigger load_node.jstree
-		 */
-		load_node : function (obj, callback) {
-			var k, l, i, j, c;
-			if($.isArray(obj)) {
-				this._load_nodes(obj.slice(), callback);
-				return true;
-			}
-			obj = this.get_node(obj);
-			if(!obj) {
-				if(callback) { callback.call(this, obj, false); }
-				return false;
-			}
-			// if(obj.state.loading) { } // the node is already loading - just wait for it to load and invoke callback? but if called implicitly it should be loaded again?
-			if(obj.state.loaded) {
-				obj.state.loaded = false;
-				for(k = 0, l = obj.children_d.length; k < l; k++) {
-					for(i = 0, j = obj.parents.length; i < j; i++) {
-						this._model.data[obj.parents[i]].children_d = $.vakata.array_remove_item(this._model.data[obj.parents[i]].children_d, obj.children_d[k]);
-					}
-					if(this._model.data[obj.children_d[k]].state.selected) {
-						c = true;
-						this._data.core.selected = $.vakata.array_remove_item(this._data.core.selected, obj.children_d[k]);
-					}
-					delete this._model.data[obj.children_d[k]];
-				}
-				obj.children = [];
-				obj.children_d = [];
-				if(c) {
-					this.trigger('changed', { 'action' : 'load_node', 'node' : obj, 'selected' : this._data.core.selected });
-				}
-			}
-			obj.state.failed = false;
-			obj.state.loading = true;
-			this.get_node(obj, true).addClass("jstree-loading").attr('aria-busy',true);
-			this._load_node(obj, $.proxy(function (status) {
-				obj = this._model.data[obj.id];
-				obj.state.loading = false;
-				obj.state.loaded = status;
-				obj.state.failed = !obj.state.loaded;
-				var dom = this.get_node(obj, true), i = 0, j = 0, m = this._model.data, has_children = false;
-				for(i = 0, j = obj.children.length; i < j; i++) {
-					if(m[obj.children[i]] && !m[obj.children[i]].state.hidden) {
-						has_children = true;
-						break;
-					}
-				}
-				if(obj.state.loaded && !has_children && dom && dom.length && !dom.hasClass('jstree-leaf')) {
-					dom.removeClass('jstree-closed jstree-open').addClass('jstree-leaf');
-				}
-				dom.removeClass("jstree-loading").attr('aria-busy',false);
-				/**
-				 * triggered after a node is loaded
-				 * @event
-				 * @name load_node.jstree
-				 * @param {Object} node the node that was loading
-				 * @param {Boolean} status was the node loaded successfully
-				 */
-				this.trigger('load_node', { "node" : obj, "status" : status });
-				if(callback) {
-					callback.call(this, obj, status);
-				}
-			}, this));
-			return true;
-		},
-		/**
-		 * load an array of nodes (will also load unavailable nodes as soon as the appear in the structure). Used internally.
-		 * @private
-		 * @name _load_nodes(nodes [, callback])
-		 * @param  {array} nodes
-		 * @param  {function} callback a function to be executed once loading is complete, the function is executed in the instance's scope and receives one argument - the array passed to _load_nodes
-		 */
-		_load_nodes : function (nodes, callback, is_callback) {
-			var r = true,
-				c = function () { this._load_nodes(nodes, callback, true); },
-				m = this._model.data, i, j, tmp = [];
-			for(i = 0, j = nodes.length; i < j; i++) {
-				if(m[nodes[i]] && ( (!m[nodes[i]].state.loaded && !m[nodes[i]].state.failed) || !is_callback)) {
-					if(!this.is_loading(nodes[i])) {
-						this.load_node(nodes[i], c);
-					}
-					r = false;
-				}
-			}
-			if(r) {
-				for(i = 0, j = nodes.length; i < j; i++) {
-					if(m[nodes[i]] && m[nodes[i]].state.loaded) {
-						tmp.push(nodes[i]);
-					}
-				}
-				if(callback && !callback.done) {
-					callback.call(this, tmp);
-					callback.done = true;
-				}
-			}
-		},
-		/**
-		 * loads all unloaded nodes
-		 * @name load_all([obj, callback])
-		 * @param {mixed} obj the node to load recursively, omit to load all nodes in the tree
-		 * @param {function} callback a function to be executed once loading all the nodes is complete,
-		 * @trigger load_all.jstree
-		 */
-		load_all : function (obj, callback) {
-			if(!obj) { obj = $.jstree.root; }
-			obj = this.get_node(obj);
-			if(!obj) { return false; }
-			var to_load = [],
-				m = this._model.data,
-				c = m[obj.id].children_d,
-				i, j;
-			if(obj.state && !obj.state.loaded) {
-				to_load.push(obj.id);
-			}
-			for(i = 0, j = c.length; i < j; i++) {
-				if(m[c[i]] && m[c[i]].state && !m[c[i]].state.loaded) {
-					to_load.push(c[i]);
-				}
-			}
-			if(to_load.length) {
-				this._load_nodes(to_load, function () {
-					this.load_all(obj, callback);
-				});
-			}
-			else {
-				/**
-				 * triggered after a load_all call completes
-				 * @event
-				 * @name load_all.jstree
-				 * @param {Object} node the recursively loaded node
-				 */
-				if(callback) { callback.call(this, obj); }
-				this.trigger('load_all', { "node" : obj });
-			}
-		},
-		/**
-		 * handles the actual loading of a node. Used only internally.
-		 * @private
-		 * @name _load_node(obj [, callback])
-		 * @param  {mixed} obj
-		 * @param  {function} callback a function to be executed once loading is complete, the function is executed in the instance's scope and receives one argument - a boolean status
-		 * @return {Boolean}
-		 */
-		_load_node : function (obj, callback) {
-			var s = this.settings.core.data, t;
-			// use original HTML
-			if(!s) {
-				if(obj.id === $.jstree.root) {
-					return this._append_html_data(obj, this._data.core.original_container_html.clone(true), function (status) {
-						callback.call(this, status);
-					});
-				}
-				else {
-					return callback.call(this, false);
-				}
-				// return callback.call(this, obj.id === $.jstree.root ? this._append_html_data(obj, this._data.core.original_container_html.clone(true)) : false);
-			}
-			if($.isFunction(s)) {
-				return s.call(this, obj, $.proxy(function (d) {
-					if(d === false) {
-						callback.call(this, false);
-					}
-					this[typeof d === 'string' ? '_append_html_data' : '_append_json_data'](obj, typeof d === 'string' ? $($.parseHTML(d)).filter(function () { return this.nodeType !== 3; }) : d, function (status) {
-						callback.call(this, status);
-					});
-					// return d === false ? callback.call(this, false) : callback.call(this, this[typeof d === 'string' ? '_append_html_data' : '_append_json_data'](obj, typeof d === 'string' ? $(d) : d));
-				}, this));
-			}
-			if(typeof s === 'object') {
-				if(s.url) {
-					s = $.extend(true, {}, s);
-					if($.isFunction(s.url)) {
-						s.url = s.url.call(this, obj);
-					}
-					if($.isFunction(s.data)) {
-						s.data = s.data.call(this, obj);
-					}
-					return $.ajax(s)
-						.done($.proxy(function (d,t,x) {
-								var type = x.getResponseHeader('Content-Type');
-								if((type && type.indexOf('json') !== -1) || typeof d === "object") {
-									return this._append_json_data(obj, d, function (status) { callback.call(this, status); });
-									//return callback.call(this, this._append_json_data(obj, d));
-								}
-								if((type && type.indexOf('html') !== -1) || typeof d === "string") {
-									return this._append_html_data(obj, $($.parseHTML(d)).filter(function () { return this.nodeType !== 3; }), function (status) { callback.call(this, status); });
-									// return callback.call(this, this._append_html_data(obj, $(d)));
-								}
-								this._data.core.last_error = { 'error' : 'ajax', 'plugin' : 'core', 'id' : 'core_04', 'reason' : 'Could not load node', 'data' : JSON.stringify({ 'id' : obj.id, 'xhr' : x }) };
-								this.settings.core.error.call(this, this._data.core.last_error);
-								return callback.call(this, false);
-							}, this))
-						.fail($.proxy(function (f) {
-								callback.call(this, false);
-								this._data.core.last_error = { 'error' : 'ajax', 'plugin' : 'core', 'id' : 'core_04', 'reason' : 'Could not load node', 'data' : JSON.stringify({ 'id' : obj.id, 'xhr' : f }) };
-								this.settings.core.error.call(this, this._data.core.last_error);
-							}, this));
-				}
-				t = ($.isArray(s) || $.isPlainObject(s)) ? JSON.parse(JSON.stringify(s)) : s;
-				if(obj.id === $.jstree.root) {
-					return this._append_json_data(obj, t, function (status) {
-						callback.call(this, status);
-					});
-				}
-				else {
-					this._data.core.last_error = { 'error' : 'nodata', 'plugin' : 'core', 'id' : 'core_05', 'reason' : 'Could not load node', 'data' : JSON.stringify({ 'id' : obj.id }) };
-					this.settings.core.error.call(this, this._data.core.last_error);
-					return callback.call(this, false);
-				}
-				//return callback.call(this, (obj.id === $.jstree.root ? this._append_json_data(obj, t) : false) );
-			}
-			if(typeof s === 'string') {
-				if(obj.id === $.jstree.root) {
-					return this._append_html_data(obj, $($.parseHTML(s)).filter(function () { return this.nodeType !== 3; }), function (status) {
-						callback.call(this, status);
-					});
-				}
-				else {
-					this._data.core.last_error = { 'error' : 'nodata', 'plugin' : 'core', 'id' : 'core_06', 'reason' : 'Could not load node', 'data' : JSON.stringify({ 'id' : obj.id }) };
-					this.settings.core.error.call(this, this._data.core.last_error);
-					return callback.call(this, false);
-				}
-				//return callback.call(this, (obj.id === $.jstree.root ? this._append_html_data(obj, $(s)) : false) );
-			}
-			return callback.call(this, false);
-		},
-		/**
-		 * adds a node to the list of nodes to redraw. Used only internally.
-		 * @private
-		 * @name _node_changed(obj [, callback])
-		 * @param  {mixed} obj
-		 */
-		_node_changed : function (obj) {
-			obj = this.get_node(obj);
-			if(obj) {
-				this._model.changed.push(obj.id);
-			}
-		},
-		/**
-		 * appends HTML content to the tree. Used internally.
-		 * @private
-		 * @name _append_html_data(obj, data)
-		 * @param  {mixed} obj the node to append to
-		 * @param  {String} data the HTML string to parse and append
-		 * @trigger model.jstree, changed.jstree
-		 */
-		_append_html_data : function (dom, data, cb) {
-			dom = this.get_node(dom);
-			dom.children = [];
-			dom.children_d = [];
-			var dat = data.is('ul') ? data.children() : data,
-				par = dom.id,
-				chd = [],
-				dpc = [],
-				m = this._model.data,
-				p = m[par],
-				s = this._data.core.selected.length,
-				tmp, i, j;
-			dat.each($.proxy(function (i, v) {
-				tmp = this._parse_model_from_html($(v), par, p.parents.concat());
-				if(tmp) {
-					chd.push(tmp);
-					dpc.push(tmp);
-					if(m[tmp].children_d.length) {
-						dpc = dpc.concat(m[tmp].children_d);
-					}
-				}
-			}, this));
-			p.children = chd;
-			p.children_d = dpc;
-			for(i = 0, j = p.parents.length; i < j; i++) {
-				m[p.parents[i]].children_d = m[p.parents[i]].children_d.concat(dpc);
-			}
-			/**
-			 * triggered when new data is inserted to the tree model
-			 * @event
-			 * @name model.jstree
-			 * @param {Array} nodes an array of node IDs
-			 * @param {String} parent the parent ID of the nodes
-			 */
-			this.trigger('model', { "nodes" : dpc, 'parent' : par });
-			if(par !== $.jstree.root) {
-				this._node_changed(par);
-				this.redraw();
-			}
-			else {
-				this.get_container_ul().children('.jstree-initial-node').remove();
-				this.redraw(true);
-			}
-			if(this._data.core.selected.length !== s) {
-				this.trigger('changed', { 'action' : 'model', 'selected' : this._data.core.selected });
-			}
-			cb.call(this, true);
-		},
-		/**
-		 * appends JSON content to the tree. Used internally.
-		 * @private
-		 * @name _append_json_data(obj, data)
-		 * @param  {mixed} obj the node to append to
-		 * @param  {String} data the JSON object to parse and append
-		 * @param  {Boolean} force_processing internal param - do not set
-		 * @trigger model.jstree, changed.jstree
-		 */
-		_append_json_data : function (dom, data, cb, force_processing) {
-			if(this.element === null) { return; }
-			dom = this.get_node(dom);
-			dom.children = [];
-			dom.children_d = [];
-			// *%$@!!!
-			if(data.d) {
-				data = data.d;
-				if(typeof data === "string") {
-					data = JSON.parse(data);
-				}
-			}
-			if(!$.isArray(data)) { data = [data]; }
-			var w = null,
-				args = {
-					'df'	: this._model.default_state,
-					'dat'	: data,
-					'par'	: dom.id,
-					'm'		: this._model.data,
-					't_id'	: this._id,
-					't_cnt'	: this._cnt,
-					'sel'	: this._data.core.selected
-				},
-				func = function (data, undefined) {
-					if(data.data) { data = data.data; }
-					var dat = data.dat,
-						par = data.par,
-						chd = [],
-						dpc = [],
-						add = [],
-						df = data.df,
-						t_id = data.t_id,
-						t_cnt = data.t_cnt,
-						m = data.m,
-						p = m[par],
-						sel = data.sel,
-						tmp, i, j, rslt,
-						parse_flat = function (d, p, ps) {
-							if(!ps) { ps = []; }
-							else { ps = ps.concat(); }
-							if(p) { ps.unshift(p); }
-							var tid = d.id.toString(),
-								i, j, c, e,
-								tmp = {
-									id			: tid,
-									text		: d.text || '',
-									icon		: d.icon !== undefined ? d.icon : true,
-									parent		: p,
-									parents		: ps,
-									children	: d.children || [],
-									children_d	: d.children_d || [],
-									data		: d.data,
-									state		: { },
-									li_attr		: { id : false },
-									a_attr		: { href : '#' },
-									original	: false
-								};
-							for(i in df) {
-								if(df.hasOwnProperty(i)) {
-									tmp.state[i] = df[i];
-								}
-							}
-							if(d && d.data && d.data.jstree && d.data.jstree.icon) {
-								tmp.icon = d.data.jstree.icon;
-							}
-							if(tmp.icon === undefined || tmp.icon === null || tmp.icon === "") {
-								tmp.icon = true;
-							}
-							if(d && d.data) {
-								tmp.data = d.data;
-								if(d.data.jstree) {
-									for(i in d.data.jstree) {
-										if(d.data.jstree.hasOwnProperty(i)) {
-											tmp.state[i] = d.data.jstree[i];
-										}
-									}
-								}
-							}
-							if(d && typeof d.state === 'object') {
-								for (i in d.state) {
-									if(d.state.hasOwnProperty(i)) {
-										tmp.state[i] = d.state[i];
-									}
-								}
-							}
-							if(d && typeof d.li_attr === 'object') {
-								for (i in d.li_attr) {
-									if(d.li_attr.hasOwnProperty(i)) {
-										tmp.li_attr[i] = d.li_attr[i];
-									}
-								}
-							}
-							if(!tmp.li_attr.id) {
-								tmp.li_attr.id = tid;
-							}
-							if(d && typeof d.a_attr === 'object') {
-								for (i in d.a_attr) {
-									if(d.a_attr.hasOwnProperty(i)) {
-										tmp.a_attr[i] = d.a_attr[i];
-									}
-								}
-							}
-							if(d && d.children && d.children === true) {
-								tmp.state.loaded = false;
-								tmp.children = [];
-								tmp.children_d = [];
-							}
-							m[tmp.id] = tmp;
-							for(i = 0, j = tmp.children.length; i < j; i++) {
-								c = parse_flat(m[tmp.children[i]], tmp.id, ps);
-								e = m[c];
-								tmp.children_d.push(c);
-								if(e.children_d.length) {
-									tmp.children_d = tmp.children_d.concat(e.children_d);
-								}
-							}
-							delete d.data;
-							delete d.children;
-							m[tmp.id].original = d;
-							if(tmp.state.selected) {
-								add.push(tmp.id);
-							}
-							return tmp.id;
-						},
-						parse_nest = function (d, p, ps) {
-							if(!ps) { ps = []; }
-							else { ps = ps.concat(); }
-							if(p) { ps.unshift(p); }
-							var tid = false, i, j, c, e, tmp;
-							do {
-								tid = 'j' + t_id + '_' + (++t_cnt);
-							} while(m[tid]);
-
-							tmp = {
-								id			: false,
-								text		: typeof d === 'string' ? d : '',
-								icon		: typeof d === 'object' && d.icon !== undefined ? d.icon : true,
-								parent		: p,
-								parents		: ps,
-								children	: [],
-								children_d	: [],
-								data		: null,
-								state		: { },
-								li_attr		: { id : false },
-								a_attr		: { href : '#' },
-								original	: false
-							};
-							for(i in df) {
-								if(df.hasOwnProperty(i)) {
-									tmp.state[i] = df[i];
-								}
-							}
-							if(d && d.id) { tmp.id = d.id.toString(); }
-							if(d && d.text) { tmp.text = d.text; }
-							if(d && d.data && d.data.jstree && d.data.jstree.icon) {
-								tmp.icon = d.data.jstree.icon;
-							}
-							if(tmp.icon === undefined || tmp.icon === null || tmp.icon === "") {
-								tmp.icon = true;
-							}
-							if(d && d.data) {
-								tmp.data = d.data;
-								if(d.data.jstree) {
-									for(i in d.data.jstree) {
-										if(d.data.jstree.hasOwnProperty(i)) {
-											tmp.state[i] = d.data.jstree[i];
-										}
-									}
-								}
-							}
-							if(d && typeof d.state === 'object') {
-								for (i in d.state) {
-									if(d.state.hasOwnProperty(i)) {
-										tmp.state[i] = d.state[i];
-									}
-								}
-							}
-							if(d && typeof d.li_attr === 'object') {
-								for (i in d.li_attr) {
-									if(d.li_attr.hasOwnProperty(i)) {
-										tmp.li_attr[i] = d.li_attr[i];
-									}
-								}
-							}
-							if(tmp.li_attr.id && !tmp.id) {
-								tmp.id = tmp.li_attr.id.toString();
-							}
-							if(!tmp.id) {
-								tmp.id = tid;
-							}
-							if(!tmp.li_attr.id) {
-								tmp.li_attr.id = tmp.id;
-							}
-							if(d && typeof d.a_attr === 'object') {
-								for (i in d.a_attr) {
-									if(d.a_attr.hasOwnProperty(i)) {
-										tmp.a_attr[i] = d.a_attr[i];
-									}
-								}
-							}
-							if(d && d.children && d.children.length) {
-								for(i = 0, j = d.children.length; i < j; i++) {
-									c = parse_nest(d.children[i], tmp.id, ps);
-									e = m[c];
-									tmp.children.push(c);
-									if(e.children_d.length) {
-										tmp.children_d = tmp.children_d.concat(e.children_d);
-									}
-								}
-								tmp.children_d = tmp.children_d.concat(tmp.children);
-							}
-							if(d && d.children && d.children === true) {
-								tmp.state.loaded = false;
-								tmp.children = [];
-								tmp.children_d = [];
-							}
-							delete d.data;
-							delete d.children;
-							tmp.original = d;
-							m[tmp.id] = tmp;
-							if(tmp.state.selected) {
-								add.push(tmp.id);
-							}
-							return tmp.id;
-						};
-
-					if(dat.length && dat[0].id !== undefined && dat[0].parent !== undefined) {
-						// Flat JSON support (for easy import from DB):
-						// 1) convert to object (foreach)
-						for(i = 0, j = dat.length; i < j; i++) {
-							if(!dat[i].children) {
-								dat[i].children = [];
-							}
-							m[dat[i].id.toString()] = dat[i];
-						}
-						// 2) populate children (foreach)
-						for(i = 0, j = dat.length; i < j; i++) {
-							m[dat[i].parent.toString()].children.push(dat[i].id.toString());
-							// populate parent.children_d
-							p.children_d.push(dat[i].id.toString());
-						}
-						// 3) normalize && populate parents and children_d with recursion
-						for(i = 0, j = p.children.length; i < j; i++) {
-							tmp = parse_flat(m[p.children[i]], par, p.parents.concat());
-							dpc.push(tmp);
-							if(m[tmp].children_d.length) {
-								dpc = dpc.concat(m[tmp].children_d);
-							}
-						}
-						for(i = 0, j = p.parents.length; i < j; i++) {
-							m[p.parents[i]].children_d = m[p.parents[i]].children_d.concat(dpc);
-						}
-						// ?) three_state selection - p.state.selected && t - (if three_state foreach(dat => ch) -> foreach(parents) if(parent.selected) child.selected = true;
-						rslt = {
-							'cnt' : t_cnt,
-							'mod' : m,
-							'sel' : sel,
-							'par' : par,
-							'dpc' : dpc,
-							'add' : add
-						};
-					}
-					else {
-						for(i = 0, j = dat.length; i < j; i++) {
-							tmp = parse_nest(dat[i], par, p.parents.concat());
-							if(tmp) {
-								chd.push(tmp);
-								dpc.push(tmp);
-								if(m[tmp].children_d.length) {
-									dpc = dpc.concat(m[tmp].children_d);
-								}
-							}
-						}
-						p.children = chd;
-						p.children_d = dpc;
-						for(i = 0, j = p.parents.length; i < j; i++) {
-							m[p.parents[i]].children_d = m[p.parents[i]].children_d.concat(dpc);
-						}
-						rslt = {
-							'cnt' : t_cnt,
-							'mod' : m,
-							'sel' : sel,
-							'par' : par,
-							'dpc' : dpc,
-							'add' : add
-						};
-					}
-					if(typeof window === 'undefined' || typeof window.document === 'undefined') {
-						postMessage(rslt);
-					}
-					else {
-						return rslt;
-					}
-				},
-				rslt = function (rslt, worker) {
-					if(this.element === null) { return; }
-					this._cnt = rslt.cnt;
-					this._model.data = rslt.mod; // breaks the reference in load_node - careful
-
-					if(worker) {
-						var i, j, a = rslt.add, r = rslt.sel, s = this._data.core.selected.slice(), m = this._model.data;
-						// if selection was changed while calculating in worker
-						if(r.length !== s.length || $.vakata.array_unique(r.concat(s)).length !== r.length) {
-							// deselect nodes that are no longer selected
-							for(i = 0, j = r.length; i < j; i++) {
-								if($.inArray(r[i], a) === -1 && $.inArray(r[i], s) === -1) {
-									m[r[i]].state.selected = false;
-								}
-							}
-							// select nodes that were selected in the mean time
-							for(i = 0, j = s.length; i < j; i++) {
-								if($.inArray(s[i], r) === -1) {
-									m[s[i]].state.selected = true;
-								}
-							}
-						}
-					}
-					if(rslt.add.length) {
-						this._data.core.selected = this._data.core.selected.concat(rslt.add);
-					}
-
-					this.trigger('model', { "nodes" : rslt.dpc, 'parent' : rslt.par });
-
-					if(rslt.par !== $.jstree.root) {
-						this._node_changed(rslt.par);
-						this.redraw();
-					}
-					else {
-						// this.get_container_ul().children('.jstree-initial-node').remove();
-						this.redraw(true);
-					}
-					if(rslt.add.length) {
-						this.trigger('changed', { 'action' : 'model', 'selected' : this._data.core.selected });
-					}
-					cb.call(this, true);
-				};
-			if(this.settings.core.worker && window.Blob && window.URL && window.Worker) {
-				try {
-					if(this._wrk === null) {
-						this._wrk = window.URL.createObjectURL(
-							new window.Blob(
-								['self.onmessage = ' + func.toString()],
-								{type:"text/javascript"}
-							)
-						);
-					}
-					if(!this._data.core.working || force_processing) {
-						this._data.core.working = true;
-						w = new window.Worker(this._wrk);
-						w.onmessage = $.proxy(function (e) {
-							rslt.call(this, e.data, true);
-							try { w.terminate(); w = null; } catch(ignore) { }
-							if(this._data.core.worker_queue.length) {
-								this._append_json_data.apply(this, this._data.core.worker_queue.shift());
-							}
-							else {
-								this._data.core.working = false;
-							}
-						}, this);
-						if(!args.par) {
-							if(this._data.core.worker_queue.length) {
-								this._append_json_data.apply(this, this._data.core.worker_queue.shift());
-							}
-							else {
-								this._data.core.working = false;
-							}
-						}
-						else {
-							w.postMessage(args);
-						}
-					}
-					else {
-						this._data.core.worker_queue.push([dom, data, cb, true]);
-					}
-				}
-				catch(e) {
-					rslt.call(this, func(args), false);
-					if(this._data.core.worker_queue.length) {
-						this._append_json_data.apply(this, this._data.core.worker_queue.shift());
-					}
-					else {
-						this._data.core.working = false;
-					}
-				}
-			}
-			else {
-				rslt.call(this, func(args), false);
-			}
-		},
-		/**
-		 * parses a node from a jQuery object and appends them to the in memory tree model. Used internally.
-		 * @private
-		 * @name _parse_model_from_html(d [, p, ps])
-		 * @param  {jQuery} d the jQuery object to parse
-		 * @param  {String} p the parent ID
-		 * @param  {Array} ps list of all parents
-		 * @return {String} the ID of the object added to the model
-		 */
-		_parse_model_from_html : function (d, p, ps) {
-			if(!ps) { ps = []; }
-			else { ps = [].concat(ps); }
-			if(p) { ps.unshift(p); }
-			var c, e, m = this._model.data,
-				data = {
-					id			: false,
-					text		: false,
-					icon		: true,
-					parent		: p,
-					parents		: ps,
-					children	: [],
-					children_d	: [],
-					data		: null,
-					state		: { },
-					li_attr		: { id : false },
-					a_attr		: { href : '#' },
-					original	: false
-				}, i, tmp, tid;
-			for(i in this._model.default_state) {
-				if(this._model.default_state.hasOwnProperty(i)) {
-					data.state[i] = this._model.default_state[i];
-				}
-			}
-			tmp = $.vakata.attributes(d, true);
-			$.each(tmp, function (i, v) {
-				v = $.trim(v);
-				if(!v.length) { return true; }
-				data.li_attr[i] = v;
-				if(i === 'id') {
-					data.id = v.toString();
-				}
-			});
-			tmp = d.children('a').first();
-			if(tmp.length) {
-				tmp = $.vakata.attributes(tmp, true);
-				$.each(tmp, function (i, v) {
-					v = $.trim(v);
-					if(v.length) {
-						data.a_attr[i] = v;
-					}
-				});
-			}
-			tmp = d.children("a").first().length ? d.children("a").first().clone() : d.clone();
-			tmp.children("ins, i, ul").remove();
-			tmp = tmp.html();
-			tmp = $('<div />').html(tmp);
-			data.text = this.settings.core.force_text ? tmp.text() : tmp.html();
-			tmp = d.data();
-			data.data = tmp ? $.extend(true, {}, tmp) : null;
-			data.state.opened = d.hasClass('jstree-open');
-			data.state.selected = d.children('a').hasClass('jstree-clicked');
-			data.state.disabled = d.children('a').hasClass('jstree-disabled');
-			if(data.data && data.data.jstree) {
-				for(i in data.data.jstree) {
-					if(data.data.jstree.hasOwnProperty(i)) {
-						data.state[i] = data.data.jstree[i];
-					}
-				}
-			}
-			tmp = d.children("a").children(".jstree-themeicon");
-			if(tmp.length) {
-				data.icon = tmp.hasClass('jstree-themeicon-hidden') ? false : tmp.attr('rel');
-			}
-			if(data.state.icon !== undefined) {
-				data.icon = data.state.icon;
-			}
-			if(data.icon === undefined || data.icon === null || data.icon === "") {
-				data.icon = true;
-			}
-			tmp = d.children("ul").children("li");
-			do {
-				tid = 'j' + this._id + '_' + (++this._cnt);
-			} while(m[tid]);
-			data.id = data.li_attr.id ? data.li_attr.id.toString() : tid;
-			if(tmp.length) {
-				tmp.each($.proxy(function (i, v) {
-					c = this._parse_model_from_html($(v), data.id, ps);
-					e = this._model.data[c];
-					data.children.push(c);
-					if(e.children_d.length) {
-						data.children_d = data.children_d.concat(e.children_d);
-					}
-				}, this));
-				data.children_d = data.children_d.concat(data.children);
-			}
-			else {
-				if(d.hasClass('jstree-closed')) {
-					data.state.loaded = false;
-				}
-			}
-			if(data.li_attr['class']) {
-				data.li_attr['class'] = data.li_attr['class'].replace('jstree-closed','').replace('jstree-open','');
-			}
-			if(data.a_attr['class']) {
-				data.a_attr['class'] = data.a_attr['class'].replace('jstree-clicked','').replace('jstree-disabled','');
-			}
-			m[data.id] = data;
-			if(data.state.selected) {
-				this._data.core.selected.push(data.id);
-			}
-			return data.id;
-		},
-		/**
-		 * parses a node from a JSON object (used when dealing with flat data, which has no nesting of children, but has id and parent properties) and appends it to the in memory tree model. Used internally.
-		 * @private
-		 * @name _parse_model_from_flat_json(d [, p, ps])
-		 * @param  {Object} d the JSON object to parse
-		 * @param  {String} p the parent ID
-		 * @param  {Array} ps list of all parents
-		 * @return {String} the ID of the object added to the model
-		 */
-		_parse_model_from_flat_json : function (d, p, ps) {
-			if(!ps) { ps = []; }
-			else { ps = ps.concat(); }
-			if(p) { ps.unshift(p); }
-			var tid = d.id.toString(),
-				m = this._model.data,
-				df = this._model.default_state,
-				i, j, c, e,
-				tmp = {
-					id			: tid,
-					text		: d.text || '',
-					icon		: d.icon !== undefined ? d.icon : true,
-					parent		: p,
-					parents		: ps,
-					children	: d.children || [],
-					children_d	: d.children_d || [],
-					data		: d.data,
-					state		: { },
-					li_attr		: { id : false },
-					a_attr		: { href : '#' },
-					original	: false
-				};
-			for(i in df) {
-				if(df.hasOwnProperty(i)) {
-					tmp.state[i] = df[i];
-				}
-			}
-			if(d && d.data && d.data.jstree && d.data.jstree.icon) {
-				tmp.icon = d.data.jstree.icon;
-			}
-			if(tmp.icon === undefined || tmp.icon === null || tmp.icon === "") {
-				tmp.icon = true;
-			}
-			if(d && d.data) {
-				tmp.data = d.data;
-				if(d.data.jstree) {
-					for(i in d.data.jstree) {
-						if(d.data.jstree.hasOwnProperty(i)) {
-							tmp.state[i] = d.data.jstree[i];
-						}
-					}
-				}
-			}
-			if(d && typeof d.state === 'object') {
-				for (i in d.state) {
-					if(d.state.hasOwnProperty(i)) {
-						tmp.state[i] = d.state[i];
-					}
-				}
-			}
-			if(d && typeof d.li_attr === 'object') {
-				for (i in d.li_attr) {
-					if(d.li_attr.hasOwnProperty(i)) {
-						tmp.li_attr[i] = d.li_attr[i];
-					}
-				}
-			}
-			if(!tmp.li_attr.id) {
-				tmp.li_attr.id = tid;
-			}
-			if(d && typeof d.a_attr === 'object') {
-				for (i in d.a_attr) {
-					if(d.a_attr.hasOwnProperty(i)) {
-						tmp.a_attr[i] = d.a_attr[i];
-					}
-				}
-			}
-			if(d && d.children && d.children === true) {
-				tmp.state.loaded = false;
-				tmp.children = [];
-				tmp.children_d = [];
-			}
-			m[tmp.id] = tmp;
-			for(i = 0, j = tmp.children.length; i < j; i++) {
-				c = this._parse_model_from_flat_json(m[tmp.children[i]], tmp.id, ps);
-				e = m[c];
-				tmp.children_d.push(c);
-				if(e.children_d.length) {
-					tmp.children_d = tmp.children_d.concat(e.children_d);
-				}
-			}
-			delete d.data;
-			delete d.children;
-			m[tmp.id].original = d;
-			if(tmp.state.selected) {
-				this._data.core.selected.push(tmp.id);
-			}
-			return tmp.id;
-		},
-		/**
-		 * parses a node from a JSON object and appends it to the in memory tree model. Used internally.
-		 * @private
-		 * @name _parse_model_from_json(d [, p, ps])
-		 * @param  {Object} d the JSON object to parse
-		 * @param  {String} p the parent ID
-		 * @param  {Array} ps list of all parents
-		 * @return {String} the ID of the object added to the model
-		 */
-		_parse_model_from_json : function (d, p, ps) {
-			if(!ps) { ps = []; }
-			else { ps = ps.concat(); }
-			if(p) { ps.unshift(p); }
-			var tid = false, i, j, c, e, m = this._model.data, df = this._model.default_state, tmp;
-			do {
-				tid = 'j' + this._id + '_' + (++this._cnt);
-			} while(m[tid]);
-
-			tmp = {
-				id			: false,
-				text		: typeof d === 'string' ? d : '',
-				icon		: typeof d === 'object' && d.icon !== undefined ? d.icon : true,
-				parent		: p,
-				parents		: ps,
-				children	: [],
-				children_d	: [],
-				data		: null,
-				state		: { },
-				li_attr		: { id : false },
-				a_attr		: { href : '#' },
-				original	: false
-			};
-			for(i in df) {
-				if(df.hasOwnProperty(i)) {
-					tmp.state[i] = df[i];
-				}
-			}
-			if(d && d.id) { tmp.id = d.id.toString(); }
-			if(d && d.text) { tmp.text = d.text; }
-			if(d && d.data && d.data.jstree && d.data.jstree.icon) {
-				tmp.icon = d.data.jstree.icon;
-			}
-			if(tmp.icon === undefined || tmp.icon === null || tmp.icon === "") {
-				tmp.icon = true;
-			}
-			if(d && d.data) {
-				tmp.data = d.data;
-				if(d.data.jstree) {
-					for(i in d.data.jstree) {
-						if(d.data.jstree.hasOwnProperty(i)) {
-							tmp.state[i] = d.data.jstree[i];
-						}
-					}
-				}
-			}
-			if(d && typeof d.state === 'object') {
-				for (i in d.state) {
-					if(d.state.hasOwnProperty(i)) {
-						tmp.state[i] = d.state[i];
-					}
-				}
-			}
-			if(d && typeof d.li_attr === 'object') {
-				for (i in d.li_attr) {
-					if(d.li_attr.hasOwnProperty(i)) {
-						tmp.li_attr[i] = d.li_attr[i];
-					}
-				}
-			}
-			if(tmp.li_attr.id && !tmp.id) {
-				tmp.id = tmp.li_attr.id.toString();
-			}
-			if(!tmp.id) {
-				tmp.id = tid;
-			}
-			if(!tmp.li_attr.id) {
-				tmp.li_attr.id = tmp.id;
-			}
-			if(d && typeof d.a_attr === 'object') {
-				for (i in d.a_attr) {
-					if(d.a_attr.hasOwnProperty(i)) {
-						tmp.a_attr[i] = d.a_attr[i];
-					}
-				}
-			}
-			if(d && d.children && d.children.length) {
-				for(i = 0, j = d.children.length; i < j; i++) {
-					c = this._parse_model_from_json(d.children[i], tmp.id, ps);
-					e = m[c];
-					tmp.children.push(c);
-					if(e.children_d.length) {
-						tmp.children_d = tmp.children_d.concat(e.children_d);
-					}
-				}
-				tmp.children_d = tmp.children_d.concat(tmp.children);
-			}
-			if(d && d.children && d.children === true) {
-				tmp.state.loaded = false;
-				tmp.children = [];
-				tmp.children_d = [];
-			}
-			delete d.data;
-			delete d.children;
-			tmp.original = d;
-			m[tmp.id] = tmp;
-			if(tmp.state.selected) {
-				this._data.core.selected.push(tmp.id);
-			}
-			return tmp.id;
-		},
-		/**
-		 * redraws all nodes that need to be redrawn. Used internally.
-		 * @private
-		 * @name _redraw()
-		 * @trigger redraw.jstree
-		 */
-		_redraw : function () {
-			var nodes = this._model.force_full_redraw ? this._model.data[$.jstree.root].children.concat([]) : this._model.changed.concat([]),
-				f = document.createElement('UL'), tmp, i, j, fe = this._data.core.focused;
-			for(i = 0, j = nodes.length; i < j; i++) {
-				tmp = this.redraw_node(nodes[i], true, this._model.force_full_redraw);
-				if(tmp && this._model.force_full_redraw) {
-					f.appendChild(tmp);
-				}
-			}
-			if(this._model.force_full_redraw) {
-				f.className = this.get_container_ul()[0].className;
-				f.setAttribute('role','group');
-				this.element.empty().append(f);
-				//this.get_container_ul()[0].appendChild(f);
-			}
-			if(fe !== null) {
-				tmp = this.get_node(fe, true);
-				if(tmp && tmp.length && tmp.children('.jstree-anchor')[0] !== document.activeElement) {
-					tmp.children('.jstree-anchor').focus();
-				}
-				else {
-					this._data.core.focused = null;
-				}
-			}
-			this._model.force_full_redraw = false;
-			this._model.changed = [];
-			/**
-			 * triggered after nodes are redrawn
-			 * @event
-			 * @name redraw.jstree
-			 * @param {array} nodes the redrawn nodes
-			 */
-			this.trigger('redraw', { "nodes" : nodes });
-		},
-		/**
-		 * redraws all nodes that need to be redrawn or optionally - the whole tree
-		 * @name redraw([full])
-		 * @param {Boolean} full if set to `true` all nodes are redrawn.
-		 */
-		redraw : function (full) {
-			if(full) {
-				this._model.force_full_redraw = true;
-			}
-			//if(this._model.redraw_timeout) {
-			//	clearTimeout(this._model.redraw_timeout);
-			//}
-			//this._model.redraw_timeout = setTimeout($.proxy(this._redraw, this),0);
-			this._redraw();
-		},
-		/**
-		 * redraws a single node's children. Used internally.
-		 * @private
-		 * @name draw_children(node)
-		 * @param {mixed} node the node whose children will be redrawn
-		 */
-		draw_children : function (node) {
-			var obj = this.get_node(node),
-				i = false,
-				j = false,
-				k = false,
-				d = document;
-			if(!obj) { return false; }
-			if(obj.id === $.jstree.root) { return this.redraw(true); }
-			node = this.get_node(node, true);
-			if(!node || !node.length) { return false; } // TODO: quick toggle
-
-			node.children('.jstree-children').remove();
-			node = node[0];
-			if(obj.children.length && obj.state.loaded) {
-				k = d.createElement('UL');
-				k.setAttribute('role', 'group');
-				k.className = 'jstree-children';
-				for(i = 0, j = obj.children.length; i < j; i++) {
-					k.appendChild(this.redraw_node(obj.children[i], true, true));
-				}
-				node.appendChild(k);
-			}
-		},
-		/**
-		 * redraws a single node. Used internally.
-		 * @private
-		 * @name redraw_node(node, deep, is_callback, force_render)
-		 * @param {mixed} node the node to redraw
-		 * @param {Boolean} deep should child nodes be redrawn too
-		 * @param {Boolean} is_callback is this a recursion call
-		 * @param {Boolean} force_render should children of closed parents be drawn anyway
-		 */
-		redraw_node : function (node, deep, is_callback, force_render) {
-			var obj = this.get_node(node),
-				par = false,
-				ind = false,
-				old = false,
-				i = false,
-				j = false,
-				k = false,
-				c = '',
-				d = document,
-				m = this._model.data,
-				f = false,
-				s = false,
-				tmp = null,
-				t = 0,
-				l = 0,
-				has_children = false,
-				last_sibling = false;
-			if(!obj) { return false; }
-			if(obj.id === $.jstree.root) {  return this.redraw(true); }
-			deep = deep || obj.children.length === 0;
-			node = !document.querySelector ? document.getElementById(obj.id) : this.element[0].querySelector('#' + ("0123456789".indexOf(obj.id[0]) !== -1 ? '\\3' + obj.id[0] + ' ' + obj.id.substr(1).replace($.jstree.idregex,'\\$&') : obj.id.replace($.jstree.idregex,'\\$&')) ); //, this.element);
-			if(!node) {
-				deep = true;
-				//node = d.createElement('LI');
-				if(!is_callback) {
-					par = obj.parent !== $.jstree.root ? $('#' + obj.parent.replace($.jstree.idregex,'\\$&'), this.element)[0] : null;
-					if(par !== null && (!par || !m[obj.parent].state.opened)) {
-						return false;
-					}
-					ind = $.inArray(obj.id, par === null ? m[$.jstree.root].children : m[obj.parent].children);
-				}
-			}
-			else {
-				node = $(node);
-				if(!is_callback) {
-					par = node.parent().parent()[0];
-					if(par === this.element[0]) {
-						par = null;
-					}
-					ind = node.index();
-				}
-				// m[obj.id].data = node.data(); // use only node's data, no need to touch jquery storage
-				if(!deep && obj.children.length && !node.children('.jstree-children').length) {
-					deep = true;
-				}
-				if(!deep) {
-					old = node.children('.jstree-children')[0];
-				}
-				f = node.children('.jstree-anchor')[0] === document.activeElement;
-				node.remove();
-				//node = d.createElement('LI');
-				//node = node[0];
-			}
-			node = _node.cloneNode(true);
-			// node is DOM, deep is boolean
-
-			c = 'jstree-node ';
-			for(i in obj.li_attr) {
-				if(obj.li_attr.hasOwnProperty(i)) {
-					if(i === 'id') { continue; }
-					if(i !== 'class') {
-						node.setAttribute(i, obj.li_attr[i]);
-					}
-					else {
-						c += obj.li_attr[i];
-					}
-				}
-			}
-			if(!obj.a_attr.id) {
-				obj.a_attr.id = obj.id + '_anchor';
-			}
-			node.setAttribute('aria-selected', !!obj.state.selected);
-			node.setAttribute('aria-level', obj.parents.length);
-			node.setAttribute('aria-labelledby', obj.a_attr.id);
-			if(obj.state.disabled) {
-				node.setAttribute('aria-disabled', true);
-			}
-
-			for(i = 0, j = obj.children.length; i < j; i++) {
-				if(!m[obj.children[i]].state.hidden) {
-					has_children = true;
-					break;
-				}
-			}
-			if(obj.parent !== null && m[obj.parent] && !obj.state.hidden) {
-				i = $.inArray(obj.id, m[obj.parent].children);
-				last_sibling = obj.id;
-				if(i !== -1) {
-					i++;
-					for(j = m[obj.parent].children.length; i < j; i++) {
-						if(!m[m[obj.parent].children[i]].state.hidden) {
-							last_sibling = m[obj.parent].children[i];
-						}
-						if(last_sibling !== obj.id) {
-							break;
-						}
-					}
-				}
-			}
-
-			if(obj.state.hidden) {
-				c += ' jstree-hidden';
-			}
-			if(obj.state.loaded && !has_children) {
-				c += ' jstree-leaf';
-			}
-			else {
-				c += obj.state.opened && obj.state.loaded ? ' jstree-open' : ' jstree-closed';
-				node.setAttribute('aria-expanded', (obj.state.opened && obj.state.loaded) );
-			}
-			if(last_sibling === obj.id) {
-				c += ' jstree-last';
-			}
-			node.id = obj.id;
-			node.className = c;
-			c = ( obj.state.selected ? ' jstree-clicked' : '') + ( obj.state.disabled ? ' jstree-disabled' : '');
-			for(j in obj.a_attr) {
-				if(obj.a_attr.hasOwnProperty(j)) {
-					if(j === 'href' && obj.a_attr[j] === '#') { continue; }
-					if(j !== 'class') {
-						node.childNodes[1].setAttribute(j, obj.a_attr[j]);
-					}
-					else {
-						c += ' ' + obj.a_attr[j];
-					}
-				}
-			}
-			if(c.length) {
-				node.childNodes[1].className = 'jstree-anchor ' + c;
-			}
-			if((obj.icon && obj.icon !== true) || obj.icon === false) {
-				if(obj.icon === false) {
-					node.childNodes[1].childNodes[0].className += ' jstree-themeicon-hidden';
-				}
-				else if(obj.icon.indexOf('/') === -1 && obj.icon.indexOf('.') === -1) {
-					node.childNodes[1].childNodes[0].className += ' ' + obj.icon + ' jstree-themeicon-custom';
-				}
-				else {
-					node.childNodes[1].childNodes[0].style.backgroundImage = 'url('+obj.icon+')';
-					node.childNodes[1].childNodes[0].style.backgroundPosition = 'center center';
-					node.childNodes[1].childNodes[0].style.backgroundSize = 'auto';
-					node.childNodes[1].childNodes[0].className += ' jstree-themeicon-custom';
-				}
-			}
-
-			if(this.settings.core.force_text) {
-				node.childNodes[1].appendChild(d.createTextNode(obj.text));
-			}
-			else {
-				node.childNodes[1].innerHTML += obj.text;
-			}
-
-
-			if(deep && obj.children.length && (obj.state.opened || force_render) && obj.state.loaded) {
-				k = d.createElement('UL');
-				k.setAttribute('role', 'group');
-				k.className = 'jstree-children';
-				for(i = 0, j = obj.children.length; i < j; i++) {
-					k.appendChild(this.redraw_node(obj.children[i], deep, true));
-				}
-				node.appendChild(k);
-			}
-			if(old) {
-				node.appendChild(old);
-			}
-			if(!is_callback) {
-				// append back using par / ind
-				if(!par) {
-					par = this.element[0];
-				}
-				for(i = 0, j = par.childNodes.length; i < j; i++) {
-					if(par.childNodes[i] && par.childNodes[i].className && par.childNodes[i].className.indexOf('jstree-children') !== -1) {
-						tmp = par.childNodes[i];
-						break;
-					}
-				}
-				if(!tmp) {
-					tmp = d.createElement('UL');
-					tmp.setAttribute('role', 'group');
-					tmp.className = 'jstree-children';
-					par.appendChild(tmp);
-				}
-				par = tmp;
-
-				if(ind < par.childNodes.length) {
-					par.insertBefore(node, par.childNodes[ind]);
-				}
-				else {
-					par.appendChild(node);
-				}
-				if(f) {
-					t = this.element[0].scrollTop;
-					l = this.element[0].scrollLeft;
-					node.childNodes[1].focus();
-					this.element[0].scrollTop = t;
-					this.element[0].scrollLeft = l;
-				}
-			}
-			if(obj.state.opened && !obj.state.loaded) {
-				obj.state.opened = false;
-				setTimeout($.proxy(function () {
-					this.open_node(obj.id, false, 0);
-				}, this), 0);
-			}
-			return node;
-		},
-		/**
-		 * opens a node, revaling its children. If the node is not loaded it will be loaded and opened once ready.
-		 * @name open_node(obj [, callback, animation])
-		 * @param {mixed} obj the node to open
-		 * @param {Function} callback a function to execute once the node is opened
-		 * @param {Number} animation the animation duration in milliseconds when opening the node (overrides the `core.animation` setting). Use `false` for no animation.
-		 * @trigger open_node.jstree, after_open.jstree, before_open.jstree
-		 */
-		open_node : function (obj, callback, animation) {
-			var t1, t2, d, t;
-			if($.isArray(obj)) {
-				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-					this.open_node(obj[t1], callback, animation);
-				}
-				return true;
-			}
-			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
-				return false;
-			}
-			animation = animation === undefined ? this.settings.core.animation : animation;
-			if(!this.is_closed(obj)) {
-				if(callback) {
-					callback.call(this, obj, false);
-				}
-				return false;
-			}
-			if(!this.is_loaded(obj)) {
-				if(this.is_loading(obj)) {
-					return setTimeout($.proxy(function () {
-						this.open_node(obj, callback, animation);
-					}, this), 500);
-				}
-				this.load_node(obj, function (o, ok) {
-					return ok ? this.open_node(o, callback, animation) : (callback ? callback.call(this, o, false) : false);
-				});
-			}
-			else {
-				d = this.get_node(obj, true);
-				t = this;
-				if(d.length) {
-					if(animation && d.children(".jstree-children").length) {
-						d.children(".jstree-children").stop(true, true);
-					}
-					if(obj.children.length && !this._firstChild(d.children('.jstree-children')[0])) {
-						this.draw_children(obj);
-						//d = this.get_node(obj, true);
-					}
-					if(!animation) {
-						this.trigger('before_open', { "node" : obj });
-						d[0].className = d[0].className.replace('jstree-closed', 'jstree-open');
-						d[0].setAttribute("aria-expanded", true);
-					}
-					else {
-						this.trigger('before_open', { "node" : obj });
-						d
-							.children(".jstree-children").css("display","none").end()
-							.removeClass("jstree-closed").addClass("jstree-open").attr("aria-expanded", true)
-							.children(".jstree-children").stop(true, true)
-								.slideDown(animation, function () {
-									this.style.display = "";
-									t.trigger("after_open", { "node" : obj });
-								});
-					}
-				}
-				obj.state.opened = true;
-				if(callback) {
-					callback.call(this, obj, true);
-				}
-				if(!d.length) {
-					/**
-					 * triggered when a node is about to be opened (if the node is supposed to be in the DOM, it will be, but it won't be visible yet)
-					 * @event
-					 * @name before_open.jstree
-					 * @param {Object} node the opened node
-					 */
-					this.trigger('before_open', { "node" : obj });
-				}
-				/**
-				 * triggered when a node is opened (if there is an animation it will not be completed yet)
-				 * @event
-				 * @name open_node.jstree
-				 * @param {Object} node the opened node
-				 */
-				this.trigger('open_node', { "node" : obj });
-				if(!animation || !d.length) {
-					/**
-					 * triggered when a node is opened and the animation is complete
-					 * @event
-					 * @name after_open.jstree
-					 * @param {Object} node the opened node
-					 */
-					this.trigger("after_open", { "node" : obj });
-				}
-				return true;
-			}
-		},
-		/**
-		 * opens every parent of a node (node should be loaded)
-		 * @name _open_to(obj)
-		 * @param {mixed} obj the node to reveal
-		 * @private
-		 */
-		_open_to : function (obj) {
-			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
-				return false;
-			}
-			var i, j, p = obj.parents;
-			for(i = 0, j = p.length; i < j; i+=1) {
-				if(i !== $.jstree.root) {
-					this.open_node(p[i], false, 0);
-				}
-			}
-			return $('#' + obj.id.replace($.jstree.idregex,'\\$&'), this.element);
-		},
-		/**
-		 * closes a node, hiding its children
-		 * @name close_node(obj [, animation])
-		 * @param {mixed} obj the node to close
-		 * @param {Number} animation the animation duration in milliseconds when closing the node (overrides the `core.animation` setting). Use `false` for no animation.
-		 * @trigger close_node.jstree, after_close.jstree
-		 */
-		close_node : function (obj, animation) {
-			var t1, t2, t, d;
-			if($.isArray(obj)) {
-				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-					this.close_node(obj[t1], animation);
-				}
-				return true;
-			}
-			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
-				return false;
-			}
-			if(this.is_closed(obj)) {
-				return false;
-			}
-			animation = animation === undefined ? this.settings.core.animation : animation;
-			t = this;
-			d = this.get_node(obj, true);
-			if(d.length) {
-				if(!animation) {
-					d[0].className = d[0].className.replace('jstree-open', 'jstree-closed');
-					d.attr("aria-expanded", false).children('.jstree-children').remove();
-				}
-				else {
-					d
-						.children(".jstree-children").attr("style","display:block !important").end()
-						.removeClass("jstree-open").addClass("jstree-closed").attr("aria-expanded", false)
-						.children(".jstree-children").stop(true, true).slideUp(animation, function () {
-							this.style.display = "";
-							d.children('.jstree-children').remove();
-							t.trigger("after_close", { "node" : obj });
-						});
-				}
-			}
-			obj.state.opened = false;
-			/**
-			 * triggered when a node is closed (if there is an animation it will not be complete yet)
-			 * @event
-			 * @name close_node.jstree
-			 * @param {Object} node the closed node
-			 */
-			this.trigger('close_node',{ "node" : obj });
-			if(!animation || !d.length) {
-				/**
-				 * triggered when a node is closed and the animation is complete
-				 * @event
-				 * @name after_close.jstree
-				 * @param {Object} node the closed node
-				 */
-				this.trigger("after_close", { "node" : obj });
-			}
-		},
-		/**
-		 * toggles a node - closing it if it is open, opening it if it is closed
-		 * @name toggle_node(obj)
-		 * @param {mixed} obj the node to toggle
-		 */
-		toggle_node : function (obj) {
-			var t1, t2;
-			if($.isArray(obj)) {
-				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-					this.toggle_node(obj[t1]);
-				}
-				return true;
-			}
-			if(this.is_closed(obj)) {
-				return this.open_node(obj);
-			}
-			if(this.is_open(obj)) {
-				return this.close_node(obj);
-			}
-		},
-		/**
-		 * opens all nodes within a node (or the tree), revaling their children. If the node is not loaded it will be loaded and opened once ready.
-		 * @name open_all([obj, animation, original_obj])
-		 * @param {mixed} obj the node to open recursively, omit to open all nodes in the tree
-		 * @param {Number} animation the animation duration in milliseconds when opening the nodes, the default is no animation
-		 * @param {jQuery} reference to the node that started the process (internal use)
-		 * @trigger open_all.jstree
-		 */
-		open_all : function (obj, animation, original_obj) {
-			if(!obj) { obj = $.jstree.root; }
-			obj = this.get_node(obj);
-			if(!obj) { return false; }
-			var dom = obj.id === $.jstree.root ? this.get_container_ul() : this.get_node(obj, true), i, j, _this;
-			if(!dom.length) {
-				for(i = 0, j = obj.children_d.length; i < j; i++) {
-					if(this.is_closed(this._model.data[obj.children_d[i]])) {
-						this._model.data[obj.children_d[i]].state.opened = true;
-					}
-				}
-				return this.trigger('open_all', { "node" : obj });
-			}
-			original_obj = original_obj || dom;
-			_this = this;
-			dom = this.is_closed(obj) ? dom.find('.jstree-closed').addBack() : dom.find('.jstree-closed');
-			dom.each(function () {
-				_this.open_node(
-					this,
-					function(node, status) { if(status && this.is_parent(node)) { this.open_all(node, animation, original_obj); } },
-					animation || 0
-				);
-			});
-			if(original_obj.find('.jstree-closed').length === 0) {
-				/**
-				 * triggered when an `open_all` call completes
-				 * @event
-				 * @name open_all.jstree
-				 * @param {Object} node the opened node
-				 */
-				this.trigger('open_all', { "node" : this.get_node(original_obj) });
-			}
-		},
-		/**
-		 * closes all nodes within a node (or the tree), revaling their children
-		 * @name close_all([obj, animation])
-		 * @param {mixed} obj the node to close recursively, omit to close all nodes in the tree
-		 * @param {Number} animation the animation duration in milliseconds when closing the nodes, the default is no animation
-		 * @trigger close_all.jstree
-		 */
-		close_all : function (obj, animation) {
-			if(!obj) { obj = $.jstree.root; }
-			obj = this.get_node(obj);
-			if(!obj) { return false; }
-			var dom = obj.id === $.jstree.root ? this.get_container_ul() : this.get_node(obj, true),
-				_this = this, i, j;
-			if(dom.length) {
-				dom = this.is_open(obj) ? dom.find('.jstree-open').addBack() : dom.find('.jstree-open');
-				$(dom.get().reverse()).each(function () { _this.close_node(this, animation || 0); });
-			}
-			for(i = 0, j = obj.children_d.length; i < j; i++) {
-				this._model.data[obj.children_d[i]].state.opened = false;
-			}
-			/**
-			 * triggered when an `close_all` call completes
-			 * @event
-			 * @name close_all.jstree
-			 * @param {Object} node the closed node
-			 */
-			this.trigger('close_all', { "node" : obj });
-		},
-		/**
-		 * checks if a node is disabled (not selectable)
-		 * @name is_disabled(obj)
-		 * @param  {mixed} obj
-		 * @return {Boolean}
-		 */
-		is_disabled : function (obj) {
-			obj = this.get_node(obj);
-			return obj && obj.state && obj.state.disabled;
-		},
-		/**
-		 * enables a node - so that it can be selected
-		 * @name enable_node(obj)
-		 * @param {mixed} obj the node to enable
-		 * @trigger enable_node.jstree
-		 */
-		enable_node : function (obj) {
-			var t1, t2;
-			if($.isArray(obj)) {
-				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-					this.enable_node(obj[t1]);
-				}
-				return true;
-			}
-			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
-				return false;
-			}
-			obj.state.disabled = false;
-			this.get_node(obj,true).children('.jstree-anchor').removeClass('jstree-disabled').attr('aria-disabled', false);
-			/**
-			 * triggered when an node is enabled
-			 * @event
-			 * @name enable_node.jstree
-			 * @param {Object} node the enabled node
-			 */
-			this.trigger('enable_node', { 'node' : obj });
-		},
-		/**
-		 * disables a node - so that it can not be selected
-		 * @name disable_node(obj)
-		 * @param {mixed} obj the node to disable
-		 * @trigger disable_node.jstree
-		 */
-		disable_node : function (obj) {
-			var t1, t2;
-			if($.isArray(obj)) {
-				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-					this.disable_node(obj[t1]);
-				}
-				return true;
-			}
-			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
-				return false;
-			}
-			obj.state.disabled = true;
-			this.get_node(obj,true).children('.jstree-anchor').addClass('jstree-disabled').attr('aria-disabled', true);
-			/**
-			 * triggered when an node is disabled
-			 * @event
-			 * @name disable_node.jstree
-			 * @param {Object} node the disabled node
-			 */
-			this.trigger('disable_node', { 'node' : obj });
-		},
-		/**
-		 * hides a node - it is still in the structure but will not be visible
-		 * @name hide_node(obj)
-		 * @param {mixed} obj the node to hide
-		 * @param {Boolean} redraw internal parameter controlling if redraw is called
-		 * @trigger hide_node.jstree
-		 */
-		hide_node : function (obj, skip_redraw) {
-			var t1, t2;
-			if($.isArray(obj)) {
-				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-					this.hide_node(obj[t1], true);
-				}
-				this.redraw();
-				return true;
-			}
-			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
-				return false;
-			}
-			if(!obj.state.hidden) {
-				obj.state.hidden = true;
-				this._node_changed(obj.parent);
-				if(!skip_redraw) {
-					this.redraw();
-				}
-				/**
-				 * triggered when an node is hidden
-				 * @event
-				 * @name hide_node.jstree
-				 * @param {Object} node the hidden node
-				 */
-				this.trigger('hide_node', { 'node' : obj });
-			}
-		},
-		/**
-		 * shows a node
-		 * @name show_node(obj)
-		 * @param {mixed} obj the node to show
-		 * @param {Boolean} skip_redraw internal parameter controlling if redraw is called
-		 * @trigger show_node.jstree
-		 */
-		show_node : function (obj, skip_redraw) {
-			var t1, t2;
-			if($.isArray(obj)) {
-				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-					this.show_node(obj[t1], true);
-				}
-				this.redraw();
-				return true;
-			}
-			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
-				return false;
-			}
-			if(obj.state.hidden) {
-				obj.state.hidden = false;
-				this._node_changed(obj.parent);
-				if(!skip_redraw) {
-					this.redraw();
-				}
-				/**
-				 * triggered when an node is shown
-				 * @event
-				 * @name show_node.jstree
-				 * @param {Object} node the shown node
-				 */
-				this.trigger('show_node', { 'node' : obj });
-			}
-		},
-		/**
-		 * hides all nodes
-		 * @name hide_all()
-		 * @trigger hide_all.jstree
-		 */
-		hide_all : function (skip_redraw) {
-			var i, m = this._model.data, ids = [];
-			for(i in m) {
-				if(m.hasOwnProperty(i) && i !== $.jstree.root && !m[i].state.hidden) {
-					m[i].state.hidden = true;
-					ids.push(i);
-				}
-			}
-			this._model.force_full_redraw = true;
-			if(!skip_redraw) {
-				this.redraw();
-			}
-			/**
-			 * triggered when all nodes are hidden
-			 * @event
-			 * @name hide_all.jstree
-			 * @param {Array} nodes the IDs of all hidden nodes
-			 */
-			this.trigger('hide_all', { 'nodes' : ids });
-			return ids;
-		},
-		/**
-		 * shows all nodes
-		 * @name show_all()
-		 * @trigger show_all.jstree
-		 */
-		show_all : function (skip_redraw) {
-			var i, m = this._model.data, ids = [];
-			for(i in m) {
-				if(m.hasOwnProperty(i) && i !== $.jstree.root && m[i].state.hidden) {
-					m[i].state.hidden = false;
-					ids.push(i);
-				}
-			}
-			this._model.force_full_redraw = true;
-			if(!skip_redraw) {
-				this.redraw();
-			}
-			/**
-			 * triggered when all nodes are shown
-			 * @event
-			 * @name show_all.jstree
-			 * @param {Array} nodes the IDs of all shown nodes
-			 */
-			this.trigger('show_all', { 'nodes' : ids });
-			return ids;
-		},
-		/**
-		 * called when a node is selected by the user. Used internally.
-		 * @private
-		 * @name activate_node(obj, e)
-		 * @param {mixed} obj the node
-		 * @param {Object} e the related event
-		 * @trigger activate_node.jstree, changed.jstree
-		 */
-		activate_node : function (obj, e) {
-			if(this.is_disabled(obj)) {
-				return false;
-			}
-			if(!e || typeof e !== 'object') {
-				e = {};
-			}
-
-			// ensure last_clicked is still in the DOM, make it fresh (maybe it was moved?) and make sure it is still selected, if not - make last_clicked the last selected node
-			this._data.core.last_clicked = this._data.core.last_clicked && this._data.core.last_clicked.id !== undefined ? this.get_node(this._data.core.last_clicked.id) : null;
-			if(this._data.core.last_clicked && !this._data.core.last_clicked.state.selected) { this._data.core.last_clicked = null; }
-			if(!this._data.core.last_clicked && this._data.core.selected.length) { this._data.core.last_clicked = this.get_node(this._data.core.selected[this._data.core.selected.length - 1]); }
-
-			if(!this.settings.core.multiple || (!e.metaKey && !e.ctrlKey && !e.shiftKey) || (e.shiftKey && (!this._data.core.last_clicked || !this.get_parent(obj) || this.get_parent(obj) !== this._data.core.last_clicked.parent ) )) {
-				if(!this.settings.core.multiple && (e.metaKey || e.ctrlKey || e.shiftKey) && this.is_selected(obj)) {
-					this.deselect_node(obj, false, e);
-				}
-				else {
-					this.deselect_all(true);
-					this.select_node(obj, false, false, e);
-					this._data.core.last_clicked = this.get_node(obj);
-				}
-			}
-			else {
-				if(e.shiftKey) {
-					var o = this.get_node(obj).id,
-						l = this._data.core.last_clicked.id,
-						p = this.get_node(this._data.core.last_clicked.parent).children,
-						c = false,
-						i, j;
-					for(i = 0, j = p.length; i < j; i += 1) {
-						// separate IFs work whem o and l are the same
-						if(p[i] === o) {
-							c = !c;
-						}
-						if(p[i] === l) {
-							c = !c;
-						}
-						if(!this.is_disabled(p[i]) && (c || p[i] === o || p[i] === l)) {
-							this.select_node(p[i], true, false, e);
-						}
-						else {
-							this.deselect_node(p[i], true, e);
-						}
-					}
-					this.trigger('changed', { 'action' : 'select_node', 'node' : this.get_node(obj), 'selected' : this._data.core.selected, 'event' : e });
-				}
-				else {
-					if(!this.is_selected(obj)) {
-						this.select_node(obj, false, false, e);
-					}
-					else {
-						this.deselect_node(obj, false, e);
-					}
-				}
-			}
-			/**
-			 * triggered when an node is clicked or intercated with by the user
-			 * @event
-			 * @name activate_node.jstree
-			 * @param {Object} node
-			 * @param {Object} event the ooriginal event (if any) which triggered the call (may be an empty object)
-			 */
-			this.trigger('activate_node', { 'node' : this.get_node(obj), 'event' : e });
-		},
-		/**
-		 * applies the hover state on a node, called when a node is hovered by the user. Used internally.
-		 * @private
-		 * @name hover_node(obj)
-		 * @param {mixed} obj
-		 * @trigger hover_node.jstree
-		 */
-		hover_node : function (obj) {
-			obj = this.get_node(obj, true);
-			if(!obj || !obj.length || obj.children('.jstree-hovered').length) {
-				return false;
-			}
-			var o = this.element.find('.jstree-hovered'), t = this.element;
-			if(o && o.length) { this.dehover_node(o); }
-
-			obj.children('.jstree-anchor').addClass('jstree-hovered');
-			/**
-			 * triggered when an node is hovered
-			 * @event
-			 * @name hover_node.jstree
-			 * @param {Object} node
-			 */
-			this.trigger('hover_node', { 'node' : this.get_node(obj) });
-			setTimeout(function () { t.attr('aria-activedescendant', obj[0].id); }, 0);
-		},
-		/**
-		 * removes the hover state from a nodecalled when a node is no longer hovered by the user. Used internally.
-		 * @private
-		 * @name dehover_node(obj)
-		 * @param {mixed} obj
-		 * @trigger dehover_node.jstree
-		 */
-		dehover_node : function (obj) {
-			obj = this.get_node(obj, true);
-			if(!obj || !obj.length || !obj.children('.jstree-hovered').length) {
-				return false;
-			}
-			obj.children('.jstree-anchor').removeClass('jstree-hovered');
-			/**
-			 * triggered when an node is no longer hovered
-			 * @event
-			 * @name dehover_node.jstree
-			 * @param {Object} node
-			 */
-			this.trigger('dehover_node', { 'node' : this.get_node(obj) });
-		},
-		/**
-		 * select a node
-		 * @name select_node(obj [, supress_event, prevent_open])
-		 * @param {mixed} obj an array can be used to select multiple nodes
-		 * @param {Boolean} supress_event if set to `true` the `changed.jstree` event won't be triggered
-		 * @param {Boolean} prevent_open if set to `true` parents of the selected node won't be opened
-		 * @trigger select_node.jstree, changed.jstree
-		 */
-		select_node : function (obj, supress_event, prevent_open, e) {
-			var dom, t1, t2, th;
-			if($.isArray(obj)) {
-				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-					this.select_node(obj[t1], supress_event, prevent_open, e);
-				}
-				return true;
-			}
-			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
-				return false;
-			}
-			dom = this.get_node(obj, true);
-			if(!obj.state.selected) {
-				obj.state.selected = true;
-				this._data.core.selected.push(obj.id);
-				if(!prevent_open) {
-					dom = this._open_to(obj);
-				}
-				if(dom && dom.length) {
-					dom.attr('aria-selected', true).children('.jstree-anchor').addClass('jstree-clicked');
-				}
-				/**
-				 * triggered when an node is selected
-				 * @event
-				 * @name select_node.jstree
-				 * @param {Object} node
-				 * @param {Array} selected the current selection
-				 * @param {Object} event the event (if any) that triggered this select_node
-				 */
-				this.trigger('select_node', { 'node' : obj, 'selected' : this._data.core.selected, 'event' : e });
-				if(!supress_event) {
-					/**
-					 * triggered when selection changes
-					 * @event
-					 * @name changed.jstree
-					 * @param {Object} node
-					 * @param {Object} action the action that caused the selection to change
-					 * @param {Array} selected the current selection
-					 * @param {Object} event the event (if any) that triggered this changed event
-					 */
-					this.trigger('changed', { 'action' : 'select_node', 'node' : obj, 'selected' : this._data.core.selected, 'event' : e });
-				}
-			}
-		},
-		/**
-		 * deselect a node
-		 * @name deselect_node(obj [, supress_event])
-		 * @param {mixed} obj an array can be used to deselect multiple nodes
-		 * @param {Boolean} supress_event if set to `true` the `changed.jstree` event won't be triggered
-		 * @trigger deselect_node.jstree, changed.jstree
-		 */
-		deselect_node : function (obj, supress_event, e) {
-			var t1, t2, dom;
-			if($.isArray(obj)) {
-				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-					this.deselect_node(obj[t1], supress_event, e);
-				}
-				return true;
-			}
-			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
-				return false;
-			}
-			dom = this.get_node(obj, true);
-			if(obj.state.selected) {
-				obj.state.selected = false;
-				this._data.core.selected = $.vakata.array_remove_item(this._data.core.selected, obj.id);
-				if(dom.length) {
-					dom.attr('aria-selected', false).children('.jstree-anchor').removeClass('jstree-clicked');
-				}
-				/**
-				 * triggered when an node is deselected
-				 * @event
-				 * @name deselect_node.jstree
-				 * @param {Object} node
-				 * @param {Array} selected the current selection
-				 * @param {Object} event the event (if any) that triggered this deselect_node
-				 */
-				this.trigger('deselect_node', { 'node' : obj, 'selected' : this._data.core.selected, 'event' : e });
-				if(!supress_event) {
-					this.trigger('changed', { 'action' : 'deselect_node', 'node' : obj, 'selected' : this._data.core.selected, 'event' : e });
-				}
-			}
-		},
-		/**
-		 * select all nodes in the tree
-		 * @name select_all([supress_event])
-		 * @param {Boolean} supress_event if set to `true` the `changed.jstree` event won't be triggered
-		 * @trigger select_all.jstree, changed.jstree
-		 */
-		select_all : function (supress_event) {
-			var tmp = this._data.core.selected.concat([]), i, j;
-			this._data.core.selected = this._model.data[$.jstree.root].children_d.concat();
-			for(i = 0, j = this._data.core.selected.length; i < j; i++) {
-				if(this._model.data[this._data.core.selected[i]]) {
-					this._model.data[this._data.core.selected[i]].state.selected = true;
-				}
-			}
-			this.redraw(true);
-			/**
-			 * triggered when all nodes are selected
-			 * @event
-			 * @name select_all.jstree
-			 * @param {Array} selected the current selection
-			 */
-			this.trigger('select_all', { 'selected' : this._data.core.selected });
-			if(!supress_event) {
-				this.trigger('changed', { 'action' : 'select_all', 'selected' : this._data.core.selected, 'old_selection' : tmp });
-			}
-		},
-		/**
-		 * deselect all selected nodes
-		 * @name deselect_all([supress_event])
-		 * @param {Boolean} supress_event if set to `true` the `changed.jstree` event won't be triggered
-		 * @trigger deselect_all.jstree, changed.jstree
-		 */
-		deselect_all : function (supress_event) {
-			var tmp = this._data.core.selected.concat([]), i, j;
-			for(i = 0, j = this._data.core.selected.length; i < j; i++) {
-				if(this._model.data[this._data.core.selected[i]]) {
-					this._model.data[this._data.core.selected[i]].state.selected = false;
-				}
-			}
-			this._data.core.selected = [];
-			this.element.find('.jstree-clicked').removeClass('jstree-clicked').parent().attr('aria-selected', false);
-			/**
-			 * triggered when all nodes are deselected
-			 * @event
-			 * @name deselect_all.jstree
-			 * @param {Object} node the previous selection
-			 * @param {Array} selected the current selection
-			 */
-			this.trigger('deselect_all', { 'selected' : this._data.core.selected, 'node' : tmp });
-			if(!supress_event) {
-				this.trigger('changed', { 'action' : 'deselect_all', 'selected' : this._data.core.selected, 'old_selection' : tmp });
-			}
-		},
-		/**
-		 * checks if a node is selected
-		 * @name is_selected(obj)
-		 * @param  {mixed}  obj
-		 * @return {Boolean}
-		 */
-		is_selected : function (obj) {
-			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
-				return false;
-			}
-			return obj.state.selected;
-		},
-		/**
-		 * get an array of all selected nodes
-		 * @name get_selected([full])
-		 * @param  {mixed}  full if set to `true` the returned array will consist of the full node objects, otherwise - only IDs will be returned
-		 * @return {Array}
-		 */
-		get_selected : function (full) {
-			return full ? $.map(this._data.core.selected, $.proxy(function (i) { return this.get_node(i); }, this)) : this._data.core.selected.slice();
-		},
-		/**
-		 * get an array of all top level selected nodes (ignoring children of selected nodes)
-		 * @name get_top_selected([full])
-		 * @param  {mixed}  full if set to `true` the returned array will consist of the full node objects, otherwise - only IDs will be returned
-		 * @return {Array}
-		 */
-		get_top_selected : function (full) {
-			var tmp = this.get_selected(true),
-				obj = {}, i, j, k, l;
-			for(i = 0, j = tmp.length; i < j; i++) {
-				obj[tmp[i].id] = tmp[i];
-			}
-			for(i = 0, j = tmp.length; i < j; i++) {
-				for(k = 0, l = tmp[i].children_d.length; k < l; k++) {
-					if(obj[tmp[i].children_d[k]]) {
-						delete obj[tmp[i].children_d[k]];
-					}
-				}
-			}
-			tmp = [];
-			for(i in obj) {
-				if(obj.hasOwnProperty(i)) {
-					tmp.push(i);
-				}
-			}
-			return full ? $.map(tmp, $.proxy(function (i) { return this.get_node(i); }, this)) : tmp;
-		},
-		/**
-		 * get an array of all bottom level selected nodes (ignoring selected parents)
-		 * @name get_bottom_selected([full])
-		 * @param  {mixed}  full if set to `true` the returned array will consist of the full node objects, otherwise - only IDs will be returned
-		 * @return {Array}
-		 */
-		get_bottom_selected : function (full) {
-			var tmp = this.get_selected(true),
-				obj = [], i, j;
-			for(i = 0, j = tmp.length; i < j; i++) {
-				if(!tmp[i].children.length) {
-					obj.push(tmp[i].id);
-				}
-			}
-			return full ? $.map(obj, $.proxy(function (i) { return this.get_node(i); }, this)) : obj;
-		},
-		/**
-		 * gets the current state of the tree so that it can be restored later with `set_state(state)`. Used internally.
-		 * @name get_state()
-		 * @private
-		 * @return {Object}
-		 */
-		get_state : function () {
-			var state	= {
-				'core' : {
-					'open' : [],
-					'scroll' : {
-						'left' : this.element.scrollLeft(),
-						'top' : this.element.scrollTop()
-					},
-					/*!
-					'themes' : {
-						'name' : this.get_theme(),
-						'icons' : this._data.core.themes.icons,
-						'dots' : this._data.core.themes.dots
-					},
-					*/
-					'selected' : []
-				}
-			}, i;
-			for(i in this._model.data) {
-				if(this._model.data.hasOwnProperty(i)) {
-					if(i !== $.jstree.root) {
-						if(this._model.data[i].state.opened) {
-							state.core.open.push(i);
-						}
-						if(this._model.data[i].state.selected) {
-							state.core.selected.push(i);
-						}
-					}
-				}
-			}
-			return state;
-		},
-		/**
-		 * sets the state of the tree. Used internally.
-		 * @name set_state(state [, callback])
-		 * @private
-		 * @param {Object} state the state to restore. Keep in mind this object is passed by reference and jstree will modify it.
-		 * @param {Function} callback an optional function to execute once the state is restored.
-		 * @trigger set_state.jstree
-		 */
-		set_state : function (state, callback) {
-			if(state) {
-				if(state.core) {
-					var res, n, t, _this, i;
-					if(state.core.open) {
-						if(!$.isArray(state.core.open) || !state.core.open.length) {
-							delete state.core.open;
-							this.set_state(state, callback);
-						}
-						else {
-							this._load_nodes(state.core.open, function (nodes) {
-								this.open_node(nodes, false, 0);
-								delete state.core.open;
-								this.set_state(state, callback);
-							}, true);
-						}
-						return false;
-					}
-					if(state.core.scroll) {
-						if(state.core.scroll && state.core.scroll.left !== undefined) {
-							this.element.scrollLeft(state.core.scroll.left);
-						}
-						if(state.core.scroll && state.core.scroll.top !== undefined) {
-							this.element.scrollTop(state.core.scroll.top);
-						}
-						delete state.core.scroll;
-						this.set_state(state, callback);
-						return false;
-					}
-					if(state.core.selected) {
-						_this = this;
-						this.deselect_all();
-						$.each(state.core.selected, function (i, v) {
-							_this.select_node(v, false, true);
-						});
-						delete state.core.selected;
-						this.set_state(state, callback);
-						return false;
-					}
-					for(i in state) {
-						if(state.hasOwnProperty(i) && i !== "core" && $.inArray(i, this.settings.plugins) === -1) {
-							delete state[i];
-						}
-					}
-					if($.isEmptyObject(state.core)) {
-						delete state.core;
-						this.set_state(state, callback);
-						return false;
-					}
-				}
-				if($.isEmptyObject(state)) {
-					state = null;
-					if(callback) { callback.call(this); }
-					/**
-					 * triggered when a `set_state` call completes
-					 * @event
-					 * @name set_state.jstree
-					 */
-					this.trigger('set_state');
-					return false;
-				}
-				return true;
-			}
-			return false;
-		},
-		/**
-		 * refreshes the tree - all nodes are reloaded with calls to `load_node`.
-		 * @name refresh()
-		 * @param {Boolean} skip_loading an option to skip showing the loading indicator
-		 * @param {Mixed} forget_state if set to `true` state will not be reapplied, if set to a function (receiving the current state as argument) the result of that function will be used as state
-		 * @trigger refresh.jstree
-		 */
-		refresh : function (skip_loading, forget_state) {
-			this._data.core.state = forget_state === true ? {} : this.get_state();
-			if(forget_state && $.isFunction(forget_state)) { this._data.core.state = forget_state.call(this, this._data.core.state); }
-			this._cnt = 0;
-			this._model.data = {};
-			this._model.data[$.jstree.root] = {
-				id : $.jstree.root,
-				parent : null,
-				parents : [],
-				children : [],
-				children_d : [],
-				state : { loaded : false }
-			};
-			this._data.core.selected = [];
-			this._data.core.last_clicked = null;
-			this._data.core.focused = null;
-
-			var c = this.get_container_ul()[0].className;
-			if(!skip_loading) {
-				this.element.html("<"+"ul class='"+c+"' role='group'><"+"li class='jstree-initial-node jstree-loading jstree-leaf jstree-last' role='treeitem' id='j"+this._id+"_loading'><i class='jstree-icon jstree-ocl'></i><"+"a class='jstree-anchor' href='#'><i class='jstree-icon jstree-themeicon-hidden'></i>" + this.get_string("Loading ...") + "</a></li></ul>");
-				this.element.attr('aria-activedescendant','j'+this._id+'_loading');
-			}
-			this.load_node($.jstree.root, function (o, s) {
-				if(s) {
-					this.get_container_ul()[0].className = c;
-					if(this._firstChild(this.get_container_ul()[0])) {
-						this.element.attr('aria-activedescendant',this._firstChild(this.get_container_ul()[0]).id);
-					}
-					this.set_state($.extend(true, {}, this._data.core.state), function () {
-						/**
-						 * triggered when a `refresh` call completes
-						 * @event
-						 * @name refresh.jstree
-						 */
-						this.trigger('refresh');
-					});
-				}
-				this._data.core.state = null;
-			});
-		},
-		/**
-		 * refreshes a node in the tree (reload its children) all opened nodes inside that node are reloaded with calls to `load_node`.
-		 * @name refresh_node(obj)
-		 * @param  {mixed} obj the node
-		 * @trigger refresh_node.jstree
-		 */
-		refresh_node : function (obj) {
-			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) { return false; }
-			var opened = [], to_load = [], s = this._data.core.selected.concat([]);
-			to_load.push(obj.id);
-			if(obj.state.opened === true) { opened.push(obj.id); }
-			this.get_node(obj, true).find('.jstree-open').each(function() { opened.push(this.id); });
-			this._load_nodes(to_load, $.proxy(function (nodes) {
-				this.open_node(opened, false, 0);
-				this.select_node(this._data.core.selected);
-				/**
-				 * triggered when a node is refreshed
-				 * @event
-				 * @name refresh_node.jstree
-				 * @param {Object} node - the refreshed node
-				 * @param {Array} nodes - an array of the IDs of the nodes that were reloaded
-				 */
-				this.trigger('refresh_node', { 'node' : obj, 'nodes' : nodes });
-			}, this));
-		},
-		/**
-		 * set (change) the ID of a node
-		 * @name set_id(obj, id)
-		 * @param  {mixed} obj the node
-		 * @param  {String} id the new ID
-		 * @return {Boolean}
-		 */
-		set_id : function (obj, id) {
-			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) { return false; }
-			var i, j, m = this._model.data;
-			id = id.toString();
-			// update parents (replace current ID with new one in children and children_d)
-			m[obj.parent].children[$.inArray(obj.id, m[obj.parent].children)] = id;
-			for(i = 0, j = obj.parents.length; i < j; i++) {
-				m[obj.parents[i]].children_d[$.inArray(obj.id, m[obj.parents[i]].children_d)] = id;
-			}
-			// update children (replace current ID with new one in parent and parents)
-			for(i = 0, j = obj.children.length; i < j; i++) {
-				m[obj.children[i]].parent = id;
-			}
-			for(i = 0, j = obj.children_d.length; i < j; i++) {
-				m[obj.children_d[i]].parents[$.inArray(obj.id, m[obj.children_d[i]].parents)] = id;
-			}
-			i = $.inArray(obj.id, this._data.core.selected);
-			if(i !== -1) { this._data.core.selected[i] = id; }
-			// update model and obj itself (obj.id, this._model.data[KEY])
-			i = this.get_node(obj.id, true);
-			if(i) {
-				i.attr('id', id).children('.jstree-anchor').attr('id', id + '_anchor').end().attr('aria-labelledby', id + '_anchor');
-				if(this.element.attr('aria-activedescendant') === obj.id) {
-					this.element.attr('aria-activedescendant', id);
-				}
-			}
-			delete m[obj.id];
-			obj.id = id;
-			obj.li_attr.id = id;
-			m[id] = obj;
-			return true;
-		},
-		/**
-		 * get the text value of a node
-		 * @name get_text(obj)
-		 * @param  {mixed} obj the node
-		 * @return {String}
-		 */
-		get_text : function (obj) {
-			obj = this.get_node(obj);
-			return (!obj || obj.id === $.jstree.root) ? false : obj.text;
-		},
-		/**
-		 * set the text value of a node. Used internally, please use `rename_node(obj, val)`.
-		 * @private
-		 * @name set_text(obj, val)
-		 * @param  {mixed} obj the node, you can pass an array to set the text on multiple nodes
-		 * @param  {String} val the new text value
-		 * @return {Boolean}
-		 * @trigger set_text.jstree
-		 */
-		set_text : function (obj, val) {
-			var t1, t2;
-			if($.isArray(obj)) {
-				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-					this.set_text(obj[t1], val);
-				}
-				return true;
-			}
-			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) { return false; }
-			obj.text = val;
-			if(this.get_node(obj, true).length) {
-				this.redraw_node(obj.id);
-			}
-			/**
-			 * triggered when a node text value is changed
-			 * @event
-			 * @name set_text.jstree
-			 * @param {Object} obj
-			 * @param {String} text the new value
-			 */
-			this.trigger('set_text',{ "obj" : obj, "text" : val });
-			return true;
-		},
-		/**
-		 * gets a JSON representation of a node (or the whole tree)
-		 * @name get_json([obj, options])
-		 * @param  {mixed} obj
-		 * @param  {Object} options
-		 * @param  {Boolean} options.no_state do not return state information
-		 * @param  {Boolean} options.no_id do not return ID
-		 * @param  {Boolean} options.no_children do not include children
-		 * @param  {Boolean} options.no_data do not include node data
-		 * @param  {Boolean} options.flat return flat JSON instead of nested
-		 * @return {Object}
-		 */
-		get_json : function (obj, options, flat) {
-			obj = this.get_node(obj || $.jstree.root);
-			if(!obj) { return false; }
-			if(options && options.flat && !flat) { flat = []; }
-			var tmp = {
-				'id' : obj.id,
-				'text' : obj.text,
-				'icon' : this.get_icon(obj),
-				'li_attr' : $.extend(true, {}, obj.li_attr),
-				'a_attr' : $.extend(true, {}, obj.a_attr),
-				'state' : {},
-				'data' : options && options.no_data ? false : $.extend(true, {}, obj.data)
-				//( this.get_node(obj, true).length ? this.get_node(obj, true).data() : obj.data ),
-			}, i, j;
-			if(options && options.flat) {
-				tmp.parent = obj.parent;
-			}
-			else {
-				tmp.children = [];
-			}
-			if(!options || !options.no_state) {
-				for(i in obj.state) {
-					if(obj.state.hasOwnProperty(i)) {
-						tmp.state[i] = obj.state[i];
-					}
-				}
-			}
-			if(options && options.no_id) {
-				delete tmp.id;
-				if(tmp.li_attr && tmp.li_attr.id) {
-					delete tmp.li_attr.id;
-				}
-				if(tmp.a_attr && tmp.a_attr.id) {
-					delete tmp.a_attr.id;
-				}
-			}
-			if(options && options.flat && obj.id !== $.jstree.root) {
-				flat.push(tmp);
-			}
-			if(!options || !options.no_children) {
-				for(i = 0, j = obj.children.length; i < j; i++) {
-					if(options && options.flat) {
-						this.get_json(obj.children[i], options, flat);
-					}
-					else {
-						tmp.children.push(this.get_json(obj.children[i], options));
-					}
-				}
-			}
-			return options && options.flat ? flat : (obj.id === $.jstree.root ? tmp.children : tmp);
-		},
-		/**
-		 * create a new node (do not confuse with load_node)
-		 * @name create_node([obj, node, pos, callback, is_loaded])
-		 * @param  {mixed}   par       the parent node (to create a root node use either "#" (string) or `null`)
-		 * @param  {mixed}   node      the data for the new node (a valid JSON object, or a simple string with the name)
-		 * @param  {mixed}   pos       the index at which to insert the node, "first" and "last" are also supported, default is "last"
-		 * @param  {Function} callback a function to be called once the node is created
-		 * @param  {Boolean} is_loaded internal argument indicating if the parent node was succesfully loaded
-		 * @return {String}            the ID of the newly create node
-		 * @trigger model.jstree, create_node.jstree
-		 */
-		create_node : function (par, node, pos, callback, is_loaded) {
-			if(par === null) { par = $.jstree.root; }
-			par = this.get_node(par);
-			if(!par) { return false; }
-			pos = pos === undefined ? "last" : pos;
-			if(!pos.toString().match(/^(before|after)$/) && !is_loaded && !this.is_loaded(par)) {
-				return this.load_node(par, function () { this.create_node(par, node, pos, callback, true); });
-			}
-			if(!node) { node = { "text" : this.get_string('New node') }; }
-			if(typeof node === "string") { node = { "text" : node }; }
-			if(node.text === undefined) { node.text = this.get_string('New node'); }
-			var tmp, dpc, i, j;
-
-			if(par.id === $.jstree.root) {
-				if(pos === "before") { pos = "first"; }
-				if(pos === "after") { pos = "last"; }
-			}
-			switch(pos) {
-				case "before":
-					tmp = this.get_node(par.parent);
-					pos = $.inArray(par.id, tmp.children);
-					par = tmp;
-					break;
-				case "after" :
-					tmp = this.get_node(par.parent);
-					pos = $.inArray(par.id, tmp.children) + 1;
-					par = tmp;
-					break;
-				case "inside":
-				case "first":
-					pos = 0;
-					break;
-				case "last":
-					pos = par.children.length;
-					break;
-				default:
-					if(!pos) { pos = 0; }
-					break;
-			}
-			if(pos > par.children.length) { pos = par.children.length; }
-			if(!node.id) { node.id = true; }
-			if(!this.check("create_node", node, par, pos)) {
-				this.settings.core.error.call(this, this._data.core.last_error);
-				return false;
-			}
-			if(node.id === true) { delete node.id; }
-			node = this._parse_model_from_json(node, par.id, par.parents.concat());
-			if(!node) { return false; }
-			tmp = this.get_node(node);
-			dpc = [];
-			dpc.push(node);
-			dpc = dpc.concat(tmp.children_d);
-			this.trigger('model', { "nodes" : dpc, "parent" : par.id });
-
-			par.children_d = par.children_d.concat(dpc);
-			for(i = 0, j = par.parents.length; i < j; i++) {
-				this._model.data[par.parents[i]].children_d = this._model.data[par.parents[i]].children_d.concat(dpc);
-			}
-			node = tmp;
-			tmp = [];
-			for(i = 0, j = par.children.length; i < j; i++) {
-				tmp[i >= pos ? i+1 : i] = par.children[i];
-			}
-			tmp[pos] = node.id;
-			par.children = tmp;
-
-			this.redraw_node(par, true);
-			if(callback) { callback.call(this, this.get_node(node)); }
-			/**
-			 * triggered when a node is created
-			 * @event
-			 * @name create_node.jstree
-			 * @param {Object} node
-			 * @param {String} parent the parent's ID
-			 * @param {Number} position the position of the new node among the parent's children
-			 */
-			this.trigger('create_node', { "node" : this.get_node(node), "parent" : par.id, "position" : pos });
-			return node.id;
-		},
-		/**
-		 * set the text value of a node
-		 * @name rename_node(obj, val)
-		 * @param  {mixed} obj the node, you can pass an array to rename multiple nodes to the same name
-		 * @param  {String} val the new text value
-		 * @return {Boolean}
-		 * @trigger rename_node.jstree
-		 */
-		rename_node : function (obj, val) {
-			var t1, t2, old;
-			if($.isArray(obj)) {
-				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-					this.rename_node(obj[t1], val);
-				}
-				return true;
-			}
-			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) { return false; }
-			old = obj.text;
-			if(!this.check("rename_node", obj, this.get_parent(obj), val)) {
-				this.settings.core.error.call(this, this._data.core.last_error);
-				return false;
-			}
-			this.set_text(obj, val); // .apply(this, Array.prototype.slice.call(arguments))
-			/**
-			 * triggered when a node is renamed
-			 * @event
-			 * @name rename_node.jstree
-			 * @param {Object} node
-			 * @param {String} text the new value
-			 * @param {String} old the old value
-			 */
-			this.trigger('rename_node', { "node" : obj, "text" : val, "old" : old });
-			return true;
-		},
-		/**
-		 * remove a node
-		 * @name delete_node(obj)
-		 * @param  {mixed} obj the node, you can pass an array to delete multiple nodes
-		 * @return {Boolean}
-		 * @trigger delete_node.jstree, changed.jstree
-		 */
-		delete_node : function (obj) {
-			var t1, t2, par, pos, tmp, i, j, k, l, c, top, lft;
-			if($.isArray(obj)) {
-				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-					this.delete_node(obj[t1]);
-				}
-				return true;
-			}
-			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) { return false; }
-			par = this.get_node(obj.parent);
-			pos = $.inArray(obj.id, par.children);
-			c = false;
-			if(!this.check("delete_node", obj, par, pos)) {
-				this.settings.core.error.call(this, this._data.core.last_error);
-				return false;
-			}
-			if(pos !== -1) {
-				par.children = $.vakata.array_remove(par.children, pos);
-			}
-			tmp = obj.children_d.concat([]);
-			tmp.push(obj.id);
-			for(k = 0, l = tmp.length; k < l; k++) {
-				for(i = 0, j = obj.parents.length; i < j; i++) {
-					pos = $.inArray(tmp[k], this._model.data[obj.parents[i]].children_d);
-					if(pos !== -1) {
-						this._model.data[obj.parents[i]].children_d = $.vakata.array_remove(this._model.data[obj.parents[i]].children_d, pos);
-					}
-				}
-				if(this._model.data[tmp[k]].state.selected) {
-					c = true;
-					pos = $.inArray(tmp[k], this._data.core.selected);
-					if(pos !== -1) {
-						this._data.core.selected = $.vakata.array_remove(this._data.core.selected, pos);
-					}
-				}
-			}
-			/**
-			 * triggered when a node is deleted
-			 * @event
-			 * @name delete_node.jstree
-			 * @param {Object} node
-			 * @param {String} parent the parent's ID
-			 */
-			this.trigger('delete_node', { "node" : obj, "parent" : par.id });
-			if(c) {
-				this.trigger('changed', { 'action' : 'delete_node', 'node' : obj, 'selected' : this._data.core.selected, 'parent' : par.id });
-			}
-			for(k = 0, l = tmp.length; k < l; k++) {
-				delete this._model.data[tmp[k]];
-			}
-			if($.inArray(this._data.core.focused, tmp) !== -1) {
-				this._data.core.focused = null;
-				top = this.element[0].scrollTop;
-				lft = this.element[0].scrollLeft;
-				if(par.id === $.jstree.root) {
-					this.get_node(this._model.data[$.jstree.root].children[0], true).children('.jstree-anchor').focus();
-				}
-				else {
-					this.get_node(par, true).children('.jstree-anchor').focus();
-				}
-				this.element[0].scrollTop  = top;
-				this.element[0].scrollLeft = lft;
-			}
-			this.redraw_node(par, true);
-			return true;
-		},
-		/**
-		 * check if an operation is premitted on the tree. Used internally.
-		 * @private
-		 * @name check(chk, obj, par, pos)
-		 * @param  {String} chk the operation to check, can be "create_node", "rename_node", "delete_node", "copy_node" or "move_node"
-		 * @param  {mixed} obj the node
-		 * @param  {mixed} par the parent
-		 * @param  {mixed} pos the position to insert at, or if "rename_node" - the new name
-		 * @param  {mixed} more some various additional information, for example if a "move_node" operations is triggered by DND this will be the hovered node
-		 * @return {Boolean}
-		 */
-		check : function (chk, obj, par, pos, more) {
-			obj = obj && obj.id ? obj : this.get_node(obj);
-			par = par && par.id ? par : this.get_node(par);
-			var tmp = chk.match(/^move_node|copy_node|create_node$/i) ? par : obj,
-				chc = this.settings.core.check_callback;
-			if(chk === "move_node" || chk === "copy_node") {
-				if((!more || !more.is_multi) && (obj.id === par.id || $.inArray(obj.id, par.children) === pos || $.inArray(par.id, obj.children_d) !== -1)) {
-					this._data.core.last_error = { 'error' : 'check', 'plugin' : 'core', 'id' : 'core_01', 'reason' : 'Moving parent inside child', 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
-					return false;
-				}
-			}
-			if(tmp && tmp.data) { tmp = tmp.data; }
-			if(tmp && tmp.functions && (tmp.functions[chk] === false || tmp.functions[chk] === true)) {
-				if(tmp.functions[chk] === false) {
-					this._data.core.last_error = { 'error' : 'check', 'plugin' : 'core', 'id' : 'core_02', 'reason' : 'Node data prevents function: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
-				}
-				return tmp.functions[chk];
-			}
-			if(chc === false || ($.isFunction(chc) && chc.call(this, chk, obj, par, pos, more) === false) || (chc && chc[chk] === false)) {
-				this._data.core.last_error = { 'error' : 'check', 'plugin' : 'core', 'id' : 'core_03', 'reason' : 'User config for core.check_callback prevents function: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
-				return false;
-			}
-			return true;
-		},
-		/**
-		 * get the last error
-		 * @name last_error()
-		 * @return {Object}
-		 */
-		last_error : function () {
-			return this._data.core.last_error;
-		},
-		/**
-		 * move a node to a new parent
-		 * @name move_node(obj, par [, pos, callback, is_loaded])
-		 * @param  {mixed} obj the node to move, pass an array to move multiple nodes
-		 * @param  {mixed} par the new parent
-		 * @param  {mixed} pos the position to insert at (besides integer values, "first" and "last" are supported, as well as "before" and "after"), defaults to integer `0`
-		 * @param  {function} callback a function to call once the move is completed, receives 3 arguments - the node, the new parent and the position
-		 * @param  {Boolean} is_loaded internal parameter indicating if the parent node has been loaded
-		 * @param  {Boolean} skip_redraw internal parameter indicating if the tree should be redrawn
-		 * @param  {Boolean} instance internal parameter indicating if the node comes from another instance
-		 * @trigger move_node.jstree
-		 */
-		move_node : function (obj, par, pos, callback, is_loaded, skip_redraw, origin) {
-			var t1, t2, old_par, old_pos, new_par, old_ins, is_multi, dpc, tmp, i, j, k, l, p;
-
-			par = this.get_node(par);
-			pos = pos === undefined ? 0 : pos;
-			if(!par) { return false; }
-			if(!pos.toString().match(/^(before|after)$/) && !is_loaded && !this.is_loaded(par)) {
-				return this.load_node(par, function () { this.move_node(obj, par, pos, callback, true, false, origin); });
-			}
-
-			if($.isArray(obj)) {
-				if(obj.length === 1) {
-					obj = obj[0];
-				}
-				else {
-					//obj = obj.slice();
-					for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-						if((tmp = this.move_node(obj[t1], par, pos, callback, is_loaded, false, origin))) {
-							par = tmp;
-							pos = "after";
-						}
-					}
-					this.redraw();
-					return true;
-				}
-			}
-			obj = obj && obj.id ? obj : this.get_node(obj);
-
-			if(!obj || obj.id === $.jstree.root) { return false; }
-
-			old_par = (obj.parent || $.jstree.root).toString();
-			new_par = (!pos.toString().match(/^(before|after)$/) || par.id === $.jstree.root) ? par : this.get_node(par.parent);
-			old_ins = origin ? origin : (this._model.data[obj.id] ? this : $.jstree.reference(obj.id));
-			is_multi = !old_ins || !old_ins._id || (this._id !== old_ins._id);
-			old_pos = old_ins && old_ins._id && old_par && old_ins._model.data[old_par] && old_ins._model.data[old_par].children ? $.inArray(obj.id, old_ins._model.data[old_par].children) : -1;
-			if(old_ins && old_ins._id) {
-				obj = old_ins._model.data[obj.id];
-			}
-
-			if(is_multi) {
-				if((tmp = this.copy_node(obj, par, pos, callback, is_loaded, false, origin))) {
-					if(old_ins) { old_ins.delete_node(obj); }
-					return tmp;
-				}
-				return false;
-			}
-			//var m = this._model.data;
-			if(par.id === $.jstree.root) {
-				if(pos === "before") { pos = "first"; }
-				if(pos === "after") { pos = "last"; }
-			}
-			switch(pos) {
-				case "before":
-					pos = $.inArray(par.id, new_par.children);
-					break;
-				case "after" :
-					pos = $.inArray(par.id, new_par.children) + 1;
-					break;
-				case "inside":
-				case "first":
-					pos = 0;
-					break;
-				case "last":
-					pos = new_par.children.length;
-					break;
-				default:
-					if(!pos) { pos = 0; }
-					break;
-			}
-			if(pos > new_par.children.length) { pos = new_par.children.length; }
-			if(!this.check("move_node", obj, new_par, pos, { 'core' : true, 'origin' : origin, 'is_multi' : (old_ins && old_ins._id && old_ins._id !== this._id), 'is_foreign' : (!old_ins || !old_ins._id) })) {
-				this.settings.core.error.call(this, this._data.core.last_error);
-				return false;
-			}
-			if(obj.parent === new_par.id) {
-				dpc = new_par.children.concat();
-				tmp = $.inArray(obj.id, dpc);
-				if(tmp !== -1) {
-					dpc = $.vakata.array_remove(dpc, tmp);
-					if(pos > tmp) { pos--; }
-				}
-				tmp = [];
-				for(i = 0, j = dpc.length; i < j; i++) {
-					tmp[i >= pos ? i+1 : i] = dpc[i];
-				}
-				tmp[pos] = obj.id;
-				new_par.children = tmp;
-				this._node_changed(new_par.id);
-				this.redraw(new_par.id === $.jstree.root);
-			}
-			else {
-				// clean old parent and up
-				tmp = obj.children_d.concat();
-				tmp.push(obj.id);
-				for(i = 0, j = obj.parents.length; i < j; i++) {
-					dpc = [];
-					p = old_ins._model.data[obj.parents[i]].children_d;
-					for(k = 0, l = p.length; k < l; k++) {
-						if($.inArray(p[k], tmp) === -1) {
-							dpc.push(p[k]);
-						}
-					}
-					old_ins._model.data[obj.parents[i]].children_d = dpc;
-				}
-				old_ins._model.data[old_par].children = $.vakata.array_remove_item(old_ins._model.data[old_par].children, obj.id);
-
-				// insert into new parent and up
-				for(i = 0, j = new_par.parents.length; i < j; i++) {
-					this._model.data[new_par.parents[i]].children_d = this._model.data[new_par.parents[i]].children_d.concat(tmp);
-				}
-				dpc = [];
-				for(i = 0, j = new_par.children.length; i < j; i++) {
-					dpc[i >= pos ? i+1 : i] = new_par.children[i];
-				}
-				dpc[pos] = obj.id;
-				new_par.children = dpc;
-				new_par.children_d.push(obj.id);
-				new_par.children_d = new_par.children_d.concat(obj.children_d);
-
-				// update object
-				obj.parent = new_par.id;
-				tmp = new_par.parents.concat();
-				tmp.unshift(new_par.id);
-				p = obj.parents.length;
-				obj.parents = tmp;
-
-				// update object children
-				tmp = tmp.concat();
-				for(i = 0, j = obj.children_d.length; i < j; i++) {
-					this._model.data[obj.children_d[i]].parents = this._model.data[obj.children_d[i]].parents.slice(0,p*-1);
-					Array.prototype.push.apply(this._model.data[obj.children_d[i]].parents, tmp);
-				}
-
-				if(old_par === $.jstree.root || new_par.id === $.jstree.root) {
-					this._model.force_full_redraw = true;
-				}
-				if(!this._model.force_full_redraw) {
-					this._node_changed(old_par);
-					this._node_changed(new_par.id);
-				}
-				if(!skip_redraw) {
-					this.redraw();
-				}
-			}
-			if(callback) { callback.call(this, obj, new_par, pos); }
-			/**
-			 * triggered when a node is moved
-			 * @event
-			 * @name move_node.jstree
-			 * @param {Object} node
-			 * @param {String} parent the parent's ID
-			 * @param {Number} position the position of the node among the parent's children
-			 * @param {String} old_parent the old parent of the node
-			 * @param {Number} old_position the old position of the node
-			 * @param {Boolean} is_multi do the node and new parent belong to different instances
-			 * @param {jsTree} old_instance the instance the node came from
-			 * @param {jsTree} new_instance the instance of the new parent
-			 */
-			this.trigger('move_node', { "node" : obj, "parent" : new_par.id, "position" : pos, "old_parent" : old_par, "old_position" : old_pos, 'is_multi' : (old_ins && old_ins._id && old_ins._id !== this._id), 'is_foreign' : (!old_ins || !old_ins._id), 'old_instance' : old_ins, 'new_instance' : this });
-			return obj.id;
-		},
-		/**
-		 * copy a node to a new parent
-		 * @name copy_node(obj, par [, pos, callback, is_loaded])
-		 * @param  {mixed} obj the node to copy, pass an array to copy multiple nodes
-		 * @param  {mixed} par the new parent
-		 * @param  {mixed} pos the position to insert at (besides integer values, "first" and "last" are supported, as well as "before" and "after"), defaults to integer `0`
-		 * @param  {function} callback a function to call once the move is completed, receives 3 arguments - the node, the new parent and the position
-		 * @param  {Boolean} is_loaded internal parameter indicating if the parent node has been loaded
-		 * @param  {Boolean} skip_redraw internal parameter indicating if the tree should be redrawn
-		 * @param  {Boolean} instance internal parameter indicating if the node comes from another instance
-		 * @trigger model.jstree copy_node.jstree
-		 */
-		copy_node : function (obj, par, pos, callback, is_loaded, skip_redraw, origin) {
-			var t1, t2, dpc, tmp, i, j, node, old_par, new_par, old_ins, is_multi;
-
-			par = this.get_node(par);
-			pos = pos === undefined ? 0 : pos;
-			if(!par) { return false; }
-			if(!pos.toString().match(/^(before|after)$/) && !is_loaded && !this.is_loaded(par)) {
-				return this.load_node(par, function () { this.copy_node(obj, par, pos, callback, true, false, origin); });
-			}
-
-			if($.isArray(obj)) {
-				if(obj.length === 1) {
-					obj = obj[0];
-				}
-				else {
-					//obj = obj.slice();
-					for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-						if((tmp = this.copy_node(obj[t1], par, pos, callback, is_loaded, true, origin))) {
-							par = tmp;
-							pos = "after";
-						}
-					}
-					this.redraw();
-					return true;
-				}
-			}
-			obj = obj && obj.id ? obj : this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) { return false; }
-
-			old_par = (obj.parent || $.jstree.root).toString();
-			new_par = (!pos.toString().match(/^(before|after)$/) || par.id === $.jstree.root) ? par : this.get_node(par.parent);
-			old_ins = origin ? origin : (this._model.data[obj.id] ? this : $.jstree.reference(obj.id));
-			is_multi = !old_ins || !old_ins._id || (this._id !== old_ins._id);
-
-			if(old_ins && old_ins._id) {
-				obj = old_ins._model.data[obj.id];
-			}
-
-			if(par.id === $.jstree.root) {
-				if(pos === "before") { pos = "first"; }
-				if(pos === "after") { pos = "last"; }
-			}
-			switch(pos) {
-				case "before":
-					pos = $.inArray(par.id, new_par.children);
-					break;
-				case "after" :
-					pos = $.inArray(par.id, new_par.children) + 1;
-					break;
-				case "inside":
-				case "first":
-					pos = 0;
-					break;
-				case "last":
-					pos = new_par.children.length;
-					break;
-				default:
-					if(!pos) { pos = 0; }
-					break;
-			}
-			if(pos > new_par.children.length) { pos = new_par.children.length; }
-			if(!this.check("copy_node", obj, new_par, pos, { 'core' : true, 'origin' : origin, 'is_multi' : (old_ins && old_ins._id && old_ins._id !== this._id), 'is_foreign' : (!old_ins || !old_ins._id) })) {
-				this.settings.core.error.call(this, this._data.core.last_error);
-				return false;
-			}
-			node = old_ins ? old_ins.get_json(obj, { no_id : true, no_data : true, no_state : true }) : obj;
-			if(!node) { return false; }
-			if(node.id === true) { delete node.id; }
-			node = this._parse_model_from_json(node, new_par.id, new_par.parents.concat());
-			if(!node) { return false; }
-			tmp = this.get_node(node);
-			if(obj && obj.state && obj.state.loaded === false) { tmp.state.loaded = false; }
-			dpc = [];
-			dpc.push(node);
-			dpc = dpc.concat(tmp.children_d);
-			this.trigger('model', { "nodes" : dpc, "parent" : new_par.id });
-
-			// insert into new parent and up
-			for(i = 0, j = new_par.parents.length; i < j; i++) {
-				this._model.data[new_par.parents[i]].children_d = this._model.data[new_par.parents[i]].children_d.concat(dpc);
-			}
-			dpc = [];
-			for(i = 0, j = new_par.children.length; i < j; i++) {
-				dpc[i >= pos ? i+1 : i] = new_par.children[i];
-			}
-			dpc[pos] = tmp.id;
-			new_par.children = dpc;
-			new_par.children_d.push(tmp.id);
-			new_par.children_d = new_par.children_d.concat(tmp.children_d);
-
-			if(new_par.id === $.jstree.root) {
-				this._model.force_full_redraw = true;
-			}
-			if(!this._model.force_full_redraw) {
-				this._node_changed(new_par.id);
-			}
-			if(!skip_redraw) {
-				this.redraw(new_par.id === $.jstree.root);
-			}
-			if(callback) { callback.call(this, tmp, new_par, pos); }
-			/**
-			 * triggered when a node is copied
-			 * @event
-			 * @name copy_node.jstree
-			 * @param {Object} node the copied node
-			 * @param {Object} original the original node
-			 * @param {String} parent the parent's ID
-			 * @param {Number} position the position of the node among the parent's children
-			 * @param {String} old_parent the old parent of the node
-			 * @param {Number} old_position the position of the original node
-			 * @param {Boolean} is_multi do the node and new parent belong to different instances
-			 * @param {jsTree} old_instance the instance the node came from
-			 * @param {jsTree} new_instance the instance of the new parent
-			 */
-			this.trigger('copy_node', { "node" : tmp, "original" : obj, "parent" : new_par.id, "position" : pos, "old_parent" : old_par, "old_position" : old_ins && old_ins._id && old_par && old_ins._model.data[old_par] && old_ins._model.data[old_par].children ? $.inArray(obj.id, old_ins._model.data[old_par].children) : -1,'is_multi' : (old_ins && old_ins._id && old_ins._id !== this._id), 'is_foreign' : (!old_ins || !old_ins._id), 'old_instance' : old_ins, 'new_instance' : this });
-			return tmp.id;
-		},
-		/**
-		 * cut a node (a later call to `paste(obj)` would move the node)
-		 * @name cut(obj)
-		 * @param  {mixed} obj multiple objects can be passed using an array
-		 * @trigger cut.jstree
-		 */
-		cut : function (obj) {
-			if(!obj) { obj = this._data.core.selected.concat(); }
-			if(!$.isArray(obj)) { obj = [obj]; }
-			if(!obj.length) { return false; }
-			var tmp = [], o, t1, t2;
-			for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-				o = this.get_node(obj[t1]);
-				if(o && o.id && o.id !== $.jstree.root) { tmp.push(o); }
-			}
-			if(!tmp.length) { return false; }
-			ccp_node = tmp;
-			ccp_inst = this;
-			ccp_mode = 'move_node';
-			/**
-			 * triggered when nodes are added to the buffer for moving
-			 * @event
-			 * @name cut.jstree
-			 * @param {Array} node
-			 */
-			this.trigger('cut', { "node" : obj });
-		},
-		/**
-		 * copy a node (a later call to `paste(obj)` would copy the node)
-		 * @name copy(obj)
-		 * @param  {mixed} obj multiple objects can be passed using an array
-		 * @trigger copy.jstree
-		 */
-		copy : function (obj) {
-			if(!obj) { obj = this._data.core.selected.concat(); }
-			if(!$.isArray(obj)) { obj = [obj]; }
-			if(!obj.length) { return false; }
-			var tmp = [], o, t1, t2;
-			for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-				o = this.get_node(obj[t1]);
-				if(o && o.id && o.id !== $.jstree.root) { tmp.push(o); }
-			}
-			if(!tmp.length) { return false; }
-			ccp_node = tmp;
-			ccp_inst = this;
-			ccp_mode = 'copy_node';
-			/**
-			 * triggered when nodes are added to the buffer for copying
-			 * @event
-			 * @name copy.jstree
-			 * @param {Array} node
-			 */
-			this.trigger('copy', { "node" : obj });
-		},
-		/**
-		 * get the current buffer (any nodes that are waiting for a paste operation)
-		 * @name get_buffer()
-		 * @return {Object} an object consisting of `mode` ("copy_node" or "move_node"), `node` (an array of objects) and `inst` (the instance)
-		 */
-		get_buffer : function () {
-			return { 'mode' : ccp_mode, 'node' : ccp_node, 'inst' : ccp_inst };
-		},
-		/**
-		 * check if there is something in the buffer to paste
-		 * @name can_paste()
-		 * @return {Boolean}
-		 */
-		can_paste : function () {
-			return ccp_mode !== false && ccp_node !== false; // && ccp_inst._model.data[ccp_node];
-		},
-		/**
-		 * copy or move the previously cut or copied nodes to a new parent
-		 * @name paste(obj [, pos])
-		 * @param  {mixed} obj the new parent
-		 * @param  {mixed} pos the position to insert at (besides integer, "first" and "last" are supported), defaults to integer `0`
-		 * @trigger paste.jstree
-		 */
-		paste : function (obj, pos) {
-			obj = this.get_node(obj);
-			if(!obj || !ccp_mode || !ccp_mode.match(/^(copy_node|move_node)$/) || !ccp_node) { return false; }
-			if(this[ccp_mode](ccp_node, obj, pos, false, false, false, ccp_inst)) {
-				/**
-				 * triggered when paste is invoked
-				 * @event
-				 * @name paste.jstree
-				 * @param {String} parent the ID of the receiving node
-				 * @param {Array} node the nodes in the buffer
-				 * @param {String} mode the performed operation - "copy_node" or "move_node"
-				 */
-				this.trigger('paste', { "parent" : obj.id, "node" : ccp_node, "mode" : ccp_mode });
-			}
-			ccp_node = false;
-			ccp_mode = false;
-			ccp_inst = false;
-		},
-		/**
-		 * clear the buffer of previously copied or cut nodes
-		 * @name clear_buffer()
-		 * @trigger clear_buffer.jstree
-		 */
-		clear_buffer : function () {
-			ccp_node = false;
-			ccp_mode = false;
-			ccp_inst = false;
-			/**
-			 * triggered when the copy / cut buffer is cleared
-			 * @event
-			 * @name clear_buffer.jstree
-			 */
-			this.trigger('clear_buffer');
-		},
-		/**
-		 * put a node in edit mode (input field to rename the node)
-		 * @name edit(obj [, default_text, callback])
-		 * @param  {mixed} obj
-		 * @param  {String} default_text the text to populate the input with (if omitted or set to a non-string value the node's text value is used)
-		 * @param  {Function} callback a function to be called once the text box is blurred, it is called in the instance's scope and receives the node, a status parameter (true if the rename is successful, false otherwise) and a boolean indicating if the user cancelled the edit. You can access the node's title using .text
-		 */
-		edit : function (obj, default_text, callback) {
-			var rtl, w, a, s, t, h1, h2, fn, tmp, cancel = false;
-			obj = this.get_node(obj);
-			if(!obj) { return false; }
-			if(this.settings.core.check_callback === false) {
-				this._data.core.last_error = { 'error' : 'check', 'plugin' : 'core', 'id' : 'core_07', 'reason' : 'Could not edit node because of check_callback' };
-				this.settings.core.error.call(this, this._data.core.last_error);
-				return false;
-			}
-			tmp = obj;
-			default_text = typeof default_text === 'string' ? default_text : obj.text;
-			this.set_text(obj, "");
-			obj = this._open_to(obj);
-			tmp.text = default_text;
-
-			rtl = this._data.core.rtl;
-			w  = this.element.width();
-			this._data.core.focused = tmp.id;
-			a  = obj.children('.jstree-anchor').focus();
-			s  = $('<span>');
-			/*!
-			oi = obj.children("i:visible"),
-			ai = a.children("i:visible"),
-			w1 = oi.width() * oi.length,
-			w2 = ai.width() * ai.length,
-			*/
-			t  = default_text;
-			h1 = $("<"+"div />", { css : { "position" : "absolute", "top" : "-200px", "left" : (rtl ? "0px" : "-1000px"), "visibility" : "hidden" } }).appendTo("body");
-			h2 = $("<"+"input />", {
-						"value" : t,
-						"class" : "jstree-rename-input",
-						// "size" : t.length,
-						"css" : {
-							"padding" : "0",
-							"border" : "1px solid silver",
-							"box-sizing" : "border-box",
-							"display" : "inline-block",
-							"height" : (this._data.core.li_height) + "px",
-							"lineHeight" : (this._data.core.li_height) + "px",
-							"width" : "150px" // will be set a bit further down
-						},
-						"blur" : $.proxy(function (e) {
-							e.stopImmediatePropagation();
-							e.preventDefault();
-							var i = s.children(".jstree-rename-input"),
-								v = i.val(),
-								f = this.settings.core.force_text,
-								nv;
-							if(v === "") { v = t; }
-							h1.remove();
-							s.replaceWith(a);
-							s.remove();
-							t = f ? t : $('<div></div>').append($.parseHTML(t)).html();
-							this.set_text(obj, t);
-							nv = !!this.rename_node(obj, f ? $('<div></div>').text(v).text() : $('<div></div>').append($.parseHTML(v)).html());
-							if(!nv) {
-								this.set_text(obj, t); // move this up? and fix #483
-							}
-							this._data.core.focused = tmp.id;
-							setTimeout($.proxy(function () {
-								var node = this.get_node(tmp.id, true);
-								if(node.length) {
-									this._data.core.focused = tmp.id;
-									node.children('.jstree-anchor').focus();
-								}
-							}, this), 0);
-							if(callback) {
-								callback.call(this, tmp, nv, cancel);
-							}
-						}, this),
-						"keydown" : function (e) {
-							var key = e.which;
-							if(key === 27) {
-								cancel = true;
-								this.value = t;
-							}
-							if(key === 27 || key === 13 || key === 37 || key === 38 || key === 39 || key === 40 || key === 32) {
-								e.stopImmediatePropagation();
-							}
-							if(key === 27 || key === 13) {
-								e.preventDefault();
-								this.blur();
-							}
-						},
-						"click" : function (e) { e.stopImmediatePropagation(); },
-						"mousedown" : function (e) { e.stopImmediatePropagation(); },
-						"keyup" : function (e) {
-							h2.width(Math.min(h1.text("pW" + this.value).width(),w));
-						},
-						"keypress" : function(e) {
-							if(e.which === 13) { return false; }
-						}
-					});
-				fn = {
-						fontFamily		: a.css('fontFamily')		|| '',
-						fontSize		: a.css('fontSize')			|| '',
-						fontWeight		: a.css('fontWeight')		|| '',
-						fontStyle		: a.css('fontStyle')		|| '',
-						fontStretch		: a.css('fontStretch')		|| '',
-						fontVariant		: a.css('fontVariant')		|| '',
-						letterSpacing	: a.css('letterSpacing')	|| '',
-						wordSpacing		: a.css('wordSpacing')		|| ''
-				};
-			s.attr('class', a.attr('class')).append(a.contents().clone()).append(h2);
-			a.replaceWith(s);
-			h1.css(fn);
-			h2.css(fn).width(Math.min(h1.text("pW" + h2[0].value).width(),w))[0].select();
-		},
-
-
-		/**
-		 * changes the theme
-		 * @name set_theme(theme_name [, theme_url])
-		 * @param {String} theme_name the name of the new theme to apply
-		 * @param {mixed} theme_url  the location of the CSS file for this theme. Omit or set to `false` if you manually included the file. Set to `true` to autoload from the `core.themes.dir` directory.
-		 * @trigger set_theme.jstree
-		 */
-		set_theme : function (theme_name, theme_url) {
-			if(!theme_name) { return false; }
-			if(theme_url === true) {
-				var dir = this.settings.core.themes.dir;
-				if(!dir) { dir = $.jstree.path + '/themes'; }
-				theme_url = dir + '/' + theme_name + '/style.css';
-			}
-			if(theme_url && $.inArray(theme_url, themes_loaded) === -1) {
-				$('head').append('<'+'link rel="stylesheet" href="' + theme_url + '" type="text/css" />');
-				themes_loaded.push(theme_url);
-			}
-			if(this._data.core.themes.name) {
-				this.element.removeClass('jstree-' + this._data.core.themes.name);
-			}
-			this._data.core.themes.name = theme_name;
-			this.element.addClass('jstree-' + theme_name);
-			this.element[this.settings.core.themes.responsive ? 'addClass' : 'removeClass' ]('jstree-' + theme_name + '-responsive');
-			/**
-			 * triggered when a theme is set
-			 * @event
-			 * @name set_theme.jstree
-			 * @param {String} theme the new theme
-			 */
-			this.trigger('set_theme', { 'theme' : theme_name });
-		},
-		/**
-		 * gets the name of the currently applied theme name
-		 * @name get_theme()
-		 * @return {String}
-		 */
-		get_theme : function () { return this._data.core.themes.name; },
-		/**
-		 * changes the theme variant (if the theme has variants)
-		 * @name set_theme_variant(variant_name)
-		 * @param {String|Boolean} variant_name the variant to apply (if `false` is used the current variant is removed)
-		 */
-		set_theme_variant : function (variant_name) {
-			if(this._data.core.themes.variant) {
-				this.element.removeClass('jstree-' + this._data.core.themes.name + '-' + this._data.core.themes.variant);
-			}
-			this._data.core.themes.variant = variant_name;
-			if(variant_name) {
-				this.element.addClass('jstree-' + this._data.core.themes.name + '-' + this._data.core.themes.variant);
-			}
-		},
-		/**
-		 * gets the name of the currently applied theme variant
-		 * @name get_theme()
-		 * @return {String}
-		 */
-		get_theme_variant : function () { return this._data.core.themes.variant; },
-		/**
-		 * shows a striped background on the container (if the theme supports it)
-		 * @name show_stripes()
-		 */
-		show_stripes : function () { this._data.core.themes.stripes = true; this.get_container_ul().addClass("jstree-striped"); },
-		/**
-		 * hides the striped background on the container
-		 * @name hide_stripes()
-		 */
-		hide_stripes : function () { this._data.core.themes.stripes = false; this.get_container_ul().removeClass("jstree-striped"); },
-		/**
-		 * toggles the striped background on the container
-		 * @name toggle_stripes()
-		 */
-		toggle_stripes : function () { if(this._data.core.themes.stripes) { this.hide_stripes(); } else { this.show_stripes(); } },
-		/**
-		 * shows the connecting dots (if the theme supports it)
-		 * @name show_dots()
-		 */
-		show_dots : function () { this._data.core.themes.dots = true; this.get_container_ul().removeClass("jstree-no-dots"); },
-		/**
-		 * hides the connecting dots
-		 * @name hide_dots()
-		 */
-		hide_dots : function () { this._data.core.themes.dots = false; this.get_container_ul().addClass("jstree-no-dots"); },
-		/**
-		 * toggles the connecting dots
-		 * @name toggle_dots()
-		 */
-		toggle_dots : function () { if(this._data.core.themes.dots) { this.hide_dots(); } else { this.show_dots(); } },
-		/**
-		 * show the node icons
-		 * @name show_icons()
-		 */
-		show_icons : function () { this._data.core.themes.icons = true; this.get_container_ul().removeClass("jstree-no-icons"); },
-		/**
-		 * hide the node icons
-		 * @name hide_icons()
-		 */
-		hide_icons : function () { this._data.core.themes.icons = false; this.get_container_ul().addClass("jstree-no-icons"); },
-		/**
-		 * toggle the node icons
-		 * @name toggle_icons()
-		 */
-		toggle_icons : function () { if(this._data.core.themes.icons) { this.hide_icons(); } else { this.show_icons(); } },
-		/**
-		 * set the node icon for a node
-		 * @name set_icon(obj, icon)
-		 * @param {mixed} obj
-		 * @param {String} icon the new icon - can be a path to an icon or a className, if using an image that is in the current directory use a `./` prefix, otherwise it will be detected as a class
-		 */
-		set_icon : function (obj, icon) {
-			var t1, t2, dom, old;
-			if($.isArray(obj)) {
-				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-					this.set_icon(obj[t1], icon);
-				}
-				return true;
-			}
-			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) { return false; }
-			old = obj.icon;
-			obj.icon = icon === true || icon === null || icon === undefined || icon === '' ? true : icon;
-			dom = this.get_node(obj, true).children(".jstree-anchor").children(".jstree-themeicon");
-			if(icon === false) {
-				this.hide_icon(obj);
-			}
-			else if(icon === true || icon === null || icon === undefined || icon === '') {
-				dom.removeClass('jstree-themeicon-custom ' + old).css("background","").removeAttr("rel");
-				if(old === false) { this.show_icon(obj); }
-			}
-			else if(icon.indexOf("/") === -1 && icon.indexOf(".") === -1) {
-				dom.removeClass(old).css("background","");
-				dom.addClass(icon + ' jstree-themeicon-custom').attr("rel",icon);
-				if(old === false) { this.show_icon(obj); }
-			}
-			else {
-				dom.removeClass(old).css("background","");
-				dom.addClass('jstree-themeicon-custom').css("background", "url('" + icon + "') center center no-repeat").attr("rel",icon);
-				if(old === false) { this.show_icon(obj); }
-			}
-			return true;
-		},
-		/**
-		 * get the node icon for a node
-		 * @name get_icon(obj)
-		 * @param {mixed} obj
-		 * @return {String}
-		 */
-		get_icon : function (obj) {
-			obj = this.get_node(obj);
-			return (!obj || obj.id === $.jstree.root) ? false : obj.icon;
-		},
-		/**
-		 * hide the icon on an individual node
-		 * @name hide_icon(obj)
-		 * @param {mixed} obj
-		 */
-		hide_icon : function (obj) {
-			var t1, t2;
-			if($.isArray(obj)) {
-				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-					this.hide_icon(obj[t1]);
-				}
-				return true;
-			}
-			obj = this.get_node(obj);
-			if(!obj || obj === $.jstree.root) { return false; }
-			obj.icon = false;
-			this.get_node(obj, true).children(".jstree-anchor").children(".jstree-themeicon").addClass('jstree-themeicon-hidden');
-			return true;
-		},
-		/**
-		 * show the icon on an individual node
-		 * @name show_icon(obj)
-		 * @param {mixed} obj
-		 */
-		show_icon : function (obj) {
-			var t1, t2, dom;
-			if($.isArray(obj)) {
-				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-					this.show_icon(obj[t1]);
-				}
-				return true;
-			}
-			obj = this.get_node(obj);
-			if(!obj || obj === $.jstree.root) { return false; }
-			dom = this.get_node(obj, true);
-			obj.icon = dom.length ? dom.children(".jstree-anchor").children(".jstree-themeicon").attr('rel') : true;
-			if(!obj.icon) { obj.icon = true; }
-			dom.children(".jstree-anchor").children(".jstree-themeicon").removeClass('jstree-themeicon-hidden');
-			return true;
-		}
-	};
-
-	// helpers
-	$.vakata = {};
-	// collect attributes
-	$.vakata.attributes = function(node, with_values) {
-		node = $(node)[0];
-		var attr = with_values ? {} : [];
-		if(node && node.attributes) {
-			$.each(node.attributes, function (i, v) {
-				if($.inArray(v.name.toLowerCase(),['style','contenteditable','hasfocus','tabindex']) !== -1) { return; }
-				if(v.value !== null && $.trim(v.value) !== '') {
-					if(with_values) { attr[v.name] = v.value; }
-					else { attr.push(v.name); }
-				}
-			});
-		}
-		return attr;
-	};
-	$.vakata.array_unique = function(array) {
-		var a = [], i, j, l, o = {};
-		for(i = 0, l = array.length; i < l; i++) {
-			if(o[array[i]] === undefined) {
-				a.push(array[i]);
-				o[array[i]] = true;
-			}
-		}
-		return a;
-	};
-	// remove item from array
-	$.vakata.array_remove = function(array, from, to) {
-		var rest = array.slice((to || from) + 1 || array.length);
-		array.length = from < 0 ? array.length + from : from;
-		array.push.apply(array, rest);
-		return array;
-	};
-	// remove item from array
-	$.vakata.array_remove_item = function(array, item) {
-		var tmp = $.inArray(item, array);
-		return tmp !== -1 ? $.vakata.array_remove(array, tmp) : array;
-	};
-
-
-/**
- * ### Changed plugin
- *
- * This plugin adds more information to the `changed.jstree` event. The new data is contained in the `changed` event data property, and contains a lists of `selected` and `deselected` nodes.
- */
-
-	$.jstree.plugins.changed = function (options, parent) {
-		var last = [];
-		this.trigger = function (ev, data) {
-			var i, j;
-			if(!data) {
-				data = {};
-			}
-			if(ev.replace('.jstree','') === 'changed') {
-				data.changed = { selected : [], deselected : [] };
-				var tmp = {};
-				for(i = 0, j = last.length; i < j; i++) {
-					tmp[last[i]] = 1;
-				}
-				for(i = 0, j = data.selected.length; i < j; i++) {
-					if(!tmp[data.selected[i]]) {
-						data.changed.selected.push(data.selected[i]);
-					}
-					else {
-						tmp[data.selected[i]] = 2;
-					}
-				}
-				for(i = 0, j = last.length; i < j; i++) {
-					if(tmp[last[i]] === 1) {
-						data.changed.deselected.push(last[i]);
-					}
-				}
-				last = data.selected.slice();
-			}
-			/**
-			 * triggered when selection changes (the "changed" plugin enhances the original event with more data)
-			 * @event
-			 * @name changed.jstree
-			 * @param {Object} node
-			 * @param {Object} action the action that caused the selection to change
-			 * @param {Array} selected the current selection
-			 * @param {Object} changed an object containing two properties `selected` and `deselected` - both arrays of node IDs, which were selected or deselected since the last changed event
-			 * @param {Object} event the event (if any) that triggered this changed event
-			 * @plugin changed
-			 */
-			parent.trigger.call(this, ev, data);
-		};
-		this.refresh = function (skip_loading, forget_state) {
-			last = [];
-			return parent.refresh.apply(this, arguments);
-		};
-	};
-
-/**
- * ### Checkbox plugin
- *
- * This plugin renders checkbox icons in front of each node, making multiple selection much easier.
- * It also supports tri-state behavior, meaning that if a node has a few of its children checked it will be rendered as undetermined, and state will be propagated up.
- */
-
-	var _i = document.createElement('I');
-	_i.className = 'jstree-icon jstree-checkbox';
-	_i.setAttribute('role', 'presentation');
-	/**
-	 * stores all defaults for the checkbox plugin
-	 * @name $.jstree.defaults.checkbox
-	 * @plugin checkbox
-	 */
-	$.jstree.defaults.checkbox = {
-		/**
-		 * a boolean indicating if checkboxes should be visible (can be changed at a later time using `show_checkboxes()` and `hide_checkboxes`). Defaults to `true`.
-		 * @name $.jstree.defaults.checkbox.visible
-		 * @plugin checkbox
-		 */
-		visible				: true,
-		/**
-		 * a boolean indicating if checkboxes should cascade down and have an undetermined state. Defaults to `true`.
-		 * @name $.jstree.defaults.checkbox.three_state
-		 * @plugin checkbox
-		 */
-		three_state			: true,
-		/**
-		 * a boolean indicating if clicking anywhere on the node should act as clicking on the checkbox. Defaults to `true`.
-		 * @name $.jstree.defaults.checkbox.whole_node
-		 * @plugin checkbox
-		 */
-		whole_node			: true,
-		/**
-		 * a boolean indicating if the selected style of a node should be kept, or removed. Defaults to `true`.
-		 * @name $.jstree.defaults.checkbox.keep_selected_style
-		 * @plugin checkbox
-		 */
-		keep_selected_style	: true,
-		/**
-		 * This setting controls how cascading and undetermined nodes are applied.
-		 * If 'up' is in the string - cascading up is enabled, if 'down' is in the string - cascading down is enabled, if 'undetermined' is in the string - undetermined nodes will be used.
-		 * If `three_state` is set to `true` this setting is automatically set to 'up+down+undetermined'. Defaults to ''.
-		 * @name $.jstree.defaults.checkbox.cascade
-		 * @plugin checkbox
-		 */
-		cascade				: '',
-		/**
-		 * This setting controls if checkbox are bound to the general tree selection or to an internal array maintained by the checkbox plugin. Defaults to `true`, only set to `false` if you know exactly what you are doing.
-		 * @name $.jstree.defaults.checkbox.tie_selection
-		 * @plugin checkbox
-		 */
-		tie_selection		: true
-	};
-	$.jstree.plugins.checkbox = function (options, parent) {
-		this.bind = function () {
-			parent.bind.call(this);
-			this._data.checkbox.uto = false;
-			this._data.checkbox.selected = [];
-			if(this.settings.checkbox.three_state) {
-				this.settings.checkbox.cascade = 'up+down+undetermined';
-			}
-			this.element
-				.on("init.jstree", $.proxy(function () {
-						this._data.checkbox.visible = this.settings.checkbox.visible;
-						if(!this.settings.checkbox.keep_selected_style) {
-							this.element.addClass('jstree-checkbox-no-clicked');
-						}
-						if(this.settings.checkbox.tie_selection) {
-							this.element.addClass('jstree-checkbox-selection');
-						}
-					}, this))
-				.on("loading.jstree", $.proxy(function () {
-						this[ this._data.checkbox.visible ? 'show_checkboxes' : 'hide_checkboxes' ]();
-					}, this));
-			if(this.settings.checkbox.cascade.indexOf('undetermined') !== -1) {
-				this.element
-					.on('changed.jstree uncheck_node.jstree check_node.jstree uncheck_all.jstree check_all.jstree move_node.jstree copy_node.jstree redraw.jstree open_node.jstree', $.proxy(function () {
-							// only if undetermined is in setting
-							if(this._data.checkbox.uto) { clearTimeout(this._data.checkbox.uto); }
-							this._data.checkbox.uto = setTimeout($.proxy(this._undetermined, this), 50);
-						}, this));
-			}
-			if(!this.settings.checkbox.tie_selection) {
-				this.element
-					.on('model.jstree', $.proxy(function (e, data) {
-						var m = this._model.data,
-							p = m[data.parent],
-							dpc = data.nodes,
-							i, j;
-						for(i = 0, j = dpc.length; i < j; i++) {
-							m[dpc[i]].state.checked = m[dpc[i]].state.checked || (m[dpc[i]].original && m[dpc[i]].original.state && m[dpc[i]].original.state.checked);
-							if(m[dpc[i]].state.checked) {
-								this._data.checkbox.selected.push(dpc[i]);
-							}
-						}
-					}, this));
-			}
-			if(this.settings.checkbox.cascade.indexOf('up') !== -1 || this.settings.checkbox.cascade.indexOf('down') !== -1) {
-				this.element
-					.on('model.jstree', $.proxy(function (e, data) {
-							var m = this._model.data,
-								p = m[data.parent],
-								dpc = data.nodes,
-								chd = [],
-								c, i, j, k, l, tmp, s = this.settings.checkbox.cascade, t = this.settings.checkbox.tie_selection;
-
-							if(s.indexOf('down') !== -1) {
-								// apply down
-								if(p.state[ t ? 'selected' : 'checked' ]) {
-									for(i = 0, j = dpc.length; i < j; i++) {
-										m[dpc[i]].state[ t ? 'selected' : 'checked' ] = true;
-									}
-									this._data[ t ? 'core' : 'checkbox' ].selected = this._data[ t ? 'core' : 'checkbox' ].selected.concat(dpc);
-								}
-								else {
-									for(i = 0, j = dpc.length; i < j; i++) {
-										if(m[dpc[i]].state[ t ? 'selected' : 'checked' ]) {
-											for(k = 0, l = m[dpc[i]].children_d.length; k < l; k++) {
-												m[m[dpc[i]].children_d[k]].state[ t ? 'selected' : 'checked' ] = true;
-											}
-											this._data[ t ? 'core' : 'checkbox' ].selected = this._data[ t ? 'core' : 'checkbox' ].selected.concat(m[dpc[i]].children_d);
-										}
-									}
-								}
-							}
-
-							if(s.indexOf('up') !== -1) {
-								// apply up
-								for(i = 0, j = p.children_d.length; i < j; i++) {
-									if(!m[p.children_d[i]].children.length) {
-										chd.push(m[p.children_d[i]].parent);
-									}
-								}
-								chd = $.vakata.array_unique(chd);
-								for(k = 0, l = chd.length; k < l; k++) {
-									p = m[chd[k]];
-									while(p && p.id !== $.jstree.root) {
-										c = 0;
-										for(i = 0, j = p.children.length; i < j; i++) {
-											c += m[p.children[i]].state[ t ? 'selected' : 'checked' ];
-										}
-										if(c === j) {
-											p.state[ t ? 'selected' : 'checked' ] = true;
-											this._data[ t ? 'core' : 'checkbox' ].selected.push(p.id);
-											tmp = this.get_node(p, true);
-											if(tmp && tmp.length) {
-												tmp.attr('aria-selected', true).children('.jstree-anchor').addClass( t ? 'jstree-clicked' : 'jstree-checked');
-											}
-										}
-										else {
-											break;
-										}
-										p = this.get_node(p.parent);
-									}
-								}
-							}
-
-							this._data[ t ? 'core' : 'checkbox' ].selected = $.vakata.array_unique(this._data[ t ? 'core' : 'checkbox' ].selected);
-						}, this))
-					.on(this.settings.checkbox.tie_selection ? 'select_node.jstree' : 'check_node.jstree', $.proxy(function (e, data) {
-							var obj = data.node,
-								m = this._model.data,
-								par = this.get_node(obj.parent),
-								dom = this.get_node(obj, true),
-								i, j, c, tmp, s = this.settings.checkbox.cascade, t = this.settings.checkbox.tie_selection;
-
-							// apply down
-							if(s.indexOf('down') !== -1) {
-								this._data[ t ? 'core' : 'checkbox' ].selected = $.vakata.array_unique(this._data[ t ? 'core' : 'checkbox' ].selected.concat(obj.children_d));
-								for(i = 0, j = obj.children_d.length; i < j; i++) {
-									tmp = m[obj.children_d[i]];
-									tmp.state[ t ? 'selected' : 'checked' ] = true;
-									if(tmp && tmp.original && tmp.original.state && tmp.original.state.undetermined) {
-										tmp.original.state.undetermined = false;
-									}
-								}
-							}
-
-							// apply up
-							if(s.indexOf('up') !== -1) {
-								while(par && par.id !== $.jstree.root) {
-									c = 0;
-									for(i = 0, j = par.children.length; i < j; i++) {
-										c += m[par.children[i]].state[ t ? 'selected' : 'checked' ];
-									}
-									if(c === j) {
-										par.state[ t ? 'selected' : 'checked' ] = true;
-										this._data[ t ? 'core' : 'checkbox' ].selected.push(par.id);
-										tmp = this.get_node(par, true);
-										if(tmp && tmp.length) {
-											tmp.attr('aria-selected', true).children('.jstree-anchor').addClass(t ? 'jstree-clicked' : 'jstree-checked');
-										}
-									}
-									else {
-										break;
-									}
-									par = this.get_node(par.parent);
-								}
-							}
-
-							// apply down (process .children separately?)
-							if(s.indexOf('down') !== -1 && dom.length) {
-								dom.find('.jstree-anchor').addClass(t ? 'jstree-clicked' : 'jstree-checked').parent().attr('aria-selected', true);
-							}
-						}, this))
-					.on(this.settings.checkbox.tie_selection ? 'deselect_all.jstree' : 'uncheck_all.jstree', $.proxy(function (e, data) {
-							var obj = this.get_node($.jstree.root),
-								m = this._model.data,
-								i, j, tmp;
-							for(i = 0, j = obj.children_d.length; i < j; i++) {
-								tmp = m[obj.children_d[i]];
-								if(tmp && tmp.original && tmp.original.state && tmp.original.state.undetermined) {
-									tmp.original.state.undetermined = false;
-								}
-							}
-						}, this))
-					.on(this.settings.checkbox.tie_selection ? 'deselect_node.jstree' : 'uncheck_node.jstree', $.proxy(function (e, data) {
-							var obj = data.node,
-								dom = this.get_node(obj, true),
-								i, j, tmp, s = this.settings.checkbox.cascade, t = this.settings.checkbox.tie_selection;
-							if(obj && obj.original && obj.original.state && obj.original.state.undetermined) {
-								obj.original.state.undetermined = false;
-							}
-
-							// apply down
-							if(s.indexOf('down') !== -1) {
-								for(i = 0, j = obj.children_d.length; i < j; i++) {
-									tmp = this._model.data[obj.children_d[i]];
-									tmp.state[ t ? 'selected' : 'checked' ] = false;
-									if(tmp && tmp.original && tmp.original.state && tmp.original.state.undetermined) {
-										tmp.original.state.undetermined = false;
-									}
-								}
-							}
-
-							// apply up
-							if(s.indexOf('up') !== -1) {
-								for(i = 0, j = obj.parents.length; i < j; i++) {
-									tmp = this._model.data[obj.parents[i]];
-									tmp.state[ t ? 'selected' : 'checked' ] = false;
-									if(tmp && tmp.original && tmp.original.state && tmp.original.state.undetermined) {
-										tmp.original.state.undetermined = false;
-									}
-									tmp = this.get_node(obj.parents[i], true);
-									if(tmp && tmp.length) {
-										tmp.attr('aria-selected', false).children('.jstree-anchor').removeClass(t ? 'jstree-clicked' : 'jstree-checked');
-									}
-								}
-							}
-							tmp = [];
-							for(i = 0, j = this._data[ t ? 'core' : 'checkbox' ].selected.length; i < j; i++) {
-								// apply down + apply up
-								if(
-									(s.indexOf('down') === -1 || $.inArray(this._data[ t ? 'core' : 'checkbox' ].selected[i], obj.children_d) === -1) &&
-									(s.indexOf('up') === -1 || $.inArray(this._data[ t ? 'core' : 'checkbox' ].selected[i], obj.parents) === -1)
-								) {
-									tmp.push(this._data[ t ? 'core' : 'checkbox' ].selected[i]);
-								}
-							}
-							this._data[ t ? 'core' : 'checkbox' ].selected = $.vakata.array_unique(tmp);
-
-							// apply down (process .children separately?)
-							if(s.indexOf('down') !== -1 && dom.length) {
-								dom.find('.jstree-anchor').removeClass(t ? 'jstree-clicked' : 'jstree-checked').parent().attr('aria-selected', false);
-							}
-						}, this));
-			}
-			if(this.settings.checkbox.cascade.indexOf('up') !== -1) {
-				this.element
-					.on('delete_node.jstree', $.proxy(function (e, data) {
-							// apply up (whole handler)
-							var p = this.get_node(data.parent),
-								m = this._model.data,
-								i, j, c, tmp, t = this.settings.checkbox.tie_selection;
-							while(p && p.id !== $.jstree.root && !p.state[ t ? 'selected' : 'checked' ]) {
-								c = 0;
-								for(i = 0, j = p.children.length; i < j; i++) {
-									c += m[p.children[i]].state[ t ? 'selected' : 'checked' ];
-								}
-								if(j > 0 && c === j) {
-									p.state[ t ? 'selected' : 'checked' ] = true;
-									this._data[ t ? 'core' : 'checkbox' ].selected.push(p.id);
-									tmp = this.get_node(p, true);
-									if(tmp && tmp.length) {
-										tmp.attr('aria-selected', true).children('.jstree-anchor').addClass(t ? 'jstree-clicked' : 'jstree-checked');
-									}
-								}
-								else {
-									break;
-								}
-								p = this.get_node(p.parent);
-							}
-						}, this))
-					.on('move_node.jstree', $.proxy(function (e, data) {
-							// apply up (whole handler)
-							var is_multi = data.is_multi,
-								old_par = data.old_parent,
-								new_par = this.get_node(data.parent),
-								m = this._model.data,
-								p, c, i, j, tmp, t = this.settings.checkbox.tie_selection;
-							if(!is_multi) {
-								p = this.get_node(old_par);
-								while(p && p.id !== $.jstree.root && !p.state[ t ? 'selected' : 'checked' ]) {
-									c = 0;
-									for(i = 0, j = p.children.length; i < j; i++) {
-										c += m[p.children[i]].state[ t ? 'selected' : 'checked' ];
-									}
-									if(j > 0 && c === j) {
-										p.state[ t ? 'selected' : 'checked' ] = true;
-										this._data[ t ? 'core' : 'checkbox' ].selected.push(p.id);
-										tmp = this.get_node(p, true);
-										if(tmp && tmp.length) {
-											tmp.attr('aria-selected', true).children('.jstree-anchor').addClass(t ? 'jstree-clicked' : 'jstree-checked');
-										}
-									}
-									else {
-										break;
-									}
-									p = this.get_node(p.parent);
-								}
-							}
-							p = new_par;
-							while(p && p.id !== $.jstree.root) {
-								c = 0;
-								for(i = 0, j = p.children.length; i < j; i++) {
-									c += m[p.children[i]].state[ t ? 'selected' : 'checked' ];
-								}
-								if(c === j) {
-									if(!p.state[ t ? 'selected' : 'checked' ]) {
-										p.state[ t ? 'selected' : 'checked' ] = true;
-										this._data[ t ? 'core' : 'checkbox' ].selected.push(p.id);
-										tmp = this.get_node(p, true);
-										if(tmp && tmp.length) {
-											tmp.attr('aria-selected', true).children('.jstree-anchor').addClass(t ? 'jstree-clicked' : 'jstree-checked');
-										}
-									}
-								}
-								else {
-									if(p.state[ t ? 'selected' : 'checked' ]) {
-										p.state[ t ? 'selected' : 'checked' ] = false;
-										this._data[ t ? 'core' : 'checkbox' ].selected = $.vakata.array_remove_item(this._data[ t ? 'core' : 'checkbox' ].selected, p.id);
-										tmp = this.get_node(p, true);
-										if(tmp && tmp.length) {
-											tmp.attr('aria-selected', false).children('.jstree-anchor').removeClass(t ? 'jstree-clicked' : 'jstree-checked');
-										}
-									}
-									else {
-										break;
-									}
-								}
-								p = this.get_node(p.parent);
-							}
-						}, this));
-			}
-		};
-		/**
-		 * set the undetermined state where and if necessary. Used internally.
-		 * @private
-		 * @name _undetermined()
-		 * @plugin checkbox
-		 */
-		this._undetermined = function () {
-			if(this.element === null) { return; }
-			var i, j, k, l, o = {}, m = this._model.data, t = this.settings.checkbox.tie_selection, s = this._data[ t ? 'core' : 'checkbox' ].selected, p = [], tt = this;
-			for(i = 0, j = s.length; i < j; i++) {
-				if(m[s[i]] && m[s[i]].parents) {
-					for(k = 0, l = m[s[i]].parents.length; k < l; k++) {
-						if(o[m[s[i]].parents[k]] === undefined && m[s[i]].parents[k] !== $.jstree.root) {
-							o[m[s[i]].parents[k]] = true;
-							p.push(m[s[i]].parents[k]);
-						}
-					}
-				}
-			}
-			// attempt for server side undetermined state
-			this.element.find('.jstree-closed').not(':has(.jstree-children)')
-				.each(function () {
-					var tmp = tt.get_node(this), tmp2;
-					if(!tmp.state.loaded) {
-						if(tmp.original && tmp.original.state && tmp.original.state.undetermined && tmp.original.state.undetermined === true) {
-							if(o[tmp.id] === undefined && tmp.id !== $.jstree.root) {
-								o[tmp.id] = true;
-								p.push(tmp.id);
-							}
-							for(k = 0, l = tmp.parents.length; k < l; k++) {
-								if(o[tmp.parents[k]] === undefined && tmp.parents[k] !== $.jstree.root) {
-									o[tmp.parents[k]] = true;
-									p.push(tmp.parents[k]);
-								}
-							}
-						}
-					}
-					else {
-						for(i = 0, j = tmp.children_d.length; i < j; i++) {
-							tmp2 = m[tmp.children_d[i]];
-							if(!tmp2.state.loaded && tmp2.original && tmp2.original.state && tmp2.original.state.undetermined && tmp2.original.state.undetermined === true) {
-								if(o[tmp2.id] === undefined && tmp2.id !== $.jstree.root) {
-									o[tmp2.id] = true;
-									p.push(tmp2.id);
-								}
-								for(k = 0, l = tmp2.parents.length; k < l; k++) {
-									if(o[tmp2.parents[k]] === undefined && tmp2.parents[k] !== $.jstree.root) {
-										o[tmp2.parents[k]] = true;
-										p.push(tmp2.parents[k]);
-									}
-								}
-							}
-						}
-					}
-				});
-
-			this.element.find('.jstree-undetermined').removeClass('jstree-undetermined');
-			for(i = 0, j = p.length; i < j; i++) {
-				if(!m[p[i]].state[ t ? 'selected' : 'checked' ]) {
-					s = this.get_node(p[i], true);
-					if(s && s.length) {
-						s.children('.jstree-anchor').children('.jstree-checkbox').addClass('jstree-undetermined');
-					}
-				}
-			}
-		};
-		this.redraw_node = function(obj, deep, is_callback, force_render) {
-			obj = parent.redraw_node.apply(this, arguments);
-			if(obj) {
-				var i, j, tmp = null, icon = null;
-				for(i = 0, j = obj.childNodes.length; i < j; i++) {
-					if(obj.childNodes[i] && obj.childNodes[i].className && obj.childNodes[i].className.indexOf("jstree-anchor") !== -1) {
-						tmp = obj.childNodes[i];
-						break;
-					}
-				}
-				if(tmp) {
-					if(!this.settings.checkbox.tie_selection && this._model.data[obj.id].state.checked) { tmp.className += ' jstree-checked'; }
-					icon = _i.cloneNode(false);
-					if(this._model.data[obj.id].state.checkbox_disabled) { icon.className += ' jstree-checkbox-disabled'; }
-					tmp.insertBefore(icon, tmp.childNodes[0]);
-				}
-			}
-			if(!is_callback && this.settings.checkbox.cascade.indexOf('undetermined') !== -1) {
-				if(this._data.checkbox.uto) { clearTimeout(this._data.checkbox.uto); }
-				this._data.checkbox.uto = setTimeout($.proxy(this._undetermined, this), 50);
-			}
-			return obj;
-		};
-		/**
-		 * show the node checkbox icons
-		 * @name show_checkboxes()
-		 * @plugin checkbox
-		 */
-		this.show_checkboxes = function () { this._data.core.themes.checkboxes = true; this.get_container_ul().removeClass("jstree-no-checkboxes"); };
-		/**
-		 * hide the node checkbox icons
-		 * @name hide_checkboxes()
-		 * @plugin checkbox
-		 */
-		this.hide_checkboxes = function () { this._data.core.themes.checkboxes = false; this.get_container_ul().addClass("jstree-no-checkboxes"); };
-		/**
-		 * toggle the node icons
-		 * @name toggle_checkboxes()
-		 * @plugin checkbox
-		 */
-		this.toggle_checkboxes = function () { if(this._data.core.themes.checkboxes) { this.hide_checkboxes(); } else { this.show_checkboxes(); } };
-		/**
-		 * checks if a node is in an undetermined state
-		 * @name is_undetermined(obj)
-		 * @param  {mixed} obj
-		 * @return {Boolean}
-		 */
-		this.is_undetermined = function (obj) {
-			obj = this.get_node(obj);
-			var s = this.settings.checkbox.cascade, i, j, t = this.settings.checkbox.tie_selection, d = this._data[ t ? 'core' : 'checkbox' ].selected, m = this._model.data;
-			if(!obj || obj.state[ t ? 'selected' : 'checked' ] === true || s.indexOf('undetermined') === -1 || (s.indexOf('down') === -1 && s.indexOf('up') === -1)) {
-				return false;
-			}
-			if(!obj.state.loaded && obj.original.state.undetermined === true) {
-				return true;
-			}
-			for(i = 0, j = obj.children_d.length; i < j; i++) {
-				if($.inArray(obj.children_d[i], d) !== -1 || (!m[obj.children_d[i]].state.loaded && m[obj.children_d[i]].original.state.undetermined)) {
-					return true;
-				}
-			}
-			return false;
-		};
-		/**
-		 * disable a node's checkbox
-		 * @name disable_checkbox(obj)
-		 * @param {mixed} obj an array can be used too
-		 * @trigger disable_checkbox.jstree
-		 * @plugin checkbox
-		 */
-		this.disable_checkbox = function (obj) {
-			var t1, t2, dom;
-			if($.isArray(obj)) {
-				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-					this.disable_checkbox(obj[t1]);
-				}
-				return true;
-			}
-			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
-				return false;
-			}
-			dom = this.get_node(obj, true);
-			if(!obj.state.checkbox_disabled) {
-				obj.state.checkbox_disabled = true;
-				if(dom && dom.length) {
-					dom.children('.jstree-anchor').children('.jstree-checkbox').addClass('jstree-checkbox-disabled');
-				}
-				/**
-				 * triggered when an node's checkbox is disabled
-				 * @event
-				 * @name disable_checkbox.jstree
-				 * @param {Object} node
-				 * @plugin checkbox
-				 */
-				this.trigger('disable_checkbox', { 'node' : obj });
-			}
-		};
-		/**
-		 * enable a node's checkbox
-		 * @name disable_checkbox(obj)
-		 * @param {mixed} obj an array can be used too
-		 * @trigger enable_checkbox.jstree
-		 * @plugin checkbox
-		 */
-		this.enable_checkbox = function (obj) {
-			var t1, t2, dom;
-			if($.isArray(obj)) {
-				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-					this.enable_checkbox(obj[t1]);
-				}
-				return true;
-			}
-			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
-				return false;
-			}
-			dom = this.get_node(obj, true);
-			if(obj.state.checkbox_disabled) {
-				obj.state.checkbox_disabled = false;
-				if(dom && dom.length) {
-					dom.children('.jstree-anchor').children('.jstree-checkbox').removeClass('jstree-checkbox-disabled');
-				}
-				/**
-				 * triggered when an node's checkbox is enabled
-				 * @event
-				 * @name enable_checkbox.jstree
-				 * @param {Object} node
-				 * @plugin checkbox
-				 */
-				this.trigger('enable_checkbox', { 'node' : obj });
-			}
-		};
-
-		this.activate_node = function (obj, e) {
-			if($(e.target).hasClass('jstree-checkbox-disabled')) {
-				return false;
-			}
-			if(this.settings.checkbox.tie_selection && (this.settings.checkbox.whole_node || $(e.target).hasClass('jstree-checkbox'))) {
-				e.ctrlKey = true;
-			}
-			if(this.settings.checkbox.tie_selection || (!this.settings.checkbox.whole_node && !$(e.target).hasClass('jstree-checkbox'))) {
-				return parent.activate_node.call(this, obj, e);
-			}
-			if(this.is_disabled(obj)) {
-				return false;
-			}
-			if(this.is_checked(obj)) {
-				this.uncheck_node(obj, e);
-			}
-			else {
-				this.check_node(obj, e);
-			}
-			this.trigger('activate_node', { 'node' : this.get_node(obj) });
-		};
-
-		/**
-		 * check a node (only if tie_selection in checkbox settings is false, otherwise select_node will be called internally)
-		 * @name check_node(obj)
-		 * @param {mixed} obj an array can be used to check multiple nodes
-		 * @trigger check_node.jstree
-		 * @plugin checkbox
-		 */
-		this.check_node = function (obj, e) {
-			if(this.settings.checkbox.tie_selection) { return this.select_node(obj, false, true, e); }
-			var dom, t1, t2, th;
-			if($.isArray(obj)) {
-				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-					this.check_node(obj[t1], e);
-				}
-				return true;
-			}
-			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
-				return false;
-			}
-			dom = this.get_node(obj, true);
-			if(!obj.state.checked) {
-				obj.state.checked = true;
-				this._data.checkbox.selected.push(obj.id);
-				if(dom && dom.length) {
-					dom.children('.jstree-anchor').addClass('jstree-checked');
-				}
-				/**
-				 * triggered when an node is checked (only if tie_selection in checkbox settings is false)
-				 * @event
-				 * @name check_node.jstree
-				 * @param {Object} node
-				 * @param {Array} selected the current selection
-				 * @param {Object} event the event (if any) that triggered this check_node
-				 * @plugin checkbox
-				 */
-				this.trigger('check_node', { 'node' : obj, 'selected' : this._data.checkbox.selected, 'event' : e });
-			}
-		};
-		/**
-		 * uncheck a node (only if tie_selection in checkbox settings is false, otherwise deselect_node will be called internally)
-		 * @name uncheck_node(obj)
-		 * @param {mixed} obj an array can be used to uncheck multiple nodes
-		 * @trigger uncheck_node.jstree
-		 * @plugin checkbox
-		 */
-		this.uncheck_node = function (obj, e) {
-			if(this.settings.checkbox.tie_selection) { return this.deselect_node(obj, false, e); }
-			var t1, t2, dom;
-			if($.isArray(obj)) {
-				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-					this.uncheck_node(obj[t1], e);
-				}
-				return true;
-			}
-			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
-				return false;
-			}
-			dom = this.get_node(obj, true);
-			if(obj.state.checked) {
-				obj.state.checked = false;
-				this._data.checkbox.selected = $.vakata.array_remove_item(this._data.checkbox.selected, obj.id);
-				if(dom.length) {
-					dom.children('.jstree-anchor').removeClass('jstree-checked');
-				}
-				/**
-				 * triggered when an node is unchecked (only if tie_selection in checkbox settings is false)
-				 * @event
-				 * @name uncheck_node.jstree
-				 * @param {Object} node
-				 * @param {Array} selected the current selection
-				 * @param {Object} event the event (if any) that triggered this uncheck_node
-				 * @plugin checkbox
-				 */
-				this.trigger('uncheck_node', { 'node' : obj, 'selected' : this._data.checkbox.selected, 'event' : e });
-			}
-		};
-		/**
-		 * checks all nodes in the tree (only if tie_selection in checkbox settings is false, otherwise select_all will be called internally)
-		 * @name check_all()
-		 * @trigger check_all.jstree, changed.jstree
-		 * @plugin checkbox
-		 */
-		this.check_all = function () {
-			if(this.settings.checkbox.tie_selection) { return this.select_all(); }
-			var tmp = this._data.checkbox.selected.concat([]), i, j;
-			this._data.checkbox.selected = this._model.data[$.jstree.root].children_d.concat();
-			for(i = 0, j = this._data.checkbox.selected.length; i < j; i++) {
-				if(this._model.data[this._data.checkbox.selected[i]]) {
-					this._model.data[this._data.checkbox.selected[i]].state.checked = true;
-				}
-			}
-			this.redraw(true);
-			/**
-			 * triggered when all nodes are checked (only if tie_selection in checkbox settings is false)
-			 * @event
-			 * @name check_all.jstree
-			 * @param {Array} selected the current selection
-			 * @plugin checkbox
-			 */
-			this.trigger('check_all', { 'selected' : this._data.checkbox.selected });
-		};
-		/**
-		 * uncheck all checked nodes (only if tie_selection in checkbox settings is false, otherwise deselect_all will be called internally)
-		 * @name uncheck_all()
-		 * @trigger uncheck_all.jstree
-		 * @plugin checkbox
-		 */
-		this.uncheck_all = function () {
-			if(this.settings.checkbox.tie_selection) { return this.deselect_all(); }
-			var tmp = this._data.checkbox.selected.concat([]), i, j;
-			for(i = 0, j = this._data.checkbox.selected.length; i < j; i++) {
-				if(this._model.data[this._data.checkbox.selected[i]]) {
-					this._model.data[this._data.checkbox.selected[i]].state.checked = false;
-				}
-			}
-			this._data.checkbox.selected = [];
-			this.element.find('.jstree-checked').removeClass('jstree-checked');
-			/**
-			 * triggered when all nodes are unchecked (only if tie_selection in checkbox settings is false)
-			 * @event
-			 * @name uncheck_all.jstree
-			 * @param {Object} node the previous selection
-			 * @param {Array} selected the current selection
-			 * @plugin checkbox
-			 */
-			this.trigger('uncheck_all', { 'selected' : this._data.checkbox.selected, 'node' : tmp });
-		};
-		/**
-		 * checks if a node is checked (if tie_selection is on in the settings this function will return the same as is_selected)
-		 * @name is_checked(obj)
-		 * @param  {mixed}  obj
-		 * @return {Boolean}
-		 * @plugin checkbox
-		 */
-		this.is_checked = function (obj) {
-			if(this.settings.checkbox.tie_selection) { return this.is_selected(obj); }
-			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) { return false; }
-			return obj.state.checked;
-		};
-		/**
-		 * get an array of all checked nodes (if tie_selection is on in the settings this function will return the same as get_selected)
-		 * @name get_checked([full])
-		 * @param  {mixed}  full if set to `true` the returned array will consist of the full node objects, otherwise - only IDs will be returned
-		 * @return {Array}
-		 * @plugin checkbox
-		 */
-		this.get_checked = function (full) {
-			if(this.settings.checkbox.tie_selection) { return this.get_selected(full); }
-			return full ? $.map(this._data.checkbox.selected, $.proxy(function (i) { return this.get_node(i); }, this)) : this._data.checkbox.selected;
-		};
-		/**
-		 * get an array of all top level checked nodes (ignoring children of checked nodes) (if tie_selection is on in the settings this function will return the same as get_top_selected)
-		 * @name get_top_checked([full])
-		 * @param  {mixed}  full if set to `true` the returned array will consist of the full node objects, otherwise - only IDs will be returned
-		 * @return {Array}
-		 * @plugin checkbox
-		 */
-		this.get_top_checked = function (full) {
-			if(this.settings.checkbox.tie_selection) { return this.get_top_selected(full); }
-			var tmp = this.get_checked(true),
-				obj = {}, i, j, k, l;
-			for(i = 0, j = tmp.length; i < j; i++) {
-				obj[tmp[i].id] = tmp[i];
-			}
-			for(i = 0, j = tmp.length; i < j; i++) {
-				for(k = 0, l = tmp[i].children_d.length; k < l; k++) {
-					if(obj[tmp[i].children_d[k]]) {
-						delete obj[tmp[i].children_d[k]];
-					}
-				}
-			}
-			tmp = [];
-			for(i in obj) {
-				if(obj.hasOwnProperty(i)) {
-					tmp.push(i);
-				}
-			}
-			return full ? $.map(tmp, $.proxy(function (i) { return this.get_node(i); }, this)) : tmp;
-		};
-		/**
-		 * get an array of all bottom level checked nodes (ignoring selected parents) (if tie_selection is on in the settings this function will return the same as get_bottom_selected)
-		 * @name get_bottom_checked([full])
-		 * @param  {mixed}  full if set to `true` the returned array will consist of the full node objects, otherwise - only IDs will be returned
-		 * @return {Array}
-		 * @plugin checkbox
-		 */
-		this.get_bottom_checked = function (full) {
-			if(this.settings.checkbox.tie_selection) { return this.get_bottom_selected(full); }
-			var tmp = this.get_checked(true),
-				obj = [], i, j;
-			for(i = 0, j = tmp.length; i < j; i++) {
-				if(!tmp[i].children.length) {
-					obj.push(tmp[i].id);
-				}
-			}
-			return full ? $.map(obj, $.proxy(function (i) { return this.get_node(i); }, this)) : obj;
-		};
-		this.load_node = function (obj, callback) {
-			var k, l, i, j, c, tmp;
-			if(!$.isArray(obj) && !this.settings.checkbox.tie_selection) {
-				tmp = this.get_node(obj);
-				if(tmp && tmp.state.loaded) {
-					for(k = 0, l = tmp.children_d.length; k < l; k++) {
-						if(this._model.data[tmp.children_d[k]].state.checked) {
-							c = true;
-							this._data.checkbox.selected = $.vakata.array_remove_item(this._data.checkbox.selected, tmp.children_d[k]);
-						}
-					}
-				}
-			}
-			return parent.load_node.apply(this, arguments);
-		};
-		this.get_state = function () {
-			var state = parent.get_state.apply(this, arguments);
-			if(this.settings.checkbox.tie_selection) { return state; }
-			state.checkbox = this._data.checkbox.selected.slice();
-			return state;
-		};
-		this.set_state = function (state, callback) {
-			var res = parent.set_state.apply(this, arguments);
-			if(res && state.checkbox) {
-				if(!this.settings.checkbox.tie_selection) {
-					this.uncheck_all();
-					var _this = this;
-					$.each(state.checkbox, function (i, v) {
-						_this.check_node(v);
-					});
-				}
-				delete state.checkbox;
-				this.set_state(state, callback);
-				return false;
-			}
-			return res;
-		};
-		this.refresh = function (skip_loading, forget_state) {
-			if(!this.settings.checkbox.tie_selection) {
-				this._data.checkbox.selected = [];
-			}
-			return parent.refresh.apply(this, arguments);
-		};
-	};
-
-	// include the checkbox plugin by default
-	// $.jstree.defaults.plugins.push("checkbox");
-
-/**
- * ### Conditionalselect plugin
- *
- * This plugin allows defining a callback to allow or deny node selection by user input (activate node method).
- */
-
-	/**
-	 * a callback (function) which is invoked in the instance's scope and receives two arguments - the node and the event that triggered the `activate_node` call. Returning false prevents working with the node, returning true allows invoking activate_node. Defaults to returning `true`.
-	 * @name $.jstree.defaults.checkbox.visible
-	 * @plugin checkbox
-	 */
-	$.jstree.defaults.conditionalselect = function () { return true; };
-	$.jstree.plugins.conditionalselect = function (options, parent) {
-		// own function
-		this.activate_node = function (obj, e) {
-			if(this.settings.conditionalselect.call(this, this.get_node(obj), e)) {
-				parent.activate_node.call(this, obj, e);
-			}
-		};
-	};
-
-
-/**
- * ### Contextmenu plugin
- *
- * Shows a context menu when a node is right-clicked.
- */
-
-	/**
-	 * stores all defaults for the contextmenu plugin
-	 * @name $.jstree.defaults.contextmenu
-	 * @plugin contextmenu
-	 */
-	$.jstree.defaults.contextmenu = {
-		/**
-		 * a boolean indicating if the node should be selected when the context menu is invoked on it. Defaults to `true`.
-		 * @name $.jstree.defaults.contextmenu.select_node
-		 * @plugin contextmenu
-		 */
-		select_node : true,
-		/**
-		 * a boolean indicating if the menu should be shown aligned with the node. Defaults to `true`, otherwise the mouse coordinates are used.
-		 * @name $.jstree.defaults.contextmenu.show_at_node
-		 * @plugin contextmenu
-		 */
-		show_at_node : true,
-		/**
-		 * an object of actions, or a function that accepts a node and a callback function and calls the callback function with an object of actions available for that node (you can also return the items too).
-		 *
-		 * Each action consists of a key (a unique name) and a value which is an object with the following properties (only label and action are required):
-		 *
-		 * * `separator_before` - a boolean indicating if there should be a separator before this item
-		 * * `separator_after` - a boolean indicating if there should be a separator after this item
-		 * * `_disabled` - a boolean indicating if this action should be disabled
-		 * * `label` - a string - the name of the action (could be a function returning a string)
-		 * * `action` - a function to be executed if this item is chosen
-		 * * `icon` - a string, can be a path to an icon or a className, if using an image that is in the current directory use a `./` prefix, otherwise it will be detected as a class
-		 * * `shortcut` - keyCode which will trigger the action if the menu is open (for example `113` for rename, which equals F2)
-		 * * `shortcut_label` - shortcut label (like for example `F2` for rename)
-		 *
-		 * @name $.jstree.defaults.contextmenu.items
-		 * @plugin contextmenu
-		 */
-		items : function (o, cb) { // Could be an object directly
-			return {
-				"create" : {
-					"separator_before"	: false,
-					"separator_after"	: true,
-					"_disabled"			: false, //(this.check("create_node", data.reference, {}, "last")),
-					"label"				: "Create",
-					"action"			: function (data) {
-						var inst = $.jstree.reference(data.reference),
-							obj = inst.get_node(data.reference);
-						inst.create_node(obj, {}, "last", function (new_node) {
-							setTimeout(function () { inst.edit(new_node); },0);
-						});
-					}
-				},
-				"rename" : {
-					"separator_before"	: false,
-					"separator_after"	: false,
-					"_disabled"			: false, //(this.check("rename_node", data.reference, this.get_parent(data.reference), "")),
-					"label"				: "Rename",
-					/*!
-					"shortcut"			: 113,
-					"shortcut_label"	: 'F2',
-					"icon"				: "glyphicon glyphicon-leaf",
-					*/
-					"action"			: function (data) {
-						var inst = $.jstree.reference(data.reference),
-							obj = inst.get_node(data.reference);
-						inst.edit(obj);
-					}
-				},
-				"remove" : {
-					"separator_before"	: false,
-					"icon"				: false,
-					"separator_after"	: false,
-					"_disabled"			: false, //(this.check("delete_node", data.reference, this.get_parent(data.reference), "")),
-					"label"				: "Delete",
-					"action"			: function (data) {
-						var inst = $.jstree.reference(data.reference),
-							obj = inst.get_node(data.reference);
-						if(inst.is_selected(obj)) {
-							inst.delete_node(inst.get_selected());
-						}
-						else {
-							inst.delete_node(obj);
-						}
-					}
-				},
-				"ccp" : {
-					"separator_before"	: true,
-					"icon"				: false,
-					"separator_after"	: false,
-					"label"				: "Edit",
-					"action"			: false,
-					"submenu" : {
-						"cut" : {
-							"separator_before"	: false,
-							"separator_after"	: false,
-							"label"				: "Cut",
-							"action"			: function (data) {
-								var inst = $.jstree.reference(data.reference),
-									obj = inst.get_node(data.reference);
-								if(inst.is_selected(obj)) {
-									inst.cut(inst.get_top_selected());
-								}
-								else {
-									inst.cut(obj);
-								}
-							}
-						},
-						"copy" : {
-							"separator_before"	: false,
-							"icon"				: false,
-							"separator_after"	: false,
-							"label"				: "Copy",
-							"action"			: function (data) {
-								var inst = $.jstree.reference(data.reference),
-									obj = inst.get_node(data.reference);
-								if(inst.is_selected(obj)) {
-									inst.copy(inst.get_top_selected());
-								}
-								else {
-									inst.copy(obj);
-								}
-							}
-						},
-						"paste" : {
-							"separator_before"	: false,
-							"icon"				: false,
-							"_disabled"			: function (data) {
-								return !$.jstree.reference(data.reference).can_paste();
-							},
-							"separator_after"	: false,
-							"label"				: "Paste",
-							"action"			: function (data) {
-								var inst = $.jstree.reference(data.reference),
-									obj = inst.get_node(data.reference);
-								inst.paste(obj);
-							}
-						}
-					}
-				}
-			};
-		}
-	};
-
-	$.jstree.plugins.contextmenu = function (options, parent) {
-		this.bind = function () {
-			parent.bind.call(this);
-
-			var last_ts = 0, cto = null, ex, ey;
-			this.element
-				.on("contextmenu.jstree", ".jstree-anchor", $.proxy(function (e, data) {
-						e.preventDefault();
-						last_ts = e.ctrlKey ? +new Date() : 0;
-						if(data || cto) {
-							last_ts = (+new Date()) + 10000;
-						}
-						if(cto) {
-							clearTimeout(cto);
-						}
-						if(!this.is_loading(e.currentTarget)) {
-							this.show_contextmenu(e.currentTarget, e.pageX, e.pageY, e);
-						}
-					}, this))
-				.on("click.jstree", ".jstree-anchor", $.proxy(function (e) {
-						if(this._data.contextmenu.visible && (!last_ts || (+new Date()) - last_ts > 250)) { // work around safari & macOS ctrl+click
-							$.vakata.context.hide();
-						}
-						last_ts = 0;
-					}, this))
-				.on("touchstart.jstree", ".jstree-anchor", function (e) {
-						if(!e.originalEvent || !e.originalEvent.changedTouches || !e.originalEvent.changedTouches[0]) {
-							return;
-						}
-						ex = e.pageX;
-						ey = e.pageY;
-						cto = setTimeout(function () {
-							$(e.currentTarget).trigger('contextmenu', true);
-						}, 750);
-					})
-				.on('touchmove.vakata.jstree', function (e) {
-						if(cto && e.originalEvent && e.originalEvent.changedTouches && e.originalEvent.changedTouches[0] && (Math.abs(ex - e.pageX) > 50 || Math.abs(ey - e.pageY) > 50)) {
-							clearTimeout(cto);
-						}
-					})
-				.on('touchend.vakata.jstree', function (e) {
-						if(cto) {
-							clearTimeout(cto);
-						}
-					});
-
-			/*!
-			if(!('oncontextmenu' in document.body) && ('ontouchstart' in document.body)) {
-				var el = null, tm = null;
-				this.element
-					.on("touchstart", ".jstree-anchor", function (e) {
-						el = e.currentTarget;
-						tm = +new Date();
-						$(document).one("touchend", function (e) {
-							e.target = document.elementFromPoint(e.originalEvent.targetTouches[0].pageX - window.pageXOffset, e.originalEvent.targetTouches[0].pageY - window.pageYOffset);
-							e.currentTarget = e.target;
-							tm = ((+(new Date())) - tm);
-							if(e.target === el && tm > 600 && tm < 1000) {
-								e.preventDefault();
-								$(el).trigger('contextmenu', e);
-							}
-							el = null;
-							tm = null;
-						});
-					});
-			}
-			*/
-			$(document).on("context_hide.vakata.jstree", $.proxy(function () { this._data.contextmenu.visible = false; }, this));
-		};
-		this.teardown = function () {
-			if(this._data.contextmenu.visible) {
-				$.vakata.context.hide();
-			}
-			parent.teardown.call(this);
-		};
-
-		/**
-		 * prepare and show the context menu for a node
-		 * @name show_contextmenu(obj [, x, y])
-		 * @param {mixed} obj the node
-		 * @param {Number} x the x-coordinate relative to the document to show the menu at
-		 * @param {Number} y the y-coordinate relative to the document to show the menu at
-		 * @param {Object} e the event if available that triggered the contextmenu
-		 * @plugin contextmenu
-		 * @trigger show_contextmenu.jstree
-		 */
-		this.show_contextmenu = function (obj, x, y, e) {
-			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) { return false; }
-			var s = this.settings.contextmenu,
-				d = this.get_node(obj, true),
-				a = d.children(".jstree-anchor"),
-				o = false,
-				i = false;
-			if(s.show_at_node || x === undefined || y === undefined) {
-				o = a.offset();
-				x = o.left;
-				y = o.top + this._data.core.li_height;
-			}
-			if(this.settings.contextmenu.select_node && !this.is_selected(obj)) {
-				this.activate_node(obj, e);
-			}
-
-			i = s.items;
-			if($.isFunction(i)) {
-				i = i.call(this, obj, $.proxy(function (i) {
-					this._show_contextmenu(obj, x, y, i);
-				}, this));
-			}
-			if($.isPlainObject(i)) {
-				this._show_contextmenu(obj, x, y, i);
-			}
-		};
-		/**
-		 * show the prepared context menu for a node
-		 * @name _show_contextmenu(obj, x, y, i)
-		 * @param {mixed} obj the node
-		 * @param {Number} x the x-coordinate relative to the document to show the menu at
-		 * @param {Number} y the y-coordinate relative to the document to show the menu at
-		 * @param {Number} i the object of items to show
-		 * @plugin contextmenu
-		 * @trigger show_contextmenu.jstree
-		 * @private
-		 */
-		this._show_contextmenu = function (obj, x, y, i) {
-			var d = this.get_node(obj, true),
-				a = d.children(".jstree-anchor");
-			$(document).one("context_show.vakata.jstree", $.proxy(function (e, data) {
-				var cls = 'jstree-contextmenu jstree-' + this.get_theme() + '-contextmenu';
-				$(data.element).addClass(cls);
-			}, this));
-			this._data.contextmenu.visible = true;
-			$.vakata.context.show(a, { 'x' : x, 'y' : y }, i);
-			/**
-			 * triggered when the contextmenu is shown for a node
-			 * @event
-			 * @name show_contextmenu.jstree
-			 * @param {Object} node the node
-			 * @param {Number} x the x-coordinate of the menu relative to the document
-			 * @param {Number} y the y-coordinate of the menu relative to the document
-			 * @plugin contextmenu
-			 */
-			this.trigger('show_contextmenu', { "node" : obj, "x" : x, "y" : y });
-		};
-	};
-
-	// contextmenu helper
-	(function ($) {
-		var right_to_left = false,
-			vakata_context = {
-				element		: false,
-				reference	: false,
-				position_x	: 0,
-				position_y	: 0,
-				items		: [],
-				html		: "",
-				is_visible	: false
-			};
-
-		$.vakata.context = {
-			settings : {
-				hide_onmouseleave	: 0,
-				icons				: true
-			},
-			_trigger : function (event_name) {
-				$(document).triggerHandler("context_" + event_name + ".vakata", {
-					"reference"	: vakata_context.reference,
-					"element"	: vakata_context.element,
-					"position"	: {
-						"x" : vakata_context.position_x,
-						"y" : vakata_context.position_y
-					}
-				});
-			},
-			_execute : function (i) {
-				i = vakata_context.items[i];
-				return i && (!i._disabled || ($.isFunction(i._disabled) && !i._disabled({ "item" : i, "reference" : vakata_context.reference, "element" : vakata_context.element }))) && i.action ? i.action.call(null, {
-							"item"		: i,
-							"reference"	: vakata_context.reference,
-							"element"	: vakata_context.element,
-							"position"	: {
-								"x" : vakata_context.position_x,
-								"y" : vakata_context.position_y
-							}
-						}) : false;
-			},
-			_parse : function (o, is_callback) {
-				if(!o) { return false; }
-				if(!is_callback) {
-					vakata_context.html		= "";
-					vakata_context.items	= [];
-				}
-				var str = "",
-					sep = false,
-					tmp;
-
-				if(is_callback) { str += "<"+"ul>"; }
-				$.each(o, function (i, val) {
-					if(!val) { return true; }
-					vakata_context.items.push(val);
-					if(!sep && val.separator_before) {
-						str += "<"+"li class='vakata-context-separator'><"+"a href='#' " + ($.vakata.context.settings.icons ? '' : 'style="margin-left:0px;"') + ">&#160;<"+"/a><"+"/li>";
-					}
-					sep = false;
-					str += "<"+"li class='" + (val._class || "") + (val._disabled === true || ($.isFunction(val._disabled) && val._disabled({ "item" : val, "reference" : vakata_context.reference, "element" : vakata_context.element })) ? " vakata-contextmenu-disabled " : "") + "' "+(val.shortcut?" data-shortcut='"+val.shortcut+"' ":'')+">";
-					str += "<"+"a href='#' rel='" + (vakata_context.items.length - 1) + "'>";
-					if($.vakata.context.settings.icons) {
-						str += "<"+"i ";
-						if(val.icon) {
-							if(val.icon.indexOf("/") !== -1 || val.icon.indexOf(".") !== -1) { str += " style='background:url(\"" + val.icon + "\") center center no-repeat' "; }
-							else { str += " class='" + val.icon + "' "; }
-						}
-						str += "><"+"/i><"+"span class='vakata-contextmenu-sep'>&#160;<"+"/span>";
-					}
-					str += ($.isFunction(val.label) ? val.label({ "item" : i, "reference" : vakata_context.reference, "element" : vakata_context.element }) : val.label) + (val.shortcut?' <span class="vakata-contextmenu-shortcut vakata-contextmenu-shortcut-'+val.shortcut+'">'+ (val.shortcut_label || '') +'</span>':'') + "<"+"/a>";
-					if(val.submenu) {
-						tmp = $.vakata.context._parse(val.submenu, true);
-						if(tmp) { str += tmp; }
-					}
-					str += "<"+"/li>";
-					if(val.separator_after) {
-						str += "<"+"li class='vakata-context-separator'><"+"a href='#' " + ($.vakata.context.settings.icons ? '' : 'style="margin-left:0px;"') + ">&#160;<"+"/a><"+"/li>";
-						sep = true;
-					}
-				});
-				str  = str.replace(/<li class\='vakata-context-separator'\><\/li\>$/,"");
-				if(is_callback) { str += "</ul>"; }
-				/**
-				 * triggered on the document when the contextmenu is parsed (HTML is built)
-				 * @event
-				 * @plugin contextmenu
-				 * @name context_parse.vakata
-				 * @param {jQuery} reference the element that was right clicked
-				 * @param {jQuery} element the DOM element of the menu itself
-				 * @param {Object} position the x & y coordinates of the menu
-				 */
-				if(!is_callback) { vakata_context.html = str; $.vakata.context._trigger("parse"); }
-				return str.length > 10 ? str : false;
-			},
-			_show_submenu : function (o) {
-				o = $(o);
-				if(!o.length || !o.children("ul").length) { return; }
-				var e = o.children("ul"),
-					x = o.offset().left + o.outerWidth(),
-					y = o.offset().top,
-					w = e.width(),
-					h = e.height(),
-					dw = $(window).width() + $(window).scrollLeft(),
-					dh = $(window).height() + $(window).scrollTop();
-				// може да се спести е една проверка - дали няма някой от класовете вече нагоре
-				if(right_to_left) {
-					o[x - (w + 10 + o.outerWidth()) < 0 ? "addClass" : "removeClass"]("vakata-context-left");
-				}
-				else {
-					o[x + w + 10 > dw ? "addClass" : "removeClass"]("vakata-context-right");
-				}
-				if(y + h + 10 > dh) {
-					e.css("bottom","-1px");
-				}
-				e.show();
-			},
-			show : function (reference, position, data) {
-				var o, e, x, y, w, h, dw, dh, cond = true;
-				if(vakata_context.element && vakata_context.element.length) {
-					vakata_context.element.width('');
-				}
-				switch(cond) {
-					case (!position && !reference):
-						return false;
-					case (!!position && !!reference):
-						vakata_context.reference	= reference;
-						vakata_context.position_x	= position.x;
-						vakata_context.position_y	= position.y;
-						break;
-					case (!position && !!reference):
-						vakata_context.reference	= reference;
-						o = reference.offset();
-						vakata_context.position_x	= o.left + reference.outerHeight();
-						vakata_context.position_y	= o.top;
-						break;
-					case (!!position && !reference):
-						vakata_context.position_x	= position.x;
-						vakata_context.position_y	= position.y;
-						break;
-				}
-				if(!!reference && !data && $(reference).data('vakata_contextmenu')) {
-					data = $(reference).data('vakata_contextmenu');
-				}
-				if($.vakata.context._parse(data)) {
-					vakata_context.element.html(vakata_context.html);
-				}
-				if(vakata_context.items.length) {
-					vakata_context.element.appendTo("body");
-					e = vakata_context.element;
-					x = vakata_context.position_x;
-					y = vakata_context.position_y;
-					w = e.width();
-					h = e.height();
-					dw = $(window).width() + $(window).scrollLeft();
-					dh = $(window).height() + $(window).scrollTop();
-					if(right_to_left) {
-						x -= (e.outerWidth() - $(reference).outerWidth());
-						if(x < $(window).scrollLeft() + 20) {
-							x = $(window).scrollLeft() + 20;
-						}
-					}
-					if(x + w + 20 > dw) {
-						x = dw - (w + 20);
-					}
-					if(y + h + 20 > dh) {
-						y = dh - (h + 20);
-					}
-
-					vakata_context.element
-						.css({ "left" : x, "top" : y })
-						.show()
-						.find('a').first().focus().parent().addClass("vakata-context-hover");
-					vakata_context.is_visible = true;
-					/**
-					 * triggered on the document when the contextmenu is shown
-					 * @event
-					 * @plugin contextmenu
-					 * @name context_show.vakata
-					 * @param {jQuery} reference the element that was right clicked
-					 * @param {jQuery} element the DOM element of the menu itself
-					 * @param {Object} position the x & y coordinates of the menu
-					 */
-					$.vakata.context._trigger("show");
-				}
-			},
-			hide : function () {
-				if(vakata_context.is_visible) {
-					vakata_context.element.hide().find("ul").hide().end().find(':focus').blur().end().detach();
-					vakata_context.is_visible = false;
-					/**
-					 * triggered on the document when the contextmenu is hidden
-					 * @event
-					 * @plugin contextmenu
-					 * @name context_hide.vakata
-					 * @param {jQuery} reference the element that was right clicked
-					 * @param {jQuery} element the DOM element of the menu itself
-					 * @param {Object} position the x & y coordinates of the menu
-					 */
-					$.vakata.context._trigger("hide");
-				}
-			}
-		};
-		$(function () {
-			right_to_left = $("body").css("direction") === "rtl";
-			var to = false;
-
-			vakata_context.element = $("<ul class='vakata-context'></ul>");
-			vakata_context.element
-				.on("mouseenter", "li", function (e) {
-					e.stopImmediatePropagation();
-
-					if($.contains(this, e.relatedTarget)) {
-						// премахнато заради delegate mouseleave по-долу
-						// $(this).find(".vakata-context-hover").removeClass("vakata-context-hover");
-						return;
-					}
-
-					if(to) { clearTimeout(to); }
-					vakata_context.element.find(".vakata-context-hover").removeClass("vakata-context-hover").end();
-
-					$(this)
-						.siblings().find("ul").hide().end().end()
-						.parentsUntil(".vakata-context", "li").addBack().addClass("vakata-context-hover");
-					$.vakata.context._show_submenu(this);
-				})
-				// тестово - дали не натоварва?
-				.on("mouseleave", "li", function (e) {
-					if($.contains(this, e.relatedTarget)) { return; }
-					$(this).find(".vakata-context-hover").addBack().removeClass("vakata-context-hover");
-				})
-				.on("mouseleave", function (e) {
-					$(this).find(".vakata-context-hover").removeClass("vakata-context-hover");
-					if($.vakata.context.settings.hide_onmouseleave) {
-						to = setTimeout(
-							(function (t) {
-								return function () { $.vakata.context.hide(); };
-							}(this)), $.vakata.context.settings.hide_onmouseleave);
-					}
-				})
-				.on("click", "a", function (e) {
-					e.preventDefault();
-				//})
-				//.on("mouseup", "a", function (e) {
-					if(!$(this).blur().parent().hasClass("vakata-context-disabled") && $.vakata.context._execute($(this).attr("rel")) !== false) {
-						$.vakata.context.hide();
-					}
-				})
-				.on('keydown', 'a', function (e) {
-						var o = null;
-						switch(e.which) {
-							case 13:
-							case 32:
-								e.type = "mouseup";
-								e.preventDefault();
-								$(e.currentTarget).trigger(e);
-								break;
-							case 37:
-								if(vakata_context.is_visible) {
-									vakata_context.element.find(".vakata-context-hover").last().closest("li").first().find("ul").hide().find(".vakata-context-hover").removeClass("vakata-context-hover").end().end().children('a').focus();
-									e.stopImmediatePropagation();
-									e.preventDefault();
-								}
-								break;
-							case 38:
-								if(vakata_context.is_visible) {
-									o = vakata_context.element.find("ul:visible").addBack().last().children(".vakata-context-hover").removeClass("vakata-context-hover").prevAll("li:not(.vakata-context-separator)").first();
-									if(!o.length) { o = vakata_context.element.find("ul:visible").addBack().last().children("li:not(.vakata-context-separator)").last(); }
-									o.addClass("vakata-context-hover").children('a').focus();
-									e.stopImmediatePropagation();
-									e.preventDefault();
-								}
-								break;
-							case 39:
-								if(vakata_context.is_visible) {
-									vakata_context.element.find(".vakata-context-hover").last().children("ul").show().children("li:not(.vakata-context-separator)").removeClass("vakata-context-hover").first().addClass("vakata-context-hover").children('a').focus();
-									e.stopImmediatePropagation();
-									e.preventDefault();
-								}
-								break;
-							case 40:
-								if(vakata_context.is_visible) {
-									o = vakata_context.element.find("ul:visible").addBack().last().children(".vakata-context-hover").removeClass("vakata-context-hover").nextAll("li:not(.vakata-context-separator)").first();
-									if(!o.length) { o = vakata_context.element.find("ul:visible").addBack().last().children("li:not(.vakata-context-separator)").first(); }
-									o.addClass("vakata-context-hover").children('a').focus();
-									e.stopImmediatePropagation();
-									e.preventDefault();
-								}
-								break;
-							case 27:
-								$.vakata.context.hide();
-								e.preventDefault();
-								break;
-							default:
-								//console.log(e.which);
-								break;
-						}
-					})
-				.on('keydown', function (e) {
-					e.preventDefault();
-					var a = vakata_context.element.find('.vakata-contextmenu-shortcut-' + e.which).parent();
-					if(a.parent().not('.vakata-context-disabled')) {
-						a.click();
-					}
-				});
-
-			$(document)
-				.on("mousedown.vakata.jstree", function (e) {
-					if(vakata_context.is_visible && !$.contains(vakata_context.element[0], e.target)) {
-						$.vakata.context.hide();
-					}
-				})
-				.on("context_show.vakata.jstree", function (e, data) {
-					vakata_context.element.find("li:has(ul)").children("a").addClass("vakata-context-parent");
-					if(right_to_left) {
-						vakata_context.element.addClass("vakata-context-rtl").css("direction", "rtl");
-					}
-					// also apply a RTL class?
-					vakata_context.element.find("ul").hide().end();
-				});
-		});
-	}($));
-	// $.jstree.defaults.plugins.push("contextmenu");
-
-/**
- * ### Drag'n'drop plugin
- *
- * Enables dragging and dropping of nodes in the tree, resulting in a move or copy operations.
- */
-
-	/**
-	 * stores all defaults for the drag'n'drop plugin
-	 * @name $.jstree.defaults.dnd
-	 * @plugin dnd
-	 */
-	$.jstree.defaults.dnd = {
-		/**
-		 * a boolean indicating if a copy should be possible while dragging (by pressint the meta key or Ctrl). Defaults to `true`.
-		 * @name $.jstree.defaults.dnd.copy
-		 * @plugin dnd
-		 */
-		copy : true,
-		/**
-		 * a number indicating how long a node should remain hovered while dragging to be opened. Defaults to `500`.
-		 * @name $.jstree.defaults.dnd.open_timeout
-		 * @plugin dnd
-		 */
-		open_timeout : 500,
-		/**
-		 * a function invoked each time a node is about to be dragged, invoked in the tree's scope and receives the nodes about to be dragged as an argument (array) and the event that started the drag - return `false` to prevent dragging
-		 * @name $.jstree.defaults.dnd.is_draggable
-		 * @plugin dnd
-		 */
-		is_draggable : true,
-		/**
-		 * a boolean indicating if checks should constantly be made while the user is dragging the node (as opposed to checking only on drop), default is `true`
-		 * @name $.jstree.defaults.dnd.check_while_dragging
-		 * @plugin dnd
-		 */
-		check_while_dragging : true,
-		/**
-		 * a boolean indicating if nodes from this tree should only be copied with dnd (as opposed to moved), default is `false`
-		 * @name $.jstree.defaults.dnd.always_copy
-		 * @plugin dnd
-		 */
-		always_copy : false,
-		/**
-		 * when dropping a node "inside", this setting indicates the position the node should go to - it can be an integer or a string: "first" (same as 0) or "last", default is `0`
-		 * @name $.jstree.defaults.dnd.inside_pos
-		 * @plugin dnd
-		 */
-		inside_pos : 0,
-		/**
-		 * when starting the drag on a node that is selected this setting controls if all selected nodes are dragged or only the single node, default is `true`, which means all selected nodes are dragged when the drag is started on a selected node
-		 * @name $.jstree.defaults.dnd.drag_selection
-		 * @plugin dnd
-		 */
-		drag_selection : true,
-		/**
-		 * controls whether dnd works on touch devices. If left as boolean true dnd will work the same as in desktop browsers, which in some cases may impair scrolling. If set to boolean false dnd will not work on touch devices. There is a special third option - string "selected" which means only selected nodes can be dragged on touch devices.
-		 * @name $.jstree.defaults.dnd.touch
-		 * @plugin dnd
-		 */
-		touch : true,
-		/**
-		 * controls whether items can be dropped anywhere on the node, not just on the anchor, by default only the node anchor is a valid drop target. Works best with the wholerow plugin. If enabled on mobile depending on the interface it might be hard for the user to cancel the drop, since the whole tree container will be a valid drop target.
-		 * @name $.jstree.defaults.dnd.large_drop_target
-		 * @plugin dnd
-		 */
-		large_drop_target : false,
-		/**
-		 * controls whether a drag can be initiated from any part of the node and not just the text/icon part, works best with the wholerow plugin. Keep in mind it can cause problems with tree scrolling on mobile depending on the interface - in that case set the touch option to "selected".
-		 * @name $.jstree.defaults.dnd.large_drag_target
-		 * @plugin dnd
-		 */
-		large_drag_target : false
-	};
-	// TODO: now check works by checking for each node individually, how about max_children, unique, etc?
-	$.jstree.plugins.dnd = function (options, parent) {
-		this.bind = function () {
-			parent.bind.call(this);
-
-			this.element
-				.on('mousedown.jstree touchstart.jstree', this.settings.dnd.large_drag_target ? '.jstree-node' : '.jstree-anchor', $.proxy(function (e) {
-					if(this.settings.dnd.large_drag_target && $(e.target).closest('.jstree-node')[0] !== e.currentTarget) {
-						return true;
-					}
-					if(e.type === "touchstart" && (!this.settings.dnd.touch || (this.settings.dnd.touch === 'selected' && !$(e.currentTarget).closest('.jstree-node').children('.jstree-anchor').hasClass('jstree-clicked')))) {
-						return true;
-					}
-					var obj = this.get_node(e.target),
-						mlt = this.is_selected(obj) && this.settings.dnd.drag_selection ? this.get_top_selected().length : 1,
-						txt = (mlt > 1 ? mlt + ' ' + this.get_string('nodes') : this.get_text(e.currentTarget));
-					if(this.settings.core.force_text) {
-						txt = $.vakata.html.escape(txt);
-					}
-					if(obj && obj.id && obj.id !== $.jstree.root && (e.which === 1 || e.type === "touchstart") &&
-						(this.settings.dnd.is_draggable === true || ($.isFunction(this.settings.dnd.is_draggable) && this.settings.dnd.is_draggable.call(this, (mlt > 1 ? this.get_top_selected(true) : [obj]), e)))
-					) {
-						this.element.trigger('mousedown.jstree');
-						return $.vakata.dnd.start(e, { 'jstree' : true, 'origin' : this, 'obj' : this.get_node(obj,true), 'nodes' : mlt > 1 ? this.get_top_selected() : [obj.id] }, '<div id="jstree-dnd" class="jstree-' + this.get_theme() + ' jstree-' + this.get_theme() + '-' + this.get_theme_variant() + ' ' + ( this.settings.core.themes.responsive ? ' jstree-dnd-responsive' : '' ) + '"><i class="jstree-icon jstree-er"></i>' + txt + '<ins class="jstree-copy" style="display:none;">+</ins></div>');
-					}
-				}, this));
-		};
-	};
-
-	$(function() {
-		// bind only once for all instances
-		var lastmv = false,
-			laster = false,
-			lastev = false,
-			opento = false,
-			marker = $('<div id="jstree-marker">&#160;</div>').hide(); //.appendTo('body');
-
-		$(document)
-			.on('dnd_start.vakata.jstree', function (e, data) {
-				lastmv = false;
-				lastev = false;
-				if(!data || !data.data || !data.data.jstree) { return; }
-				marker.appendTo('body'); //.show();
-			})
-			.on('dnd_move.vakata.jstree', function (e, data) {
-				if(opento) { clearTimeout(opento); }
-				if(!data || !data.data || !data.data.jstree) { return; }
-
-				// if we are hovering the marker image do nothing (can happen on "inside" drags)
-				if(data.event.target.id && data.event.target.id === 'jstree-marker') {
-					return;
-				}
-				lastev = data.event;
-
-				var ins = $.jstree.reference(data.event.target),
-					ref = false,
-					off = false,
-					rel = false,
-					tmp, l, t, h, p, i, o, ok, t1, t2, op, ps, pr, ip, tm;
-				// if we are over an instance
-				if(ins && ins._data && ins._data.dnd) {
-					marker.attr('class', 'jstree-' + ins.get_theme() + ( ins.settings.core.themes.responsive ? ' jstree-dnd-responsive' : '' ));
-					data.helper
-						.children().attr('class', 'jstree-' + ins.get_theme() + ' jstree-' + ins.get_theme() + '-' + ins.get_theme_variant() + ' ' + ( ins.settings.core.themes.responsive ? ' jstree-dnd-responsive' : '' ))
-						.find('.jstree-copy').first()[ data.data.origin && (data.data.origin.settings.dnd.always_copy || (data.data.origin.settings.dnd.copy && (data.event.metaKey || data.event.ctrlKey))) ? 'show' : 'hide' ]();
-
-
-					// if are hovering the container itself add a new root node
-					if( (data.event.target === ins.element[0] || data.event.target === ins.get_container_ul()[0]) && ins.get_container_ul().children().length === 0) {
-						ok = true;
-						for(t1 = 0, t2 = data.data.nodes.length; t1 < t2; t1++) {
-							ok = ok && ins.check( (data.data.origin && (data.data.origin.settings.dnd.always_copy || (data.data.origin.settings.dnd.copy && (data.event.metaKey || data.event.ctrlKey)) ) ? "copy_node" : "move_node"), (data.data.origin && data.data.origin !== ins ? data.data.origin.get_node(data.data.nodes[t1]) : data.data.nodes[t1]), $.jstree.root, 'last', { 'dnd' : true, 'ref' : ins.get_node($.jstree.root), 'pos' : 'i', 'origin' : data.data.origin, 'is_multi' : (data.data.origin && data.data.origin !== ins), 'is_foreign' : (!data.data.origin) });
-							if(!ok) { break; }
-						}
-						if(ok) {
-							lastmv = { 'ins' : ins, 'par' : $.jstree.root, 'pos' : 'last' };
-							marker.hide();
-							data.helper.find('.jstree-icon').first().removeClass('jstree-er').addClass('jstree-ok');
-							return;
-						}
-					}
-					else {
-						// if we are hovering a tree node
-						ref = ins.settings.dnd.large_drop_target ? $(data.event.target).closest('.jstree-node').children('.jstree-anchor') : $(data.event.target).closest('.jstree-anchor');
-						if(ref && ref.length && ref.parent().is('.jstree-closed, .jstree-open, .jstree-leaf')) {
-							off = ref.offset();
-							rel = data.event.pageY - off.top;
-							h = ref.outerHeight();
-							if(rel < h / 3) {
-								o = ['b', 'i', 'a'];
-							}
-							else if(rel > h - h / 3) {
-								o = ['a', 'i', 'b'];
-							}
-							else {
-								o = rel > h / 2 ? ['i', 'a', 'b'] : ['i', 'b', 'a'];
-							}
-							$.each(o, function (j, v) {
-								switch(v) {
-									case 'b':
-										l = off.left - 6;
-										t = off.top;
-										p = ins.get_parent(ref);
-										i = ref.parent().index();
-										break;
-									case 'i':
-										ip = ins.settings.dnd.inside_pos;
-										tm = ins.get_node(ref.parent());
-										l = off.left - 2;
-										t = off.top + h / 2 + 1;
-										p = tm.id;
-										i = ip === 'first' ? 0 : (ip === 'last' ? tm.children.length : Math.min(ip, tm.children.length));
-										break;
-									case 'a':
-										l = off.left - 6;
-										t = off.top + h;
-										p = ins.get_parent(ref);
-										i = ref.parent().index() + 1;
-										break;
-								}
-								ok = true;
-								for(t1 = 0, t2 = data.data.nodes.length; t1 < t2; t1++) {
-									op = data.data.origin && (data.data.origin.settings.dnd.always_copy || (data.data.origin.settings.dnd.copy && (data.event.metaKey || data.event.ctrlKey))) ? "copy_node" : "move_node";
-									ps = i;
-									if(op === "move_node" && v === 'a' && (data.data.origin && data.data.origin === ins) && p === ins.get_parent(data.data.nodes[t1])) {
-										pr = ins.get_node(p);
-										if(ps > $.inArray(data.data.nodes[t1], pr.children)) {
-											ps -= 1;
-										}
-									}
-									ok = ok && ( (ins && ins.settings && ins.settings.dnd && ins.settings.dnd.check_while_dragging === false) || ins.check(op, (data.data.origin && data.data.origin !== ins ? data.data.origin.get_node(data.data.nodes[t1]) : data.data.nodes[t1]), p, ps, { 'dnd' : true, 'ref' : ins.get_node(ref.parent()), 'pos' : v, 'origin' : data.data.origin, 'is_multi' : (data.data.origin && data.data.origin !== ins), 'is_foreign' : (!data.data.origin) }) );
-									if(!ok) {
-										if(ins && ins.last_error) { laster = ins.last_error(); }
-										break;
-									}
-								}
-								if(v === 'i' && ref.parent().is('.jstree-closed') && ins.settings.dnd.open_timeout) {
-									opento = setTimeout((function (x, z) { return function () { x.open_node(z); }; }(ins, ref)), ins.settings.dnd.open_timeout);
-								}
-								if(ok) {
-									lastmv = { 'ins' : ins, 'par' : p, 'pos' : v === 'i' && ip === 'last' && i === 0 && !ins.is_loaded(tm) ? 'last' : i };
-									marker.css({ 'left' : l + 'px', 'top' : t + 'px' }).show();
-									data.helper.find('.jstree-icon').first().removeClass('jstree-er').addClass('jstree-ok');
-									laster = {};
-									o = true;
-									return false;
-								}
-							});
-							if(o === true) { return; }
-						}
-					}
-				}
-				lastmv = false;
-				data.helper.find('.jstree-icon').removeClass('jstree-ok').addClass('jstree-er');
-				marker.hide();
-			})
-			.on('dnd_scroll.vakata.jstree', function (e, data) {
-				if(!data || !data.data || !data.data.jstree) { return; }
-				marker.hide();
-				lastmv = false;
-				lastev = false;
-				data.helper.find('.jstree-icon').first().removeClass('jstree-ok').addClass('jstree-er');
-			})
-			.on('dnd_stop.vakata.jstree', function (e, data) {
-				if(opento) { clearTimeout(opento); }
-				if(!data || !data.data || !data.data.jstree) { return; }
-				marker.hide().detach();
-				var i, j, nodes = [];
-				if(lastmv) {
-					for(i = 0, j = data.data.nodes.length; i < j; i++) {
-						nodes[i] = data.data.origin ? data.data.origin.get_node(data.data.nodes[i]) : data.data.nodes[i];
-					}
-					lastmv.ins[ data.data.origin && (data.data.origin.settings.dnd.always_copy || (data.data.origin.settings.dnd.copy && (data.event.metaKey || data.event.ctrlKey))) ? 'copy_node' : 'move_node' ](nodes, lastmv.par, lastmv.pos, false, false, false, data.data.origin);
-				}
-				else {
-					i = $(data.event.target).closest('.jstree');
-					if(i.length && laster && laster.error && laster.error === 'check') {
-						i = i.jstree(true);
-						if(i) {
-							i.settings.core.error.call(this, laster);
-						}
-					}
-				}
-				lastev = false;
-				lastmv = false;
-			})
-			.on('keyup.jstree keydown.jstree', function (e, data) {
-				data = $.vakata.dnd._get();
-				if(data && data.data && data.data.jstree) {
-					data.helper.find('.jstree-copy').first()[ data.data.origin && (data.data.origin.settings.dnd.always_copy || (data.data.origin.settings.dnd.copy && (e.metaKey || e.ctrlKey))) ? 'show' : 'hide' ]();
-					if(lastev) {
-						lastev.metaKey = e.metaKey;
-						lastev.ctrlKey = e.ctrlKey;
-						$.vakata.dnd._trigger('move', lastev);
-					}
-				}
-			});
-	});
-
-	// helpers
-	(function ($) {
-		$.vakata.html = {
-			div : $('<div />'),
-			escape : function (str) {
-				return $.vakata.html.div.text(str).html();
-			},
-			strip : function (str) {
-				return $.vakata.html.div.empty().append($.parseHTML(str)).text();
-			}
-		};
-		// private variable
-		var vakata_dnd = {
-			element	: false,
-			target	: false,
-			is_down	: false,
-			is_drag	: false,
-			helper	: false,
-			helper_w: 0,
-			data	: false,
-			init_x	: 0,
-			init_y	: 0,
-			scroll_l: 0,
-			scroll_t: 0,
-			scroll_e: false,
-			scroll_i: false,
-			is_touch: false
-		};
-		$.vakata.dnd = {
-			settings : {
-				scroll_speed		: 10,
-				scroll_proximity	: 20,
-				helper_left			: 5,
-				helper_top			: 10,
-				threshold			: 5,
-				threshold_touch		: 50
-			},
-			_trigger : function (event_name, e) {
-				var data = $.vakata.dnd._get();
-				data.event = e;
-				$(document).triggerHandler("dnd_" + event_name + ".vakata", data);
-			},
-			_get : function () {
-				return {
-					"data"		: vakata_dnd.data,
-					"element"	: vakata_dnd.element,
-					"helper"	: vakata_dnd.helper
-				};
-			},
-			_clean : function () {
-				if(vakata_dnd.helper) { vakata_dnd.helper.remove(); }
-				if(vakata_dnd.scroll_i) { clearInterval(vakata_dnd.scroll_i); vakata_dnd.scroll_i = false; }
-				vakata_dnd = {
-					element	: false,
-					target	: false,
-					is_down	: false,
-					is_drag	: false,
-					helper	: false,
-					helper_w: 0,
-					data	: false,
-					init_x	: 0,
-					init_y	: 0,
-					scroll_l: 0,
-					scroll_t: 0,
-					scroll_e: false,
-					scroll_i: false,
-					is_touch: false
-				};
-				$(document).off("mousemove.vakata.jstree touchmove.vakata.jstree", $.vakata.dnd.drag);
-				$(document).off("mouseup.vakata.jstree touchend.vakata.jstree", $.vakata.dnd.stop);
-			},
-			_scroll : function (init_only) {
-				if(!vakata_dnd.scroll_e || (!vakata_dnd.scroll_l && !vakata_dnd.scroll_t)) {
-					if(vakata_dnd.scroll_i) { clearInterval(vakata_dnd.scroll_i); vakata_dnd.scroll_i = false; }
-					return false;
-				}
-				if(!vakata_dnd.scroll_i) {
-					vakata_dnd.scroll_i = setInterval($.vakata.dnd._scroll, 100);
-					return false;
-				}
-				if(init_only === true) { return false; }
-
-				var i = vakata_dnd.scroll_e.scrollTop(),
-					j = vakata_dnd.scroll_e.scrollLeft();
-				vakata_dnd.scroll_e.scrollTop(i + vakata_dnd.scroll_t * $.vakata.dnd.settings.scroll_speed);
-				vakata_dnd.scroll_e.scrollLeft(j + vakata_dnd.scroll_l * $.vakata.dnd.settings.scroll_speed);
-				if(i !== vakata_dnd.scroll_e.scrollTop() || j !== vakata_dnd.scroll_e.scrollLeft()) {
-					/**
-					 * triggered on the document when a drag causes an element to scroll
-					 * @event
-					 * @plugin dnd
-					 * @name dnd_scroll.vakata
-					 * @param {Mixed} data any data supplied with the call to $.vakata.dnd.start
-					 * @param {DOM} element the DOM element being dragged
-					 * @param {jQuery} helper the helper shown next to the mouse
-					 * @param {jQuery} event the element that is scrolling
-					 */
-					$.vakata.dnd._trigger("scroll", vakata_dnd.scroll_e);
-				}
-			},
-			start : function (e, data, html) {
-				if(e.type === "touchstart" && e.originalEvent && e.originalEvent.changedTouches && e.originalEvent.changedTouches[0]) {
-					e.pageX = e.originalEvent.changedTouches[0].pageX;
-					e.pageY = e.originalEvent.changedTouches[0].pageY;
-					e.target = document.elementFromPoint(e.originalEvent.changedTouches[0].pageX - window.pageXOffset, e.originalEvent.changedTouches[0].pageY - window.pageYOffset);
-				}
-				if(vakata_dnd.is_drag) { $.vakata.dnd.stop({}); }
-				try {
-					e.currentTarget.unselectable = "on";
-					e.currentTarget.onselectstart = function() { return false; };
-					if(e.currentTarget.style) { e.currentTarget.style.MozUserSelect = "none"; }
-				} catch(ignore) { }
-				vakata_dnd.init_x	= e.pageX;
-				vakata_dnd.init_y	= e.pageY;
-				vakata_dnd.data		= data;
-				vakata_dnd.is_down	= true;
-				vakata_dnd.element	= e.currentTarget;
-				vakata_dnd.target	= e.target;
-				vakata_dnd.is_touch	= e.type === "touchstart";
-				if(html !== false) {
-					vakata_dnd.helper = $("<div id='vakata-dnd'></div>").html(html).css({
-						"display"		: "block",
-						"margin"		: "0",
-						"padding"		: "0",
-						"position"		: "absolute",
-						"top"			: "-2000px",
-						"lineHeight"	: "16px",
-						"zIndex"		: "10000"
-					});
-				}
-				$(document).on("mousemove.vakata.jstree touchmove.vakata.jstree", $.vakata.dnd.drag);
-				$(document).on("mouseup.vakata.jstree touchend.vakata.jstree", $.vakata.dnd.stop);
-				return false;
-			},
-			drag : function (e) {
-				if(e.type === "touchmove" && e.originalEvent && e.originalEvent.changedTouches && e.originalEvent.changedTouches[0]) {
-					e.pageX = e.originalEvent.changedTouches[0].pageX;
-					e.pageY = e.originalEvent.changedTouches[0].pageY;
-					e.target = document.elementFromPoint(e.originalEvent.changedTouches[0].pageX - window.pageXOffset, e.originalEvent.changedTouches[0].pageY - window.pageYOffset);
-				}
-				if(!vakata_dnd.is_down) { return; }
-				if(!vakata_dnd.is_drag) {
-					if(
-						Math.abs(e.pageX - vakata_dnd.init_x) > (vakata_dnd.is_touch ? $.vakata.dnd.settings.threshold_touch : $.vakata.dnd.settings.threshold) ||
-						Math.abs(e.pageY - vakata_dnd.init_y) > (vakata_dnd.is_touch ? $.vakata.dnd.settings.threshold_touch : $.vakata.dnd.settings.threshold)
-					) {
-						if(vakata_dnd.helper) {
-							vakata_dnd.helper.appendTo("body");
-							vakata_dnd.helper_w = vakata_dnd.helper.outerWidth();
-						}
-						vakata_dnd.is_drag = true;
-						/**
-						 * triggered on the document when a drag starts
-						 * @event
-						 * @plugin dnd
-						 * @name dnd_start.vakata
-						 * @param {Mixed} data any data supplied with the call to $.vakata.dnd.start
-						 * @param {DOM} element the DOM element being dragged
-						 * @param {jQuery} helper the helper shown next to the mouse
-						 * @param {Object} event the event that caused the start (probably mousemove)
-						 */
-						$.vakata.dnd._trigger("start", e);
-					}
-					else { return; }
-				}
-
-				var d  = false, w  = false,
-					dh = false, wh = false,
-					dw = false, ww = false,
-					dt = false, dl = false,
-					ht = false, hl = false;
-
-				vakata_dnd.scroll_t = 0;
-				vakata_dnd.scroll_l = 0;
-				vakata_dnd.scroll_e = false;
-				$($(e.target).parentsUntil("body").addBack().get().reverse())
-					.filter(function () {
-						return	(/^auto|scroll$/).test($(this).css("overflow")) &&
-								(this.scrollHeight > this.offsetHeight || this.scrollWidth > this.offsetWidth);
-					})
-					.each(function () {
-						var t = $(this), o = t.offset();
-						if(this.scrollHeight > this.offsetHeight) {
-							if(o.top + t.height() - e.pageY < $.vakata.dnd.settings.scroll_proximity)	{ vakata_dnd.scroll_t = 1; }
-							if(e.pageY - o.top < $.vakata.dnd.settings.scroll_proximity)				{ vakata_dnd.scroll_t = -1; }
-						}
-						if(this.scrollWidth > this.offsetWidth) {
-							if(o.left + t.width() - e.pageX < $.vakata.dnd.settings.scroll_proximity)	{ vakata_dnd.scroll_l = 1; }
-							if(e.pageX - o.left < $.vakata.dnd.settings.scroll_proximity)				{ vakata_dnd.scroll_l = -1; }
-						}
-						if(vakata_dnd.scroll_t || vakata_dnd.scroll_l) {
-							vakata_dnd.scroll_e = $(this);
-							return false;
-						}
-					});
-
-				if(!vakata_dnd.scroll_e) {
-					d  = $(document); w = $(window);
-					dh = d.height(); wh = w.height();
-					dw = d.width(); ww = w.width();
-					dt = d.scrollTop(); dl = d.scrollLeft();
-					if(dh > wh && e.pageY - dt < $.vakata.dnd.settings.scroll_proximity)		{ vakata_dnd.scroll_t = -1;  }
-					if(dh > wh && wh - (e.pageY - dt) < $.vakata.dnd.settings.scroll_proximity)	{ vakata_dnd.scroll_t = 1; }
-					if(dw > ww && e.pageX - dl < $.vakata.dnd.settings.scroll_proximity)		{ vakata_dnd.scroll_l = -1; }
-					if(dw > ww && ww - (e.pageX - dl) < $.vakata.dnd.settings.scroll_proximity)	{ vakata_dnd.scroll_l = 1; }
-					if(vakata_dnd.scroll_t || vakata_dnd.scroll_l) {
-						vakata_dnd.scroll_e = d;
-					}
-				}
-				if(vakata_dnd.scroll_e) { $.vakata.dnd._scroll(true); }
-
-				if(vakata_dnd.helper) {
-					ht = parseInt(e.pageY + $.vakata.dnd.settings.helper_top, 10);
-					hl = parseInt(e.pageX + $.vakata.dnd.settings.helper_left, 10);
-					if(dh && ht + 25 > dh) { ht = dh - 50; }
-					if(dw && hl + vakata_dnd.helper_w > dw) { hl = dw - (vakata_dnd.helper_w + 2); }
-					vakata_dnd.helper.css({
-						left	: hl + "px",
-						top		: ht + "px"
-					});
-				}
-				/**
-				 * triggered on the document when a drag is in progress
-				 * @event
-				 * @plugin dnd
-				 * @name dnd_move.vakata
-				 * @param {Mixed} data any data supplied with the call to $.vakata.dnd.start
-				 * @param {DOM} element the DOM element being dragged
-				 * @param {jQuery} helper the helper shown next to the mouse
-				 * @param {Object} event the event that caused this to trigger (most likely mousemove)
-				 */
-				$.vakata.dnd._trigger("move", e);
-				return false;
-			},
-			stop : function (e) {
-				if(e.type === "touchend" && e.originalEvent && e.originalEvent.changedTouches && e.originalEvent.changedTouches[0]) {
-					e.pageX = e.originalEvent.changedTouches[0].pageX;
-					e.pageY = e.originalEvent.changedTouches[0].pageY;
-					e.target = document.elementFromPoint(e.originalEvent.changedTouches[0].pageX - window.pageXOffset, e.originalEvent.changedTouches[0].pageY - window.pageYOffset);
-				}
-				if(vakata_dnd.is_drag) {
-					/**
-					 * triggered on the document when a drag stops (the dragged element is dropped)
-					 * @event
-					 * @plugin dnd
-					 * @name dnd_stop.vakata
-					 * @param {Mixed} data any data supplied with the call to $.vakata.dnd.start
-					 * @param {DOM} element the DOM element being dragged
-					 * @param {jQuery} helper the helper shown next to the mouse
-					 * @param {Object} event the event that caused the stop
-					 */
-					$.vakata.dnd._trigger("stop", e);
-				}
-				else {
-					if(e.type === "touchend" && e.target === vakata_dnd.target) {
-						var to = setTimeout(function () { $(e.target).click(); }, 100);
-						$(e.target).one('click', function() { if(to) { clearTimeout(to); } });
-					}
-				}
-				$.vakata.dnd._clean();
-				return false;
-			}
-		};
-	}($));
-
-	// include the dnd plugin by default
-	// $.jstree.defaults.plugins.push("dnd");
-
-
-/**
- * ### Massload plugin
- *
- * Adds massload functionality to jsTree, so that multiple nodes can be loaded in a single request (only useful with lazy loading).
- */
-
-	/**
-	 * massload configuration
-	 *
-	 * It is possible to set this to a standard jQuery-like AJAX config.
-	 * In addition to the standard jQuery ajax options here you can supply functions for `data` and `url`, the functions will be run in the current instance's scope and a param will be passed indicating which node IDs need to be loaded, the return value of those functions will be used.
-	 *
-	 * You can also set this to a function, that function will receive the node IDs being loaded as argument and a second param which is a function (callback) which should be called with the result.
-	 *
-	 * Both the AJAX and the function approach rely on the same return value - an object where the keys are the node IDs, and the value is the children of that node as an array.
-	 *
-	 *	{
-	 *		"id1" : [{ "text" : "Child of ID1", "id" : "c1" }, { "text" : "Another child of ID1", "id" : "c2" }],
-	 *		"id2" : [{ "text" : "Child of ID2", "id" : "c3" }]
-	 *	}
-	 * 
-	 * @name $.jstree.defaults.massload
-	 * @plugin massload
-	 */
-	$.jstree.defaults.massload = null;
-	$.jstree.plugins.massload = function (options, parent) {
-		this.init = function (el, options) {
-			parent.init.call(this, el, options);
-			this._data.massload = {};
-		};
-		this._load_nodes = function (nodes, callback, is_callback) {
-			var s = this.settings.massload;
-			if(is_callback && !$.isEmptyObject(this._data.massload)) {
-				return parent._load_nodes.call(this, nodes, callback, is_callback);
-			}
-			if($.isFunction(s)) {
-				return s.call(this, nodes, $.proxy(function (data) {
-					if(data) {
-						for(var i in data) {
-							if(data.hasOwnProperty(i)) {
-								this._data.massload[i] = data[i];
-							}
-						}
-					}
-					parent._load_nodes.call(this, nodes, callback, is_callback);
-				}, this));
-			}
-			if(typeof s === 'object' && s && s.url) {
-				s = $.extend(true, {}, s);
-				if($.isFunction(s.url)) {
-					s.url = s.url.call(this, nodes);
-				}
-				if($.isFunction(s.data)) {
-					s.data = s.data.call(this, nodes);
-				}
-				return $.ajax(s)
-					.done($.proxy(function (data,t,x) {
-							if(data) {
-								for(var i in data) {
-									if(data.hasOwnProperty(i)) {
-										this._data.massload[i] = data[i];
-									}
-								}
-							}
-							parent._load_nodes.call(this, nodes, callback, is_callback);
-						}, this))
-					.fail($.proxy(function (f) {
-							parent._load_nodes.call(this, nodes, callback, is_callback);
-						}, this));
-			}
-			return parent._load_nodes.call(this, nodes, callback, is_callback);
-		};
-		this._load_node = function (obj, callback) {
-			var d = this._data.massload[obj.id];
-			if(d) {
-				return this[typeof d === 'string' ? '_append_html_data' : '_append_json_data'](obj, typeof d === 'string' ? $($.parseHTML(d)).filter(function () { return this.nodeType !== 3; }) : d, function (status) {
-					callback.call(this, status);
-					delete this._data.massload[obj.id];
-				});
-			}
-			return parent._load_node.call(this, obj, callback);
-		};
-	};
-
-/**
- * ### Search plugin
- *
- * Adds search functionality to jsTree.
- */
-
-	/**
-	 * stores all defaults for the search plugin
-	 * @name $.jstree.defaults.search
-	 * @plugin search
-	 */
-	$.jstree.defaults.search = {
-		/**
-		 * a jQuery-like AJAX config, which jstree uses if a server should be queried for results. 
-		 * 
-		 * A `str` (which is the search string) parameter will be added with the request, an optional `inside` parameter will be added if the search is limited to a node id. The expected result is a JSON array with nodes that need to be opened so that matching nodes will be revealed.
-		 * Leave this setting as `false` to not query the server. You can also set this to a function, which will be invoked in the instance's scope and receive 3 parameters - the search string, the callback to call with the array of nodes to load, and the optional node ID to limit the search to 
-		 * @name $.jstree.defaults.search.ajax
-		 * @plugin search
-		 */
-		ajax : false,
-		/**
-		 * Indicates if the search should be fuzzy or not (should `chnd3` match `child node 3`). Default is `false`.
-		 * @name $.jstree.defaults.search.fuzzy
-		 * @plugin search
-		 */
-		fuzzy : false,
-		/**
-		 * Indicates if the search should be case sensitive. Default is `false`.
-		 * @name $.jstree.defaults.search.case_sensitive
-		 * @plugin search
-		 */
-		case_sensitive : false,
-		/**
-		 * Indicates if the tree should be filtered (by default) to show only matching nodes (keep in mind this can be a heavy on large trees in old browsers). 
-		 * This setting can be changed at runtime when calling the search method. Default is `false`.
-		 * @name $.jstree.defaults.search.show_only_matches
-		 * @plugin search
-		 */
-		show_only_matches : false,
-		/**
-		 * Indicates if the children of matched element are shown (when show_only_matches is true)
-		 * This setting can be changed at runtime when calling the search method. Default is `false`.
-		 * @name $.jstree.defaults.search.show_only_matches_children
-		 * @plugin search
-		 */
-		show_only_matches_children : false,
-		/**
-		 * Indicates if all nodes opened to reveal the search result, should be closed when the search is cleared or a new search is performed. Default is `true`.
-		 * @name $.jstree.defaults.search.close_opened_onclear
-		 * @plugin search
-		 */
-		close_opened_onclear : true,
-		/**
-		 * Indicates if only leaf nodes should be included in search results. Default is `false`.
-		 * @name $.jstree.defaults.search.search_leaves_only
-		 * @plugin search
-		 */
-		search_leaves_only : false,
-		/**
-		 * If set to a function it wil be called in the instance's scope with two arguments - search string and node (where node will be every node in the structure, so use with caution).
-		 * If the function returns a truthy value the node will be considered a match (it might not be displayed if search_only_leaves is set to true and the node is not a leaf). Default is `false`.
-		 * @name $.jstree.defaults.search.search_callback
-		 * @plugin search
-		 */
-		search_callback : false
-	};
-
-	$.jstree.plugins.search = function (options, parent) {
-		this.bind = function () {
-			parent.bind.call(this);
-
-			this._data.search.str = "";
-			this._data.search.dom = $();
-			this._data.search.res = [];
-			this._data.search.opn = [];
-			this._data.search.som = false;
-			this._data.search.smc = false;
-			this._data.search.hdn = [];
-
-			this.element
-				.on("search.jstree", $.proxy(function (e, data) {
-						if(this._data.search.som && data.res.length) {
-							var m = this._model.data, i, j, p = [];
-							for(i = 0, j = data.res.length; i < j; i++) {
-								if(m[data.res[i]] && !m[data.res[i]].state.hidden) {
-									p.push(data.res[i]);
-									p = p.concat(m[data.res[i]].parents);
-									if(this._data.search.smc) {
-										p = p.concat(m[data.res[i]].children_d);
-									}
-								}
-							}
-							p = $.vakata.array_remove_item($.vakata.array_unique(p), $.jstree.root);
-							this._data.search.hdn = this.hide_all(true);
-							this.show_node(p);
-						}
-					}, this))
-				.on("clear_search.jstree", $.proxy(function (e, data) {
-						if(this._data.search.som && data.res.length) {
-							this.show_node(this._data.search.hdn);
-						}
-					}, this));
-		};
-		/**
-		 * used to search the tree nodes for a given string
-		 * @name search(str [, skip_async])
-		 * @param {String} str the search string
-		 * @param {Boolean} skip_async if set to true server will not be queried even if configured
-		 * @param {Boolean} show_only_matches if set to true only matching nodes will be shown (keep in mind this can be very slow on large trees or old browsers)
-		 * @param {mixed} inside an optional node to whose children to limit the search
-		 * @param {Boolean} append if set to true the results of this search are appended to the previous search
-		 * @plugin search
-		 * @trigger search.jstree
-		 */
-		this.search = function (str, skip_async, show_only_matches, inside, append, show_only_matches_children) {
-			if(str === false || $.trim(str.toString()) === "") {
-				return this.clear_search();
-			}
-			inside = this.get_node(inside);
-			inside = inside && inside.id ? inside.id : null;
-			str = str.toString();
-			var s = this.settings.search,
-				a = s.ajax ? s.ajax : false,
-				m = this._model.data,
-				f = null,
-				r = [],
-				p = [], i, j;
-			if(this._data.search.res.length && !append) {
-				this.clear_search();
-			}
-			if(show_only_matches === undefined) {
-				show_only_matches = s.show_only_matches;
-			}
-			if(show_only_matches_children === undefined) {
-				show_only_matches_children = s.show_only_matches_children;
-			}
-			if(!skip_async && a !== false) {
-				if($.isFunction(a)) {
-					return a.call(this, str, $.proxy(function (d) {
-							if(d && d.d) { d = d.d; }
-							this._load_nodes(!$.isArray(d) ? [] : $.vakata.array_unique(d), function () {
-								this.search(str, true, show_only_matches, inside, append);
-							}, true);
-						}, this), inside);
-				}
-				else {
-					a = $.extend({}, a);
-					if(!a.data) { a.data = {}; }
-					a.data.str = str;
-					if(inside) {
-						a.data.inside = inside;
-					}
-					return $.ajax(a)
-						.fail($.proxy(function () {
-							this._data.core.last_error = { 'error' : 'ajax', 'plugin' : 'search', 'id' : 'search_01', 'reason' : 'Could not load search parents', 'data' : JSON.stringify(a) };
-							this.settings.core.error.call(this, this._data.core.last_error);
-						}, this))
-						.done($.proxy(function (d) {
-							if(d && d.d) { d = d.d; }
-							this._load_nodes(!$.isArray(d) ? [] : $.vakata.array_unique(d), function () {
-								this.search(str, true, show_only_matches, inside, append);
-							}, true);
-						}, this));
-				}
-			}
-			if(!append) {
-				this._data.search.str = str;
-				this._data.search.dom = $();
-				this._data.search.res = [];
-				this._data.search.opn = [];
-				this._data.search.som = show_only_matches;
-				this._data.search.smc = show_only_matches_children;
-			}
-
-			f = new $.vakata.search(str, true, { caseSensitive : s.case_sensitive, fuzzy : s.fuzzy });
-			$.each(m[inside ? inside : $.jstree.root].children_d, function (ii, i) {
-				var v = m[i];
-				if(v.text && (!s.search_leaves_only || (v.state.loaded && v.children.length === 0)) && ( (s.search_callback && s.search_callback.call(this, str, v)) || (!s.search_callback && f.search(v.text).isMatch) ) ) {
-					r.push(i);
-					p = p.concat(v.parents);
-				}
-			});
-			if(r.length) {
-				p = $.vakata.array_unique(p);
-				for(i = 0, j = p.length; i < j; i++) {
-					if(p[i] !== $.jstree.root && m[p[i]] && this.open_node(p[i], null, 0) === true) {
-						this._data.search.opn.push(p[i]);
-					}
-				}
-				if(!append) {
-					this._data.search.dom = $(this.element[0].querySelectorAll('#' + $.map(r, function (v) { return "0123456789".indexOf(v[0]) !== -1 ? '\\3' + v[0] + ' ' + v.substr(1).replace($.jstree.idregex,'\\$&') : v.replace($.jstree.idregex,'\\$&'); }).join(', #')));
-					this._data.search.res = r;
-				}
-				else {
-					this._data.search.dom = this._data.search.dom.add($(this.element[0].querySelectorAll('#' + $.map(r, function (v) { return "0123456789".indexOf(v[0]) !== -1 ? '\\3' + v[0] + ' ' + v.substr(1).replace($.jstree.idregex,'\\$&') : v.replace($.jstree.idregex,'\\$&'); }).join(', #'))));
-					this._data.search.res = $.vakata.array_unique(this._data.search.res.concat(r));
-				}
-				this._data.search.dom.children(".jstree-anchor").addClass('jstree-search');
-			}
-			/**
-			 * triggered after search is complete
-			 * @event
-			 * @name search.jstree
-			 * @param {jQuery} nodes a jQuery collection of matching nodes
-			 * @param {String} str the search string
-			 * @param {Array} res a collection of objects represeing the matching nodes
-			 * @plugin search
-			 */
-			this.trigger('search', { nodes : this._data.search.dom, str : str, res : this._data.search.res, show_only_matches : show_only_matches });
-		};
-		/**
-		 * used to clear the last search (removes classes and shows all nodes if filtering is on)
-		 * @name clear_search()
-		 * @plugin search
-		 * @trigger clear_search.jstree
-		 */
-		this.clear_search = function () {
-			if(this.settings.search.close_opened_onclear) {
-				this.close_node(this._data.search.opn, 0);
-			}
-			/**
-			 * triggered after search is complete
-			 * @event
-			 * @name clear_search.jstree
-			 * @param {jQuery} nodes a jQuery collection of matching nodes (the result from the last search)
-			 * @param {String} str the search string (the last search string)
-			 * @param {Array} res a collection of objects represeing the matching nodes (the result from the last search)
-			 * @plugin search
-			 */
-			this.trigger('clear_search', { 'nodes' : this._data.search.dom, str : this._data.search.str, res : this._data.search.res });
-			if(this._data.search.res.length) {
-				this._data.search.dom = $(this.element[0].querySelectorAll('#' + $.map(this._data.search.res, function (v) {
-					return "0123456789".indexOf(v[0]) !== -1 ? '\\3' + v[0] + ' ' + v.substr(1).replace($.jstree.idregex,'\\$&') : v.replace($.jstree.idregex,'\\$&');
-				}).join(', #')));
-				this._data.search.dom.children(".jstree-anchor").removeClass("jstree-search");
-			}
-			this._data.search.str = "";
-			this._data.search.res = [];
-			this._data.search.opn = [];
-			this._data.search.dom = $();
-		};
-
-		this.redraw_node = function(obj, deep, callback, force_render) {
-			obj = parent.redraw_node.apply(this, arguments);
-			if(obj) {
-				if($.inArray(obj.id, this._data.search.res) !== -1) {
-					var i, j, tmp = null;
-					for(i = 0, j = obj.childNodes.length; i < j; i++) {
-						if(obj.childNodes[i] && obj.childNodes[i].className && obj.childNodes[i].className.indexOf("jstree-anchor") !== -1) {
-							tmp = obj.childNodes[i];
-							break;
-						}
-					}
-					if(tmp) {
-						tmp.className += ' jstree-search';
-					}
-				}
-			}
-			return obj;
-		};
-	};
-
-	// helpers
-	(function ($) {
-		// from http://kiro.me/projects/fuse.html
-		$.vakata.search = function(pattern, txt, options) {
-			options = options || {};
-			options = $.extend({}, $.vakata.search.defaults, options);
-			if(options.fuzzy !== false) {
-				options.fuzzy = true;
-			}
-			pattern = options.caseSensitive ? pattern : pattern.toLowerCase();
-			var MATCH_LOCATION	= options.location,
-				MATCH_DISTANCE	= options.distance,
-				MATCH_THRESHOLD	= options.threshold,
-				patternLen = pattern.length,
-				matchmask, pattern_alphabet, match_bitapScore, search;
-			if(patternLen > 32) {
-				options.fuzzy = false;
-			}
-			if(options.fuzzy) {
-				matchmask = 1 << (patternLen - 1);
-				pattern_alphabet = (function () {
-					var mask = {},
-						i = 0;
-					for (i = 0; i < patternLen; i++) {
-						mask[pattern.charAt(i)] = 0;
-					}
-					for (i = 0; i < patternLen; i++) {
-						mask[pattern.charAt(i)] |= 1 << (patternLen - i - 1);
-					}
-					return mask;
-				}());
-				match_bitapScore = function (e, x) {
-					var accuracy = e / patternLen,
-						proximity = Math.abs(MATCH_LOCATION - x);
-					if(!MATCH_DISTANCE) {
-						return proximity ? 1.0 : accuracy;
-					}
-					return accuracy + (proximity / MATCH_DISTANCE);
-				};
-			}
-			search = function (text) {
-				text = options.caseSensitive ? text : text.toLowerCase();
-				if(pattern === text || text.indexOf(pattern) !== -1) {
-					return {
-						isMatch: true,
-						score: 0
-					};
-				}
-				if(!options.fuzzy) {
-					return {
-						isMatch: false,
-						score: 1
-					};
-				}
-				var i, j,
-					textLen = text.length,
-					scoreThreshold = MATCH_THRESHOLD,
-					bestLoc = text.indexOf(pattern, MATCH_LOCATION),
-					binMin, binMid,
-					binMax = patternLen + textLen,
-					lastRd, start, finish, rd, charMatch,
-					score = 1,
-					locations = [];
-				if (bestLoc !== -1) {
-					scoreThreshold = Math.min(match_bitapScore(0, bestLoc), scoreThreshold);
-					bestLoc = text.lastIndexOf(pattern, MATCH_LOCATION + patternLen);
-					if (bestLoc !== -1) {
-						scoreThreshold = Math.min(match_bitapScore(0, bestLoc), scoreThreshold);
-					}
-				}
-				bestLoc = -1;
-				for (i = 0; i < patternLen; i++) {
-					binMin = 0;
-					binMid = binMax;
-					while (binMin < binMid) {
-						if (match_bitapScore(i, MATCH_LOCATION + binMid) <= scoreThreshold) {
-							binMin = binMid;
-						} else {
-							binMax = binMid;
-						}
-						binMid = Math.floor((binMax - binMin) / 2 + binMin);
-					}
-					binMax = binMid;
-					start = Math.max(1, MATCH_LOCATION - binMid + 1);
-					finish = Math.min(MATCH_LOCATION + binMid, textLen) + patternLen;
-					rd = new Array(finish + 2);
-					rd[finish + 1] = (1 << i) - 1;
-					for (j = finish; j >= start; j--) {
-						charMatch = pattern_alphabet[text.charAt(j - 1)];
-						if (i === 0) {
-							rd[j] = ((rd[j + 1] << 1) | 1) & charMatch;
-						} else {
-							rd[j] = ((rd[j + 1] << 1) | 1) & charMatch | (((lastRd[j + 1] | lastRd[j]) << 1) | 1) | lastRd[j + 1];
-						}
-						if (rd[j] & matchmask) {
-							score = match_bitapScore(i, j - 1);
-							if (score <= scoreThreshold) {
-								scoreThreshold = score;
-								bestLoc = j - 1;
-								locations.push(bestLoc);
-								if (bestLoc > MATCH_LOCATION) {
-									start = Math.max(1, 2 * MATCH_LOCATION - bestLoc);
-								} else {
-									break;
-								}
-							}
-						}
-					}
-					if (match_bitapScore(i + 1, MATCH_LOCATION) > scoreThreshold) {
-						break;
-					}
-					lastRd = rd;
-				}
-				return {
-					isMatch: bestLoc >= 0,
-					score: score
-				};
-			};
-			return txt === true ? { 'search' : search } : search(txt);
-		};
-		$.vakata.search.defaults = {
-			location : 0,
-			distance : 100,
-			threshold : 0.6,
-			fuzzy : false,
-			caseSensitive : false
-		};
-	}($));
-
-	// include the search plugin by default
-	// $.jstree.defaults.plugins.push("search");
-
-
-/**
- * ### Sort plugin
- *
- * Automatically sorts all siblings in the tree according to a sorting function.
- */
-
-	/**
-	 * the settings function used to sort the nodes.
-	 * It is executed in the tree's context, accepts two nodes as arguments and should return `1` or `-1`.
-	 * @name $.jstree.defaults.sort
-	 * @plugin sort
-	 */
-	$.jstree.defaults.sort = function (a, b) {
-		//return this.get_type(a) === this.get_type(b) ? (this.get_text(a) > this.get_text(b) ? 1 : -1) : this.get_type(a) >= this.get_type(b);
-		return this.get_text(a) > this.get_text(b) ? 1 : -1;
-	};
-	$.jstree.plugins.sort = function (options, parent) {
-		this.bind = function () {
-			parent.bind.call(this);
-			this.element
-				.on("model.jstree", $.proxy(function (e, data) {
-						this.sort(data.parent, true);
-					}, this))
-				.on("rename_node.jstree create_node.jstree", $.proxy(function (e, data) {
-						this.sort(data.parent || data.node.parent, false);
-						this.redraw_node(data.parent || data.node.parent, true);
-					}, this))
-				.on("move_node.jstree copy_node.jstree", $.proxy(function (e, data) {
-						this.sort(data.parent, false);
-						this.redraw_node(data.parent, true);
-					}, this));
-		};
-		/**
-		 * used to sort a node's children
-		 * @private
-		 * @name sort(obj [, deep])
-		 * @param  {mixed} obj the node
-		 * @param {Boolean} deep if set to `true` nodes are sorted recursively.
-		 * @plugin sort
-		 * @trigger search.jstree
-		 */
-		this.sort = function (obj, deep) {
-			var i, j;
-			obj = this.get_node(obj);
-			if(obj && obj.children && obj.children.length) {
-				obj.children.sort($.proxy(this.settings.sort, this));
-				if(deep) {
-					for(i = 0, j = obj.children_d.length; i < j; i++) {
-						this.sort(obj.children_d[i], false);
-					}
-				}
-			}
-		};
-	};
-
-	// include the sort plugin by default
-	// $.jstree.defaults.plugins.push("sort");
-
-/**
- * ### State plugin
- *
- * Saves the state of the tree (selected nodes, opened nodes) on the user's computer using available options (localStorage, cookies, etc)
- */
-
-	var to = false;
-	/**
-	 * stores all defaults for the state plugin
-	 * @name $.jstree.defaults.state
-	 * @plugin state
-	 */
-	$.jstree.defaults.state = {
-		/**
-		 * A string for the key to use when saving the current tree (change if using multiple trees in your project). Defaults to `jstree`.
-		 * @name $.jstree.defaults.state.key
-		 * @plugin state
-		 */
-		key		: 'jstree',
-		/**
-		 * A space separated list of events that trigger a state save. Defaults to `changed.jstree open_node.jstree close_node.jstree`.
-		 * @name $.jstree.defaults.state.events
-		 * @plugin state
-		 */
-		events	: 'changed.jstree open_node.jstree close_node.jstree check_node.jstree uncheck_node.jstree',
-		/**
-		 * Time in milliseconds after which the state will expire. Defaults to 'false' meaning - no expire.
-		 * @name $.jstree.defaults.state.ttl
-		 * @plugin state
-		 */
-		ttl		: false,
-		/**
-		 * A function that will be executed prior to restoring state with one argument - the state object. Can be used to clear unwanted parts of the state.
-		 * @name $.jstree.defaults.state.filter
-		 * @plugin state
-		 */
-		filter	: false
-	};
-	$.jstree.plugins.state = function (options, parent) {
-		this.bind = function () {
-			parent.bind.call(this);
-			var bind = $.proxy(function () {
-				this.element.on(this.settings.state.events, $.proxy(function () {
-					if(to) { clearTimeout(to); }
-					to = setTimeout($.proxy(function () { this.save_state(); }, this), 100);
-				}, this));
-				/**
-				 * triggered when the state plugin is finished restoring the state (and immediately after ready if there is no state to restore).
-				 * @event
-				 * @name state_ready.jstree
-				 * @plugin state
-				 */
-				this.trigger('state_ready');
-			}, this);
-			this.element
-				.on("ready.jstree", $.proxy(function (e, data) {
-						this.element.one("restore_state.jstree", bind);
-						if(!this.restore_state()) { bind(); }
-					}, this));
-		};
-		/**
-		 * save the state
-		 * @name save_state()
-		 * @plugin state
-		 */
-		this.save_state = function () {
-			var st = { 'state' : this.get_state(), 'ttl' : this.settings.state.ttl, 'sec' : +(new Date()) };
-			$.vakata.storage.set(this.settings.state.key, JSON.stringify(st));
-		};
-		/**
-		 * restore the state from the user's computer
-		 * @name restore_state()
-		 * @plugin state
-		 */
-		this.restore_state = function () {
-			var k = $.vakata.storage.get(this.settings.state.key);
-			if(!!k) { try { k = JSON.parse(k); } catch(ex) { return false; } }
-			if(!!k && k.ttl && k.sec && +(new Date()) - k.sec > k.ttl) { return false; }
-			if(!!k && k.state) { k = k.state; }
-			if(!!k && $.isFunction(this.settings.state.filter)) { k = this.settings.state.filter.call(this, k); }
-			if(!!k) {
-				this.element.one("set_state.jstree", function (e, data) { data.instance.trigger('restore_state', { 'state' : $.extend(true, {}, k) }); });
-				this.set_state(k);
-				return true;
-			}
-			return false;
-		};
-		/**
-		 * clear the state on the user's computer
-		 * @name clear_state()
-		 * @plugin state
-		 */
-		this.clear_state = function () {
-			return $.vakata.storage.del(this.settings.state.key);
-		};
-	};
-
-	(function ($, undefined) {
-		$.vakata.storage = {
-			// simply specifying the functions in FF throws an error
-			set : function (key, val) { return window.localStorage.setItem(key, val); },
-			get : function (key) { return window.localStorage.getItem(key); },
-			del : function (key) { return window.localStorage.removeItem(key); }
-		};
-	}($));
-
-	// include the state plugin by default
-	// $.jstree.defaults.plugins.push("state");
-
-/**
- * ### Types plugin
- *
- * Makes it possible to add predefined types for groups of nodes, which make it possible to easily control nesting rules and icon for each group.
- */
-
-	/**
-	 * An object storing all types as key value pairs, where the key is the type name and the value is an object that could contain following keys (all optional).
-	 *
-	 * * `max_children` the maximum number of immediate children this node type can have. Do not specify or set to `-1` for unlimited.
-	 * * `max_depth` the maximum number of nesting this node type can have. A value of `1` would mean that the node can have children, but no grandchildren. Do not specify or set to `-1` for unlimited.
-	 * * `valid_children` an array of node type strings, that nodes of this type can have as children. Do not specify or set to `-1` for no limits.
-	 * * `icon` a string - can be a path to an icon or a className, if using an image that is in the current directory use a `./` prefix, otherwise it will be detected as a class. Omit to use the default icon from your theme.
-	 *
-	 * There are two predefined types:
-	 *
-	 * * `#` represents the root of the tree, for example `max_children` would control the maximum number of root nodes.
-	 * * `default` represents the default node - any settings here will be applied to all nodes that do not have a type specified.
-	 *
-	 * @name $.jstree.defaults.types
-	 * @plugin types
-	 */
-	$.jstree.defaults.types = {
-		'default' : {}
-	};
-	$.jstree.defaults.types[$.jstree.root] = {};
-
-	$.jstree.plugins.types = function (options, parent) {
-		this.init = function (el, options) {
-			var i, j;
-			if(options && options.types && options.types['default']) {
-				for(i in options.types) {
-					if(i !== "default" && i !== $.jstree.root && options.types.hasOwnProperty(i)) {
-						for(j in options.types['default']) {
-							if(options.types['default'].hasOwnProperty(j) && options.types[i][j] === undefined) {
-								options.types[i][j] = options.types['default'][j];
-							}
-						}
-					}
-				}
-			}
-			parent.init.call(this, el, options);
-			this._model.data[$.jstree.root].type = $.jstree.root;
-		};
-		this.refresh = function (skip_loading, forget_state) {
-			parent.refresh.call(this, skip_loading, forget_state);
-			this._model.data[$.jstree.root].type = $.jstree.root;
-		};
-		this.bind = function () {
-			this.element
-				.on('model.jstree', $.proxy(function (e, data) {
-						var m = this._model.data,
-							dpc = data.nodes,
-							t = this.settings.types,
-							i, j, c = 'default';
-						for(i = 0, j = dpc.length; i < j; i++) {
-							c = 'default';
-							if(m[dpc[i]].original && m[dpc[i]].original.type && t[m[dpc[i]].original.type]) {
-								c = m[dpc[i]].original.type;
-							}
-							if(m[dpc[i]].data && m[dpc[i]].data.jstree && m[dpc[i]].data.jstree.type && t[m[dpc[i]].data.jstree.type]) {
-								c = m[dpc[i]].data.jstree.type;
-							}
-							m[dpc[i]].type = c;
-							if(m[dpc[i]].icon === true && t[c].icon !== undefined) {
-								m[dpc[i]].icon = t[c].icon;
-							}
-						}
-						m[$.jstree.root].type = $.jstree.root;
-					}, this));
-			parent.bind.call(this);
-		};
-		this.get_json = function (obj, options, flat) {
-			var i, j,
-				m = this._model.data,
-				opt = options ? $.extend(true, {}, options, {no_id:false}) : {},
-				tmp = parent.get_json.call(this, obj, opt, flat);
-			if(tmp === false) { return false; }
-			if($.isArray(tmp)) {
-				for(i = 0, j = tmp.length; i < j; i++) {
-					tmp[i].type = tmp[i].id && m[tmp[i].id] && m[tmp[i].id].type ? m[tmp[i].id].type : "default";
-					if(options && options.no_id) {
-						delete tmp[i].id;
-						if(tmp[i].li_attr && tmp[i].li_attr.id) {
-							delete tmp[i].li_attr.id;
-						}
-						if(tmp[i].a_attr && tmp[i].a_attr.id) {
-							delete tmp[i].a_attr.id;
-						}
-					}
-				}
-			}
-			else {
-				tmp.type = tmp.id && m[tmp.id] && m[tmp.id].type ? m[tmp.id].type : "default";
-				if(options && options.no_id) {
-					tmp = this._delete_ids(tmp);
-				}
-			}
-			return tmp;
-		};
-		this._delete_ids = function (tmp) {
-			if($.isArray(tmp)) {
-				for(var i = 0, j = tmp.length; i < j; i++) {
-					tmp[i] = this._delete_ids(tmp[i]);
-				}
-				return tmp;
-			}
-			delete tmp.id;
-			if(tmp.li_attr && tmp.li_attr.id) {
-				delete tmp.li_attr.id;
-			}
-			if(tmp.a_attr && tmp.a_attr.id) {
-				delete tmp.a_attr.id;
-			}
-			if(tmp.children && $.isArray(tmp.children)) {
-				tmp.children = this._delete_ids(tmp.children);
-			}
-			return tmp;
-		};
-		this.check = function (chk, obj, par, pos, more) {
-			if(parent.check.call(this, chk, obj, par, pos, more) === false) { return false; }
-			obj = obj && obj.id ? obj : this.get_node(obj);
-			par = par && par.id ? par : this.get_node(par);
-			var m = obj && obj.id ? (more && more.origin ? more.origin : $.jstree.reference(obj.id)) : null, tmp, d, i, j;
-			m = m && m._model && m._model.data ? m._model.data : null;
-			switch(chk) {
-				case "create_node":
-				case "move_node":
-				case "copy_node":
-					if(chk !== 'move_node' || $.inArray(obj.id, par.children) === -1) {
-						tmp = this.get_rules(par);
-						if(tmp.max_children !== undefined && tmp.max_children !== -1 && tmp.max_children === par.children.length) {
-							this._data.core.last_error = { 'error' : 'check', 'plugin' : 'types', 'id' : 'types_01', 'reason' : 'max_children prevents function: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
-							return false;
-						}
-						if(tmp.valid_children !== undefined && tmp.valid_children !== -1 && $.inArray((obj.type || 'default'), tmp.valid_children) === -1) {
-							this._data.core.last_error = { 'error' : 'check', 'plugin' : 'types', 'id' : 'types_02', 'reason' : 'valid_children prevents function: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
-							return false;
-						}
-						if(m && obj.children_d && obj.parents) {
-							d = 0;
-							for(i = 0, j = obj.children_d.length; i < j; i++) {
-								d = Math.max(d, m[obj.children_d[i]].parents.length);
-							}
-							d = d - obj.parents.length + 1;
-						}
-						if(d <= 0 || d === undefined) { d = 1; }
-						do {
-							if(tmp.max_depth !== undefined && tmp.max_depth !== -1 && tmp.max_depth < d) {
-								this._data.core.last_error = { 'error' : 'check', 'plugin' : 'types', 'id' : 'types_03', 'reason' : 'max_depth prevents function: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
-								return false;
-							}
-							par = this.get_node(par.parent);
-							tmp = this.get_rules(par);
-							d++;
-						} while(par);
-					}
-					break;
-			}
-			return true;
-		};
-		/**
-		 * used to retrieve the type settings object for a node
-		 * @name get_rules(obj)
-		 * @param {mixed} obj the node to find the rules for
-		 * @return {Object}
-		 * @plugin types
-		 */
-		this.get_rules = function (obj) {
-			obj = this.get_node(obj);
-			if(!obj) { return false; }
-			var tmp = this.get_type(obj, true);
-			if(tmp.max_depth === undefined) { tmp.max_depth = -1; }
-			if(tmp.max_children === undefined) { tmp.max_children = -1; }
-			if(tmp.valid_children === undefined) { tmp.valid_children = -1; }
-			return tmp;
-		};
-		/**
-		 * used to retrieve the type string or settings object for a node
-		 * @name get_type(obj [, rules])
-		 * @param {mixed} obj the node to find the rules for
-		 * @param {Boolean} rules if set to `true` instead of a string the settings object will be returned
-		 * @return {String|Object}
-		 * @plugin types
-		 */
-		this.get_type = function (obj, rules) {
-			obj = this.get_node(obj);
-			return (!obj) ? false : ( rules ? $.extend({ 'type' : obj.type }, this.settings.types[obj.type]) : obj.type);
-		};
-		/**
-		 * used to change a node's type
-		 * @name set_type(obj, type)
-		 * @param {mixed} obj the node to change
-		 * @param {String} type the new type
-		 * @plugin types
-		 */
-		this.set_type = function (obj, type) {
-			var t, t1, t2, old_type, old_icon;
-			if($.isArray(obj)) {
-				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-					this.set_type(obj[t1], type);
-				}
-				return true;
-			}
-			t = this.settings.types;
-			obj = this.get_node(obj);
-			if(!t[type] || !obj) { return false; }
-			old_type = obj.type;
-			old_icon = this.get_icon(obj);
-			obj.type = type;
-			if(old_icon === true || (t[old_type] && t[old_type].icon !== undefined && old_icon === t[old_type].icon)) {
-				this.set_icon(obj, t[type].icon !== undefined ? t[type].icon : true);
-			}
-			return true;
-		};
-	};
-	// include the types plugin by default
-	// $.jstree.defaults.plugins.push("types");
-
-/**
- * ### Unique plugin
- *
- * Enforces that no nodes with the same name can coexist as siblings.
- */
-
-	/**
-	 * stores all defaults for the unique plugin
-	 * @name $.jstree.defaults.unique
-	 * @plugin unique
-	 */
-	$.jstree.defaults.unique = {
-		/**
-		 * Indicates if the comparison should be case sensitive. Default is `false`.
-		 * @name $.jstree.defaults.unique.case_sensitive
-		 * @plugin unique
-		 */
-		case_sensitive : false,
-		/**
-		 * A callback executed in the instance's scope when a new node is created and the name is already taken, the two arguments are the conflicting name and the counter. The default will produce results like `New node (2)`.
-		 * @name $.jstree.defaults.unique.duplicate
-		 * @plugin unique
-		 */
-		duplicate : function (name, counter) {
-			return name + ' (' + counter + ')';
-		}
-	};
-
-	$.jstree.plugins.unique = function (options, parent) {
-		this.check = function (chk, obj, par, pos, more) {
-			if(parent.check.call(this, chk, obj, par, pos, more) === false) { return false; }
-			obj = obj && obj.id ? obj : this.get_node(obj);
-			par = par && par.id ? par : this.get_node(par);
-			if(!par || !par.children) { return true; }
-			var n = chk === "rename_node" ? pos : obj.text,
-				c = [],
-				s = this.settings.unique.case_sensitive,
-				m = this._model.data, i, j;
-			for(i = 0, j = par.children.length; i < j; i++) {
-				c.push(s ? m[par.children[i]].text : m[par.children[i]].text.toLowerCase());
-			}
-			if(!s) { n = n.toLowerCase(); }
-			switch(chk) {
-				case "delete_node":
-					return true;
-				case "rename_node":
-					i = ($.inArray(n, c) === -1 || (obj.text && obj.text[ s ? 'toString' : 'toLowerCase']() === n));
-					if(!i) {
-						this._data.core.last_error = { 'error' : 'check', 'plugin' : 'unique', 'id' : 'unique_01', 'reason' : 'Child with name ' + n + ' already exists. Preventing: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
-					}
-					return i;
-				case "create_node":
-					i = ($.inArray(n, c) === -1);
-					if(!i) {
-						this._data.core.last_error = { 'error' : 'check', 'plugin' : 'unique', 'id' : 'unique_04', 'reason' : 'Child with name ' + n + ' already exists. Preventing: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
-					}
-					return i;
-				case "copy_node":
-					i = ($.inArray(n, c) === -1);
-					if(!i) {
-						this._data.core.last_error = { 'error' : 'check', 'plugin' : 'unique', 'id' : 'unique_02', 'reason' : 'Child with name ' + n + ' already exists. Preventing: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
-					}
-					return i;
-				case "move_node":
-					i = ( (obj.parent === par.id && (!more || !more.is_multi)) || $.inArray(n, c) === -1);
-					if(!i) {
-						this._data.core.last_error = { 'error' : 'check', 'plugin' : 'unique', 'id' : 'unique_03', 'reason' : 'Child with name ' + n + ' already exists. Preventing: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
-					}
-					return i;
-			}
-			return true;
-		};
-		this.create_node = function (par, node, pos, callback, is_loaded) {
-			if(!node || node.text === undefined) {
-				if(par === null) {
-					par = $.jstree.root;
-				}
-				par = this.get_node(par);
-				if(!par) {
-					return parent.create_node.call(this, par, node, pos, callback, is_loaded);
-				}
-				pos = pos === undefined ? "last" : pos;
-				if(!pos.toString().match(/^(before|after)$/) && !is_loaded && !this.is_loaded(par)) {
-					return parent.create_node.call(this, par, node, pos, callback, is_loaded);
-				}
-				if(!node) { node = {}; }
-				var tmp, n, dpc, i, j, m = this._model.data, s = this.settings.unique.case_sensitive, cb = this.settings.unique.duplicate;
-				n = tmp = this.get_string('New node');
-				dpc = [];
-				for(i = 0, j = par.children.length; i < j; i++) {
-					dpc.push(s ? m[par.children[i]].text : m[par.children[i]].text.toLowerCase());
-				}
-				i = 1;
-				while($.inArray(s ? n : n.toLowerCase(), dpc) !== -1) {
-					n = cb.call(this, tmp, (++i)).toString();
-				}
-				node.text = n;
-			}
-			return parent.create_node.call(this, par, node, pos, callback, is_loaded);
-		};
-	};
-
-	// include the unique plugin by default
-	// $.jstree.defaults.plugins.push("unique");
-
-
-/**
- * ### Wholerow plugin
- *
- * Makes each node appear block level. Making selection easier. May cause slow down for large trees in old browsers.
- */
-
-	var div = document.createElement('DIV');
-	div.setAttribute('unselectable','on');
-	div.setAttribute('role','presentation');
-	div.className = 'jstree-wholerow';
-	div.innerHTML = '&#160;';
-	$.jstree.plugins.wholerow = function (options, parent) {
-		this.bind = function () {
-			parent.bind.call(this);
-
-			this.element
-				.on('ready.jstree set_state.jstree', $.proxy(function () {
-						this.hide_dots();
-					}, this))
-				.on("init.jstree loading.jstree ready.jstree", $.proxy(function () {
-						//div.style.height = this._data.core.li_height + 'px';
-						this.get_container_ul().addClass('jstree-wholerow-ul');
-					}, this))
-				.on("deselect_all.jstree", $.proxy(function (e, data) {
-						this.element.find('.jstree-wholerow-clicked').removeClass('jstree-wholerow-clicked');
-					}, this))
-				.on("changed.jstree", $.proxy(function (e, data) {
-						this.element.find('.jstree-wholerow-clicked').removeClass('jstree-wholerow-clicked');
-						var tmp = false, i, j;
-						for(i = 0, j = data.selected.length; i < j; i++) {
-							tmp = this.get_node(data.selected[i], true);
-							if(tmp && tmp.length) {
-								tmp.children('.jstree-wholerow').addClass('jstree-wholerow-clicked');
-							}
-						}
-					}, this))
-				.on("open_node.jstree", $.proxy(function (e, data) {
-						this.get_node(data.node, true).find('.jstree-clicked').parent().children('.jstree-wholerow').addClass('jstree-wholerow-clicked');
-					}, this))
-				.on("hover_node.jstree dehover_node.jstree", $.proxy(function (e, data) {
-						if(e.type === "hover_node" && this.is_disabled(data.node)) { return; }
-						this.get_node(data.node, true).children('.jstree-wholerow')[e.type === "hover_node"?"addClass":"removeClass"]('jstree-wholerow-hovered');
-					}, this))
-				.on("contextmenu.jstree", ".jstree-wholerow", $.proxy(function (e) {
-						e.preventDefault();
-						var tmp = $.Event('contextmenu', { metaKey : e.metaKey, ctrlKey : e.ctrlKey, altKey : e.altKey, shiftKey : e.shiftKey, pageX : e.pageX, pageY : e.pageY });
-						$(e.currentTarget).closest(".jstree-node").children(".jstree-anchor").first().trigger(tmp);
-					}, this))
-				/*!
-				.on("mousedown.jstree touchstart.jstree", ".jstree-wholerow", function (e) {
-						if(e.target === e.currentTarget) {
-							var a = $(e.currentTarget).closest(".jstree-node").children(".jstree-anchor");
-							e.target = a[0];
-							a.trigger(e);
-						}
-					})
-				*/
-				.on("click.jstree", ".jstree-wholerow", function (e) {
-						e.stopImmediatePropagation();
-						var tmp = $.Event('click', { metaKey : e.metaKey, ctrlKey : e.ctrlKey, altKey : e.altKey, shiftKey : e.shiftKey });
-						$(e.currentTarget).closest(".jstree-node").children(".jstree-anchor").first().trigger(tmp).focus();
-					})
-				.on("click.jstree", ".jstree-leaf > .jstree-ocl", $.proxy(function (e) {
-						e.stopImmediatePropagation();
-						var tmp = $.Event('click', { metaKey : e.metaKey, ctrlKey : e.ctrlKey, altKey : e.altKey, shiftKey : e.shiftKey });
-						$(e.currentTarget).closest(".jstree-node").children(".jstree-anchor").first().trigger(tmp).focus();
-					}, this))
-				.on("mouseover.jstree", ".jstree-wholerow, .jstree-icon", $.proxy(function (e) {
-						e.stopImmediatePropagation();
-						if(!this.is_disabled(e.currentTarget)) {
-							this.hover_node(e.currentTarget);
-						}
-						return false;
-					}, this))
-				.on("mouseleave.jstree", ".jstree-node", $.proxy(function (e) {
-						this.dehover_node(e.currentTarget);
-					}, this));
-		};
-		this.teardown = function () {
-			if(this.settings.wholerow) {
-				this.element.find(".jstree-wholerow").remove();
-			}
-			parent.teardown.call(this);
-		};
-		this.redraw_node = function(obj, deep, callback, force_render) {
-			obj = parent.redraw_node.apply(this, arguments);
-			if(obj) {
-				var tmp = div.cloneNode(true);
-				//tmp.style.height = this._data.core.li_height + 'px';
-				if($.inArray(obj.id, this._data.core.selected) !== -1) { tmp.className += ' jstree-wholerow-clicked'; }
-				if(this._data.core.focused && this._data.core.focused === obj.id) { tmp.className += ' jstree-wholerow-hovered'; }
-				obj.insertBefore(tmp, obj.childNodes[0]);
-			}
-			return obj;
-		};
-	};
-	// include the wholerow plugin by default
-	// $.jstree.defaults.plugins.push("wholerow");
-	if(document.registerElement && Object && Object.create) {
-		var proto = Object.create(HTMLElement.prototype);
-		proto.createdCallback = function () {
-			var c = { core : {}, plugins : [] }, i;
-			for(i in $.jstree.plugins) {
-				if($.jstree.plugins.hasOwnProperty(i) && this.attributes[i]) {
-					c.plugins.push(i);
-					if(this.getAttribute(i) && JSON.parse(this.getAttribute(i))) {
-						c[i] = JSON.parse(this.getAttribute(i));
-					}
-				}
-			}
-			for(i in $.jstree.defaults.core) {
-				if($.jstree.defaults.core.hasOwnProperty(i) && this.attributes[i]) {
-					c.core[i] = JSON.parse(this.getAttribute(i)) || this.getAttribute(i);
-				}
-			}
-			$(this).jstree(c);
-		};
-		// proto.attributeChangedCallback = function (name, previous, value) { };
-		try {
-			document.registerElement("vakata-jstree", { prototype: proto });
-		} catch(ignore) { }
-	}
-
-}));
\ No newline at end of file
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/jstree.min.js b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/jstree.min.js
deleted file mode 100755
index 30b73e79c79..00000000000
--- a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/jstree.min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*! jsTree - v3.2.1 - 2015-08-24 - (MIT) */
-!function(a){"use strict";"function"==typeof define&&define.amd?define(["jquery"],a):"undefined"!=typeof module&&module.exports?module.exports=a(require("jquery")):a(jQuery)}(function(a,b){"use strict";if(!a.jstree){var c=0,d=!1,e=!1,f=!1,g=[],h=a("script:last").attr("src"),i=window.document,j=i.createElement("LI"),k,l;j.setAttribute("role","treeitem"),k=i.createElement("I"),k.className="jstree-icon jstree-ocl",k.setAttribute("role","presentation"),j.appendChild(k),k=i.createElement("A"),k.className="jstree-anchor",k.setAttribute("href","#"),k.setAttribute("tabindex","-1"),l=i.createElement("I"),l.className="jstree-icon jstree-themeicon",l.setAttribute("role","presentation"),k.appendChild(l),j.appendChild(k),k=l=null,a.jstree={version:"3.2.1",defaults:{plugins:[]},plugins:{},path:h&&-1!==h.indexOf("/")?h.replace(/\/[^\/]+$/,""):"",idregex:/[\\:&!^|()\[\]<>@*'+~#";.,=\- \/${}%?`]/g,root:"#"},a.jstree.create=function(b,d){var e=new a.jstree.core(++c),f=d;return d=a.extend(!0,{},a.jstree.defaults,d),f&&f.plugins&&(d.plugins=f.plugins),a.each(d.plugins,function(a,b){"core"!==a&&(e=e.plugin(b,d[b]))}),a(b).data("jstree",e),e.init(b,d),e},a.jstree.destroy=function(){a(".jstree:jstree").jstree("destroy"),a(i).off(".jstree")},a.jstree.core=function(a){this._id=a,this._cnt=0,this._wrk=null,this._data={core:{themes:{name:!1,dots:!1,icons:!1},selected:[],last_error:{},working:!1,worker_queue:[],focused:null}}},a.jstree.reference=function(b){var c=null,d=null;if(!b||!b.id||b.tagName&&b.nodeType||(b=b.id),!d||!d.length)try{d=a(b)}catch(e){}if(!d||!d.length)try{d=a("#"+b.replace(a.jstree.idregex,"\\$&"))}catch(e){}return d&&d.length&&(d=d.closest(".jstree")).length&&(d=d.data("jstree"))?c=d:a(".jstree").each(function(){var d=a(this).data("jstree");return d&&d._model.data[b]?(c=d,!1):void 0}),c},a.fn.jstree=function(c){var d="string"==typeof c,e=Array.prototype.slice.call(arguments,1),f=null;return c!==!0||this.length?(this.each(function(){var g=a.jstree.reference(this),h=d&&g?g[c]:null;return f=d&&h?h.apply(g,e):null,g||d||c!==b&&!a.isPlainObject(c)||a.jstree.create(this,c),(g&&!d||c===!0)&&(f=g||!1),null!==f&&f!==b?!1:void 0}),null!==f&&f!==b?f:this):!1},a.expr[":"].jstree=a.expr.createPseudo(function(c){return function(c){return a(c).hasClass("jstree")&&a(c).data("jstree")!==b}}),a.jstree.defaults.core={data:!1,strings:!1,check_callback:!1,error:a.noop,animation:200,multiple:!0,themes:{name:!1,url:!1,dir:!1,dots:!0,icons:!0,stripes:!1,variant:!1,responsive:!1},expand_selected_onload:!0,worker:!0,force_text:!1,dblclick_toggle:!0},a.jstree.core.prototype={plugin:function(b,c){var d=a.jstree.plugins[b];return d?(this._data[b]={},d.prototype=this,new d(c,this)):this},init:function(b,c){this._model={data:{},changed:[],force_full_redraw:!1,redraw_timeout:!1,default_state:{loaded:!0,opened:!1,selected:!1,disabled:!1}},this._model.data[a.jstree.root]={id:a.jstree.root,parent:null,parents:[],children:[],children_d:[],state:{loaded:!1}},this.element=a(b).addClass("jstree jstree-"+this._id),this.settings=c,this._data.core.ready=!1,this._data.core.loaded=!1,this._data.core.rtl="rtl"===this.element.css("direction"),this.element[this._data.core.rtl?"addClass":"removeClass"]("jstree-rtl"),this.element.attr("role","tree"),this.settings.core.multiple&&this.element.attr("aria-multiselectable",!0),this.element.attr("tabindex")||this.element.attr("tabindex","0"),this.bind(),this.trigger("init"),this._data.core.original_container_html=this.element.find(" > ul > li").clone(!0),this._data.core.original_container_html.find("li").addBack().contents().filter(function(){return 3===this.nodeType&&(!this.nodeValue||/^\s+$/.test(this.nodeValue))}).remove(),this.element.html("<ul class='jstree-container-ul jstree-children' role='group'><li id='j"+this._id+"_loading' class='jstree-initial-node jstree-loading jstree-leaf jstree-last' role='tree-item'><i class='jstree-icon jstree-ocl'></i><a class='jstree-anchor' href='#'><i class='jstree-icon jstree-themeicon-hidden'></i>"+this.get_string("Loading ...")+"</a></li></ul>"),this.element.attr("aria-activedescendant","j"+this._id+"_loading"),this._data.core.li_height=this.get_container_ul().children("li").first().height()||24,this.trigger("loading"),this.load_node(a.jstree.root)},destroy:function(a){if(this._wrk)try{window.URL.revokeObjectURL(this._wrk),this._wrk=null}catch(b){}a||this.element.empty(),this.teardown()},teardown:function(){this.unbind(),this.element.removeClass("jstree").removeData("jstree").find("[class^='jstree']").addBack().attr("class",function(){return this.className.replace(/jstree[^ ]*|$/gi,"")}),this.element=null},bind:function(){var b="",c=null,d=0;this.element.on("dblclick.jstree",function(a){if(a.target.tagName&&"input"===a.target.tagName.toLowerCase())return!0;if(i.selection&&i.selection.empty)i.selection.empty();else if(window.getSelection){var b=window.getSelection();try{b.removeAllRanges(),b.collapse()}catch(c){}}}).on("mousedown.jstree",a.proxy(function(a){a.target===this.element[0]&&(a.preventDefault(),d=+new Date)},this)).on("mousedown.jstree",".jstree-ocl",function(a){a.preventDefault()}).on("click.jstree",".jstree-ocl",a.proxy(function(a){this.toggle_node(a.target)},this)).on("dblclick.jstree",".jstree-anchor",a.proxy(function(a){return a.target.tagName&&"input"===a.target.tagName.toLowerCase()?!0:void(this.settings.core.dblclick_toggle&&this.toggle_node(a.target))},this)).on("click.jstree",".jstree-anchor",a.proxy(function(b){b.preventDefault(),b.currentTarget!==i.activeElement&&a(b.currentTarget).focus(),this.activate_node(b.currentTarget,b)},this)).on("keydown.jstree",".jstree-anchor",a.proxy(function(b){if(b.target.tagName&&"input"===b.target.tagName.toLowerCase())return!0;if(32!==b.which&&13!==b.which&&(b.shiftKey||b.ctrlKey||b.altKey||b.metaKey))return!0;var c=null;switch(this._data.core.rtl&&(37===b.which?b.which=39:39===b.which&&(b.which=37)),b.which){case 32:b.ctrlKey&&(b.type="click",a(b.currentTarget).trigger(b));break;case 13:b.type="click",a(b.currentTarget).trigger(b);break;case 37:b.preventDefault(),this.is_open(b.currentTarget)?this.close_node(b.currentTarget):(c=this.get_parent(b.currentTarget),c&&c.id!==a.jstree.root&&this.get_node(c,!0).children(".jstree-anchor").focus());break;case 38:b.preventDefault(),c=this.get_prev_dom(b.currentTarget),c&&c.length&&c.children(".jstree-anchor").focus();break;case 39:b.preventDefault(),this.is_closed(b.currentTarget)?this.open_node(b.currentTarget,function(a){this.get_node(a,!0).children(".jstree-anchor").focus()}):this.is_open(b.currentTarget)&&(c=this.get_node(b.currentTarget,!0).children(".jstree-children")[0],c&&a(this._firstChild(c)).children(".jstree-anchor").focus());break;case 40:b.preventDefault(),c=this.get_next_dom(b.currentTarget),c&&c.length&&c.children(".jstree-anchor").focus();break;case 106:this.open_all();break;case 36:b.preventDefault(),c=this._firstChild(this.get_container_ul()[0]),c&&a(c).children(".jstree-anchor").filter(":visible").focus();break;case 35:b.preventDefault(),this.element.find(".jstree-anchor").filter(":visible").last().focus()}},this)).on("load_node.jstree",a.proxy(function(b,c){c.status&&(c.node.id!==a.jstree.root||this._data.core.loaded||(this._data.core.loaded=!0,this._firstChild(this.get_container_ul()[0])&&this.element.attr("aria-activedescendant",this._firstChild(this.get_container_ul()[0]).id),this.trigger("loaded")),this._data.core.ready||setTimeout(a.proxy(function(){if(this.element&&!this.get_container_ul().find(".jstree-loading").length){if(this._data.core.ready=!0,this._data.core.selected.length){if(this.settings.core.expand_selected_onload){var b=[],c,d;for(c=0,d=this._data.core.selected.length;d>c;c++)b=b.concat(this._model.data[this._data.core.selected[c]].parents);for(b=a.vakata.array_unique(b),c=0,d=b.length;d>c;c++)this.open_node(b[c],!1,0)}this.trigger("changed",{action:"ready",selected:this._data.core.selected})}this.trigger("ready")}},this),0))},this)).on("keypress.jstree",a.proxy(function(d){if(d.target.tagName&&"input"===d.target.tagName.toLowerCase())return!0;c&&clearTimeout(c),c=setTimeout(function(){b=""},500);var e=String.fromCharCode(d.which).toLowerCase(),f=this.element.find(".jstree-anchor").filter(":visible"),g=f.index(i.activeElement)||0,h=!1;if(b+=e,b.length>1){if(f.slice(g).each(a.proxy(function(c,d){return 0===a(d).text().toLowerCase().indexOf(b)?(a(d).focus(),h=!0,!1):void 0},this)),h)return;if(f.slice(0,g).each(a.proxy(function(c,d){return 0===a(d).text().toLowerCase().indexOf(b)?(a(d).focus(),h=!0,!1):void 0},this)),h)return}if(new RegExp("^"+e.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")+"+$").test(b)){if(f.slice(g+1).each(a.proxy(function(b,c){return a(c).text().toLowerCase().charAt(0)===e?(a(c).focus(),h=!0,!1):void 0},this)),h)return;if(f.slice(0,g+1).each(a.proxy(function(b,c){return a(c).text().toLowerCase().charAt(0)===e?(a(c).focus(),h=!0,!1):void 0},this)),h)return}},this)).on("init.jstree",a.proxy(function(){var a=this.settings.core.themes;this._data.core.themes.dots=a.dots,this._data.core.themes.stripes=a.stripes,this._data.core.themes.icons=a.icons,this.set_theme(a.name||"default",a.url),this.set_theme_variant(a.variant)},this)).on("loading.jstree",a.proxy(function(){this[this._data.core.themes.dots?"show_dots":"hide_dots"](),this[this._data.core.themes.icons?"show_icons":"hide_icons"](),this[this._data.core.themes.stripes?"show_stripes":"hide_stripes"]()},this)).on("blur.jstree",".jstree-anchor",a.proxy(function(b){this._data.core.focused=null,a(b.currentTarget).filter(".jstree-hovered").mouseleave(),this.element.attr("tabindex","0")},this)).on("focus.jstree",".jstree-anchor",a.proxy(function(b){var c=this.get_node(b.currentTarget);c&&c.id&&(this._data.core.focused=c.id),this.element.find(".jstree-hovered").not(b.currentTarget).mouseleave(),a(b.currentTarget).mouseenter(),this.element.attr("tabindex","-1")},this)).on("focus.jstree",a.proxy(function(){if(+new Date-d>500&&!this._data.core.focused){d=0;var a=this.get_node(this.element.attr("aria-activedescendant"),!0);a&&a.find("> .jstree-anchor").focus()}},this)).on("mouseenter.jstree",".jstree-anchor",a.proxy(function(a){this.hover_node(a.currentTarget)},this)).on("mouseleave.jstree",".jstree-anchor",a.proxy(function(a){this.dehover_node(a.currentTarget)},this))},unbind:function(){this.element.off(".jstree"),a(i).off(".jstree-"+this._id)},trigger:function(a,b){b||(b={}),b.instance=this,this.element.triggerHandler(a.replace(".jstree","")+".jstree",b)},get_container:function(){return this.element},get_container_ul:function(){return this.element.children(".jstree-children").first()},get_string:function(b){var c=this.settings.core.strings;return a.isFunction(c)?c.call(this,b):c&&c[b]?c[b]:b},_firstChild:function(a){a=a?a.firstChild:null;while(null!==a&&1!==a.nodeType)a=a.nextSibling;return a},_nextSibling:function(a){a=a?a.nextSibling:null;while(null!==a&&1!==a.nodeType)a=a.nextSibling;return a},_previousSibling:function(a){a=a?a.previousSibling:null;while(null!==a&&1!==a.nodeType)a=a.previousSibling;return a},get_node:function(b,c){b&&b.id&&(b=b.id);var d;try{if(this._model.data[b])b=this._model.data[b];else if("string"==typeof b&&this._model.data[b.replace(/^#/,"")])b=this._model.data[b.replace(/^#/,"")];else if("string"==typeof b&&(d=a("#"+b.replace(a.jstree.idregex,"\\$&"),this.element)).length&&this._model.data[d.closest(".jstree-node").attr("id")])b=this._model.data[d.closest(".jstree-node").attr("id")];else if((d=a(b,this.element)).length&&this._model.data[d.closest(".jstree-node").attr("id")])b=this._model.data[d.closest(".jstree-node").attr("id")];else{if(!(d=a(b,this.element)).length||!d.hasClass("jstree"))return!1;b=this._model.data[a.jstree.root]}return c&&(b=b.id===a.jstree.root?this.element:a("#"+b.id.replace(a.jstree.idregex,"\\$&"),this.element)),b}catch(e){return!1}},get_path:function(b,c,d){if(b=b.parents?b:this.get_node(b),!b||b.id===a.jstree.root||!b.parents)return!1;var e,f,g=[];for(g.push(d?b.id:b.text),e=0,f=b.parents.length;f>e;e++)g.push(d?b.parents[e]:this.get_text(b.parents[e]));return g=g.reverse().slice(1),c?g.join(c):g},get_next_dom:function(b,c){var d;if(b=this.get_node(b,!0),b[0]===this.element[0]){d=this._firstChild(this.get_container_ul()[0]);while(d&&0===d.offsetHeight)d=this._nextSibling(d);return d?a(d):!1}if(!b||!b.length)return!1;if(c){d=b[0];do d=this._nextSibling(d);while(d&&0===d.offsetHeight);return d?a(d):!1}if(b.hasClass("jstree-open")){d=this._firstChild(b.children(".jstree-children")[0]);while(d&&0===d.offsetHeight)d=this._nextSibling(d);if(null!==d)return a(d)}d=b[0];do d=this._nextSibling(d);while(d&&0===d.offsetHeight);return null!==d?a(d):b.parentsUntil(".jstree",".jstree-node").nextAll(".jstree-node:visible").first()},get_prev_dom:function(b,c){var d;if(b=this.get_node(b,!0),b[0]===this.element[0]){d=this.get_container_ul()[0].lastChild;while(d&&0===d.offsetHeight)d=this._previousSibling(d);return d?a(d):!1}if(!b||!b.length)return!1;if(c){d=b[0];do d=this._previousSibling(d);while(d&&0===d.offsetHeight);return d?a(d):!1}d=b[0];do d=this._previousSibling(d);while(d&&0===d.offsetHeight);if(null!==d){b=a(d);while(b.hasClass("jstree-open"))b=b.children(".jstree-children").first().children(".jstree-node:visible:last");return b}return d=b[0].parentNode.parentNode,d&&d.className&&-1!==d.className.indexOf("jstree-node")?a(d):!1},get_parent:function(b){return b=this.get_node(b),b&&b.id!==a.jstree.root?b.parent:!1},get_children_dom:function(a){return a=this.get_node(a,!0),a[0]===this.element[0]?this.get_container_ul().children(".jstree-node"):a&&a.length?a.children(".jstree-children").children(".jstree-node"):!1},is_parent:function(a){return a=this.get_node(a),a&&(a.state.loaded===!1||a.children.length>0)},is_loaded:function(a){return a=this.get_node(a),a&&a.state.loaded},is_loading:function(a){return a=this.get_node(a),a&&a.state&&a.state.loading},is_open:function(a){return a=this.get_node(a),a&&a.state.opened},is_closed:function(a){return a=this.get_node(a),a&&this.is_parent(a)&&!a.state.opened},is_leaf:function(a){return!this.is_parent(a)},load_node:function(b,c){var d,e,f,g,h;if(a.isArray(b))return this._load_nodes(b.slice(),c),!0;if(b=this.get_node(b),!b)return c&&c.call(this,b,!1),!1;if(b.state.loaded){for(b.state.loaded=!1,d=0,e=b.children_d.length;e>d;d++){for(f=0,g=b.parents.length;g>f;f++)this._model.data[b.parents[f]].children_d=a.vakata.array_remove_item(this._model.data[b.parents[f]].children_d,b.children_d[d]);this._model.data[b.children_d[d]].state.selected&&(h=!0,this._data.core.selected=a.vakata.array_remove_item(this._data.core.selected,b.children_d[d])),delete this._model.data[b.children_d[d]]}b.children=[],b.children_d=[],h&&this.trigger("changed",{action:"load_node",node:b,selected:this._data.core.selected})}return b.state.failed=!1,b.state.loading=!0,this.get_node(b,!0).addClass("jstree-loading").attr("aria-busy",!0),this._load_node(b,a.proxy(function(a){b=this._model.data[b.id],b.state.loading=!1,b.state.loaded=a,b.state.failed=!b.state.loaded;var d=this.get_node(b,!0),e=0,f=0,g=this._model.data,h=!1;for(e=0,f=b.children.length;f>e;e++)if(g[b.children[e]]&&!g[b.children[e]].state.hidden){h=!0;break}b.state.loaded&&!h&&d&&d.length&&!d.hasClass("jstree-leaf")&&d.removeClass("jstree-closed jstree-open").addClass("jstree-leaf"),d.removeClass("jstree-loading").attr("aria-busy",!1),this.trigger("load_node",{node:b,status:a}),c&&c.call(this,b,a)},this)),!0},_load_nodes:function(a,b,c){var d=!0,e=function(){this._load_nodes(a,b,!0)},f=this._model.data,g,h,i=[];for(g=0,h=a.length;h>g;g++)!f[a[g]]||(f[a[g]].state.loaded||f[a[g]].state.failed)&&c||(this.is_loading(a[g])||this.load_node(a[g],e),d=!1);if(d){for(g=0,h=a.length;h>g;g++)f[a[g]]&&f[a[g]].state.loaded&&i.push(a[g]);b&&!b.done&&(b.call(this,i),b.done=!0)}},load_all:function(b,c){if(b||(b=a.jstree.root),b=this.get_node(b),!b)return!1;var d=[],e=this._model.data,f=e[b.id].children_d,g,h;for(b.state&&!b.state.loaded&&d.push(b.id),g=0,h=f.length;h>g;g++)e[f[g]]&&e[f[g]].state&&!e[f[g]].state.loaded&&d.push(f[g]);d.length?this._load_nodes(d,function(){this.load_all(b,c)}):(c&&c.call(this,b),this.trigger("load_all",{node:b}))},_load_node:function(b,c){var d=this.settings.core.data,e;return d?a.isFunction(d)?d.call(this,b,a.proxy(function(d){d===!1&&c.call(this,!1),this["string"==typeof d?"_append_html_data":"_append_json_data"](b,"string"==typeof d?a(a.parseHTML(d)).filter(function(){return 3!==this.nodeType}):d,function(a){c.call(this,a)})},this)):"object"==typeof d?d.url?(d=a.extend(!0,{},d),a.isFunction(d.url)&&(d.url=d.url.call(this,b)),a.isFunction(d.data)&&(d.data=d.data.call(this,b)),a.ajax(d).done(a.proxy(function(d,e,f){var g=f.getResponseHeader("Content-Type");return g&&-1!==g.indexOf("json")||"object"==typeof d?this._append_json_data(b,d,function(a){c.call(this,a)}):g&&-1!==g.indexOf("html")||"string"==typeof d?this._append_html_data(b,a(a.parseHTML(d)).filter(function(){return 3!==this.nodeType}),function(a){c.call(this,a)}):(this._data.core.last_error={error:"ajax",plugin:"core",id:"core_04",reason:"Could not load node",data:JSON.stringify({id:b.id,xhr:f})},this.settings.core.error.call(this,this._data.core.last_error),c.call(this,!1))},this)).fail(a.proxy(function(a){c.call(this,!1),this._data.core.last_error={error:"ajax",plugin:"core",id:"core_04",reason:"Could not load node",data:JSON.stringify({id:b.id,xhr:a})},this.settings.core.error.call(this,this._data.core.last_error)},this))):(e=a.isArray(d)||a.isPlainObject(d)?JSON.parse(JSON.stringify(d)):d,b.id===a.jstree.root?this._append_json_data(b,e,function(a){c.call(this,a)}):(this._data.core.last_error={error:"nodata",plugin:"core",id:"core_05",reason:"Could not load node",data:JSON.stringify({id:b.id})},this.settings.core.error.call(this,this._data.core.last_error),c.call(this,!1))):"string"==typeof d?b.id===a.jstree.root?this._append_html_data(b,a(a.parseHTML(d)).filter(function(){return 3!==this.nodeType}),function(a){c.call(this,a)}):(this._data.core.last_error={error:"nodata",plugin:"core",id:"core_06",reason:"Could not load node",data:JSON.stringify({id:b.id})},this.settings.core.error.call(this,this._data.core.last_error),c.call(this,!1)):c.call(this,!1):b.id===a.jstree.root?this._append_html_data(b,this._data.core.original_container_html.clone(!0),function(a){c.call(this,a)}):c.call(this,!1)},_node_changed:function(a){a=this.get_node(a),a&&this._model.changed.push(a.id)},_append_html_data:function(b,c,d){b=this.get_node(b),b.children=[],b.children_d=[];var e=c.is("ul")?c.children():c,f=b.id,g=[],h=[],i=this._model.data,j=i[f],k=this._data.core.selected.length,l,m,n;for(e.each(a.proxy(function(b,c){l=this._parse_model_from_html(a(c),f,j.parents.concat()),l&&(g.push(l),h.push(l),i[l].children_d.length&&(h=h.concat(i[l].children_d)))},this)),j.children=g,j.children_d=h,m=0,n=j.parents.length;n>m;m++)i[j.parents[m]].children_d=i[j.parents[m]].children_d.concat(h);this.trigger("model",{nodes:h,parent:f}),f!==a.jstree.root?(this._node_changed(f),this.redraw()):(this.get_container_ul().children(".jstree-initial-node").remove(),this.redraw(!0)),this._data.core.selected.length!==k&&this.trigger("changed",{action:"model",selected:this._data.core.selected}),d.call(this,!0)},_append_json_data:function(b,c,d,e){if(null!==this.element){b=this.get_node(b),b.children=[],b.children_d=[],c.d&&(c=c.d,"string"==typeof c&&(c=JSON.parse(c))),a.isArray(c)||(c=[c]);var f=null,g={df:this._model.default_state,dat:c,par:b.id,m:this._model.data,t_id:this._id,t_cnt:this._cnt,sel:this._data.core.selected},h=function(a,b){a.data&&(a=a.data);var c=a.dat,d=a.par,e=[],f=[],g=[],h=a.df,i=a.t_id,j=a.t_cnt,k=a.m,l=k[d],m=a.sel,n,o,p,q,r=function(a,c,d){d=d?d.concat():[],c&&d.unshift(c);var e=a.id.toString(),f,i,j,l,m={id:e,text:a.text||"",icon:a.icon!==b?a.icon:!0,parent:c,parents:d,children:a.children||[],children_d:a.children_d||[],data:a.data,state:{},li_attr:{id:!1},a_attr:{href:"#"},original:!1};for(f in h)h.hasOwnProperty(f)&&(m.state[f]=h[f]);if(a&&a.data&&a.data.jstree&&a.data.jstree.icon&&(m.icon=a.data.jstree.icon),(m.icon===b||null===m.icon||""===m.icon)&&(m.icon=!0),a&&a.data&&(m.data=a.data,a.data.jstree))for(f in a.data.jstree)a.data.jstree.hasOwnProperty(f)&&(m.state[f]=a.data.jstree[f]);if(a&&"object"==typeof a.state)for(f in a.state)a.state.hasOwnProperty(f)&&(m.state[f]=a.state[f]);if(a&&"object"==typeof a.li_attr)for(f in a.li_attr)a.li_attr.hasOwnProperty(f)&&(m.li_attr[f]=a.li_attr[f]);if(m.li_attr.id||(m.li_attr.id=e),a&&"object"==typeof a.a_attr)for(f in a.a_attr)a.a_attr.hasOwnProperty(f)&&(m.a_attr[f]=a.a_attr[f]);for(a&&a.children&&a.children===!0&&(m.state.loaded=!1,m.children=[],m.children_d=[]),k[m.id]=m,f=0,i=m.children.length;i>f;f++)j=r(k[m.children[f]],m.id,d),l=k[j],m.children_d.push(j),l.children_d.length&&(m.children_d=m.children_d.concat(l.children_d));return delete a.data,delete a.children,k[m.id].original=a,m.state.selected&&g.push(m.id),m.id},s=function(a,c,d){d=d?d.concat():[],c&&d.unshift(c);var e=!1,f,l,m,n,o;do e="j"+i+"_"+ ++j;while(k[e]);o={id:!1,text:"string"==typeof a?a:"",icon:"object"==typeof a&&a.icon!==b?a.icon:!0,parent:c,parents:d,children:[],children_d:[],data:null,state:{},li_attr:{id:!1},a_attr:{href:"#"},original:!1};for(f in h)h.hasOwnProperty(f)&&(o.state[f]=h[f]);if(a&&a.id&&(o.id=a.id.toString()),a&&a.text&&(o.text=a.text),a&&a.data&&a.data.jstree&&a.data.jstree.icon&&(o.icon=a.data.jstree.icon),(o.icon===b||null===o.icon||""===o.icon)&&(o.icon=!0),a&&a.data&&(o.data=a.data,a.data.jstree))for(f in a.data.jstree)a.data.jstree.hasOwnProperty(f)&&(o.state[f]=a.data.jstree[f]);if(a&&"object"==typeof a.state)for(f in a.state)a.state.hasOwnProperty(f)&&(o.state[f]=a.state[f]);if(a&&"object"==typeof a.li_attr)for(f in a.li_attr)a.li_attr.hasOwnProperty(f)&&(o.li_attr[f]=a.li_attr[f]);if(o.li_attr.id&&!o.id&&(o.id=o.li_attr.id.toString()),o.id||(o.id=e),o.li_attr.id||(o.li_attr.id=o.id),a&&"object"==typeof a.a_attr)for(f in a.a_attr)a.a_attr.hasOwnProperty(f)&&(o.a_attr[f]=a.a_attr[f]);if(a&&a.children&&a.children.length){for(f=0,l=a.children.length;l>f;f++)m=s(a.children[f],o.id,d),n=k[m],o.children.push(m),n.children_d.length&&(o.children_d=o.children_d.concat(n.children_d));o.children_d=o.children_d.concat(o.children)}return a&&a.children&&a.children===!0&&(o.state.loaded=!1,o.children=[],o.children_d=[]),delete a.data,delete a.children,o.original=a,k[o.id]=o,o.state.selected&&g.push(o.id),o.id};if(c.length&&c[0].id!==b&&c[0].parent!==b){for(o=0,p=c.length;p>o;o++)c[o].children||(c[o].children=[]),k[c[o].id.toString()]=c[o];for(o=0,p=c.length;p>o;o++)k[c[o].parent.toString()].children.push(c[o].id.toString()),l.children_d.push(c[o].id.toString());for(o=0,p=l.children.length;p>o;o++)n=r(k[l.children[o]],d,l.parents.concat()),f.push(n),k[n].children_d.length&&(f=f.concat(k[n].children_d));for(o=0,p=l.parents.length;p>o;o++)k[l.parents[o]].children_d=k[l.parents[o]].children_d.concat(f);q={cnt:j,mod:k,sel:m,par:d,dpc:f,add:g}}else{for(o=0,p=c.length;p>o;o++)n=s(c[o],d,l.parents.concat()),n&&(e.push(n),f.push(n),k[n].children_d.length&&(f=f.concat(k[n].children_d)));for(l.children=e,l.children_d=f,o=0,p=l.parents.length;p>o;o++)k[l.parents[o]].children_d=k[l.parents[o]].children_d.concat(f);q={cnt:j,mod:k,sel:m,par:d,dpc:f,add:g}}return"undefined"!=typeof window&&"undefined"!=typeof window.document?q:void postMessage(q)},i=function(b,c){if(null!==this.element){if(this._cnt=b.cnt,this._model.data=b.mod,c){var e,f,g=b.add,h=b.sel,i=this._data.core.selected.slice(),j=this._model.data;if(h.length!==i.length||a.vakata.array_unique(h.concat(i)).length!==h.length){for(e=0,f=h.length;f>e;e++)-1===a.inArray(h[e],g)&&-1===a.inArray(h[e],i)&&(j[h[e]].state.selected=!1);for(e=0,f=i.length;f>e;e++)-1===a.inArray(i[e],h)&&(j[i[e]].state.selected=!0)}}b.add.length&&(this._data.core.selected=this._data.core.selected.concat(b.add)),this.trigger("model",{nodes:b.dpc,parent:b.par}),b.par!==a.jstree.root?(this._node_changed(b.par),this.redraw()):this.redraw(!0),b.add.length&&this.trigger("changed",{action:"model",selected:this._data.core.selected}),d.call(this,!0)}};if(this.settings.core.worker&&window.Blob&&window.URL&&window.Worker)try{null===this._wrk&&(this._wrk=window.URL.createObjectURL(new window.Blob(["self.onmessage = "+h.toString()],{type:"text/javascript"}))),!this._data.core.working||e?(this._data.core.working=!0,f=new window.Worker(this._wrk),f.onmessage=a.proxy(function(a){i.call(this,a.data,!0);try{f.terminate(),f=null}catch(b){}this._data.core.worker_queue.length?this._append_json_data.apply(this,this._data.core.worker_queue.shift()):this._data.core.working=!1},this),g.par?f.postMessage(g):this._data.core.worker_queue.length?this._append_json_data.apply(this,this._data.core.worker_queue.shift()):this._data.core.working=!1):this._data.core.worker_queue.push([b,c,d,!0])}catch(j){i.call(this,h(g),!1),this._data.core.worker_queue.length?this._append_json_data.apply(this,this._data.core.worker_queue.shift()):this._data.core.working=!1}else i.call(this,h(g),!1)}},_parse_model_from_html:function(c,d,e){e=e?[].concat(e):[],d&&e.unshift(d);var f,g,h=this._model.data,i={id:!1,text:!1,icon:!0,parent:d,parents:e,children:[],children_d:[],data:null,state:{},li_attr:{id:!1},a_attr:{href:"#"},original:!1},j,k,l;for(j in this._model.default_state)this._model.default_state.hasOwnProperty(j)&&(i.state[j]=this._model.default_state[j]);if(k=a.vakata.attributes(c,!0),a.each(k,function(b,c){return c=a.trim(c),c.length?(i.li_attr[b]=c,void("id"===b&&(i.id=c.toString()))):!0}),k=c.children("a").first(),k.length&&(k=a.vakata.attributes(k,!0),a.each(k,function(b,c){c=a.trim(c),c.length&&(i.a_attr[b]=c)})),k=c.children("a").first().length?c.children("a").first().clone():c.clone(),k.children("ins, i, ul").remove(),k=k.html(),k=a("<div />").html(k),i.text=this.settings.core.force_text?k.text():k.html(),k=c.data(),i.data=k?a.extend(!0,{},k):null,i.state.opened=c.hasClass("jstree-open"),i.state.selected=c.children("a").hasClass("jstree-clicked"),i.state.disabled=c.children("a").hasClass("jstree-disabled"),i.data&&i.data.jstree)for(j in i.data.jstree)i.data.jstree.hasOwnProperty(j)&&(i.state[j]=i.data.jstree[j]);k=c.children("a").children(".jstree-themeicon"),k.length&&(i.icon=k.hasClass("jstree-themeicon-hidden")?!1:k.attr("rel")),i.state.icon!==b&&(i.icon=i.state.icon),(i.icon===b||null===i.icon||""===i.icon)&&(i.icon=!0),k=c.children("ul").children("li");do l="j"+this._id+"_"+ ++this._cnt;while(h[l]);return i.id=i.li_attr.id?i.li_attr.id.toString():l,k.length?(k.each(a.proxy(function(b,c){f=this._parse_model_from_html(a(c),i.id,e),g=this._model.data[f],i.children.push(f),g.children_d.length&&(i.children_d=i.children_d.concat(g.children_d))},this)),i.children_d=i.children_d.concat(i.children)):c.hasClass("jstree-closed")&&(i.state.loaded=!1),i.li_attr["class"]&&(i.li_attr["class"]=i.li_attr["class"].replace("jstree-closed","").replace("jstree-open","")),i.a_attr["class"]&&(i.a_attr["class"]=i.a_attr["class"].replace("jstree-clicked","").replace("jstree-disabled","")),h[i.id]=i,i.state.selected&&this._data.core.selected.push(i.id),i.id},_parse_model_from_flat_json:function(a,c,d){d=d?d.concat():[],c&&d.unshift(c);var e=a.id.toString(),f=this._model.data,g=this._model.default_state,h,i,j,k,l={id:e,text:a.text||"",icon:a.icon!==b?a.icon:!0,parent:c,parents:d,children:a.children||[],children_d:a.children_d||[],data:a.data,state:{},li_attr:{id:!1},a_attr:{href:"#"},original:!1};for(h in g)g.hasOwnProperty(h)&&(l.state[h]=g[h]);if(a&&a.data&&a.data.jstree&&a.data.jstree.icon&&(l.icon=a.data.jstree.icon),(l.icon===b||null===l.icon||""===l.icon)&&(l.icon=!0),a&&a.data&&(l.data=a.data,a.data.jstree))for(h in a.data.jstree)a.data.jstree.hasOwnProperty(h)&&(l.state[h]=a.data.jstree[h]);if(a&&"object"==typeof a.state)for(h in a.state)a.state.hasOwnProperty(h)&&(l.state[h]=a.state[h]);if(a&&"object"==typeof a.li_attr)for(h in a.li_attr)a.li_attr.hasOwnProperty(h)&&(l.li_attr[h]=a.li_attr[h]);if(l.li_attr.id||(l.li_attr.id=e),a&&"object"==typeof a.a_attr)for(h in a.a_attr)a.a_attr.hasOwnProperty(h)&&(l.a_attr[h]=a.a_attr[h]);for(a&&a.children&&a.children===!0&&(l.state.loaded=!1,l.children=[],l.children_d=[]),f[l.id]=l,h=0,i=l.children.length;i>h;h++)j=this._parse_model_from_flat_json(f[l.children[h]],l.id,d),k=f[j],l.children_d.push(j),k.children_d.length&&(l.children_d=l.children_d.concat(k.children_d));return delete a.data,delete a.children,f[l.id].original=a,l.state.selected&&this._data.core.selected.push(l.id),l.id},_parse_model_from_json:function(a,c,d){d=d?d.concat():[],c&&d.unshift(c);var e=!1,f,g,h,i,j=this._model.data,k=this._model.default_state,l;do e="j"+this._id+"_"+ ++this._cnt;while(j[e]);l={id:!1,text:"string"==typeof a?a:"",icon:"object"==typeof a&&a.icon!==b?a.icon:!0,parent:c,parents:d,children:[],children_d:[],data:null,state:{},li_attr:{id:!1},a_attr:{href:"#"},original:!1};for(f in k)k.hasOwnProperty(f)&&(l.state[f]=k[f]);if(a&&a.id&&(l.id=a.id.toString()),a&&a.text&&(l.text=a.text),a&&a.data&&a.data.jstree&&a.data.jstree.icon&&(l.icon=a.data.jstree.icon),(l.icon===b||null===l.icon||""===l.icon)&&(l.icon=!0),a&&a.data&&(l.data=a.data,a.data.jstree))for(f in a.data.jstree)a.data.jstree.hasOwnProperty(f)&&(l.state[f]=a.data.jstree[f]);if(a&&"object"==typeof a.state)for(f in a.state)a.state.hasOwnProperty(f)&&(l.state[f]=a.state[f]);if(a&&"object"==typeof a.li_attr)for(f in a.li_attr)a.li_attr.hasOwnProperty(f)&&(l.li_attr[f]=a.li_attr[f]);if(l.li_attr.id&&!l.id&&(l.id=l.li_attr.id.toString()),l.id||(l.id=e),l.li_attr.id||(l.li_attr.id=l.id),a&&"object"==typeof a.a_attr)for(f in a.a_attr)a.a_attr.hasOwnProperty(f)&&(l.a_attr[f]=a.a_attr[f]);if(a&&a.children&&a.children.length){for(f=0,g=a.children.length;g>f;f++)h=this._parse_model_from_json(a.children[f],l.id,d),i=j[h],l.children.push(h),i.children_d.length&&(l.children_d=l.children_d.concat(i.children_d));l.children_d=l.children_d.concat(l.children)}return a&&a.children&&a.children===!0&&(l.state.loaded=!1,l.children=[],l.children_d=[]),delete a.data,delete a.children,l.original=a,j[l.id]=l,l.state.selected&&this._data.core.selected.push(l.id),l.id},_redraw:function(){var b=this._model.force_full_redraw?this._model.data[a.jstree.root].children.concat([]):this._model.changed.concat([]),c=i.createElement("UL"),d,e,f,g=this._data.core.focused;for(e=0,f=b.length;f>e;e++)d=this.redraw_node(b[e],!0,this._model.force_full_redraw),d&&this._model.force_full_redraw&&c.appendChild(d);this._model.force_full_redraw&&(c.className=this.get_container_ul()[0].className,c.setAttribute("role","group"),this.element.empty().append(c)),null!==g&&(d=this.get_node(g,!0),d&&d.length&&d.children(".jstree-anchor")[0]!==i.activeElement?d.children(".jstree-anchor").focus():this._data.core.focused=null),this._model.force_full_redraw=!1,this._model.changed=[],this.trigger("redraw",{nodes:b})},redraw:function(a){a&&(this._model.force_full_redraw=!0),this._redraw()},draw_children:function(b){var c=this.get_node(b),d=!1,e=!1,f=!1,g=i;if(!c)return!1;if(c.id===a.jstree.root)return this.redraw(!0);if(b=this.get_node(b,!0),!b||!b.length)return!1;if(b.children(".jstree-children").remove(),b=b[0],c.children.length&&c.state.loaded){for(f=g.createElement("UL"),f.setAttribute("role","group"),f.className="jstree-children",d=0,e=c.children.length;e>d;d++)f.appendChild(this.redraw_node(c.children[d],!0,!0));b.appendChild(f)}},redraw_node:function(b,c,d,e){var f=this.get_node(b),g=!1,h=!1,k=!1,l=!1,m=!1,n=!1,o="",p=i,q=this._model.data,r=!1,s=!1,t=null,u=0,v=0,w=!1,x=!1;if(!f)return!1;if(f.id===a.jstree.root)return this.redraw(!0);if(c=c||0===f.children.length,b=i.querySelector?this.element[0].querySelector("#"+(-1!=="0123456789".indexOf(f.id[0])?"\\3"+f.id[0]+" "+f.id.substr(1).replace(a.jstree.idregex,"\\$&"):f.id.replace(a.jstree.idregex,"\\$&"))):i.getElementById(f.id))b=a(b),d||(g=b.parent().parent()[0],g===this.element[0]&&(g=null),h=b.index()),c||!f.children.length||b.children(".jstree-children").length||(c=!0),
-c||(k=b.children(".jstree-children")[0]),r=b.children(".jstree-anchor")[0]===i.activeElement,b.remove();else if(c=!0,!d){if(g=f.parent!==a.jstree.root?a("#"+f.parent.replace(a.jstree.idregex,"\\$&"),this.element)[0]:null,!(null===g||g&&q[f.parent].state.opened))return!1;h=a.inArray(f.id,null===g?q[a.jstree.root].children:q[f.parent].children)}b=j.cloneNode(!0),o="jstree-node ";for(l in f.li_attr)if(f.li_attr.hasOwnProperty(l)){if("id"===l)continue;"class"!==l?b.setAttribute(l,f.li_attr[l]):o+=f.li_attr[l]}for(f.a_attr.id||(f.a_attr.id=f.id+"_anchor"),b.setAttribute("aria-selected",!!f.state.selected),b.setAttribute("aria-level",f.parents.length),b.setAttribute("aria-labelledby",f.a_attr.id),f.state.disabled&&b.setAttribute("aria-disabled",!0),l=0,m=f.children.length;m>l;l++)if(!q[f.children[l]].state.hidden){w=!0;break}if(null!==f.parent&&q[f.parent]&&!f.state.hidden&&(l=a.inArray(f.id,q[f.parent].children),x=f.id,-1!==l))for(l++,m=q[f.parent].children.length;m>l;l++)if(q[q[f.parent].children[l]].state.hidden||(x=q[f.parent].children[l]),x!==f.id)break;f.state.hidden&&(o+=" jstree-hidden"),f.state.loaded&&!w?o+=" jstree-leaf":(o+=f.state.opened&&f.state.loaded?" jstree-open":" jstree-closed",b.setAttribute("aria-expanded",f.state.opened&&f.state.loaded)),x===f.id&&(o+=" jstree-last"),b.id=f.id,b.className=o,o=(f.state.selected?" jstree-clicked":"")+(f.state.disabled?" jstree-disabled":"");for(m in f.a_attr)if(f.a_attr.hasOwnProperty(m)){if("href"===m&&"#"===f.a_attr[m])continue;"class"!==m?b.childNodes[1].setAttribute(m,f.a_attr[m]):o+=" "+f.a_attr[m]}if(o.length&&(b.childNodes[1].className="jstree-anchor "+o),(f.icon&&f.icon!==!0||f.icon===!1)&&(f.icon===!1?b.childNodes[1].childNodes[0].className+=" jstree-themeicon-hidden":-1===f.icon.indexOf("/")&&-1===f.icon.indexOf(".")?b.childNodes[1].childNodes[0].className+=" "+f.icon+" jstree-themeicon-custom":(b.childNodes[1].childNodes[0].style.backgroundImage="url("+f.icon+")",b.childNodes[1].childNodes[0].style.backgroundPosition="center center",b.childNodes[1].childNodes[0].style.backgroundSize="auto",b.childNodes[1].childNodes[0].className+=" jstree-themeicon-custom")),this.settings.core.force_text?b.childNodes[1].appendChild(p.createTextNode(f.text)):b.childNodes[1].innerHTML+=f.text,c&&f.children.length&&(f.state.opened||e)&&f.state.loaded){for(n=p.createElement("UL"),n.setAttribute("role","group"),n.className="jstree-children",l=0,m=f.children.length;m>l;l++)n.appendChild(this.redraw_node(f.children[l],c,!0));b.appendChild(n)}if(k&&b.appendChild(k),!d){for(g||(g=this.element[0]),l=0,m=g.childNodes.length;m>l;l++)if(g.childNodes[l]&&g.childNodes[l].className&&-1!==g.childNodes[l].className.indexOf("jstree-children")){t=g.childNodes[l];break}t||(t=p.createElement("UL"),t.setAttribute("role","group"),t.className="jstree-children",g.appendChild(t)),g=t,h<g.childNodes.length?g.insertBefore(b,g.childNodes[h]):g.appendChild(b),r&&(u=this.element[0].scrollTop,v=this.element[0].scrollLeft,b.childNodes[1].focus(),this.element[0].scrollTop=u,this.element[0].scrollLeft=v)}return f.state.opened&&!f.state.loaded&&(f.state.opened=!1,setTimeout(a.proxy(function(){this.open_node(f.id,!1,0)},this),0)),b},open_node:function(c,d,e){var f,g,h,i;if(a.isArray(c)){for(c=c.slice(),f=0,g=c.length;g>f;f++)this.open_node(c[f],d,e);return!0}return c=this.get_node(c),c&&c.id!==a.jstree.root?(e=e===b?this.settings.core.animation:e,this.is_closed(c)?this.is_loaded(c)?(h=this.get_node(c,!0),i=this,h.length&&(e&&h.children(".jstree-children").length&&h.children(".jstree-children").stop(!0,!0),c.children.length&&!this._firstChild(h.children(".jstree-children")[0])&&this.draw_children(c),e?(this.trigger("before_open",{node:c}),h.children(".jstree-children").css("display","none").end().removeClass("jstree-closed").addClass("jstree-open").attr("aria-expanded",!0).children(".jstree-children").stop(!0,!0).slideDown(e,function(){this.style.display="",i.trigger("after_open",{node:c})})):(this.trigger("before_open",{node:c}),h[0].className=h[0].className.replace("jstree-closed","jstree-open"),h[0].setAttribute("aria-expanded",!0))),c.state.opened=!0,d&&d.call(this,c,!0),h.length||this.trigger("before_open",{node:c}),this.trigger("open_node",{node:c}),e&&h.length||this.trigger("after_open",{node:c}),!0):this.is_loading(c)?setTimeout(a.proxy(function(){this.open_node(c,d,e)},this),500):void this.load_node(c,function(a,b){return b?this.open_node(a,d,e):d?d.call(this,a,!1):!1}):(d&&d.call(this,c,!1),!1)):!1},_open_to:function(b){if(b=this.get_node(b),!b||b.id===a.jstree.root)return!1;var c,d,e=b.parents;for(c=0,d=e.length;d>c;c+=1)c!==a.jstree.root&&this.open_node(e[c],!1,0);return a("#"+b.id.replace(a.jstree.idregex,"\\$&"),this.element)},close_node:function(c,d){var e,f,g,h;if(a.isArray(c)){for(c=c.slice(),e=0,f=c.length;f>e;e++)this.close_node(c[e],d);return!0}return c=this.get_node(c),c&&c.id!==a.jstree.root?this.is_closed(c)?!1:(d=d===b?this.settings.core.animation:d,g=this,h=this.get_node(c,!0),h.length&&(d?h.children(".jstree-children").attr("style","display:block !important").end().removeClass("jstree-open").addClass("jstree-closed").attr("aria-expanded",!1).children(".jstree-children").stop(!0,!0).slideUp(d,function(){this.style.display="",h.children(".jstree-children").remove(),g.trigger("after_close",{node:c})}):(h[0].className=h[0].className.replace("jstree-open","jstree-closed"),h.attr("aria-expanded",!1).children(".jstree-children").remove())),c.state.opened=!1,this.trigger("close_node",{node:c}),void(d&&h.length||this.trigger("after_close",{node:c}))):!1},toggle_node:function(b){var c,d;if(a.isArray(b)){for(b=b.slice(),c=0,d=b.length;d>c;c++)this.toggle_node(b[c]);return!0}return this.is_closed(b)?this.open_node(b):this.is_open(b)?this.close_node(b):void 0},open_all:function(b,c,d){if(b||(b=a.jstree.root),b=this.get_node(b),!b)return!1;var e=b.id===a.jstree.root?this.get_container_ul():this.get_node(b,!0),f,g,h;if(!e.length){for(f=0,g=b.children_d.length;g>f;f++)this.is_closed(this._model.data[b.children_d[f]])&&(this._model.data[b.children_d[f]].state.opened=!0);return this.trigger("open_all",{node:b})}d=d||e,h=this,e=this.is_closed(b)?e.find(".jstree-closed").addBack():e.find(".jstree-closed"),e.each(function(){h.open_node(this,function(a,b){b&&this.is_parent(a)&&this.open_all(a,c,d)},c||0)}),0===d.find(".jstree-closed").length&&this.trigger("open_all",{node:this.get_node(d)})},close_all:function(b,c){if(b||(b=a.jstree.root),b=this.get_node(b),!b)return!1;var d=b.id===a.jstree.root?this.get_container_ul():this.get_node(b,!0),e=this,f,g;for(d.length&&(d=this.is_open(b)?d.find(".jstree-open").addBack():d.find(".jstree-open"),a(d.get().reverse()).each(function(){e.close_node(this,c||0)})),f=0,g=b.children_d.length;g>f;f++)this._model.data[b.children_d[f]].state.opened=!1;this.trigger("close_all",{node:b})},is_disabled:function(a){return a=this.get_node(a),a&&a.state&&a.state.disabled},enable_node:function(b){var c,d;if(a.isArray(b)){for(b=b.slice(),c=0,d=b.length;d>c;c++)this.enable_node(b[c]);return!0}return b=this.get_node(b),b&&b.id!==a.jstree.root?(b.state.disabled=!1,this.get_node(b,!0).children(".jstree-anchor").removeClass("jstree-disabled").attr("aria-disabled",!1),void this.trigger("enable_node",{node:b})):!1},disable_node:function(b){var c,d;if(a.isArray(b)){for(b=b.slice(),c=0,d=b.length;d>c;c++)this.disable_node(b[c]);return!0}return b=this.get_node(b),b&&b.id!==a.jstree.root?(b.state.disabled=!0,this.get_node(b,!0).children(".jstree-anchor").addClass("jstree-disabled").attr("aria-disabled",!0),void this.trigger("disable_node",{node:b})):!1},hide_node:function(b,c){var d,e;if(a.isArray(b)){for(b=b.slice(),d=0,e=b.length;e>d;d++)this.hide_node(b[d],!0);return this.redraw(),!0}return b=this.get_node(b),b&&b.id!==a.jstree.root?void(b.state.hidden||(b.state.hidden=!0,this._node_changed(b.parent),c||this.redraw(),this.trigger("hide_node",{node:b}))):!1},show_node:function(b,c){var d,e;if(a.isArray(b)){for(b=b.slice(),d=0,e=b.length;e>d;d++)this.show_node(b[d],!0);return this.redraw(),!0}return b=this.get_node(b),b&&b.id!==a.jstree.root?void(b.state.hidden&&(b.state.hidden=!1,this._node_changed(b.parent),c||this.redraw(),this.trigger("show_node",{node:b}))):!1},hide_all:function(b){var c,d=this._model.data,e=[];for(c in d)d.hasOwnProperty(c)&&c!==a.jstree.root&&!d[c].state.hidden&&(d[c].state.hidden=!0,e.push(c));return this._model.force_full_redraw=!0,b||this.redraw(),this.trigger("hide_all",{nodes:e}),e},show_all:function(b){var c,d=this._model.data,e=[];for(c in d)d.hasOwnProperty(c)&&c!==a.jstree.root&&d[c].state.hidden&&(d[c].state.hidden=!1,e.push(c));return this._model.force_full_redraw=!0,b||this.redraw(),this.trigger("show_all",{nodes:e}),e},activate_node:function(a,c){if(this.is_disabled(a))return!1;if(c&&"object"==typeof c||(c={}),this._data.core.last_clicked=this._data.core.last_clicked&&this._data.core.last_clicked.id!==b?this.get_node(this._data.core.last_clicked.id):null,this._data.core.last_clicked&&!this._data.core.last_clicked.state.selected&&(this._data.core.last_clicked=null),!this._data.core.last_clicked&&this._data.core.selected.length&&(this._data.core.last_clicked=this.get_node(this._data.core.selected[this._data.core.selected.length-1])),this.settings.core.multiple&&(c.metaKey||c.ctrlKey||c.shiftKey)&&(!c.shiftKey||this._data.core.last_clicked&&this.get_parent(a)&&this.get_parent(a)===this._data.core.last_clicked.parent))if(c.shiftKey){var d=this.get_node(a).id,e=this._data.core.last_clicked.id,f=this.get_node(this._data.core.last_clicked.parent).children,g=!1,h,i;for(h=0,i=f.length;i>h;h+=1)f[h]===d&&(g=!g),f[h]===e&&(g=!g),this.is_disabled(f[h])||!g&&f[h]!==d&&f[h]!==e?this.deselect_node(f[h],!0,c):this.select_node(f[h],!0,!1,c);this.trigger("changed",{action:"select_node",node:this.get_node(a),selected:this._data.core.selected,event:c})}else this.is_selected(a)?this.deselect_node(a,!1,c):this.select_node(a,!1,!1,c);else!this.settings.core.multiple&&(c.metaKey||c.ctrlKey||c.shiftKey)&&this.is_selected(a)?this.deselect_node(a,!1,c):(this.deselect_all(!0),this.select_node(a,!1,!1,c),this._data.core.last_clicked=this.get_node(a));this.trigger("activate_node",{node:this.get_node(a),event:c})},hover_node:function(a){if(a=this.get_node(a,!0),!a||!a.length||a.children(".jstree-hovered").length)return!1;var b=this.element.find(".jstree-hovered"),c=this.element;b&&b.length&&this.dehover_node(b),a.children(".jstree-anchor").addClass("jstree-hovered"),this.trigger("hover_node",{node:this.get_node(a)}),setTimeout(function(){c.attr("aria-activedescendant",a[0].id)},0)},dehover_node:function(a){return a=this.get_node(a,!0),a&&a.length&&a.children(".jstree-hovered").length?(a.children(".jstree-anchor").removeClass("jstree-hovered"),void this.trigger("dehover_node",{node:this.get_node(a)})):!1},select_node:function(b,c,d,e){var f,g,h,i;if(a.isArray(b)){for(b=b.slice(),g=0,h=b.length;h>g;g++)this.select_node(b[g],c,d,e);return!0}return b=this.get_node(b),b&&b.id!==a.jstree.root?(f=this.get_node(b,!0),void(b.state.selected||(b.state.selected=!0,this._data.core.selected.push(b.id),d||(f=this._open_to(b)),f&&f.length&&f.attr("aria-selected",!0).children(".jstree-anchor").addClass("jstree-clicked"),this.trigger("select_node",{node:b,selected:this._data.core.selected,event:e}),c||this.trigger("changed",{action:"select_node",node:b,selected:this._data.core.selected,event:e})))):!1},deselect_node:function(b,c,d){var e,f,g;if(a.isArray(b)){for(b=b.slice(),e=0,f=b.length;f>e;e++)this.deselect_node(b[e],c,d);return!0}return b=this.get_node(b),b&&b.id!==a.jstree.root?(g=this.get_node(b,!0),void(b.state.selected&&(b.state.selected=!1,this._data.core.selected=a.vakata.array_remove_item(this._data.core.selected,b.id),g.length&&g.attr("aria-selected",!1).children(".jstree-anchor").removeClass("jstree-clicked"),this.trigger("deselect_node",{node:b,selected:this._data.core.selected,event:d}),c||this.trigger("changed",{action:"deselect_node",node:b,selected:this._data.core.selected,event:d})))):!1},select_all:function(b){var c=this._data.core.selected.concat([]),d,e;for(this._data.core.selected=this._model.data[a.jstree.root].children_d.concat(),d=0,e=this._data.core.selected.length;e>d;d++)this._model.data[this._data.core.selected[d]]&&(this._model.data[this._data.core.selected[d]].state.selected=!0);this.redraw(!0),this.trigger("select_all",{selected:this._data.core.selected}),b||this.trigger("changed",{action:"select_all",selected:this._data.core.selected,old_selection:c})},deselect_all:function(a){var b=this._data.core.selected.concat([]),c,d;for(c=0,d=this._data.core.selected.length;d>c;c++)this._model.data[this._data.core.selected[c]]&&(this._model.data[this._data.core.selected[c]].state.selected=!1);this._data.core.selected=[],this.element.find(".jstree-clicked").removeClass("jstree-clicked").parent().attr("aria-selected",!1),this.trigger("deselect_all",{selected:this._data.core.selected,node:b}),a||this.trigger("changed",{action:"deselect_all",selected:this._data.core.selected,old_selection:b})},is_selected:function(b){return b=this.get_node(b),b&&b.id!==a.jstree.root?b.state.selected:!1},get_selected:function(b){return b?a.map(this._data.core.selected,a.proxy(function(a){return this.get_node(a)},this)):this._data.core.selected.slice()},get_top_selected:function(b){var c=this.get_selected(!0),d={},e,f,g,h;for(e=0,f=c.length;f>e;e++)d[c[e].id]=c[e];for(e=0,f=c.length;f>e;e++)for(g=0,h=c[e].children_d.length;h>g;g++)d[c[e].children_d[g]]&&delete d[c[e].children_d[g]];c=[];for(e in d)d.hasOwnProperty(e)&&c.push(e);return b?a.map(c,a.proxy(function(a){return this.get_node(a)},this)):c},get_bottom_selected:function(b){var c=this.get_selected(!0),d=[],e,f;for(e=0,f=c.length;f>e;e++)c[e].children.length||d.push(c[e].id);return b?a.map(d,a.proxy(function(a){return this.get_node(a)},this)):d},get_state:function(){var b={core:{open:[],scroll:{left:this.element.scrollLeft(),top:this.element.scrollTop()},selected:[]}},c;for(c in this._model.data)this._model.data.hasOwnProperty(c)&&c!==a.jstree.root&&(this._model.data[c].state.opened&&b.core.open.push(c),this._model.data[c].state.selected&&b.core.selected.push(c));return b},set_state:function(c,d){if(c){if(c.core){var e,f,g,h,i;if(c.core.open)return a.isArray(c.core.open)&&c.core.open.length?this._load_nodes(c.core.open,function(a){this.open_node(a,!1,0),delete c.core.open,this.set_state(c,d)},!0):(delete c.core.open,this.set_state(c,d)),!1;if(c.core.scroll)return c.core.scroll&&c.core.scroll.left!==b&&this.element.scrollLeft(c.core.scroll.left),c.core.scroll&&c.core.scroll.top!==b&&this.element.scrollTop(c.core.scroll.top),delete c.core.scroll,this.set_state(c,d),!1;if(c.core.selected)return h=this,this.deselect_all(),a.each(c.core.selected,function(a,b){h.select_node(b,!1,!0)}),delete c.core.selected,this.set_state(c,d),!1;for(i in c)c.hasOwnProperty(i)&&"core"!==i&&-1===a.inArray(i,this.settings.plugins)&&delete c[i];if(a.isEmptyObject(c.core))return delete c.core,this.set_state(c,d),!1}return a.isEmptyObject(c)?(c=null,d&&d.call(this),this.trigger("set_state"),!1):!0}return!1},refresh:function(b,c){this._data.core.state=c===!0?{}:this.get_state(),c&&a.isFunction(c)&&(this._data.core.state=c.call(this,this._data.core.state)),this._cnt=0,this._model.data={},this._model.data[a.jstree.root]={id:a.jstree.root,parent:null,parents:[],children:[],children_d:[],state:{loaded:!1}},this._data.core.selected=[],this._data.core.last_clicked=null,this._data.core.focused=null;var d=this.get_container_ul()[0].className;b||(this.element.html("<ul class='"+d+"' role='group'><li class='jstree-initial-node jstree-loading jstree-leaf jstree-last' role='treeitem' id='j"+this._id+"_loading'><i class='jstree-icon jstree-ocl'></i><a class='jstree-anchor' href='#'><i class='jstree-icon jstree-themeicon-hidden'></i>"+this.get_string("Loading ...")+"</a></li></ul>"),this.element.attr("aria-activedescendant","j"+this._id+"_loading")),this.load_node(a.jstree.root,function(b,c){c&&(this.get_container_ul()[0].className=d,this._firstChild(this.get_container_ul()[0])&&this.element.attr("aria-activedescendant",this._firstChild(this.get_container_ul()[0]).id),this.set_state(a.extend(!0,{},this._data.core.state),function(){this.trigger("refresh")})),this._data.core.state=null})},refresh_node:function(b){if(b=this.get_node(b),!b||b.id===a.jstree.root)return!1;var c=[],d=[],e=this._data.core.selected.concat([]);d.push(b.id),b.state.opened===!0&&c.push(b.id),this.get_node(b,!0).find(".jstree-open").each(function(){c.push(this.id)}),this._load_nodes(d,a.proxy(function(a){this.open_node(c,!1,0),this.select_node(this._data.core.selected),this.trigger("refresh_node",{node:b,nodes:a})},this))},set_id:function(b,c){if(b=this.get_node(b),!b||b.id===a.jstree.root)return!1;var d,e,f=this._model.data;for(c=c.toString(),f[b.parent].children[a.inArray(b.id,f[b.parent].children)]=c,d=0,e=b.parents.length;e>d;d++)f[b.parents[d]].children_d[a.inArray(b.id,f[b.parents[d]].children_d)]=c;for(d=0,e=b.children.length;e>d;d++)f[b.children[d]].parent=c;for(d=0,e=b.children_d.length;e>d;d++)f[b.children_d[d]].parents[a.inArray(b.id,f[b.children_d[d]].parents)]=c;return d=a.inArray(b.id,this._data.core.selected),-1!==d&&(this._data.core.selected[d]=c),d=this.get_node(b.id,!0),d&&(d.attr("id",c).children(".jstree-anchor").attr("id",c+"_anchor").end().attr("aria-labelledby",c+"_anchor"),this.element.attr("aria-activedescendant")===b.id&&this.element.attr("aria-activedescendant",c)),delete f[b.id],b.id=c,b.li_attr.id=c,f[c]=b,!0},get_text:function(b){return b=this.get_node(b),b&&b.id!==a.jstree.root?b.text:!1},set_text:function(b,c){var d,e;if(a.isArray(b)){for(b=b.slice(),d=0,e=b.length;e>d;d++)this.set_text(b[d],c);return!0}return b=this.get_node(b),b&&b.id!==a.jstree.root?(b.text=c,this.get_node(b,!0).length&&this.redraw_node(b.id),this.trigger("set_text",{obj:b,text:c}),!0):!1},get_json:function(b,c,d){if(b=this.get_node(b||a.jstree.root),!b)return!1;c&&c.flat&&!d&&(d=[]);var e={id:b.id,text:b.text,icon:this.get_icon(b),li_attr:a.extend(!0,{},b.li_attr),a_attr:a.extend(!0,{},b.a_attr),state:{},data:c&&c.no_data?!1:a.extend(!0,{},b.data)},f,g;if(c&&c.flat?e.parent=b.parent:e.children=[],!c||!c.no_state)for(f in b.state)b.state.hasOwnProperty(f)&&(e.state[f]=b.state[f]);if(c&&c.no_id&&(delete e.id,e.li_attr&&e.li_attr.id&&delete e.li_attr.id,e.a_attr&&e.a_attr.id&&delete e.a_attr.id),c&&c.flat&&b.id!==a.jstree.root&&d.push(e),!c||!c.no_children)for(f=0,g=b.children.length;g>f;f++)c&&c.flat?this.get_json(b.children[f],c,d):e.children.push(this.get_json(b.children[f],c));return c&&c.flat?d:b.id===a.jstree.root?e.children:e},create_node:function(c,d,e,f,g){if(null===c&&(c=a.jstree.root),c=this.get_node(c),!c)return!1;if(e=e===b?"last":e,!e.toString().match(/^(before|after)$/)&&!g&&!this.is_loaded(c))return this.load_node(c,function(){this.create_node(c,d,e,f,!0)});d||(d={text:this.get_string("New node")}),"string"==typeof d&&(d={text:d}),d.text===b&&(d.text=this.get_string("New node"));var h,i,j,k;switch(c.id===a.jstree.root&&("before"===e&&(e="first"),"after"===e&&(e="last")),e){case"before":h=this.get_node(c.parent),e=a.inArray(c.id,h.children),c=h;break;case"after":h=this.get_node(c.parent),e=a.inArray(c.id,h.children)+1,c=h;break;case"inside":case"first":e=0;break;case"last":e=c.children.length;break;default:e||(e=0)}if(e>c.children.length&&(e=c.children.length),d.id||(d.id=!0),!this.check("create_node",d,c,e))return this.settings.core.error.call(this,this._data.core.last_error),!1;if(d.id===!0&&delete d.id,d=this._parse_model_from_json(d,c.id,c.parents.concat()),!d)return!1;for(h=this.get_node(d),i=[],i.push(d),i=i.concat(h.children_d),this.trigger("model",{nodes:i,parent:c.id}),c.children_d=c.children_d.concat(i),j=0,k=c.parents.length;k>j;j++)this._model.data[c.parents[j]].children_d=this._model.data[c.parents[j]].children_d.concat(i);for(d=h,h=[],j=0,k=c.children.length;k>j;j++)h[j>=e?j+1:j]=c.children[j];return h[e]=d.id,c.children=h,this.redraw_node(c,!0),f&&f.call(this,this.get_node(d)),this.trigger("create_node",{node:this.get_node(d),parent:c.id,position:e}),d.id},rename_node:function(b,c){var d,e,f;if(a.isArray(b)){for(b=b.slice(),d=0,e=b.length;e>d;d++)this.rename_node(b[d],c);return!0}return b=this.get_node(b),b&&b.id!==a.jstree.root?(f=b.text,this.check("rename_node",b,this.get_parent(b),c)?(this.set_text(b,c),this.trigger("rename_node",{node:b,text:c,old:f}),!0):(this.settings.core.error.call(this,this._data.core.last_error),!1)):!1},delete_node:function(b){var c,d,e,f,g,h,i,j,k,l,m,n;if(a.isArray(b)){for(b=b.slice(),c=0,d=b.length;d>c;c++)this.delete_node(b[c]);return!0}if(b=this.get_node(b),!b||b.id===a.jstree.root)return!1;if(e=this.get_node(b.parent),f=a.inArray(b.id,e.children),l=!1,!this.check("delete_node",b,e,f))return this.settings.core.error.call(this,this._data.core.last_error),!1;for(-1!==f&&(e.children=a.vakata.array_remove(e.children,f)),g=b.children_d.concat([]),g.push(b.id),j=0,k=g.length;k>j;j++){for(h=0,i=b.parents.length;i>h;h++)f=a.inArray(g[j],this._model.data[b.parents[h]].children_d),-1!==f&&(this._model.data[b.parents[h]].children_d=a.vakata.array_remove(this._model.data[b.parents[h]].children_d,f));this._model.data[g[j]].state.selected&&(l=!0,f=a.inArray(g[j],this._data.core.selected),-1!==f&&(this._data.core.selected=a.vakata.array_remove(this._data.core.selected,f)))}for(this.trigger("delete_node",{node:b,parent:e.id}),l&&this.trigger("changed",{action:"delete_node",node:b,selected:this._data.core.selected,parent:e.id}),j=0,k=g.length;k>j;j++)delete this._model.data[g[j]];return-1!==a.inArray(this._data.core.focused,g)&&(this._data.core.focused=null,m=this.element[0].scrollTop,n=this.element[0].scrollLeft,e.id===a.jstree.root?this.get_node(this._model.data[a.jstree.root].children[0],!0).children(".jstree-anchor").focus():this.get_node(e,!0).children(".jstree-anchor").focus(),this.element[0].scrollTop=m,this.element[0].scrollLeft=n),this.redraw_node(e,!0),!0},check:function(b,c,d,e,f){c=c&&c.id?c:this.get_node(c),d=d&&d.id?d:this.get_node(d);var g=b.match(/^move_node|copy_node|create_node$/i)?d:c,h=this.settings.core.check_callback;return"move_node"!==b&&"copy_node"!==b||f&&f.is_multi||c.id!==d.id&&a.inArray(c.id,d.children)!==e&&-1===a.inArray(d.id,c.children_d)?(g&&g.data&&(g=g.data),g&&g.functions&&(g.functions[b]===!1||g.functions[b]===!0)?(g.functions[b]===!1&&(this._data.core.last_error={error:"check",plugin:"core",id:"core_02",reason:"Node data prevents function: "+b,data:JSON.stringify({chk:b,pos:e,obj:c&&c.id?c.id:!1,par:d&&d.id?d.id:!1})}),g.functions[b]):h===!1||a.isFunction(h)&&h.call(this,b,c,d,e,f)===!1||h&&h[b]===!1?(this._data.core.last_error={error:"check",plugin:"core",id:"core_03",reason:"User config for core.check_callback prevents function: "+b,data:JSON.stringify({chk:b,pos:e,obj:c&&c.id?c.id:!1,par:d&&d.id?d.id:!1})},!1):!0):(this._data.core.last_error={error:"check",plugin:"core",id:"core_01",reason:"Moving parent inside child",data:JSON.stringify({chk:b,pos:e,obj:c&&c.id?c.id:!1,par:d&&d.id?d.id:!1})},!1)},last_error:function(){return this._data.core.last_error},move_node:function(c,d,e,f,g,h,i){var j,k,l,m,n,o,p,q,r,s,t,u,v,w;if(d=this.get_node(d),e=e===b?0:e,!d)return!1;if(!e.toString().match(/^(before|after)$/)&&!g&&!this.is_loaded(d))return this.load_node(d,function(){this.move_node(c,d,e,f,!0,!1,i)});if(a.isArray(c)){if(1!==c.length){for(j=0,k=c.length;k>j;j++)(r=this.move_node(c[j],d,e,f,g,!1,i))&&(d=r,e="after");return this.redraw(),!0}c=c[0]}if(c=c&&c.id?c:this.get_node(c),!c||c.id===a.jstree.root)return!1;if(l=(c.parent||a.jstree.root).toString(),n=e.toString().match(/^(before|after)$/)&&d.id!==a.jstree.root?this.get_node(d.parent):d,o=i?i:this._model.data[c.id]?this:a.jstree.reference(c.id),p=!o||!o._id||this._id!==o._id,m=o&&o._id&&l&&o._model.data[l]&&o._model.data[l].children?a.inArray(c.id,o._model.data[l].children):-1,o&&o._id&&(c=o._model.data[c.id]),p)return(r=this.copy_node(c,d,e,f,g,!1,i))?(o&&o.delete_node(c),r):!1;switch(d.id===a.jstree.root&&("before"===e&&(e="first"),"after"===e&&(e="last")),e){case"before":e=a.inArray(d.id,n.children);break;case"after":e=a.inArray(d.id,n.children)+1;break;case"inside":case"first":e=0;break;case"last":e=n.children.length;break;default:e||(e=0)}if(e>n.children.length&&(e=n.children.length),!this.check("move_node",c,n,e,{core:!0,origin:i,is_multi:o&&o._id&&o._id!==this._id,is_foreign:!o||!o._id}))return this.settings.core.error.call(this,this._data.core.last_error),!1;if(c.parent===n.id){for(q=n.children.concat(),r=a.inArray(c.id,q),-1!==r&&(q=a.vakata.array_remove(q,r),e>r&&e--),r=[],s=0,t=q.length;t>s;s++)r[s>=e?s+1:s]=q[s];r[e]=c.id,n.children=r,this._node_changed(n.id),this.redraw(n.id===a.jstree.root)}else{for(r=c.children_d.concat(),r.push(c.id),s=0,t=c.parents.length;t>s;s++){for(q=[],w=o._model.data[c.parents[s]].children_d,u=0,v=w.length;v>u;u++)-1===a.inArray(w[u],r)&&q.push(w[u]);o._model.data[c.parents[s]].children_d=q}for(o._model.data[l].children=a.vakata.array_remove_item(o._model.data[l].children,c.id),s=0,t=n.parents.length;t>s;s++)this._model.data[n.parents[s]].children_d=this._model.data[n.parents[s]].children_d.concat(r);for(q=[],s=0,t=n.children.length;t>s;s++)q[s>=e?s+1:s]=n.children[s];for(q[e]=c.id,n.children=q,n.children_d.push(c.id),n.children_d=n.children_d.concat(c.children_d),c.parent=n.id,r=n.parents.concat(),r.unshift(n.id),w=c.parents.length,c.parents=r,r=r.concat(),s=0,t=c.children_d.length;t>s;s++)this._model.data[c.children_d[s]].parents=this._model.data[c.children_d[s]].parents.slice(0,-1*w),Array.prototype.push.apply(this._model.data[c.children_d[s]].parents,r);(l===a.jstree.root||n.id===a.jstree.root)&&(this._model.force_full_redraw=!0),this._model.force_full_redraw||(this._node_changed(l),this._node_changed(n.id)),h||this.redraw()}return f&&f.call(this,c,n,e),this.trigger("move_node",{node:c,parent:n.id,position:e,old_parent:l,old_position:m,is_multi:o&&o._id&&o._id!==this._id,is_foreign:!o||!o._id,old_instance:o,new_instance:this}),c.id},copy_node:function(c,d,e,f,g,h,i){var j,k,l,m,n,o,p,q,r,s,t;if(d=this.get_node(d),e=e===b?0:e,!d)return!1;if(!e.toString().match(/^(before|after)$/)&&!g&&!this.is_loaded(d))return this.load_node(d,function(){this.copy_node(c,d,e,f,!0,!1,i)});if(a.isArray(c)){if(1!==c.length){for(j=0,k=c.length;k>j;j++)(m=this.copy_node(c[j],d,e,f,g,!0,i))&&(d=m,e="after");return this.redraw(),!0}c=c[0]}if(c=c&&c.id?c:this.get_node(c),!c||c.id===a.jstree.root)return!1;switch(q=(c.parent||a.jstree.root).toString(),r=e.toString().match(/^(before|after)$/)&&d.id!==a.jstree.root?this.get_node(d.parent):d,s=i?i:this._model.data[c.id]?this:a.jstree.reference(c.id),t=!s||!s._id||this._id!==s._id,s&&s._id&&(c=s._model.data[c.id]),d.id===a.jstree.root&&("before"===e&&(e="first"),"after"===e&&(e="last")),e){case"before":e=a.inArray(d.id,r.children);break;case"after":e=a.inArray(d.id,r.children)+1;break;case"inside":case"first":e=0;break;case"last":e=r.children.length;break;default:e||(e=0)}if(e>r.children.length&&(e=r.children.length),!this.check("copy_node",c,r,e,{core:!0,origin:i,is_multi:s&&s._id&&s._id!==this._id,is_foreign:!s||!s._id}))return this.settings.core.error.call(this,this._data.core.last_error),!1;if(p=s?s.get_json(c,{no_id:!0,no_data:!0,no_state:!0}):c,!p)return!1;if(p.id===!0&&delete p.id,p=this._parse_model_from_json(p,r.id,r.parents.concat()),!p)return!1;for(m=this.get_node(p),c&&c.state&&c.state.loaded===!1&&(m.state.loaded=!1),l=[],l.push(p),l=l.concat(m.children_d),this.trigger("model",{nodes:l,parent:r.id}),n=0,o=r.parents.length;o>n;n++)this._model.data[r.parents[n]].children_d=this._model.data[r.parents[n]].children_d.concat(l);for(l=[],n=0,o=r.children.length;o>n;n++)l[n>=e?n+1:n]=r.children[n];return l[e]=m.id,r.children=l,r.children_d.push(m.id),r.children_d=r.children_d.concat(m.children_d),r.id===a.jstree.root&&(this._model.force_full_redraw=!0),this._model.force_full_redraw||this._node_changed(r.id),h||this.redraw(r.id===a.jstree.root),f&&f.call(this,m,r,e),this.trigger("copy_node",{node:m,original:c,parent:r.id,position:e,old_parent:q,old_position:s&&s._id&&q&&s._model.data[q]&&s._model.data[q].children?a.inArray(c.id,s._model.data[q].children):-1,is_multi:s&&s._id&&s._id!==this._id,is_foreign:!s||!s._id,old_instance:s,new_instance:this}),m.id},cut:function(b){if(b||(b=this._data.core.selected.concat()),a.isArray(b)||(b=[b]),!b.length)return!1;var c=[],g,h,i;for(h=0,i=b.length;i>h;h++)g=this.get_node(b[h]),g&&g.id&&g.id!==a.jstree.root&&c.push(g);return c.length?(d=c,f=this,e="move_node",void this.trigger("cut",{node:b})):!1},copy:function(b){if(b||(b=this._data.core.selected.concat()),a.isArray(b)||(b=[b]),!b.length)return!1;var c=[],g,h,i;for(h=0,i=b.length;i>h;h++)g=this.get_node(b[h]),g&&g.id&&g.id!==a.jstree.root&&c.push(g);return c.length?(d=c,f=this,e="copy_node",void this.trigger("copy",{node:b})):!1},get_buffer:function(){return{mode:e,node:d,inst:f}},can_paste:function(){return e!==!1&&d!==!1},paste:function(a,b){return a=this.get_node(a),a&&e&&e.match(/^(copy_node|move_node)$/)&&d?(this[e](d,a,b,!1,!1,!1,f)&&this.trigger("paste",{parent:a.id,node:d,mode:e}),d=!1,e=!1,void(f=!1)):!1},clear_buffer:function(){d=!1,e=!1,f=!1,this.trigger("clear_buffer")},edit:function(b,c,d){var e,f,g,h,i,j,k,l,m,n=!1;return(b=this.get_node(b))?this.settings.core.check_callback===!1?(this._data.core.last_error={error:"check",plugin:"core",id:"core_07",reason:"Could not edit node because of check_callback"},this.settings.core.error.call(this,this._data.core.last_error),!1):(m=b,c="string"==typeof c?c:b.text,this.set_text(b,""),b=this._open_to(b),m.text=c,e=this._data.core.rtl,f=this.element.width(),this._data.core.focused=m.id,g=b.children(".jstree-anchor").focus(),h=a("<span>"),i=c,j=a("<div />",{css:{position:"absolute",top:"-200px",left:e?"0px":"-1000px",visibility:"hidden"}}).appendTo("body"),k=a("<input />",{value:i,"class":"jstree-rename-input",css:{padding:"0",border:"1px solid silver","box-sizing":"border-box",display:"inline-block",height:this._data.core.li_height+"px",lineHeight:this._data.core.li_height+"px",width:"150px"},blur:a.proxy(function(c){c.stopImmediatePropagation(),c.preventDefault();var e=h.children(".jstree-rename-input"),f=e.val(),k=this.settings.core.force_text,l;""===f&&(f=i),j.remove(),h.replaceWith(g),h.remove(),i=k?i:a("<div></div>").append(a.parseHTML(i)).html(),this.set_text(b,i),l=!!this.rename_node(b,k?a("<div></div>").text(f).text():a("<div></div>").append(a.parseHTML(f)).html()),l||this.set_text(b,i),this._data.core.focused=m.id,setTimeout(a.proxy(function(){var a=this.get_node(m.id,!0);a.length&&(this._data.core.focused=m.id,a.children(".jstree-anchor").focus())},this),0),d&&d.call(this,m,l,n)},this),keydown:function(a){var b=a.which;27===b&&(n=!0,this.value=i),(27===b||13===b||37===b||38===b||39===b||40===b||32===b)&&a.stopImmediatePropagation(),(27===b||13===b)&&(a.preventDefault(),this.blur())},click:function(a){a.stopImmediatePropagation()},mousedown:function(a){a.stopImmediatePropagation()},keyup:function(a){k.width(Math.min(j.text("pW"+this.value).width(),f))},keypress:function(a){return 13===a.which?!1:void 0}}),l={fontFamily:g.css("fontFamily")||"",fontSize:g.css("fontSize")||"",fontWeight:g.css("fontWeight")||"",fontStyle:g.css("fontStyle")||"",fontStretch:g.css("fontStretch")||"",fontVariant:g.css("fontVariant")||"",letterSpacing:g.css("letterSpacing")||"",wordSpacing:g.css("wordSpacing")||""},h.attr("class",g.attr("class")).append(g.contents().clone()).append(k),g.replaceWith(h),j.css(l),void k.css(l).width(Math.min(j.text("pW"+k[0].value).width(),f))[0].select()):!1},set_theme:function(b,c){if(!b)return!1;if(c===!0){var d=this.settings.core.themes.dir;d||(d=a.jstree.path+"/themes"),c=d+"/"+b+"/style.css"}c&&-1===a.inArray(c,g)&&(a("head").append('<link rel="stylesheet" href="'+c+'" type="text/css" />'),g.push(c)),this._data.core.themes.name&&this.element.removeClass("jstree-"+this._data.core.themes.name),
-this._data.core.themes.name=b,this.element.addClass("jstree-"+b),this.element[this.settings.core.themes.responsive?"addClass":"removeClass"]("jstree-"+b+"-responsive"),this.trigger("set_theme",{theme:b})},get_theme:function(){return this._data.core.themes.name},set_theme_variant:function(a){this._data.core.themes.variant&&this.element.removeClass("jstree-"+this._data.core.themes.name+"-"+this._data.core.themes.variant),this._data.core.themes.variant=a,a&&this.element.addClass("jstree-"+this._data.core.themes.name+"-"+this._data.core.themes.variant)},get_theme_variant:function(){return this._data.core.themes.variant},show_stripes:function(){this._data.core.themes.stripes=!0,this.get_container_ul().addClass("jstree-striped")},hide_stripes:function(){this._data.core.themes.stripes=!1,this.get_container_ul().removeClass("jstree-striped")},toggle_stripes:function(){this._data.core.themes.stripes?this.hide_stripes():this.show_stripes()},show_dots:function(){this._data.core.themes.dots=!0,this.get_container_ul().removeClass("jstree-no-dots")},hide_dots:function(){this._data.core.themes.dots=!1,this.get_container_ul().addClass("jstree-no-dots")},toggle_dots:function(){this._data.core.themes.dots?this.hide_dots():this.show_dots()},show_icons:function(){this._data.core.themes.icons=!0,this.get_container_ul().removeClass("jstree-no-icons")},hide_icons:function(){this._data.core.themes.icons=!1,this.get_container_ul().addClass("jstree-no-icons")},toggle_icons:function(){this._data.core.themes.icons?this.hide_icons():this.show_icons()},set_icon:function(c,d){var e,f,g,h;if(a.isArray(c)){for(c=c.slice(),e=0,f=c.length;f>e;e++)this.set_icon(c[e],d);return!0}return c=this.get_node(c),c&&c.id!==a.jstree.root?(h=c.icon,c.icon=d===!0||null===d||d===b||""===d?!0:d,g=this.get_node(c,!0).children(".jstree-anchor").children(".jstree-themeicon"),d===!1?this.hide_icon(c):d===!0||null===d||d===b||""===d?(g.removeClass("jstree-themeicon-custom "+h).css("background","").removeAttr("rel"),h===!1&&this.show_icon(c)):-1===d.indexOf("/")&&-1===d.indexOf(".")?(g.removeClass(h).css("background",""),g.addClass(d+" jstree-themeicon-custom").attr("rel",d),h===!1&&this.show_icon(c)):(g.removeClass(h).css("background",""),g.addClass("jstree-themeicon-custom").css("background","url('"+d+"') center center no-repeat").attr("rel",d),h===!1&&this.show_icon(c)),!0):!1},get_icon:function(b){return b=this.get_node(b),b&&b.id!==a.jstree.root?b.icon:!1},hide_icon:function(b){var c,d;if(a.isArray(b)){for(b=b.slice(),c=0,d=b.length;d>c;c++)this.hide_icon(b[c]);return!0}return b=this.get_node(b),b&&b!==a.jstree.root?(b.icon=!1,this.get_node(b,!0).children(".jstree-anchor").children(".jstree-themeicon").addClass("jstree-themeicon-hidden"),!0):!1},show_icon:function(b){var c,d,e;if(a.isArray(b)){for(b=b.slice(),c=0,d=b.length;d>c;c++)this.show_icon(b[c]);return!0}return b=this.get_node(b),b&&b!==a.jstree.root?(e=this.get_node(b,!0),b.icon=e.length?e.children(".jstree-anchor").children(".jstree-themeicon").attr("rel"):!0,b.icon||(b.icon=!0),e.children(".jstree-anchor").children(".jstree-themeicon").removeClass("jstree-themeicon-hidden"),!0):!1}},a.vakata={},a.vakata.attributes=function(b,c){b=a(b)[0];var d=c?{}:[];return b&&b.attributes&&a.each(b.attributes,function(b,e){-1===a.inArray(e.name.toLowerCase(),["style","contenteditable","hasfocus","tabindex"])&&null!==e.value&&""!==a.trim(e.value)&&(c?d[e.name]=e.value:d.push(e.name))}),d},a.vakata.array_unique=function(a){var c=[],d,e,f,g={};for(d=0,f=a.length;f>d;d++)g[a[d]]===b&&(c.push(a[d]),g[a[d]]=!0);return c},a.vakata.array_remove=function(a,b,c){var d=a.slice((c||b)+1||a.length);return a.length=0>b?a.length+b:b,a.push.apply(a,d),a},a.vakata.array_remove_item=function(b,c){var d=a.inArray(c,b);return-1!==d?a.vakata.array_remove(b,d):b},a.jstree.plugins.changed=function(a,b){var c=[];this.trigger=function(a,d){var e,f;if(d||(d={}),"changed"===a.replace(".jstree","")){d.changed={selected:[],deselected:[]};var g={};for(e=0,f=c.length;f>e;e++)g[c[e]]=1;for(e=0,f=d.selected.length;f>e;e++)g[d.selected[e]]?g[d.selected[e]]=2:d.changed.selected.push(d.selected[e]);for(e=0,f=c.length;f>e;e++)1===g[c[e]]&&d.changed.deselected.push(c[e]);c=d.selected.slice()}b.trigger.call(this,a,d)},this.refresh=function(a,d){return c=[],b.refresh.apply(this,arguments)}};var m=i.createElement("I");m.className="jstree-icon jstree-checkbox",m.setAttribute("role","presentation"),a.jstree.defaults.checkbox={visible:!0,three_state:!0,whole_node:!0,keep_selected_style:!0,cascade:"",tie_selection:!0},a.jstree.plugins.checkbox=function(c,d){this.bind=function(){d.bind.call(this),this._data.checkbox.uto=!1,this._data.checkbox.selected=[],this.settings.checkbox.three_state&&(this.settings.checkbox.cascade="up+down+undetermined"),this.element.on("init.jstree",a.proxy(function(){this._data.checkbox.visible=this.settings.checkbox.visible,this.settings.checkbox.keep_selected_style||this.element.addClass("jstree-checkbox-no-clicked"),this.settings.checkbox.tie_selection&&this.element.addClass("jstree-checkbox-selection")},this)).on("loading.jstree",a.proxy(function(){this[this._data.checkbox.visible?"show_checkboxes":"hide_checkboxes"]()},this)),-1!==this.settings.checkbox.cascade.indexOf("undetermined")&&this.element.on("changed.jstree uncheck_node.jstree check_node.jstree uncheck_all.jstree check_all.jstree move_node.jstree copy_node.jstree redraw.jstree open_node.jstree",a.proxy(function(){this._data.checkbox.uto&&clearTimeout(this._data.checkbox.uto),this._data.checkbox.uto=setTimeout(a.proxy(this._undetermined,this),50)},this)),this.settings.checkbox.tie_selection||this.element.on("model.jstree",a.proxy(function(a,b){var c=this._model.data,d=c[b.parent],e=b.nodes,f,g;for(f=0,g=e.length;g>f;f++)c[e[f]].state.checked=c[e[f]].state.checked||c[e[f]].original&&c[e[f]].original.state&&c[e[f]].original.state.checked,c[e[f]].state.checked&&this._data.checkbox.selected.push(e[f])},this)),(-1!==this.settings.checkbox.cascade.indexOf("up")||-1!==this.settings.checkbox.cascade.indexOf("down"))&&this.element.on("model.jstree",a.proxy(function(b,c){var d=this._model.data,e=d[c.parent],f=c.nodes,g=[],h,i,j,k,l,m,n=this.settings.checkbox.cascade,o=this.settings.checkbox.tie_selection;if(-1!==n.indexOf("down"))if(e.state[o?"selected":"checked"]){for(i=0,j=f.length;j>i;i++)d[f[i]].state[o?"selected":"checked"]=!0;this._data[o?"core":"checkbox"].selected=this._data[o?"core":"checkbox"].selected.concat(f)}else for(i=0,j=f.length;j>i;i++)if(d[f[i]].state[o?"selected":"checked"]){for(k=0,l=d[f[i]].children_d.length;l>k;k++)d[d[f[i]].children_d[k]].state[o?"selected":"checked"]=!0;this._data[o?"core":"checkbox"].selected=this._data[o?"core":"checkbox"].selected.concat(d[f[i]].children_d)}if(-1!==n.indexOf("up")){for(i=0,j=e.children_d.length;j>i;i++)d[e.children_d[i]].children.length||g.push(d[e.children_d[i]].parent);for(g=a.vakata.array_unique(g),k=0,l=g.length;l>k;k++){e=d[g[k]];while(e&&e.id!==a.jstree.root){for(h=0,i=0,j=e.children.length;j>i;i++)h+=d[e.children[i]].state[o?"selected":"checked"];if(h!==j)break;e.state[o?"selected":"checked"]=!0,this._data[o?"core":"checkbox"].selected.push(e.id),m=this.get_node(e,!0),m&&m.length&&m.attr("aria-selected",!0).children(".jstree-anchor").addClass(o?"jstree-clicked":"jstree-checked"),e=this.get_node(e.parent)}}}this._data[o?"core":"checkbox"].selected=a.vakata.array_unique(this._data[o?"core":"checkbox"].selected)},this)).on(this.settings.checkbox.tie_selection?"select_node.jstree":"check_node.jstree",a.proxy(function(b,c){var d=c.node,e=this._model.data,f=this.get_node(d.parent),g=this.get_node(d,!0),h,i,j,k,l=this.settings.checkbox.cascade,m=this.settings.checkbox.tie_selection;if(-1!==l.indexOf("down"))for(this._data[m?"core":"checkbox"].selected=a.vakata.array_unique(this._data[m?"core":"checkbox"].selected.concat(d.children_d)),h=0,i=d.children_d.length;i>h;h++)k=e[d.children_d[h]],k.state[m?"selected":"checked"]=!0,k&&k.original&&k.original.state&&k.original.state.undetermined&&(k.original.state.undetermined=!1);if(-1!==l.indexOf("up"))while(f&&f.id!==a.jstree.root){for(j=0,h=0,i=f.children.length;i>h;h++)j+=e[f.children[h]].state[m?"selected":"checked"];if(j!==i)break;f.state[m?"selected":"checked"]=!0,this._data[m?"core":"checkbox"].selected.push(f.id),k=this.get_node(f,!0),k&&k.length&&k.attr("aria-selected",!0).children(".jstree-anchor").addClass(m?"jstree-clicked":"jstree-checked"),f=this.get_node(f.parent)}-1!==l.indexOf("down")&&g.length&&g.find(".jstree-anchor").addClass(m?"jstree-clicked":"jstree-checked").parent().attr("aria-selected",!0)},this)).on(this.settings.checkbox.tie_selection?"deselect_all.jstree":"uncheck_all.jstree",a.proxy(function(b,c){var d=this.get_node(a.jstree.root),e=this._model.data,f,g,h;for(f=0,g=d.children_d.length;g>f;f++)h=e[d.children_d[f]],h&&h.original&&h.original.state&&h.original.state.undetermined&&(h.original.state.undetermined=!1)},this)).on(this.settings.checkbox.tie_selection?"deselect_node.jstree":"uncheck_node.jstree",a.proxy(function(b,c){var d=c.node,e=this.get_node(d,!0),f,g,h,i=this.settings.checkbox.cascade,j=this.settings.checkbox.tie_selection;if(d&&d.original&&d.original.state&&d.original.state.undetermined&&(d.original.state.undetermined=!1),-1!==i.indexOf("down"))for(f=0,g=d.children_d.length;g>f;f++)h=this._model.data[d.children_d[f]],h.state[j?"selected":"checked"]=!1,h&&h.original&&h.original.state&&h.original.state.undetermined&&(h.original.state.undetermined=!1);if(-1!==i.indexOf("up"))for(f=0,g=d.parents.length;g>f;f++)h=this._model.data[d.parents[f]],h.state[j?"selected":"checked"]=!1,h&&h.original&&h.original.state&&h.original.state.undetermined&&(h.original.state.undetermined=!1),h=this.get_node(d.parents[f],!0),h&&h.length&&h.attr("aria-selected",!1).children(".jstree-anchor").removeClass(j?"jstree-clicked":"jstree-checked");for(h=[],f=0,g=this._data[j?"core":"checkbox"].selected.length;g>f;f++)-1!==i.indexOf("down")&&-1!==a.inArray(this._data[j?"core":"checkbox"].selected[f],d.children_d)||-1!==i.indexOf("up")&&-1!==a.inArray(this._data[j?"core":"checkbox"].selected[f],d.parents)||h.push(this._data[j?"core":"checkbox"].selected[f]);this._data[j?"core":"checkbox"].selected=a.vakata.array_unique(h),-1!==i.indexOf("down")&&e.length&&e.find(".jstree-anchor").removeClass(j?"jstree-clicked":"jstree-checked").parent().attr("aria-selected",!1)},this)),-1!==this.settings.checkbox.cascade.indexOf("up")&&this.element.on("delete_node.jstree",a.proxy(function(b,c){var d=this.get_node(c.parent),e=this._model.data,f,g,h,i,j=this.settings.checkbox.tie_selection;while(d&&d.id!==a.jstree.root&&!d.state[j?"selected":"checked"]){for(h=0,f=0,g=d.children.length;g>f;f++)h+=e[d.children[f]].state[j?"selected":"checked"];if(!(g>0&&h===g))break;d.state[j?"selected":"checked"]=!0,this._data[j?"core":"checkbox"].selected.push(d.id),i=this.get_node(d,!0),i&&i.length&&i.attr("aria-selected",!0).children(".jstree-anchor").addClass(j?"jstree-clicked":"jstree-checked"),d=this.get_node(d.parent)}},this)).on("move_node.jstree",a.proxy(function(b,c){var d=c.is_multi,e=c.old_parent,f=this.get_node(c.parent),g=this._model.data,h,i,j,k,l,m=this.settings.checkbox.tie_selection;if(!d){h=this.get_node(e);while(h&&h.id!==a.jstree.root&&!h.state[m?"selected":"checked"]){for(i=0,j=0,k=h.children.length;k>j;j++)i+=g[h.children[j]].state[m?"selected":"checked"];if(!(k>0&&i===k))break;h.state[m?"selected":"checked"]=!0,this._data[m?"core":"checkbox"].selected.push(h.id),l=this.get_node(h,!0),l&&l.length&&l.attr("aria-selected",!0).children(".jstree-anchor").addClass(m?"jstree-clicked":"jstree-checked"),h=this.get_node(h.parent)}}h=f;while(h&&h.id!==a.jstree.root){for(i=0,j=0,k=h.children.length;k>j;j++)i+=g[h.children[j]].state[m?"selected":"checked"];if(i===k)h.state[m?"selected":"checked"]||(h.state[m?"selected":"checked"]=!0,this._data[m?"core":"checkbox"].selected.push(h.id),l=this.get_node(h,!0),l&&l.length&&l.attr("aria-selected",!0).children(".jstree-anchor").addClass(m?"jstree-clicked":"jstree-checked"));else{if(!h.state[m?"selected":"checked"])break;h.state[m?"selected":"checked"]=!1,this._data[m?"core":"checkbox"].selected=a.vakata.array_remove_item(this._data[m?"core":"checkbox"].selected,h.id),l=this.get_node(h,!0),l&&l.length&&l.attr("aria-selected",!1).children(".jstree-anchor").removeClass(m?"jstree-clicked":"jstree-checked")}h=this.get_node(h.parent)}},this))},this._undetermined=function(){if(null!==this.element){var c,d,e,f,g={},h=this._model.data,i=this.settings.checkbox.tie_selection,j=this._data[i?"core":"checkbox"].selected,k=[],l=this;for(c=0,d=j.length;d>c;c++)if(h[j[c]]&&h[j[c]].parents)for(e=0,f=h[j[c]].parents.length;f>e;e++)g[h[j[c]].parents[e]]===b&&h[j[c]].parents[e]!==a.jstree.root&&(g[h[j[c]].parents[e]]=!0,k.push(h[j[c]].parents[e]));for(this.element.find(".jstree-closed").not(":has(.jstree-children)").each(function(){var i=l.get_node(this),j;if(i.state.loaded){for(c=0,d=i.children_d.length;d>c;c++)if(j=h[i.children_d[c]],!j.state.loaded&&j.original&&j.original.state&&j.original.state.undetermined&&j.original.state.undetermined===!0)for(g[j.id]===b&&j.id!==a.jstree.root&&(g[j.id]=!0,k.push(j.id)),e=0,f=j.parents.length;f>e;e++)g[j.parents[e]]===b&&j.parents[e]!==a.jstree.root&&(g[j.parents[e]]=!0,k.push(j.parents[e]))}else if(i.original&&i.original.state&&i.original.state.undetermined&&i.original.state.undetermined===!0)for(g[i.id]===b&&i.id!==a.jstree.root&&(g[i.id]=!0,k.push(i.id)),e=0,f=i.parents.length;f>e;e++)g[i.parents[e]]===b&&i.parents[e]!==a.jstree.root&&(g[i.parents[e]]=!0,k.push(i.parents[e]))}),this.element.find(".jstree-undetermined").removeClass("jstree-undetermined"),c=0,d=k.length;d>c;c++)h[k[c]].state[i?"selected":"checked"]||(j=this.get_node(k[c],!0),j&&j.length&&j.children(".jstree-anchor").children(".jstree-checkbox").addClass("jstree-undetermined"))}},this.redraw_node=function(b,c,e,f){if(b=d.redraw_node.apply(this,arguments)){var g,h,i=null,j=null;for(g=0,h=b.childNodes.length;h>g;g++)if(b.childNodes[g]&&b.childNodes[g].className&&-1!==b.childNodes[g].className.indexOf("jstree-anchor")){i=b.childNodes[g];break}i&&(!this.settings.checkbox.tie_selection&&this._model.data[b.id].state.checked&&(i.className+=" jstree-checked"),j=m.cloneNode(!1),this._model.data[b.id].state.checkbox_disabled&&(j.className+=" jstree-checkbox-disabled"),i.insertBefore(j,i.childNodes[0]))}return e||-1===this.settings.checkbox.cascade.indexOf("undetermined")||(this._data.checkbox.uto&&clearTimeout(this._data.checkbox.uto),this._data.checkbox.uto=setTimeout(a.proxy(this._undetermined,this),50)),b},this.show_checkboxes=function(){this._data.core.themes.checkboxes=!0,this.get_container_ul().removeClass("jstree-no-checkboxes")},this.hide_checkboxes=function(){this._data.core.themes.checkboxes=!1,this.get_container_ul().addClass("jstree-no-checkboxes")},this.toggle_checkboxes=function(){this._data.core.themes.checkboxes?this.hide_checkboxes():this.show_checkboxes()},this.is_undetermined=function(b){b=this.get_node(b);var c=this.settings.checkbox.cascade,d,e,f=this.settings.checkbox.tie_selection,g=this._data[f?"core":"checkbox"].selected,h=this._model.data;if(!b||b.state[f?"selected":"checked"]===!0||-1===c.indexOf("undetermined")||-1===c.indexOf("down")&&-1===c.indexOf("up"))return!1;if(!b.state.loaded&&b.original.state.undetermined===!0)return!0;for(d=0,e=b.children_d.length;e>d;d++)if(-1!==a.inArray(b.children_d[d],g)||!h[b.children_d[d]].state.loaded&&h[b.children_d[d]].original.state.undetermined)return!0;return!1},this.disable_checkbox=function(b){var c,d,e;if(a.isArray(b)){for(b=b.slice(),c=0,d=b.length;d>c;c++)this.disable_checkbox(b[c]);return!0}return b=this.get_node(b),b&&b.id!==a.jstree.root?(e=this.get_node(b,!0),void(b.state.checkbox_disabled||(b.state.checkbox_disabled=!0,e&&e.length&&e.children(".jstree-anchor").children(".jstree-checkbox").addClass("jstree-checkbox-disabled"),this.trigger("disable_checkbox",{node:b})))):!1},this.enable_checkbox=function(b){var c,d,e;if(a.isArray(b)){for(b=b.slice(),c=0,d=b.length;d>c;c++)this.enable_checkbox(b[c]);return!0}return b=this.get_node(b),b&&b.id!==a.jstree.root?(e=this.get_node(b,!0),void(b.state.checkbox_disabled&&(b.state.checkbox_disabled=!1,e&&e.length&&e.children(".jstree-anchor").children(".jstree-checkbox").removeClass("jstree-checkbox-disabled"),this.trigger("enable_checkbox",{node:b})))):!1},this.activate_node=function(b,c){return a(c.target).hasClass("jstree-checkbox-disabled")?!1:(this.settings.checkbox.tie_selection&&(this.settings.checkbox.whole_node||a(c.target).hasClass("jstree-checkbox"))&&(c.ctrlKey=!0),this.settings.checkbox.tie_selection||!this.settings.checkbox.whole_node&&!a(c.target).hasClass("jstree-checkbox")?d.activate_node.call(this,b,c):this.is_disabled(b)?!1:(this.is_checked(b)?this.uncheck_node(b,c):this.check_node(b,c),void this.trigger("activate_node",{node:this.get_node(b)})))},this.check_node=function(b,c){if(this.settings.checkbox.tie_selection)return this.select_node(b,!1,!0,c);var d,e,f,g;if(a.isArray(b)){for(b=b.slice(),e=0,f=b.length;f>e;e++)this.check_node(b[e],c);return!0}return b=this.get_node(b),b&&b.id!==a.jstree.root?(d=this.get_node(b,!0),void(b.state.checked||(b.state.checked=!0,this._data.checkbox.selected.push(b.id),d&&d.length&&d.children(".jstree-anchor").addClass("jstree-checked"),this.trigger("check_node",{node:b,selected:this._data.checkbox.selected,event:c})))):!1},this.uncheck_node=function(b,c){if(this.settings.checkbox.tie_selection)return this.deselect_node(b,!1,c);var d,e,f;if(a.isArray(b)){for(b=b.slice(),d=0,e=b.length;e>d;d++)this.uncheck_node(b[d],c);return!0}return b=this.get_node(b),b&&b.id!==a.jstree.root?(f=this.get_node(b,!0),void(b.state.checked&&(b.state.checked=!1,this._data.checkbox.selected=a.vakata.array_remove_item(this._data.checkbox.selected,b.id),f.length&&f.children(".jstree-anchor").removeClass("jstree-checked"),this.trigger("uncheck_node",{node:b,selected:this._data.checkbox.selected,event:c})))):!1},this.check_all=function(){if(this.settings.checkbox.tie_selection)return this.select_all();var b=this._data.checkbox.selected.concat([]),c,d;for(this._data.checkbox.selected=this._model.data[a.jstree.root].children_d.concat(),c=0,d=this._data.checkbox.selected.length;d>c;c++)this._model.data[this._data.checkbox.selected[c]]&&(this._model.data[this._data.checkbox.selected[c]].state.checked=!0);this.redraw(!0),this.trigger("check_all",{selected:this._data.checkbox.selected})},this.uncheck_all=function(){if(this.settings.checkbox.tie_selection)return this.deselect_all();var a=this._data.checkbox.selected.concat([]),b,c;for(b=0,c=this._data.checkbox.selected.length;c>b;b++)this._model.data[this._data.checkbox.selected[b]]&&(this._model.data[this._data.checkbox.selected[b]].state.checked=!1);this._data.checkbox.selected=[],this.element.find(".jstree-checked").removeClass("jstree-checked"),this.trigger("uncheck_all",{selected:this._data.checkbox.selected,node:a})},this.is_checked=function(b){return this.settings.checkbox.tie_selection?this.is_selected(b):(b=this.get_node(b),b&&b.id!==a.jstree.root?b.state.checked:!1)},this.get_checked=function(b){return this.settings.checkbox.tie_selection?this.get_selected(b):b?a.map(this._data.checkbox.selected,a.proxy(function(a){return this.get_node(a)},this)):this._data.checkbox.selected},this.get_top_checked=function(b){if(this.settings.checkbox.tie_selection)return this.get_top_selected(b);var c=this.get_checked(!0),d={},e,f,g,h;for(e=0,f=c.length;f>e;e++)d[c[e].id]=c[e];for(e=0,f=c.length;f>e;e++)for(g=0,h=c[e].children_d.length;h>g;g++)d[c[e].children_d[g]]&&delete d[c[e].children_d[g]];c=[];for(e in d)d.hasOwnProperty(e)&&c.push(e);return b?a.map(c,a.proxy(function(a){return this.get_node(a)},this)):c},this.get_bottom_checked=function(b){if(this.settings.checkbox.tie_selection)return this.get_bottom_selected(b);var c=this.get_checked(!0),d=[],e,f;for(e=0,f=c.length;f>e;e++)c[e].children.length||d.push(c[e].id);return b?a.map(d,a.proxy(function(a){return this.get_node(a)},this)):d},this.load_node=function(b,c){var e,f,g,h,i,j;if(!a.isArray(b)&&!this.settings.checkbox.tie_selection&&(j=this.get_node(b),j&&j.state.loaded))for(e=0,f=j.children_d.length;f>e;e++)this._model.data[j.children_d[e]].state.checked&&(i=!0,this._data.checkbox.selected=a.vakata.array_remove_item(this._data.checkbox.selected,j.children_d[e]));return d.load_node.apply(this,arguments)},this.get_state=function(){var a=d.get_state.apply(this,arguments);return this.settings.checkbox.tie_selection?a:(a.checkbox=this._data.checkbox.selected.slice(),a)},this.set_state=function(b,c){var e=d.set_state.apply(this,arguments);if(e&&b.checkbox){if(!this.settings.checkbox.tie_selection){this.uncheck_all();var f=this;a.each(b.checkbox,function(a,b){f.check_node(b)})}return delete b.checkbox,this.set_state(b,c),!1}return e},this.refresh=function(a,b){return this.settings.checkbox.tie_selection||(this._data.checkbox.selected=[]),d.refresh.apply(this,arguments)}},a.jstree.defaults.conditionalselect=function(){return!0},a.jstree.plugins.conditionalselect=function(a,b){this.activate_node=function(a,c){this.settings.conditionalselect.call(this,this.get_node(a),c)&&b.activate_node.call(this,a,c)}},a.jstree.defaults.contextmenu={select_node:!0,show_at_node:!0,items:function(b,c){return{create:{separator_before:!1,separator_after:!0,_disabled:!1,label:"Create",action:function(b){var c=a.jstree.reference(b.reference),d=c.get_node(b.reference);c.create_node(d,{},"last",function(a){setTimeout(function(){c.edit(a)},0)})}},rename:{separator_before:!1,separator_after:!1,_disabled:!1,label:"Rename",action:function(b){var c=a.jstree.reference(b.reference),d=c.get_node(b.reference);c.edit(d)}},remove:{separator_before:!1,icon:!1,separator_after:!1,_disabled:!1,label:"Delete",action:function(b){var c=a.jstree.reference(b.reference),d=c.get_node(b.reference);c.is_selected(d)?c.delete_node(c.get_selected()):c.delete_node(d)}},ccp:{separator_before:!0,icon:!1,separator_after:!1,label:"Edit",action:!1,submenu:{cut:{separator_before:!1,separator_after:!1,label:"Cut",action:function(b){var c=a.jstree.reference(b.reference),d=c.get_node(b.reference);c.is_selected(d)?c.cut(c.get_top_selected()):c.cut(d)}},copy:{separator_before:!1,icon:!1,separator_after:!1,label:"Copy",action:function(b){var c=a.jstree.reference(b.reference),d=c.get_node(b.reference);c.is_selected(d)?c.copy(c.get_top_selected()):c.copy(d)}},paste:{separator_before:!1,icon:!1,_disabled:function(b){return!a.jstree.reference(b.reference).can_paste()},separator_after:!1,label:"Paste",action:function(b){var c=a.jstree.reference(b.reference),d=c.get_node(b.reference);c.paste(d)}}}}}}},a.jstree.plugins.contextmenu=function(c,d){this.bind=function(){d.bind.call(this);var b=0,c=null,e,f;this.element.on("contextmenu.jstree",".jstree-anchor",a.proxy(function(a,d){a.preventDefault(),b=a.ctrlKey?+new Date:0,(d||c)&&(b=+new Date+1e4),c&&clearTimeout(c),this.is_loading(a.currentTarget)||this.show_contextmenu(a.currentTarget,a.pageX,a.pageY,a)},this)).on("click.jstree",".jstree-anchor",a.proxy(function(c){this._data.contextmenu.visible&&(!b||+new Date-b>250)&&a.vakata.context.hide(),b=0},this)).on("touchstart.jstree",".jstree-anchor",function(b){b.originalEvent&&b.originalEvent.changedTouches&&b.originalEvent.changedTouches[0]&&(e=b.pageX,f=b.pageY,c=setTimeout(function(){a(b.currentTarget).trigger("contextmenu",!0)},750))}).on("touchmove.vakata.jstree",function(a){c&&a.originalEvent&&a.originalEvent.changedTouches&&a.originalEvent.changedTouches[0]&&(Math.abs(e-a.pageX)>50||Math.abs(f-a.pageY)>50)&&clearTimeout(c)}).on("touchend.vakata.jstree",function(a){c&&clearTimeout(c)}),a(i).on("context_hide.vakata.jstree",a.proxy(function(){this._data.contextmenu.visible=!1},this))},this.teardown=function(){this._data.contextmenu.visible&&a.vakata.context.hide(),d.teardown.call(this)},this.show_contextmenu=function(c,d,e,f){if(c=this.get_node(c),!c||c.id===a.jstree.root)return!1;var g=this.settings.contextmenu,h=this.get_node(c,!0),i=h.children(".jstree-anchor"),j=!1,k=!1;(g.show_at_node||d===b||e===b)&&(j=i.offset(),d=j.left,e=j.top+this._data.core.li_height),this.settings.contextmenu.select_node&&!this.is_selected(c)&&this.activate_node(c,f),k=g.items,a.isFunction(k)&&(k=k.call(this,c,a.proxy(function(a){this._show_contextmenu(c,d,e,a)},this))),a.isPlainObject(k)&&this._show_contextmenu(c,d,e,k)},this._show_contextmenu=function(b,c,d,e){var f=this.get_node(b,!0),g=f.children(".jstree-anchor");a(i).one("context_show.vakata.jstree",a.proxy(function(b,c){var d="jstree-contextmenu jstree-"+this.get_theme()+"-contextmenu";a(c.element).addClass(d)},this)),this._data.contextmenu.visible=!0,a.vakata.context.show(g,{x:c,y:d},e),this.trigger("show_contextmenu",{node:b,x:c,y:d})}},function(a){var b=!1,c={element:!1,reference:!1,position_x:0,position_y:0,items:[],html:"",is_visible:!1};a.vakata.context={settings:{hide_onmouseleave:0,icons:!0},_trigger:function(b){a(i).triggerHandler("context_"+b+".vakata",{reference:c.reference,element:c.element,position:{x:c.position_x,y:c.position_y}})},_execute:function(b){return b=c.items[b],b&&(!b._disabled||a.isFunction(b._disabled)&&!b._disabled({item:b,reference:c.reference,element:c.element}))&&b.action?b.action.call(null,{item:b,reference:c.reference,element:c.element,position:{x:c.position_x,y:c.position_y}}):!1},_parse:function(b,d){if(!b)return!1;d||(c.html="",c.items=[]);var e="",f=!1,g;return d&&(e+="<ul>"),a.each(b,function(b,d){return d?(c.items.push(d),!f&&d.separator_before&&(e+="<li class='vakata-context-separator'><a href='#' "+(a.vakata.context.settings.icons?"":'style="margin-left:0px;"')+">&#160;</a></li>"),f=!1,e+="<li class='"+(d._class||"")+(d._disabled===!0||a.isFunction(d._disabled)&&d._disabled({item:d,reference:c.reference,element:c.element})?" vakata-contextmenu-disabled ":"")+"' "+(d.shortcut?" data-shortcut='"+d.shortcut+"' ":"")+">",e+="<a href='#' rel='"+(c.items.length-1)+"'>",a.vakata.context.settings.icons&&(e+="<i ",d.icon&&(e+=-1!==d.icon.indexOf("/")||-1!==d.icon.indexOf(".")?" style='background:url(\""+d.icon+"\") center center no-repeat' ":" class='"+d.icon+"' "),e+="></i><span class='vakata-contextmenu-sep'>&#160;</span>"),e+=(a.isFunction(d.label)?d.label({item:b,reference:c.reference,element:c.element}):d.label)+(d.shortcut?' <span class="vakata-contextmenu-shortcut vakata-contextmenu-shortcut-'+d.shortcut+'">'+(d.shortcut_label||"")+"</span>":"")+"</a>",d.submenu&&(g=a.vakata.context._parse(d.submenu,!0),g&&(e+=g)),e+="</li>",void(d.separator_after&&(e+="<li class='vakata-context-separator'><a href='#' "+(a.vakata.context.settings.icons?"":'style="margin-left:0px;"')+">&#160;</a></li>",f=!0))):!0}),e=e.replace(/<li class\='vakata-context-separator'\><\/li\>$/,""),d&&(e+="</ul>"),d||(c.html=e,a.vakata.context._trigger("parse")),e.length>10?e:!1},_show_submenu:function(c){if(c=a(c),c.length&&c.children("ul").length){var d=c.children("ul"),e=c.offset().left+c.outerWidth(),f=c.offset().top,g=d.width(),h=d.height(),i=a(window).width()+a(window).scrollLeft(),j=a(window).height()+a(window).scrollTop();b?c[e-(g+10+c.outerWidth())<0?"addClass":"removeClass"]("vakata-context-left"):c[e+g+10>i?"addClass":"removeClass"]("vakata-context-right"),f+h+10>j&&d.css("bottom","-1px"),d.show()}},show:function(d,e,f){var g,h,i,j,k,l,m,n,o=!0;switch(c.element&&c.element.length&&c.element.width(""),o){case!e&&!d:return!1;case!!e&&!!d:c.reference=d,c.position_x=e.x,c.position_y=e.y;break;case!e&&!!d:c.reference=d,g=d.offset(),c.position_x=g.left+d.outerHeight(),c.position_y=g.top;break;case!!e&&!d:c.position_x=e.x,c.position_y=e.y}d&&!f&&a(d).data("vakata_contextmenu")&&(f=a(d).data("vakata_contextmenu")),a.vakata.context._parse(f)&&c.element.html(c.html),c.items.length&&(c.element.appendTo("body"),h=c.element,i=c.position_x,j=c.position_y,k=h.width(),l=h.height(),m=a(window).width()+a(window).scrollLeft(),n=a(window).height()+a(window).scrollTop(),b&&(i-=h.outerWidth()-a(d).outerWidth(),i<a(window).scrollLeft()+20&&(i=a(window).scrollLeft()+20)),i+k+20>m&&(i=m-(k+20)),j+l+20>n&&(j=n-(l+20)),c.element.css({left:i,top:j}).show().find("a").first().focus().parent().addClass("vakata-context-hover"),c.is_visible=!0,a.vakata.context._trigger("show"))},hide:function(){c.is_visible&&(c.element.hide().find("ul").hide().end().find(":focus").blur().end().detach(),c.is_visible=!1,a.vakata.context._trigger("hide"))}},a(function(){b="rtl"===a("body").css("direction");var d=!1;c.element=a("<ul class='vakata-context'></ul>"),c.element.on("mouseenter","li",function(b){b.stopImmediatePropagation(),a.contains(this,b.relatedTarget)||(d&&clearTimeout(d),c.element.find(".vakata-context-hover").removeClass("vakata-context-hover").end(),a(this).siblings().find("ul").hide().end().end().parentsUntil(".vakata-context","li").addBack().addClass("vakata-context-hover"),a.vakata.context._show_submenu(this))}).on("mouseleave","li",function(b){a.contains(this,b.relatedTarget)||a(this).find(".vakata-context-hover").addBack().removeClass("vakata-context-hover")}).on("mouseleave",function(b){a(this).find(".vakata-context-hover").removeClass("vakata-context-hover"),a.vakata.context.settings.hide_onmouseleave&&(d=setTimeout(function(b){return function(){a.vakata.context.hide()}}(this),a.vakata.context.settings.hide_onmouseleave))}).on("click","a",function(b){b.preventDefault(),a(this).blur().parent().hasClass("vakata-context-disabled")||a.vakata.context._execute(a(this).attr("rel"))===!1||a.vakata.context.hide()}).on("keydown","a",function(b){var d=null;switch(b.which){case 13:case 32:b.type="mouseup",b.preventDefault(),a(b.currentTarget).trigger(b);break;case 37:c.is_visible&&(c.element.find(".vakata-context-hover").last().closest("li").first().find("ul").hide().find(".vakata-context-hover").removeClass("vakata-context-hover").end().end().children("a").focus(),b.stopImmediatePropagation(),b.preventDefault());break;case 38:c.is_visible&&(d=c.element.find("ul:visible").addBack().last().children(".vakata-context-hover").removeClass("vakata-context-hover").prevAll("li:not(.vakata-context-separator)").first(),d.length||(d=c.element.find("ul:visible").addBack().last().children("li:not(.vakata-context-separator)").last()),d.addClass("vakata-context-hover").children("a").focus(),b.stopImmediatePropagation(),b.preventDefault());break;case 39:c.is_visible&&(c.element.find(".vakata-context-hover").last().children("ul").show().children("li:not(.vakata-context-separator)").removeClass("vakata-context-hover").first().addClass("vakata-context-hover").children("a").focus(),b.stopImmediatePropagation(),b.preventDefault());break;case 40:c.is_visible&&(d=c.element.find("ul:visible").addBack().last().children(".vakata-context-hover").removeClass("vakata-context-hover").nextAll("li:not(.vakata-context-separator)").first(),d.length||(d=c.element.find("ul:visible").addBack().last().children("li:not(.vakata-context-separator)").first()),d.addClass("vakata-context-hover").children("a").focus(),b.stopImmediatePropagation(),b.preventDefault());break;case 27:a.vakata.context.hide(),b.preventDefault()}}).on("keydown",function(a){a.preventDefault();var b=c.element.find(".vakata-contextmenu-shortcut-"+a.which).parent();b.parent().not(".vakata-context-disabled")&&b.click()}),a(i).on("mousedown.vakata.jstree",function(b){c.is_visible&&!a.contains(c.element[0],b.target)&&a.vakata.context.hide()}).on("context_show.vakata.jstree",function(a,d){c.element.find("li:has(ul)").children("a").addClass("vakata-context-parent"),b&&c.element.addClass("vakata-context-rtl").css("direction","rtl"),c.element.find("ul").hide().end()})})}(a),a.jstree.defaults.dnd={copy:!0,open_timeout:500,is_draggable:!0,check_while_dragging:!0,always_copy:!1,inside_pos:0,drag_selection:!0,touch:!0,large_drop_target:!1,large_drag_target:!1},a.jstree.plugins.dnd=function(b,c){this.bind=function(){c.bind.call(this),this.element.on("mousedown.jstree touchstart.jstree",this.settings.dnd.large_drag_target?".jstree-node":".jstree-anchor",a.proxy(function(b){
-if(this.settings.dnd.large_drag_target&&a(b.target).closest(".jstree-node")[0]!==b.currentTarget)return!0;if("touchstart"===b.type&&(!this.settings.dnd.touch||"selected"===this.settings.dnd.touch&&!a(b.currentTarget).closest(".jstree-node").children(".jstree-anchor").hasClass("jstree-clicked")))return!0;var c=this.get_node(b.target),d=this.is_selected(c)&&this.settings.dnd.drag_selection?this.get_top_selected().length:1,e=d>1?d+" "+this.get_string("nodes"):this.get_text(b.currentTarget);return this.settings.core.force_text&&(e=a.vakata.html.escape(e)),c&&c.id&&c.id!==a.jstree.root&&(1===b.which||"touchstart"===b.type)&&(this.settings.dnd.is_draggable===!0||a.isFunction(this.settings.dnd.is_draggable)&&this.settings.dnd.is_draggable.call(this,d>1?this.get_top_selected(!0):[c],b))?(this.element.trigger("mousedown.jstree"),a.vakata.dnd.start(b,{jstree:!0,origin:this,obj:this.get_node(c,!0),nodes:d>1?this.get_top_selected():[c.id]},'<div id="jstree-dnd" class="jstree-'+this.get_theme()+" jstree-"+this.get_theme()+"-"+this.get_theme_variant()+" "+(this.settings.core.themes.responsive?" jstree-dnd-responsive":"")+'"><i class="jstree-icon jstree-er"></i>'+e+'<ins class="jstree-copy" style="display:none;">+</ins></div>')):void 0},this))}},a(function(){var b=!1,c=!1,d=!1,e=!1,f=a('<div id="jstree-marker">&#160;</div>').hide();a(i).on("dnd_start.vakata.jstree",function(a,c){b=!1,d=!1,c&&c.data&&c.data.jstree&&f.appendTo("body")}).on("dnd_move.vakata.jstree",function(g,h){if(e&&clearTimeout(e),h&&h.data&&h.data.jstree&&(!h.event.target.id||"jstree-marker"!==h.event.target.id)){d=h.event;var i=a.jstree.reference(h.event.target),j=!1,k=!1,l=!1,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A;if(i&&i._data&&i._data.dnd)if(f.attr("class","jstree-"+i.get_theme()+(i.settings.core.themes.responsive?" jstree-dnd-responsive":"")),h.helper.children().attr("class","jstree-"+i.get_theme()+" jstree-"+i.get_theme()+"-"+i.get_theme_variant()+" "+(i.settings.core.themes.responsive?" jstree-dnd-responsive":"")).find(".jstree-copy").first()[h.data.origin&&(h.data.origin.settings.dnd.always_copy||h.data.origin.settings.dnd.copy&&(h.event.metaKey||h.event.ctrlKey))?"show":"hide"](),h.event.target!==i.element[0]&&h.event.target!==i.get_container_ul()[0]||0!==i.get_container_ul().children().length){if(j=i.settings.dnd.large_drop_target?a(h.event.target).closest(".jstree-node").children(".jstree-anchor"):a(h.event.target).closest(".jstree-anchor"),j&&j.length&&j.parent().is(".jstree-closed, .jstree-open, .jstree-leaf")&&(k=j.offset(),l=h.event.pageY-k.top,p=j.outerHeight(),s=p/3>l?["b","i","a"]:l>p-p/3?["a","i","b"]:l>p/2?["i","a","b"]:["i","b","a"],a.each(s,function(d,g){switch(g){case"b":n=k.left-6,o=k.top,q=i.get_parent(j),r=j.parent().index();break;case"i":z=i.settings.dnd.inside_pos,A=i.get_node(j.parent()),n=k.left-2,o=k.top+p/2+1,q=A.id,r="first"===z?0:"last"===z?A.children.length:Math.min(z,A.children.length);break;case"a":n=k.left-6,o=k.top+p,q=i.get_parent(j),r=j.parent().index()+1}for(t=!0,u=0,v=h.data.nodes.length;v>u;u++)if(w=h.data.origin&&(h.data.origin.settings.dnd.always_copy||h.data.origin.settings.dnd.copy&&(h.event.metaKey||h.event.ctrlKey))?"copy_node":"move_node",x=r,"move_node"===w&&"a"===g&&h.data.origin&&h.data.origin===i&&q===i.get_parent(h.data.nodes[u])&&(y=i.get_node(q),x>a.inArray(h.data.nodes[u],y.children)&&(x-=1)),t=t&&(i&&i.settings&&i.settings.dnd&&i.settings.dnd.check_while_dragging===!1||i.check(w,h.data.origin&&h.data.origin!==i?h.data.origin.get_node(h.data.nodes[u]):h.data.nodes[u],q,x,{dnd:!0,ref:i.get_node(j.parent()),pos:g,origin:h.data.origin,is_multi:h.data.origin&&h.data.origin!==i,is_foreign:!h.data.origin})),!t){i&&i.last_error&&(c=i.last_error());break}return"i"===g&&j.parent().is(".jstree-closed")&&i.settings.dnd.open_timeout&&(e=setTimeout(function(a,b){return function(){a.open_node(b)}}(i,j),i.settings.dnd.open_timeout)),t?(b={ins:i,par:q,pos:"i"!==g||"last"!==z||0!==r||i.is_loaded(A)?r:"last"},f.css({left:n+"px",top:o+"px"}).show(),h.helper.find(".jstree-icon").first().removeClass("jstree-er").addClass("jstree-ok"),c={},s=!0,!1):void 0}),s===!0))return}else{for(t=!0,u=0,v=h.data.nodes.length;v>u;u++)if(t=t&&i.check(h.data.origin&&(h.data.origin.settings.dnd.always_copy||h.data.origin.settings.dnd.copy&&(h.event.metaKey||h.event.ctrlKey))?"copy_node":"move_node",h.data.origin&&h.data.origin!==i?h.data.origin.get_node(h.data.nodes[u]):h.data.nodes[u],a.jstree.root,"last",{dnd:!0,ref:i.get_node(a.jstree.root),pos:"i",origin:h.data.origin,is_multi:h.data.origin&&h.data.origin!==i,is_foreign:!h.data.origin}),!t)break;if(t)return b={ins:i,par:a.jstree.root,pos:"last"},f.hide(),void h.helper.find(".jstree-icon").first().removeClass("jstree-er").addClass("jstree-ok")}b=!1,h.helper.find(".jstree-icon").removeClass("jstree-ok").addClass("jstree-er"),f.hide()}}).on("dnd_scroll.vakata.jstree",function(a,c){c&&c.data&&c.data.jstree&&(f.hide(),b=!1,d=!1,c.helper.find(".jstree-icon").first().removeClass("jstree-ok").addClass("jstree-er"))}).on("dnd_stop.vakata.jstree",function(g,h){if(e&&clearTimeout(e),h&&h.data&&h.data.jstree){f.hide().detach();var i,j,k=[];if(b){for(i=0,j=h.data.nodes.length;j>i;i++)k[i]=h.data.origin?h.data.origin.get_node(h.data.nodes[i]):h.data.nodes[i];b.ins[h.data.origin&&(h.data.origin.settings.dnd.always_copy||h.data.origin.settings.dnd.copy&&(h.event.metaKey||h.event.ctrlKey))?"copy_node":"move_node"](k,b.par,b.pos,!1,!1,!1,h.data.origin)}else i=a(h.event.target).closest(".jstree"),i.length&&c&&c.error&&"check"===c.error&&(i=i.jstree(!0),i&&i.settings.core.error.call(this,c));d=!1,b=!1}}).on("keyup.jstree keydown.jstree",function(b,c){c=a.vakata.dnd._get(),c&&c.data&&c.data.jstree&&(c.helper.find(".jstree-copy").first()[c.data.origin&&(c.data.origin.settings.dnd.always_copy||c.data.origin.settings.dnd.copy&&(b.metaKey||b.ctrlKey))?"show":"hide"](),d&&(d.metaKey=b.metaKey,d.ctrlKey=b.ctrlKey,a.vakata.dnd._trigger("move",d)))})}),function(a){a.vakata.html={div:a("<div />"),escape:function(b){return a.vakata.html.div.text(b).html()},strip:function(b){return a.vakata.html.div.empty().append(a.parseHTML(b)).text()}};var b={element:!1,target:!1,is_down:!1,is_drag:!1,helper:!1,helper_w:0,data:!1,init_x:0,init_y:0,scroll_l:0,scroll_t:0,scroll_e:!1,scroll_i:!1,is_touch:!1};a.vakata.dnd={settings:{scroll_speed:10,scroll_proximity:20,helper_left:5,helper_top:10,threshold:5,threshold_touch:50},_trigger:function(b,c){var d=a.vakata.dnd._get();d.event=c,a(i).triggerHandler("dnd_"+b+".vakata",d)},_get:function(){return{data:b.data,element:b.element,helper:b.helper}},_clean:function(){b.helper&&b.helper.remove(),b.scroll_i&&(clearInterval(b.scroll_i),b.scroll_i=!1),b={element:!1,target:!1,is_down:!1,is_drag:!1,helper:!1,helper_w:0,data:!1,init_x:0,init_y:0,scroll_l:0,scroll_t:0,scroll_e:!1,scroll_i:!1,is_touch:!1},a(i).off("mousemove.vakata.jstree touchmove.vakata.jstree",a.vakata.dnd.drag),a(i).off("mouseup.vakata.jstree touchend.vakata.jstree",a.vakata.dnd.stop)},_scroll:function(c){if(!b.scroll_e||!b.scroll_l&&!b.scroll_t)return b.scroll_i&&(clearInterval(b.scroll_i),b.scroll_i=!1),!1;if(!b.scroll_i)return b.scroll_i=setInterval(a.vakata.dnd._scroll,100),!1;if(c===!0)return!1;var d=b.scroll_e.scrollTop(),e=b.scroll_e.scrollLeft();b.scroll_e.scrollTop(d+b.scroll_t*a.vakata.dnd.settings.scroll_speed),b.scroll_e.scrollLeft(e+b.scroll_l*a.vakata.dnd.settings.scroll_speed),(d!==b.scroll_e.scrollTop()||e!==b.scroll_e.scrollLeft())&&a.vakata.dnd._trigger("scroll",b.scroll_e)},start:function(c,d,e){"touchstart"===c.type&&c.originalEvent&&c.originalEvent.changedTouches&&c.originalEvent.changedTouches[0]&&(c.pageX=c.originalEvent.changedTouches[0].pageX,c.pageY=c.originalEvent.changedTouches[0].pageY,c.target=i.elementFromPoint(c.originalEvent.changedTouches[0].pageX-window.pageXOffset,c.originalEvent.changedTouches[0].pageY-window.pageYOffset)),b.is_drag&&a.vakata.dnd.stop({});try{c.currentTarget.unselectable="on",c.currentTarget.onselectstart=function(){return!1},c.currentTarget.style&&(c.currentTarget.style.MozUserSelect="none")}catch(f){}return b.init_x=c.pageX,b.init_y=c.pageY,b.data=d,b.is_down=!0,b.element=c.currentTarget,b.target=c.target,b.is_touch="touchstart"===c.type,e!==!1&&(b.helper=a("<div id='vakata-dnd'></div>").html(e).css({display:"block",margin:"0",padding:"0",position:"absolute",top:"-2000px",lineHeight:"16px",zIndex:"10000"})),a(i).on("mousemove.vakata.jstree touchmove.vakata.jstree",a.vakata.dnd.drag),a(i).on("mouseup.vakata.jstree touchend.vakata.jstree",a.vakata.dnd.stop),!1},drag:function(c){if("touchmove"===c.type&&c.originalEvent&&c.originalEvent.changedTouches&&c.originalEvent.changedTouches[0]&&(c.pageX=c.originalEvent.changedTouches[0].pageX,c.pageY=c.originalEvent.changedTouches[0].pageY,c.target=i.elementFromPoint(c.originalEvent.changedTouches[0].pageX-window.pageXOffset,c.originalEvent.changedTouches[0].pageY-window.pageYOffset)),b.is_down){if(!b.is_drag){if(!(Math.abs(c.pageX-b.init_x)>(b.is_touch?a.vakata.dnd.settings.threshold_touch:a.vakata.dnd.settings.threshold)||Math.abs(c.pageY-b.init_y)>(b.is_touch?a.vakata.dnd.settings.threshold_touch:a.vakata.dnd.settings.threshold)))return;b.helper&&(b.helper.appendTo("body"),b.helper_w=b.helper.outerWidth()),b.is_drag=!0,a.vakata.dnd._trigger("start",c)}var d=!1,e=!1,f=!1,g=!1,h=!1,j=!1,k=!1,l=!1,m=!1,n=!1;return b.scroll_t=0,b.scroll_l=0,b.scroll_e=!1,a(a(c.target).parentsUntil("body").addBack().get().reverse()).filter(function(){return/^auto|scroll$/.test(a(this).css("overflow"))&&(this.scrollHeight>this.offsetHeight||this.scrollWidth>this.offsetWidth)}).each(function(){var d=a(this),e=d.offset();return this.scrollHeight>this.offsetHeight&&(e.top+d.height()-c.pageY<a.vakata.dnd.settings.scroll_proximity&&(b.scroll_t=1),c.pageY-e.top<a.vakata.dnd.settings.scroll_proximity&&(b.scroll_t=-1)),this.scrollWidth>this.offsetWidth&&(e.left+d.width()-c.pageX<a.vakata.dnd.settings.scroll_proximity&&(b.scroll_l=1),c.pageX-e.left<a.vakata.dnd.settings.scroll_proximity&&(b.scroll_l=-1)),b.scroll_t||b.scroll_l?(b.scroll_e=a(this),!1):void 0}),b.scroll_e||(d=a(i),e=a(window),f=d.height(),g=e.height(),h=d.width(),j=e.width(),k=d.scrollTop(),l=d.scrollLeft(),f>g&&c.pageY-k<a.vakata.dnd.settings.scroll_proximity&&(b.scroll_t=-1),f>g&&g-(c.pageY-k)<a.vakata.dnd.settings.scroll_proximity&&(b.scroll_t=1),h>j&&c.pageX-l<a.vakata.dnd.settings.scroll_proximity&&(b.scroll_l=-1),h>j&&j-(c.pageX-l)<a.vakata.dnd.settings.scroll_proximity&&(b.scroll_l=1),(b.scroll_t||b.scroll_l)&&(b.scroll_e=d)),b.scroll_e&&a.vakata.dnd._scroll(!0),b.helper&&(m=parseInt(c.pageY+a.vakata.dnd.settings.helper_top,10),n=parseInt(c.pageX+a.vakata.dnd.settings.helper_left,10),f&&m+25>f&&(m=f-50),h&&n+b.helper_w>h&&(n=h-(b.helper_w+2)),b.helper.css({left:n+"px",top:m+"px"})),a.vakata.dnd._trigger("move",c),!1}},stop:function(c){if("touchend"===c.type&&c.originalEvent&&c.originalEvent.changedTouches&&c.originalEvent.changedTouches[0]&&(c.pageX=c.originalEvent.changedTouches[0].pageX,c.pageY=c.originalEvent.changedTouches[0].pageY,c.target=i.elementFromPoint(c.originalEvent.changedTouches[0].pageX-window.pageXOffset,c.originalEvent.changedTouches[0].pageY-window.pageYOffset)),b.is_drag)a.vakata.dnd._trigger("stop",c);else if("touchend"===c.type&&c.target===b.target){var d=setTimeout(function(){a(c.target).click()},100);a(c.target).one("click",function(){d&&clearTimeout(d)})}return a.vakata.dnd._clean(),!1}}}(a),a.jstree.defaults.massload=null,a.jstree.plugins.massload=function(b,c){this.init=function(a,b){c.init.call(this,a,b),this._data.massload={}},this._load_nodes=function(b,d,e){var f=this.settings.massload;return e&&!a.isEmptyObject(this._data.massload)?c._load_nodes.call(this,b,d,e):a.isFunction(f)?f.call(this,b,a.proxy(function(a){if(a)for(var f in a)a.hasOwnProperty(f)&&(this._data.massload[f]=a[f]);c._load_nodes.call(this,b,d,e)},this)):"object"==typeof f&&f&&f.url?(f=a.extend(!0,{},f),a.isFunction(f.url)&&(f.url=f.url.call(this,b)),a.isFunction(f.data)&&(f.data=f.data.call(this,b)),a.ajax(f).done(a.proxy(function(a,f,g){if(a)for(var h in a)a.hasOwnProperty(h)&&(this._data.massload[h]=a[h]);c._load_nodes.call(this,b,d,e)},this)).fail(a.proxy(function(a){c._load_nodes.call(this,b,d,e)},this))):c._load_nodes.call(this,b,d,e)},this._load_node=function(b,d){var e=this._data.massload[b.id];return e?this["string"==typeof e?"_append_html_data":"_append_json_data"](b,"string"==typeof e?a(a.parseHTML(e)).filter(function(){return 3!==this.nodeType}):e,function(a){d.call(this,a),delete this._data.massload[b.id]}):c._load_node.call(this,b,d)}},a.jstree.defaults.search={ajax:!1,fuzzy:!1,case_sensitive:!1,show_only_matches:!1,show_only_matches_children:!1,close_opened_onclear:!0,search_leaves_only:!1,search_callback:!1},a.jstree.plugins.search=function(c,d){this.bind=function(){d.bind.call(this),this._data.search.str="",this._data.search.dom=a(),this._data.search.res=[],this._data.search.opn=[],this._data.search.som=!1,this._data.search.smc=!1,this._data.search.hdn=[],this.element.on("search.jstree",a.proxy(function(b,c){if(this._data.search.som&&c.res.length){var d=this._model.data,e,f,g=[];for(e=0,f=c.res.length;f>e;e++)d[c.res[e]]&&!d[c.res[e]].state.hidden&&(g.push(c.res[e]),g=g.concat(d[c.res[e]].parents),this._data.search.smc&&(g=g.concat(d[c.res[e]].children_d)));g=a.vakata.array_remove_item(a.vakata.array_unique(g),a.jstree.root),this._data.search.hdn=this.hide_all(!0),this.show_node(g)}},this)).on("clear_search.jstree",a.proxy(function(a,b){this._data.search.som&&b.res.length&&this.show_node(this._data.search.hdn)},this))},this.search=function(c,d,e,f,g,h){if(c===!1||""===a.trim(c.toString()))return this.clear_search();f=this.get_node(f),f=f&&f.id?f.id:null,c=c.toString();var i=this.settings.search,j=i.ajax?i.ajax:!1,k=this._model.data,l=null,m=[],n=[],o,p;if(this._data.search.res.length&&!g&&this.clear_search(),e===b&&(e=i.show_only_matches),h===b&&(h=i.show_only_matches_children),!d&&j!==!1)return a.isFunction(j)?j.call(this,c,a.proxy(function(b){b&&b.d&&(b=b.d),this._load_nodes(a.isArray(b)?a.vakata.array_unique(b):[],function(){this.search(c,!0,e,f,g)},!0)},this),f):(j=a.extend({},j),j.data||(j.data={}),j.data.str=c,f&&(j.data.inside=f),a.ajax(j).fail(a.proxy(function(){this._data.core.last_error={error:"ajax",plugin:"search",id:"search_01",reason:"Could not load search parents",data:JSON.stringify(j)},this.settings.core.error.call(this,this._data.core.last_error)},this)).done(a.proxy(function(b){b&&b.d&&(b=b.d),this._load_nodes(a.isArray(b)?a.vakata.array_unique(b):[],function(){this.search(c,!0,e,f,g)},!0)},this)));if(g||(this._data.search.str=c,this._data.search.dom=a(),this._data.search.res=[],this._data.search.opn=[],this._data.search.som=e,this._data.search.smc=h),l=new a.vakata.search(c,!0,{caseSensitive:i.case_sensitive,fuzzy:i.fuzzy}),a.each(k[f?f:a.jstree.root].children_d,function(a,b){var d=k[b];d.text&&(!i.search_leaves_only||d.state.loaded&&0===d.children.length)&&(i.search_callback&&i.search_callback.call(this,c,d)||!i.search_callback&&l.search(d.text).isMatch)&&(m.push(b),n=n.concat(d.parents))}),m.length){for(n=a.vakata.array_unique(n),o=0,p=n.length;p>o;o++)n[o]!==a.jstree.root&&k[n[o]]&&this.open_node(n[o],null,0)===!0&&this._data.search.opn.push(n[o]);g?(this._data.search.dom=this._data.search.dom.add(a(this.element[0].querySelectorAll("#"+a.map(m,function(b){return-1!=="0123456789".indexOf(b[0])?"\\3"+b[0]+" "+b.substr(1).replace(a.jstree.idregex,"\\$&"):b.replace(a.jstree.idregex,"\\$&")}).join(", #")))),this._data.search.res=a.vakata.array_unique(this._data.search.res.concat(m))):(this._data.search.dom=a(this.element[0].querySelectorAll("#"+a.map(m,function(b){return-1!=="0123456789".indexOf(b[0])?"\\3"+b[0]+" "+b.substr(1).replace(a.jstree.idregex,"\\$&"):b.replace(a.jstree.idregex,"\\$&")}).join(", #"))),this._data.search.res=m),this._data.search.dom.children(".jstree-anchor").addClass("jstree-search")}this.trigger("search",{nodes:this._data.search.dom,str:c,res:this._data.search.res,show_only_matches:e})},this.clear_search=function(){this.settings.search.close_opened_onclear&&this.close_node(this._data.search.opn,0),this.trigger("clear_search",{nodes:this._data.search.dom,str:this._data.search.str,res:this._data.search.res}),this._data.search.res.length&&(this._data.search.dom=a(this.element[0].querySelectorAll("#"+a.map(this._data.search.res,function(b){return-1!=="0123456789".indexOf(b[0])?"\\3"+b[0]+" "+b.substr(1).replace(a.jstree.idregex,"\\$&"):b.replace(a.jstree.idregex,"\\$&")}).join(", #"))),this._data.search.dom.children(".jstree-anchor").removeClass("jstree-search")),this._data.search.str="",this._data.search.res=[],this._data.search.opn=[],this._data.search.dom=a()},this.redraw_node=function(b,c,e,f){if(b=d.redraw_node.apply(this,arguments),b&&-1!==a.inArray(b.id,this._data.search.res)){var g,h,i=null;for(g=0,h=b.childNodes.length;h>g;g++)if(b.childNodes[g]&&b.childNodes[g].className&&-1!==b.childNodes[g].className.indexOf("jstree-anchor")){i=b.childNodes[g];break}i&&(i.className+=" jstree-search")}return b}},function(a){a.vakata.search=function(b,c,d){d=d||{},d=a.extend({},a.vakata.search.defaults,d),d.fuzzy!==!1&&(d.fuzzy=!0),b=d.caseSensitive?b:b.toLowerCase();var e=d.location,f=d.distance,g=d.threshold,h=b.length,i,j,k,l;return h>32&&(d.fuzzy=!1),d.fuzzy&&(i=1<<h-1,j=function(){var a={},c=0;for(c=0;h>c;c++)a[b.charAt(c)]=0;for(c=0;h>c;c++)a[b.charAt(c)]|=1<<h-c-1;return a}(),k=function(a,b){var c=a/h,d=Math.abs(e-b);return f?c+d/f:d?1:c}),l=function(a){if(a=d.caseSensitive?a:a.toLowerCase(),b===a||-1!==a.indexOf(b))return{isMatch:!0,score:0};if(!d.fuzzy)return{isMatch:!1,score:1};var c,f,l=a.length,m=g,n=a.indexOf(b,e),o,p,q=h+l,r,s,t,u,v,w=1,x=[];for(-1!==n&&(m=Math.min(k(0,n),m),n=a.lastIndexOf(b,e+h),-1!==n&&(m=Math.min(k(0,n),m))),n=-1,c=0;h>c;c++){o=0,p=q;while(p>o)k(c,e+p)<=m?o=p:q=p,p=Math.floor((q-o)/2+o);for(q=p,s=Math.max(1,e-p+1),t=Math.min(e+p,l)+h,u=new Array(t+2),u[t+1]=(1<<c)-1,f=t;f>=s;f--)if(v=j[a.charAt(f-1)],0===c?u[f]=(u[f+1]<<1|1)&v:u[f]=(u[f+1]<<1|1)&v|((r[f+1]|r[f])<<1|1)|r[f+1],u[f]&i&&(w=k(c,f-1),m>=w)){if(m=w,n=f-1,x.push(n),!(n>e))break;s=Math.max(1,2*e-n)}if(k(c+1,e)>m)break;r=u}return{isMatch:n>=0,score:w}},c===!0?{search:l}:l(c)},a.vakata.search.defaults={location:0,distance:100,threshold:.6,fuzzy:!1,caseSensitive:!1}}(a),a.jstree.defaults.sort=function(a,b){return this.get_text(a)>this.get_text(b)?1:-1},a.jstree.plugins.sort=function(b,c){this.bind=function(){c.bind.call(this),this.element.on("model.jstree",a.proxy(function(a,b){this.sort(b.parent,!0)},this)).on("rename_node.jstree create_node.jstree",a.proxy(function(a,b){this.sort(b.parent||b.node.parent,!1),this.redraw_node(b.parent||b.node.parent,!0)},this)).on("move_node.jstree copy_node.jstree",a.proxy(function(a,b){this.sort(b.parent,!1),this.redraw_node(b.parent,!0)},this))},this.sort=function(b,c){var d,e;if(b=this.get_node(b),b&&b.children&&b.children.length&&(b.children.sort(a.proxy(this.settings.sort,this)),c))for(d=0,e=b.children_d.length;e>d;d++)this.sort(b.children_d[d],!1)}};var n=!1;a.jstree.defaults.state={key:"jstree",events:"changed.jstree open_node.jstree close_node.jstree check_node.jstree uncheck_node.jstree",ttl:!1,filter:!1},a.jstree.plugins.state=function(b,c){this.bind=function(){c.bind.call(this);var b=a.proxy(function(){this.element.on(this.settings.state.events,a.proxy(function(){n&&clearTimeout(n),n=setTimeout(a.proxy(function(){this.save_state()},this),100)},this)),this.trigger("state_ready")},this);this.element.on("ready.jstree",a.proxy(function(a,c){this.element.one("restore_state.jstree",b),this.restore_state()||b()},this))},this.save_state=function(){var b={state:this.get_state(),ttl:this.settings.state.ttl,sec:+new Date};a.vakata.storage.set(this.settings.state.key,JSON.stringify(b))},this.restore_state=function(){var b=a.vakata.storage.get(this.settings.state.key);if(b)try{b=JSON.parse(b)}catch(c){return!1}return b&&b.ttl&&b.sec&&+new Date-b.sec>b.ttl?!1:(b&&b.state&&(b=b.state),b&&a.isFunction(this.settings.state.filter)&&(b=this.settings.state.filter.call(this,b)),b?(this.element.one("set_state.jstree",function(c,d){d.instance.trigger("restore_state",{state:a.extend(!0,{},b)})}),this.set_state(b),!0):!1)},this.clear_state=function(){return a.vakata.storage.del(this.settings.state.key)}},function(a,b){a.vakata.storage={set:function(a,b){return window.localStorage.setItem(a,b)},get:function(a){return window.localStorage.getItem(a)},del:function(a){return window.localStorage.removeItem(a)}}}(a),a.jstree.defaults.types={"default":{}},a.jstree.defaults.types[a.jstree.root]={},a.jstree.plugins.types=function(c,d){this.init=function(c,e){var f,g;if(e&&e.types&&e.types["default"])for(f in e.types)if("default"!==f&&f!==a.jstree.root&&e.types.hasOwnProperty(f))for(g in e.types["default"])e.types["default"].hasOwnProperty(g)&&e.types[f][g]===b&&(e.types[f][g]=e.types["default"][g]);d.init.call(this,c,e),this._model.data[a.jstree.root].type=a.jstree.root},this.refresh=function(b,c){d.refresh.call(this,b,c),this._model.data[a.jstree.root].type=a.jstree.root},this.bind=function(){this.element.on("model.jstree",a.proxy(function(c,d){var e=this._model.data,f=d.nodes,g=this.settings.types,h,i,j="default";for(h=0,i=f.length;i>h;h++)j="default",e[f[h]].original&&e[f[h]].original.type&&g[e[f[h]].original.type]&&(j=e[f[h]].original.type),e[f[h]].data&&e[f[h]].data.jstree&&e[f[h]].data.jstree.type&&g[e[f[h]].data.jstree.type]&&(j=e[f[h]].data.jstree.type),e[f[h]].type=j,e[f[h]].icon===!0&&g[j].icon!==b&&(e[f[h]].icon=g[j].icon);e[a.jstree.root].type=a.jstree.root},this)),d.bind.call(this)},this.get_json=function(b,c,e){var f,g,h=this._model.data,i=c?a.extend(!0,{},c,{no_id:!1}):{},j=d.get_json.call(this,b,i,e);if(j===!1)return!1;if(a.isArray(j))for(f=0,g=j.length;g>f;f++)j[f].type=j[f].id&&h[j[f].id]&&h[j[f].id].type?h[j[f].id].type:"default",c&&c.no_id&&(delete j[f].id,j[f].li_attr&&j[f].li_attr.id&&delete j[f].li_attr.id,j[f].a_attr&&j[f].a_attr.id&&delete j[f].a_attr.id);else j.type=j.id&&h[j.id]&&h[j.id].type?h[j.id].type:"default",c&&c.no_id&&(j=this._delete_ids(j));return j},this._delete_ids=function(b){if(a.isArray(b)){for(var c=0,d=b.length;d>c;c++)b[c]=this._delete_ids(b[c]);return b}return delete b.id,b.li_attr&&b.li_attr.id&&delete b.li_attr.id,b.a_attr&&b.a_attr.id&&delete b.a_attr.id,b.children&&a.isArray(b.children)&&(b.children=this._delete_ids(b.children)),b},this.check=function(c,e,f,g,h){if(d.check.call(this,c,e,f,g,h)===!1)return!1;e=e&&e.id?e:this.get_node(e),f=f&&f.id?f:this.get_node(f);var i=e&&e.id?h&&h.origin?h.origin:a.jstree.reference(e.id):null,j,k,l,m;switch(i=i&&i._model&&i._model.data?i._model.data:null,c){case"create_node":case"move_node":case"copy_node":if("move_node"!==c||-1===a.inArray(e.id,f.children)){if(j=this.get_rules(f),j.max_children!==b&&-1!==j.max_children&&j.max_children===f.children.length)return this._data.core.last_error={error:"check",plugin:"types",id:"types_01",reason:"max_children prevents function: "+c,data:JSON.stringify({chk:c,pos:g,obj:e&&e.id?e.id:!1,par:f&&f.id?f.id:!1})},!1;if(j.valid_children!==b&&-1!==j.valid_children&&-1===a.inArray(e.type||"default",j.valid_children))return this._data.core.last_error={error:"check",plugin:"types",id:"types_02",reason:"valid_children prevents function: "+c,data:JSON.stringify({chk:c,pos:g,obj:e&&e.id?e.id:!1,par:f&&f.id?f.id:!1})},!1;if(i&&e.children_d&&e.parents){for(k=0,l=0,m=e.children_d.length;m>l;l++)k=Math.max(k,i[e.children_d[l]].parents.length);k=k-e.parents.length+1}(0>=k||k===b)&&(k=1);do{if(j.max_depth!==b&&-1!==j.max_depth&&j.max_depth<k)return this._data.core.last_error={error:"check",plugin:"types",id:"types_03",reason:"max_depth prevents function: "+c,data:JSON.stringify({chk:c,pos:g,obj:e&&e.id?e.id:!1,par:f&&f.id?f.id:!1})},!1;f=this.get_node(f.parent),j=this.get_rules(f),k++}while(f)}}return!0},this.get_rules=function(a){if(a=this.get_node(a),!a)return!1;var c=this.get_type(a,!0);return c.max_depth===b&&(c.max_depth=-1),c.max_children===b&&(c.max_children=-1),c.valid_children===b&&(c.valid_children=-1),c},this.get_type=function(b,c){return b=this.get_node(b),b?c?a.extend({type:b.type},this.settings.types[b.type]):b.type:!1},this.set_type=function(c,d){var e,f,g,h,i;if(a.isArray(c)){for(c=c.slice(),f=0,g=c.length;g>f;f++)this.set_type(c[f],d);return!0}return e=this.settings.types,c=this.get_node(c),e[d]&&c?(h=c.type,i=this.get_icon(c),c.type=d,(i===!0||e[h]&&e[h].icon!==b&&i===e[h].icon)&&this.set_icon(c,e[d].icon!==b?e[d].icon:!0),!0):!1}},a.jstree.defaults.unique={case_sensitive:!1,duplicate:function(a,b){return a+" ("+b+")"}},a.jstree.plugins.unique=function(c,d){this.check=function(b,c,e,f,g){if(d.check.call(this,b,c,e,f,g)===!1)return!1;if(c=c&&c.id?c:this.get_node(c),e=e&&e.id?e:this.get_node(e),!e||!e.children)return!0;var h="rename_node"===b?f:c.text,i=[],j=this.settings.unique.case_sensitive,k=this._model.data,l,m;for(l=0,m=e.children.length;m>l;l++)i.push(j?k[e.children[l]].text:k[e.children[l]].text.toLowerCase());switch(j||(h=h.toLowerCase()),b){case"delete_node":return!0;case"rename_node":return l=-1===a.inArray(h,i)||c.text&&c.text[j?"toString":"toLowerCase"]()===h,l||(this._data.core.last_error={error:"check",plugin:"unique",id:"unique_01",reason:"Child with name "+h+" already exists. Preventing: "+b,data:JSON.stringify({chk:b,pos:f,obj:c&&c.id?c.id:!1,par:e&&e.id?e.id:!1})}),l;case"create_node":return l=-1===a.inArray(h,i),l||(this._data.core.last_error={error:"check",plugin:"unique",id:"unique_04",reason:"Child with name "+h+" already exists. Preventing: "+b,data:JSON.stringify({chk:b,pos:f,obj:c&&c.id?c.id:!1,par:e&&e.id?e.id:!1})}),l;case"copy_node":return l=-1===a.inArray(h,i),l||(this._data.core.last_error={error:"check",plugin:"unique",id:"unique_02",reason:"Child with name "+h+" already exists. Preventing: "+b,data:JSON.stringify({chk:b,pos:f,obj:c&&c.id?c.id:!1,par:e&&e.id?e.id:!1})}),l;case"move_node":return l=c.parent===e.id&&(!g||!g.is_multi)||-1===a.inArray(h,i),l||(this._data.core.last_error={error:"check",plugin:"unique",id:"unique_03",reason:"Child with name "+h+" already exists. Preventing: "+b,data:JSON.stringify({chk:b,pos:f,obj:c&&c.id?c.id:!1,par:e&&e.id?e.id:!1})}),l}return!0},this.create_node=function(c,e,f,g,h){if(!e||e.text===b){if(null===c&&(c=a.jstree.root),c=this.get_node(c),!c)return d.create_node.call(this,c,e,f,g,h);if(f=f===b?"last":f,!f.toString().match(/^(before|after)$/)&&!h&&!this.is_loaded(c))return d.create_node.call(this,c,e,f,g,h);e||(e={});var i,j,k,l,m,n=this._model.data,o=this.settings.unique.case_sensitive,p=this.settings.unique.duplicate;for(j=i=this.get_string("New node"),k=[],l=0,m=c.children.length;m>l;l++)k.push(o?n[c.children[l]].text:n[c.children[l]].text.toLowerCase());l=1;while(-1!==a.inArray(o?j:j.toLowerCase(),k))j=p.call(this,i,++l).toString();e.text=j}return d.create_node.call(this,c,e,f,g,h)}};var o=i.createElement("DIV");if(o.setAttribute("unselectable","on"),o.setAttribute("role","presentation"),o.className="jstree-wholerow",o.innerHTML="&#160;",a.jstree.plugins.wholerow=function(b,c){this.bind=function(){c.bind.call(this),this.element.on("ready.jstree set_state.jstree",a.proxy(function(){this.hide_dots()},this)).on("init.jstree loading.jstree ready.jstree",a.proxy(function(){this.get_container_ul().addClass("jstree-wholerow-ul")},this)).on("deselect_all.jstree",a.proxy(function(a,b){this.element.find(".jstree-wholerow-clicked").removeClass("jstree-wholerow-clicked")},this)).on("changed.jstree",a.proxy(function(a,b){this.element.find(".jstree-wholerow-clicked").removeClass("jstree-wholerow-clicked");var c=!1,d,e;for(d=0,e=b.selected.length;e>d;d++)c=this.get_node(b.selected[d],!0),c&&c.length&&c.children(".jstree-wholerow").addClass("jstree-wholerow-clicked")},this)).on("open_node.jstree",a.proxy(function(a,b){this.get_node(b.node,!0).find(".jstree-clicked").parent().children(".jstree-wholerow").addClass("jstree-wholerow-clicked")},this)).on("hover_node.jstree dehover_node.jstree",a.proxy(function(a,b){"hover_node"===a.type&&this.is_disabled(b.node)||this.get_node(b.node,!0).children(".jstree-wholerow")["hover_node"===a.type?"addClass":"removeClass"]("jstree-wholerow-hovered")},this)).on("contextmenu.jstree",".jstree-wholerow",a.proxy(function(b){b.preventDefault();var c=a.Event("contextmenu",{metaKey:b.metaKey,ctrlKey:b.ctrlKey,altKey:b.altKey,shiftKey:b.shiftKey,pageX:b.pageX,pageY:b.pageY});a(b.currentTarget).closest(".jstree-node").children(".jstree-anchor").first().trigger(c)},this)).on("click.jstree",".jstree-wholerow",function(b){b.stopImmediatePropagation();var c=a.Event("click",{metaKey:b.metaKey,ctrlKey:b.ctrlKey,altKey:b.altKey,shiftKey:b.shiftKey});a(b.currentTarget).closest(".jstree-node").children(".jstree-anchor").first().trigger(c).focus()}).on("click.jstree",".jstree-leaf > .jstree-ocl",a.proxy(function(b){b.stopImmediatePropagation();var c=a.Event("click",{metaKey:b.metaKey,ctrlKey:b.ctrlKey,altKey:b.altKey,shiftKey:b.shiftKey});a(b.currentTarget).closest(".jstree-node").children(".jstree-anchor").first().trigger(c).focus()},this)).on("mouseover.jstree",".jstree-wholerow, .jstree-icon",a.proxy(function(a){return a.stopImmediatePropagation(),this.is_disabled(a.currentTarget)||this.hover_node(a.currentTarget),!1},this)).on("mouseleave.jstree",".jstree-node",a.proxy(function(a){this.dehover_node(a.currentTarget)},this))},this.teardown=function(){this.settings.wholerow&&this.element.find(".jstree-wholerow").remove(),c.teardown.call(this)},this.redraw_node=function(b,d,e,f){if(b=c.redraw_node.apply(this,arguments)){var g=o.cloneNode(!0);-1!==a.inArray(b.id,this._data.core.selected)&&(g.className+=" jstree-wholerow-clicked"),this._data.core.focused&&this._data.core.focused===b.id&&(g.className+=" jstree-wholerow-hovered"),b.insertBefore(g,b.childNodes[0])}return b}},i.registerElement&&Object&&Object.create){var p=Object.create(HTMLElement.prototype);p.createdCallback=function(){var b={core:{},plugins:[]},c;for(c in a.jstree.plugins)a.jstree.plugins.hasOwnProperty(c)&&this.attributes[c]&&(b.plugins.push(c),this.getAttribute(c)&&JSON.parse(this.getAttribute(c))&&(b[c]=JSON.parse(this.getAttribute(c))));for(c in a.jstree.defaults.core)a.jstree.defaults.core.hasOwnProperty(c)&&this.attributes[c]&&(b.core[c]=JSON.parse(this.getAttribute(c))||this.getAttribute(c));a(this).jstree(b)};try{i.registerElement("vakata-jstree",{prototype:p})}catch(q){}}}});
\ No newline at end of file
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/32px.png b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/32px.png
deleted file mode 100755
index d6fd72114f8205ace7579894ec50cc37739b1471..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1562
zcmZ8heKga182_1NL)y?Sx!97DWU52*G8;`HFB3{gC^fx#KelDfGF0oNTV6Y2ZdXn(
zW?q&;2$$7yGo_jk?dL78m$BH`?oapJf9~_g^E}_rdCuo~&i8zt=LXs5u#T3Y761S`
z9`2;00H8*M@^GX&<U?{o453g+_6l%=A{-7^S6{;+Q&Us>H~F9M=;#m#1Z8Dq5Z>6>
z$mjF#-n~0GIQa47M*@KWf$i<>91aJI#ZoAgjEs!d)>f5DH9kIGP*5;GKd(?ICMG77
zO6APVj7%n*nwnZ#T3T3GSX^A}>+6GfKoAs(L}IbHv$Inu6lP^*QK{7Q%Q;&hYLmpH
zKK_8EZ-l{ijlJvfy6TRlf7~;9DPVu?BhfnV*dK~6$QQ=l0)TZW50Xm&^~-c2Cs^XJ
zG2LRnx7N-)T||;kWH254-Gre^cGMJXz<XQYvjIiD7d8@lTX&sU^}k;gWixTyH+S+>
zIbn5~l}bdTk#HD`I8<!jmGrl-J@0b@gLG#%c3%K&-~yd@p>|A;99ehHfebTtaNb7o
zGG3K;76(qcr3!~V^z!nRWo5aU&-H`AEDPT1G+30PS2S8u73QQ}EU)%_Ff^AV5?k+1
zM3Q=9yvY~Cu9z1rB_q)cA94?xD+WqIPvh>Y8jTwk4}SYJ7x;XDhSF61*rcj;P;F3?
zbajJrz<1dK)~3=%Pol3!i&})y(x5z|zRCoajmUH&{JC+)Al#Bw6USa2^+xu{>`<{g
zZZj?y70(;=YP0^@W~My$HkHU=N`a0Rxu=|Co@%A%{y4<3F|mV|yI(&@SvJpn`gpT)
z_K5>-<ff$s=SnPkc3;u71b8|DV%<L+&>7wk&=XZjzOO-tYaC5tql=~NO7^5aWhm>&
z!4?-=;8r!;7<D-JOi*C)@`)X?u4w5^dgntvx$QI__F({5{vd)^b5;_fuxW3@<YlnI
z^MJwODL%6o6U5F*k{tHSjtTS2L*dM<YLLT)c19&+sr}hZKxZXR(<}6KK!2Kn{#K(l
ztD~RRfm5d;>Ub&*w-E2Xfb`NE9F6<}appJs<#6A7k^%`KZWa^Yl*@~Qp%q;UGKbjq
zZ1mjlEW1>2d3+(XqXhf6Z60<{k178{uvivcKZB&TzDojSp_`?u7tA*T!p(<3C~8F@
zA6v1*i_$dccr+Y-jYz~Ik#NQwj$Su)a{Zc2*4}E6S}NYsnL{GYny;7xiLmk?2-%|y
zJ6v5uS+{2phdBUVf{;Vu{;E@XO6L&ebA|d9Fy@o!cv|$8YgYBw8)}!Dz9T3-7_mO9
z#hGHn-I^x<StO}=sj3h(Rb1M<WvOolHI?3+lA@#Df3@cGmT3&0*|*AiCA{?Asx7*m
zR@(HWayvhO=`UA3YqDJB#7@f)GSbjvR)uqO12b!KA4L*VPvBRa=1vVgT|9)*Nhwh%
zR@df|?dqg45Km~C+{UJ9WwX-2OE2W>p`ZOjZ|t$Dy3Z|I!w0K2DLvO(#^PglepW~D
z%&$Y&;~KOuKfeGA?F|g(g2keH+{T#iQ!1HV{WqGwpV{ljSYKjSAe?+r<k($T$hk!@
zns&8G8heAPz0b|$+1<7?rQ(yz3>(Eu_i}J)&5spU+}>Ib+a~+cBQ~@br7nUmR?V}=
z%^6Mofa6H*FYNwfUj?QK9`DXK<PtU!xuy=TP6fqAgVQHRcFy8)QQNca5`M(!@aIaw
zISgrdC2-UnotV2kR4YyYQS0+f1NLTsg*&&r^2)y`in^2?9$S$!IHVcMc0pe>jZ08)
zosVpzCY<*Tv8StD?y@1m2E6M)zqV>a<)h&U<8y`5lMOwdXhihh^bg^waQeGlk+;$(
z>kXAxpC$Xn_nYZv<po=tR*DHPsZMRjBT(h8?VoI=$u=)Xojhk&bKLJt?l#+l>YWn~
zCkqiYlbw2Jl2$xi$2{Vju$1jrDY^!gky_Q1d`sO*G1W}x<F7QOq+}$eM3AlB3eLsK
zwOUy`l9R-i<R9vlPYLrnFxz!7%}m78h_lyDeEpw3)mU8TMNFyVa8x>e!WufFfQOq8
JiRT)A?H?ng_znO7

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/40px.png b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/40px.png
deleted file mode 100755
index 4fc88e41e66508e4657b3ec6e5ec185a6084b7a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5717
zcmZu#cU)7;wx*+i1Ocf67MfH61(BvGa3J&+IuTH+(xjJAM5L-9Rf@Eu5FpeLN+{Bi
zVvrVkk90x_O_H}g_uc!>J-;`9Oun`D%v#^K_RQY16Qi%IafyzLj*N`#lI9<e4T0ZX
zGBWb{3zPsV6=8ZyMn<8ouWhUbnBLyrrlzI<_<vhiSlGY(Ha0c@aCdjt)z$r%heRTo
zn3xzF8ygxL=H=z->+1u4IyyQdBO?Il>FL2>u$7e+YinyDJ_G_WFfed%Z~!jdzI_|$
zLqbA=f`WW}d|tkM>F4Jc5D;KxWo2n;X<=buZf<U7W(JILa&iKCpoNBp`uh3?2M1G8
zQ3VDDva+)J`}=EaYoDK=gTY{c#`N?wFE1|+hr{FX2L}hIr>7?;Cre99XJ=;shohsT
z{r!Ccfv~l;wX?Icv9YnXwzjaaFgG_hGcz+eImyn>zPh>!BwAct1p0)81Wry)Kw5r&
zK49|m^8>_+i;DpacmQtP+}wctjEoE-kqD$1A0IzHK5lDktFEpF2mmpGIEROa03RSD
z8jb$>^CysNaBy&UcXwc5U}9pTr>6&?2aw#{-2D3W>+<q4Kzn|E9u9~9`0)ea{Oi{*
z6bc1!1~d*25AW^m0XzXAU0q!Oc|gw8)D$3Oc6JsJTVG%Q{rmUw^78KP?uv>EK+E>_
z_WJsIdwV+qffyMX>F@7vZf-6qDFIZEj*eDURrU4t0j2o%?HdMz85<j`t*tFBEp2LQ
z0xH?i(D3EUm&V4%y1F_*b!TU1OG^tDi*0Rf9U2<y=;)}asp;+Qt*oppD=R}Hk;^ic
zEI?_TUmEHfkx^J_QZNfhF(}bcP~SEt*RbNaOb*=HBrA}N6{8geIZ#zA4M8v~#a|7u
zjE$8wo|piZGQ}kdC!&)vQ4Of-KieZB6Hz!%*6cmEhE)Jn(tUZ|bkTccWGp6{j~^QQ
zPj1b`*m5~%(s~5d)F)-@N@pJkPC=5^GL%0Ltzk2=vGRoGowMdNVJ_WU59%G%47MLd
zgq3l|UvT#HNx;a?kg(0uCi+D_P5P3%in)3)3;37lBk&ddw3hgUOPVv>Y!|}F8K7j8
z9Ia$Dw|~RbOjK}y-G^3|A=~=BUmZWggmOrkre}Ax7s<)Sn<hGzBe`v?>=xU^B?YC{
zpqcD%(>-pt$Ek_&lo|>f+pWgzE;4~>;3F1g76QRJ!jd$2B?cRb(SZHOfwhyOX-}!g
zbv8@(S7Qi$3@<V#jBx`jJ1Kt2FFrPy;0BU0q8GL0d`bpC3Vnvqr90dGMsNrP>c?Y9
zww#^~f~q1v=&_DT9RzOjZlRO@#T#ssYAgD{Zl;jiZjh7T-!s(dF4Q4NDpdTgOK_Hx
zWHZm({n%@gNb7G8@r(EUTbFqngVo^Ko27g$F+*_+yB=Ooot<L~Qd3O@skgkWnx$h-
zeGZOqX+rsJGQD*4qRm|bC-2tszhvJy?KAF+;zIVNWH#sy3R<&#{`#kx{+vl$`mHSH
zW|j~hbm&4@u}OFZ{b!DLO~sVJz=yfjD3*9HORv)?XQ^n-@eE1mmQSN@*SI10>UYch
z)zVy3bMKLS&>ID&W~t|Nliu=Rw3mF)_d6kxUtGZ=KK*uwY+oGUUn0g`Vq%m=J#RAg
z*Y6v+qVog%BsfqHM`{I9Ecko`A9**Z4@4ymezE!0TgojM^fmJ^Xk%r_g2ng8rTlX7
z;t~0lhjnIJxu3Ms*nDVUx_xVXX|5mR-<G5ykmx4u-(l_>q>IY?4zA*ce6JSOtEx_3
zTuVC)KnyW~Mnzxj2JD}v#WWxb4K+mJjT$)_oI{vx7lD#g|K5e7{CfQiQTK7UBIH(j
zoaAMn=bA->yb6gqn_EiqURNE90$lCl#y?Gor3{aXq{#ZvAXWsJ%f&Grvs=}lX=(L_
zkZ42nUC(@vCYPznnc}hS)aQq&`A|)wE103uQ%XiA+5C>yk!j~#ykOmP$BZ6>+8Y_!
zEZLREI`s%~pIAAbL>;l&%!#X#Tc6%WeICuk_GG;(?cA{uyb#~<ELM66Z`vt$-i_?}
zfkjgq2Z59t8{87bJPwmZ<Gxw41btJGq5T$Z8{&g%!g;>hlZ%-w>@KvW*kR_DlL4i*
zpkSo9mFNte9i4pTnm~P)p_X;g?Cm)iVUtL7?mZGQumz);jgT2D8gEk_-A3T;Fe9)@
z@aTLxb}rYGqdf8JbFhzRV5o9Jw*p5Uug#&U$Sl0TYvYMd)_@I9_D3*$QErx_XewG`
zhsHCD`tKX?Z+r2-AgUW0&whuNB3=gX!qjTUf-t5NDD#-by}lHG7q8_K{DAMbv#^Wy
zfIMCfuXSBq`4b4L9RnHg+dgV&n=|rFIrbwcmD*qyV=Qx>s7HnB1eeL}wVFzZGZhug
z+^R1@)sRB7eV@E}gsTI2bs4ABVz_yGDdm;xIjBSNqEDx(+B*xg(X8_ln|v09ah@>o
z7*<ffU;<e2HlGEmgL1$26<E;>%CJaI31$aznN|7Ew;Fav(xwXYKB%~ZzZTIgIQz>J
z!pb(sLq(OtYU~gOn|xmyHC!Wj5;3H?VmGjM<4JOJVp7G=hi1YTU85YelU51L_E`G9
z6pIFNQZyUgSG!fH&OYet@U*TDtv0>lH`a9B-b<+*kwx`e($t5(IYppMtGbn0{5!UY
zq5zevViwbi-wYXE&!q*78`@E&u7(&%J-NFt=9=#mXgeE8TTE`235s}8{iCNk>zUs!
zr8x*B&~59iTw$60A>7eG7jCV7J8@TZAX;8U%WBCyuTbSE&kZVufn<Vay1o-`3{5g}
z&Qyitsen1Ey;{z+Lt5@a1$@0!>Nb9mO%qj*&6L%ftfe&yL)E@u&uVQbE4j&?bzNVJ
zJcy(0!8$z%Jsi9_{+uVke+-j4NUGExPi?lWd95qWozNpXgkcQCtGx<#R`!(`RLNd3
z*Tb=ASA~0<&y?eyDB)cQ&K<s+?8$Em>o>r;+v5AB=pQvZ<yIdL27-GQuy7$8p8m}b
zodOS>w*`6hKs)=T?Vl5ut+C2AF9O$MAnKkmkj%!E>PQWc|5!m}b)WS~bE*fwjq~;^
z>2ILW!D?PHM^!(EX?*KD|Dt-M3|mVQUrueatZn^GTzSz!hv-0dgicS;gemIgMqA`E
zU=Q_Q?_OgVy6^L<UnTiySKnoEbVaTTtNKTGwQ7_bA>o^JM3IoqrD1CPYYy8*6L<O-
zOnd~2zg{{2waowXBKo@*Ec}cr_28P=^!aWC=4Tg{cwgU5j1|)2DYhCkT)$)m0|k_w
zymJ*1JAY?>-&_Qxumg9!R1m#ui^Uxz*I?%<_V@SraB4Pdi$NjyJsw=AP48mRIew2@
zh!0_mM=J-M#3$!M^3CYXu6Ilkzq4Tw1+05vCQDoHe-J{bULSou{5pd$*g6q0Z;g!;
z{@SE^ddq=aRMH<!9Voe}F-7yiD@-!bH_t|ytLWglg(9k!TBOona=n`jJn?5|WQsMV
z@vX_mh6uFSd56-Uu=x^$GUg2)MUNS??wDQ1t0?Evy$*lcOVhF?CizW~G=FZfCBBWD
z+~KjR=sEutK2zAqJI+9cdha%R`hC5x$t6S+FJC;0(L1mYq%9YK<~hK}#)tXES?G0g
z-C(!$L|z@SoTbl(yIwRC#+IO$DkCUrt;&SUkbY4^WR0gW!P+~mM#ALu0+u?pe&VA8
zkINoR+#MxIh~qh-ekz`C*LWtL#;zSoCBx5`MSMh>nCNNj=@*Qr6rxP)42@L`fC2Ze
zidu+unxzw#Meb^isxCbFa}CK}mQ0pQUUkT_59Ef&7>;t>I!%U;EJQ&)u1^#4p%r$w
zKe1x<Isno(73pZ3YK1QUz4iNlBId%BE)U??KG>c4C<?BYD|c00qrdk?x=7g3cqrJ*
zfuV*V$4VYF;(8!tr-eCBe~Zz`W~D>W^-&_(7Cl8QH~qa%oynexx!>WS8~bD!tkPv4
zYc9fz8wV+vU9L9tzW>3^XO_%+Fm^k=s*5%KG;c(F=4wmmL|cg`{7H~cb&`^M*lHhP
z9og20E96FmV*3Q=fUEX>O;0eshJ<WCi&2Pjr8w7~mi*}xT2Zf&#j!*k+_JLg_6XJ&
z$yS`Dn)p{RSb(UE`=gClOT%vvZXbu-QqF%NA55QDM0T^XJ-T1zS(7|w5<Ihz+#D-`
z_O7|C$t^|~00e}OJY(f0EXN2{RX^P*Da-!DXSRH>pR}hk3q&228-2FgOWd1O)&g&Q
zK}Vj~uAB>H=zM<1t+-2QXH>s=M?(D>sKx)lE#zEAy$qoebkMor=714)2u7Vfp&cLV
zRqO*>!gg112OaRCmf(s+=8@H?a?o#D@SVnY;(HFHT`8Hpb^HP``HeXL@%igUK3|VR
zb!m4eA33k}JRzF^-J6Z@>xehpy&gyHjOBA8Kh-oFfCs>bw2do4@N3(@OI6_Oy#~GV
zkAvjj_wWB5FaPqcmh#T#Ke&dfJArhB2W7+5xKOwg$gA+6T$mag3UmT_9Dep5rpAnt
zJc00spC!T6m{2Mw5UTLAWB{h89(Gi^#@r;uUcIf;p5dIw@BXnX>2uNiX{ljSosRuQ
z34^N0lzS2CWdAwXilS1U7j4E4ucu30o%cniB(W8$(T^A|_O#r%Fg=JYA@zt&GHCwJ
zz>PJ%wXBuL$IhYl@wyZ#*7lHcx(Au5UhaHQkZn-IIlPCsV9}o7Cd$fF#PEr4CO&`Q
zUFvUs@1IBI=X{|5sUcI~BvZIzdztFRvTfe-&8JM~J=!x5@*uUGN&AQk6molr&7LB?
zV|vyCIwBQam*J!U&h|Z3InLJHMO50=AtC`gSyK1MV9O2K>HZc~j7BVVkn)Cuv8=o8
zgU|kZK#U%8xqZa1(PaO&8>b%mkbI8PoQ{3)|4zssRL}uy0>*{uo)!^ylwJpW-@o%-
zUEv=uN_D_qmnX$u^H3m_T$R%|PBLJ9`X<eD8Q`!DCSK8;Z(g>&Ouel^ykb7D3_zOg
z5aJc*`5c_>W!h~Y;+63EN`uDwmlbsX{$TjWeWp}-@DESbfqgx5;)&|LCs4JaM`9N!
zMa@YRpw>qqQ){CHHnY6*<*^RoaLh97bc$V_PO<o$ASxNp?5`H5srUe@xcHF5{xXQw
z>}&%O&tY~po-~dR3$G=Km?%0yx9VD?q?qS>#}Fi6SE|<df-V>*d4(1pJaD>03Vce{
z`o+d+q@#nrosqcA9dCHvT@guI$c4Q(C7tZJGb*5}iJ={>$t}0-=5rZ1{rB>@q;G?h
zOf^c!b}q4}3uwl1!tWkVwNvMKMH$$!IZ}TupL>5nP*4xf=u6EO5x7k!K}CGP#o?z(
zt=GLNPw%&~S*gM$;qkz|SEF9k9YY%P2xs>SsLpNdKbhuZWWSf*!xb|9v|ljP8`bLT
z+Qx*Fc+_?()J`pNn%sSVn@->yrf3C?ld3`YSx;SG$^~XTO!>jMt(8`+!Y$!ZQ`Mj_
zWZei)nd6YC2pCMo&X>n;9Un#0Z_dr)6_+K31_?Wi>=X4|8P-eX*q-%V5If3a(LAW%
z`Yh+bmVrHeGVs_xyOCGr<*yZw@JkA`L&~^vM_PpzS*v-iXD8oCE9H`DGO)W2uE%a$
z)ug4;To}?<*1>fmK-&BGO(Ub@Fig%tf!A{i!{En*U4+RPL)B#C_M+-VU-UoIjKyzu
zURr!5^to*g^pD;CukXsgFAC6&<4$F9neX%OE!ztiLp?`Y)Bd12vZEK|3cmQ)vZAFd
zH8gg&X1;$f(MqYyLAp(()-;YdFb0lDvpb8n$w-c&f}l<C0t;ZDI0eDv3*|u=VHm$%
zv92f1fuc<ZVR|Miav3buX`S3lS%<a|C&7X;kgOqj+r1s(Yc@o?F2k)TGr?q<XMrcN
z3aKs<9kLm>JwB)9qFjqlRZEk5Dg1(JCtcYk$9T-Giz@FJG0{BR-!pHgLv~JNUZ!E&
zcxvqtoQ39m2*ubC)Z{bYQ>M<Z2nlYw#ysz#Ak;{(u^^Y)8bV?GmE==hH$bRRRL}w;
z*qPy@*=%HV*TQzxj_u{>X!d}o<Z>WC$zM$kcV26X?OY5STPR=8AHsp{{X1OD_3$+s
zqa3tHN0=fhF}tqD&pXf*uA*OMpHxZkgu=Ud<^!De_K1typ<71kaEnGg&Y&g4A!n%}
zLQJQ~Py!-yx3(q%dU&zi^sZnWcb3+`&(WXVX6+#~1()+Kw0e-4_;X!S57AK?&HA1-
z!8`97(Wr+Bti7*`={%=~XuM*^ufO+i<DmO>#!5}mWpO#c$?)DN@2n*KRu0{d%t|Ed
zq|uFI3y~`?1Qu7kd_$NPw(1G5KJ}_`Pg_!;C5$RYORrRpV-CuiBjEN`1&<Y7%kocx
zZ@llRgZZ#WJ~>@IO0Ae(fMRCc#>x|s=hOuT)CU*ga~q{8;~R$sB(9d@vWtx|c=CP9
zhuJy=U!2R%m|lFB%1=p-1kqJlg%Hh0jshXNz!5@`H`vl`j$iF0m^H=0`P?_R&B@`k
zDLIyJNNVGruKfOK;?i85ny*qKq*wFN*^%#lb0lU0I3F0#S`~JF6@QWX$QU^h&_sGf
zRN7iK)f?HIn3v%SdA&sV!1NS3K1r(Bf!?_vC)1pblt*T+R20=M>4L{k5_WdCIqq<0
z^1ugFqc)HIkxcn|GU<_{LdUwKHmBf=xe{oF+?WwjnU;@ZC(JWA?_);YJU^q4iPhS0
z&MRd(wef~!j=fp(vbXANu7fyY3SM{4^t}GeHn50&vnj!qFNQ;erbwdF5g!J1mHM9@
zIO4N%QbbPjBVc-^&^v72Kl!C)8vQ&xD&!Pc<S%Am2glLfjn)$8ea2H#nYFppI)fjQ
z>erW#9LNhQk9`_*(6#Ld#&LpT<9(Hllink$rZDeO-*5fT1{{lZa^Nit(%~4htdAMk
z_OrL!e1p$qvo~?}Es_;8dk|odSaORb3r9kc{-jwWX_GjqUfk+QJmGn=rF%3+(9IZV
z5Nf%}&XLfWM%d)b?^od)KOy+Nsug`ID=lD)<00coUZEWCV#dDta1U+2Ll>Of|9nus
zaR(384TUJ*=88M=Kb!a#qO@WizSaLsX3APIzSk=PV^)RTlplYa!!n(Ct}K4Kj9aEE
z5M?6y+nA+)Z^PHK=-GH2&VAr&r(HEVr)nW)r3Z$1v<+{lk<rh+fL;P|AN!Djm^dDx
km0jkg{{86Dp!h|);!ZS4OrTl<{?#MXRMUN2t_qF#A79W+tN;K2

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/style.css b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/style.css
deleted file mode 100755
index 36224a019cb..00000000000
--- a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/style.css
+++ /dev/null
@@ -1,1105 +0,0 @@
-/* jsTree default dark theme */
-.jstree-node,
-.jstree-children,
-.jstree-container-ul {
-  display: block;
-  margin: 0;
-  padding: 0;
-  list-style-type: none;
-  list-style-image: none;
-}
-.jstree-node {
-  white-space: nowrap;
-}
-.jstree-anchor {
-  display: inline-block;
-  color: black;
-  white-space: nowrap;
-  padding: 0 4px 0 1px;
-  margin: 0;
-  vertical-align: top;
-}
-.jstree-anchor:focus {
-  outline: 0;
-}
-.jstree-anchor,
-.jstree-anchor:link,
-.jstree-anchor:visited,
-.jstree-anchor:hover,
-.jstree-anchor:active {
-  text-decoration: none;
-  color: inherit;
-}
-.jstree-icon {
-  display: inline-block;
-  text-decoration: none;
-  margin: 0;
-  padding: 0;
-  vertical-align: top;
-  text-align: center;
-}
-.jstree-icon:empty {
-  display: inline-block;
-  text-decoration: none;
-  margin: 0;
-  padding: 0;
-  vertical-align: top;
-  text-align: center;
-}
-.jstree-ocl {
-  cursor: pointer;
-}
-.jstree-leaf > .jstree-ocl {
-  cursor: default;
-}
-.jstree .jstree-open > .jstree-children {
-  display: block;
-}
-.jstree .jstree-closed > .jstree-children,
-.jstree .jstree-leaf > .jstree-children {
-  display: none;
-}
-.jstree-anchor > .jstree-themeicon {
-  margin-right: 2px;
-}
-.jstree-no-icons .jstree-themeicon,
-.jstree-anchor > .jstree-themeicon-hidden {
-  display: none;
-}
-.jstree-hidden {
-  display: none;
-}
-.jstree-rtl .jstree-anchor {
-  padding: 0 1px 0 4px;
-}
-.jstree-rtl .jstree-anchor > .jstree-themeicon {
-  margin-left: 2px;
-  margin-right: 0;
-}
-.jstree-rtl .jstree-node {
-  margin-left: 0;
-}
-.jstree-rtl .jstree-container-ul > .jstree-node {
-  margin-right: 0;
-}
-.jstree-wholerow-ul {
-  position: relative;
-  display: inline-block;
-  min-width: 100%;
-}
-.jstree-wholerow-ul .jstree-leaf > .jstree-ocl {
-  cursor: pointer;
-}
-.jstree-wholerow-ul .jstree-anchor,
-.jstree-wholerow-ul .jstree-icon {
-  position: relative;
-}
-.jstree-wholerow-ul .jstree-wholerow {
-  width: 100%;
-  cursor: pointer;
-  position: absolute;
-  left: 0;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-.vakata-context {
-  display: none;
-}
-.vakata-context,
-.vakata-context ul {
-  margin: 0;
-  padding: 2px;
-  position: absolute;
-  background: #f5f5f5;
-  border: 1px solid #979797;
-  box-shadow: 2px 2px 2px #999999;
-}
-.vakata-context ul {
-  list-style: none;
-  left: 100%;
-  margin-top: -2.7em;
-  margin-left: -4px;
-}
-.vakata-context .vakata-context-right ul {
-  left: auto;
-  right: 100%;
-  margin-left: auto;
-  margin-right: -4px;
-}
-.vakata-context li {
-  list-style: none;
-  display: inline;
-}
-.vakata-context li > a {
-  display: block;
-  padding: 0 2em 0 2em;
-  text-decoration: none;
-  width: auto;
-  color: black;
-  white-space: nowrap;
-  line-height: 2.4em;
-  text-shadow: 1px 1px 0 white;
-  border-radius: 1px;
-}
-.vakata-context li > a:hover {
-  position: relative;
-  background-color: #e8eff7;
-  box-shadow: 0 0 2px #0a6aa1;
-}
-.vakata-context li > a.vakata-context-parent {
-  background-image: url("data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAIORI4JlrqN1oMSnmmZDQUAOw==");
-  background-position: right center;
-  background-repeat: no-repeat;
-}
-.vakata-context li > a:focus {
-  outline: 0;
-}
-.vakata-context .vakata-context-hover > a {
-  position: relative;
-  background-color: #e8eff7;
-  box-shadow: 0 0 2px #0a6aa1;
-}
-.vakata-context .vakata-context-separator > a,
-.vakata-context .vakata-context-separator > a:hover {
-  background: white;
-  border: 0;
-  border-top: 1px solid #e2e3e3;
-  height: 1px;
-  min-height: 1px;
-  max-height: 1px;
-  padding: 0;
-  margin: 0 0 0 2.4em;
-  border-left: 1px solid #e0e0e0;
-  text-shadow: 0 0 0 transparent;
-  box-shadow: 0 0 0 transparent;
-  border-radius: 0;
-}
-.vakata-context .vakata-contextmenu-disabled a,
-.vakata-context .vakata-contextmenu-disabled a:hover {
-  color: silver;
-  background-color: transparent;
-  border: 0;
-  box-shadow: 0 0 0;
-}
-.vakata-context li > a > i {
-  text-decoration: none;
-  display: inline-block;
-  width: 2.4em;
-  height: 2.4em;
-  background: transparent;
-  margin: 0 0 0 -2em;
-  vertical-align: top;
-  text-align: center;
-  line-height: 2.4em;
-}
-.vakata-context li > a > i:empty {
-  width: 2.4em;
-  line-height: 2.4em;
-}
-.vakata-context li > a .vakata-contextmenu-sep {
-  display: inline-block;
-  width: 1px;
-  height: 2.4em;
-  background: white;
-  margin: 0 0.5em 0 0;
-  border-left: 1px solid #e2e3e3;
-}
-.vakata-context .vakata-contextmenu-shortcut {
-  font-size: 0.8em;
-  color: silver;
-  opacity: 0.5;
-  display: none;
-}
-.vakata-context-rtl ul {
-  left: auto;
-  right: 100%;
-  margin-left: auto;
-  margin-right: -4px;
-}
-.vakata-context-rtl li > a.vakata-context-parent {
-  background-image: url("data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAINjI+AC7rWHIsPtmoxLAA7");
-  background-position: left center;
-  background-repeat: no-repeat;
-}
-.vakata-context-rtl .vakata-context-separator > a {
-  margin: 0 2.4em 0 0;
-  border-left: 0;
-  border-right: 1px solid #e2e3e3;
-}
-.vakata-context-rtl .vakata-context-left ul {
-  right: auto;
-  left: 100%;
-  margin-left: -4px;
-  margin-right: auto;
-}
-.vakata-context-rtl li > a > i {
-  margin: 0 -2em 0 0;
-}
-.vakata-context-rtl li > a .vakata-contextmenu-sep {
-  margin: 0 0 0 0.5em;
-  border-left-color: white;
-  background: #e2e3e3;
-}
-#jstree-marker {
-  position: absolute;
-  top: 0;
-  left: 0;
-  margin: -5px 0 0 0;
-  padding: 0;
-  border-right: 0;
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent;
-  border-left: 5px solid;
-  width: 0;
-  height: 0;
-  font-size: 0;
-  line-height: 0;
-}
-#jstree-dnd {
-  line-height: 16px;
-  margin: 0;
-  padding: 4px;
-}
-#jstree-dnd .jstree-icon,
-#jstree-dnd .jstree-copy {
-  display: inline-block;
-  text-decoration: none;
-  margin: 0 2px 0 0;
-  padding: 0;
-  width: 16px;
-  height: 16px;
-}
-#jstree-dnd .jstree-ok {
-  background: green;
-}
-#jstree-dnd .jstree-er {
-  background: red;
-}
-#jstree-dnd .jstree-copy {
-  margin: 0 2px 0 2px;
-}
-.jstree-default-dark .jstree-node,
-.jstree-default-dark .jstree-icon {
-  background-repeat: no-repeat;
-  background-color: transparent;
-}
-.jstree-default-dark .jstree-anchor,
-.jstree-default-dark .jstree-wholerow {
-  transition: background-color 0.15s, box-shadow 0.15s;
-}
-.jstree-default-dark .jstree-hovered {
-  background: #555555;
-  border-radius: 2px;
-  box-shadow: inset 0 0 1px #555555;
-}
-.jstree-default-dark .jstree-clicked {
-  background: #5fa2db;
-  border-radius: 2px;
-  box-shadow: inset 0 0 1px #666666;
-}
-.jstree-default-dark .jstree-no-icons .jstree-anchor > .jstree-themeicon {
-  display: none;
-}
-.jstree-default-dark .jstree-disabled {
-  background: transparent;
-  color: #666666;
-}
-.jstree-default-dark .jstree-disabled.jstree-hovered {
-  background: transparent;
-  box-shadow: none;
-}
-.jstree-default-dark .jstree-disabled.jstree-clicked {
-  background: #333333;
-}
-.jstree-default-dark .jstree-disabled > .jstree-icon {
-  opacity: 0.8;
-  filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");
-  /* Firefox 10+ */
-  filter: gray;
-  /* IE6-9 */
-  -webkit-filter: grayscale(100%);
-  /* Chrome 19+ & Safari 6+ */
-}
-.jstree-default-dark .jstree-search {
-  font-style: italic;
-  color: #ffffff;
-  font-weight: bold;
-}
-.jstree-default-dark .jstree-no-checkboxes .jstree-checkbox {
-  display: none !important;
-}
-.jstree-default-dark.jstree-checkbox-no-clicked .jstree-clicked {
-  background: transparent;
-  box-shadow: none;
-}
-.jstree-default-dark.jstree-checkbox-no-clicked .jstree-clicked.jstree-hovered {
-  background: #555555;
-}
-.jstree-default-dark.jstree-checkbox-no-clicked > .jstree-wholerow-ul .jstree-wholerow-clicked {
-  background: transparent;
-}
-.jstree-default-dark.jstree-checkbox-no-clicked > .jstree-wholerow-ul .jstree-wholerow-clicked.jstree-wholerow-hovered {
-  background: #555555;
-}
-.jstree-default-dark > .jstree-striped {
-  min-width: 100%;
-  display: inline-block;
-  background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAMAAAB/qqA+AAAABlBMVEUAAAAAAAClZ7nPAAAAAnRSTlMNAMM9s3UAAAAXSURBVHjajcEBAQAAAIKg/H/aCQZ70AUBjAATb6YPDgAAAABJRU5ErkJggg==") left top repeat;
-}
-.jstree-default-dark > .jstree-wholerow-ul .jstree-hovered,
-.jstree-default-dark > .jstree-wholerow-ul .jstree-clicked {
-  background: transparent;
-  box-shadow: none;
-  border-radius: 0;
-}
-.jstree-default-dark .jstree-wholerow {
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-}
-.jstree-default-dark .jstree-wholerow-hovered {
-  background: #555555;
-}
-.jstree-default-dark .jstree-wholerow-clicked {
-  background: #5fa2db;
-  background: -webkit-linear-gradient(top, #5fa2db 0%, #5fa2db 100%);
-  background: linear-gradient(to bottom, #5fa2db 0%, #5fa2db 100%);
-}
-.jstree-default-dark .jstree-node {
-  min-height: 24px;
-  line-height: 24px;
-  margin-left: 24px;
-  min-width: 24px;
-}
-.jstree-default-dark .jstree-anchor {
-  line-height: 24px;
-  height: 24px;
-}
-.jstree-default-dark .jstree-icon {
-  width: 24px;
-  height: 24px;
-  line-height: 24px;
-}
-.jstree-default-dark .jstree-icon:empty {
-  width: 24px;
-  height: 24px;
-  line-height: 24px;
-}
-.jstree-default-dark.jstree-rtl .jstree-node {
-  margin-right: 24px;
-}
-.jstree-default-dark .jstree-wholerow {
-  height: 24px;
-}
-.jstree-default-dark .jstree-node,
-.jstree-default-dark .jstree-icon {
-  background-image: url("32px.png");
-}
-.jstree-default-dark .jstree-node {
-  background-position: -292px -4px;
-  background-repeat: repeat-y;
-}
-.jstree-default-dark .jstree-last {
-  background: transparent;
-}
-.jstree-default-dark .jstree-open > .jstree-ocl {
-  background-position: -132px -4px;
-}
-.jstree-default-dark .jstree-closed > .jstree-ocl {
-  background-position: -100px -4px;
-}
-.jstree-default-dark .jstree-leaf > .jstree-ocl {
-  background-position: -68px -4px;
-}
-.jstree-default-dark .jstree-themeicon {
-  background-position: -260px -4px;
-}
-.jstree-default-dark > .jstree-no-dots .jstree-node,
-.jstree-default-dark > .jstree-no-dots .jstree-leaf > .jstree-ocl {
-  background: transparent;
-}
-.jstree-default-dark > .jstree-no-dots .jstree-open > .jstree-ocl {
-  background-position: -36px -4px;
-}
-.jstree-default-dark > .jstree-no-dots .jstree-closed > .jstree-ocl {
-  background-position: -4px -4px;
-}
-.jstree-default-dark .jstree-disabled {
-  background: transparent;
-}
-.jstree-default-dark .jstree-disabled.jstree-hovered {
-  background: transparent;
-}
-.jstree-default-dark .jstree-disabled.jstree-clicked {
-  background: #efefef;
-}
-.jstree-default-dark .jstree-checkbox {
-  background-position: -164px -4px;
-}
-.jstree-default-dark .jstree-checkbox:hover {
-  background-position: -164px -36px;
-}
-.jstree-default-dark.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox,
-.jstree-default-dark .jstree-checked > .jstree-checkbox {
-  background-position: -228px -4px;
-}
-.jstree-default-dark.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox:hover,
-.jstree-default-dark .jstree-checked > .jstree-checkbox:hover {
-  background-position: -228px -36px;
-}
-.jstree-default-dark .jstree-anchor > .jstree-undetermined {
-  background-position: -196px -4px;
-}
-.jstree-default-dark .jstree-anchor > .jstree-undetermined:hover {
-  background-position: -196px -36px;
-}
-.jstree-default-dark .jstree-checkbox-disabled {
-  opacity: 0.8;
-  filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");
-  /* Firefox 10+ */
-  filter: gray;
-  /* IE6-9 */
-  -webkit-filter: grayscale(100%);
-  /* Chrome 19+ & Safari 6+ */
-}
-.jstree-default-dark > .jstree-striped {
-  background-size: auto 48px;
-}
-.jstree-default-dark.jstree-rtl .jstree-node {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==");
-  background-position: 100% 1px;
-  background-repeat: repeat-y;
-}
-.jstree-default-dark.jstree-rtl .jstree-last {
-  background: transparent;
-}
-.jstree-default-dark.jstree-rtl .jstree-open > .jstree-ocl {
-  background-position: -132px -36px;
-}
-.jstree-default-dark.jstree-rtl .jstree-closed > .jstree-ocl {
-  background-position: -100px -36px;
-}
-.jstree-default-dark.jstree-rtl .jstree-leaf > .jstree-ocl {
-  background-position: -68px -36px;
-}
-.jstree-default-dark.jstree-rtl > .jstree-no-dots .jstree-node,
-.jstree-default-dark.jstree-rtl > .jstree-no-dots .jstree-leaf > .jstree-ocl {
-  background: transparent;
-}
-.jstree-default-dark.jstree-rtl > .jstree-no-dots .jstree-open > .jstree-ocl {
-  background-position: -36px -36px;
-}
-.jstree-default-dark.jstree-rtl > .jstree-no-dots .jstree-closed > .jstree-ocl {
-  background-position: -4px -36px;
-}
-.jstree-default-dark .jstree-themeicon-custom {
-  background-color: transparent;
-  background-image: none;
-  background-position: 0 0;
-}
-.jstree-default-dark > .jstree-container-ul .jstree-loading > .jstree-ocl {
-  background: url("throbber.gif") center center no-repeat;
-}
-.jstree-default-dark .jstree-file {
-  background: url("32px.png") -100px -68px no-repeat;
-}
-.jstree-default-dark .jstree-folder {
-  background: url("32px.png") -260px -4px no-repeat;
-}
-.jstree-default-dark > .jstree-container-ul > .jstree-node {
-  margin-left: 0;
-  margin-right: 0;
-}
-#jstree-dnd.jstree-default-dark {
-  line-height: 24px;
-  padding: 0 4px;
-}
-#jstree-dnd.jstree-default-dark .jstree-ok,
-#jstree-dnd.jstree-default-dark .jstree-er {
-  background-image: url("32px.png");
-  background-repeat: no-repeat;
-  background-color: transparent;
-}
-#jstree-dnd.jstree-default-dark i {
-  background: transparent;
-  width: 24px;
-  height: 24px;
-  line-height: 24px;
-}
-#jstree-dnd.jstree-default-dark .jstree-ok {
-  background-position: -4px -68px;
-}
-#jstree-dnd.jstree-default-dark .jstree-er {
-  background-position: -36px -68px;
-}
-.jstree-default-dark.jstree-rtl .jstree-node {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==");
-}
-.jstree-default-dark.jstree-rtl .jstree-last {
-  background: transparent;
-}
-.jstree-default-dark-small .jstree-node {
-  min-height: 18px;
-  line-height: 18px;
-  margin-left: 18px;
-  min-width: 18px;
-}
-.jstree-default-dark-small .jstree-anchor {
-  line-height: 18px;
-  height: 18px;
-}
-.jstree-default-dark-small .jstree-icon {
-  width: 18px;
-  height: 18px;
-  line-height: 18px;
-}
-.jstree-default-dark-small .jstree-icon:empty {
-  width: 18px;
-  height: 18px;
-  line-height: 18px;
-}
-.jstree-default-dark-small.jstree-rtl .jstree-node {
-  margin-right: 18px;
-}
-.jstree-default-dark-small .jstree-wholerow {
-  height: 18px;
-}
-.jstree-default-dark-small .jstree-node,
-.jstree-default-dark-small .jstree-icon {
-  background-image: url("32px.png");
-}
-.jstree-default-dark-small .jstree-node {
-  background-position: -295px -7px;
-  background-repeat: repeat-y;
-}
-.jstree-default-dark-small .jstree-last {
-  background: transparent;
-}
-.jstree-default-dark-small .jstree-open > .jstree-ocl {
-  background-position: -135px -7px;
-}
-.jstree-default-dark-small .jstree-closed > .jstree-ocl {
-  background-position: -103px -7px;
-}
-.jstree-default-dark-small .jstree-leaf > .jstree-ocl {
-  background-position: -71px -7px;
-}
-.jstree-default-dark-small .jstree-themeicon {
-  background-position: -263px -7px;
-}
-.jstree-default-dark-small > .jstree-no-dots .jstree-node,
-.jstree-default-dark-small > .jstree-no-dots .jstree-leaf > .jstree-ocl {
-  background: transparent;
-}
-.jstree-default-dark-small > .jstree-no-dots .jstree-open > .jstree-ocl {
-  background-position: -39px -7px;
-}
-.jstree-default-dark-small > .jstree-no-dots .jstree-closed > .jstree-ocl {
-  background-position: -7px -7px;
-}
-.jstree-default-dark-small .jstree-disabled {
-  background: transparent;
-}
-.jstree-default-dark-small .jstree-disabled.jstree-hovered {
-  background: transparent;
-}
-.jstree-default-dark-small .jstree-disabled.jstree-clicked {
-  background: #efefef;
-}
-.jstree-default-dark-small .jstree-checkbox {
-  background-position: -167px -7px;
-}
-.jstree-default-dark-small .jstree-checkbox:hover {
-  background-position: -167px -39px;
-}
-.jstree-default-dark-small.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox,
-.jstree-default-dark-small .jstree-checked > .jstree-checkbox {
-  background-position: -231px -7px;
-}
-.jstree-default-dark-small.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox:hover,
-.jstree-default-dark-small .jstree-checked > .jstree-checkbox:hover {
-  background-position: -231px -39px;
-}
-.jstree-default-dark-small .jstree-anchor > .jstree-undetermined {
-  background-position: -199px -7px;
-}
-.jstree-default-dark-small .jstree-anchor > .jstree-undetermined:hover {
-  background-position: -199px -39px;
-}
-.jstree-default-dark-small .jstree-checkbox-disabled {
-  opacity: 0.8;
-  filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");
-  /* Firefox 10+ */
-  filter: gray;
-  /* IE6-9 */
-  -webkit-filter: grayscale(100%);
-  /* Chrome 19+ & Safari 6+ */
-}
-.jstree-default-dark-small > .jstree-striped {
-  background-size: auto 36px;
-}
-.jstree-default-dark-small.jstree-rtl .jstree-node {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==");
-  background-position: 100% 1px;
-  background-repeat: repeat-y;
-}
-.jstree-default-dark-small.jstree-rtl .jstree-last {
-  background: transparent;
-}
-.jstree-default-dark-small.jstree-rtl .jstree-open > .jstree-ocl {
-  background-position: -135px -39px;
-}
-.jstree-default-dark-small.jstree-rtl .jstree-closed > .jstree-ocl {
-  background-position: -103px -39px;
-}
-.jstree-default-dark-small.jstree-rtl .jstree-leaf > .jstree-ocl {
-  background-position: -71px -39px;
-}
-.jstree-default-dark-small.jstree-rtl > .jstree-no-dots .jstree-node,
-.jstree-default-dark-small.jstree-rtl > .jstree-no-dots .jstree-leaf > .jstree-ocl {
-  background: transparent;
-}
-.jstree-default-dark-small.jstree-rtl > .jstree-no-dots .jstree-open > .jstree-ocl {
-  background-position: -39px -39px;
-}
-.jstree-default-dark-small.jstree-rtl > .jstree-no-dots .jstree-closed > .jstree-ocl {
-  background-position: -7px -39px;
-}
-.jstree-default-dark-small .jstree-themeicon-custom {
-  background-color: transparent;
-  background-image: none;
-  background-position: 0 0;
-}
-.jstree-default-dark-small > .jstree-container-ul .jstree-loading > .jstree-ocl {
-  background: url("throbber.gif") center center no-repeat;
-}
-.jstree-default-dark-small .jstree-file {
-  background: url("32px.png") -103px -71px no-repeat;
-}
-.jstree-default-dark-small .jstree-folder {
-  background: url("32px.png") -263px -7px no-repeat;
-}
-.jstree-default-dark-small > .jstree-container-ul > .jstree-node {
-  margin-left: 0;
-  margin-right: 0;
-}
-#jstree-dnd.jstree-default-dark-small {
-  line-height: 18px;
-  padding: 0 4px;
-}
-#jstree-dnd.jstree-default-dark-small .jstree-ok,
-#jstree-dnd.jstree-default-dark-small .jstree-er {
-  background-image: url("32px.png");
-  background-repeat: no-repeat;
-  background-color: transparent;
-}
-#jstree-dnd.jstree-default-dark-small i {
-  background: transparent;
-  width: 18px;
-  height: 18px;
-  line-height: 18px;
-}
-#jstree-dnd.jstree-default-dark-small .jstree-ok {
-  background-position: -7px -71px;
-}
-#jstree-dnd.jstree-default-dark-small .jstree-er {
-  background-position: -39px -71px;
-}
-.jstree-default-dark-small.jstree-rtl .jstree-node {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAACAQMAAABv1h6PAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMHBgAAiABBI4gz9AAAAABJRU5ErkJggg==");
-}
-.jstree-default-dark-small.jstree-rtl .jstree-last {
-  background: transparent;
-}
-.jstree-default-dark-large .jstree-node {
-  min-height: 32px;
-  line-height: 32px;
-  margin-left: 32px;
-  min-width: 32px;
-}
-.jstree-default-dark-large .jstree-anchor {
-  line-height: 32px;
-  height: 32px;
-}
-.jstree-default-dark-large .jstree-icon {
-  width: 32px;
-  height: 32px;
-  line-height: 32px;
-}
-.jstree-default-dark-large .jstree-icon:empty {
-  width: 32px;
-  height: 32px;
-  line-height: 32px;
-}
-.jstree-default-dark-large.jstree-rtl .jstree-node {
-  margin-right: 32px;
-}
-.jstree-default-dark-large .jstree-wholerow {
-  height: 32px;
-}
-.jstree-default-dark-large .jstree-node,
-.jstree-default-dark-large .jstree-icon {
-  background-image: url("32px.png");
-}
-.jstree-default-dark-large .jstree-node {
-  background-position: -288px 0px;
-  background-repeat: repeat-y;
-}
-.jstree-default-dark-large .jstree-last {
-  background: transparent;
-}
-.jstree-default-dark-large .jstree-open > .jstree-ocl {
-  background-position: -128px 0px;
-}
-.jstree-default-dark-large .jstree-closed > .jstree-ocl {
-  background-position: -96px 0px;
-}
-.jstree-default-dark-large .jstree-leaf > .jstree-ocl {
-  background-position: -64px 0px;
-}
-.jstree-default-dark-large .jstree-themeicon {
-  background-position: -256px 0px;
-}
-.jstree-default-dark-large > .jstree-no-dots .jstree-node,
-.jstree-default-dark-large > .jstree-no-dots .jstree-leaf > .jstree-ocl {
-  background: transparent;
-}
-.jstree-default-dark-large > .jstree-no-dots .jstree-open > .jstree-ocl {
-  background-position: -32px 0px;
-}
-.jstree-default-dark-large > .jstree-no-dots .jstree-closed > .jstree-ocl {
-  background-position: 0px 0px;
-}
-.jstree-default-dark-large .jstree-disabled {
-  background: transparent;
-}
-.jstree-default-dark-large .jstree-disabled.jstree-hovered {
-  background: transparent;
-}
-.jstree-default-dark-large .jstree-disabled.jstree-clicked {
-  background: #efefef;
-}
-.jstree-default-dark-large .jstree-checkbox {
-  background-position: -160px 0px;
-}
-.jstree-default-dark-large .jstree-checkbox:hover {
-  background-position: -160px -32px;
-}
-.jstree-default-dark-large.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox,
-.jstree-default-dark-large .jstree-checked > .jstree-checkbox {
-  background-position: -224px 0px;
-}
-.jstree-default-dark-large.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox:hover,
-.jstree-default-dark-large .jstree-checked > .jstree-checkbox:hover {
-  background-position: -224px -32px;
-}
-.jstree-default-dark-large .jstree-anchor > .jstree-undetermined {
-  background-position: -192px 0px;
-}
-.jstree-default-dark-large .jstree-anchor > .jstree-undetermined:hover {
-  background-position: -192px -32px;
-}
-.jstree-default-dark-large .jstree-checkbox-disabled {
-  opacity: 0.8;
-  filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");
-  /* Firefox 10+ */
-  filter: gray;
-  /* IE6-9 */
-  -webkit-filter: grayscale(100%);
-  /* Chrome 19+ & Safari 6+ */
-}
-.jstree-default-dark-large > .jstree-striped {
-  background-size: auto 64px;
-}
-.jstree-default-dark-large.jstree-rtl .jstree-node {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==");
-  background-position: 100% 1px;
-  background-repeat: repeat-y;
-}
-.jstree-default-dark-large.jstree-rtl .jstree-last {
-  background: transparent;
-}
-.jstree-default-dark-large.jstree-rtl .jstree-open > .jstree-ocl {
-  background-position: -128px -32px;
-}
-.jstree-default-dark-large.jstree-rtl .jstree-closed > .jstree-ocl {
-  background-position: -96px -32px;
-}
-.jstree-default-dark-large.jstree-rtl .jstree-leaf > .jstree-ocl {
-  background-position: -64px -32px;
-}
-.jstree-default-dark-large.jstree-rtl > .jstree-no-dots .jstree-node,
-.jstree-default-dark-large.jstree-rtl > .jstree-no-dots .jstree-leaf > .jstree-ocl {
-  background: transparent;
-}
-.jstree-default-dark-large.jstree-rtl > .jstree-no-dots .jstree-open > .jstree-ocl {
-  background-position: -32px -32px;
-}
-.jstree-default-dark-large.jstree-rtl > .jstree-no-dots .jstree-closed > .jstree-ocl {
-  background-position: 0px -32px;
-}
-.jstree-default-dark-large .jstree-themeicon-custom {
-  background-color: transparent;
-  background-image: none;
-  background-position: 0 0;
-}
-.jstree-default-dark-large > .jstree-container-ul .jstree-loading > .jstree-ocl {
-  background: url("throbber.gif") center center no-repeat;
-}
-.jstree-default-dark-large .jstree-file {
-  background: url("32px.png") -96px -64px no-repeat;
-}
-.jstree-default-dark-large .jstree-folder {
-  background: url("32px.png") -256px 0px no-repeat;
-}
-.jstree-default-dark-large > .jstree-container-ul > .jstree-node {
-  margin-left: 0;
-  margin-right: 0;
-}
-#jstree-dnd.jstree-default-dark-large {
-  line-height: 32px;
-  padding: 0 4px;
-}
-#jstree-dnd.jstree-default-dark-large .jstree-ok,
-#jstree-dnd.jstree-default-dark-large .jstree-er {
-  background-image: url("32px.png");
-  background-repeat: no-repeat;
-  background-color: transparent;
-}
-#jstree-dnd.jstree-default-dark-large i {
-  background: transparent;
-  width: 32px;
-  height: 32px;
-  line-height: 32px;
-}
-#jstree-dnd.jstree-default-dark-large .jstree-ok {
-  background-position: 0px -64px;
-}
-#jstree-dnd.jstree-default-dark-large .jstree-er {
-  background-position: -32px -64px;
-}
-.jstree-default-dark-large.jstree-rtl .jstree-node {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAACAQMAAAAD0EyKAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjgIIGBgABCgCBvVLXcAAAAABJRU5ErkJggg==");
-}
-.jstree-default-dark-large.jstree-rtl .jstree-last {
-  background: transparent;
-}
-@media (max-width: 768px) {
-  #jstree-dnd.jstree-dnd-responsive {
-    line-height: 40px;
-    font-weight: bold;
-    font-size: 1.1em;
-    text-shadow: 1px 1px white;
-  }
-  #jstree-dnd.jstree-dnd-responsive > i {
-    background: transparent;
-    width: 40px;
-    height: 40px;
-  }
-  #jstree-dnd.jstree-dnd-responsive > .jstree-ok {
-    background-image: url("40px.png");
-    background-position: 0 -200px;
-    background-size: 120px 240px;
-  }
-  #jstree-dnd.jstree-dnd-responsive > .jstree-er {
-    background-image: url("40px.png");
-    background-position: -40px -200px;
-    background-size: 120px 240px;
-  }
-  #jstree-marker.jstree-dnd-responsive {
-    border-left-width: 10px;
-    border-top-width: 10px;
-    border-bottom-width: 10px;
-    margin-top: -10px;
-  }
-}
-@media (max-width: 768px) {
-  .jstree-default-dark-responsive {
-    /*
-	.jstree-open > .jstree-ocl,
-	.jstree-closed > .jstree-ocl { border-radius:20px; background-color:white; }
-	*/
-  }
-  .jstree-default-dark-responsive .jstree-icon {
-    background-image: url("40px.png");
-  }
-  .jstree-default-dark-responsive .jstree-node,
-  .jstree-default-dark-responsive .jstree-leaf > .jstree-ocl {
-    background: transparent;
-  }
-  .jstree-default-dark-responsive .jstree-node {
-    min-height: 40px;
-    line-height: 40px;
-    margin-left: 40px;
-    min-width: 40px;
-    white-space: nowrap;
-  }
-  .jstree-default-dark-responsive .jstree-anchor {
-    line-height: 40px;
-    height: 40px;
-  }
-  .jstree-default-dark-responsive .jstree-icon,
-  .jstree-default-dark-responsive .jstree-icon:empty {
-    width: 40px;
-    height: 40px;
-    line-height: 40px;
-  }
-  .jstree-default-dark-responsive > .jstree-container-ul > .jstree-node {
-    margin-left: 0;
-  }
-  .jstree-default-dark-responsive.jstree-rtl .jstree-node {
-    margin-left: 0;
-    margin-right: 40px;
-  }
-  .jstree-default-dark-responsive.jstree-rtl .jstree-container-ul > .jstree-node {
-    margin-right: 0;
-  }
-  .jstree-default-dark-responsive .jstree-ocl,
-  .jstree-default-dark-responsive .jstree-themeicon,
-  .jstree-default-dark-responsive .jstree-checkbox {
-    background-size: 120px 240px;
-  }
-  .jstree-default-dark-responsive .jstree-leaf > .jstree-ocl {
-    background: transparent;
-  }
-  .jstree-default-dark-responsive .jstree-open > .jstree-ocl {
-    background-position: 0 0px !important;
-  }
-  .jstree-default-dark-responsive .jstree-closed > .jstree-ocl {
-    background-position: 0 -40px !important;
-  }
-  .jstree-default-dark-responsive.jstree-rtl .jstree-closed > .jstree-ocl {
-    background-position: -40px 0px !important;
-  }
-  .jstree-default-dark-responsive .jstree-themeicon {
-    background-position: -40px -40px;
-  }
-  .jstree-default-dark-responsive .jstree-checkbox,
-  .jstree-default-dark-responsive .jstree-checkbox:hover {
-    background-position: -40px -80px;
-  }
-  .jstree-default-dark-responsive.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox,
-  .jstree-default-dark-responsive.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox:hover,
-  .jstree-default-dark-responsive .jstree-checked > .jstree-checkbox,
-  .jstree-default-dark-responsive .jstree-checked > .jstree-checkbox:hover {
-    background-position: 0 -80px;
-  }
-  .jstree-default-dark-responsive .jstree-anchor > .jstree-undetermined,
-  .jstree-default-dark-responsive .jstree-anchor > .jstree-undetermined:hover {
-    background-position: 0 -120px;
-  }
-  .jstree-default-dark-responsive .jstree-anchor {
-    font-weight: bold;
-    font-size: 1.1em;
-    text-shadow: 1px 1px white;
-  }
-  .jstree-default-dark-responsive > .jstree-striped {
-    background: transparent;
-  }
-  .jstree-default-dark-responsive .jstree-wholerow {
-    border-top: 1px solid #666666;
-    border-bottom: 1px solid #000000;
-    background: #333333;
-    height: 40px;
-  }
-  .jstree-default-dark-responsive .jstree-wholerow-hovered {
-    background: #555555;
-  }
-  .jstree-default-dark-responsive .jstree-wholerow-clicked {
-    background: #5fa2db;
-  }
-  .jstree-default-dark-responsive .jstree-children .jstree-last > .jstree-wholerow {
-    box-shadow: inset 0 -6px 3px -5px #111111;
-  }
-  .jstree-default-dark-responsive .jstree-children .jstree-open > .jstree-wholerow {
-    box-shadow: inset 0 6px 3px -5px #111111;
-    border-top: 0;
-  }
-  .jstree-default-dark-responsive .jstree-children .jstree-open + .jstree-open {
-    box-shadow: none;
-  }
-  .jstree-default-dark-responsive .jstree-node,
-  .jstree-default-dark-responsive .jstree-icon,
-  .jstree-default-dark-responsive .jstree-node > .jstree-ocl,
-  .jstree-default-dark-responsive .jstree-themeicon,
-  .jstree-default-dark-responsive .jstree-checkbox {
-    background-image: url("40px.png");
-    background-size: 120px 240px;
-  }
-  .jstree-default-dark-responsive .jstree-node {
-    background-position: -80px 0;
-    background-repeat: repeat-y;
-  }
-  .jstree-default-dark-responsive .jstree-last {
-    background: transparent;
-  }
-  .jstree-default-dark-responsive .jstree-leaf > .jstree-ocl {
-    background-position: -40px -120px;
-  }
-  .jstree-default-dark-responsive .jstree-last > .jstree-ocl {
-    background-position: -40px -160px;
-  }
-  .jstree-default-dark-responsive .jstree-themeicon-custom {
-    background-color: transparent;
-    background-image: none;
-    background-position: 0 0;
-  }
-  .jstree-default-dark-responsive .jstree-file {
-    background: url("40px.png") 0 -160px no-repeat;
-    background-size: 120px 240px;
-  }
-  .jstree-default-dark-responsive .jstree-folder {
-    background: url("40px.png") -40px -40px no-repeat;
-    background-size: 120px 240px;
-  }
-  .jstree-default-dark-responsive > .jstree-container-ul > .jstree-node {
-    margin-left: 0;
-    margin-right: 0;
-  }
-}
-.jstree-default-dark {
-  background: #333;
-}
-.jstree-default-dark .jstree-anchor {
-  color: #999;
-  text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.5);
-}
-.jstree-default-dark .jstree-clicked,
-.jstree-default-dark .jstree-checked {
-  color: white;
-}
-.jstree-default-dark .jstree-hovered {
-  color: white;
-}
-#jstree-marker.jstree-default-dark {
-  border-left-color: #999;
-  background: transparent;
-}
-.jstree-default-dark .jstree-anchor > .jstree-icon {
-  opacity: 0.75;
-}
-.jstree-default-dark .jstree-clicked > .jstree-icon,
-.jstree-default-dark .jstree-hovered > .jstree-icon,
-.jstree-default-dark .jstree-checked > .jstree-icon {
-  opacity: 1;
-}
-.jstree-default-dark.jstree-rtl .jstree-node {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAACZmZl+9SADAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==");
-}
-.jstree-default-dark.jstree-rtl .jstree-last {
-  background: transparent;
-}
-.jstree-default-dark-small.jstree-rtl .jstree-node {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAACAQMAAABv1h6PAAAABlBMVEUAAACZmZl+9SADAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMHBgAAiABBI4gz9AAAAABJRU5ErkJggg==");
-}
-.jstree-default-dark-small.jstree-rtl .jstree-last {
-  background: transparent;
-}
-.jstree-default-dark-large.jstree-rtl .jstree-node {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAACAQMAAAAD0EyKAAAABlBMVEUAAACZmZl+9SADAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjgIIGBgABCgCBvVLXcAAAAABJRU5ErkJggg==");
-}
-.jstree-default-dark-large.jstree-rtl .jstree-last {
-  background: transparent;
-}
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/style.min.css b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/style.min.css
deleted file mode 100755
index eea330acfe2..00000000000
--- a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/style.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.jstree-node,.jstree-children,.jstree-container-ul{display:block;margin:0;padding:0;list-style-type:none;list-style-image:none}.jstree-node{white-space:nowrap}.jstree-anchor{display:inline-block;color:#000;white-space:nowrap;padding:0 4px 0 1px;margin:0;vertical-align:top}.jstree-anchor:focus{outline:0}.jstree-anchor,.jstree-anchor:link,.jstree-anchor:visited,.jstree-anchor:hover,.jstree-anchor:active{text-decoration:none;color:inherit}.jstree-icon{display:inline-block;text-decoration:none;margin:0;padding:0;vertical-align:top;text-align:center}.jstree-icon:empty{display:inline-block;text-decoration:none;margin:0;padding:0;vertical-align:top;text-align:center}.jstree-ocl{cursor:pointer}.jstree-leaf>.jstree-ocl{cursor:default}.jstree .jstree-open>.jstree-children{display:block}.jstree .jstree-closed>.jstree-children,.jstree .jstree-leaf>.jstree-children{display:none}.jstree-anchor>.jstree-themeicon{margin-right:2px}.jstree-no-icons .jstree-themeicon,.jstree-anchor>.jstree-themeicon-hidden{display:none}.jstree-hidden{display:none}.jstree-rtl .jstree-anchor{padding:0 1px 0 4px}.jstree-rtl .jstree-anchor>.jstree-themeicon{margin-left:2px;margin-right:0}.jstree-rtl .jstree-node{margin-left:0}.jstree-rtl .jstree-container-ul>.jstree-node{margin-right:0}.jstree-wholerow-ul{position:relative;display:inline-block;min-width:100%}.jstree-wholerow-ul .jstree-leaf>.jstree-ocl{cursor:pointer}.jstree-wholerow-ul .jstree-anchor,.jstree-wholerow-ul .jstree-icon{position:relative}.jstree-wholerow-ul .jstree-wholerow{width:100%;cursor:pointer;position:absolute;left:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vakata-context{display:none}.vakata-context,.vakata-context ul{margin:0;padding:2px;position:absolute;background:#f5f5f5;border:1px solid #979797;box-shadow:2px 2px 2px #999}.vakata-context ul{list-style:none;left:100%;margin-top:-2.7em;margin-left:-4px}.vakata-context .vakata-context-right ul{left:auto;right:100%;margin-left:auto;margin-right:-4px}.vakata-context li{list-style:none;display:inline}.vakata-context li>a{display:block;padding:0 2em;text-decoration:none;width:auto;color:#000;white-space:nowrap;line-height:2.4em;text-shadow:1px 1px 0 #fff;border-radius:1px}.vakata-context li>a:hover{position:relative;background-color:#e8eff7;box-shadow:0 0 2px #0a6aa1}.vakata-context li>a.vakata-context-parent{background-image:url(data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAIORI4JlrqN1oMSnmmZDQUAOw==);background-position:right center;background-repeat:no-repeat}.vakata-context li>a:focus{outline:0}.vakata-context .vakata-context-hover>a{position:relative;background-color:#e8eff7;box-shadow:0 0 2px #0a6aa1}.vakata-context .vakata-context-separator>a,.vakata-context .vakata-context-separator>a:hover{background:#fff;border:0;border-top:1px solid #e2e3e3;height:1px;min-height:1px;max-height:1px;padding:0;margin:0 0 0 2.4em;border-left:1px solid #e0e0e0;text-shadow:0 0 0 transparent;box-shadow:0 0 0 transparent;border-radius:0}.vakata-context .vakata-contextmenu-disabled a,.vakata-context .vakata-contextmenu-disabled a:hover{color:silver;background-color:transparent;border:0;box-shadow:0 0 0}.vakata-context li>a>i{text-decoration:none;display:inline-block;width:2.4em;height:2.4em;background:0 0;margin:0 0 0 -2em;vertical-align:top;text-align:center;line-height:2.4em}.vakata-context li>a>i:empty{width:2.4em;line-height:2.4em}.vakata-context li>a .vakata-contextmenu-sep{display:inline-block;width:1px;height:2.4em;background:#fff;margin:0 .5em 0 0;border-left:1px solid #e2e3e3}.vakata-context .vakata-contextmenu-shortcut{font-size:.8em;color:silver;opacity:.5;display:none}.vakata-context-rtl ul{left:auto;right:100%;margin-left:auto;margin-right:-4px}.vakata-context-rtl li>a.vakata-context-parent{background-image:url(data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAINjI+AC7rWHIsPtmoxLAA7);background-position:left center;background-repeat:no-repeat}.vakata-context-rtl .vakata-context-separator>a{margin:0 2.4em 0 0;border-left:0;border-right:1px solid #e2e3e3}.vakata-context-rtl .vakata-context-left ul{right:auto;left:100%;margin-left:-4px;margin-right:auto}.vakata-context-rtl li>a>i{margin:0 -2em 0 0}.vakata-context-rtl li>a .vakata-contextmenu-sep{margin:0 0 0 .5em;border-left-color:#fff;background:#e2e3e3}#jstree-marker{position:absolute;top:0;left:0;margin:-5px 0 0 0;padding:0;border-right:0;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid;width:0;height:0;font-size:0;line-height:0}#jstree-dnd{line-height:16px;margin:0;padding:4px}#jstree-dnd .jstree-icon,#jstree-dnd .jstree-copy{display:inline-block;text-decoration:none;margin:0 2px 0 0;padding:0;width:16px;height:16px}#jstree-dnd .jstree-ok{background:green}#jstree-dnd .jstree-er{background:red}#jstree-dnd .jstree-copy{margin:0 2px}.jstree-default-dark .jstree-node,.jstree-default-dark .jstree-icon{background-repeat:no-repeat;background-color:transparent}.jstree-default-dark .jstree-anchor,.jstree-default-dark .jstree-wholerow{transition:background-color .15s,box-shadow .15s}.jstree-default-dark .jstree-hovered{background:#555;border-radius:2px;box-shadow:inset 0 0 1px #555}.jstree-default-dark .jstree-clicked{background:#5fa2db;border-radius:2px;box-shadow:inset 0 0 1px #666}.jstree-default-dark .jstree-no-icons .jstree-anchor>.jstree-themeicon{display:none}.jstree-default-dark .jstree-disabled{background:0 0;color:#666}.jstree-default-dark .jstree-disabled.jstree-hovered{background:0 0;box-shadow:none}.jstree-default-dark .jstree-disabled.jstree-clicked{background:#333}.jstree-default-dark .jstree-disabled>.jstree-icon{opacity:.8;filter:url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default-dark .jstree-search{font-style:italic;color:#fff;font-weight:700}.jstree-default-dark .jstree-no-checkboxes .jstree-checkbox{display:none!important}.jstree-default-dark.jstree-checkbox-no-clicked .jstree-clicked{background:0 0;box-shadow:none}.jstree-default-dark.jstree-checkbox-no-clicked .jstree-clicked.jstree-hovered{background:#555}.jstree-default-dark.jstree-checkbox-no-clicked>.jstree-wholerow-ul .jstree-wholerow-clicked{background:0 0}.jstree-default-dark.jstree-checkbox-no-clicked>.jstree-wholerow-ul .jstree-wholerow-clicked.jstree-wholerow-hovered{background:#555}.jstree-default-dark>.jstree-striped{min-width:100%;display:inline-block;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAMAAAB/qqA+AAAABlBMVEUAAAAAAAClZ7nPAAAAAnRSTlMNAMM9s3UAAAAXSURBVHjajcEBAQAAAIKg/H/aCQZ70AUBjAATb6YPDgAAAABJRU5ErkJggg==) left top repeat}.jstree-default-dark>.jstree-wholerow-ul .jstree-hovered,.jstree-default-dark>.jstree-wholerow-ul .jstree-clicked{background:0 0;box-shadow:none;border-radius:0}.jstree-default-dark .jstree-wholerow{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.jstree-default-dark .jstree-wholerow-hovered{background:#555}.jstree-default-dark .jstree-wholerow-clicked{background:#5fa2db;background:-webkit-linear-gradient(top,#5fa2db 0,#5fa2db 100%);background:linear-gradient(to bottom,#5fa2db 0,#5fa2db 100%)}.jstree-default-dark .jstree-node{min-height:24px;line-height:24px;margin-left:24px;min-width:24px}.jstree-default-dark .jstree-anchor{line-height:24px;height:24px}.jstree-default-dark .jstree-icon{width:24px;height:24px;line-height:24px}.jstree-default-dark .jstree-icon:empty{width:24px;height:24px;line-height:24px}.jstree-default-dark.jstree-rtl .jstree-node{margin-right:24px}.jstree-default-dark .jstree-wholerow{height:24px}.jstree-default-dark .jstree-node,.jstree-default-dark .jstree-icon{background-image:url(32px.png)}.jstree-default-dark .jstree-node{background-position:-292px -4px;background-repeat:repeat-y}.jstree-default-dark .jstree-last{background:0 0}.jstree-default-dark .jstree-open>.jstree-ocl{background-position:-132px -4px}.jstree-default-dark .jstree-closed>.jstree-ocl{background-position:-100px -4px}.jstree-default-dark .jstree-leaf>.jstree-ocl{background-position:-68px -4px}.jstree-default-dark .jstree-themeicon{background-position:-260px -4px}.jstree-default-dark>.jstree-no-dots .jstree-node,.jstree-default-dark>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-dark>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-36px -4px}.jstree-default-dark>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-4px -4px}.jstree-default-dark .jstree-disabled{background:0 0}.jstree-default-dark .jstree-disabled.jstree-hovered{background:0 0}.jstree-default-dark .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default-dark .jstree-checkbox{background-position:-164px -4px}.jstree-default-dark .jstree-checkbox:hover{background-position:-164px -36px}.jstree-default-dark.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-dark .jstree-checked>.jstree-checkbox{background-position:-228px -4px}.jstree-default-dark.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default-dark .jstree-checked>.jstree-checkbox:hover{background-position:-228px -36px}.jstree-default-dark .jstree-anchor>.jstree-undetermined{background-position:-196px -4px}.jstree-default-dark .jstree-anchor>.jstree-undetermined:hover{background-position:-196px -36px}.jstree-default-dark .jstree-checkbox-disabled{opacity:.8;filter:url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default-dark>.jstree-striped{background-size:auto 48px}.jstree-default-dark.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==);background-position:100% 1px;background-repeat:repeat-y}.jstree-default-dark.jstree-rtl .jstree-last{background:0 0}.jstree-default-dark.jstree-rtl .jstree-open>.jstree-ocl{background-position:-132px -36px}.jstree-default-dark.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-100px -36px}.jstree-default-dark.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-68px -36px}.jstree-default-dark.jstree-rtl>.jstree-no-dots .jstree-node,.jstree-default-dark.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-dark.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-36px -36px}.jstree-default-dark.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-4px -36px}.jstree-default-dark .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-dark>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(throbber.gif) center center no-repeat}.jstree-default-dark .jstree-file{background:url(32px.png) -100px -68px no-repeat}.jstree-default-dark .jstree-folder{background:url(32px.png) -260px -4px no-repeat}.jstree-default-dark>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default-dark{line-height:24px;padding:0 4px}#jstree-dnd.jstree-default-dark .jstree-ok,#jstree-dnd.jstree-default-dark .jstree-er{background-image:url(32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default-dark i{background:0 0;width:24px;height:24px;line-height:24px}#jstree-dnd.jstree-default-dark .jstree-ok{background-position:-4px -68px}#jstree-dnd.jstree-default-dark .jstree-er{background-position:-36px -68px}.jstree-default-dark.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==)}.jstree-default-dark.jstree-rtl .jstree-last{background:0 0}.jstree-default-dark-small .jstree-node{min-height:18px;line-height:18px;margin-left:18px;min-width:18px}.jstree-default-dark-small .jstree-anchor{line-height:18px;height:18px}.jstree-default-dark-small .jstree-icon{width:18px;height:18px;line-height:18px}.jstree-default-dark-small .jstree-icon:empty{width:18px;height:18px;line-height:18px}.jstree-default-dark-small.jstree-rtl .jstree-node{margin-right:18px}.jstree-default-dark-small .jstree-wholerow{height:18px}.jstree-default-dark-small .jstree-node,.jstree-default-dark-small .jstree-icon{background-image:url(32px.png)}.jstree-default-dark-small .jstree-node{background-position:-295px -7px;background-repeat:repeat-y}.jstree-default-dark-small .jstree-last{background:0 0}.jstree-default-dark-small .jstree-open>.jstree-ocl{background-position:-135px -7px}.jstree-default-dark-small .jstree-closed>.jstree-ocl{background-position:-103px -7px}.jstree-default-dark-small .jstree-leaf>.jstree-ocl{background-position:-71px -7px}.jstree-default-dark-small .jstree-themeicon{background-position:-263px -7px}.jstree-default-dark-small>.jstree-no-dots .jstree-node,.jstree-default-dark-small>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-dark-small>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-39px -7px}.jstree-default-dark-small>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-7px -7px}.jstree-default-dark-small .jstree-disabled{background:0 0}.jstree-default-dark-small .jstree-disabled.jstree-hovered{background:0 0}.jstree-default-dark-small .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default-dark-small .jstree-checkbox{background-position:-167px -7px}.jstree-default-dark-small .jstree-checkbox:hover{background-position:-167px -39px}.jstree-default-dark-small.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-dark-small .jstree-checked>.jstree-checkbox{background-position:-231px -7px}.jstree-default-dark-small.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default-dark-small .jstree-checked>.jstree-checkbox:hover{background-position:-231px -39px}.jstree-default-dark-small .jstree-anchor>.jstree-undetermined{background-position:-199px -7px}.jstree-default-dark-small .jstree-anchor>.jstree-undetermined:hover{background-position:-199px -39px}.jstree-default-dark-small .jstree-checkbox-disabled{opacity:.8;filter:url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default-dark-small>.jstree-striped{background-size:auto 36px}.jstree-default-dark-small.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==);background-position:100% 1px;background-repeat:repeat-y}.jstree-default-dark-small.jstree-rtl .jstree-last{background:0 0}.jstree-default-dark-small.jstree-rtl .jstree-open>.jstree-ocl{background-position:-135px -39px}.jstree-default-dark-small.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-103px -39px}.jstree-default-dark-small.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-71px -39px}.jstree-default-dark-small.jstree-rtl>.jstree-no-dots .jstree-node,.jstree-default-dark-small.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-dark-small.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-39px -39px}.jstree-default-dark-small.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-7px -39px}.jstree-default-dark-small .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-dark-small>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(throbber.gif) center center no-repeat}.jstree-default-dark-small .jstree-file{background:url(32px.png) -103px -71px no-repeat}.jstree-default-dark-small .jstree-folder{background:url(32px.png) -263px -7px no-repeat}.jstree-default-dark-small>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default-dark-small{line-height:18px;padding:0 4px}#jstree-dnd.jstree-default-dark-small .jstree-ok,#jstree-dnd.jstree-default-dark-small .jstree-er{background-image:url(32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default-dark-small i{background:0 0;width:18px;height:18px;line-height:18px}#jstree-dnd.jstree-default-dark-small .jstree-ok{background-position:-7px -71px}#jstree-dnd.jstree-default-dark-small .jstree-er{background-position:-39px -71px}.jstree-default-dark-small.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAACAQMAAABv1h6PAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMHBgAAiABBI4gz9AAAAABJRU5ErkJggg==)}.jstree-default-dark-small.jstree-rtl .jstree-last{background:0 0}.jstree-default-dark-large .jstree-node{min-height:32px;line-height:32px;margin-left:32px;min-width:32px}.jstree-default-dark-large .jstree-anchor{line-height:32px;height:32px}.jstree-default-dark-large .jstree-icon{width:32px;height:32px;line-height:32px}.jstree-default-dark-large .jstree-icon:empty{width:32px;height:32px;line-height:32px}.jstree-default-dark-large.jstree-rtl .jstree-node{margin-right:32px}.jstree-default-dark-large .jstree-wholerow{height:32px}.jstree-default-dark-large .jstree-node,.jstree-default-dark-large .jstree-icon{background-image:url(32px.png)}.jstree-default-dark-large .jstree-node{background-position:-288px 0;background-repeat:repeat-y}.jstree-default-dark-large .jstree-last{background:0 0}.jstree-default-dark-large .jstree-open>.jstree-ocl{background-position:-128px 0}.jstree-default-dark-large .jstree-closed>.jstree-ocl{background-position:-96px 0}.jstree-default-dark-large .jstree-leaf>.jstree-ocl{background-position:-64px 0}.jstree-default-dark-large .jstree-themeicon{background-position:-256px 0}.jstree-default-dark-large>.jstree-no-dots .jstree-node,.jstree-default-dark-large>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-dark-large>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-32px 0}.jstree-default-dark-large>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:0 0}.jstree-default-dark-large .jstree-disabled{background:0 0}.jstree-default-dark-large .jstree-disabled.jstree-hovered{background:0 0}.jstree-default-dark-large .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default-dark-large .jstree-checkbox{background-position:-160px 0}.jstree-default-dark-large .jstree-checkbox:hover{background-position:-160px -32px}.jstree-default-dark-large.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-dark-large .jstree-checked>.jstree-checkbox{background-position:-224px 0}.jstree-default-dark-large.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default-dark-large .jstree-checked>.jstree-checkbox:hover{background-position:-224px -32px}.jstree-default-dark-large .jstree-anchor>.jstree-undetermined{background-position:-192px 0}.jstree-default-dark-large .jstree-anchor>.jstree-undetermined:hover{background-position:-192px -32px}.jstree-default-dark-large .jstree-checkbox-disabled{opacity:.8;filter:url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default-dark-large>.jstree-striped{background-size:auto 64px}.jstree-default-dark-large.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==);background-position:100% 1px;background-repeat:repeat-y}.jstree-default-dark-large.jstree-rtl .jstree-last{background:0 0}.jstree-default-dark-large.jstree-rtl .jstree-open>.jstree-ocl{background-position:-128px -32px}.jstree-default-dark-large.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-96px -32px}.jstree-default-dark-large.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-64px -32px}.jstree-default-dark-large.jstree-rtl>.jstree-no-dots .jstree-node,.jstree-default-dark-large.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-dark-large.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-32px -32px}.jstree-default-dark-large.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:0 -32px}.jstree-default-dark-large .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-dark-large>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(throbber.gif) center center no-repeat}.jstree-default-dark-large .jstree-file{background:url(32px.png) -96px -64px no-repeat}.jstree-default-dark-large .jstree-folder{background:url(32px.png) -256px 0 no-repeat}.jstree-default-dark-large>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default-dark-large{line-height:32px;padding:0 4px}#jstree-dnd.jstree-default-dark-large .jstree-ok,#jstree-dnd.jstree-default-dark-large .jstree-er{background-image:url(32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default-dark-large i{background:0 0;width:32px;height:32px;line-height:32px}#jstree-dnd.jstree-default-dark-large .jstree-ok{background-position:0 -64px}#jstree-dnd.jstree-default-dark-large .jstree-er{background-position:-32px -64px}.jstree-default-dark-large.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAACAQMAAAAD0EyKAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjgIIGBgABCgCBvVLXcAAAAABJRU5ErkJggg==)}.jstree-default-dark-large.jstree-rtl .jstree-last{background:0 0}@media (max-width:768px){#jstree-dnd.jstree-dnd-responsive{line-height:40px;font-weight:700;font-size:1.1em;text-shadow:1px 1px #fff}#jstree-dnd.jstree-dnd-responsive>i{background:0 0;width:40px;height:40px}#jstree-dnd.jstree-dnd-responsive>.jstree-ok{background-image:url(40px.png);background-position:0 -200px;background-size:120px 240px}#jstree-dnd.jstree-dnd-responsive>.jstree-er{background-image:url(40px.png);background-position:-40px -200px;background-size:120px 240px}#jstree-marker.jstree-dnd-responsive{border-left-width:10px;border-top-width:10px;border-bottom-width:10px;margin-top:-10px}}@media (max-width:768px){.jstree-default-dark-responsive .jstree-icon{background-image:url(40px.png)}.jstree-default-dark-responsive .jstree-node,.jstree-default-dark-responsive .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-dark-responsive .jstree-node{min-height:40px;line-height:40px;margin-left:40px;min-width:40px;white-space:nowrap}.jstree-default-dark-responsive .jstree-anchor{line-height:40px;height:40px}.jstree-default-dark-responsive .jstree-icon,.jstree-default-dark-responsive .jstree-icon:empty{width:40px;height:40px;line-height:40px}.jstree-default-dark-responsive>.jstree-container-ul>.jstree-node{margin-left:0}.jstree-default-dark-responsive.jstree-rtl .jstree-node{margin-left:0;margin-right:40px}.jstree-default-dark-responsive.jstree-rtl .jstree-container-ul>.jstree-node{margin-right:0}.jstree-default-dark-responsive .jstree-ocl,.jstree-default-dark-responsive .jstree-themeicon,.jstree-default-dark-responsive .jstree-checkbox{background-size:120px 240px}.jstree-default-dark-responsive .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-dark-responsive .jstree-open>.jstree-ocl{background-position:0 0!important}.jstree-default-dark-responsive .jstree-closed>.jstree-ocl{background-position:0 -40px!important}.jstree-default-dark-responsive.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-40px 0!important}.jstree-default-dark-responsive .jstree-themeicon{background-position:-40px -40px}.jstree-default-dark-responsive .jstree-checkbox,.jstree-default-dark-responsive .jstree-checkbox:hover{background-position:-40px -80px}.jstree-default-dark-responsive.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-dark-responsive.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default-dark-responsive .jstree-checked>.jstree-checkbox,.jstree-default-dark-responsive .jstree-checked>.jstree-checkbox:hover{background-position:0 -80px}.jstree-default-dark-responsive .jstree-anchor>.jstree-undetermined,.jstree-default-dark-responsive .jstree-anchor>.jstree-undetermined:hover{background-position:0 -120px}.jstree-default-dark-responsive .jstree-anchor{font-weight:700;font-size:1.1em;text-shadow:1px 1px #fff}.jstree-default-dark-responsive>.jstree-striped{background:0 0}.jstree-default-dark-responsive .jstree-wholerow{border-top:1px solid #666;border-bottom:1px solid #000;background:#333;height:40px}.jstree-default-dark-responsive .jstree-wholerow-hovered{background:#555}.jstree-default-dark-responsive .jstree-wholerow-clicked{background:#5fa2db}.jstree-default-dark-responsive .jstree-children .jstree-last>.jstree-wholerow{box-shadow:inset 0 -6px 3px -5px #111}.jstree-default-dark-responsive .jstree-children .jstree-open>.jstree-wholerow{box-shadow:inset 0 6px 3px -5px #111;border-top:0}.jstree-default-dark-responsive .jstree-children .jstree-open+.jstree-open{box-shadow:none}.jstree-default-dark-responsive .jstree-node,.jstree-default-dark-responsive .jstree-icon,.jstree-default-dark-responsive .jstree-node>.jstree-ocl,.jstree-default-dark-responsive .jstree-themeicon,.jstree-default-dark-responsive .jstree-checkbox{background-image:url(40px.png);background-size:120px 240px}.jstree-default-dark-responsive .jstree-node{background-position:-80px 0;background-repeat:repeat-y}.jstree-default-dark-responsive .jstree-last{background:0 0}.jstree-default-dark-responsive .jstree-leaf>.jstree-ocl{background-position:-40px -120px}.jstree-default-dark-responsive .jstree-last>.jstree-ocl{background-position:-40px -160px}.jstree-default-dark-responsive .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-dark-responsive .jstree-file{background:url(40px.png) 0 -160px no-repeat;background-size:120px 240px}.jstree-default-dark-responsive .jstree-folder{background:url(40px.png) -40px -40px no-repeat;background-size:120px 240px}.jstree-default-dark-responsive>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}}.jstree-default-dark{background:#333}.jstree-default-dark .jstree-anchor{color:#999;text-shadow:1px 1px 0 rgba(0,0,0,.5)}.jstree-default-dark .jstree-clicked,.jstree-default-dark .jstree-checked{color:#fff}.jstree-default-dark .jstree-hovered{color:#fff}#jstree-marker.jstree-default-dark{border-left-color:#999;background:0 0}.jstree-default-dark .jstree-anchor>.jstree-icon{opacity:.75}.jstree-default-dark .jstree-clicked>.jstree-icon,.jstree-default-dark .jstree-hovered>.jstree-icon,.jstree-default-dark .jstree-checked>.jstree-icon{opacity:1}.jstree-default-dark.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAACZmZl+9SADAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==)}.jstree-default-dark.jstree-rtl .jstree-last{background:0 0}.jstree-default-dark-small.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAACAQMAAABv1h6PAAAABlBMVEUAAACZmZl+9SADAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMHBgAAiABBI4gz9AAAAABJRU5ErkJggg==)}.jstree-default-dark-small.jstree-rtl .jstree-last{background:0 0}.jstree-default-dark-large.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAACAQMAAAAD0EyKAAAABlBMVEUAAACZmZl+9SADAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjgIIGBgABCgCBvVLXcAAAAABJRU5ErkJggg==)}.jstree-default-dark-large.jstree-rtl .jstree-last{background:0 0}
\ No newline at end of file
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/throbber.gif b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default-dark/throbber.gif
deleted file mode 100755
index cd75035ce8086b233c62c3775de4696007ba7950..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1720
zcmZ|OYfMvT7zgm4p2O+ea@rnBg#%t_w^9y@rd%z;T+7W;EEIuRP@n~of>p{*LD94n
zD#dD%>4eQ7(f}2w1Jp&gxD-%9@q$L8PU8@DI@}hSaq0)%%HqfF!~5+?{=fX6_gR&k
zB#zeL6rA#kLJ1EKkB*MkYPAxH#A31N_4>ZPK7+x~*4Cy{sgz1(XJ@Bct?upZwb^Vn
zH8uQyJW~@hGvcMn#IR)|7@|-p{15)|6-An=q7A%lB~@CUrc_g-E7NRPR<dPd8HN82
zp)*`lA+G0&#3>Y{9GBtGW2#F<6Tlp*{3e2sO*9QTn07T-ayS_ZHC-#O>$xhqqdcpZ
ztmi!vPe)MeZRuUe$#kkQ=ZCx#&BIF_bl`&&kBftO#70Qh(%BzvH^%Q*V^7k&A({sT
z%Y^lTu*avnIgG+U1|!SMokH(YXlu`0j~)X}p;*dbvgwiG8ou~G0H`U%D%A}cX`Z7O
z)ni(eb`a})TPHM1hAVH$IJP)wYgYnn9eF%-V%K@toW*&nV8eM+!Cp9L>Vhol^Gh@~
z%&1Z5Vm+|c!un0R(q?jRP)d+nM1>1Mdb<!00m4C22b1F~4bvL(K24Ow5uy;LR~``5
zOQu8^f<FFpK#ZYe4kw9DF7mew^V&!=_Pit^m3#em=(!cL4S{wAZ`L^mhtchw{eR!7
z@ef;-7EoITVWKo{ZN-+Dg7Toy0{4u$F33U`Lk?)O3$F;7`+QMbdTM|(MD8Hik;>t4
zq+z&G4Mf-;dC=>aU>rU4#Qsu;p3RpG$pl+_MhkB8a)~L$l9^5fWiX2+H!!5_T5s^9
z4>JK<{X^Fo%S_uDF%5Ow6`@;%!WN<1E;i0BB-n*W1?E{l7sBj|dY;=Uk(#XoO1L_N
z@qGP~b}*65jDQozoGo?S4(63|3?uFyzC7?Gm+`Y=Q}V!~<?@+(&6BbN{6Aic9m8Wq
z51v(;f10WNVvBcuty$P$@^%|t<BE2yIdk1_4TzhaHzM?C3<A706_YQq7yTg9kGxC?
zJ5*n|o40{WwF*UIV!?MeoTunG5%8O{m?~n?>eW9^>IiUQTB_L<1=H*gdQy5&m_IYV
z%Li4Uo_>Bi7os#uY}WcRfHHEkH&b8~%gsue?-o<(!aOHjm`s4Z3LOy|RiA_<T+TA#
z4tT%HCu)iBtEz@0jc=lvi}sjacsq4e8&cVKPq4^l(v?yLfVIkaD<l=AmCRNiV{uW_
zMA*_;9CZxszpVB_sc2zY+6n_)vn*{j6ZK^-&kds0aos!qJJUIbUMa@~Bf_1;+s^{m
zGWp_I#=+|8>cGTpV7aX)L(k3WdLrb3z#~FKmqZa8IsfA0m#1pKiYPj1TEN53e>tkg
z0RTNlJq#uQVrLpQqdM5r6JnuD=hIQXX(5PA4}{kHxmV1!p*>qQvt#tEygNOAs@+Oz
zdfw4ZMdhbk+u}+OPG5|*-o?V{NXcn0HBbAn)h^Y1-B04pOzSBDfelR>`teLE(^ROI
zh&b$euUUs^kZN*1k{J%gadZHxgJ?{nH{AjOmJrF77iSdv|L<1j9OLgC{;#V|RJlr&
zcSW6j{0-Aeuhh1H@4Gt=_&ggRSH>Bn1;_M62O`)zlyTGNWU^sE&gnQmJ~HG$aPw$;
zKX(DOIsRy?o{m{z>42;$0!CTTcF2R3?au%K2(p-Mna`zCH@bI}ee7d=$K>rPkFF?8
zv$nvf0d|7yp7!sKocJY+u<ZT)F9{LAbEZmTB7FA5RkY(44su(dd`hxUK1h5i%cQd6
z`4X|n&z5aWKME1f;le4<y4n+QF|h26Y=});nZql_s{Gua%g3FRp1JhC4JBQlsv`<>
zY6SVs9!-4A?3JGvc^gfN8$7Nen2o=3aWO!QO@le}aMdx8^`2yXn=H9`9ATLE&9>s?
q)n(GDbX6ch9<^Oe2Q%ytegccF@POz|8L)A;FQ!??rHkeqG5-P<(jCG8

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/32px.png b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/32px.png
deleted file mode 100755
index 15327152481789306eadef88393cd1c748dc31a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3121
zcmd7U`8U-69tZG`S&Ttp2wAdCqGXM%-z>#gDk)iGP*Pd5FU3%4q{tQ_Lo{TYq8P+T
z5f#GN%GeTPjAdk><<7nLm-{E&_xqgZdpqwR-se2d>%6h{=dAYeOYs8$u+JKG+5rG~
zOu2J3ADEkN*=|w*00!*sE}h{nU5gzdXvqoyFfcHHKp@<m``4`C007|!%~ajGd-rZx
z*{ia$GNPoUTZtpD_rccyP>!$I+1Y6afnM?O0B%x~Mb|(c2l@8#hDXMUCqv2rKqy4I
z6@l2QsK7&^+`G<=>TiUFIV{dwI6NXUP9q(8;688n@#F0Z3P+RG9BWO&y3Wd_@m4~i
zfQ#s{=Yr)R(0o!-H6PzfW~NXatPBR*Sl{p>ntc@%+{n!IZL)@WiKq143Tt=C{~6=)
z#wLv%lr|8&bp85}we>p*iFp^7MIWDf2;?yUERGkpN=p-*^qJcXSy}1Q($eY58ypU2
zX^F0^tjuPzD1|<|%hQfdZrn#9^MUR8Vb&(u-6wc+W0SQ_Ut_FIPEJu57WNp_sV|SW
z=$*NFxy7lDy0rjEkH9@092{C5XjuQ%{CA?0I`X2sF1DfgdM_zs;v3#Fz#<_LySlof
zSHrtCH&jL}+g+Yoq|u)Lx!yb5F+DRA77=^=C7@ji>@gOud^)P}3b-?ZYFJC{+pKl1
zF=y`W4FJFb0MM4`1M{5*1m5}i`OVq>SpcB(@Kk&)F>QeAK9f!yJzKZ(@O+y%d5Fx~
zqSe;U+I$e&S{!@3@bojOP%#G*HDo?FH^=zPn4nOG$iqE6JRgU;aFm3n!@+*vv^=UU
zkGufTU1~}x2=XAAlbbsRg>FvutN{Sq*O#@uwD;)IQLJp>N88449|~pzhqs%SR+eJB
zTzA%g*Z#_T@--l`)itEqDL%fD@cG^F@EE7QegXhkk&)ZV%4@?-t0pEiVc`p(#IAih
znLOb2aL^k|Mwd^fRINq@_3C%`H4?s8Z_z35#l*ac7MogHly4QB%F3jiWL#6}g_nlk
z$gPk1{7XiYAG8LZDv_zobIhLgC?Lm{P=nfjyfb=o;=@|D)?-y-OU|=5MQT|h4y}hc
z6bh%in-do|(OW_2c>i^*qoKfMAv`=hH=>}xKI&<FX-nnnrC0*-NqNmf|E*zfu6TNw
z!?}w9OI^m*OqmBR&Prf&+}OH`Y&P57YR5o=MXfqxw^_{E3*@kvV`EkK&=d60`h(QU
ziGtm+q}_$}U9uvTOsie!XY@Pm?F=ApW<pt9WZcI7@9_VYJMVl`F985--TJiIrKoXw
zLA3LruS}N!bUa30CA61#R(WxMt?Y8^%B+yvN58KZUewsT*tn4{D3+_}Tbf}X^1qP3
z*iSqgk}^^N^T=NgYx-#rX*6+XawWgs?$BLp7xN>XTi_GMefcdn{)x+M3EIZkkl&>W
z+}@+UYHm9PvX;jn)BoFXpCC6I`x5++Z98xoB9S;IbW{@)ac9Nj&6^J~RG(PdMnt)+
z=%ZngTU%Z*R@n~9y88kev~gJoMlZf`S*U(cJZ;|KUYAdCdqi#8E1%>Ig6T`G$LG-z
zPZ)@DjZ#(q?mA~R4*?ZF#`|ua>%9f32~Y>gafc7yUo$+-FsiDZaChLamHi|(9B~zC
zH;IMt|E<La<hH-nA(%_qIeRYFJs;>2@%*PX;K9MstygLL>rm*8p2NpHJfnFCkKB=g
zAiRc>g*Ry94~dQVU5c{gyxF&urRuLBp=ghu-n1?n$;!zY9`e_KY_7A1libqmFKr~}
zd&bU@9gA_K)U018s?Iy3ao|$WHO+S9F^u+ZS^&Yd`l8e!Oa2=|D#2YX=Z`4p_5Hjs
z+F%hn^x1YYw_y#n(Rswy#)Ca|=YX0f7_Vtz3Hp#_LR!nadf48Q<2<E(Rrr4T1B9RY
zuN_HWYUX4W2(o{>G2%zTvmS~^R$iV#1Dt8#s}wR82k3O#nwV<jAGsUHBRa|kFM2i>
zuE+&ifu5~c^5O|<a~SAwj`0--2P6FL17ZA}e<UjMFB$}l*Avg4P}A(_hKDJ3!VY8L
zGVQiFKTgc>V(^m31F^Sa1*Er3W=~HKlgZRxRenpOQ3vto3k}09L>o;Q^S!ryec}Tf
zV&e!k80}<5?cI^O{mDM;n_}k21o%sLk%teP+;7e3Q9;SG$U2ST9m>J6)klwjv7y)T
zjT2NV)j`znGSmr|$~M4^Dl|PKfh;oO?vX&Uo+cMP+or9eVhh!~u%C#bpP&)#`t~`d
z+3uLiXSFX@2p_?7SOtYU{Z^<i>cO~x5Pi0ONSr963q)^Pm5Gc942(Hv6Vvn;5<$!3
zyEbi>sbw$x^}Oz?sYt=1i_3eji=vO-fbg2)5BcO*1v_g_`s~g~V3MJ}av6t|{ggUG
zRrD|%i5AP5=@TXaioz%m9EpK&t?!6HD+-b6rU;Zg90^CJLl7vC5pG%@4zc!!^#^K7
z#suSnAmcw#VwCew4K#E$`bt|M%1!<Onh8Ksz@7H>hcnR6H}t?m%e6wrF;(O8Ox~r6
z=>3_hju^O_rlNmi;!r*>T<s4H9D+e>sq}w|OrU||lQz?PytEZCeyXg(6c$6TSOB3y
zX$uA&^wG|ACmFa4!PQnrV1Z+o0XTE!Wu~CEio0B{RN9(Dw7}UlbCIRfpzkHHTzMmF
z#NG%}yIXKphmSvQ&`HkOwN4hX-OZ&;OYJnA-X#rfTWPL&gN&Y@`oYM)mp~4fO&n_b
z^ULL%D^in)Bl#WUg={)6RSGdfDd$Y(J>{I8x<+8^stgrPG>D$%#01VVv{i`lYW;K1
z?;ntQ3<5o4Y+&A9>wE(GNrthn+Cx<_(N!n=c_Q@9*D^?(bbAi|y?})L&E6}tm>*PE
zBLQg$<YtT-W#{|g!|@(F6mBsyo(4{Pb?}@UXzntf&9dC#{_Hs&XFz%NyW@^b9>KK3
z%k$3EFAGbze#Gb<TgX$>>z6O*3{r1v*=a?IQfD=SlAz=485&qfD>dEpMTtD+elvh&
zy=)E^hw1r&leGds7HEu1{Om5tu*JkU{SPd$;*5Z3zin_Q=1PVc7JNgQHW3*=CDUYz
zd5?7uk*^WDR}=E!1b+QDb~fBk?GtIlH2Xjj^SHn6m@2gQ^niGkXM$;_R<QC%N!F+&
zO5SiIPh-DVe5&o$qt|Z+9KRW$o9Aeww3dbE!6FWchi!U&RF6aCJJ5ee%NHA&|A!S9
z6(3hyhAD_!S^q699r8lgn50pU#0*H@c0_ud_6RQ~@w?vpvf1=P#w(>kCVYMl*XBu)
zek5q=@t1yvU{<ZJXnw?7Gj*@J@;<#{74m@c{u&$|jM~Alj{7Jn1^ud<HyXw1C6;_t
zs-NK&9Hmygc2Z<J{bcA)Gq|RxxvAy#45=w6Cr9@d<!9)@sFVj6ML!EN;H9$l4S0m8
zKKggNTNjQwkw}}j3@a}hEQe(~T{3QtpKM)m8+Ly!F1%fyYvzG_7NIXQ&EK**y-UpR
zy!YhOMra3S*W&SR4<lu)uayuu(P~SUQoxMj`oq&DB<IUi4eg@gGQrTABIytlZXAHt
zl(e>`=tMQRPN_eFDkh1PfI|2_*tCdlwSDwFb@Hf~$83T0=55}Ulq{81g|>EmsIu@u
z<D%N4W~2?t(=J*^Pk*m)Pth^soYy(DyG+c5Kh6ZsPUGEWL@{$;fWKN$AjR#1)?Q)k
z%F{5>wN8`Y8zp@@&Qpy5FO60!@}+2Tyun-QtF%>`dhKgNf@hDWrRZ=U2d}<nQ~3Dr
zDJ|nm3#;U$$rLP6+c3u7$8nu}(;7^rsj)d|d_Uy%32@21pF>H>`^{&DlDv64I&u>(
z8uW=uGK=c7Psu$Hv@8;>zTt+7$`u~2m9z0|)7cfv+3PCBtFeuy&wye3rS%AWA~lN4
q$a=%VWn+k|UtiDv&>%>!2^rk(<mU}sN#*`~0P8d7PS=>D6aNK_^-%!;

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/40px.png b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/40px.png
deleted file mode 100755
index 1959347aea041d75a58d0584ea7ec51714797983..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1880
zcmZ`)do<fw9*<}e@1Q2_D)Bn4dY2-m9$9UbNQ(-Cs6<n0F-g-_Oim3EEY)_HF~y9G
z)y~u--ik^|h*GAbm`0I$#INeHCDEW2(qOY^dv<o(v-h9R_k8a?-}||r`~BRT8x-KH
ztzoDE0)ezKekX&KC<TF305w%*RBNr9uLN|^=@1_!9{pqp1cKe&-A~dV5)z5zKaq!r
zM+znSqO!!^q~HJ?NM{Fn4!mumqEL%4HZ#zOf(9+)csn2vv=wvGJA^(VnO-iKI;5L@
zo@7~cB}so{r@<xXw__KUvw#yxBM!T#@N9a5Gq@!COngBBt`WTdNHjlPMHQ;G{|LbD
z9?;k1&T&tIcO`|n&HEbsf10NI%!>PK^x}L8xo#<I*1cfr5N*+#3%-n?=ZD5ER&yn@
zwNfN|XejhrPUg(=W!co>OE#OkB~$LGr;}=FbpxeWUvbGmLn1DXa;HsQK~D7_{^sq2
z^fni3chvJ5$YKUAlPB<%YYsGqZ3*PyX7OjPSmNI*c<p)p5sq_(G&>$WG!up*Jd*}3
zyaNUJH)Q(CkAGRYx9(QF6|av~uGv)1Y;;XvzcpOJ6RwjX&Aq_Aw}!?@ks55jzGfWq
zHi2b^qzQ-8bl-&6a#)X#NWKfdin__%Ol?}CAS&@2z3m-#8{JmeH=J<Bz4_RtZNZYA
z&bMp24(x-3iC}JT3!R;_T7Z334!3bX^+BrtYW8u!VcTMDrRIddSYxi=`1u&}0u9#a
z+H_cEkcfL&tV3vWv*DG*_^n5umB)34LNi>{JF%S+MQ5YWYP20_w8qRF6(+-b#Trf>
zo_2Ahj>H8mS@~xq^k9LXSkqS5UA65dkI8zx!mlGSfKyE;s4Src2P4*>GKW637{uPZ
zn41TS!b0I%aCMOGtR7_5i0R^u?Z1kp6{@2~AH^7slz&0Qj|5)78I0s6dlVU{)cQrP
zeNGP#HlU^~-R%ecwQ5d4f89gT`1oM|(<dLMHs@Rg472*KGDNM&w5q4*gg@0=azER~
zY|)bY)zS+x(Mpf=G?Fl!=N^yYmx~0~lBeBIgY0ERqs{A-_(8y3RB$bM#v}k@Z?3k2
zGE}sLnIqCeMFrz5vUHkQN~6AZSgAm@?F=54O4_PVP-!W11`7GzpGT8mY1<(qSSd7Z
zJABmU3N-ED*gNoaMq&z&VDfs2&^c24#dcL+T=R3?=T}~=x)~Y_PqcoiG5b)AHGz08
z7<)MHu`A6h+F*<yg~MwyTPXcKDQ_fdDj@z!_u3uS`>Ofc=m=oyYg2-k3n{hQ$7?G#
z&FPF6FFv(B1kEI;9zR$1bF}BYcUcz6lkHP>F~*Z@^?L7<Tb32ZW6uQJbJ1wXAD;TZ
zGP>Dwi265tsN>ESDZo%}%mSZ>gVZrQEHe#NWr4C*NSf*0NrTPY+o|6J6YC;=zHNu2
z8bz_U4ETk(5(4ZKzU=r-bX5C~YoQu69_!<yls;DOxd_V9oc+7@NS}Id4l5xS^&^7P
z?kvipb8qL+F?OqhqF_#MOVU{DPY7`(=-=M|h^M$N<4>Kg_;tIz@|bcZeUDp?>LM|N
ziJp5yVxnWe6Y7OqZ0sqz9>rV_e8%6p;7r{y(w<VdZ;a@46%#Yxw$v&Pysw19(cI$v
zE=N3AY@}G1HO$M<m9WIF%M1YijE@FGwcMPQ4#f|r<616#LPkqyx`}g^#!Py&+x&^u
zN4z~V#{2Epv;xvEFvIxC{F-lA%EHQLO$sO~Y9n3YLt7@R_{%Tm&wmdv*5NahafvB;
zb-4%8y&HS3vo5qa%E(o%{<M=PXKAu$gI^fm3JW9auvEwGpU-q9qzDZ;PBb}CUE0&f
zFMKi!3zHZ>fYhJK>k?%R9^#}q@<oO3ziQq?iBJS_Lvzijlcan>xkWO6(y$(5^<ZpO
z$bMOpMM{hs;3*T9NDsPD;o)NE_e9WO1`KLq#xl-1&<?1GLXMAR+*>YBRpql1{)zuK
zbrtwwtit>e;@%w>h7p&2<37Z3Q~Of2IoVshosA0BYcm}a31kTD@b5Y^cq1>Lz~v#*
z=I3$&3b7mLgtwj%M~`+Qvt=#z{qJiwXm0kiXWM^#JaGk!bF6zb=stF+fn62*;^IMV
z;8jniInrmfUG6KNlUC^lV!pmFFQ+Bb!%x?kA|oelOOeQZy&ZYzuw;)RIQ$l#&^K8*
z0OFJoe{kr3Me>S$Wc!cxtzZ7K-m>EtO!YQ<*Jwhovtf3=v?o4fP-T|cmxOL~h!|$H
iV&_@$q2+YC87j9T{b5}<wiwF)4TSLtI9Y!@I^$o<n_Kw+

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/style.css b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/style.css
deleted file mode 100755
index 85bd0d8d316..00000000000
--- a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/style.css
+++ /dev/null
@@ -1,1061 +0,0 @@
-/* jsTree default theme */
-.jstree-node,
-.jstree-children,
-.jstree-container-ul {
-  display: block;
-  margin: 0;
-  padding: 0;
-  list-style-type: none;
-  list-style-image: none;
-}
-.jstree-node {
-  white-space: nowrap;
-}
-.jstree-anchor {
-  display: inline-block;
-  color: black;
-  white-space: nowrap;
-  padding: 0 4px 0 1px;
-  margin: 0;
-  vertical-align: top;
-}
-.jstree-anchor:focus {
-  outline: 0;
-}
-.jstree-anchor,
-.jstree-anchor:link,
-.jstree-anchor:visited,
-.jstree-anchor:hover,
-.jstree-anchor:active {
-  text-decoration: none;
-  color: inherit;
-}
-.jstree-icon {
-  display: inline-block;
-  text-decoration: none;
-  margin: 0;
-  padding: 0;
-  vertical-align: top;
-  text-align: center;
-}
-.jstree-icon:empty {
-  display: inline-block;
-  text-decoration: none;
-  margin: 0;
-  padding: 0;
-  vertical-align: top;
-  text-align: center;
-}
-.jstree-ocl {
-  cursor: pointer;
-}
-.jstree-leaf > .jstree-ocl {
-  cursor: default;
-}
-.jstree .jstree-open > .jstree-children {
-  display: block;
-}
-.jstree .jstree-closed > .jstree-children,
-.jstree .jstree-leaf > .jstree-children {
-  display: none;
-}
-.jstree-anchor > .jstree-themeicon {
-  margin-right: 2px;
-}
-.jstree-no-icons .jstree-themeicon,
-.jstree-anchor > .jstree-themeicon-hidden {
-  display: none;
-}
-.jstree-hidden {
-  display: none;
-}
-.jstree-rtl .jstree-anchor {
-  padding: 0 1px 0 4px;
-}
-.jstree-rtl .jstree-anchor > .jstree-themeicon {
-  margin-left: 2px;
-  margin-right: 0;
-}
-.jstree-rtl .jstree-node {
-  margin-left: 0;
-}
-.jstree-rtl .jstree-container-ul > .jstree-node {
-  margin-right: 0;
-}
-.jstree-wholerow-ul {
-  position: relative;
-  display: inline-block;
-  min-width: 100%;
-}
-.jstree-wholerow-ul .jstree-leaf > .jstree-ocl {
-  cursor: pointer;
-}
-.jstree-wholerow-ul .jstree-anchor,
-.jstree-wholerow-ul .jstree-icon {
-  position: relative;
-}
-.jstree-wholerow-ul .jstree-wholerow {
-  width: 100%;
-  cursor: pointer;
-  position: absolute;
-  left: 0;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-.vakata-context {
-  display: none;
-}
-.vakata-context,
-.vakata-context ul {
-  margin: 0;
-  padding: 2px;
-  position: absolute;
-  background: #f5f5f5;
-  border: 1px solid #979797;
-  box-shadow: 2px 2px 2px #999999;
-}
-.vakata-context ul {
-  list-style: none;
-  left: 100%;
-  margin-top: -2.7em;
-  margin-left: -4px;
-}
-.vakata-context .vakata-context-right ul {
-  left: auto;
-  right: 100%;
-  margin-left: auto;
-  margin-right: -4px;
-}
-.vakata-context li {
-  list-style: none;
-  display: inline;
-}
-.vakata-context li > a {
-  display: block;
-  padding: 0 2em 0 2em;
-  text-decoration: none;
-  width: auto;
-  color: black;
-  white-space: nowrap;
-  line-height: 2.4em;
-  text-shadow: 1px 1px 0 white;
-  border-radius: 1px;
-}
-.vakata-context li > a:hover {
-  position: relative;
-  background-color: #e8eff7;
-  box-shadow: 0 0 2px #0a6aa1;
-}
-.vakata-context li > a.vakata-context-parent {
-  background-image: url("data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAIORI4JlrqN1oMSnmmZDQUAOw==");
-  background-position: right center;
-  background-repeat: no-repeat;
-}
-.vakata-context li > a:focus {
-  outline: 0;
-}
-.vakata-context .vakata-context-hover > a {
-  position: relative;
-  background-color: #e8eff7;
-  box-shadow: 0 0 2px #0a6aa1;
-}
-.vakata-context .vakata-context-separator > a,
-.vakata-context .vakata-context-separator > a:hover {
-  background: white;
-  border: 0;
-  border-top: 1px solid #e2e3e3;
-  height: 1px;
-  min-height: 1px;
-  max-height: 1px;
-  padding: 0;
-  margin: 0 0 0 2.4em;
-  border-left: 1px solid #e0e0e0;
-  text-shadow: 0 0 0 transparent;
-  box-shadow: 0 0 0 transparent;
-  border-radius: 0;
-}
-.vakata-context .vakata-contextmenu-disabled a,
-.vakata-context .vakata-contextmenu-disabled a:hover {
-  color: silver;
-  background-color: transparent;
-  border: 0;
-  box-shadow: 0 0 0;
-}
-.vakata-context li > a > i {
-  text-decoration: none;
-  display: inline-block;
-  width: 2.4em;
-  height: 2.4em;
-  background: transparent;
-  margin: 0 0 0 -2em;
-  vertical-align: top;
-  text-align: center;
-  line-height: 2.4em;
-}
-.vakata-context li > a > i:empty {
-  width: 2.4em;
-  line-height: 2.4em;
-}
-.vakata-context li > a .vakata-contextmenu-sep {
-  display: inline-block;
-  width: 1px;
-  height: 2.4em;
-  background: white;
-  margin: 0 0.5em 0 0;
-  border-left: 1px solid #e2e3e3;
-}
-.vakata-context .vakata-contextmenu-shortcut {
-  font-size: 0.8em;
-  color: silver;
-  opacity: 0.5;
-  display: none;
-}
-.vakata-context-rtl ul {
-  left: auto;
-  right: 100%;
-  margin-left: auto;
-  margin-right: -4px;
-}
-.vakata-context-rtl li > a.vakata-context-parent {
-  background-image: url("data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAINjI+AC7rWHIsPtmoxLAA7");
-  background-position: left center;
-  background-repeat: no-repeat;
-}
-.vakata-context-rtl .vakata-context-separator > a {
-  margin: 0 2.4em 0 0;
-  border-left: 0;
-  border-right: 1px solid #e2e3e3;
-}
-.vakata-context-rtl .vakata-context-left ul {
-  right: auto;
-  left: 100%;
-  margin-left: -4px;
-  margin-right: auto;
-}
-.vakata-context-rtl li > a > i {
-  margin: 0 -2em 0 0;
-}
-.vakata-context-rtl li > a .vakata-contextmenu-sep {
-  margin: 0 0 0 0.5em;
-  border-left-color: white;
-  background: #e2e3e3;
-}
-#jstree-marker {
-  position: absolute;
-  top: 0;
-  left: 0;
-  margin: -5px 0 0 0;
-  padding: 0;
-  border-right: 0;
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent;
-  border-left: 5px solid;
-  width: 0;
-  height: 0;
-  font-size: 0;
-  line-height: 0;
-}
-#jstree-dnd {
-  line-height: 16px;
-  margin: 0;
-  padding: 4px;
-}
-#jstree-dnd .jstree-icon,
-#jstree-dnd .jstree-copy {
-  display: inline-block;
-  text-decoration: none;
-  margin: 0 2px 0 0;
-  padding: 0;
-  width: 16px;
-  height: 16px;
-}
-#jstree-dnd .jstree-ok {
-  background: green;
-}
-#jstree-dnd .jstree-er {
-  background: red;
-}
-#jstree-dnd .jstree-copy {
-  margin: 0 2px 0 2px;
-}
-.jstree-default .jstree-node,
-.jstree-default .jstree-icon {
-  background-repeat: no-repeat;
-  background-color: transparent;
-}
-.jstree-default .jstree-anchor,
-.jstree-default .jstree-wholerow {
-  transition: background-color 0.15s, box-shadow 0.15s;
-}
-.jstree-default .jstree-hovered {
-  background: #e7f4f9;
-  border-radius: 2px;
-  box-shadow: inset 0 0 1px #cccccc;
-}
-.jstree-default .jstree-clicked {
-  background: #beebff;
-  border-radius: 2px;
-  box-shadow: inset 0 0 1px #999999;
-}
-.jstree-default .jstree-no-icons .jstree-anchor > .jstree-themeicon {
-  display: none;
-}
-.jstree-default .jstree-disabled {
-  background: transparent;
-  color: #666666;
-}
-.jstree-default .jstree-disabled.jstree-hovered {
-  background: transparent;
-  box-shadow: none;
-}
-.jstree-default .jstree-disabled.jstree-clicked {
-  background: #efefef;
-}
-.jstree-default .jstree-disabled > .jstree-icon {
-  opacity: 0.8;
-  filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");
-  /* Firefox 10+ */
-  filter: gray;
-  /* IE6-9 */
-  -webkit-filter: grayscale(100%);
-  /* Chrome 19+ & Safari 6+ */
-}
-.jstree-default .jstree-search {
-  font-style: italic;
-  color: #8b0000;
-  font-weight: bold;
-}
-.jstree-default .jstree-no-checkboxes .jstree-checkbox {
-  display: none !important;
-}
-.jstree-default.jstree-checkbox-no-clicked .jstree-clicked {
-  background: transparent;
-  box-shadow: none;
-}
-.jstree-default.jstree-checkbox-no-clicked .jstree-clicked.jstree-hovered {
-  background: #e7f4f9;
-}
-.jstree-default.jstree-checkbox-no-clicked > .jstree-wholerow-ul .jstree-wholerow-clicked {
-  background: transparent;
-}
-.jstree-default.jstree-checkbox-no-clicked > .jstree-wholerow-ul .jstree-wholerow-clicked.jstree-wholerow-hovered {
-  background: #e7f4f9;
-}
-.jstree-default > .jstree-striped {
-  min-width: 100%;
-  display: inline-block;
-  background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAMAAAB/qqA+AAAABlBMVEUAAAAAAAClZ7nPAAAAAnRSTlMNAMM9s3UAAAAXSURBVHjajcEBAQAAAIKg/H/aCQZ70AUBjAATb6YPDgAAAABJRU5ErkJggg==") left top repeat;
-}
-.jstree-default > .jstree-wholerow-ul .jstree-hovered,
-.jstree-default > .jstree-wholerow-ul .jstree-clicked {
-  background: transparent;
-  box-shadow: none;
-  border-radius: 0;
-}
-.jstree-default .jstree-wholerow {
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-}
-.jstree-default .jstree-wholerow-hovered {
-  background: #e7f4f9;
-}
-.jstree-default .jstree-wholerow-clicked {
-  background: #beebff;
-  background: -webkit-linear-gradient(top, #beebff 0%, #a8e4ff 100%);
-  background: linear-gradient(to bottom, #beebff 0%, #a8e4ff 100%);
-}
-.jstree-default .jstree-node {
-  min-height: 24px;
-  line-height: 24px;
-  margin-left: 24px;
-  min-width: 24px;
-}
-.jstree-default .jstree-anchor {
-  line-height: 24px;
-  height: 24px;
-}
-.jstree-default .jstree-icon {
-  width: 24px;
-  height: 24px;
-  line-height: 24px;
-}
-.jstree-default .jstree-icon:empty {
-  width: 24px;
-  height: 24px;
-  line-height: 24px;
-}
-.jstree-default.jstree-rtl .jstree-node {
-  margin-right: 24px;
-}
-.jstree-default .jstree-wholerow {
-  height: 24px;
-}
-.jstree-default .jstree-node,
-.jstree-default .jstree-icon {
-  background-image: url("32px.png");
-}
-.jstree-default .jstree-node {
-  background-position: -292px -4px;
-  background-repeat: repeat-y;
-}
-.jstree-default .jstree-last {
-  background: transparent;
-}
-.jstree-default .jstree-open > .jstree-ocl {
-  background-position: -132px -4px;
-}
-.jstree-default .jstree-closed > .jstree-ocl {
-  background-position: -100px -4px;
-}
-.jstree-default .jstree-leaf > .jstree-ocl {
-  background-position: -68px -4px;
-}
-.jstree-default .jstree-themeicon {
-  background-position: -260px -4px;
-}
-.jstree-default > .jstree-no-dots .jstree-node,
-.jstree-default > .jstree-no-dots .jstree-leaf > .jstree-ocl {
-  background: transparent;
-}
-.jstree-default > .jstree-no-dots .jstree-open > .jstree-ocl {
-  background-position: -36px -4px;
-}
-.jstree-default > .jstree-no-dots .jstree-closed > .jstree-ocl {
-  background-position: -4px -4px;
-}
-.jstree-default .jstree-disabled {
-  background: transparent;
-}
-.jstree-default .jstree-disabled.jstree-hovered {
-  background: transparent;
-}
-.jstree-default .jstree-disabled.jstree-clicked {
-  background: #efefef;
-}
-.jstree-default .jstree-checkbox {
-  background-position: -164px -4px;
-}
-.jstree-default .jstree-checkbox:hover {
-  background-position: -164px -36px;
-}
-.jstree-default.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox,
-.jstree-default .jstree-checked > .jstree-checkbox {
-  background-position: -228px -4px;
-}
-.jstree-default.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox:hover,
-.jstree-default .jstree-checked > .jstree-checkbox:hover {
-  background-position: -228px -36px;
-}
-.jstree-default .jstree-anchor > .jstree-undetermined {
-  background-position: -196px -4px;
-}
-.jstree-default .jstree-anchor > .jstree-undetermined:hover {
-  background-position: -196px -36px;
-}
-.jstree-default .jstree-checkbox-disabled {
-  opacity: 0.8;
-  filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");
-  /* Firefox 10+ */
-  filter: gray;
-  /* IE6-9 */
-  -webkit-filter: grayscale(100%);
-  /* Chrome 19+ & Safari 6+ */
-}
-.jstree-default > .jstree-striped {
-  background-size: auto 48px;
-}
-.jstree-default.jstree-rtl .jstree-node {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==");
-  background-position: 100% 1px;
-  background-repeat: repeat-y;
-}
-.jstree-default.jstree-rtl .jstree-last {
-  background: transparent;
-}
-.jstree-default.jstree-rtl .jstree-open > .jstree-ocl {
-  background-position: -132px -36px;
-}
-.jstree-default.jstree-rtl .jstree-closed > .jstree-ocl {
-  background-position: -100px -36px;
-}
-.jstree-default.jstree-rtl .jstree-leaf > .jstree-ocl {
-  background-position: -68px -36px;
-}
-.jstree-default.jstree-rtl > .jstree-no-dots .jstree-node,
-.jstree-default.jstree-rtl > .jstree-no-dots .jstree-leaf > .jstree-ocl {
-  background: transparent;
-}
-.jstree-default.jstree-rtl > .jstree-no-dots .jstree-open > .jstree-ocl {
-  background-position: -36px -36px;
-}
-.jstree-default.jstree-rtl > .jstree-no-dots .jstree-closed > .jstree-ocl {
-  background-position: -4px -36px;
-}
-.jstree-default .jstree-themeicon-custom {
-  background-color: transparent;
-  background-image: none;
-  background-position: 0 0;
-}
-.jstree-default > .jstree-container-ul .jstree-loading > .jstree-ocl {
-  background: url("throbber.gif") center center no-repeat;
-}
-.jstree-default .jstree-file {
-  background: url("32px.png") -100px -68px no-repeat;
-}
-.jstree-default .jstree-folder {
-  background: url("32px.png") -260px -4px no-repeat;
-}
-.jstree-default > .jstree-container-ul > .jstree-node {
-  margin-left: 0;
-  margin-right: 0;
-}
-#jstree-dnd.jstree-default {
-  line-height: 24px;
-  padding: 0 4px;
-}
-#jstree-dnd.jstree-default .jstree-ok,
-#jstree-dnd.jstree-default .jstree-er {
-  background-image: url("32px.png");
-  background-repeat: no-repeat;
-  background-color: transparent;
-}
-#jstree-dnd.jstree-default i {
-  background: transparent;
-  width: 24px;
-  height: 24px;
-  line-height: 24px;
-}
-#jstree-dnd.jstree-default .jstree-ok {
-  background-position: -4px -68px;
-}
-#jstree-dnd.jstree-default .jstree-er {
-  background-position: -36px -68px;
-}
-.jstree-default.jstree-rtl .jstree-node {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==");
-}
-.jstree-default.jstree-rtl .jstree-last {
-  background: transparent;
-}
-.jstree-default-small .jstree-node {
-  min-height: 18px;
-  line-height: 18px;
-  margin-left: 18px;
-  min-width: 18px;
-}
-.jstree-default-small .jstree-anchor {
-  line-height: 18px;
-  height: 18px;
-}
-.jstree-default-small .jstree-icon {
-  width: 18px;
-  height: 18px;
-  line-height: 18px;
-}
-.jstree-default-small .jstree-icon:empty {
-  width: 18px;
-  height: 18px;
-  line-height: 18px;
-}
-.jstree-default-small.jstree-rtl .jstree-node {
-  margin-right: 18px;
-}
-.jstree-default-small .jstree-wholerow {
-  height: 18px;
-}
-.jstree-default-small .jstree-node,
-.jstree-default-small .jstree-icon {
-  background-image: url("32px.png");
-}
-.jstree-default-small .jstree-node {
-  background-position: -295px -7px;
-  background-repeat: repeat-y;
-}
-.jstree-default-small .jstree-last {
-  background: transparent;
-}
-.jstree-default-small .jstree-open > .jstree-ocl {
-  background-position: -135px -7px;
-}
-.jstree-default-small .jstree-closed > .jstree-ocl {
-  background-position: -103px -7px;
-}
-.jstree-default-small .jstree-leaf > .jstree-ocl {
-  background-position: -71px -7px;
-}
-.jstree-default-small .jstree-themeicon {
-  background-position: -263px -7px;
-}
-.jstree-default-small > .jstree-no-dots .jstree-node,
-.jstree-default-small > .jstree-no-dots .jstree-leaf > .jstree-ocl {
-  background: transparent;
-}
-.jstree-default-small > .jstree-no-dots .jstree-open > .jstree-ocl {
-  background-position: -39px -7px;
-}
-.jstree-default-small > .jstree-no-dots .jstree-closed > .jstree-ocl {
-  background-position: -7px -7px;
-}
-.jstree-default-small .jstree-disabled {
-  background: transparent;
-}
-.jstree-default-small .jstree-disabled.jstree-hovered {
-  background: transparent;
-}
-.jstree-default-small .jstree-disabled.jstree-clicked {
-  background: #efefef;
-}
-.jstree-default-small .jstree-checkbox {
-  background-position: -167px -7px;
-}
-.jstree-default-small .jstree-checkbox:hover {
-  background-position: -167px -39px;
-}
-.jstree-default-small.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox,
-.jstree-default-small .jstree-checked > .jstree-checkbox {
-  background-position: -231px -7px;
-}
-.jstree-default-small.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox:hover,
-.jstree-default-small .jstree-checked > .jstree-checkbox:hover {
-  background-position: -231px -39px;
-}
-.jstree-default-small .jstree-anchor > .jstree-undetermined {
-  background-position: -199px -7px;
-}
-.jstree-default-small .jstree-anchor > .jstree-undetermined:hover {
-  background-position: -199px -39px;
-}
-.jstree-default-small .jstree-checkbox-disabled {
-  opacity: 0.8;
-  filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");
-  /* Firefox 10+ */
-  filter: gray;
-  /* IE6-9 */
-  -webkit-filter: grayscale(100%);
-  /* Chrome 19+ & Safari 6+ */
-}
-.jstree-default-small > .jstree-striped {
-  background-size: auto 36px;
-}
-.jstree-default-small.jstree-rtl .jstree-node {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==");
-  background-position: 100% 1px;
-  background-repeat: repeat-y;
-}
-.jstree-default-small.jstree-rtl .jstree-last {
-  background: transparent;
-}
-.jstree-default-small.jstree-rtl .jstree-open > .jstree-ocl {
-  background-position: -135px -39px;
-}
-.jstree-default-small.jstree-rtl .jstree-closed > .jstree-ocl {
-  background-position: -103px -39px;
-}
-.jstree-default-small.jstree-rtl .jstree-leaf > .jstree-ocl {
-  background-position: -71px -39px;
-}
-.jstree-default-small.jstree-rtl > .jstree-no-dots .jstree-node,
-.jstree-default-small.jstree-rtl > .jstree-no-dots .jstree-leaf > .jstree-ocl {
-  background: transparent;
-}
-.jstree-default-small.jstree-rtl > .jstree-no-dots .jstree-open > .jstree-ocl {
-  background-position: -39px -39px;
-}
-.jstree-default-small.jstree-rtl > .jstree-no-dots .jstree-closed > .jstree-ocl {
-  background-position: -7px -39px;
-}
-.jstree-default-small .jstree-themeicon-custom {
-  background-color: transparent;
-  background-image: none;
-  background-position: 0 0;
-}
-.jstree-default-small > .jstree-container-ul .jstree-loading > .jstree-ocl {
-  background: url("throbber.gif") center center no-repeat;
-}
-.jstree-default-small .jstree-file {
-  background: url("32px.png") -103px -71px no-repeat;
-}
-.jstree-default-small .jstree-folder {
-  background: url("32px.png") -263px -7px no-repeat;
-}
-.jstree-default-small > .jstree-container-ul > .jstree-node {
-  margin-left: 0;
-  margin-right: 0;
-}
-#jstree-dnd.jstree-default-small {
-  line-height: 18px;
-  padding: 0 4px;
-}
-#jstree-dnd.jstree-default-small .jstree-ok,
-#jstree-dnd.jstree-default-small .jstree-er {
-  background-image: url("32px.png");
-  background-repeat: no-repeat;
-  background-color: transparent;
-}
-#jstree-dnd.jstree-default-small i {
-  background: transparent;
-  width: 18px;
-  height: 18px;
-  line-height: 18px;
-}
-#jstree-dnd.jstree-default-small .jstree-ok {
-  background-position: -7px -71px;
-}
-#jstree-dnd.jstree-default-small .jstree-er {
-  background-position: -39px -71px;
-}
-.jstree-default-small.jstree-rtl .jstree-node {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAACAQMAAABv1h6PAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMHBgAAiABBI4gz9AAAAABJRU5ErkJggg==");
-}
-.jstree-default-small.jstree-rtl .jstree-last {
-  background: transparent;
-}
-.jstree-default-large .jstree-node {
-  min-height: 32px;
-  line-height: 32px;
-  margin-left: 32px;
-  min-width: 32px;
-}
-.jstree-default-large .jstree-anchor {
-  line-height: 32px;
-  height: 32px;
-}
-.jstree-default-large .jstree-icon {
-  width: 32px;
-  height: 32px;
-  line-height: 32px;
-}
-.jstree-default-large .jstree-icon:empty {
-  width: 32px;
-  height: 32px;
-  line-height: 32px;
-}
-.jstree-default-large.jstree-rtl .jstree-node {
-  margin-right: 32px;
-}
-.jstree-default-large .jstree-wholerow {
-  height: 32px;
-}
-.jstree-default-large .jstree-node,
-.jstree-default-large .jstree-icon {
-  background-image: url("32px.png");
-}
-.jstree-default-large .jstree-node {
-  background-position: -288px 0px;
-  background-repeat: repeat-y;
-}
-.jstree-default-large .jstree-last {
-  background: transparent;
-}
-.jstree-default-large .jstree-open > .jstree-ocl {
-  background-position: -128px 0px;
-}
-.jstree-default-large .jstree-closed > .jstree-ocl {
-  background-position: -96px 0px;
-}
-.jstree-default-large .jstree-leaf > .jstree-ocl {
-  background-position: -64px 0px;
-}
-.jstree-default-large .jstree-themeicon {
-  background-position: -256px 0px;
-}
-.jstree-default-large > .jstree-no-dots .jstree-node,
-.jstree-default-large > .jstree-no-dots .jstree-leaf > .jstree-ocl {
-  background: transparent;
-}
-.jstree-default-large > .jstree-no-dots .jstree-open > .jstree-ocl {
-  background-position: -32px 0px;
-}
-.jstree-default-large > .jstree-no-dots .jstree-closed > .jstree-ocl {
-  background-position: 0px 0px;
-}
-.jstree-default-large .jstree-disabled {
-  background: transparent;
-}
-.jstree-default-large .jstree-disabled.jstree-hovered {
-  background: transparent;
-}
-.jstree-default-large .jstree-disabled.jstree-clicked {
-  background: #efefef;
-}
-.jstree-default-large .jstree-checkbox {
-  background-position: -160px 0px;
-}
-.jstree-default-large .jstree-checkbox:hover {
-  background-position: -160px -32px;
-}
-.jstree-default-large.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox,
-.jstree-default-large .jstree-checked > .jstree-checkbox {
-  background-position: -224px 0px;
-}
-.jstree-default-large.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox:hover,
-.jstree-default-large .jstree-checked > .jstree-checkbox:hover {
-  background-position: -224px -32px;
-}
-.jstree-default-large .jstree-anchor > .jstree-undetermined {
-  background-position: -192px 0px;
-}
-.jstree-default-large .jstree-anchor > .jstree-undetermined:hover {
-  background-position: -192px -32px;
-}
-.jstree-default-large .jstree-checkbox-disabled {
-  opacity: 0.8;
-  filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");
-  /* Firefox 10+ */
-  filter: gray;
-  /* IE6-9 */
-  -webkit-filter: grayscale(100%);
-  /* Chrome 19+ & Safari 6+ */
-}
-.jstree-default-large > .jstree-striped {
-  background-size: auto 64px;
-}
-.jstree-default-large.jstree-rtl .jstree-node {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==");
-  background-position: 100% 1px;
-  background-repeat: repeat-y;
-}
-.jstree-default-large.jstree-rtl .jstree-last {
-  background: transparent;
-}
-.jstree-default-large.jstree-rtl .jstree-open > .jstree-ocl {
-  background-position: -128px -32px;
-}
-.jstree-default-large.jstree-rtl .jstree-closed > .jstree-ocl {
-  background-position: -96px -32px;
-}
-.jstree-default-large.jstree-rtl .jstree-leaf > .jstree-ocl {
-  background-position: -64px -32px;
-}
-.jstree-default-large.jstree-rtl > .jstree-no-dots .jstree-node,
-.jstree-default-large.jstree-rtl > .jstree-no-dots .jstree-leaf > .jstree-ocl {
-  background: transparent;
-}
-.jstree-default-large.jstree-rtl > .jstree-no-dots .jstree-open > .jstree-ocl {
-  background-position: -32px -32px;
-}
-.jstree-default-large.jstree-rtl > .jstree-no-dots .jstree-closed > .jstree-ocl {
-  background-position: 0px -32px;
-}
-.jstree-default-large .jstree-themeicon-custom {
-  background-color: transparent;
-  background-image: none;
-  background-position: 0 0;
-}
-.jstree-default-large > .jstree-container-ul .jstree-loading > .jstree-ocl {
-  background: url("throbber.gif") center center no-repeat;
-}
-.jstree-default-large .jstree-file {
-  background: url("32px.png") -96px -64px no-repeat;
-}
-.jstree-default-large .jstree-folder {
-  background: url("32px.png") -256px 0px no-repeat;
-}
-.jstree-default-large > .jstree-container-ul > .jstree-node {
-  margin-left: 0;
-  margin-right: 0;
-}
-#jstree-dnd.jstree-default-large {
-  line-height: 32px;
-  padding: 0 4px;
-}
-#jstree-dnd.jstree-default-large .jstree-ok,
-#jstree-dnd.jstree-default-large .jstree-er {
-  background-image: url("32px.png");
-  background-repeat: no-repeat;
-  background-color: transparent;
-}
-#jstree-dnd.jstree-default-large i {
-  background: transparent;
-  width: 32px;
-  height: 32px;
-  line-height: 32px;
-}
-#jstree-dnd.jstree-default-large .jstree-ok {
-  background-position: 0px -64px;
-}
-#jstree-dnd.jstree-default-large .jstree-er {
-  background-position: -32px -64px;
-}
-.jstree-default-large.jstree-rtl .jstree-node {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAACAQMAAAAD0EyKAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjgIIGBgABCgCBvVLXcAAAAABJRU5ErkJggg==");
-}
-.jstree-default-large.jstree-rtl .jstree-last {
-  background: transparent;
-}
-@media (max-width: 768px) {
-  #jstree-dnd.jstree-dnd-responsive {
-    line-height: 40px;
-    font-weight: bold;
-    font-size: 1.1em;
-    text-shadow: 1px 1px white;
-  }
-  #jstree-dnd.jstree-dnd-responsive > i {
-    background: transparent;
-    width: 40px;
-    height: 40px;
-  }
-  #jstree-dnd.jstree-dnd-responsive > .jstree-ok {
-    background-image: url("40px.png");
-    background-position: 0 -200px;
-    background-size: 120px 240px;
-  }
-  #jstree-dnd.jstree-dnd-responsive > .jstree-er {
-    background-image: url("40px.png");
-    background-position: -40px -200px;
-    background-size: 120px 240px;
-  }
-  #jstree-marker.jstree-dnd-responsive {
-    border-left-width: 10px;
-    border-top-width: 10px;
-    border-bottom-width: 10px;
-    margin-top: -10px;
-  }
-}
-@media (max-width: 768px) {
-  .jstree-default-responsive {
-    /*
-	.jstree-open > .jstree-ocl,
-	.jstree-closed > .jstree-ocl { border-radius:20px; background-color:white; }
-	*/
-  }
-  .jstree-default-responsive .jstree-icon {
-    background-image: url("40px.png");
-  }
-  .jstree-default-responsive .jstree-node,
-  .jstree-default-responsive .jstree-leaf > .jstree-ocl {
-    background: transparent;
-  }
-  .jstree-default-responsive .jstree-node {
-    min-height: 40px;
-    line-height: 40px;
-    margin-left: 40px;
-    min-width: 40px;
-    white-space: nowrap;
-  }
-  .jstree-default-responsive .jstree-anchor {
-    line-height: 40px;
-    height: 40px;
-  }
-  .jstree-default-responsive .jstree-icon,
-  .jstree-default-responsive .jstree-icon:empty {
-    width: 40px;
-    height: 40px;
-    line-height: 40px;
-  }
-  .jstree-default-responsive > .jstree-container-ul > .jstree-node {
-    margin-left: 0;
-  }
-  .jstree-default-responsive.jstree-rtl .jstree-node {
-    margin-left: 0;
-    margin-right: 40px;
-  }
-  .jstree-default-responsive.jstree-rtl .jstree-container-ul > .jstree-node {
-    margin-right: 0;
-  }
-  .jstree-default-responsive .jstree-ocl,
-  .jstree-default-responsive .jstree-themeicon,
-  .jstree-default-responsive .jstree-checkbox {
-    background-size: 120px 240px;
-  }
-  .jstree-default-responsive .jstree-leaf > .jstree-ocl {
-    background: transparent;
-  }
-  .jstree-default-responsive .jstree-open > .jstree-ocl {
-    background-position: 0 0px !important;
-  }
-  .jstree-default-responsive .jstree-closed > .jstree-ocl {
-    background-position: 0 -40px !important;
-  }
-  .jstree-default-responsive.jstree-rtl .jstree-closed > .jstree-ocl {
-    background-position: -40px 0px !important;
-  }
-  .jstree-default-responsive .jstree-themeicon {
-    background-position: -40px -40px;
-  }
-  .jstree-default-responsive .jstree-checkbox,
-  .jstree-default-responsive .jstree-checkbox:hover {
-    background-position: -40px -80px;
-  }
-  .jstree-default-responsive.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox,
-  .jstree-default-responsive.jstree-checkbox-selection .jstree-clicked > .jstree-checkbox:hover,
-  .jstree-default-responsive .jstree-checked > .jstree-checkbox,
-  .jstree-default-responsive .jstree-checked > .jstree-checkbox:hover {
-    background-position: 0 -80px;
-  }
-  .jstree-default-responsive .jstree-anchor > .jstree-undetermined,
-  .jstree-default-responsive .jstree-anchor > .jstree-undetermined:hover {
-    background-position: 0 -120px;
-  }
-  .jstree-default-responsive .jstree-anchor {
-    font-weight: bold;
-    font-size: 1.1em;
-    text-shadow: 1px 1px white;
-  }
-  .jstree-default-responsive > .jstree-striped {
-    background: transparent;
-  }
-  .jstree-default-responsive .jstree-wholerow {
-    border-top: 1px solid rgba(255, 255, 255, 0.7);
-    border-bottom: 1px solid rgba(64, 64, 64, 0.2);
-    background: #ebebeb;
-    height: 40px;
-  }
-  .jstree-default-responsive .jstree-wholerow-hovered {
-    background: #e7f4f9;
-  }
-  .jstree-default-responsive .jstree-wholerow-clicked {
-    background: #beebff;
-  }
-  .jstree-default-responsive .jstree-children .jstree-last > .jstree-wholerow {
-    box-shadow: inset 0 -6px 3px -5px #666666;
-  }
-  .jstree-default-responsive .jstree-children .jstree-open > .jstree-wholerow {
-    box-shadow: inset 0 6px 3px -5px #666666;
-    border-top: 0;
-  }
-  .jstree-default-responsive .jstree-children .jstree-open + .jstree-open {
-    box-shadow: none;
-  }
-  .jstree-default-responsive .jstree-node,
-  .jstree-default-responsive .jstree-icon,
-  .jstree-default-responsive .jstree-node > .jstree-ocl,
-  .jstree-default-responsive .jstree-themeicon,
-  .jstree-default-responsive .jstree-checkbox {
-    background-image: url("40px.png");
-    background-size: 120px 240px;
-  }
-  .jstree-default-responsive .jstree-node {
-    background-position: -80px 0;
-    background-repeat: repeat-y;
-  }
-  .jstree-default-responsive .jstree-last {
-    background: transparent;
-  }
-  .jstree-default-responsive .jstree-leaf > .jstree-ocl {
-    background-position: -40px -120px;
-  }
-  .jstree-default-responsive .jstree-last > .jstree-ocl {
-    background-position: -40px -160px;
-  }
-  .jstree-default-responsive .jstree-themeicon-custom {
-    background-color: transparent;
-    background-image: none;
-    background-position: 0 0;
-  }
-  .jstree-default-responsive .jstree-file {
-    background: url("40px.png") 0 -160px no-repeat;
-    background-size: 120px 240px;
-  }
-  .jstree-default-responsive .jstree-folder {
-    background: url("40px.png") -40px -40px no-repeat;
-    background-size: 120px 240px;
-  }
-  .jstree-default-responsive > .jstree-container-ul > .jstree-node {
-    margin-left: 0;
-    margin-right: 0;
-  }
-}
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/style.min.css b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/style.min.css
deleted file mode 100755
index a24ff301362..00000000000
--- a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/style.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.jstree-node,.jstree-children,.jstree-container-ul{display:block;margin:0;padding:0;list-style-type:none;list-style-image:none}.jstree-node{white-space:nowrap}.jstree-anchor{display:inline-block;color:#000;white-space:nowrap;padding:0 4px 0 1px;margin:0;vertical-align:top}.jstree-anchor:focus{outline:0}.jstree-anchor,.jstree-anchor:link,.jstree-anchor:visited,.jstree-anchor:hover,.jstree-anchor:active{text-decoration:none;color:inherit}.jstree-icon{display:inline-block;text-decoration:none;margin:0;padding:0;vertical-align:top;text-align:center}.jstree-icon:empty{display:inline-block;text-decoration:none;margin:0;padding:0;vertical-align:top;text-align:center}.jstree-ocl{cursor:pointer}.jstree-leaf>.jstree-ocl{cursor:default}.jstree .jstree-open>.jstree-children{display:block}.jstree .jstree-closed>.jstree-children,.jstree .jstree-leaf>.jstree-children{display:none}.jstree-anchor>.jstree-themeicon{margin-right:2px}.jstree-no-icons .jstree-themeicon,.jstree-anchor>.jstree-themeicon-hidden{display:none}.jstree-hidden{display:none}.jstree-rtl .jstree-anchor{padding:0 1px 0 4px}.jstree-rtl .jstree-anchor>.jstree-themeicon{margin-left:2px;margin-right:0}.jstree-rtl .jstree-node{margin-left:0}.jstree-rtl .jstree-container-ul>.jstree-node{margin-right:0}.jstree-wholerow-ul{position:relative;display:inline-block;min-width:100%}.jstree-wholerow-ul .jstree-leaf>.jstree-ocl{cursor:pointer}.jstree-wholerow-ul .jstree-anchor,.jstree-wholerow-ul .jstree-icon{position:relative}.jstree-wholerow-ul .jstree-wholerow{width:100%;cursor:pointer;position:absolute;left:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vakata-context{display:none}.vakata-context,.vakata-context ul{margin:0;padding:2px;position:absolute;background:#f5f5f5;border:1px solid #979797;box-shadow:2px 2px 2px #999}.vakata-context ul{list-style:none;left:100%;margin-top:-2.7em;margin-left:-4px}.vakata-context .vakata-context-right ul{left:auto;right:100%;margin-left:auto;margin-right:-4px}.vakata-context li{list-style:none;display:inline}.vakata-context li>a{display:block;padding:0 2em;text-decoration:none;width:auto;color:#000;white-space:nowrap;line-height:2.4em;text-shadow:1px 1px 0 #fff;border-radius:1px}.vakata-context li>a:hover{position:relative;background-color:#e8eff7;box-shadow:0 0 2px #0a6aa1}.vakata-context li>a.vakata-context-parent{background-image:url(data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAIORI4JlrqN1oMSnmmZDQUAOw==);background-position:right center;background-repeat:no-repeat}.vakata-context li>a:focus{outline:0}.vakata-context .vakata-context-hover>a{position:relative;background-color:#e8eff7;box-shadow:0 0 2px #0a6aa1}.vakata-context .vakata-context-separator>a,.vakata-context .vakata-context-separator>a:hover{background:#fff;border:0;border-top:1px solid #e2e3e3;height:1px;min-height:1px;max-height:1px;padding:0;margin:0 0 0 2.4em;border-left:1px solid #e0e0e0;text-shadow:0 0 0 transparent;box-shadow:0 0 0 transparent;border-radius:0}.vakata-context .vakata-contextmenu-disabled a,.vakata-context .vakata-contextmenu-disabled a:hover{color:silver;background-color:transparent;border:0;box-shadow:0 0 0}.vakata-context li>a>i{text-decoration:none;display:inline-block;width:2.4em;height:2.4em;background:0 0;margin:0 0 0 -2em;vertical-align:top;text-align:center;line-height:2.4em}.vakata-context li>a>i:empty{width:2.4em;line-height:2.4em}.vakata-context li>a .vakata-contextmenu-sep{display:inline-block;width:1px;height:2.4em;background:#fff;margin:0 .5em 0 0;border-left:1px solid #e2e3e3}.vakata-context .vakata-contextmenu-shortcut{font-size:.8em;color:silver;opacity:.5;display:none}.vakata-context-rtl ul{left:auto;right:100%;margin-left:auto;margin-right:-4px}.vakata-context-rtl li>a.vakata-context-parent{background-image:url(data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAINjI+AC7rWHIsPtmoxLAA7);background-position:left center;background-repeat:no-repeat}.vakata-context-rtl .vakata-context-separator>a{margin:0 2.4em 0 0;border-left:0;border-right:1px solid #e2e3e3}.vakata-context-rtl .vakata-context-left ul{right:auto;left:100%;margin-left:-4px;margin-right:auto}.vakata-context-rtl li>a>i{margin:0 -2em 0 0}.vakata-context-rtl li>a .vakata-contextmenu-sep{margin:0 0 0 .5em;border-left-color:#fff;background:#e2e3e3}#jstree-marker{position:absolute;top:0;left:0;margin:-5px 0 0 0;padding:0;border-right:0;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid;width:0;height:0;font-size:0;line-height:0}#jstree-dnd{line-height:16px;margin:0;padding:4px}#jstree-dnd .jstree-icon,#jstree-dnd .jstree-copy{display:inline-block;text-decoration:none;margin:0 2px 0 0;padding:0;width:16px;height:16px}#jstree-dnd .jstree-ok{background:green}#jstree-dnd .jstree-er{background:red}#jstree-dnd .jstree-copy{margin:0 2px}.jstree-default .jstree-node,.jstree-default .jstree-icon{background-repeat:no-repeat;background-color:transparent}.jstree-default .jstree-anchor,.jstree-default .jstree-wholerow{transition:background-color .15s,box-shadow .15s}.jstree-default .jstree-hovered{background:#e7f4f9;border-radius:2px;box-shadow:inset 0 0 1px #ccc}.jstree-default .jstree-clicked{background:#beebff;border-radius:2px;box-shadow:inset 0 0 1px #999}.jstree-default .jstree-no-icons .jstree-anchor>.jstree-themeicon{display:none}.jstree-default .jstree-disabled{background:0 0;color:#666}.jstree-default .jstree-disabled.jstree-hovered{background:0 0;box-shadow:none}.jstree-default .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default .jstree-disabled>.jstree-icon{opacity:.8;filter:url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default .jstree-search{font-style:italic;color:#8b0000;font-weight:700}.jstree-default .jstree-no-checkboxes .jstree-checkbox{display:none!important}.jstree-default.jstree-checkbox-no-clicked .jstree-clicked{background:0 0;box-shadow:none}.jstree-default.jstree-checkbox-no-clicked .jstree-clicked.jstree-hovered{background:#e7f4f9}.jstree-default.jstree-checkbox-no-clicked>.jstree-wholerow-ul .jstree-wholerow-clicked{background:0 0}.jstree-default.jstree-checkbox-no-clicked>.jstree-wholerow-ul .jstree-wholerow-clicked.jstree-wholerow-hovered{background:#e7f4f9}.jstree-default>.jstree-striped{min-width:100%;display:inline-block;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAMAAAB/qqA+AAAABlBMVEUAAAAAAAClZ7nPAAAAAnRSTlMNAMM9s3UAAAAXSURBVHjajcEBAQAAAIKg/H/aCQZ70AUBjAATb6YPDgAAAABJRU5ErkJggg==) left top repeat}.jstree-default>.jstree-wholerow-ul .jstree-hovered,.jstree-default>.jstree-wholerow-ul .jstree-clicked{background:0 0;box-shadow:none;border-radius:0}.jstree-default .jstree-wholerow{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.jstree-default .jstree-wholerow-hovered{background:#e7f4f9}.jstree-default .jstree-wholerow-clicked{background:#beebff;background:-webkit-linear-gradient(top,#beebff 0,#a8e4ff 100%);background:linear-gradient(to bottom,#beebff 0,#a8e4ff 100%)}.jstree-default .jstree-node{min-height:24px;line-height:24px;margin-left:24px;min-width:24px}.jstree-default .jstree-anchor{line-height:24px;height:24px}.jstree-default .jstree-icon{width:24px;height:24px;line-height:24px}.jstree-default .jstree-icon:empty{width:24px;height:24px;line-height:24px}.jstree-default.jstree-rtl .jstree-node{margin-right:24px}.jstree-default .jstree-wholerow{height:24px}.jstree-default .jstree-node,.jstree-default .jstree-icon{background-image:url(32px.png)}.jstree-default .jstree-node{background-position:-292px -4px;background-repeat:repeat-y}.jstree-default .jstree-last{background:0 0}.jstree-default .jstree-open>.jstree-ocl{background-position:-132px -4px}.jstree-default .jstree-closed>.jstree-ocl{background-position:-100px -4px}.jstree-default .jstree-leaf>.jstree-ocl{background-position:-68px -4px}.jstree-default .jstree-themeicon{background-position:-260px -4px}.jstree-default>.jstree-no-dots .jstree-node,.jstree-default>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-36px -4px}.jstree-default>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-4px -4px}.jstree-default .jstree-disabled{background:0 0}.jstree-default .jstree-disabled.jstree-hovered{background:0 0}.jstree-default .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default .jstree-checkbox{background-position:-164px -4px}.jstree-default .jstree-checkbox:hover{background-position:-164px -36px}.jstree-default.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default .jstree-checked>.jstree-checkbox{background-position:-228px -4px}.jstree-default.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default .jstree-checked>.jstree-checkbox:hover{background-position:-228px -36px}.jstree-default .jstree-anchor>.jstree-undetermined{background-position:-196px -4px}.jstree-default .jstree-anchor>.jstree-undetermined:hover{background-position:-196px -36px}.jstree-default .jstree-checkbox-disabled{opacity:.8;filter:url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default>.jstree-striped{background-size:auto 48px}.jstree-default.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==);background-position:100% 1px;background-repeat:repeat-y}.jstree-default.jstree-rtl .jstree-last{background:0 0}.jstree-default.jstree-rtl .jstree-open>.jstree-ocl{background-position:-132px -36px}.jstree-default.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-100px -36px}.jstree-default.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-68px -36px}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-node,.jstree-default.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-36px -36px}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-4px -36px}.jstree-default .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(throbber.gif) center center no-repeat}.jstree-default .jstree-file{background:url(32px.png) -100px -68px no-repeat}.jstree-default .jstree-folder{background:url(32px.png) -260px -4px no-repeat}.jstree-default>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default{line-height:24px;padding:0 4px}#jstree-dnd.jstree-default .jstree-ok,#jstree-dnd.jstree-default .jstree-er{background-image:url(32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default i{background:0 0;width:24px;height:24px;line-height:24px}#jstree-dnd.jstree-default .jstree-ok{background-position:-4px -68px}#jstree-dnd.jstree-default .jstree-er{background-position:-36px -68px}.jstree-default.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==)}.jstree-default.jstree-rtl .jstree-last{background:0 0}.jstree-default-small .jstree-node{min-height:18px;line-height:18px;margin-left:18px;min-width:18px}.jstree-default-small .jstree-anchor{line-height:18px;height:18px}.jstree-default-small .jstree-icon{width:18px;height:18px;line-height:18px}.jstree-default-small .jstree-icon:empty{width:18px;height:18px;line-height:18px}.jstree-default-small.jstree-rtl .jstree-node{margin-right:18px}.jstree-default-small .jstree-wholerow{height:18px}.jstree-default-small .jstree-node,.jstree-default-small .jstree-icon{background-image:url(32px.png)}.jstree-default-small .jstree-node{background-position:-295px -7px;background-repeat:repeat-y}.jstree-default-small .jstree-last{background:0 0}.jstree-default-small .jstree-open>.jstree-ocl{background-position:-135px -7px}.jstree-default-small .jstree-closed>.jstree-ocl{background-position:-103px -7px}.jstree-default-small .jstree-leaf>.jstree-ocl{background-position:-71px -7px}.jstree-default-small .jstree-themeicon{background-position:-263px -7px}.jstree-default-small>.jstree-no-dots .jstree-node,.jstree-default-small>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-small>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-39px -7px}.jstree-default-small>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-7px -7px}.jstree-default-small .jstree-disabled{background:0 0}.jstree-default-small .jstree-disabled.jstree-hovered{background:0 0}.jstree-default-small .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default-small .jstree-checkbox{background-position:-167px -7px}.jstree-default-small .jstree-checkbox:hover{background-position:-167px -39px}.jstree-default-small.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-small .jstree-checked>.jstree-checkbox{background-position:-231px -7px}.jstree-default-small.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default-small .jstree-checked>.jstree-checkbox:hover{background-position:-231px -39px}.jstree-default-small .jstree-anchor>.jstree-undetermined{background-position:-199px -7px}.jstree-default-small .jstree-anchor>.jstree-undetermined:hover{background-position:-199px -39px}.jstree-default-small .jstree-checkbox-disabled{opacity:.8;filter:url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default-small>.jstree-striped{background-size:auto 36px}.jstree-default-small.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==);background-position:100% 1px;background-repeat:repeat-y}.jstree-default-small.jstree-rtl .jstree-last{background:0 0}.jstree-default-small.jstree-rtl .jstree-open>.jstree-ocl{background-position:-135px -39px}.jstree-default-small.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-103px -39px}.jstree-default-small.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-71px -39px}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-node,.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-39px -39px}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-7px -39px}.jstree-default-small .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-small>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(throbber.gif) center center no-repeat}.jstree-default-small .jstree-file{background:url(32px.png) -103px -71px no-repeat}.jstree-default-small .jstree-folder{background:url(32px.png) -263px -7px no-repeat}.jstree-default-small>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default-small{line-height:18px;padding:0 4px}#jstree-dnd.jstree-default-small .jstree-ok,#jstree-dnd.jstree-default-small .jstree-er{background-image:url(32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default-small i{background:0 0;width:18px;height:18px;line-height:18px}#jstree-dnd.jstree-default-small .jstree-ok{background-position:-7px -71px}#jstree-dnd.jstree-default-small .jstree-er{background-position:-39px -71px}.jstree-default-small.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAACAQMAAABv1h6PAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMHBgAAiABBI4gz9AAAAABJRU5ErkJggg==)}.jstree-default-small.jstree-rtl .jstree-last{background:0 0}.jstree-default-large .jstree-node{min-height:32px;line-height:32px;margin-left:32px;min-width:32px}.jstree-default-large .jstree-anchor{line-height:32px;height:32px}.jstree-default-large .jstree-icon{width:32px;height:32px;line-height:32px}.jstree-default-large .jstree-icon:empty{width:32px;height:32px;line-height:32px}.jstree-default-large.jstree-rtl .jstree-node{margin-right:32px}.jstree-default-large .jstree-wholerow{height:32px}.jstree-default-large .jstree-node,.jstree-default-large .jstree-icon{background-image:url(32px.png)}.jstree-default-large .jstree-node{background-position:-288px 0;background-repeat:repeat-y}.jstree-default-large .jstree-last{background:0 0}.jstree-default-large .jstree-open>.jstree-ocl{background-position:-128px 0}.jstree-default-large .jstree-closed>.jstree-ocl{background-position:-96px 0}.jstree-default-large .jstree-leaf>.jstree-ocl{background-position:-64px 0}.jstree-default-large .jstree-themeicon{background-position:-256px 0}.jstree-default-large>.jstree-no-dots .jstree-node,.jstree-default-large>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-large>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-32px 0}.jstree-default-large>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:0 0}.jstree-default-large .jstree-disabled{background:0 0}.jstree-default-large .jstree-disabled.jstree-hovered{background:0 0}.jstree-default-large .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default-large .jstree-checkbox{background-position:-160px 0}.jstree-default-large .jstree-checkbox:hover{background-position:-160px -32px}.jstree-default-large.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-large .jstree-checked>.jstree-checkbox{background-position:-224px 0}.jstree-default-large.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default-large .jstree-checked>.jstree-checkbox:hover{background-position:-224px -32px}.jstree-default-large .jstree-anchor>.jstree-undetermined{background-position:-192px 0}.jstree-default-large .jstree-anchor>.jstree-undetermined:hover{background-position:-192px -32px}.jstree-default-large .jstree-checkbox-disabled{opacity:.8;filter:url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default-large>.jstree-striped{background-size:auto 64px}.jstree-default-large.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==);background-position:100% 1px;background-repeat:repeat-y}.jstree-default-large.jstree-rtl .jstree-last{background:0 0}.jstree-default-large.jstree-rtl .jstree-open>.jstree-ocl{background-position:-128px -32px}.jstree-default-large.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-96px -32px}.jstree-default-large.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-64px -32px}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-node,.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-32px -32px}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:0 -32px}.jstree-default-large .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-large>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(throbber.gif) center center no-repeat}.jstree-default-large .jstree-file{background:url(32px.png) -96px -64px no-repeat}.jstree-default-large .jstree-folder{background:url(32px.png) -256px 0 no-repeat}.jstree-default-large>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default-large{line-height:32px;padding:0 4px}#jstree-dnd.jstree-default-large .jstree-ok,#jstree-dnd.jstree-default-large .jstree-er{background-image:url(32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default-large i{background:0 0;width:32px;height:32px;line-height:32px}#jstree-dnd.jstree-default-large .jstree-ok{background-position:0 -64px}#jstree-dnd.jstree-default-large .jstree-er{background-position:-32px -64px}.jstree-default-large.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAACAQMAAAAD0EyKAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjgIIGBgABCgCBvVLXcAAAAABJRU5ErkJggg==)}.jstree-default-large.jstree-rtl .jstree-last{background:0 0}@media (max-width:768px){#jstree-dnd.jstree-dnd-responsive{line-height:40px;font-weight:700;font-size:1.1em;text-shadow:1px 1px #fff}#jstree-dnd.jstree-dnd-responsive>i{background:0 0;width:40px;height:40px}#jstree-dnd.jstree-dnd-responsive>.jstree-ok{background-image:url(40px.png);background-position:0 -200px;background-size:120px 240px}#jstree-dnd.jstree-dnd-responsive>.jstree-er{background-image:url(40px.png);background-position:-40px -200px;background-size:120px 240px}#jstree-marker.jstree-dnd-responsive{border-left-width:10px;border-top-width:10px;border-bottom-width:10px;margin-top:-10px}}@media (max-width:768px){.jstree-default-responsive .jstree-icon{background-image:url(40px.png)}.jstree-default-responsive .jstree-node,.jstree-default-responsive .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-responsive .jstree-node{min-height:40px;line-height:40px;margin-left:40px;min-width:40px;white-space:nowrap}.jstree-default-responsive .jstree-anchor{line-height:40px;height:40px}.jstree-default-responsive .jstree-icon,.jstree-default-responsive .jstree-icon:empty{width:40px;height:40px;line-height:40px}.jstree-default-responsive>.jstree-container-ul>.jstree-node{margin-left:0}.jstree-default-responsive.jstree-rtl .jstree-node{margin-left:0;margin-right:40px}.jstree-default-responsive.jstree-rtl .jstree-container-ul>.jstree-node{margin-right:0}.jstree-default-responsive .jstree-ocl,.jstree-default-responsive .jstree-themeicon,.jstree-default-responsive .jstree-checkbox{background-size:120px 240px}.jstree-default-responsive .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-responsive .jstree-open>.jstree-ocl{background-position:0 0!important}.jstree-default-responsive .jstree-closed>.jstree-ocl{background-position:0 -40px!important}.jstree-default-responsive.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-40px 0!important}.jstree-default-responsive .jstree-themeicon{background-position:-40px -40px}.jstree-default-responsive .jstree-checkbox,.jstree-default-responsive .jstree-checkbox:hover{background-position:-40px -80px}.jstree-default-responsive.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-responsive.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default-responsive .jstree-checked>.jstree-checkbox,.jstree-default-responsive .jstree-checked>.jstree-checkbox:hover{background-position:0 -80px}.jstree-default-responsive .jstree-anchor>.jstree-undetermined,.jstree-default-responsive .jstree-anchor>.jstree-undetermined:hover{background-position:0 -120px}.jstree-default-responsive .jstree-anchor{font-weight:700;font-size:1.1em;text-shadow:1px 1px #fff}.jstree-default-responsive>.jstree-striped{background:0 0}.jstree-default-responsive .jstree-wholerow{border-top:1px solid rgba(255,255,255,.7);border-bottom:1px solid rgba(64,64,64,.2);background:#ebebeb;height:40px}.jstree-default-responsive .jstree-wholerow-hovered{background:#e7f4f9}.jstree-default-responsive .jstree-wholerow-clicked{background:#beebff}.jstree-default-responsive .jstree-children .jstree-last>.jstree-wholerow{box-shadow:inset 0 -6px 3px -5px #666}.jstree-default-responsive .jstree-children .jstree-open>.jstree-wholerow{box-shadow:inset 0 6px 3px -5px #666;border-top:0}.jstree-default-responsive .jstree-children .jstree-open+.jstree-open{box-shadow:none}.jstree-default-responsive .jstree-node,.jstree-default-responsive .jstree-icon,.jstree-default-responsive .jstree-node>.jstree-ocl,.jstree-default-responsive .jstree-themeicon,.jstree-default-responsive .jstree-checkbox{background-image:url(40px.png);background-size:120px 240px}.jstree-default-responsive .jstree-node{background-position:-80px 0;background-repeat:repeat-y}.jstree-default-responsive .jstree-last{background:0 0}.jstree-default-responsive .jstree-leaf>.jstree-ocl{background-position:-40px -120px}.jstree-default-responsive .jstree-last>.jstree-ocl{background-position:-40px -160px}.jstree-default-responsive .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-responsive .jstree-file{background:url(40px.png) 0 -160px no-repeat;background-size:120px 240px}.jstree-default-responsive .jstree-folder{background:url(40px.png) -40px -40px no-repeat;background-size:120px 240px}.jstree-default-responsive>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}}
\ No newline at end of file
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/throbber.gif b/src/Oro/Bundle/UIBundle/Resources/public/lib/jstree/themes/default/throbber.gif
deleted file mode 100755
index 1b5b2fde42f8ea14e6981339196a9d62b681d79e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1720
zcmZ|OYfMvT7zgm4p2O+ea@rnBg#)OxTPX)YQxLES+gfgxVz~&+f}$;m6s%Hi3W%nq
zP@z^qrV}=TNF%FL8K5q@MN>cp#S0pVI*qHSli{|&j8i`-D~lhy5AU}p`Tz2N-e*-(
zqBu&8Q*g>F3T19?Zf0i2Y&JU_j>N>onwlC4g`!j{1p>jzlP51;yvXHpJ32ZL1c{7{
z)MzyPIro%=%#1i`T0+<|5ezw}`5%1a$_msK1)F#~iYhcbb+NiiTcX~ytZ3Wj5(@tv
zLT5OqLY&VTiBl*@DK5jOqAQC<<G>V}_H8&J8*d!6F|8^P+>r!@8gG==_FR|TOFO5N
ztmi!uPli+Ln$x?H-gK%V=cf&)%tK3Ubl`;)j){YK#AZm_($yDbHN+iIVb4-MA(|Tn
z%Y=0Su-m75IE?%N1|!SEl|tuKXsXZNj2Z=vp;+=jlJSZD2EODW0H`s<BGnEWXznAI
zRihe|b_nZwTPrk3hRW~AIL)!p_U?GtGW>M#)b0zgDU0)5!G<?Df;@1J<B}}$iz_rX
z%&1amW8ARS!n!TmVl%lfFgegAqRfdPJ)MZh0O24h14(h^`bjnUkS0px2vG>rr5zO1
zNgN^!L7)EBFUC+Zhm%Mr7yC91@!CieHdPd#!o7Jn^!!TMrU0vgH)|h-!|2wozJKmj
z`G&1Z^{+00Fi|SEx@=o?UTI)xo@>T@7i7MZAqTYCMc0JP{oZJEdWye2L~bM45otrq
zk@}$q6%b*2<$<rGgK+flGwX~NJ-1OZC=+b&8OgiN%OxC&;OQ;|WiSgRw=ksb#&<za
zK1};>_YGZVC^6PBqU&pG6rtOM!WN;+E;i3EB*=+K0j60WC&J{7x}V=Ak(w<1X>er-
zV`_bHI~Y%5hQkS?_Lf?1C-Yh<h7tEWuJ%96W&EPplGML=g?##fc|vxO|L1G5ZD_RM
z(Tj4^#p&uVw|Ul8n}qd7PnXeE&S=}3vp0R#fY{ju!$P-)K)_p5HZg;}>;suT<W)-8
z;kx`iyiHuHMJN&z3xBv}KTXF8|KII}R1u3-r}}w9OMpw0QuXdgm}Y&{liY*C{OPgX
zUZ?_f_wm`a2&GYCveuUXl#!dgl>(z!ZdS6NOH8>FGetNtnE-ngIxI9OKM9M!nq|ao
z@ByV)WU%+EiuxlBZ=#rs_ZnY%+O^bXr2P8_g2l~7Z822<SgQ<oLQ+s#(QNr~78f;+
zhb@i4QQP2wt12&)isqN3uGGU-%TiY}QE%po+(23_*R|unGo5$n(&V^cSh$OL`&qzR
zCSM%GI8-@V8IZ68tZ44Z&~bCRp9y&&;D}J)Em6co_+5TFbGrKL@Pc0BLLPSEs}U6r
z0O&F3U@#64D^tG})xz%X5DQ)EM@RX_MIa(Q09x<kS~1^-=3K?}&XIHSW9b_m?G{qq
z^NwyTC_U5K7F&F1@^XyjKDL~W6rJ%<@idQHty1+jeI#yXT22cHY;Z!~hi6im#(b4T
z#9`NY%-Tc)RHOZgOn*3*qXkecL}MB}=}iz|36X4hVMd|v|88a8G4{^p`?}Idl`BOX
zuBoz5ykT1C<(d}o<FU?zUN8E|&tvt{yyH5e6A|ni%((5<o22iTb2=}K4G-E7+%(eO
z$6ZJ@#~p3e(J>1w?Uyx%!zc@?f!tWxz6{`xAWPUyeq1Vbvuj7m$3Dh(PTY04bw^_A
zwRr|LuoC34N#A1;<G*GRP5b`%TSEBr>?zXdaId|wW$kzq2e~Uqdrq=@A0^DlGO4UM
zzC<kYY0fsJAB70}P`(4Su69S93@ke%8)DNw&*2qf6+W)d<>O9@&t7@ohLX-t)ftJ|
z)q;&?w?;l@^4Pc`;x3vPJ8(itFdKg3;$nap8V7O~;L775>pjUjnIyS=0%4f;&$i;^
q^<`2=x-x(uk2YUU2h;2jemsk<aD(WL8L(lGH>O_4rHker(f<M+QXWPC

diff --git a/src/Oro/Bundle/UIBundle/composer.json b/src/Oro/Bundle/UIBundle/composer.json
index 6b12e4e2629..f0cf3e97734 100644
--- a/src/Oro/Bundle/UIBundle/composer.json
+++ b/src/Oro/Bundle/UIBundle/composer.json
@@ -18,7 +18,8 @@
         "oro/theme-bundle": "dev-master",
         "components/jquery": "2.1.*",
         "components/underscore": "1.7.*",
-        "components/backbone": "1.1.*"
+        "components/backbone": "1.1.*",
+        "vakata/jstree": "^3.2"
     },
     "autoload": {
         "psr-0": { "Oro\\Bundle\\UIBundle": "" }

From 816d58b289102c5e291f88259bf6fd19dcfff2e1 Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Mon, 4 Jan 2016 23:55:43 +0200
Subject: [PATCH 349/471] CRM-4789: improve solution and fix mobile

---
 .../Resources/public/css/less/oro.grid.less   |  3 ++
 .../Resources/public/css/less/oro.filter.less | 22 ++++++----
 .../Resources/public/js/datafilter-builder.js | 10 ++---
 .../public/js/filter/select-filter.js         | 20 +++++++--
 .../Resources/public/js/filters-manager.js    | 41 ++++++++++++-------
 .../public/css/less/desktop/filter.less       |  3 ++
 .../public/css/less/desktop/main.less         |  1 +
 .../public/css/less/mobile/filter.less        |  3 +-
 .../Resources/public/js/extend/multiselect.js | 18 --------
 9 files changed, 68 insertions(+), 53 deletions(-)
 create mode 100644 src/Oro/Bundle/UIBundle/Resources/public/css/less/desktop/filter.less

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/oro.grid.less b/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/oro.grid.less
index 7026c0604a3..45d297c015b 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/oro.grid.less
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/oro.grid.less
@@ -12,6 +12,9 @@
   th.renderable, td.renderable {
     display: table-cell;
   }
+  .loader-mask {
+    z-index: @oroZindexDropdown - 1;// to show under grid's filter
+  }
 }
 
 .grid-toolbar .pagination ul li input {
diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/css/less/oro.filter.less b/src/Oro/Bundle/FilterBundle/Resources/public/css/less/oro.filter.less
index 5416367ea9a..100a5dacd8c 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/css/less/oro.filter.less
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/css/less/oro.filter.less
@@ -115,11 +115,14 @@
     margin-bottom: 0;
 }
 .filter-select .select-filter-widget {
-    font-weight: bold;
-    color: #333333;
-    padding: 0 0 2px 0;
-    background: none;
-    border: none;
+    &, &.ui-multiselect {
+      font-weight: bold;
+      color: #333333;
+      padding: 0 0 2px 0;
+      background: none;
+      border: none;
+      margin-left: 0;
+    }
 }
 
 .filter-select .select-filter-widget .ui-icon {
@@ -200,7 +203,8 @@
     margin: 0 6px 5px 5px;
 }
 
-.ui-multiselect.filter-list {
+.ui-multiselect.filter-list, .ui-multiselect.select-filter-widget {
+
     background: none;
     border: none;
     font-size: 13px;
@@ -209,15 +213,15 @@
     line-height: 1em;
 }
 
-.ui-multiselect.filter-list:hover .add-filter-button span.caret {
+.ui-multiselect.select-filter-widget:hover .add-filter-button span.caret {
     border-top-color: #005099; /* @linkColorHover; */
 }
 
-.ui-multiselect.filter-list:hover a {
+.ui-multiselect.select-filter-widget:hover a {
     color: #005099; /* @linkColorHover; */
 }
 
-.ui-multiselect.filter-list.select-filter-widget span.caret {
+.ui-multiselect.select-filter-widget span.caret {
     margin-top: 5px;
 }
 
diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/datafilter-builder.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/datafilter-builder.js
index 445839e0b82..5f5f60c3655 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/js/datafilter-builder.js
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/datafilter-builder.js
@@ -41,9 +41,9 @@ define([
 
             var options = methods.combineOptions.call(this);
             options.collection = this.collection;
+            options.prependTo = this.$el;
             var filtersList = new FiltersManager(options);
-            this.$el.prepend(filtersList.render().$el);
-            filtersList.refreshSelectWidget();
+            filtersList.render();
             mediator.trigger('datagrid_filters:rendered', this.collection, this.$el);
             this.metadata.state.filters = this.metadata.state.filters || [];
             if (this.collection.length === 0 && this.metadata.state.filters.length === 0) {
@@ -65,7 +65,6 @@ define([
             var filters = {};
             var modules = this.modules;
             var collection = this.collection;
-            var container = tools.isMobile() ? 'body' : this.$el;
             _.each(this.metadata.filters, function(options) {
                 if (_.has(options, 'name') && _.has(options, 'type')) {
                     // @TODO pass collection only for specific filters
@@ -73,12 +72,11 @@ define([
                         options.collection = collection;
                     }
                     var Filter = modules[options.type].extend(options);
-                    filters[options.name] = new Filter({container: container});
+                    filters[options.name] = new Filter();
                 }
             });
             return {
-                filters: filters,
-                container: container
+                filters: filters
             };
         }
     };
diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/select-filter.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/select-filter.js
index 82c87f7beed..4a3ee93b171 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/select-filter.js
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/select-filter.js
@@ -88,7 +88,7 @@ define([
          *
          * @property
          */
-        container: 'body',
+        dropdownContainer: 'body',
 
         /**
          * Select widget menu opened flag
@@ -121,7 +121,7 @@ define([
          * @param {Object} options
          */
         initialize: function(options) {
-            var opts = _.pick(options || {}, ['choices', 'container']);
+            var opts = _.pick(options || {}, ['choices', 'dropdownContainer']);
             _.extend(this, opts);
 
             // init filter content options if it was not initialized so far
@@ -185,6 +185,16 @@ define([
             return this;
         },
 
+        /**
+         * Set dropdownContainer for dropdown element
+         *
+         * @param {(jQuery|Element|String)} container
+         * @protected
+         */
+        setDropdownContainer: function(container) {
+            this.dropdownContainer = $(container);
+        },
+
         /**
          * Initialize multiselect widget
          *
@@ -201,7 +211,9 @@ define([
                     position: {
                         my: 'left top+7',
                         at: 'left bottom',
-                        of: this.$(this.containerSelector)
+                        of: this.$(this.containerSelector),
+                        collision: 'fit none',
+                        within: this.dropdownContainer
                     },
                     open: _.bind(function() {
                         this.selectWidget.onOpenDropdown();
@@ -218,7 +230,7 @@ define([
                             }
                         }, this), 100);
                     }, this),
-                    appendTo: this.container
+                    appendTo: this.dropdownContainer
                 }, this.widgetOptions),
                 contextSearch: this.contextSearch
             });
diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/filters-manager.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/filters-manager.js
index 68a40c998cb..006594dedb3 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/js/filters-manager.js
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/filters-manager.js
@@ -92,11 +92,18 @@ define(function(require) {
         buttonSelector: '.ui-multiselect.filter-list',
 
         /**
-         * Selector, jQuery object or HTML element that will be target for append multiselect dropdown menu
+         * jQuery object that will be target for append multiselect dropdown menus
          *
          * @property
          */
-        container: 'body',
+        dropdownContainer: 'body',
+
+        /**
+         * Selector, jQuery object or HTML element that will be target for prepend view element
+         *
+         * @property
+         */
+        prependTo: null,
 
         /** @property */
         events: {
@@ -119,7 +126,7 @@ define(function(require) {
 
             this.filters = {};
 
-            _.extend(this, _.pick(options, ['addButtonHint', 'container']));
+            _.extend(this, _.pick(options, ['addButtonHint', 'prependTo']));
 
             if (options.filters) {
                 _.extend(this.filters, options.filters);
@@ -307,12 +314,20 @@ define(function(require) {
          * @return {*}
          */
         render: function() {
-            var $container = $(this.template({filters: this.filters}));
-            this.setElement($container);
+            this.$el.html(
+                this.template({filters: this.filters})
+            );
+            this.dropdownContainer = this.$el.find('.filter-container');
+            if (this.prependTo) {
+                this.prependTo.prepend(this.$el);
+            }
 
             var fragment = document.createDocumentFragment();
 
             _.each(this.filters, function(filter) {
+                if (_.isFunction(filter.setDropdownContainer)) {
+                    filter.setDropdownContainer(this.dropdownContainer);
+                }
                 filter.render();
                 if (!filter.enabled) {
                     filter.hide();
@@ -323,9 +338,9 @@ define(function(require) {
             this.trigger('rendered');
 
             if (_.isEmpty(this.filters)) {
-                $container.hide();
+                this.$el.hide();
             } else {
-                $container.find('.filter-container').append(fragment);
+                this.dropdownContainer.append(fragment);
                 this._initializeSelectWidget();
             }
 
@@ -338,13 +353,14 @@ define(function(require) {
          * @protected
          */
         _initializeSelectWidget: function() {
+            var $button;
             this.selectWidget = new MultiselectDecorator({
                 element: this.$(this.filterSelector),
                 parameters: {
                     multiple: true,
                     selectedList: 0,
                     selectedText: this.addButtonHint,
-                    classes: 'filter-list select-filter-widget',
+                    classes: 'select-filter-widget',
                     position: {
                         my: 'left top+2',
                         at: 'left bottom'
@@ -353,21 +369,18 @@ define(function(require) {
                         this.selectWidget.onOpenDropdown();
                         this._setDropdownWidth();
                     }, this),
-                    appendTo: this.container
+                    appendTo: this.dropdownContainer
                 }
             });
 
             this.selectWidget.setViewDesign(this);
-            this.$('.filter-list span:first').replaceWith(
+            $button = this.selectWidget.multiselect('instance').button;
+            $button.find('span:first').replaceWith(
                 '<a class="add-filter-button" href="javascript:void(0);">' + this.addButtonHint +
                     '<span class="caret"></span></a>'
             );
         },
 
-        refreshSelectWidget: function() {
-            this.selectWidget.multiselect('refresh');
-        },
-
         /**
          * Set design for select dropdown
          *
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/desktop/filter.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/desktop/filter.less
new file mode 100644
index 00000000000..1674b96aa3e
--- /dev/null
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/desktop/filter.less
@@ -0,0 +1,3 @@
+.filter-box > .filter-container > .select-filter-widget {
+  margin: -8px 0 0 -118px;
+}
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/desktop/main.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/desktop/main.less
index 1d4074f5c18..8c0e39a262a 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/desktop/main.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/desktop/main.less
@@ -5,5 +5,6 @@
   @import "scrollspy";
   @import "pin-bar";
   @import "form";
+  @import "filter";
 }
 @import "layout";
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/filter.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/filter.less
index 2cacbb917d8..1f131395708 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/filter.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/filter.less
@@ -24,7 +24,6 @@
     margin: 10px auto 0;
     max-width: 506px;
     width: 100%;
-    z-index: @oroZindexDropdown; // to show over grid's loading mask
     @media only screen and (min-width: 527px) {
       left: 50%;
       margin-left: -253px;
@@ -128,7 +127,7 @@
       }
     }
   }
-  .filter-list {
+  .filter-list, .select-filter-widget {
     margin: 0 0 5px -5px;
   }
   .filter-criteria {
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/extend/multiselect.js b/src/Oro/Bundle/UIBundle/Resources/public/js/extend/multiselect.js
index d9afe9d4ea4..e790f089f0a 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/js/extend/multiselect.js
+++ b/src/Oro/Bundle/UIBundle/Resources/public/js/extend/multiselect.js
@@ -13,26 +13,8 @@ define([
          * @override
          */
         open: function() {
-            var rect;
-            var parentRect;
-            var overlap;
-            var value;
             this._superApply(arguments);
             mask.show().onhide($.proxy(this.close, this));
-            rect = this.menu.get(0).getBoundingClientRect();
-            parentRect = this.menu.parent().get(0).getBoundingClientRect();
-            overlap =  rect.right - parentRect.right;
-            if (overlap > 0) {
-                value = parseInt(this.menu.css('left'));
-                if (!isNaN(value)) {
-                    this.menu.css('left', value - overlap + 'px');
-                } else {
-                    value = parseInt(this.menu.css('right'));
-                    if (!isNaN(value)) {
-                        this.menu.css('right', value + overlap + 'px');
-                    }
-                }
-            }
         },
 
         /**

From cacc153673e4bac3f0a51e56c18ea3c827b4d465 Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Tue, 5 Jan 2016 12:02:20 +0200
Subject: [PATCH 350/471] BAP-9632 Different baseline in different browsers on
 edit page

---
 .../ConfigBundle/Resources/public/css/less/config.less   | 2 +-
 .../Bundle/UIBundle/Resources/public/css/less/oro.less   | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Oro/Bundle/ConfigBundle/Resources/public/css/less/config.less b/src/Oro/Bundle/ConfigBundle/Resources/public/css/less/config.less
index ec10c7970e7..7b03c2aecf8 100644
--- a/src/Oro/Bundle/ConfigBundle/Resources/public/css/less/config.less
+++ b/src/Oro/Bundle/ConfigBundle/Resources/public/css/less/config.less
@@ -38,7 +38,7 @@
       margin: 0 4px 0 0;
     }
     input[type="checkbox"] {
-      margin: -3px 10px 0 0
+      margin: -4px 10px 0 0
     }
   }
   .oro-item-collection input[type="text"]{
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less
index 7c1d1db4b8a..784f7753442 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less
@@ -120,11 +120,12 @@ label, input, button, select, textarea { font-size:13px;}
     }
     .control-label.wrap {
       float:left;
-      padding-top:7px;
+      padding-top: 6px;
       color: #777;
       font-weight: normal;
       font-size: 13px;
-      text-align:right;
+      line-height: 20px;
+      text-align: right;
       .tooltip-icon {
         margin-right: 5px;
         cursor: pointer;
@@ -2122,14 +2123,14 @@ textarea {
 }
 .horizontal .oro-clearfix input[type="checkbox"],
 .horizontal .oro-clearfix input[type="radio"] {
-  margin: -4px 10px 0 0;
+  margin: -3px 6px 0 0;
 }
 .horizontal .oro-clearfix .label {
   float: left;
 }
 .controls {
   .horizontal {
-    padding-top: 5px;
+    padding-top: 7px;
   }
   > input[type=checkbox]:only-child {
     margin-top: 10px;

From 1c385a4f8d3c6a8a8e7e7907e80e0cb2ae56cfdd Mon Sep 17 00:00:00 2001
From: Andrii Muzalevskyi <amuzalevsky@magecore.com>
Date: Tue, 5 Jan 2016 12:10:19 +0200
Subject: [PATCH 351/471] BAP-9632 Different baseline in different browsers on
 edit page

---
 src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less
index 784f7753442..f7cb7a59592 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro.less
@@ -2123,7 +2123,7 @@ textarea {
 }
 .horizontal .oro-clearfix input[type="checkbox"],
 .horizontal .oro-clearfix input[type="radio"] {
-  margin: -3px 6px 0 0;
+  margin: -4px 6px 0 0;
 }
 .horizontal .oro-clearfix .label {
   float: left;

From c6ffecc6fefd42713ab98b9273fc1079e7ea3710 Mon Sep 17 00:00:00 2001
From: Oleg Popadko <oleg@popadko.com>
Date: Tue, 5 Jan 2016 13:46:19 +0200
Subject: [PATCH 352/471] BAP-7696: Update jsTree library

- require vakata/jstree
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 9c34dd44514..4a7c481469e 100644
--- a/composer.json
+++ b/composer.json
@@ -75,7 +75,8 @@
         "components/font-awesome": "~4.3.0",
         "piwik/device-detector": "~3.0",
         "oro/jsplumb": "~1.7",
-        "oro/moment-timezone": "0.3.*"
+        "oro/moment-timezone": "0.3.*",
+        "vakata/jstree": "^3.2"
     },
     "require-dev": {
         "sensio/generator-bundle": "2.5.3"

From 23eb0b0b6a90aded26c12ffbb230d72a3529da95 Mon Sep 17 00:00:00 2001
From: Ievgenii Myshusta <imyshusta@magecore.com>
Date: Tue, 5 Jan 2016 14:02:10 +0200
Subject: [PATCH 353/471] CRM-4843: Allow to choose activity when editing
 activity entity in Entity Management

---
 .../Form/Type/AbstractAssociationType.php     | 11 +--
 .../Form/Util/AssociationTypeHelper.php       | 28 -------
 .../Form/Util/AssociationTypeHelperTest.php   | 75 -------------------
 3 files changed, 4 insertions(+), 110 deletions(-)

diff --git a/src/Oro/Bundle/EntityExtendBundle/Form/Type/AbstractAssociationType.php b/src/Oro/Bundle/EntityExtendBundle/Form/Type/AbstractAssociationType.php
index bddcd0c57c0..9d6d7ca8c9c 100644
--- a/src/Oro/Bundle/EntityExtendBundle/Form/Type/AbstractAssociationType.php
+++ b/src/Oro/Bundle/EntityExtendBundle/Form/Type/AbstractAssociationType.php
@@ -54,14 +54,11 @@ protected function isReadOnly($options)
         $configId  = $options['config_id'];
         $className = $configId->getClassName();
 
-        if (!empty($className)) {
-            if ($this->typeHelper->isAssociationOwningSideEntity($className, $options['association_class'])) {
+        if (!empty($className)
+            && $this->typeHelper->isDictionary($className)
+            && !$this->typeHelper->isSupportActivityEnabled($className)
+        ) {
                 return true;
-            }
-            if ($this->typeHelper->isDictionary($className)
-                && !$this->typeHelper->isSupportActivityEnabled($className)) {
-                return true;
-            }
         }
 
         return parent::isReadOnly($options);
diff --git a/src/Oro/Bundle/EntityExtendBundle/Form/Util/AssociationTypeHelper.php b/src/Oro/Bundle/EntityExtendBundle/Form/Util/AssociationTypeHelper.php
index 2370bc52fef..1972fb68963 100644
--- a/src/Oro/Bundle/EntityExtendBundle/Form/Util/AssociationTypeHelper.php
+++ b/src/Oro/Bundle/EntityExtendBundle/Form/Util/AssociationTypeHelper.php
@@ -68,34 +68,6 @@ public function isSupportActivityEnabled($className)
         return false;
     }
 
-    /**
-     * Checks if the given entity is an owning side of association
-     *
-     * @param string $className
-     * @param string $associationClass Represents the owning side entity, can be:
-     *                                 - full class name or entity name for single association
-     *                                 - a group name for multiple association
-     *                                 it is supposed that the group name should not contain \ and : characters
-     *
-     * @return bool
-     */
-    public function isAssociationOwningSideEntity($className, $associationClass)
-    {
-        if (strpos($associationClass, ':') !== false || strpos($associationClass, '\\') !== false) {
-            // the association class is full class name or entity name
-            if ($className === $this->entityClassResolver->getEntityClass($associationClass)) {
-                return true;
-            }
-        } else {
-            // the association class is a group name
-            if (!empty($className) && in_array($className, $this->getOwningSideEntities($associationClass))) {
-                return true;
-            };
-        }
-
-        return false;
-    }
-
     /**
      * Returns all entities included in the given group
      *
diff --git a/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Form/Util/AssociationTypeHelperTest.php b/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Form/Util/AssociationTypeHelperTest.php
index 3cb6af2d9d9..cf96a549042 100644
--- a/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Form/Util/AssociationTypeHelperTest.php
+++ b/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Form/Util/AssociationTypeHelperTest.php
@@ -142,81 +142,6 @@ public function isActivitySupport()
         ];
     }
 
-    public function testIsAssociationOwningSideEntityForNotOwningSideEntity()
-    {
-        $className        = 'Test\Entity1';
-        $associationClass = 'Test\Entity';
-
-        $this->entityClassResolver->expects($this->once())
-            ->method('getEntityClass')
-            ->with($associationClass)
-            ->will($this->returnValue($associationClass));
-
-        $this->assertFalse(
-            $this->typeHelper->isAssociationOwningSideEntity($className, $associationClass)
-        );
-    }
-
-    public function testIsAssociationOwningSideEntityWithClassName()
-    {
-        $className        = 'Test\Entity';
-        $associationClass = 'Test\Entity';
-
-        $this->entityClassResolver->expects($this->once())
-            ->method('getEntityClass')
-            ->with($associationClass)
-            ->will($this->returnValue($className));
-
-        $this->assertTrue(
-            $this->typeHelper->isAssociationOwningSideEntity($className, $associationClass)
-        );
-    }
-
-    public function testIsAssociationOwningSideEntityWithEntityName()
-    {
-        $className        = 'Test\Entity';
-        $associationClass = 'Test:Entity';
-
-        $this->entityClassResolver->expects($this->once())
-            ->method('getEntityClass')
-            ->with($associationClass)
-            ->will($this->returnValue($className));
-
-        $this->assertTrue(
-            $this->typeHelper->isAssociationOwningSideEntity($className, $associationClass)
-        );
-    }
-
-    public function testIsAssociationOwningSideEntityWithGroupName()
-    {
-        $config1 = new Config(new EntityConfigId('grouping', 'Test\Entity1'));
-        $config1->set('groups', ['some_group', 'another_group']);
-        $config2 = new Config(new EntityConfigId('grouping', 'Test\Entity2'));
-        $config2->set('groups', ['another_group']);
-        $config3 = new Config(new EntityConfigId('grouping', 'Test\Entity3'));
-
-        $configs = [$config1, $config2, $config3];
-
-        $configProvider = $this->getConfigProviderMock();
-        $this->configManager->expects($this->once())
-            ->method('getProvider')
-            ->with('grouping')
-            ->will($this->returnValue($configProvider));
-        $configProvider->expects($this->once())
-            ->method('getConfigs')
-            ->will($this->returnValue($configs));
-
-        $this->assertTrue(
-            $this->typeHelper->isAssociationOwningSideEntity('Test\Entity1', 'some_group')
-        );
-        $this->assertFalse(
-            $this->typeHelper->isAssociationOwningSideEntity('Test\Entity', 'some_group')
-        );
-        $this->assertFalse(
-            $this->typeHelper->isAssociationOwningSideEntity('Test\Entity2', 'some_group')
-        );
-    }
-
     public function testGetOwningSideEntities()
     {
         $config1 = new Config(new EntityConfigId('grouping', 'Test\Entity1'));

From 7156e569b318186b4bfa68137d6e76c74f228c49 Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Tue, 5 Jan 2016 17:57:53 +0200
Subject: [PATCH 354/471] CRM-4850: adjust max width on column manager popup to
 avoid out of screen

---
 .../public/css/less/column-manager.less       |  2 +-
 .../css/less/mobile/column-manager.less       |  4 ++++
 .../column-manager/column-manager-view.js     | 10 ++++++++-
 .../Resources/public/js/extend/bootstrap.js   | 21 ++++++++++++++++++-
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/column-manager.less b/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/column-manager.less
index fa46b3b6fa8..005c3673b39 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/column-manager.less
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/column-manager.less
@@ -17,7 +17,7 @@
     left: auto;
     padding: 20px;
     border-color: #ccc;
-    min-width: 270px;
+    min-width: 268px;
     &:before, &:after {
       content: '';
       display: inline-block;
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/mobile/column-manager.less b/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/mobile/column-manager.less
index 59768ec6ab0..6502425d41e 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/mobile/column-manager.less
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/mobile/column-manager.less
@@ -15,6 +15,10 @@
       top: 10px;
     }
   }
+  td.sort-cell {
+    padding-left: 0px;
+    padding-right: 0px;
+  }
 }
 
 .dropup .column-manager .dropdown-menu {
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/views/column-manager/column-manager-view.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/views/column-manager/column-manager-view.js
index 88b186da723..d8e511e19fc 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/views/column-manager/column-manager-view.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/views/column-manager/column-manager-view.js
@@ -10,7 +10,8 @@ define(function(require) {
         autoRender: true,
         className: 'dropdown-menu',
         events: {
-            'click [data-role="column-manager-select-all"]': 'onSelectAll'
+            'click [data-role="column-manager-select-all"]': 'onSelectAll',
+            'shown.bs.dropdown': 'onOpen'
         },
 
         listen: {
@@ -55,6 +56,13 @@ define(function(require) {
             });
         },
 
+        onOpen: function() {
+            var rect = this.el.getBoundingClientRect();
+            this.$el.css({
+                maxWidth: rect.right + 'px'
+            });
+        },
+
         _getFilteredModels: function() {
             return _.filter(this.collection.filter(this.filterer), function(model) {
                 return !model.get('disabledVisibilityChange');
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/extend/bootstrap.js b/src/Oro/Bundle/UIBundle/Resources/public/js/extend/bootstrap.js
index 69694bfd521..18e1e9b62b4 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/js/extend/bootstrap.js
+++ b/src/Oro/Bundle/UIBundle/Resources/public/js/extend/bootstrap.js
@@ -1,8 +1,9 @@
 define([
     'jquery',
+    'underscore',
     'oroui/js/tools/scroll-helper',
     'bootstrap'
-], function($, scrollHelper) {
+], function($, _, scrollHelper) {
     'use strict';
 
     /**
@@ -24,6 +25,24 @@ define([
     }
 
     Dropdown.prototype = $.fn.dropdown.Constructor.prototype;
+
+    $(document).off('click.dropdown.data-api', '[data-toggle=dropdown]', Dropdown.prototype.toggle);
+    Dropdown.prototype.toggle = _.wrap(Dropdown.prototype.toggle, function(func, event) {
+        var result = func.apply(this, _.rest(arguments));
+        var selector = $(this).attr('data-target') || $(this).attr('href');
+        var $parent = selector ? $(selector) : null;
+
+        if (!$parent || $parent.length === 0) {
+            $parent = $(this).parent();
+        }
+        if ($parent.hasClass('open')) {
+            $parent.find('.dropdown-menu').trigger('shown.bs.dropdown');
+        }
+
+        return result;
+    });
+    $(document).on('click.dropdown.data-api', '[data-toggle=dropdown]', Dropdown.prototype.toggle);
+
     Dropdown.prototype.destroy = function() {
         var globalHandlers = this.data('globalHandlers');
         $('html').off(globalHandlers);

From 0caa1dcc9ed3eb948e0027fd43be1566b752240b Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Tue, 5 Jan 2016 18:30:21 +0200
Subject: [PATCH 355/471] CRM-4828: adjust popup height when context items are
 loaded into select2

---
 .../Resources/public/js/app/views/calendar-event-form-view.js  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/CalendarBundle/Resources/public/js/app/views/calendar-event-form-view.js b/src/Oro/Bundle/CalendarBundle/Resources/public/js/app/views/calendar-event-form-view.js
index 13a7b807d07..675030017f9 100644
--- a/src/Oro/Bundle/CalendarBundle/Resources/public/js/app/views/calendar-event-form-view.js
+++ b/src/Oro/Bundle/CalendarBundle/Resources/public/js/app/views/calendar-event-form-view.js
@@ -15,7 +15,8 @@ define([
         options: {},
 
         events: {
-            'change input[name$="[contexts]"]': 'onContextChange'
+            'change input[name$="[contexts]"]': 'onContextChange',
+            'select2-data-loaded input[name$="[contexts]"]': 'onContextChange'
         },
 
         /**

From 9458533a72eeb7d559c7ee5ae3057261a8f2cc94 Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Tue, 5 Jan 2016 19:19:51 +0200
Subject: [PATCH 356/471] CRM-4863: tune up context entity dropdown list styles

---
 .../public/css/less/activity-context.less          | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/Oro/Bundle/ActivityBundle/Resources/public/css/less/activity-context.less b/src/Oro/Bundle/ActivityBundle/Resources/public/css/less/activity-context.less
index 9f6c7da9686..6acf5ec67be 100644
--- a/src/Oro/Bundle/ActivityBundle/Resources/public/css/less/activity-context.less
+++ b/src/Oro/Bundle/ActivityBundle/Resources/public/css/less/activity-context.less
@@ -24,7 +24,7 @@
   white-space: nowrap;
 }
 
-.context-item:hover, .context-item.active {
+.context-item.active {
   background-color: #ebebeb;
 }
 
@@ -53,8 +53,13 @@
 }
 
 .context-items-dropdown {
-  top: 35px;
-  left: 15px;
+  top: 38px;
+  left: 14px;
+  border-color: #d3d3d3;
+  .context-item {
+    padding: 2px 8px;
+    font-size: 13px;
+  }
 }
 
 .activity-context-current-block {
@@ -64,6 +69,9 @@
   outline: none;
   margin: 10px 10px 15px 10px;
   box-shadow: none;
+  .btn-group.open & {
+    box-shadow: none;
+  }
 }
 
 .activity-context-current-item {

From cd4818ed07ed1660c4bc3c9c7ebb602e65291554 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Tue, 5 Jan 2016 20:07:41 +0200
Subject: [PATCH 357/471] CRM-3685: Can't add context for entity with newly
 enabled activities  - Configure grid configuration for entities  - Remove
 unused context from entities config

---
 .../Schema/OroActivityBundleInstaller.php     |  2 +-
 .../Schema/v1_0/OroActivityBundle.php         |  3 -
 .../v1_0/UpdateActivityButtonConfigQuery.php  |  4 +-
 .../Schema/v1_1/OroActivityBundle.php         | 19 +++++
 .../v1_1/RemoveUnusedContextConfigQuery.php   | 73 +++++++++++++++++++
 .../Resources/config/entity_config.yml        |  6 ++
 .../Resources/config/entity_config.yml        |  6 ++
 src/Oro/Bundle/UserBundle/Entity/User.php     |  7 +-
 8 files changed, 112 insertions(+), 8 deletions(-)
 create mode 100644 src/Oro/Bundle/ActivityBundle/Migrations/Schema/v1_1/OroActivityBundle.php
 create mode 100644 src/Oro/Bundle/ActivityBundle/Migrations/Schema/v1_1/RemoveUnusedContextConfigQuery.php
 create mode 100644 src/Oro/Bundle/DataGridBundle/Resources/config/entity_config.yml

diff --git a/src/Oro/Bundle/ActivityBundle/Migrations/Schema/OroActivityBundleInstaller.php b/src/Oro/Bundle/ActivityBundle/Migrations/Schema/OroActivityBundleInstaller.php
index d12ffde18a3..6512e5c8899 100644
--- a/src/Oro/Bundle/ActivityBundle/Migrations/Schema/OroActivityBundleInstaller.php
+++ b/src/Oro/Bundle/ActivityBundle/Migrations/Schema/OroActivityBundleInstaller.php
@@ -29,7 +29,7 @@ public function setContainer(ContainerInterface $container = null)
      */
     public function getMigrationVersion()
     {
-        return 'v1_0';
+        return 'v1_1';
     }
 
     /**
diff --git a/src/Oro/Bundle/ActivityBundle/Migrations/Schema/v1_0/OroActivityBundle.php b/src/Oro/Bundle/ActivityBundle/Migrations/Schema/v1_0/OroActivityBundle.php
index 003e4115dc0..5eb16e5c06f 100644
--- a/src/Oro/Bundle/ActivityBundle/Migrations/Schema/v1_0/OroActivityBundle.php
+++ b/src/Oro/Bundle/ActivityBundle/Migrations/Schema/v1_0/OroActivityBundle.php
@@ -7,9 +7,6 @@
 use Oro\Bundle\MigrationBundle\Migration\Migration;
 use Oro\Bundle\MigrationBundle\Migration\QueryBag;
 
-/**
- *
- */
 class OroActivityBundle implements Migration
 {
     /**
diff --git a/src/Oro/Bundle/ActivityBundle/Migrations/Schema/v1_0/UpdateActivityButtonConfigQuery.php b/src/Oro/Bundle/ActivityBundle/Migrations/Schema/v1_0/UpdateActivityButtonConfigQuery.php
index 1731aec1fb3..a93150a204a 100644
--- a/src/Oro/Bundle/ActivityBundle/Migrations/Schema/v1_0/UpdateActivityButtonConfigQuery.php
+++ b/src/Oro/Bundle/ActivityBundle/Migrations/Schema/v1_0/UpdateActivityButtonConfigQuery.php
@@ -10,7 +10,7 @@
 class UpdateActivityButtonConfigQuery extends ParametrizedMigrationQuery
 {
     /**
-     * {inheritdoc}
+     * {@inheritdoc}
      */
     public function getDescription()
     {
@@ -21,7 +21,7 @@ public function getDescription()
     }
 
     /**
-     * {inheritdoc}
+     * {@inheritdoc}
      */
     public function execute(LoggerInterface $logger)
     {
diff --git a/src/Oro/Bundle/ActivityBundle/Migrations/Schema/v1_1/OroActivityBundle.php b/src/Oro/Bundle/ActivityBundle/Migrations/Schema/v1_1/OroActivityBundle.php
new file mode 100644
index 00000000000..cb0ebc1c1d9
--- /dev/null
+++ b/src/Oro/Bundle/ActivityBundle/Migrations/Schema/v1_1/OroActivityBundle.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Oro\Bundle\ActivityBundle\Migrations\Schema\v1_1;
+
+use Doctrine\DBAL\Schema\Schema;
+
+use Oro\Bundle\MigrationBundle\Migration\Migration;
+use Oro\Bundle\MigrationBundle\Migration\QueryBag;
+
+class OroActivityBundle implements Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function up(Schema $schema, QueryBag $queries)
+    {
+        $queries->addQuery(new RemoveUnusedContextConfigQuery());
+    }
+}
diff --git a/src/Oro/Bundle/ActivityBundle/Migrations/Schema/v1_1/RemoveUnusedContextConfigQuery.php b/src/Oro/Bundle/ActivityBundle/Migrations/Schema/v1_1/RemoveUnusedContextConfigQuery.php
new file mode 100644
index 00000000000..2840c2c2a20
--- /dev/null
+++ b/src/Oro/Bundle/ActivityBundle/Migrations/Schema/v1_1/RemoveUnusedContextConfigQuery.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Oro\Bundle\ActivityBundle\Migrations\Schema\v1_1;
+
+use Psr\Log\LoggerInterface;
+
+use Oro\Bundle\MigrationBundle\Migration\ArrayLogger;
+use Oro\Bundle\MigrationBundle\Migration\ParametrizedMigrationQuery;
+
+class RemoveUnusedContextConfigQuery extends ParametrizedMigrationQuery
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getDescription()
+    {
+        $logger = new ArrayLogger();
+        $this->removeContextConfigs($logger, true);
+
+        return $logger->getMessages();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function execute(LoggerInterface $logger)
+    {
+        $this->removeContextConfigs($logger);
+    }
+
+    /**
+     * @param LoggerInterface $logger
+     * @param bool            $dryRun
+     */
+    protected function removeContextConfigs(LoggerInterface $logger, $dryRun = false)
+    {
+        $configs = $this->loadConfigs($logger);
+        foreach ($configs as $id => $data) {
+            if (!isset($data['entity']['context-grid'])) {
+                continue;
+            }
+            unset($data['entity']['context-grid']);
+
+            $query  = 'UPDATE oro_entity_config SET data = :data WHERE id = :id';
+            $params = ['data' => $data, 'id' => $id];
+            $types  = ['data' => 'array', 'id' => 'integer'];
+            $this->logQuery($logger, $query, $params, $types);
+            if (!$dryRun) {
+                $this->connection->executeUpdate($query, $params, $types);
+            }
+        }
+    }
+
+    /**
+     * @param LoggerInterface $logger
+     *
+     * @return array key = {config id}, value = data
+     */
+    protected function loadConfigs(LoggerInterface $logger)
+    {
+        $sql = 'SELECT id, data FROM oro_entity_config';
+        $this->logQuery($logger, $sql);
+
+        $result = [];
+
+        $rows = $this->connection->fetchAll($sql);
+        foreach ($rows as $row) {
+            $result[$row['id']] = $this->connection->convertToPHPValue($row['data'], 'array');
+        }
+
+        return $result;
+    }
+}
diff --git a/src/Oro/Bundle/ActivityBundle/Resources/config/entity_config.yml b/src/Oro/Bundle/ActivityBundle/Resources/config/entity_config.yml
index 84ba0b116c3..1fdf001a7c5 100644
--- a/src/Oro/Bundle/ActivityBundle/Resources/config/entity_config.yml
+++ b/src/Oro/Bundle/ActivityBundle/Resources/config/entity_config.yml
@@ -74,3 +74,9 @@ oro_entity_config:
                 action_link_widget: # string
                     options:
                         auditable:          false
+
+    grid:
+        entity:
+            items:
+                # indicates grid for the entity using for context
+                context: # string
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/config/entity_config.yml b/src/Oro/Bundle/DataGridBundle/Resources/config/entity_config.yml
new file mode 100644
index 00000000000..ddc141ed889
--- /dev/null
+++ b/src/Oro/Bundle/DataGridBundle/Resources/config/entity_config.yml
@@ -0,0 +1,6 @@
+oro_entity_config:
+    grid:
+        entity:
+            items:
+                # indicates default grid for the entity
+                default: # string
diff --git a/src/Oro/Bundle/UserBundle/Entity/User.php b/src/Oro/Bundle/UserBundle/Entity/User.php
index 66228ad70fb..248814aaec8 100644
--- a/src/Oro/Bundle/UserBundle/Entity/User.php
+++ b/src/Oro/Bundle/UserBundle/Entity/User.php
@@ -37,8 +37,7 @@
  *      routeView="oro_user_view",
  *      defaultValues={
  *          "entity"={
- *              "icon"="icon-user",
- *              "context-grid"="users-for-context-grid"
+ *              "icon"="icon-user"
  *          },
  *          "grouping"={
  *              "groups"={"dictionary"}
@@ -65,6 +64,10 @@
  *              "form_type"="oro_user_select",
  *              "grid_name"="users-select-grid"
  *          },
+ *          "grid"={
+ *              "default"="users-grid",
+ *              "context"="users-for-context-grid"
+ *          },
  *          "tag"={
  *              "enabled"=true
  *          }

From 4940f14904064473257131a8423aeadc89fbca2e Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Tue, 5 Jan 2016 20:30:35 +0200
Subject: [PATCH 358/471] CRM-4864: make visible workflow steps on mobile

---
 .../Resources/public/css/less/mobile/workflow.less  | 13 +++++++++++++
 .../Resources/public/css/less/workflow.less         |  5 +++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 src/Oro/Bundle/WorkflowBundle/Resources/public/css/less/mobile/workflow.less

diff --git a/src/Oro/Bundle/WorkflowBundle/Resources/public/css/less/mobile/workflow.less b/src/Oro/Bundle/WorkflowBundle/Resources/public/css/less/mobile/workflow.less
new file mode 100644
index 00000000000..be4a17863a9
--- /dev/null
+++ b/src/Oro/Bundle/WorkflowBundle/Resources/public/css/less/mobile/workflow.less
@@ -0,0 +1,13 @@
+.mobile-version {
+  .workflow-steps-container {
+    margin-top: 6px;
+    width: auto;
+    .box-type1 {
+      margin-bottom: 0;
+    }
+    .workflow-step-list {
+      white-space: nowrap;
+      overflow: hidden;
+    }
+  }
+}
diff --git a/src/Oro/Bundle/WorkflowBundle/Resources/public/css/less/workflow.less b/src/Oro/Bundle/WorkflowBundle/Resources/public/css/less/workflow.less
index 593d354c0dc..03a6c7b96a9 100644
--- a/src/Oro/Bundle/WorkflowBundle/Resources/public/css/less/workflow.less
+++ b/src/Oro/Bundle/WorkflowBundle/Resources/public/css/less/workflow.less
@@ -85,10 +85,8 @@ li.current:before {
 }
 .workflow-steps-container {
   text-align: center;
-  left: 25%;
   width: 50%;
   margin: -25px auto 0;
-  .forScreen (959px; display; none);// less than Nexus 7 landscape
   .box-type1 {
     background: transparent;
   }
@@ -104,3 +102,6 @@ li.current:before {
     padding-left: 6px;
   }
 }
+
+/* mobile version */
+@import "mobile/workflow";

From d077a0a6a6e7676105f944559c4f450d057f5940 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Tue, 5 Jan 2016 20:34:19 +0200
Subject: [PATCH 359/471] BAP-8029: Installer are not support filesystem with
 file name length different from 255

---
 .../Bundle/ActivityBundle/Resources/config/entity_config.yml  | 4 +++-
 .../Bundle/DataGridBundle/Resources/config/entity_config.yml  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/ActivityBundle/Resources/config/entity_config.yml b/src/Oro/Bundle/ActivityBundle/Resources/config/entity_config.yml
index 1fdf001a7c5..f971b747173 100644
--- a/src/Oro/Bundle/ActivityBundle/Resources/config/entity_config.yml
+++ b/src/Oro/Bundle/ActivityBundle/Resources/config/entity_config.yml
@@ -78,5 +78,7 @@ oro_entity_config:
     grid:
         entity:
             items:
-                # indicates grid for the entity using for context
+                # grid name that used for rendering entity context
                 context: # string
+                    options:
+                        auditable:          false
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/config/entity_config.yml b/src/Oro/Bundle/DataGridBundle/Resources/config/entity_config.yml
index ddc141ed889..cc64e6d51ac 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/config/entity_config.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/config/entity_config.yml
@@ -2,5 +2,7 @@ oro_entity_config:
     grid:
         entity:
             items:
-                # indicates default grid for the entity
+                # default grid name for the entity
                 default: # string
+                    options:
+                        auditable:          false

From 3478a6121155f64c2b04d5c4e8200f692aa72c6a Mon Sep 17 00:00:00 2001
From: Vova Soroka <vsoroka@magecore.com>
Date: Tue, 5 Jan 2016 20:51:34 +0200
Subject: [PATCH 360/471] BAP-9640: Impossible to import CSV file. Fix Notice:
 Undefined index entityIds in SegmentSnapshotRepository.php

---
 .../Entity/Repository/SegmentSnapshotRepository.php             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/SegmentBundle/Entity/Repository/SegmentSnapshotRepository.php b/src/Oro/Bundle/SegmentBundle/Entity/Repository/SegmentSnapshotRepository.php
index 2a4214dc79c..75b6485d3b5 100644
--- a/src/Oro/Bundle/SegmentBundle/Entity/Repository/SegmentSnapshotRepository.php
+++ b/src/Oro/Bundle/SegmentBundle/Entity/Repository/SegmentSnapshotRepository.php
@@ -134,7 +134,7 @@ protected function getDeleteQueryBuilderByParameters($deleteParams)
         $returnQueryBuilder = false;
 
         foreach ($deleteParams as $params) {
-            if (empty($params['segmentIds'])) {
+            if (empty($params['segmentIds']) || empty($params['entityIds'])) {
                 continue;
             }
 

From 3c3cf01d34da332fe501c83347f616dba352ea97 Mon Sep 17 00:00:00 2001
From: Vova Soroka <vsoroka@magecore.com>
Date: Wed, 6 Jan 2016 03:55:00 +0200
Subject: [PATCH 361/471] fix 'Uncaught TypeError: Cannot read property 'VIEW'
 of undefined' when a grid view is disabled

---
 src/Oro/Bundle/DataGridBundle/Resources/views/macros.html.twig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/views/macros.html.twig b/src/Oro/Bundle/DataGridBundle/Resources/views/macros.html.twig
index c791ae50649..fa166de08e1 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/views/macros.html.twig
+++ b/src/Oro/Bundle/DataGridBundle/Resources/views/macros.html.twig
@@ -12,6 +12,9 @@
         {% if app.request.get('_widgetContainer') == 'dialog' %}
             {% set renderParams = {'enableViews': false}|merge(renderParams) %}
         {% endif %}
+        {% if params._grid_view._disabled is defined and params._grid_view._disabled %}
+            {% set renderParams = renderParams|merge({'enableViews': false}) %}
+        {% endif %}
         {% set metaData = oro_datagrid_metadata(datagrid, params) %}
         {% if renderParams.routerEnabled is defined %}
             {% set metadataOptions = metaData.options is defined ? metaData.options : {} %}

From 05be70b201c8e5c60e619f72c15bfc1d61417eee Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Wed, 6 Jan 2016 12:30:34 +0200
Subject: [PATCH 362/471] CRM-3685: Can't add context for entity with newly
 enabled activities  - Move entity context provider to Activity Bundle

---
 .../Provider/ContextGridProvider.php}                      | 0
 src/Oro/Bundle/EntityBundle/Resources/config/services.yml  | 7 -------
 2 files changed, 7 deletions(-)
 rename src/Oro/Bundle/{EntityBundle/Provider/EntityContextProvider.php => ActivityBundle/Provider/ContextGridProvider.php} (100%)

diff --git a/src/Oro/Bundle/EntityBundle/Provider/EntityContextProvider.php b/src/Oro/Bundle/ActivityBundle/Provider/ContextGridProvider.php
similarity index 100%
rename from src/Oro/Bundle/EntityBundle/Provider/EntityContextProvider.php
rename to src/Oro/Bundle/ActivityBundle/Provider/ContextGridProvider.php
diff --git a/src/Oro/Bundle/EntityBundle/Resources/config/services.yml b/src/Oro/Bundle/EntityBundle/Resources/config/services.yml
index e26a53fde66..66550edf2a5 100644
--- a/src/Oro/Bundle/EntityBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/EntityBundle/Resources/config/services.yml
@@ -260,13 +260,6 @@ services:
         tags:
             - { name: oro_migration.extension, extension_name: change_type }
 
-    oro_entity.entity_context_provider:
-        class: %oro_entity.entity_context_provider.class%
-        arguments:
-            - @oro_entity.routing_helper
-            - @oro_entity.entity_provider
-            - @oro_entity_config.provider.entity
-
     oro_entity.entity_alias.cache.warmer:
         class: Oro\Bundle\EntityBundle\Cache\EntityAliasCacheWarmer
         arguments:

From 728aecd2095a0e3d453a3762bb7d5217c6ad18a1 Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Wed, 6 Jan 2016 13:20:37 +0200
Subject: [PATCH 363/471] CRM-4789: small improvement

---
 .../Resources/public/js/datafilter-builder.js        |  5 +++--
 .../Resources/public/js/filters-manager.js           | 12 +-----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/datafilter-builder.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/datafilter-builder.js
index 5f5f60c3655..cb0da3b532e 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/js/datafilter-builder.js
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/datafilter-builder.js
@@ -39,10 +39,11 @@ define([
                 return;
             }
 
+            var filtersList;
             var options = methods.combineOptions.call(this);
             options.collection = this.collection;
-            options.prependTo = this.$el;
-            var filtersList = new FiltersManager(options);
+            options.el = $('<div/>').prependTo(this.$el);
+            filtersList = new FiltersManager(options);
             filtersList.render();
             mediator.trigger('datagrid_filters:rendered', this.collection, this.$el);
             this.metadata.state.filters = this.metadata.state.filters || [];
diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/filters-manager.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/filters-manager.js
index 006594dedb3..1dd539fec92 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/js/filters-manager.js
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/filters-manager.js
@@ -98,13 +98,6 @@ define(function(require) {
          */
         dropdownContainer: 'body',
 
-        /**
-         * Selector, jQuery object or HTML element that will be target for prepend view element
-         *
-         * @property
-         */
-        prependTo: null,
-
         /** @property */
         events: {
             'change [data-action=add-filter-select]': '_onChangeFilterSelect',
@@ -126,7 +119,7 @@ define(function(require) {
 
             this.filters = {};
 
-            _.extend(this, _.pick(options, ['addButtonHint', 'prependTo']));
+            _.extend(this, _.pick(options, ['addButtonHint']));
 
             if (options.filters) {
                 _.extend(this.filters, options.filters);
@@ -318,9 +311,6 @@ define(function(require) {
                 this.template({filters: this.filters})
             );
             this.dropdownContainer = this.$el.find('.filter-container');
-            if (this.prependTo) {
-                this.prependTo.prepend(this.$el);
-            }
 
             var fragment = document.createDocumentFragment();
 

From 753e220aeba0dd28fe4765d7f8074b6dc69f688c Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Wed, 6 Jan 2016 14:49:10 +0200
Subject: [PATCH 364/471] CRM-4864: add scrolling for long sequences of steps

---
 .../public/css/less/mobile/workflow.less      | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/WorkflowBundle/Resources/public/css/less/mobile/workflow.less b/src/Oro/Bundle/WorkflowBundle/Resources/public/css/less/mobile/workflow.less
index be4a17863a9..098d25a9875 100644
--- a/src/Oro/Bundle/WorkflowBundle/Resources/public/css/less/mobile/workflow.less
+++ b/src/Oro/Bundle/WorkflowBundle/Resources/public/css/less/mobile/workflow.less
@@ -3,11 +3,32 @@
     margin-top: 6px;
     width: auto;
     .box-type1 {
-      margin-bottom: 0;
+      margin: 0;
+      > .row-fluid {
+        position: relative;
+      }
+    }
+    .widget-content {
+      overflow-x: auto;
+      &:before, &:after {
+        display: block;
+        content: '';
+        position: absolute;
+        top: 0;
+        bottom:0;
+        left: 0;
+        width: 0;
+        z-index: 1;
+        .box-shadow(0px 0 14px 12px white);
+      }
+      &:after {
+        left: auto;
+        right: 0;
+      }
     }
     .workflow-step-list {
       white-space: nowrap;
-      overflow: hidden;
+      display: inline-block;
     }
   }
 }

From f751de8d6fe068df997ac7878d9e111a0f2dcc4d Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Wed, 6 Jan 2016 15:02:04 +0200
Subject: [PATCH 365/471] CRM-3685: Can't add context for entity with newly
 enabled activities  - Move entity context provider to Activity Bundle

---
 UPGRADE-1.9.md                                |  1 +
 .../Controller/ActivityController.php         |  8 +--
 .../Provider/ContextGridProvider.php          | 54 ++++++++++---------
 .../Resources/config/services.yml             |  7 +++
 .../Resources/config/services.yml             |  1 -
 5 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/UPGRADE-1.9.md b/UPGRADE-1.9.md
index 35a347054cb..88b3f879547 100644
--- a/UPGRADE-1.9.md
+++ b/UPGRADE-1.9.md
@@ -85,6 +85,7 @@ grid-name:
 - `oro_entity.entity_hierarchy_provider` service was marked as private.
 - `oro_entity.entity_hierarchy_provider.class` parameter was removed.
 - `oro_entity.entity_hierarchy_provider.all` service was added. It can be used if you need a hierarchy of all entities but not only configurable ones.
+- Class `Oro\Bundle\EntityBundle\Provider\EntityContextProvider` was moved to `Oro\Bundle\ActivityBundle\Provider\ContextGridProvider`.
 
 ####EntityConfigBundle
 - Removed `optionSet` field type deprecated since v1.4. Existing options sets are converted to `Select` or `Multi-Select` automatically during the Platform update.
diff --git a/src/Oro/Bundle/ActivityBundle/Controller/ActivityController.php b/src/Oro/Bundle/ActivityBundle/Controller/ActivityController.php
index 6b4f8dbfe73..b188061a1d5 100644
--- a/src/Oro/Bundle/ActivityBundle/Controller/ActivityController.php
+++ b/src/Oro/Bundle/ActivityBundle/Controller/ActivityController.php
@@ -63,7 +63,7 @@ public function contextAction($activity, $id)
             throw new AccessDeniedException();
         }
 
-        $entityTargets    = $this->get('oro_entity.entity_context_provider')->getSupportedTargets($entity);
+        $entityTargets    = $this->get('oro_activity.provider.context_grid')->getSupportedTargets($entity);
         $entityClassAlias = $this->get('oro_entity.entity_alias_resolver')->getPluralAlias($entityClass);
 
         return [
@@ -93,12 +93,14 @@ public function contextAction($activity, $id)
      */
     public function contextGridAction($activity, $id, $entityClass = null)
     {
-        $gridName = $this->get('oro_entity.entity_context_provider')->getContextGridByEntity($entityClass);
+        $entityClass = $this->get('oro_entity.routing_helper')->resolveEntityClass($entityClass);
+        $gridName = $this->get('oro_activity.provider.context_grid')->getContextGridByEntity($entityClass);
 
         // Need to specify parameters for Oro\Bundle\ActivityBundle\EventListener\Datagrid\ContextGridListener
         $params = [
             'activityClass' => $activity,
-            'activityId'    => $id
+            'activityId'    => $id,
+            'class_name'    => $entityClass,
         ];
 
         return [
diff --git a/src/Oro/Bundle/ActivityBundle/Provider/ContextGridProvider.php b/src/Oro/Bundle/ActivityBundle/Provider/ContextGridProvider.php
index 9a7a8ae5c39..234ff536310 100644
--- a/src/Oro/Bundle/ActivityBundle/Provider/ContextGridProvider.php
+++ b/src/Oro/Bundle/ActivityBundle/Provider/ContextGridProvider.php
@@ -1,67 +1,63 @@
 <?php
 
-namespace Oro\Bundle\EntityBundle\Provider;
+namespace Oro\Bundle\ActivityBundle\Provider;
 
 use Oro\Bundle\EntityBundle\Provider\EntityProvider;
-use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider;
 use Oro\Bundle\EntityBundle\Tools\EntityRoutingHelper;
+use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider;
+use Oro\Bundle\EntityExtendBundle\Tools\ExtendHelper;
 
-class EntityContextProvider
+class ContextGridProvider
 {
-    /**
-     * @var EntityRoutingHelper
-     */
+    /** @var EntityRoutingHelper */
     protected $routingHelper;
 
-    /**
-     * @var EntityProvider
-     */
+    /** @var EntityProvider */
     protected $entityProvider;
 
-    /**
-     * @var ConfigProvider
-     */
+    /** @var ConfigProvider */
     protected $entityConfigProvider;
 
     /**
      * @param EntityRoutingHelper $routingHelper
-     * @param EntityProvider $entityProvider
-     * @param ConfigProvider $entityConfigProvider
+     * @param EntityProvider      $entityProvider
+     * @param ConfigProvider      $entityConfigProvider
      */
     public function __construct(
         EntityRoutingHelper $routingHelper,
         EntityProvider $entityProvider,
         ConfigProvider $entityConfigProvider
     ) {
-        $this->routingHelper  = $routingHelper;
-        $this->entityProvider = $entityProvider;
+        $this->routingHelper        = $routingHelper;
+        $this->entityProvider       = $entityProvider;
         $this->entityConfigProvider = $entityConfigProvider;
     }
 
     /**
      * @param object $entity
+     *
      * @return array
      */
     public function getSupportedTargets($entity)
     {
         $targetEntities = $this->entityProvider->getEntities();
-        $entityTargets = [];
+        $entityTargets  = [];
 
         if (!is_object($entity) || !method_exists($entity, 'supportActivityTarget')) {
             return $entityTargets;
         }
 
         $count = count($targetEntities);
-        for ($i=0; $i < $count; $i++) {
+        for ($i = 0; $i < $count; $i++) {
             $targetEntity = $targetEntities[$i];
-            $className = $targetEntity['name'];
-            $gridName = $this->getContextGridByEntity($className);
+            $className    = $targetEntity['name'];
+            $gridName     = $this->getContextGridByEntity($className);
             if ($gridName && !empty($className) && $entity->supportActivityTarget($className)) {
                 $entityTargets[] = [
-                    'label' => $targetEntity['label'],
+                    'label'     => $targetEntity['label'],
                     'className' => $this->routingHelper->getUrlSafeClassName($targetEntity['name']),
-                    'first' => count($entityTargets) === 0,
-                    'gridName' => $gridName
+                    'first'     => count($entityTargets) === 0,
+                    'gridName'  => $gridName
                 ];
 
                 $i++;
@@ -73,16 +69,22 @@ public function getSupportedTargets($entity)
 
     /**
      * @param string $entityClass
+     *
      * @return string|null
      */
     public function getContextGridByEntity($entityClass)
     {
         if (!empty($entityClass)) {
             $entityClass = $this->routingHelper->resolveEntityClass($entityClass);
+            if (ExtendHelper::isCustomEntity($entityClass)) {
+                return 'custom-entity-grid';
+            }
             $config = $this->entityConfigProvider->getConfig($entityClass);
-            $gridName = $config->get('context-grid');
-            if ($gridName) {
-                return $gridName;
+            if ($config->has('context')) {
+                return $config->get('context');
+            }
+            if ($config->has('default')) {
+                return $config->get('default');
             }
         }
 
diff --git a/src/Oro/Bundle/ActivityBundle/Resources/config/services.yml b/src/Oro/Bundle/ActivityBundle/Resources/config/services.yml
index af8b51bb7cf..e655a910c3b 100644
--- a/src/Oro/Bundle/ActivityBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/ActivityBundle/Resources/config/services.yml
@@ -60,6 +60,13 @@ services:
         tags:
             - { name: oro_activity.activity_widget_provider }
 
+    oro_activity.provider.context_grid:
+        class: Oro\Bundle\ActivityBundle\Provider\ContextGridProvider
+        arguments:
+            - @oro_entity.routing_helper
+            - @oro_entity.entity_provider
+            - @oro_entity_config.provider.grid
+
     oro_activity.widget_provider.actions:
         class: %oro_activity.widget_provider.actions.class%
         arguments:
diff --git a/src/Oro/Bundle/EntityBundle/Resources/config/services.yml b/src/Oro/Bundle/EntityBundle/Resources/config/services.yml
index 66550edf2a5..aa6ea58cc6f 100644
--- a/src/Oro/Bundle/EntityBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/EntityBundle/Resources/config/services.yml
@@ -30,7 +30,6 @@ parameters:
     oro_entity.listener.orm.generated_value_strategy_listener.class: Oro\Bundle\EntityBundle\EventListener\ORM\GeneratedValueStrategyListener
 
     oro_entity.migration.extension.change_type.class: Oro\Bundle\EntityBundle\Migrations\Extension\ChangeTypeExtension
-    oro_entity.entity_context_provider.class:                Oro\Bundle\EntityBundle\Provider\EntityContextProvider
     oro_entity.entity_alias_resolver.class:                  Oro\Bundle\EntityBundle\ORM\EntityAliasResolver
     oro_entity.entity_alias_config_bag.class:                Oro\Bundle\EntityBundle\Provider\EntityAliasConfigBag
     oro_entity.entity_alias_provider.class:                  Oro\Bundle\EntityBundle\Provider\EntityAliasProvider

From 29f3774ae8f242408eac0c59e903195d669979f7 Mon Sep 17 00:00:00 2001
From: Ievgenii Myshusta <imyshusta@magecore.com>
Date: Wed, 6 Jan 2016 16:49:37 +0200
Subject: [PATCH 366/471] CRM-4845: Create grids for action add context for
 activity

---
 .../CalendarBundle/Entity/CalendarEvent.php   |  3 +-
 .../Resources/config/datagrid.yml             | 81 +++++++++++++++++++
 .../Constraints/DateEarlierThanValidator.php  |  2 +-
 src/Oro/Bundle/EmailBundle/Entity/Email.php   |  3 +-
 .../EmailBundle/Resources/config/datagrid.yml | 10 +++
 5 files changed, 96 insertions(+), 3 deletions(-)

diff --git a/src/Oro/Bundle/CalendarBundle/Entity/CalendarEvent.php b/src/Oro/Bundle/CalendarBundle/Entity/CalendarEvent.php
index 89d6d852354..505585d2037 100644
--- a/src/Oro/Bundle/CalendarBundle/Entity/CalendarEvent.php
+++ b/src/Oro/Bundle/CalendarBundle/Entity/CalendarEvent.php
@@ -30,7 +30,8 @@
  *      routeView="oro_calendar_event_view",
  *      defaultValues={
  *          "entity"={
- *              "icon"="icon-time"
+ *              "icon"="icon-time",
+ *              "context-grid"="calendar-event-for-context-grid"
  *          },
  *          "dataaudit"={
  *              "auditable"=true
diff --git a/src/Oro/Bundle/CalendarBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/CalendarBundle/Resources/config/datagrid.yml
index 5a3738772fc..60a9554d9f5 100644
--- a/src/Oro/Bundle/CalendarBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/CalendarBundle/Resources/config/datagrid.yml
@@ -466,3 +466,84 @@ datagrid:
         action_configuration: @oro_calendar.listener.datagrid.system_calendar->getActionConfigurationClosure
         options:
             skip_acl_check: true
+
+    calendar-event-for-context-grid:
+        extended_entity_name: %oro_calendar.calendar_event.entity.class%
+        options:
+            entityHint: calendar_events
+            entity_pagination: true
+            toolbarOptions:
+                pageSize:
+                    default_per_page: 10
+            routerEnabled: false
+        source:
+            type: orm
+            acl_resource: oro_calendar_event_view
+            query:
+                select:
+                    - event.id
+                    - CONCAT(CASE WHEN calendar.name IS NOT NULL THEN calendar.name ELSE CONCAT(owner.firstName, ' ',owner.lastName) END, '') AS name
+                    - event.title
+                    - event.start
+                    - event.end
+                    - parent.id as parentId
+                    - owner.id as ownerId
+                    - COUNT(children.id) as childrenCount
+                from:
+                    - { table: %oro_calendar.calendar_event.entity.class%, alias: event }
+                join:
+                    left:
+                        - { join: event.parent, alias: parent }
+                        - { join:  %oro_calendar.calendar_event.entity.class%, alias: children, conditionType: WITH, condition: 'children.parent = event' }
+                    inner:
+                        - { join: event.calendar, alias: calendar }
+                        - { join: calendar.owner, alias: owner }
+                        -
+                            join: %oro_calendar.calendar_property.entity.class%
+                            alias: connection
+                            conditionType: WITH
+                            condition: "connection.calendarAlias = 'user' AND connection.calendar = calendar.id AND connection.visible = true"
+                        - { join: connection.targetCalendar, alias: targetCalendar }
+                where:
+                    and:
+                        - targetCalendar.owner = @oro_security.security_facade->getLoggedUserId
+                groupBy: event.id, calendar.name, owner.firstName, owner.lastName, parentId, ownerId
+        columns:
+            id:
+                label: oro.calendar.calendarevent.id.label
+            title:
+                label: oro.calendar.calendarevent.title.label
+            name:
+                label: oro.calendar.calendarevent.calendar.label
+            start:
+                label: oro.calendar.calendarevent.start.label
+                frontend_type: datetime
+            end:
+                label: oro.calendar.calendarevent.end.label
+                frontend_type: datetime
+        sorters:
+            columns:
+                title:
+                    data_name: event.title
+                name:
+                    data_name: name
+                start:
+                    data_name: event.start
+                end:
+                    data_name: event.end
+            default:
+                start: ASC
+        filters:
+            columns:
+                title:
+                    type: string
+                    data_name: event.title
+                name:
+                    type: string
+                    data_name: name
+                start:
+                    type: datetime
+                    data_name: event.start
+                end:
+                    type: datetime
+                    data_name: event.end
diff --git a/src/Oro/Bundle/CalendarBundle/Validator/Constraints/DateEarlierThanValidator.php b/src/Oro/Bundle/CalendarBundle/Validator/Constraints/DateEarlierThanValidator.php
index f0a9309b4f9..74848224521 100644
--- a/src/Oro/Bundle/CalendarBundle/Validator/Constraints/DateEarlierThanValidator.php
+++ b/src/Oro/Bundle/CalendarBundle/Validator/Constraints/DateEarlierThanValidator.php
@@ -21,7 +21,7 @@ public function validate($value, Constraint $constraint)
         $root = $this->context->getRoot();
 
         if ($root instanceof FormInterface) {
-            $valueCompare = $root->get($constraint->field)->getData();
+            $valueCompare = $root->has($constraint->field) ? $root->get($constraint->field)->getData() : false;
         } else {
             $propertyAccessor = PropertyAccess::createPropertyAccessor();
             $valueCompare = $propertyAccessor->getValue($root, $constraint->field);
diff --git a/src/Oro/Bundle/EmailBundle/Entity/Email.php b/src/Oro/Bundle/EmailBundle/Entity/Email.php
index 2722ecc78a0..e3eed3bcf00 100644
--- a/src/Oro/Bundle/EmailBundle/Entity/Email.php
+++ b/src/Oro/Bundle/EmailBundle/Entity/Email.php
@@ -31,7 +31,8 @@
  * @Config(
  *      defaultValues={
  *          "entity"={
- *              "icon"="icon-envelope"
+ *              "icon"="icon-envelope",
+ *              "context-grid"="email-for-context-grid"
  *          },
  *          "grouping"={
  *              "groups"={"activity"}
diff --git a/src/Oro/Bundle/EmailBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/EmailBundle/Resources/config/datagrid.yml
index 8f5c8053855..31bf1315b35 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/EmailBundle/Resources/config/datagrid.yml
@@ -571,3 +571,13 @@ datagrid:
                 label:        oro.grid.action.delete
                 icon:         trash
                 link:         delete_link
+
+    email-for-context-grid:
+        extends: email-grid
+        options:
+            entityHint: email
+            entity_pagination: true
+            toolbarOptions:
+                pageSize:
+                    default_per_page: 10
+            routerEnabled: false

From 5ad21e4a303630bdf47c1b1c4f0175dc33e8b97a Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Wed, 6 Jan 2016 16:55:57 +0200
Subject: [PATCH 367/471] CRM-4789: fix bug in bootstrup dropdown extend for
 links with href=javascript:void(0)

---
 .../Bundle/UIBundle/Resources/public/js/extend/bootstrap.js    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/extend/bootstrap.js b/src/Oro/Bundle/UIBundle/Resources/public/js/extend/bootstrap.js
index 18e1e9b62b4..5c2f07b5ad8 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/js/extend/bootstrap.js
+++ b/src/Oro/Bundle/UIBundle/Resources/public/js/extend/bootstrap.js
@@ -29,7 +29,8 @@ define([
     $(document).off('click.dropdown.data-api', '[data-toggle=dropdown]', Dropdown.prototype.toggle);
     Dropdown.prototype.toggle = _.wrap(Dropdown.prototype.toggle, function(func, event) {
         var result = func.apply(this, _.rest(arguments));
-        var selector = $(this).attr('data-target') || $(this).attr('href');
+        var href = $(this).attr('href');
+        var selector = $(this).attr('data-target') || /#/.test(href) && href;
         var $parent = selector ? $(selector) : null;
 
         if (!$parent || $parent.length === 0) {

From bc29636d261b5c4fa6232d4f206a9cebfb203473 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Wed, 6 Jan 2016 17:09:53 +0200
Subject: [PATCH 368/471] CRM-3685: Can't add context for entity with newly
 enabled activities  - Define common event for all context grid.

---
 UPGRADE-1.9.md                                         |  2 +-
 .../EventListener/Datagrid/ContextGridListener.php     |  5 ++---
 .../ActivityBundle/Resources/config/services.yml       | 10 +++++++++-
 .../Bundle/UserBundle/Resources/config/services.yml    |  8 --------
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/UPGRADE-1.9.md b/UPGRADE-1.9.md
index 88b3f879547..2a75a8f5fcd 100644
--- a/UPGRADE-1.9.md
+++ b/UPGRADE-1.9.md
@@ -85,7 +85,7 @@ grid-name:
 - `oro_entity.entity_hierarchy_provider` service was marked as private.
 - `oro_entity.entity_hierarchy_provider.class` parameter was removed.
 - `oro_entity.entity_hierarchy_provider.all` service was added. It can be used if you need a hierarchy of all entities but not only configurable ones.
-- Class `Oro\Bundle\EntityBundle\Provider\EntityContextProvider` was moved to `Oro\Bundle\ActivityBundle\Provider\ContextGridProvider`.
+- Class `Oro\Bundle\EntityBundle\Provider\EntityContextProvider` was moved to `Oro\Bundle\ActivityBundle\Provider\ContextGridProvider` and `oro_entity.entity_context_provider` service was moved to `oro_activity.provider.context_grid`. 
 
 ####EntityConfigBundle
 - Removed `optionSet` field type deprecated since v1.4. Existing options sets are converted to `Select` or `Multi-Select` automatically during the Platform update.
diff --git a/src/Oro/Bundle/ActivityBundle/EventListener/Datagrid/ContextGridListener.php b/src/Oro/Bundle/ActivityBundle/EventListener/Datagrid/ContextGridListener.php
index 0281dbd1cd8..a4e404c0b34 100644
--- a/src/Oro/Bundle/ActivityBundle/EventListener/Datagrid/ContextGridListener.php
+++ b/src/Oro/Bundle/ActivityBundle/EventListener/Datagrid/ContextGridListener.php
@@ -60,10 +60,9 @@ public function onBuildAfter(BuildAfter $event)
             $class       = $parameters->get('activityClass');
             $entityClass = $this->entityClassNameHelper->resolveEntityClass($class, true);
 
-            /** @var ActivityInterface $entity */
             $entity = $this->doctrineHelper->getEntity($entityClass, $id);
 
-            if ($entity) {
+            if ($entity && $entity instanceof ActivityInterface) {
                 $targetsArray = $entity->getActivityTargets($targetClass);
 
                 $targetIds = [];
@@ -72,7 +71,7 @@ public function onBuildAfter(BuildAfter $event)
                 }
 
                 if ($targetIds) {
-                    $queryBuilder->andWhere($queryBuilder->expr()->notIn("$alias.id", $targetIds));
+                    $queryBuilder->andWhere($queryBuilder->expr()->notIn(sprintf('%s.id', $alias), $targetIds));
                 }
             }
         }
diff --git a/src/Oro/Bundle/ActivityBundle/Resources/config/services.yml b/src/Oro/Bundle/ActivityBundle/Resources/config/services.yml
index e655a910c3b..940e22fd29a 100644
--- a/src/Oro/Bundle/ActivityBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/ActivityBundle/Resources/config/services.yml
@@ -13,7 +13,7 @@ parameters:
     oro_activity.handler.delete.activity_entity.class:   Oro\Bundle\ActivityBundle\Entity\Manager\ActivityEntityDeleteHandler
     oro_activity.form.handler.activity_entity.api.class: Oro\Bundle\ActivityBundle\Form\Handler\ActivityEntityApiHandler
     oro_activity.manager.activity_target.api.class:      Oro\Bundle\ActivityBundle\Entity\Manager\ActivityTargetApiEntityManager
-    oro_activity.listener.datagrid.context.class:        Oro\Bundle\ActivityBundle\EventListener\Datagrid\ContextGridListener
+
 services:
     oro_activity.manager:
         class: %oro_activity.manager.class%
@@ -67,6 +67,14 @@ services:
             - @oro_entity.entity_provider
             - @oro_entity_config.provider.grid
 
+    oro_activity.listener.context_grid:
+        class: Oro\Bundle\ActivityBundle\EventListener\Datagrid\ContextGridListener
+        arguments:
+            - @oro_entity.doctrine_helper
+            - @oro_entity.entity_class_name_helper
+        tags:
+            - { name: kernel.event_listener, event: oro_datagrid.datagrid.build.after, method: onBuildAfter }
+
     oro_activity.widget_provider.actions:
         class: %oro_activity.widget_provider.actions.class%
         arguments:
diff --git a/src/Oro/Bundle/UserBundle/Resources/config/services.yml b/src/Oro/Bundle/UserBundle/Resources/config/services.yml
index 6978f2acae3..79c412a8dd1 100644
--- a/src/Oro/Bundle/UserBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/UserBundle/Resources/config/services.yml
@@ -294,14 +294,6 @@ services:
             - @session.flash_bag
             - @translator
 
-    oro_activity.listener.datagrid.context.user:
-        class: %oro_activity.listener.datagrid.context.class%
-        arguments:
-            - @oro_entity.doctrine_helper
-            - @oro_entity.entity_class_name_helper
-        tags:
-            - { name: kernel.event_listener, event: oro_datagrid.datagrid.build.after.users-for-context-grid, method: onBuildAfter }
-
     oro_user.token.factory.wsse:
         class: %oro_user.token.factory.wsse.class%
 

From d6945c35f9937147179dca9aadbef95d39a362d3 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Wed, 6 Jan 2016 17:16:31 +0200
Subject: [PATCH 369/471] CRM-3685: Can't add context for entity with newly
 enabled activities

---
 .../Resources/doc/entity_context.md                               | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/Oro/Bundle/{EntityBundle => ActivityBundle}/Resources/doc/entity_context.md (100%)

diff --git a/src/Oro/Bundle/EntityBundle/Resources/doc/entity_context.md b/src/Oro/Bundle/ActivityBundle/Resources/doc/entity_context.md
similarity index 100%
rename from src/Oro/Bundle/EntityBundle/Resources/doc/entity_context.md
rename to src/Oro/Bundle/ActivityBundle/Resources/doc/entity_context.md

From 2a50cc894061faafa24feae3d6d4cf9b8eb52f6e Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Wed, 6 Jan 2016 17:49:24 +0200
Subject: [PATCH 370/471] CRM-3685: Can't add context for entity with newly
 enabled activities  - Update documentation

---
 src/Oro/Bundle/ActivityBundle/README.md       | 23 +++++++++++++++++++
 .../Resources/doc/entity_context.md           |  7 ------
 2 files changed, 23 insertions(+), 7 deletions(-)
 delete mode 100644 src/Oro/Bundle/ActivityBundle/Resources/doc/entity_context.md

diff --git a/src/Oro/Bundle/ActivityBundle/README.md b/src/Oro/Bundle/ActivityBundle/README.md
index a574f392756..be7e5b1d776 100644
--- a/src/Oro/Bundle/ActivityBundle/README.md
+++ b/src/Oro/Bundle/ActivityBundle/README.md
@@ -273,3 +273,26 @@ Bind items declared in *placeholders.yml* to the activity entity using `action_b
  */
 class Email extends ExtendEmail
 ```
+
+How to configure custom grid for activity context dialog
+--------------------------------------------------------
+
+If you want to define context grid for entity(e.g User) in the activity context dialog you need to add the
+`context` option in entity class `@Config` annotation, e.g: 
+
+``` php
+/**
+ * @Config(
+ *      defaultValues={
+ *          "grid"={
+ *              default="default-grid",
+ *              context="default-context-grid"
+ *          }
+ *     }
+ * )
+ */
+class User extends ExtendUser
+```
+
+This option is used to recognize grid for entity with higher priority than `default` option.
+In cases if these options (`context` or `default`) are not defined for entity, it won`t appear in the context dialog.
diff --git a/src/Oro/Bundle/ActivityBundle/Resources/doc/entity_context.md b/src/Oro/Bundle/ActivityBundle/Resources/doc/entity_context.md
deleted file mode 100644
index 51d4bd5a827..00000000000
--- a/src/Oro/Bundle/ActivityBundle/Resources/doc/entity_context.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## Context ##
-
-**Adding context entity to email**
-
-If you want add new context entity class name to email context dialog you need add
-"context-grid"="..." option to entity class @config (See CaseEntity.php, for example)
-and add datagrid with same name. (See cases-for-context-grid grid in CaseBundle) 

From 7951dc9da378fb218ad52aefecd8f8366e2e3aa4 Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Wed, 6 Jan 2016 18:39:38 +0200
Subject: [PATCH 371/471] CRM-4880: adjust email thread view appearance on
 mobile

---
 .../css/less/mobile/activity-context.less     |  4 +--
 .../public/css/less/mobile/thread-view.less   | 14 +++++++-
 .../select2-email-recipients-component.js     |  2 +-
 .../views/Email/Thread/emailItem.html.twig    | 35 ++++++++++---------
 4 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/src/Oro/Bundle/ActivityBundle/Resources/public/css/less/mobile/activity-context.less b/src/Oro/Bundle/ActivityBundle/Resources/public/css/less/mobile/activity-context.less
index 1966bc4cb88..e7a7cd2cd41 100644
--- a/src/Oro/Bundle/ActivityBundle/Resources/public/css/less/mobile/activity-context.less
+++ b/src/Oro/Bundle/ActivityBundle/Resources/public/css/less/mobile/activity-context.less
@@ -18,7 +18,7 @@
   margin-bottom: 7px;
   .activity-context-activity-label,
   .activity-context-activity-items {
-    font-size: 13px;
+    font-size: 12px;
     line-height: 1.2em;
   }
   .activity-context-activity-label {
@@ -29,7 +29,7 @@
   }
   .activity-context-activity-items {
     margin-left: 0;
-    padding-left: 5px;
+    padding-left: 0;
     .context-item {
       font-size: inherit;
       line-height: inherit;
diff --git a/src/Oro/Bundle/EmailBundle/Resources/public/css/less/mobile/thread-view.less b/src/Oro/Bundle/EmailBundle/Resources/public/css/less/mobile/thread-view.less
index a056efd61ef..0b301b2759c 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/public/css/less/mobile/thread-view.less
+++ b/src/Oro/Bundle/EmailBundle/Resources/public/css/less/mobile/thread-view.less
@@ -7,9 +7,21 @@
     .responsive-cell {
       padding: 0;
     }
+    .email-participants {
+      margin-right: 100px;
+    }
+    .email-actions {
+      margin-top: 16px;
+      .btn-group +.btn-group {
+        margin-left: 5px;
+      }
+    }
     .email-full {
       .email-sent-date {
-        padding-right: 0;
+        padding: 0;
+        height: 18px;
+        font-size: 12px;
+        color: #888;
       }
     }
     .email-view-toggle {
diff --git a/src/Oro/Bundle/EmailBundle/Resources/public/js/app/components/select2-email-recipients-component.js b/src/Oro/Bundle/EmailBundle/Resources/public/js/app/components/select2-email-recipients-component.js
index e4d268486b4..261099fdd98 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/public/js/app/components/select2-email-recipients-component.js
+++ b/src/Oro/Bundle/EmailBundle/Resources/public/js/app/components/select2-email-recipients-component.js
@@ -108,7 +108,7 @@ define([
         * Extracts contexts and organizations from data
         */
         _processData: function(data) {
-           if (typeof data === 'undefined') {
+           if (typeof data === 'undefined' || this.disposed) {
                return;
            }
 
diff --git a/src/Oro/Bundle/EmailBundle/Resources/views/Email/Thread/emailItem.html.twig b/src/Oro/Bundle/EmailBundle/Resources/views/Email/Thread/emailItem.html.twig
index 4d7d2e91ffa..8e689344400 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/views/Email/Thread/emailItem.html.twig
+++ b/src/Oro/Bundle/EmailBundle/Resources/views/Email/Thread/emailItem.html.twig
@@ -38,23 +38,23 @@
     </div>
     <div class="email-full">
         <div class="email-view-toggle">
+            {% set actionParameters = routeParameters is defined ? {
+            routeParameters: routeParameters
+            } : {} %}
+            {% set buttonsHtml %}
+                {% if defaultReplyButton is not defined or defaultReplyButton == 1 %}
+                    {{ Actions.replyButton(email, actionParameters) }}
+                    {{ Actions.replyAllButton(email, actionParameters) }}
+                {% else %}
+                    {{ Actions.replyAllButton(email, actionParameters) }}
+                    {{ Actions.replyButton(email, actionParameters) }}
+                {% endif %}
+                {{ Actions.forwardButton(email, actionParameters ) }}
+            {% endset %}
             <div class="pull-right">
-                {% set actionParameters = routeParameters is defined ? {
-                    routeParameters: routeParameters
-                } : {} %}
-                {% set buttonsHtml %}
-                    {% if defaultReplyButton is not defined or defaultReplyButton == 1 %}
-                        {{ Actions.replyButton(email, actionParameters) }}
-                        {{ Actions.replyAllButton(email, actionParameters) }}
-                    {% else %}
-                        {{ Actions.replyAllButton(email, actionParameters) }}
-                        {{ Actions.replyButton(email, actionParameters) }}
-                    {% endif %}
-                    {{ Actions.forwardButton(email, actionParameters ) }}
-                {% endset %}
-                {{ UI.pinnedDropdownButton({
-                    'html': buttonsHtml
-                }) }}
+                {% if isDesktopVersion() %}
+                    {{ UI.pinnedDropdownButton({'html': buttonsHtml}) }}
+                {% endif %}
                 <div class="email-sent-date">
                     <span class="comment-count" style="display:none" title="{{ 'oro.comment.quantity_label'|trans }}">
                         <i class="icon icon-comment"></i><span class="count"></span>
@@ -77,6 +77,9 @@
                     </div>
                 </div>
             </div>
+            {% if isMobileVersion() %}
+                <div class="email-actions clearfix">{{ buttonsHtml }}</div>
+            {% endif %}
         </div>
         <div class="email-content clearfix">
             <div class="email-body responsive-cell">

From 8d6feb12d27c2c11448c061b6f8e616e7ce69080 Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Wed, 6 Jan 2016 19:08:39 +0200
Subject: [PATCH 372/471] CRM-4880: fix position of detailed info dropdown

---
 .../public/css/less/mobile/thread-view.less         |  1 +
 .../public/js/app/views/email-thread-view.js        | 13 ++++++++++++-
 .../views/Email/Thread/emailItem.html.twig          |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/EmailBundle/Resources/public/css/less/mobile/thread-view.less b/src/Oro/Bundle/EmailBundle/Resources/public/css/less/mobile/thread-view.less
index 0b301b2759c..b5aeea331d6 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/public/css/less/mobile/thread-view.less
+++ b/src/Oro/Bundle/EmailBundle/Resources/public/css/less/mobile/thread-view.less
@@ -42,6 +42,7 @@
   .email-detailed-info-table {
     .dropdown-menu {
       padding: 0px @contentPadding;
+      overflow-x: auto;
     }
     .control-group:last-child {
       margin-bottom: 0;
diff --git a/src/Oro/Bundle/EmailBundle/Resources/public/js/app/views/email-thread-view.js b/src/Oro/Bundle/EmailBundle/Resources/public/js/app/views/email-thread-view.js
index fe4e90e4151..9eb58b62a26 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/public/js/app/views/email-thread-view.js
+++ b/src/Oro/Bundle/EmailBundle/Resources/public/js/app/views/email-thread-view.js
@@ -15,7 +15,8 @@ define(function(require) {
 
         events: {
             'click .email-view-toggle-all': 'onToggleAllClick',
-            'click .email-load-more': 'onLoadMoreClick'
+            'click .email-load-more': 'onLoadMoreClick',
+            'shown.bs.dropdown .email-detailed-info-table.mobile .dropdown-menu': 'onDetailedInfoOpen'
         },
 
         selectors: {
@@ -107,6 +108,16 @@ define(function(require) {
             this.loadEmails();
         },
 
+        onDetailedInfoOpen: function(e) {
+            var rect = e.currentTarget.getBoundingClientRect();
+            var parentRect = this.el.getBoundingClientRect();
+            var left = parseInt($(e.currentTarget).css('left'));
+            $(e.currentTarget).css({
+                'left': left + parentRect.left - rect.left + 'px',
+                'max-width': parentRect.width + 'px'
+            });
+        },
+
         /**
          * Loads emails' html
          *
diff --git a/src/Oro/Bundle/EmailBundle/Resources/views/Email/Thread/emailItem.html.twig b/src/Oro/Bundle/EmailBundle/Resources/views/Email/Thread/emailItem.html.twig
index 8e689344400..7cd3afb7933 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/views/Email/Thread/emailItem.html.twig
+++ b/src/Oro/Bundle/EmailBundle/Resources/views/Email/Thread/emailItem.html.twig
@@ -68,7 +68,7 @@
             <div class="email-participants">
                 <div class="email-author">{{ EA.email_participant_name_or_me(email.fromEmailAddress, email.fromName, true) }}</div>
                 <span class="email-recipients">{{ 'To'|trans }}: {{ EA.email_participants_name(email.recipients, true) }}</span>
-                <div class="email-detailed-info-table dropdown">
+                <div class="email-detailed-info-table dropdown{% if isMobileVersion() %} mobile{% endif %}">
                     <span class="dropdown-toggle" data-toggle="dropdown" title="{{ 'oro.email.show_details.tooltip'|trans }}">
                         <i class="fa fa-caret-square-o-down"></i>
                     </span>

From 0fc4d6af995139f43f007016d70f37dc647398ea Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Wed, 6 Jan 2016 19:30:50 +0200
Subject: [PATCH 373/471] CRM-3685: Can't add context for entity with newly
 enabled activities  - Define defaults grids

---
 src/Oro/Bundle/OrganizationBundle/Entity/BusinessUnit.php | 3 +++
 src/Oro/Bundle/TrackingBundle/Entity/TrackingEvent.php    | 5 ++++-
 src/Oro/Bundle/TrackingBundle/Entity/TrackingWebsite.php  | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/OrganizationBundle/Entity/BusinessUnit.php b/src/Oro/Bundle/OrganizationBundle/Entity/BusinessUnit.php
index 92b3f4fb622..d3c8b323752 100644
--- a/src/Oro/Bundle/OrganizationBundle/Entity/BusinessUnit.php
+++ b/src/Oro/Bundle/OrganizationBundle/Entity/BusinessUnit.php
@@ -43,6 +43,9 @@
  *          "security"={
  *              "type"="ACL",
  *              "group_name"=""
+ *          },
+ *          "grid"={
+ *              "default"="business-unit-grid"
  *          }
  *      }
  * )
diff --git a/src/Oro/Bundle/TrackingBundle/Entity/TrackingEvent.php b/src/Oro/Bundle/TrackingBundle/Entity/TrackingEvent.php
index e954e13a2af..3786299c6bb 100644
--- a/src/Oro/Bundle/TrackingBundle/Entity/TrackingEvent.php
+++ b/src/Oro/Bundle/TrackingBundle/Entity/TrackingEvent.php
@@ -22,7 +22,10 @@
  *  defaultValues={
  *      "entity"={
  *          "icon"="icon-external-link"
- *      }
+ *      },
+ *      "grid"={
+ *          "default"="tracking-events-grid"
+ *     }
  *  }
  * )
  */
diff --git a/src/Oro/Bundle/TrackingBundle/Entity/TrackingWebsite.php b/src/Oro/Bundle/TrackingBundle/Entity/TrackingWebsite.php
index 8aa0906edc6..067c2c6c2b6 100644
--- a/src/Oro/Bundle/TrackingBundle/Entity/TrackingWebsite.php
+++ b/src/Oro/Bundle/TrackingBundle/Entity/TrackingWebsite.php
@@ -31,6 +31,9 @@
  *          "organization_field_name"="organization",
  *          "organization_column_name"="organization_id"
  *      },
+ *      "grid"={
+ *          "default"="website-grid"
+ *     }
  *  }
  * )
  */

From 2adfeb30ca13b8d3acdfa30fd3bac0fd93bf0d12 Mon Sep 17 00:00:00 2001
From: Vova Soroka <vsoroka@magecore.com>
Date: Wed, 6 Jan 2016 22:30:35 +0200
Subject: [PATCH 374/471] Mark Oro\Bundle\UIBundle\Tools\ArrayUtils deprecated

---
 UPGRADE-1.9.md                                |   1 +
 .../Model/Strategy/ReplaceStrategy.php        |  14 +-
 .../Model/Strategy/UniteStrategy.php          |  12 +-
 .../Manager/CalendarManager.php               |   5 +-
 .../OroDashboardExtension.php                 |   5 +-
 .../CompilerPass/ConfigurationPass.php        |   4 +-
 .../Extension/Totals/OrmTotalsExtension.php   |   5 +-
 .../Provider/SystemAwareResolver.php          |   4 +-
 .../Constraints/UniqueKeysValidator.php       |   6 +-
 .../Bundle/FormBundle/Config/BlockConfig.php  |   4 +-
 .../Bundle/FormBundle/Config/FormConfig.php   |   4 +-
 .../Model/Strategy/ReplaceStrategy.php        |  10 +-
 .../Model/Strategy/UniteStrategy.php          |   8 +-
 .../OroPlatformExtension.php                  |   5 +-
 .../Validator/GroupingValidator.php           |   9 +-
 .../RequireJSBundle/Provider/Config.php       |   4 +-
 .../DependencyInjection/Configuration.php     |   5 +-
 .../Tests/Unit/Tools/ArrayUtilsTest.php       | 509 ------------------
 src/Oro/Bundle/UIBundle/Tools/ArrayUtils.php  | 184 +------
 .../Bundle/UIBundle/Twig/SortByExtension.php  |   4 +-
 src/Oro/Component/PhpUtils/ArrayUtil.php      |  82 ++-
 .../PhpUtils/Tests/Unit/ArrayUtilTest.php     | 133 +++++
 22 files changed, 280 insertions(+), 737 deletions(-)
 delete mode 100644 src/Oro/Bundle/UIBundle/Tests/Unit/Tools/ArrayUtilsTest.php

diff --git a/UPGRADE-1.9.md b/UPGRADE-1.9.md
index 35a347054cb..546c6a66010 100644
--- a/UPGRADE-1.9.md
+++ b/UPGRADE-1.9.md
@@ -222,6 +222,7 @@ after:
 - `Oro\Bundle\UIBundle\EventListener\ContentProviderListener` added to the class cache and constructor have container as performance improvement
 - Services with tag `oro_ui.content_provider` was marked as private
 - Services with tag `oro_formatter` was marked as private
+- Class `Oro\Bundle\UIBundle\Tools\ArrayUtils` marked as deprecated. Use `Oro\Component\PhpUtils\ArrayUtil` instead.
 
 ####UserBundle
 - Bundle now contains configuration of security providers (`chain_provider`, `oro_user`, `in_memory`), encoders and security firewalls (`login`, `reset_password`, `main`)
diff --git a/src/Oro/Bundle/ActivityListBundle/Model/Strategy/ReplaceStrategy.php b/src/Oro/Bundle/ActivityListBundle/Model/Strategy/ReplaceStrategy.php
index 31104106d0c..dd96f740ae4 100644
--- a/src/Oro/Bundle/ActivityListBundle/Model/Strategy/ReplaceStrategy.php
+++ b/src/Oro/Bundle/ActivityListBundle/Model/Strategy/ReplaceStrategy.php
@@ -3,6 +3,9 @@
 namespace Oro\Bundle\ActivityListBundle\Model\Strategy;
 
 use Symfony\Component\Security\Core\Util\ClassUtils;
+
+use Oro\Component\PhpUtils\ArrayUtil;
+
 use Oro\Bundle\ActivityBundle\Manager\ActivityManager;
 use Oro\Bundle\ActivityListBundle\Entity\Manager\ActivityListManager;
 use Oro\Bundle\ActivityListBundle\Entity\ActivityList;
@@ -10,12 +13,7 @@
 use Oro\Bundle\EntityBundle\ORM\DoctrineHelper;
 use Oro\Bundle\EntityMergeBundle\Data\FieldData;
 use Oro\Bundle\EntityMergeBundle\Model\Strategy\StrategyInterface;
-use Oro\Bundle\UIBundle\Tools\ArrayUtils;
 
-/**
- * Class ReplaceStrategy
- * @package Oro\Bundle\ActivityListBundle\Model\Strategy
- */
 class ReplaceStrategy implements StrategyInterface
 {
     /** @var ActivityListManager  */
@@ -56,7 +54,7 @@ public function merge(FieldData $fieldData)
             $activityClass = $fieldMetadata->get('type');
 
             $activityListItems = $this->getActivitiesByEntity($masterEntity, $activityClass);
-            $activityIds = ArrayUtils::arrayColumn($activityListItems, 'relatedActivityId');
+            $activityIds = ArrayUtil::arrayColumn($activityListItems, 'relatedActivityId');
 
             $activities = $this->doctrineHelper->getEntityRepository($activityClass)->findBy(['id' => $activityIds]);
             foreach ($activities as $activity) {
@@ -65,7 +63,7 @@ public function merge(FieldData $fieldData)
 
             $activityListItems = $this->getActivitiesByEntity($sourceEntity, $activityClass);
 
-            $activityIds = ArrayUtils::arrayColumn($activityListItems, 'id');
+            $activityIds = ArrayUtil::arrayColumn($activityListItems, 'id');
             $entityClass = ClassUtils::getRealClass($masterEntity);
             $this->activityListManager
                 ->replaceActivityTargetWithPlainQuery(
@@ -75,7 +73,7 @@ public function merge(FieldData $fieldData)
                     $masterEntity->getId()
                 );
 
-            $activityIds = ArrayUtils::arrayColumn($activityListItems, 'relatedActivityId');
+            $activityIds = ArrayUtil::arrayColumn($activityListItems, 'relatedActivityId');
             $this->activityListManager
                 ->replaceActivityTargetWithPlainQuery(
                     $activityIds,
diff --git a/src/Oro/Bundle/ActivityListBundle/Model/Strategy/UniteStrategy.php b/src/Oro/Bundle/ActivityListBundle/Model/Strategy/UniteStrategy.php
index 44621d1dc0f..24ee39db5b7 100644
--- a/src/Oro/Bundle/ActivityListBundle/Model/Strategy/UniteStrategy.php
+++ b/src/Oro/Bundle/ActivityListBundle/Model/Strategy/UniteStrategy.php
@@ -3,18 +3,16 @@
 namespace Oro\Bundle\ActivityListBundle\Model\Strategy;
 
 use Symfony\Component\Security\Core\Util\ClassUtils;
+
+use Oro\Component\PhpUtils\ArrayUtil;
+
 use Oro\Bundle\ActivityListBundle\Entity\Manager\ActivityListManager;
 use Oro\Bundle\ActivityListBundle\Entity\ActivityList;
 use Oro\Bundle\ActivityListBundle\Model\MergeModes;
 use Oro\Bundle\EntityBundle\ORM\DoctrineHelper;
 use Oro\Bundle\EntityMergeBundle\Model\Strategy\StrategyInterface;
 use Oro\Bundle\EntityMergeBundle\Data\FieldData;
-use Oro\Bundle\UIBundle\Tools\ArrayUtils;
 
-/**
- * Class UniteStrategy
- * @package Oro\Bundle\ActivityListBundle\Model\Strategy
- */
 class UniteStrategy implements StrategyInterface
 {
     /** @var ActivityListManager  */
@@ -53,7 +51,7 @@ public function merge(FieldData $fieldData)
 
                 $activityListItems = $queryBuilder->getQuery()->getResult();
 
-                $activityIds = ArrayUtils::arrayColumn($activityListItems, 'id');
+                $activityIds = ArrayUtil::arrayColumn($activityListItems, 'id');
                 $this->activityListManager
                     ->replaceActivityTargetWithPlainQuery(
                         $activityIds,
@@ -62,7 +60,7 @@ public function merge(FieldData $fieldData)
                         $masterEntity->getId()
                     );
 
-                $activityIds = ArrayUtils::arrayColumn($activityListItems, 'relatedActivityId');
+                $activityIds = ArrayUtil::arrayColumn($activityListItems, 'relatedActivityId');
                 $this->activityListManager
                     ->replaceActivityTargetWithPlainQuery(
                         $activityIds,
diff --git a/src/Oro/Bundle/CalendarBundle/Manager/CalendarManager.php b/src/Oro/Bundle/CalendarBundle/Manager/CalendarManager.php
index 9a407ac2d37..b387db59c4b 100644
--- a/src/Oro/Bundle/CalendarBundle/Manager/CalendarManager.php
+++ b/src/Oro/Bundle/CalendarBundle/Manager/CalendarManager.php
@@ -2,9 +2,10 @@
 
 namespace Oro\Bundle\CalendarBundle\Manager;
 
+use Oro\Component\PhpUtils\ArrayUtil;
+
 use Oro\Bundle\CalendarBundle\Provider\CalendarPropertyProvider;
 use Oro\Bundle\CalendarBundle\Provider\CalendarProviderInterface;
-use Oro\Bundle\UIBundle\Tools\ArrayUtils;
 
 class CalendarManager
 {
@@ -164,7 +165,7 @@ protected function normalizeCalendarData(array &$calendars)
             $this->applyCalendarDefaultValues($calendar, $defaultValues);
         }
 
-        ArrayUtils::sortBy($calendars, false, 'position');
+        ArrayUtil::sortBy($calendars, false, 'position');
     }
 
     /**
diff --git a/src/Oro/Bundle/DashboardBundle/DependencyInjection/OroDashboardExtension.php b/src/Oro/Bundle/DashboardBundle/DependencyInjection/OroDashboardExtension.php
index 1c8a3302a35..a050c9a9412 100644
--- a/src/Oro/Bundle/DashboardBundle/DependencyInjection/OroDashboardExtension.php
+++ b/src/Oro/Bundle/DashboardBundle/DependencyInjection/OroDashboardExtension.php
@@ -9,8 +9,7 @@
 
 use Oro\Component\Config\Loader\CumulativeConfigLoader;
 use Oro\Component\Config\Loader\YamlCumulativeFileLoader;
-
-use Oro\Bundle\UIBundle\Tools\ArrayUtils;
+use Oro\Component\PhpUtils\ArrayUtil;
 
 class OroDashboardExtension extends Extension
 {
@@ -69,7 +68,7 @@ protected function prepareWidgets(array &$widgets, array $defaultConfiguration)
      */
     protected function sortItemsByPosition(array &$items)
     {
-        ArrayUtils::sortBy($items, false, 'position');
+        ArrayUtil::sortBy($items, false, 'position');
 
         foreach ($items as &$item) {
             unset($item['position']);
diff --git a/src/Oro/Bundle/DataGridBundle/DependencyInjection/CompilerPass/ConfigurationPass.php b/src/Oro/Bundle/DataGridBundle/DependencyInjection/CompilerPass/ConfigurationPass.php
index 1c422f34d46..127a68c4424 100644
--- a/src/Oro/Bundle/DataGridBundle/DependencyInjection/CompilerPass/ConfigurationPass.php
+++ b/src/Oro/Bundle/DataGridBundle/DependencyInjection/CompilerPass/ConfigurationPass.php
@@ -6,9 +6,9 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
-use Oro\Bundle\UIBundle\Tools\ArrayUtils;
 use Oro\Component\Config\Loader\CumulativeConfigLoader;
 use Oro\Component\Config\Loader\YamlCumulativeFileLoader;
+use Oro\Component\PhpUtils\ArrayUtil;
 
 class ConfigurationPass implements CompilerPassInterface
 {
@@ -49,7 +49,7 @@ protected function registerConfigFiles(ContainerBuilder $container)
             $resources    = $configLoader->load($container);
             foreach ($resources as $resource) {
                 if (isset($resource->data[self::ROOT_PARAMETER]) && is_array($resource->data[self::ROOT_PARAMETER])) {
-                    $config = ArrayUtils::arrayMergeRecursiveDistinct($config, $resource->data[self::ROOT_PARAMETER]);
+                    $config = ArrayUtil::arrayMergeRecursiveDistinct($config, $resource->data[self::ROOT_PARAMETER]);
                 }
             }
 
diff --git a/src/Oro/Bundle/DataGridBundle/Extension/Totals/OrmTotalsExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/Totals/OrmTotalsExtension.php
index d139d5fb719..84adb32c322 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/Totals/OrmTotalsExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/Totals/OrmTotalsExtension.php
@@ -8,6 +8,8 @@
 
 use Symfony\Component\Translation\TranslatorInterface;
 
+use Oro\Component\PhpUtils\ArrayUtil;
+
 use Oro\Bundle\DataGridBundle\Datagrid\Builder;
 use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
 use Oro\Bundle\DataGridBundle\Datagrid\Common\MetadataObject;
@@ -22,7 +24,6 @@
 use Oro\Bundle\LocaleBundle\Formatter\NumberFormatter;
 
 use Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper;
-use Oro\Bundle\UIBundle\Tools\ArrayUtils;
 
 /**
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
@@ -347,7 +348,7 @@ protected function addPageLimits(QueryBuilder $dataQueryBuilder, $pageData, $per
             $data = $pageData['data'];
         }
         foreach ($rootIdentifiers as $identifier) {
-            $ids = ArrayUtils::arrayColumn($data, $identifier['alias']);
+            $ids = ArrayUtil::arrayColumn($data, $identifier['alias']);
 
             $field = isset($identifier['entityAlias'])
                 ? $identifier['entityAlias'] . '.' . $identifier['fieldAlias']
diff --git a/src/Oro/Bundle/DataGridBundle/Provider/SystemAwareResolver.php b/src/Oro/Bundle/DataGridBundle/Provider/SystemAwareResolver.php
index 6076d7c87a4..fea26ce3003 100644
--- a/src/Oro/Bundle/DataGridBundle/Provider/SystemAwareResolver.php
+++ b/src/Oro/Bundle/DataGridBundle/Provider/SystemAwareResolver.php
@@ -5,7 +5,7 @@
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
-use Oro\Bundle\UIBundle\Tools\ArrayUtils;
+use Oro\Component\PhpUtils\ArrayUtil;
 
 class SystemAwareResolver implements ContainerAwareInterface
 {
@@ -51,7 +51,7 @@ public function resolve($datagridName, $datagridDefinition, $recursion = false)
                     ->getConfigurationForGrid($val);
 
                 // merge them and remove extend directive
-                $datagridDefinition = ArrayUtils::arrayMergeRecursiveDistinct(
+                $datagridDefinition = ArrayUtil::arrayMergeRecursiveDistinct(
                     $definition->toArray(),
                     $datagridDefinition
                 );
diff --git a/src/Oro/Bundle/EntityExtendBundle/Validator/Constraints/UniqueKeysValidator.php b/src/Oro/Bundle/EntityExtendBundle/Validator/Constraints/UniqueKeysValidator.php
index 05f2944c067..fc25d1aef32 100644
--- a/src/Oro/Bundle/EntityExtendBundle/Validator/Constraints/UniqueKeysValidator.php
+++ b/src/Oro/Bundle/EntityExtendBundle/Validator/Constraints/UniqueKeysValidator.php
@@ -5,7 +5,7 @@
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 
-use Oro\Bundle\UIBundle\Tools\ArrayUtils;
+use Oro\Component\PhpUtils\ArrayUtil;
 
 class UniqueKeysValidator extends ConstraintValidator
 {
@@ -15,7 +15,7 @@ class UniqueKeysValidator extends ConstraintValidator
     public function validate($value, Constraint $constraint)
     {
         /** @var UniqueKeys $constraint */
-        $names = ArrayUtils::arrayColumn($value, 'name');
+        $names = ArrayUtil::arrayColumn($value, 'name');
         if ($names && $names != array_unique($names)) {
             $this->context->addViolation(
                 $constraint->message
@@ -24,7 +24,7 @@ public function validate($value, Constraint $constraint)
             return;
         }
 
-        $keys = ArrayUtils::arrayColumn($value, 'key');
+        $keys = ArrayUtil::arrayColumn($value, 'key');
         if ($keys && $keys != array_unique($keys, SORT_REGULAR)) {
             $this->context->addViolation(
                 $constraint->message
diff --git a/src/Oro/Bundle/FormBundle/Config/BlockConfig.php b/src/Oro/Bundle/FormBundle/Config/BlockConfig.php
index 8de2b9209b7..1895fef34d1 100644
--- a/src/Oro/Bundle/FormBundle/Config/BlockConfig.php
+++ b/src/Oro/Bundle/FormBundle/Config/BlockConfig.php
@@ -2,7 +2,7 @@
 
 namespace Oro\Bundle\FormBundle\Config;
 
-use Oro\Bundle\UIBundle\Tools\ArrayUtils;
+use Oro\Component\PhpUtils\ArrayUtil;
 
 class BlockConfig implements FormConfigInterface
 {
@@ -235,6 +235,6 @@ public function toArray()
 
     protected function sortSubBlocks()
     {
-        ArrayUtils::sortBy($this->subBlocks, true);
+        ArrayUtil::sortBy($this->subBlocks, true);
     }
 }
diff --git a/src/Oro/Bundle/FormBundle/Config/FormConfig.php b/src/Oro/Bundle/FormBundle/Config/FormConfig.php
index 3946ca59e5c..51492b5ef55 100644
--- a/src/Oro/Bundle/FormBundle/Config/FormConfig.php
+++ b/src/Oro/Bundle/FormBundle/Config/FormConfig.php
@@ -2,7 +2,7 @@
 
 namespace Oro\Bundle\FormBundle\Config;
 
-use Oro\Bundle\UIBundle\Tools\ArrayUtils;
+use Oro\Component\PhpUtils\ArrayUtil;
 
 class FormConfig implements FormConfigInterface
 {
@@ -87,6 +87,6 @@ public function toArray()
 
     protected function sortBlocks()
     {
-        ArrayUtils::sortBy($this->blocks, true);
+        ArrayUtil::sortBy($this->blocks, true);
     }
 }
diff --git a/src/Oro/Bundle/NoteBundle/Model/Strategy/ReplaceStrategy.php b/src/Oro/Bundle/NoteBundle/Model/Strategy/ReplaceStrategy.php
index 42ae4ff3e52..bc3e769e42a 100644
--- a/src/Oro/Bundle/NoteBundle/Model/Strategy/ReplaceStrategy.php
+++ b/src/Oro/Bundle/NoteBundle/Model/Strategy/ReplaceStrategy.php
@@ -3,18 +3,16 @@
 namespace Oro\Bundle\NoteBundle\Model\Strategy;
 
 use Symfony\Component\Security\Core\Util\ClassUtils;
+
+use Oro\Component\PhpUtils\ArrayUtil;
+
 use Oro\Bundle\ActivityListBundle\Entity\Manager\ActivityListManager;
 use Oro\Bundle\ActivityListBundle\Entity\ActivityList;
 use Oro\Bundle\EntityBundle\ORM\DoctrineHelper;
 use Oro\Bundle\EntityMergeBundle\Data\FieldData;
 use Oro\Bundle\EntityMergeBundle\Model\Strategy\StrategyInterface;
 use Oro\Bundle\NoteBundle\Model\MergeModes;
-use Oro\Bundle\UIBundle\Tools\ArrayUtils;
 
-/**
- * Class ReplaceStrategy
- * @package Oro\Bundle\NoteBundle\Model\Strategy
- */
 class ReplaceStrategy implements StrategyInterface
 {
     /** @var DoctrineHelper  */
@@ -71,7 +69,7 @@ public function merge(FieldData $fieldData)
                 ->getActivityListQueryBuilderByActivityClass($entityClass, $sourceEntity->getId(), $activityClass);
             $activityListItems = $queryBuilder->getQuery()->getResult();
 
-            $activityIds = ArrayUtils::arrayColumn($activityListItems, 'id');
+            $activityIds = ArrayUtil::arrayColumn($activityListItems, 'id');
             $this->activityListManager
                 ->replaceActivityTargetWithPlainQuery(
                     $activityIds,
diff --git a/src/Oro/Bundle/NoteBundle/Model/Strategy/UniteStrategy.php b/src/Oro/Bundle/NoteBundle/Model/Strategy/UniteStrategy.php
index 2c663fa7bd2..07912c7638f 100644
--- a/src/Oro/Bundle/NoteBundle/Model/Strategy/UniteStrategy.php
+++ b/src/Oro/Bundle/NoteBundle/Model/Strategy/UniteStrategy.php
@@ -2,14 +2,16 @@
 
 namespace Oro\Bundle\NoteBundle\Model\Strategy;
 
-use Oro\Bundle\NoteBundle\Model\MergeModes;
 use Symfony\Component\Security\Core\Util\ClassUtils;
+
+use Oro\Component\PhpUtils\ArrayUtil;
+
 use Oro\Bundle\ActivityListBundle\Entity\Manager\ActivityListManager;
 use Oro\Bundle\ActivityListBundle\Entity\ActivityList;
 use Oro\Bundle\EntityBundle\ORM\DoctrineHelper;
 use Oro\Bundle\EntityMergeBundle\Model\Strategy\StrategyInterface;
 use Oro\Bundle\EntityMergeBundle\Data\FieldData;
-use Oro\Bundle\UIBundle\Tools\ArrayUtils;
+use Oro\Bundle\NoteBundle\Model\MergeModes;
 
 class UniteStrategy implements StrategyInterface
 {
@@ -60,7 +62,7 @@ public function merge(FieldData $fieldData)
 
                 $activityListItems = $queryBuilder->getQuery()->getResult();
 
-                $activityIds = ArrayUtils::arrayColumn($activityListItems, 'id');
+                $activityIds = ArrayUtil::arrayColumn($activityListItems, 'id');
                 $this->activityListManager
                     ->replaceActivityTargetWithPlainQuery(
                         $activityIds,
diff --git a/src/Oro/Bundle/PlatformBundle/DependencyInjection/OroPlatformExtension.php b/src/Oro/Bundle/PlatformBundle/DependencyInjection/OroPlatformExtension.php
index bfd342a88ef..0cbf23da26c 100644
--- a/src/Oro/Bundle/PlatformBundle/DependencyInjection/OroPlatformExtension.php
+++ b/src/Oro/Bundle/PlatformBundle/DependencyInjection/OroPlatformExtension.php
@@ -11,8 +11,9 @@
 use Oro\Component\Config\Loader\CumulativeConfigLoader;
 use Oro\Component\Config\Loader\YamlCumulativeFileLoader;
 use Oro\Component\DependencyInjection\ExtendedContainerBuilder;
+use Oro\Component\PhpUtils\ArrayUtil;
+
 use Oro\Bundle\EntityBundle\ORM\DatabaseDriverInterface;
-use Oro\Bundle\UIBundle\Tools\ArrayUtils;
 
 class OroPlatformExtension extends Extension implements PrependExtensionInterface
 {
@@ -111,7 +112,7 @@ private function mergeConfigIntoOne(ContainerBuilder $container, $name, array $c
             $originalConfig[] = array();
         }
 
-        $mergedConfig = ArrayUtils::arrayMergeRecursiveDistinct($originalConfig[0], $config);
+        $mergedConfig = ArrayUtil::arrayMergeRecursiveDistinct($originalConfig[0], $config);
         $originalConfig[0] = $mergedConfig;
 
         $container->setExtensionConfig($name, $originalConfig);
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Validator/GroupingValidator.php b/src/Oro/Bundle/QueryDesignerBundle/Validator/GroupingValidator.php
index 64e2b4c13f2..05a99061910 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Validator/GroupingValidator.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/Validator/GroupingValidator.php
@@ -6,9 +6,10 @@
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 
+use Oro\Component\PhpUtils\ArrayUtil;
+
 use Oro\Bundle\QueryDesignerBundle\Model\AbstractQueryDesigner;
 use Oro\Bundle\QueryDesignerBundle\Validator\Constraints\GroupingConstraint;
-use Oro\Bundle\UIBundle\Tools\ArrayUtils;
 
 class GroupingValidator extends ConstraintValidator
 {
@@ -55,11 +56,11 @@ function (array $column) {
             $groupingColumns = $definition['grouping_columns'];
         }
 
-        $groupingColumnNames = ArrayUtils::arrayColumn($groupingColumns, 'name');
-        $columnNames         = ArrayUtils::arrayColumn($columns, 'name');
+        $groupingColumnNames = ArrayUtil::arrayColumn($groupingColumns, 'name');
+        $columnNames         = ArrayUtil::arrayColumn($columns, 'name');
         $columnNamesToCheck  = array_diff(
             $columnNames,
-            ArrayUtils::arrayColumn($aggregateColumns, 'name')
+            ArrayUtil::arrayColumn($aggregateColumns, 'name')
         );
         $columnsToGroup      = array_diff($columnNamesToCheck, $groupingColumnNames);
 
diff --git a/src/Oro/Bundle/RequireJSBundle/Provider/Config.php b/src/Oro/Bundle/RequireJSBundle/Provider/Config.php
index 15c4f467169..800adc06dab 100644
--- a/src/Oro/Bundle/RequireJSBundle/Provider/Config.php
+++ b/src/Oro/Bundle/RequireJSBundle/Provider/Config.php
@@ -9,7 +9,7 @@
 
 use Doctrine\Common\Cache\CacheProvider;
 
-use Oro\Bundle\UIBundle\Tools\ArrayUtils;
+use Oro\Component\PhpUtils\ArrayUtil;
 
 class Config
 {
@@ -149,7 +149,7 @@ public function collectConfigs()
                 $reflection = new \ReflectionClass($bundle);
                 if (is_file($file = dirname($reflection->getFilename()) . '/Resources/config/requirejs.yml')) {
                     $requirejs = Yaml::parse(realpath($file));
-                    $config = ArrayUtils::arrayMergeRecursiveDistinct($config, $requirejs);
+                    $config = ArrayUtil::arrayMergeRecursiveDistinct($config, $requirejs);
                 }
             }
 
diff --git a/src/Oro/Bundle/UIBundle/DependencyInjection/Configuration.php b/src/Oro/Bundle/UIBundle/DependencyInjection/Configuration.php
index afe7d2fb3c8..2dbd4847bb1 100644
--- a/src/Oro/Bundle/UIBundle/DependencyInjection/Configuration.php
+++ b/src/Oro/Bundle/UIBundle/DependencyInjection/Configuration.php
@@ -6,8 +6,9 @@
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
+use Oro\Component\PhpUtils\ArrayUtil;
+
 use Oro\Bundle\ConfigBundle\DependencyInjection\SettingsBuilder;
-use Oro\Bundle\UIBundle\Tools\ArrayUtils;
 
 /**
  * This is the class that validates and merges configuration from your app/config files
@@ -218,7 +219,7 @@ function ($v) {
      */
     protected function sortItems($items)
     {
-        ArrayUtils::sortBy($items, false, 'order');
+        ArrayUtil::sortBy($items, false, 'order');
 
         return array_keys($items);
     }
diff --git a/src/Oro/Bundle/UIBundle/Tests/Unit/Tools/ArrayUtilsTest.php b/src/Oro/Bundle/UIBundle/Tests/Unit/Tools/ArrayUtilsTest.php
deleted file mode 100644
index 8a83f3a00b3..00000000000
--- a/src/Oro/Bundle/UIBundle/Tests/Unit/Tools/ArrayUtilsTest.php
+++ /dev/null
@@ -1,509 +0,0 @@
-<?php
-
-namespace Oro\Bundle\UIBundle\Tests\Unit\Tools;
-
-use Oro\Bundle\UIBundle\Tools\ArrayUtils;
-
-class ArrayUtilsTest extends \PHPUnit_Framework_TestCase
-{
-    public function testSortByEmpty()
-    {
-        $array = [];
-
-        ArrayUtils::sortBy($array);
-        $this->assertSame([], $array);
-    }
-
-    public function testSortByArrayNoOrder()
-    {
-        $array = [
-            ['name' => '1'],
-            ['name' => '2'],
-            ['name' => '3'],
-        ];
-
-        ArrayUtils::sortBy($array);
-        $this->assertSame(
-            [
-                ['name' => '1'],
-                ['name' => '2'],
-                ['name' => '3'],
-            ],
-            $array
-        );
-    }
-
-    public function testSortByArrayNoOrderReverse()
-    {
-        $array = [
-            ['name' => '1'],
-            ['name' => '2'],
-            ['name' => '3'],
-        ];
-
-        ArrayUtils::sortBy($array, true);
-        $this->assertSame(
-            [
-                ['name' => '1'],
-                ['name' => '2'],
-                ['name' => '3'],
-            ],
-            $array
-        );
-    }
-
-    public function testSortByArraySameOrder()
-    {
-        $array = [
-            ['name' => '1', 'priority' => 100],
-            ['name' => '2', 'priority' => 100],
-            ['name' => '3', 'priority' => 100],
-        ];
-
-        ArrayUtils::sortBy($array);
-        $this->assertSame(
-            [
-                ['name' => '1', 'priority' => 100],
-                ['name' => '2', 'priority' => 100],
-                ['name' => '3', 'priority' => 100],
-            ],
-            $array
-        );
-    }
-
-    public function testSortByArraySameOrderReverse()
-    {
-        $array = [
-            ['name' => '1', 'priority' => 100],
-            ['name' => '2', 'priority' => 100],
-            ['name' => '3', 'priority' => 100],
-        ];
-
-        ArrayUtils::sortBy($array, true);
-        $this->assertSame(
-            [
-                ['name' => '1', 'priority' => 100],
-                ['name' => '2', 'priority' => 100],
-                ['name' => '3', 'priority' => 100],
-            ],
-            $array
-        );
-    }
-
-    public function testSortByArrayNumeric()
-    {
-        $array = [
-            ['name' => '1'],
-            ['name' => '2'],
-            ['name' => '3', 'priority' => 100],
-            ['name' => '4'],
-            ['name' => '5', 'priority' => -100],
-            ['name' => '6', 'priority' => 100],
-            ['name' => '7', 'priority' => -100],
-            ['name' => '8', 'priority' => 0],
-            ['name' => '9'],
-        ];
-
-        ArrayUtils::sortBy($array);
-        $this->assertSame(
-            [
-                ['name' => '5', 'priority' => -100],
-                ['name' => '7', 'priority' => -100],
-                ['name' => '1'],
-                ['name' => '2'],
-                ['name' => '4'],
-                ['name' => '8', 'priority' => 0],
-                ['name' => '9'],
-                ['name' => '3', 'priority' => 100],
-                ['name' => '6', 'priority' => 100],
-            ],
-            $array
-        );
-    }
-
-    public function testSortByArrayNumericReverse()
-    {
-        $array = [
-            ['name' => '1'],
-            ['name' => '2'],
-            ['name' => '3', 'priority' => 100],
-            ['name' => '4'],
-            ['name' => '5', 'priority' => -100],
-            ['name' => '6', 'priority' => 100],
-            ['name' => '7', 'priority' => -100],
-            ['name' => '8', 'priority' => 0],
-            ['name' => '9'],
-        ];
-
-        ArrayUtils::sortBy($array, true);
-        $this->assertSame(
-            [
-                ['name' => '3', 'priority' => 100],
-                ['name' => '6', 'priority' => 100],
-                ['name' => '1'],
-                ['name' => '2'],
-                ['name' => '4'],
-                ['name' => '8', 'priority' => 0],
-                ['name' => '9'],
-                ['name' => '5', 'priority' => -100],
-                ['name' => '7', 'priority' => -100],
-            ],
-            $array
-        );
-    }
-
-    public function testSortByAssocArrayNumeric()
-    {
-        $array = [
-            'i1' => ['name' => '1'],
-            'i2' => ['name' => '2'],
-            'i3' => ['name' => '3', 'priority' => 100],
-            'i4' => ['name' => '4'],
-            'i5' => ['name' => '5', 'priority' => -100],
-            'i6' => ['name' => '6', 'priority' => 100],
-            'i7' => ['name' => '7', 'priority' => -100],
-            'i8' => ['name' => '8', 'priority' => 0],
-            'i9' => ['name' => '9'],
-        ];
-
-        ArrayUtils::sortBy($array);
-        $this->assertSame(
-            [
-                'i5' => ['name' => '5', 'priority' => -100],
-                'i7' => ['name' => '7', 'priority' => -100],
-                'i1' => ['name' => '1'],
-                'i2' => ['name' => '2'],
-                'i4' => ['name' => '4'],
-                'i8' => ['name' => '8', 'priority' => 0],
-                'i9' => ['name' => '9'],
-                'i3' => ['name' => '3', 'priority' => 100],
-                'i6' => ['name' => '6', 'priority' => 100],
-            ],
-            $array
-        );
-    }
-
-    public function testSortByAssocArrayNumericReverse()
-    {
-        $array = [
-            'i1' => ['name' => '1'],
-            'i2' => ['name' => '2'],
-            'i3' => ['name' => '3', 'priority' => 100],
-            'i4' => ['name' => '4'],
-            'i5' => ['name' => '5', 'priority' => -100],
-            'i6' => ['name' => '6', 'priority' => 100],
-            'i7' => ['name' => '7', 'priority' => -100],
-            'i8' => ['name' => '8', 'priority' => 0],
-            'i9' => ['name' => '9'],
-        ];
-
-        ArrayUtils::sortBy($array, true);
-        $this->assertSame(
-            [
-                'i3' => ['name' => '3', 'priority' => 100],
-                'i6' => ['name' => '6', 'priority' => 100],
-                'i1' => ['name' => '1'],
-                'i2' => ['name' => '2'],
-                'i4' => ['name' => '4'],
-                'i8' => ['name' => '8', 'priority' => 0],
-                'i9' => ['name' => '9'],
-                'i5' => ['name' => '5', 'priority' => -100],
-                'i7' => ['name' => '7', 'priority' => -100],
-            ],
-            $array
-        );
-    }
-
-    public function testSortByArrayString()
-    {
-        $array = [
-            ['name' => 'a'],
-            ['name' => 'c'],
-            ['name' => 'b'],
-        ];
-
-        ArrayUtils::sortBy($array, false, 'name', SORT_STRING);
-        $this->assertSame(
-            [
-                ['name' => 'a'],
-                ['name' => 'b'],
-                ['name' => 'c'],
-            ],
-            $array
-        );
-    }
-
-    public function testSortByArrayStringReverse()
-    {
-        $array = [
-            ['name' => 'a'],
-            ['name' => 'c'],
-            ['name' => 'b'],
-        ];
-
-        ArrayUtils::sortBy($array, true, 'name', SORT_STRING);
-        $this->assertSame(
-            [
-                ['name' => 'c'],
-                ['name' => 'b'],
-                ['name' => 'a'],
-            ],
-            $array
-        );
-    }
-
-    public function testSortByArrayStringCaseInsensitive()
-    {
-        $array = [
-            ['name' => 'a'],
-            ['name' => 'C'],
-            ['name' => 'B'],
-        ];
-
-        ArrayUtils::sortBy($array, false, 'name', SORT_STRING | SORT_FLAG_CASE);
-        $this->assertSame(
-            [
-                ['name' => 'a'],
-                ['name' => 'B'],
-                ['name' => 'C'],
-            ],
-            $array
-        );
-    }
-
-    public function testSortByArrayStringCaseInsensitiveReverse()
-    {
-        $array = [
-            ['name' => 'a'],
-            ['name' => 'C'],
-            ['name' => 'B'],
-        ];
-
-        ArrayUtils::sortBy($array, true, 'name', SORT_STRING | SORT_FLAG_CASE);
-        $this->assertSame(
-            [
-                ['name' => 'C'],
-                ['name' => 'B'],
-                ['name' => 'a'],
-            ],
-            $array
-        );
-    }
-
-    public function testSortByArrayPath()
-    {
-        $array = [
-            ['name' => '1', 'child' => ['priority' => 1]],
-            ['name' => '2', 'child' => ['priority' => 3]],
-            ['name' => '3', 'child' => ['priority' => 2]],
-        ];
-
-        ArrayUtils::sortBy($array, false, '[child][priority]');
-        $this->assertSame(
-            [
-                ['name' => '1', 'child' => ['priority' => 1]],
-                ['name' => '3', 'child' => ['priority' => 2]],
-                ['name' => '2', 'child' => ['priority' => 3]],
-            ],
-            $array
-        );
-    }
-
-    public function testSortByObject()
-    {
-        $obj1  = $this->createObject(['name' => '1', 'priority' => null]);
-        $obj2  = $this->createObject(['name' => '2', 'priority' => 100]);
-        $obj3  = $this->createObject(['name' => '3', 'priority' => 0]);
-        $array = [
-            $obj1,
-            $obj2,
-            $obj3,
-        ];
-
-        ArrayUtils::sortBy($array);
-        $this->assertSame(
-            [
-                $obj1,
-                $obj3,
-                $obj2,
-            ],
-            $array
-        );
-    }
-
-    public function testSortByObjectPath()
-    {
-        $obj1  = $this->createObject(
-            ['name' => '1', 'child' => $this->createObject(['priority' => null])]
-        );
-        $obj2  = $this->createObject(
-            ['name' => '2', 'child' => $this->createObject(['priority' => 100])]
-        );
-        $obj3  = $this->createObject(
-            ['name' => '3', 'child' => $this->createObject(['priority' => 0])]
-        );
-        $array = [
-            $obj1,
-            $obj2,
-            $obj3,
-        ];
-
-        ArrayUtils::sortBy($array, false, 'child.priority');
-        $this->assertSame(
-            [
-                $obj1,
-                $obj3,
-                $obj2,
-            ],
-            $array
-        );
-    }
-
-    /**
-     * @param array $properties
-     *
-     * @return object
-     */
-    protected function createObject($properties)
-    {
-        $obj = new \stdClass();
-        foreach ($properties as $name => $val) {
-            $obj->$name = $val;
-        }
-
-        return $obj;
-    }
-
-    /**
-     * @param array $array
-     * @param mixed $columnKey
-     * @param mixed $indexKey
-     * @param array $expected
-     *
-     * @dataProvider arrayColumnProvider
-     */
-    public function testArrayColumn(array $array, $columnKey, $indexKey, array $expected)
-    {
-        $this->assertEquals(
-            $expected,
-            ArrayUtils::arrayColumn($array, $columnKey, $indexKey)
-        );
-    }
-
-    /**
-     * @return array
-     */
-    public function arrayColumnProvider()
-    {
-        return [
-            'empty'        => [[], 'value', 'value', []],
-            'no_index'     => [
-                [
-                    [
-                        'id'    => 'id1',
-                        'value' => 'value2'
-                    ]
-                ],
-                'value',
-                null,
-                ['value2']
-            ],
-            'index'        => [
-                [
-                    [
-                        'id'    => 'id1',
-                        'value' => 'value2'
-                    ]
-                ],
-                'value',
-                'id',
-                ['id1' => 'value2']
-            ],
-            'wrong_index'  => [
-                [
-                    ['value' => 'value2']
-                ],
-                'value',
-                'id',
-                []
-            ],
-            'wrong_column' => [
-                [
-                    ['value' => 'value2']
-                ],
-                'id',
-                null,
-                []
-            ],
-
-        ];
-    }
-
-    /**
-     * @param array  $array
-     * @param mixed  $columnKey
-     * @param mixed  $indexKey
-     * @param string $expectedMessage
-     *
-     * @dataProvider arrayColumnInputData
-     */
-    public function testArrayColumnInputData(array $array, $columnKey, $indexKey, $expectedMessage)
-    {
-        $this->setExpectedException(
-            '\InvalidArgumentException',
-            $expectedMessage
-        );
-
-        ArrayUtils::arrayColumn($array, $columnKey, $indexKey);
-    }
-
-    /**
-     * @return array
-     */
-    public function arrayColumnInputData()
-    {
-        return [
-            'empty_column_key' => [
-                [
-                    ['id' => 'value']
-                ],
-                null,
-                null,
-                'Column key is empty'
-            ]
-        ];
-    }
-
-    /**
-     * @dataProvider mergeDataProvider
-     *
-     * @param array $expected
-     * @param array $first
-     * @param array $second
-     */
-    public function testArrayMergeRecursiveDistinct(array $expected, array $first, array $second)
-    {
-        $this->assertEquals($expected, ArrayUtils::arrayMergeRecursiveDistinct($first, $second));
-    }
-
-    /**
-     * @return array
-     */
-    public function mergeDataProvider()
-    {
-        return [
-            [
-                [
-                    'a',
-                    'b',
-                    'c' => [
-                        'd' => 'd2',
-                        'e' => 'e1'
-                    ]
-                ],
-                ['a', 'c' => ['d' => 'd1', 'e' => 'e1']],
-                ['b', 'c' => ['d' => 'd2']]
-            ]
-        ];
-    }
-}
diff --git a/src/Oro/Bundle/UIBundle/Tools/ArrayUtils.php b/src/Oro/Bundle/UIBundle/Tools/ArrayUtils.php
index 47a1693d539..730329cf89f 100644
--- a/src/Oro/Bundle/UIBundle/Tools/ArrayUtils.php
+++ b/src/Oro/Bundle/UIBundle/Tools/ArrayUtils.php
@@ -2,9 +2,12 @@
 
 namespace Oro\Bundle\UIBundle\Tools;
 
-use Symfony\Component\PropertyAccess\PropertyAccess;
+use Oro\Component\PhpUtils\ArrayUtil;
 use Symfony\Component\PropertyAccess\PropertyPathInterface;
 
+/**
+ * @deprecated since 1.9. Use {@see Oro\Component\PhpUtils\ArrayUtil} instead
+ */
 class ArrayUtils
 {
     /**
@@ -16,26 +19,12 @@ class ArrayUtils
      * @param array $first
      * @param array $second
      * @return array
+     *
+     * @deprecated since 1.9. Use Oro\Component\PhpUtils\ArrayUtil::arrayMergeRecursiveDistinct instead
      */
     public static function arrayMergeRecursiveDistinct(array $first, array $second)
     {
-        foreach ($second as $idx => $value) {
-            if (is_integer($idx)) {
-                $first[] = $value;
-            } else {
-                if (!array_key_exists($idx, $first)) {
-                    $first[$idx] = $value;
-                } else {
-                    if (is_array($value)) {
-                        $first[$idx] = self::arrayMergeRecursiveDistinct($first[$idx], $value);
-                    } else {
-                        $first[$idx] = $value;
-                    }
-                }
-            }
-        }
-
-        return $first;
+        return ArrayUtil::arrayMergeRecursiveDistinct($first, $second);
     }
 
     /**
@@ -48,37 +37,12 @@ public static function arrayMergeRecursiveDistinct(array $first, array $second)
      * @param mixed $indexKey
      *
      * @return array
+     *
+     * @deprecated since 1.9. Use Oro\Component\PhpUtils\ArrayUtil::arrayColumn instead
      */
     public static function arrayColumn(array $array, $columnKey, $indexKey = null)
     {
-        $result = [];
-
-        if (empty($array)) {
-            return [];
-        }
-
-        if (empty($columnKey)) {
-            throw new \InvalidArgumentException('Column key is empty');
-        }
-
-        foreach ($array as $item) {
-            if (!isset($item[$columnKey])) {
-                continue;
-            }
-
-            if ($indexKey && !isset($item[$indexKey])) {
-                continue;
-            }
-
-            if ($indexKey) {
-                $index = $item[$indexKey];
-                $result[$index] = $item[$columnKey];
-            } else {
-                $result[] = $item[$columnKey];
-            }
-        }
-
-        return $result;
+        return ArrayUtil::arrayColumn($array, $columnKey, $indexKey);
     }
 
     /**
@@ -95,6 +59,8 @@ public static function arrayColumn(array $array, $columnKey, $indexKey = null)
      * @param int $sortingFlags The sorting type. Can be SORT_NUMERIC or SORT_STRING
      *                                                   Also SORT_STRING can be combined with SORT_FLAG_CASE to sort
      *                                                   strings case-insensitively
+     *
+     * @deprecated since 1.9. Use Oro\Component\PhpUtils\ArrayUtil::sortBy instead
      */
     public static function sortBy(
         array &$array,
@@ -102,130 +68,6 @@ public static function sortBy(
         $propertyPath = 'priority',
         $sortingFlags = SORT_NUMERIC
     ) {
-        if (empty($array)) {
-            return;
-        }
-
-        /**
-         * we have to implement such complex logic because the stable sorting is not supported in PHP for now
-         * see https://bugs.php.net/bug.php?id=53341
-         */
-
-        $stringComparison = 0 !== ($sortingFlags & SORT_STRING);
-        $caseInsensitive = 0 !== ($sortingFlags & SORT_FLAG_CASE);
-
-        $sortable = self::prepareSortable($array, $propertyPath, $reverse, $stringComparison, $caseInsensitive);
-        if (!empty($sortable)) {
-            $keys = self::getSortedKeys($sortable, $stringComparison, $reverse);
-
-            $result = [];
-            foreach ($keys as $key) {
-                if (is_string($key)) {
-                    $result[$key] = $array[$key];
-                } else {
-                    $result[] = $array[$key];
-                }
-            }
-            $array = $result;
-        }
-    }
-
-    /**
-     * @param mixed $a
-     * @param mixed $b
-     * @param bool $stringComparison
-     *
-     * @return int
-     */
-    private static function compare($a, $b, $stringComparison = false)
-    {
-        if ($a === $b) {
-            return 0;
-        }
-
-        if ($stringComparison) {
-            return strcmp($a, $b);
-        } else {
-            return $a < $b ? -1 : 1;
-        }
-    }
-
-    /**
-     * @param array $array
-     * @param string|PropertyPathInterface $propertyPath
-     * @param bool $reverse
-     * @param bool $stringComparison
-     * @param bool $caseInsensitive
-     *
-     * @return array|null
-     *
-     * @SuppressWarnings(PHPMD.NPathComplexity)
-     */
-    private static function prepareSortable($array, $propertyPath, $reverse, $stringComparison, $caseInsensitive)
-    {
-        $propertyAccessor = PropertyAccess::createPropertyAccessor();
-        $isSimplePropertyPath = is_string($propertyPath) && !preg_match('/.\[/', $propertyPath);
-        $defaultValue = $stringComparison ? '' : 0;
-        $needSorting = $reverse;
-
-        $result = [];
-        $lastVal = null;
-        $index = 0;
-        foreach ($array as $key => $value) {
-            if (is_array($value) && $isSimplePropertyPath) {
-                // get array property directly to speed up
-                $val = isset($value[$propertyPath]) || array_key_exists($propertyPath, $value)
-                    ? $value[$propertyPath]
-                    : null;
-            } else {
-                $val = $propertyAccessor->getValue($value, $propertyPath);
-            }
-            if (null === $val) {
-                $val = $defaultValue;
-            } elseif ($caseInsensitive) {
-                $val = strtolower($val);
-            }
-
-            $result[$key] = [$val, $index++];
-
-            if ($lastVal === null) {
-                $lastVal = $val;
-            } elseif (0 !== self::compare($lastVal, $val, $stringComparison)) {
-                $lastVal = $val;
-                $needSorting = true;
-            }
-        }
-
-        if (!$needSorting) {
-            return null;
-        }
-
-        return $result;
-    }
-
-    /**
-     * @param array $sortable
-     * @param bool $stringComparison
-     * @param bool $reverse
-     *
-     * @return array
-     */
-    private static function getSortedKeys($sortable, $stringComparison, $reverse)
-    {
-        uasort(
-            $sortable,
-            function ($a, $b) use ($stringComparison, $reverse) {
-                $result = self::compare($a[0], $b[0], $stringComparison);
-                if (0 === $result) {
-                    $result = self::compare($a[1], $b[1]);
-                } elseif ($reverse) {
-                    $result = 0 - $result;
-                }
-
-                return $result;
-            }
-        );
-
-        return array_keys($sortable);
+        ArrayUtil::sortBy($array, $reverse, $propertyPath, $sortingFlags);
     }
 }
diff --git a/src/Oro/Bundle/UIBundle/Twig/SortByExtension.php b/src/Oro/Bundle/UIBundle/Twig/SortByExtension.php
index a001ce12393..17173e027d7 100644
--- a/src/Oro/Bundle/UIBundle/Twig/SortByExtension.php
+++ b/src/Oro/Bundle/UIBundle/Twig/SortByExtension.php
@@ -2,7 +2,7 @@
 
 namespace Oro\Bundle\UIBundle\Twig;
 
-use Oro\Bundle\UIBundle\Tools\ArrayUtils;
+use Oro\Component\PhpUtils\ArrayUtil;
 
 class SortByExtension extends \Twig_Extension
 {
@@ -52,7 +52,7 @@ public function sortBy(array $array, array $options = [])
 
         }
 
-        ArrayUtils::sortBy(
+        ArrayUtil::sortBy(
             $array,
             self::getOption($options, 'reverse', false),
             self::getOption($options, 'property', 'priority'),
diff --git a/src/Oro/Component/PhpUtils/ArrayUtil.php b/src/Oro/Component/PhpUtils/ArrayUtil.php
index 49e19fa9e61..57ff70b83aa 100644
--- a/src/Oro/Component/PhpUtils/ArrayUtil.php
+++ b/src/Oro/Component/PhpUtils/ArrayUtil.php
@@ -176,7 +176,7 @@ function ($a, $b) use ($stringComparison, $reverse) {
      *
      * @param int[] $order
      *
-     * @return int
+     * @return callable
      */
     public static function createOrderedComparator(array $order)
     {
@@ -197,7 +197,7 @@ public static function createOrderedComparator(array $order)
      * Return true if callback on any element returns truthy value, false otherwise
      *
      * @param callable $callback
-     * @param array $array
+     * @param array    $array
      *
      * @return boolean
      */
@@ -216,8 +216,9 @@ public static function some(callable $callback, array $array)
      * Return copy of the array starting with item for which callback returns falsity value
      *
      * @param callable $callback
+     * @param array    $array
      *
-     * @param array $array
+     * @return array
      */
     public static function dropWhile(callable $callback, array $array)
     {
@@ -229,4 +230,79 @@ public static function dropWhile(callable $callback, array $array)
 
         return [];
     }
+
+    /**
+     * Recursively merge arrays.
+     *
+     * Merge two arrays as array_merge_recursive do, but instead of converting values to arrays when keys are same
+     * replaces value from first array with value from second
+     *
+     * @param array $first
+     * @param array $second
+     *
+     * @return array
+     */
+    public static function arrayMergeRecursiveDistinct(array $first, array $second)
+    {
+        foreach ($second as $idx => $value) {
+            if (is_integer($idx)) {
+                $first[] = $value;
+            } else {
+                if (!array_key_exists($idx, $first)) {
+                    $first[$idx] = $value;
+                } else {
+                    if (is_array($value)) {
+                        $first[$idx] = self::arrayMergeRecursiveDistinct($first[$idx], $value);
+                    } else {
+                        $first[$idx] = $value;
+                    }
+                }
+            }
+        }
+
+        return $first;
+    }
+
+    /**
+     * Return the values from a single column in the input array
+     *
+     * http://php.net/manual/en/function.array-column.php
+     *
+     * @param array $array
+     * @param mixed $columnKey
+     * @param mixed $indexKey
+     *
+     * @return array
+     */
+    public static function arrayColumn(array $array, $columnKey, $indexKey = null)
+    {
+        $result = [];
+
+        if (empty($array)) {
+            return [];
+        }
+
+        if (empty($columnKey)) {
+            throw new \InvalidArgumentException('Column key is empty');
+        }
+
+        foreach ($array as $item) {
+            if (!isset($item[$columnKey])) {
+                continue;
+            }
+
+            if ($indexKey && !isset($item[$indexKey])) {
+                continue;
+            }
+
+            if ($indexKey) {
+                $index          = $item[$indexKey];
+                $result[$index] = $item[$columnKey];
+            } else {
+                $result[] = $item[$columnKey];
+            }
+        }
+
+        return $result;
+    }
 }
diff --git a/src/Oro/Component/PhpUtils/Tests/Unit/ArrayUtilTest.php b/src/Oro/Component/PhpUtils/Tests/Unit/ArrayUtilTest.php
index 7d842f5873d..1b44d23a4df 100644
--- a/src/Oro/Component/PhpUtils/Tests/Unit/ArrayUtilTest.php
+++ b/src/Oro/Component/PhpUtils/Tests/Unit/ArrayUtilTest.php
@@ -539,6 +539,139 @@ function ($item) {
         ];
     }
 
+    /**
+     * @param array $array
+     * @param mixed $columnKey
+     * @param mixed $indexKey
+     * @param array $expected
+     *
+     * @dataProvider arrayColumnProvider
+     */
+    public function testArrayColumn(array $array, $columnKey, $indexKey, array $expected)
+    {
+        $this->assertEquals(
+            $expected,
+            ArrayUtil::arrayColumn($array, $columnKey, $indexKey)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function arrayColumnProvider()
+    {
+        return [
+            'empty'        => [[], 'value', 'value', []],
+            'no_index'     => [
+                [
+                    [
+                        'id'    => 'id1',
+                        'value' => 'value2'
+                    ]
+                ],
+                'value',
+                null,
+                ['value2']
+            ],
+            'index'        => [
+                [
+                    [
+                        'id'    => 'id1',
+                        'value' => 'value2'
+                    ]
+                ],
+                'value',
+                'id',
+                ['id1' => 'value2']
+            ],
+            'wrong_index'  => [
+                [
+                    ['value' => 'value2']
+                ],
+                'value',
+                'id',
+                []
+            ],
+            'wrong_column' => [
+                [
+                    ['value' => 'value2']
+                ],
+                'id',
+                null,
+                []
+            ],
+
+        ];
+    }
+
+    /**
+     * @param array  $array
+     * @param mixed  $columnKey
+     * @param mixed  $indexKey
+     * @param string $expectedMessage
+     *
+     * @dataProvider arrayColumnInputData
+     */
+    public function testArrayColumnInputData(array $array, $columnKey, $indexKey, $expectedMessage)
+    {
+        $this->setExpectedException(
+            '\InvalidArgumentException',
+            $expectedMessage
+        );
+
+        ArrayUtil::arrayColumn($array, $columnKey, $indexKey);
+    }
+
+    /**
+     * @return array
+     */
+    public function arrayColumnInputData()
+    {
+        return [
+            'empty_column_key' => [
+                [
+                    ['id' => 'value']
+                ],
+                null,
+                null,
+                'Column key is empty'
+            ]
+        ];
+    }
+
+    /**
+     * @dataProvider mergeDataProvider
+     *
+     * @param array $expected
+     * @param array $first
+     * @param array $second
+     */
+    public function testArrayMergeRecursiveDistinct(array $expected, array $first, array $second)
+    {
+        $this->assertEquals($expected, ArrayUtil::arrayMergeRecursiveDistinct($first, $second));
+    }
+
+    /**
+     * @return array
+     */
+    public function mergeDataProvider()
+    {
+        return [
+            [
+                [
+                    'a',
+                    'b',
+                    'c' => [
+                        'd' => 'd2',
+                        'e' => 'e1'
+                    ]
+                ],
+                ['a', 'c' => ['d' => 'd1', 'e' => 'e1']],
+                ['b', 'c' => ['d' => 'd2']]
+            ]
+        ];
+    }
+
     /**
      * @param object $obj
      *

From 546c38a87db1b9629647bedc152e8c685401d385 Mon Sep 17 00:00:00 2001
From: Ievgenii Myshusta <imyshusta@magecore.com>
Date: Fri, 8 Jan 2016 12:23:35 +0200
Subject: [PATCH 375/471] CRM-4846: Grid on activity page - added activities
 widget on My Emails -> Email page

---
 .../EmailBundle/Resources/public/css/less/style.less       | 6 ++++++
 .../Resources/views/Email/Thread/view.html.twig            | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less b/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less
index fb6db1be071..3f749f958b8 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less
+++ b/src/Oro/Bundle/EmailBundle/Resources/public/css/less/style.less
@@ -726,3 +726,9 @@ a.sync-btn span.dots {
 .check-connection-messages {
     width: 294px;
 }
+
+.container-fluid {
+  .email-activity-widget {
+    margin-bottom: 20px;
+  }
+}
diff --git a/src/Oro/Bundle/EmailBundle/Resources/views/Email/Thread/view.html.twig b/src/Oro/Bundle/EmailBundle/Resources/views/Email/Thread/view.html.twig
index 539cb4998f6..6b88c64a84d 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/views/Email/Thread/view.html.twig
+++ b/src/Oro/Bundle/EmailBundle/Resources/views/Email/Thread/view.html.twig
@@ -54,5 +54,12 @@
                 'contextsRendered': true
             }) }}
         </div>
+        <div class="widget-content email-activity-widget">
+            <h4 class="scrollspy-title">{{ 'oro.activity.sections.activities'|trans }}</h4>
+            <div class="scrollspy-nav-target"></div>
+            <div class="responsive-section">
+                {% placeholder view_content_data_activities with {entity: entity} %}
+            </div>
+        </div>
     </div>
 {% endblock content_data %}

From 0644c7115f3c3842636b80ba0fc6298f658193dc Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Fri, 8 Jan 2016 14:01:42 +0200
Subject: [PATCH 376/471] CRM-3685: Can't add context for entity with newly
 enabled activities  - Fixing tests

---
 .../Tests/Unit/Provider/ContextGridProviderTest.php}              | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/Oro/Bundle/{EntityBundle/Tests/Unit/Provider/EntityContextProviderTest.php => ActivityBundle/Tests/Unit/Provider/ContextGridProviderTest.php} (100%)

diff --git a/src/Oro/Bundle/EntityBundle/Tests/Unit/Provider/EntityContextProviderTest.php b/src/Oro/Bundle/ActivityBundle/Tests/Unit/Provider/ContextGridProviderTest.php
similarity index 100%
rename from src/Oro/Bundle/EntityBundle/Tests/Unit/Provider/EntityContextProviderTest.php
rename to src/Oro/Bundle/ActivityBundle/Tests/Unit/Provider/ContextGridProviderTest.php

From bd2c653fcf8f8fbd2927c67173621297a0f619ae Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Fri, 8 Jan 2016 14:04:16 +0200
Subject: [PATCH 377/471] CRM-3685: Can't add context for entity with newly
 enabled activities  - Fixing tests

---
 .../Unit/Provider/ContextGridProviderTest.php | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/Oro/Bundle/ActivityBundle/Tests/Unit/Provider/ContextGridProviderTest.php b/src/Oro/Bundle/ActivityBundle/Tests/Unit/Provider/ContextGridProviderTest.php
index c5da4ce6fb7..628d50538a5 100644
--- a/src/Oro/Bundle/ActivityBundle/Tests/Unit/Provider/ContextGridProviderTest.php
+++ b/src/Oro/Bundle/ActivityBundle/Tests/Unit/Provider/ContextGridProviderTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Oro\Bundle\EntityBundle\Tests\Unit\Provider;
+namespace Oro\Bundle\ActivityBundle\Tests\Unit\Provider;
 
-use Oro\Bundle\EntityBundle\Provider\EntityContextProvider;
+use Oro\Bundle\ActivityBundle\Provider\ContextGridProvider;
 
-class EntityContextProviderTest extends \PHPUnit_Framework_TestCase
+class ContextGridProviderTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
@@ -27,7 +27,7 @@ class EntityContextProviderTest extends \PHPUnit_Framework_TestCase
     protected $mockEntity;
 
     /**
-     * @var EntityContextProvider
+     * @var ContextGridProvider
      */
     protected $provider;
 
@@ -78,7 +78,7 @@ protected function setUp()
         $this->configProvider = $this
             ->getMockBuilder('Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider')
             ->disableOriginalConstructor()
-            ->setMethods(['getConfig', 'get'])
+            ->setMethods(['getConfig', 'has', 'get'])
             ->getMock();
 
         $this->configProvider->expects($this->any())
@@ -86,12 +86,17 @@ protected function setUp()
             ->with($this->routingHelper->getUrlSafeClassName($this->entityClass))
             ->will($this->returnValue($this->configProvider));
 
+        $this->configProvider->expects($this->any())
+            ->method('has')
+            ->with('context')
+            ->willReturn(true);
+
         $this->configProvider->expects($this->any())
             ->method('get')
-            ->with('context-grid')
+            ->with('context')
             ->will($this->returnValue($this->expectedGridName));
 
-        $this->provider = new EntityContextProvider(
+        $this->provider = new ContextGridProvider(
             $this->routingHelper,
             $this->entityProvider,
             $this->configProvider

From 324f3ebb3ef8d56ee1e159de38437b35ed9109d7 Mon Sep 17 00:00:00 2001
From: Maksym Perepelytsya <mperepelytsya@magecore.com>
Date: Fri, 8 Jan 2016 14:27:53 +0200
Subject: [PATCH 378/471] BAP-9633: Failed selenium tests  - add
 assertNoDataMessageAndDisplayed method

---
 .../Pages/AbstractPageGrid.php                | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/Oro/Bundle/TestFrameworkBundle/Pages/AbstractPageGrid.php b/src/Oro/Bundle/TestFrameworkBundle/Pages/AbstractPageGrid.php
index 1d2eb22ead2..6d8a74918f2 100644
--- a/src/Oro/Bundle/TestFrameworkBundle/Pages/AbstractPageGrid.php
+++ b/src/Oro/Bundle/TestFrameworkBundle/Pages/AbstractPageGrid.php
@@ -501,4 +501,25 @@ public function assertNoActionMenu($actionName)
 
         return $this;
     }
+
+    /**
+     * Method checks if "No data message" is present and displayed
+     *
+     * @param string $message Grid message to verify
+     *
+     * @return $this
+     * @throws  \PHPUnit_Framework_AssertionFailedError
+     */
+    public function assertNoDataMessageAndDisplayed($message)
+    {
+        $this->assertNoDataMessage($message);
+        $noDataMessage = $this->test->byXPath("//div[@class='no-data']/span[contains(., '{$message}')]");
+        if (!$noDataMessage->displayed()) {
+            PHPUnit_Framework_Assert::fail(
+                "//div[@class='no-data']/span[contains(., '{$message}')] is not displayed"
+            );
+        }
+
+        return $this;
+    }
 }

From b7a999e6d9cf1c01862db0cc3dc7c6193c30c60e Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Fri, 8 Jan 2016 15:56:36 +0200
Subject: [PATCH 379/471] CRM-4850: adjust styles of column manager on mobile

---
 .../css/less/mobile/column-manager.less       | 48 +++++++++++++++++--
 1 file changed, 44 insertions(+), 4 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/mobile/column-manager.less b/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/mobile/column-manager.less
index 6502425d41e..c93945cdc6b 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/mobile/column-manager.less
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/css/less/mobile/column-manager.less
@@ -8,26 +8,66 @@
     line-height: @baseLineHeight;
   }
   .dropdown-menu {
+    right: 0;
+    top: 100%;
+    margin-top: 7px;
+    min-width: 300px;
+    padding: 18px 12px 12px;
+    .close {
+      right: 12px;
+    }
     &:before {
-      top: 9px;
+      top: -8px;
+      right: 9px;
+      border-top: 0 none;
+      border-left: 7px solid transparent;
+      border-right: 7px solid transparent;
+      border-bottom: 7px solid rgba(0,0,0,0.2);
     }
     &:after {
-      top: 10px;
+      top: -6px;
+      right: 10px;
+      border-top: 0 none;
+      border-left: 6px solid transparent;
+      border-right: 6px solid transparent;
+      border-bottom: 6px solid #fff;
     }
   }
+  .table-header-wrapper th:nth-child(2) {
+    text-align: center;
+  }
+  td.title-cell {
+    white-space: normal;
+  }
   td.sort-cell {
+    width: 40px;
     padding-left: 0px;
     padding-right: 0px;
+    .btn {
+      height: 20px;
+      line-height: 16px;
+    }
+  }
+  td.visibility-cell {
+    width: 40px;
   }
 }
 
+/* changes position of bubble point of dropdown when it's shown above */
 .dropup .column-manager .dropdown-menu {
+  top: auto;
+  margin-top: 0;
+  margin-bottom: 40px;
   &:before {
     top: auto;
-    bottom: 9px;
+    bottom: -7px;
+    border-bottom: 0 none;
+    border-top: 7px solid rgba(0,0,0,0.1);
   }
   &:after {
     top: auto;
-    bottom: 10px;
+    bottom: -6px;
+    border-bottom: 0 none;
+    border-top: 6px solid #fff;
   }
 }

From 2355fd9b2659bbc66c7914d2471095d5825972ec Mon Sep 17 00:00:00 2001
From: Alexander Nezdoiminoga <alex@magecore.com>
Date: Fri, 8 Jan 2016 16:03:11 +0200
Subject: [PATCH 380/471] BAP-9639: 500 error is occurred on Business Units  -
 activity placeholder fixes  - unit tests  - template fixes (potential issue
 with hangouts button)

---
 .../Placeholder/PlaceholderFilter.php         |  56 +++++--
 .../Resources/config/services.yml             |   1 +
 .../Placeholder/PlaceholderFilterTest.php     | 145 +++++++++---------
 .../Entity/BusinessUnit.php                   |   3 +
 4 files changed, 126 insertions(+), 79 deletions(-)

diff --git a/src/Oro/Bundle/ActivityListBundle/Placeholder/PlaceholderFilter.php b/src/Oro/Bundle/ActivityListBundle/Placeholder/PlaceholderFilter.php
index 7288b8ad675..c7b2931ecca 100644
--- a/src/Oro/Bundle/ActivityListBundle/Placeholder/PlaceholderFilter.php
+++ b/src/Oro/Bundle/ActivityListBundle/Placeholder/PlaceholderFilter.php
@@ -5,9 +5,11 @@
 use Doctrine\Common\Persistence\ManagerRegistry;
 
 use Oro\Bundle\ActivityBundle\EntityConfig\ActivityScope;
+use Oro\Bundle\ActivityBundle\Manager\ActivityManager;
 use Oro\Bundle\ActivityListBundle\Provider\ActivityListChainProvider;
 use Oro\Bundle\EntityBundle\ORM\DoctrineHelper;
 use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider;
+use Oro\Bundle\EntityExtendBundle\Tools\ExtendHelper;
 use Oro\Bundle\UIBundle\Event\BeforeGroupingChainWidgetEvent;
 
 class PlaceholderFilter
@@ -24,22 +26,28 @@ class PlaceholderFilter
     /** @var ConfigProvider */
     protected $configProvider;
 
+    /** @var ActivityManager */
+    protected $activityManager;
+
     /**
      * @param ActivityListChainProvider $activityListChainProvider
      * @param ManagerRegistry           $doctrine
      * @param DoctrineHelper            $doctrineHelper
      * @param ConfigProvider            $configProvider
+     * @param ActivityManager           $activityManager
      */
     public function __construct(
         ActivityListChainProvider $activityListChainProvider,
         ManagerRegistry $doctrine,
         DoctrineHelper $doctrineHelper,
-        ConfigProvider $configProvider
+        ConfigProvider $configProvider,
+        ActivityManager $activityManager
     ) {
         $this->activityListProvider = $activityListChainProvider;
         $this->doctrine             = $doctrine;
         $this->doctrineHelper       = $doctrineHelper;
         $this->configProvider       = $configProvider;
+        $this->activityManager      = $activityManager;
     }
 
     /**
@@ -52,33 +60,60 @@ public function __construct(
     public function isApplicable($entity = null, $pageType = null)
     {
         if ($pageType === null || !is_object($entity) || !$this->doctrineHelper->isManageableEntity($entity) ||
-            $this->doctrineHelper->isNewEntity($entity)) {
+            $this->doctrineHelper->isNewEntity($entity)
+        ) {
+            return false;
+        }
+
+        $entityClass = $this->doctrineHelper->getEntityClass($entity);
+        if (!$this->configProvider->hasConfig($entityClass)) {
+            return false;
+        }
+
+        $hasAppliedActivityAssociation = false;
+        $activityAssociations          = $this->activityManager->getActivityAssociations($entityClass);
+        foreach ($activityAssociations as $activityAssociation) {
+            $isAssociationAccessible = ExtendHelper::isFieldAccessible(
+                $this->configProvider->getConfig(
+                    $activityAssociation['className'],
+                    $activityAssociation['associationName']
+                )
+            );
+            if ($isAssociationAccessible) {
+                $hasAppliedActivityAssociation = true;
+                break;
+            }
+        }
+
+        /**
+         * If at least one activity is accessible we can continue otherwise no.
+         */
+        if (!$hasAppliedActivityAssociation) {
             return false;
         }
 
         $pageType         = (int) $pageType;
         $id               = $this->doctrineHelper->getSingleEntityIdentifier($entity);
-        $entityClass      = $this->doctrineHelper->getEntityClass($entity);
         $activityListRepo = $this->doctrine->getRepository('OroActivityListBundle:ActivityList');
 
-        return $this->isAllowedOnPage($entity, $pageType) && (
+        return $this->isAllowedOnPage($entityClass, $pageType) && (
             in_array($entityClass, $this->activityListProvider->getTargetEntityClasses())
             || (bool)$activityListRepo->getRecordsCountForTargetClassAndId($entityClass, $id)
         );
     }
 
     /**
-     * @param object $entity
+     * @param string $entityClass
      * @param int    $pageType
      * @return bool
      */
-    protected function isAllowedOnPage($entity, $pageType)
+    protected function isAllowedOnPage($entityClass, $pageType)
     {
-        if (!$this->configProvider->hasConfig($entity)) {
+        if (!$this->configProvider->hasConfig($entityClass)) {
             return false;
         }
 
-        $config = $this->configProvider->getConfig($entity);
+        $config = $this->configProvider->getConfig($entityClass);
         if (!$config->has(ActivityScope::SHOW_ON_PAGE)) {
             return false;
         }
@@ -101,7 +136,10 @@ public function isAllowedButton(BeforeGroupingChainWidgetEvent $event)
         $entity   = $event->getEntity();
         $pageType = $event->getPageType();
 
-        if ($pageType === null || !is_object($entity) || !$this->isAllowedOnPage($entity, $pageType)) {
+        if ($pageType === null
+            || !is_object($entity)
+            || !$this->isAllowedOnPage($this->doctrineHelper->getEntityClass($entity), $pageType)
+        ) {
             // Clear allowed widgets
             $event->setWidgets([]);
         }
diff --git a/src/Oro/Bundle/ActivityListBundle/Resources/config/services.yml b/src/Oro/Bundle/ActivityListBundle/Resources/config/services.yml
index dbd8e6e20c9..e6b445e63dc 100644
--- a/src/Oro/Bundle/ActivityListBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/ActivityListBundle/Resources/config/services.yml
@@ -70,6 +70,7 @@ services:
             - @doctrine
             - @oro_entity.doctrine_helper
             - @oro_entity_config.provider.activity
+            - @oro_activity.manager
         tags:
             - { name: kernel.event_listener, event: oro.ui.grouping_chain_widget.before, method: isAllowedButton }
 
diff --git a/src/Oro/Bundle/ActivityListBundle/Tests/Unit/Placeholder/PlaceholderFilterTest.php b/src/Oro/Bundle/ActivityListBundle/Tests/Unit/Placeholder/PlaceholderFilterTest.php
index 0c89230968c..60db6fd0b71 100644
--- a/src/Oro/Bundle/ActivityListBundle/Tests/Unit/Placeholder/PlaceholderFilterTest.php
+++ b/src/Oro/Bundle/ActivityListBundle/Tests/Unit/Placeholder/PlaceholderFilterTest.php
@@ -11,8 +11,7 @@
 use Oro\Bundle\ActivityListBundle\Tests\Unit\Placeholder\Fixture\TestNonManagedTarget;
 use Oro\Bundle\ActivityListBundle\Tests\Unit\Placeholder\Fixture\TestTarget;
 use Oro\Bundle\EntityBundle\ORM\DoctrineHelper;
-use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider;
-use Oro\Bundle\EntityConfigBundle\Exception\RuntimeException;
+use Oro\Bundle\EntityConfigBundle\Tests\Unit\ConfigProviderMock;
 use Oro\Bundle\UIBundle\Event\BeforeGroupingChainWidgetEvent;
 
 class PlaceholderFilterTest extends \PHPUnit_Framework_TestCase
@@ -20,13 +19,16 @@ class PlaceholderFilterTest extends \PHPUnit_Framework_TestCase
     /** @var \PHPUnit_Framework_MockObject_MockObject|ActivityListChainProvider */
     protected $activityListProvider;
 
+    /** @var \PHPUnit_Framework_MockObject_MockObject|ActivityListChainProvider */
+    protected $activityManager;
+
     /** @var \PHPUnit_Framework_MockObject_MockObject|ManagerRegistry */
     protected $doctrine;
 
     /** @var PlaceholderFilter */
     protected $filter;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject|ConfigProvider */
+    /** @var ConfigProviderMock */
     protected $configProvider;
 
     /** @var array */
@@ -42,6 +44,11 @@ public function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->activityManager = $this
+            ->getMockBuilder('Oro\Bundle\ActivityBundle\Manager\ActivityManager')
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->doctrine = $this
             ->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')
             ->disableOriginalConstructor()
@@ -73,23 +80,40 @@ public function setUp()
                 return !$entity instanceof TestNonManagedTarget;
             });
 
-        $this->configureConfigProvider();
+        $configManager        = $this->getMockBuilder('Oro\Bundle\EntityConfigBundle\Config\ConfigManager')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->configProvider = new ConfigProviderMock($configManager, 'activity');
 
         $this->filter = new PlaceholderFilter(
             $this->activityListProvider,
             $this->doctrine,
             $this->doctrineHelper,
-            $this->configProvider
+            $this->configProvider,
+            $this->activityManager
         );
     }
 
     public function testIsApplicable()
     {
         $testTarget = new TestTarget(1);
-        $this->setConfigProviderEntitySupport(
-            $testTarget,
-            '\Oro\Bundle\ActivityBundle\EntityConfig\ActivityScope::VIEW_PAGE'
+
+        $entityClass = get_class($testTarget);
+        $this->configProvider->addEntityConfig(
+            $entityClass,
+            [ActivityScope::SHOW_ON_PAGE => '\Oro\Bundle\ActivityBundle\EntityConfig\ActivityScope::VIEW_PAGE']
         );
+        $this->configProvider->addFieldConfig($entityClass, 'associationField');
+
+        $this->activityManager
+            ->expects($this->once())
+            ->method('getActivityAssociations')
+            ->with($entityClass)
+            ->willReturn(
+                [
+                    ['className' => $entityClass, 'associationName' => 'associationField']
+                ]
+            );
 
         $this->assertTrue($this->filter->isApplicable($testTarget, ActivityScope::VIEW_PAGE));
         $this->assertFalse($this->filter->isApplicable(null, ActivityScope::VIEW_PAGE));
@@ -105,15 +129,24 @@ public function testIsApplicableWithShowOnPageConfiguration()
     {
         $entity = new TestTarget(1);
 
-        $this->setConfigProviderEntitySupport(
-            $entity,
-            '\Oro\Bundle\ActivityBundle\EntityConfig\ActivityScope::UPDATE_PAGE'
+        $entityClass = get_class($entity);
+        $this->configProvider->addEntityConfig(
+            $entityClass,
+            [ActivityScope::SHOW_ON_PAGE => '\Oro\Bundle\ActivityBundle\EntityConfig\ActivityScope::UPDATE_PAGE']
         );
+        $this->configProvider->addFieldConfig($entityClass, 'associationField');
+        $this->activityManager->expects($this->exactly(2))
+            ->method('getActivityAssociations')
+            ->with($entityClass)
+            ->willReturn([
+                ['className' => $entityClass, 'associationName' => 'associationField']
+            ]);
+
         $this->assertFalse($this->filter->isApplicable($entity, ActivityScope::VIEW_PAGE));
 
-        $this->setConfigProviderEntitySupport(
-            $entity,
-            '\Oro\Bundle\ActivityBundle\EntityConfig\ActivityScope::VIEW_UPDATE_PAGES'
+        $this->configProvider->addEntityConfig(
+            $entityClass,
+            [ActivityScope::SHOW_ON_PAGE => '\Oro\Bundle\ActivityBundle\EntityConfig\ActivityScope::VIEW_UPDATE_PAGES']
         );
         $this->assertTrue($this->filter->isApplicable($entity, ActivityScope::VIEW_PAGE));
     }
@@ -133,10 +166,23 @@ public function testIsApplicableOnNonSupportedTarget()
             ->willReturn(true);
 
         $entity = new TestNonActiveTarget(123);
-        $this->setConfigProviderEntitySupport(
-            $entity,
-            '\Oro\Bundle\ActivityBundle\EntityConfig\ActivityScope::VIEW_PAGE'
+
+        $entityClass = get_class($entity);
+        $this->configProvider->addEntityConfig(
+            $entityClass,
+            [ActivityScope::SHOW_ON_PAGE => '\Oro\Bundle\ActivityBundle\EntityConfig\ActivityScope::VIEW_PAGE']
         );
+        $this->configProvider->addFieldConfig($entityClass, 'associationField');
+
+        $this->activityManager
+            ->expects($this->once())
+            ->method('getActivityAssociations')
+            ->with($entityClass)
+            ->willReturn(
+                [
+                    ['className' => $entityClass, 'associationName' => 'associationField']
+                ]
+            );
 
         $this->assertTrue($this->filter->isApplicable($entity, ActivityScope::VIEW_PAGE));
     }
@@ -147,13 +193,19 @@ public function testIsApplicableOnNonSupportedTarget()
     public function testIsAllowedButtonWithUnknownPageConstant()
     {
         $entity = new TestTarget(1);
-        $this->setConfigProviderEntitySupport($entity, 'UNKNOWN_ORO_CONSTANT');
+
+        $this->configProvider->addEntityConfig(
+            get_class($entity),
+            [ActivityScope::SHOW_ON_PAGE => 'UNKNOWN_ORO_CONSTANT']
+        );
+
         $event = new BeforeGroupingChainWidgetEvent(ActivityScope::SHOW_ON_PAGE, [], $entity);
         $this->filter->isAllowedButton($event);
     }
 
     /**
-     * @dataProvider isAllowedButtonProvider
+     * @dataProvider   isAllowedButtonProvider
+     *
      * @param int      $pageType
      * @param array    $widgets
      * @param object   $entity
@@ -163,7 +215,10 @@ public function testIsAllowedButtonWithUnknownPageConstant()
     public function testIsAllowedButton($pageType, $widgets, $entity, $configProviderSetting, $expected)
     {
         if ($configProviderSetting !== null) {
-            $this->setConfigProviderEntitySupport($entity, $configProviderSetting);
+            $this->configProvider->addEntityConfig(
+                get_class($entity),
+                [ActivityScope::SHOW_ON_PAGE => $configProviderSetting]
+            );
         }
         $event = new BeforeGroupingChainWidgetEvent($pageType, $widgets, $entity);
         $this->filter->isAllowedButton($event);
@@ -201,54 +256,4 @@ public function isAllowedButtonProvider()
             ],
         ];
     }
-
-    /**
-     * @param $entity
-     * @param $value
-     */
-    protected function setConfigProviderEntitySupport($entity, $value)
-    {
-        $entityHash                  = spl_object_hash($entity);
-        $this->entities[$entityHash] = $value;
-    }
-
-    protected function configureConfigProvider()
-    {
-        $this->configProvider = $this->getMockBuilder('Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->configProvider->expects($this->any())
-            ->method('hasConfig')
-            ->willReturnCallback(function ($entity) {
-                $entityHash = spl_object_hash($entity);
-                return array_key_exists($entityHash, $this->entities);
-            });
-
-        $this->configProvider->expects($this->any())
-            ->method('getConfig')
-            ->willReturnCallback(function ($entity) {
-                $entityHash = spl_object_hash($entity);
-
-                if (!array_key_exists($entityHash, $this->entities)) {
-                    throw new RuntimeException();
-                }
-
-                $config = $this->getMockBuilder('Oro\Bundle\EntityConfigBundle\Config\ConfigInterface')
-                    ->disableOriginalConstructor()
-                    ->getMock();
-
-                $config->expects($this->any())
-                    ->method('get')
-                    ->with($this->equalTo(ActivityScope::SHOW_ON_PAGE))
-                    ->willReturn($this->entities[$entityHash]);
-
-                $config->expects($this->any())
-                    ->method('has')
-                    ->with($this->equalTo(ActivityScope::SHOW_ON_PAGE))
-                    ->willReturn(array_key_exists($entityHash, $this->entities));
-
-                return $config;
-            });
-    }
 }
diff --git a/src/Oro/Bundle/OrganizationBundle/Entity/BusinessUnit.php b/src/Oro/Bundle/OrganizationBundle/Entity/BusinessUnit.php
index 92b3f4fb622..f9d850d7e76 100644
--- a/src/Oro/Bundle/OrganizationBundle/Entity/BusinessUnit.php
+++ b/src/Oro/Bundle/OrganizationBundle/Entity/BusinessUnit.php
@@ -21,6 +21,9 @@
  * @ORM\HasLifecycleCallbacks()
  * @Oro\Loggable
  * @Config(
+ *      routeName="oro_business_unit_index",
+ *      routeView="oro_business_unit_view",
+ *      routeCreate="oro_business_unit_create",
  *      defaultValues={
  *          "grouping"={
  *              "groups"={"dictionary"}

From 1b2e05fab39765897550ea673021c8e484d39bd5 Mon Sep 17 00:00:00 2001
From: Maksym Perepelytsya <mperepelytsya@magecore.com>
Date: Fri, 8 Jan 2016 16:34:04 +0200
Subject: [PATCH 381/471] BAP-9633: Failed selenium tests  - remove DELETE HTTP
 method

---
 .../MassAction/DeleteMassActionHandler.php    | 22 ++++---------------
 .../js/datagrid/action/delete-mass-action.js  | 17 +++++++++++---
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/DeleteMassActionHandler.php b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/DeleteMassActionHandler.php
index ec8d2feb9aa..c249fc6fc43 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/DeleteMassActionHandler.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/DeleteMassActionHandler.php
@@ -66,14 +66,13 @@ public function __construct(
     public function handle(MassActionHandlerArgs $args)
     {
         $limitResult = $this->limiter->getLimitResult($args);
-        $method      = $this->requestStack->getMasterRequest()->getMethod();
-        if ($method === 'POST') {
-            $result = $this->getPostResponse($limitResult);
-        } elseif ($method === 'DELETE') {
+        $data = $args->getData();
+        $doDelete = isset($data['doDelete']) ? filter_var($data['doDelete'], FILTER_VALIDATE_BOOLEAN) : false;
+        if ($doDelete) {
             $this->limiter->limitQuery($limitResult, $args);
             $result = $this->doDelete($args);
         } else {
-            $result = $this->getNotSupportedResponse($method);
+            $result = $this->getPostResponse($limitResult);
         }
 
         return $result;
@@ -133,19 +132,6 @@ protected function getPostResponse(MassDeleteLimitResult $limitResult)
         );
     }
 
-    /**
-     * @param $method
-     *
-     * @return MassActionResponse
-     */
-    protected function getNotSupportedResponse($method)
-    {
-        return new MassActionResponse(
-            false,
-            sprintf('Method "%s" is not supported', $method)
-        );
-    }
-
     /**
      * @param MassActionHandlerArgs $args
      *
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 5533eb2e3ed..2493b743606 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
@@ -44,6 +44,9 @@ define([
         /** @property {Boolean} */
         allowOk: true,
 
+        /** @property {Boolean} */
+        doDelete: false,
+
         /**
          * As in this action we need to send POST request to get data for confirm message
          * we set this.confirmation = false at initialization to prevent opening confirm window.
@@ -54,6 +57,7 @@ define([
             DeleteMassAction.__super__.initialize.apply(this, arguments);
             this.confirmMessage = __(this.defaultMessages.confirm_content);
             this.confirmation = false;
+            this.requestType = 'POST';
         },
 
         /**
@@ -86,8 +90,8 @@ define([
          *
          */
         _onAjaxSuccess: function(data, textStatus, jqXHR) {
-            if (this.requestType === 'POST') {
-                this.requestType = 'DELETE';
+            if (!this.doDelete) {
+                this.doDelete = true;
                 this.setConfirmMessage(data);
                 if (this.reloadData) {
                     this.datagrid.hideLoading();
@@ -105,7 +109,7 @@ define([
          * Sets this.confirmModal = null to rebuild confirm window after each request.
          */
         execute: function() {
-            this.requestType = 'POST';
+            this.doDelete = false;
             this.confirmModal = null;
             if (this.checkSelectionState()) {
                 DeleteMassAction.__super__.executeConfiguredAction.call(this);
@@ -146,6 +150,13 @@ define([
             }
         },
 
+        /**
+         * @inheritDoc
+         */
+        getActionParameters: function() {
+            return _.extend({doDelete: this.doDelete}, DeleteMassAction.__super__.getActionParameters.call(this));
+        },
+
         isDefined: function(value) {
             return !_.isUndefined(value);
         }

From 1273083703a7b0db2dad9b5d8b516284741abb76 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Fri, 8 Jan 2016 17:09:32 +0200
Subject: [PATCH 382/471] CRM-3685: Can't add context for entity with newly
 enabled activities  - Fixing context link if entity does not have default
 view

---
 .../ActivityContextApiEntityManager.php       | 52 +++++++++++++------
 1 file changed, 35 insertions(+), 17 deletions(-)

diff --git a/src/Oro/Bundle/ActivityBundle/Entity/Manager/ActivityContextApiEntityManager.php b/src/Oro/Bundle/ActivityBundle/Entity/Manager/ActivityContextApiEntityManager.php
index 5712efe1246..6da90ef0ff2 100644
--- a/src/Oro/Bundle/ActivityBundle/Entity/Manager/ActivityContextApiEntityManager.php
+++ b/src/Oro/Bundle/ActivityBundle/Entity/Manager/ActivityContextApiEntityManager.php
@@ -110,24 +110,8 @@ public function getActivityContext($class, $id)
 
             $item          = [];
             $config        = $entityProvider->getConfig($targetClass);
-            $metadata      = $this->configManager->getEntityMetadata($targetClass);
             $safeClassName = $this->entityClassNameHelper->getUrlSafeClassName($targetClass);
 
-            $link = null;
-            if ($metadata) {
-                $link = $this->router->generate($metadata->getRoute(), ['id' => $targetId]);
-            } elseif ($link === null && ExtendHelper::isCustomEntity($targetClass)) {
-                // Generate view link for the custom entity
-                $link = $this->router->generate(
-                    'oro_entity_view',
-                    [
-                        'id'         => $targetId,
-                        'entityName' => $safeClassName
-
-                    ]
-                );
-            }
-
             if ($fields = $this->mapper->getEntityMapParameter($targetClass, 'title_fields')) {
                 $text = [];
                 foreach ($fields as $field) {
@@ -145,11 +129,45 @@ public function getActivityContext($class, $id)
             $item['targetClassName'] = $safeClassName;
 
             $item['icon'] = $config->get('icon');
-            $item['link'] = $link;
+            $item['link'] = $this->getContextLink($targetClass, $targetId);
 
             $result[] = $item;
         }
 
         return $result;
     }
+
+    /**
+     * @param string $targetClass The FQCN of the activity target entity
+     * @param int    $targetId    The identifier of the activity target entity
+     *
+     * @return string|null
+     */
+    protected function getContextLink($targetClass, $targetId)
+    {
+        $metadata = $this->configManager->getEntityMetadata($targetClass);
+        $link     = null;
+        if ($metadata) {
+            try {
+                $route = $metadata->getRoute('view', true);
+            } catch (\LogicException $exception) {
+                // Need for cases when entity does not have route.
+                return null;
+            }
+            $link = $this->router->generate($route, ['id' => $targetId]);
+        } elseif (ExtendHelper::isCustomEntity($targetClass)) {
+            $safeClassName = $this->entityClassNameHelper->getUrlSafeClassName($targetClass);
+            // Generate view link for the custom entity
+            $link = $this->router->generate(
+                'oro_entity_view',
+                [
+                    'id'         => $targetId,
+                    'entityName' => $safeClassName
+
+                ]
+            );
+        }
+
+        return $link;
+    }
 }

From 22ba75d00729dd5f3e324fced91e6a165a066090 Mon Sep 17 00:00:00 2001
From: Hryhorii Hrebiniuk <grebinuk@gmail.com>
Date: Fri, 8 Jan 2016 17:17:49 +0200
Subject: [PATCH 383/471] CRM-4899: Can't sort case comments nor refresh them

---
 .../Resources/public/js/app/views/notes-view.js           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Oro/Bundle/NoteBundle/Resources/public/js/app/views/notes-view.js b/src/Oro/Bundle/NoteBundle/Resources/public/js/app/views/notes-view.js
index 7145ae60225..7e0e74ca299 100644
--- a/src/Oro/Bundle/NoteBundle/Resources/public/js/app/views/notes-view.js
+++ b/src/Oro/Bundle/NoteBundle/Resources/public/js/app/views/notes-view.js
@@ -70,13 +70,13 @@ define(function(require) {
         },
 
         expandAll: function() {
-            _.each(this.subviews, function(itemView) {
+            _.each(this.getItemViews(), function(itemView) {
                 itemView.toggle(false);
             });
         },
 
         collapseAll: function() {
-            _.each(this.subviews, function(itemView) {
+            _.each(this.getItemViews(), function(itemView) {
                 itemView.toggle(true);
             });
         },
@@ -104,13 +104,13 @@ define(function(require) {
             }
             this._showLoading();
             try {
-                _.each(this.subviews, function(itemView) {
+                _.each(this.getItemViews(), function(itemView) {
                     state[itemView.model.get('id')] = itemView.isCollapsed();
                 });
                 this.collection.fetch({
                     reset: true,
                     success: _.bind(function() {
-                        _.each(this.subviews, function(itemView) {
+                        _.each(this.getItemViews(), function(itemView) {
                             itemView.toggle(state[itemView.model.get('id')]);
                         });
                         this._hideLoading();

From 6c281709e4435d762c08c50c1cb9f0a3690bea61 Mon Sep 17 00:00:00 2001
From: Hryhorii Hrebiniuk <grebinuk@gmail.com>
Date: Fri, 8 Jan 2016 17:44:08 +0200
Subject: [PATCH 384/471] CRM-4873: Unread emails near My Emails displayed as
 10+. Mobile

---
 .../views/email-notification/mobile-email-notification-view.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/EmailBundle/Resources/public/js/app/views/email-notification/mobile-email-notification-view.js b/src/Oro/Bundle/EmailBundle/Resources/public/js/app/views/email-notification/mobile-email-notification-view.js
index 6242d83222a..fd146df77e9 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/public/js/app/views/email-notification/mobile-email-notification-view.js
+++ b/src/Oro/Bundle/EmailBundle/Resources/public/js/app/views/email-notification/mobile-email-notification-view.js
@@ -40,7 +40,7 @@ define(function(require) {
             if (count === 0) {
                 count = '';
             } else {
-                count = '(' + (count > 10 ? '10+' : count) + ')';
+                count = '(' + (count > 99 ? '99+' : count) + ')';
             }
             this.$counter.html(count);
             $('#user-menu .dropdown-toggle').toggleClass('has-new-emails', Boolean(this.countNewEmail));

From 9dc52f0633c48e5926310699a916e8c9b5042ad0 Mon Sep 17 00:00:00 2001
From: Hryhorii Hrebiniuk <grebinuk@gmail.com>
Date: Fri, 8 Jan 2016 18:17:54 +0200
Subject: [PATCH 385/471] CRM-4898: Fix layout for entity in the Reports

---
 .../IntegrationBundle/Resources/public/css/style.css      | 6 ------
 .../UIBundle/Resources/public/css/less/oro/select2.less   | 8 +++++++-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Oro/Bundle/IntegrationBundle/Resources/public/css/style.css b/src/Oro/Bundle/IntegrationBundle/Resources/public/css/style.css
index fc5ed37e01a..ff154c71e67 100644
--- a/src/Oro/Bundle/IntegrationBundle/Resources/public/css/style.css
+++ b/src/Oro/Bundle/IntegrationBundle/Resources/public/css/style.css
@@ -14,9 +14,3 @@
     position: relative;
     top: 3px;
 }
-
-.integration-icon,
-.select2-choice .select2-chosen .aware-icon-block-text,
-.select2-results .select2-result-label .aware-icon-block-text {
-    display: inline-block;
-}
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/select2.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/select2.less
index b81e0f89bd5..e772bcbb2a6 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/select2.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/select2.less
@@ -512,7 +512,13 @@ disabled look for disabled choices in the results dropdown
 }
 
 .select2-container a.select2-choice .select2-chosen {
-  padding: 8px 30px 0 8px;
+  padding: 8px 30px 7px 8px;
+  & > i[class^=icon-] {
+    height: 16px;
+    margin-top: -3px;
+    vertical-align: middle;
+    float: left;
+  }
 }
 
 .select2-search-choice-close {

From ce58fb851862ae645d60b439dcd52b94f5e475b4 Mon Sep 17 00:00:00 2001
From: Maksym Perepelytsya <mperepelytsya@magecore.com>
Date: Fri, 8 Jan 2016 18:59:58 +0200
Subject: [PATCH 386/471] BAP-9633: Failed selenium tests  - restore DELETE
 HTTP method in mass delete action

---
 .../MassAction/DeleteMassActionHandler.php    | 22 +++++++++++++++----
 .../js/datagrid/action/delete-mass-action.js  | 17 +++-----------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/DeleteMassActionHandler.php b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/DeleteMassActionHandler.php
index c249fc6fc43..ec8d2feb9aa 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/DeleteMassActionHandler.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/DeleteMassActionHandler.php
@@ -66,13 +66,14 @@ public function __construct(
     public function handle(MassActionHandlerArgs $args)
     {
         $limitResult = $this->limiter->getLimitResult($args);
-        $data = $args->getData();
-        $doDelete = isset($data['doDelete']) ? filter_var($data['doDelete'], FILTER_VALIDATE_BOOLEAN) : false;
-        if ($doDelete) {
+        $method      = $this->requestStack->getMasterRequest()->getMethod();
+        if ($method === 'POST') {
+            $result = $this->getPostResponse($limitResult);
+        } elseif ($method === 'DELETE') {
             $this->limiter->limitQuery($limitResult, $args);
             $result = $this->doDelete($args);
         } else {
-            $result = $this->getPostResponse($limitResult);
+            $result = $this->getNotSupportedResponse($method);
         }
 
         return $result;
@@ -132,6 +133,19 @@ protected function getPostResponse(MassDeleteLimitResult $limitResult)
         );
     }
 
+    /**
+     * @param $method
+     *
+     * @return MassActionResponse
+     */
+    protected function getNotSupportedResponse($method)
+    {
+        return new MassActionResponse(
+            false,
+            sprintf('Method "%s" is not supported', $method)
+        );
+    }
+
     /**
      * @param MassActionHandlerArgs $args
      *
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 2493b743606..5533eb2e3ed 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
@@ -44,9 +44,6 @@ define([
         /** @property {Boolean} */
         allowOk: true,
 
-        /** @property {Boolean} */
-        doDelete: false,
-
         /**
          * As in this action we need to send POST request to get data for confirm message
          * we set this.confirmation = false at initialization to prevent opening confirm window.
@@ -57,7 +54,6 @@ define([
             DeleteMassAction.__super__.initialize.apply(this, arguments);
             this.confirmMessage = __(this.defaultMessages.confirm_content);
             this.confirmation = false;
-            this.requestType = 'POST';
         },
 
         /**
@@ -90,8 +86,8 @@ define([
          *
          */
         _onAjaxSuccess: function(data, textStatus, jqXHR) {
-            if (!this.doDelete) {
-                this.doDelete = true;
+            if (this.requestType === 'POST') {
+                this.requestType = 'DELETE';
                 this.setConfirmMessage(data);
                 if (this.reloadData) {
                     this.datagrid.hideLoading();
@@ -109,7 +105,7 @@ define([
          * Sets this.confirmModal = null to rebuild confirm window after each request.
          */
         execute: function() {
-            this.doDelete = false;
+            this.requestType = 'POST';
             this.confirmModal = null;
             if (this.checkSelectionState()) {
                 DeleteMassAction.__super__.executeConfiguredAction.call(this);
@@ -150,13 +146,6 @@ define([
             }
         },
 
-        /**
-         * @inheritDoc
-         */
-        getActionParameters: function() {
-            return _.extend({doDelete: this.doDelete}, DeleteMassAction.__super__.getActionParameters.call(this));
-        },
-
         isDefined: function(value) {
             return !_.isUndefined(value);
         }

From 6bbd4336627c3ced719be9fd6c6d5ccce82e4912 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Fri, 8 Jan 2016 19:37:51 +0200
Subject: [PATCH 387/471] CRM-3685: Can't add context for entity with newly
 enabled activities  - Fix titles

---
 .../Entity/Manager/AssociationManager.php                  | 7 +++++++
 .../Tests/Unit/Entity/Manager/AssociationManagerTest.php   | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/EntityExtendBundle/Entity/Manager/AssociationManager.php b/src/Oro/Bundle/EntityExtendBundle/Entity/Manager/AssociationManager.php
index edce9cfe967..a5a28baacd9 100644
--- a/src/Oro/Bundle/EntityExtendBundle/Entity/Manager/AssociationManager.php
+++ b/src/Oro/Bundle/EntityExtendBundle/Entity/Manager/AssociationManager.php
@@ -180,6 +180,8 @@ public function getMultiOwnerFilter($scope, $attribute)
      *                                             function (QueryBuilder $qb, $targetEntityClass)
      *
      * @return SqlQueryBuilder
+     *
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function getMultiAssociationsQueryBuilder(
         $associationOwnerClass,
@@ -198,6 +200,11 @@ public function getMultiAssociationsQueryBuilder(
         $subQueries = [];
         foreach ($associationTargets as $entityClass => $fieldName) {
             $nameExpr = $this->entityNameResolver->getNameDQL($entityClass, 'target');
+            // Need to forcibly convert expression to string when the title is different type.
+            // Example of error: "UNION types text and integer cannot be matched".
+            if ($nameExpr) {
+                $nameExpr = sprintf('CONCAT(%s,\'\')', $nameExpr);
+            }
             $subQb    = $em->getRepository($associationOwnerClass)->createQueryBuilder('e')
                 ->select(
                     sprintf(
diff --git a/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Entity/Manager/AssociationManagerTest.php b/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Entity/Manager/AssociationManagerTest.php
index 6c04f037dfa..7cd7482d435 100644
--- a/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Entity/Manager/AssociationManagerTest.php
+++ b/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Entity/Manager/AssociationManagerTest.php
@@ -406,7 +406,7 @@ function (QueryBuilder $qb) {
             . 'FROM ('
             . 'SELECT DISTINCT t0_.id AS id_0, t1_.id AS id_1, '
             . '\'' . $targetClass1 . '\' AS sclr_2, '
-            . 't1_.firstName || \' \' || t1_.lastName AS sclr_3 '
+            . 't1_.firstName || \' \' || t1_.lastName || \'\' AS sclr_3 '
             . 'FROM test_owner1 t0_ '
             . 'INNER JOIN test_owner1_to_target1 t2_ ON t0_.id = t2_.owner_id '
             . 'INNER JOIN test_target1 t1_ ON t1_.id = t2_.target_id '
@@ -415,7 +415,7 @@ function (QueryBuilder $qb) {
             . ' UNION ALL '
             . 'SELECT DISTINCT t0_.id AS id_0, t1_.id AS id_1, '
             . '\'' . $targetClass2 . '\' AS sclr_2, '
-            . 't1_.firstName || \' \' || t1_.lastName AS sclr_3 '
+            . 't1_.firstName || \' \' || t1_.lastName || \'\' AS sclr_3 '
             . 'FROM test_owner1 t0_ '
             . 'INNER JOIN test_owner1_to_target2 t2_ ON t0_.id = t2_.owner_id '
             . 'INNER JOIN test_target2 t1_ ON t1_.id = t2_.target_id '

From 34e55878e270a9afa83b67c217090fc39a07f35d Mon Sep 17 00:00:00 2001
From: Ievgenii Myshusta <imyshusta@magecore.com>
Date: Fri, 8 Jan 2016 20:29:26 +0200
Subject: [PATCH 388/471] CRM-4845: Create grids for action add context for
 activity - added unit tests

---
 .../DateEarlierThanValidatorTest.php          | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/Oro/Bundle/CalendarBundle/Tests/Unit/Validator/Constraints/DateEarlierThanValidatorTest.php b/src/Oro/Bundle/CalendarBundle/Tests/Unit/Validator/Constraints/DateEarlierThanValidatorTest.php
index a264580631b..d394a73c955 100644
--- a/src/Oro/Bundle/CalendarBundle/Tests/Unit/Validator/Constraints/DateEarlierThanValidatorTest.php
+++ b/src/Oro/Bundle/CalendarBundle/Tests/Unit/Validator/Constraints/DateEarlierThanValidatorTest.php
@@ -4,6 +4,7 @@
 
 use Oro\Bundle\CalendarBundle\Validator\Constraints\DateEarlierThan;
 use Oro\Bundle\CalendarBundle\Validator\Constraints\DateEarlierThanValidator;
+use Symfony\Component\Form\Form;
 
 class DateEarlierThanValidatorTest extends \PHPUnit_Framework_TestCase
 {
@@ -56,6 +57,10 @@ protected function setUp()
             ->method('get')
             ->will($this->returnValue($this->formField));
 
+        $form->expects($this->any())
+            ->method('has')
+            ->will($this->returnValue(true));
+
         $this->context = $this->getMock('\Symfony\Component\Validator\ExecutionContextInterface');
         $this->context->expects($this->any())
             ->method('getRoot')
@@ -144,4 +149,19 @@ public function testInvalidData()
 
         $this->validator->validate($this->dateTimeEnd, $this->constraint);
     }
+
+    public function testNotExistingFormData()
+    {
+        $formConfig = $this->getMock('\Symfony\Component\Form\FormConfigInterface');
+        $form = new Form($formConfig);
+
+        $this->context = $this->getMock('\Symfony\Component\Validator\ExecutionContextInterface');
+        $this->context->expects($this->any())
+            ->method('getRoot')
+            ->will($this->returnValue($form));
+
+        $this->validator->initialize($this->context);
+
+        $this->assertNull($this->validator->validate(false, $this->constraint));
+    }
 }

From 5e53e8f4c87df66b9ce3e1446715de19ff247e3a Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Fri, 8 Jan 2016 22:20:03 +0200
Subject: [PATCH 389/471] CRM-4893: fit all filter dropdowns to specified
 container

---
 .../public/js/filter/abstract-filter.js       | 22 +++++++++++++++
 .../public/js/filter/select-filter.js         |  4 ++-
 .../Resources/public/js/filter/text-filter.js | 27 ++++++++++---------
 3 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/abstract-filter.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/abstract-filter.js
index 420945ac201..3b48f4e68d9 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/abstract-filter.js
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/abstract-filter.js
@@ -103,6 +103,13 @@ define([
          */
         nullLink: '#',
 
+        /**
+         * Element enclosing a criteria dropdown
+         *
+         * @property {string|jQuery|HTMLElement}
+         */
+        dropdownFitContainer: ['.ui-dialog-content', '#container:visible', 'body'],
+
         /**
          * Initialize.
          *
@@ -224,6 +231,21 @@ define([
             return this;
         },
 
+        /**
+         * Find element that dropdown of filter should fit to
+         *
+         * @param {string|jQuery|HTMLElement} element
+         * @return {*}
+         */
+        _findDropdownFitContainer: function(element) {
+            element = element || this.$el;
+            var $container = $();
+            for (var i = 0; i < this.dropdownFitContainer.length && $container.length === 0; i += 1) {
+                $container = $(element).closest(this.dropdownFitContainer[i]);
+            }
+            return $container.length === 0 ? null : $container;
+        },
+
         /**
          * Converts a display value to raw format, e.g. decimal value can be displayed as "5,000,000.00"
          * but raw value is 5000000.0
diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/select-filter.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/select-filter.js
index 4a3ee93b171..711c73832cb 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/select-filter.js
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/select-filter.js
@@ -201,6 +201,7 @@ define([
          * @protected
          */
         _initializeSelectWidget: function() {
+            var $dropdownContainer = this._findDropdownFitContainer(this.dropdownContainer) || this.dropdownContainer;
             this.selectWidget = new MultiselectDecorator({
                 element: this.$(this.inputSelector),
                 parameters: _.extend({
@@ -213,7 +214,7 @@ define([
                         at: 'left bottom',
                         of: this.$(this.containerSelector),
                         collision: 'fit none',
-                        within: this.dropdownContainer
+                        within: $dropdownContainer
                     },
                     open: _.bind(function() {
                         this.selectWidget.onOpenDropdown();
@@ -221,6 +222,7 @@ define([
                         this._setButtonPressed(this.$(this.containerSelector), true);
                         this._clearChoicesStyle();
                         this.selectDropdownOpened = true;
+                        this.selectWidget.updateDropdownPosition();
                     }, this),
                     close: _.bind(function() {
                         this._setButtonPressed(this.$(this.containerSelector), false);
diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/text-filter.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/text-filter.js
index 7cc81d71e5a..9cf14465fae 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/text-filter.js
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/text-filter.js
@@ -48,13 +48,6 @@ define([
          */
         criteriaSelector: '.filter-criteria',
 
-        /**
-         * Element enclosing a criteria dropdown
-         *
-         * @property {string|jQuery|HTMLElement}
-         */
-        limitCriteriaTo: '#container:visible, body',
-
         /**
          * Selectors for filter criteria elements
          *
@@ -220,11 +213,21 @@ define([
          * @private
          */
         _alignCriteria: function() {
-            var $container = $(this.limitCriteriaTo);
-            var $criteria = this.$(this.criteriaSelector);
-            var shift = $container.prop('clientWidth') + $container.offset().left -
-                this.$el.offset().left - $criteria.outerWidth();
-            $criteria.css('margin-left', shift < 0 ? shift : 0);
+            var $container = this._findDropdownFitContainer();
+            if ($container === null) {
+                return;
+            }
+            var $dropdown = this.$(this.criteriaSelector);
+            var rect = $dropdown.get(0).getBoundingClientRect();
+            var containerRect = $container.get(0).getBoundingClientRect();
+            var shift = rect.right - (containerRect.left + $container.prop('clientWidth'));
+            if (shift > 0) {
+                /**
+                 * reduce shift to avoid overlaping left edge of container
+                 */
+                shift -= Math.max(0, containerRect.left - (rect.left - shift));
+                $dropdown.css('margin-left', -shift);
+            }
         },
 
         /**

From c65e6b94cd1141aa6ccd4d6d26dfbc6c339550f1 Mon Sep 17 00:00:00 2001
From: Maksym Perepelytsya <mperepelytsya@magecore.com>
Date: Fri, 8 Jan 2016 22:21:51 +0200
Subject: [PATCH 390/471] BAP-9633: Failed selenium tests  - DELETE HTTP method
 in mass delete action(query string parameters)

---
 .../public/js/datagrid/action/delete-mass-action.js  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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 5533eb2e3ed..3cf80ce275f 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
@@ -148,6 +148,18 @@ define([
 
         isDefined: function(value) {
             return !_.isUndefined(value);
+        },
+
+        getLink: function(parameters) {
+            if (this.requestType === 'DELETE') {
+                var actionParameters = this.getActionParameters();
+                if (_.isUndefined(parameters)) {
+                    parameters = {};
+                }
+                parameters = _.extend(actionParameters, parameters);
+            }
+
+            return DeleteMassAction.__super__.getLink.call(this, parameters);
         }
     });
 

From bc20740fe55806584d711d36edd10efe1b5e1dc7 Mon Sep 17 00:00:00 2001
From: Yauheni Kasenka <beta.screech@gmail.com>
Date: Mon, 11 Jan 2016 13:24:07 +0300
Subject: [PATCH 391/471] BB-1720: Make (Frontend) Product - Add to Shopping
 List(s) an Action

---
 .../Extension/Action/ActionExtension.php      | 13 ++++++++-
 .../MassAction/MassActionExtension.php        | 13 +++++++++
 .../js/app/components/datagrid-component.js   | 24 ++++++++++++-----
 .../Resources/public/js/datagrid/grid.js      | 27 +++++++++++++++++--
 .../header-cell/action-header-cell.js         | 14 +++++++++-
 5 files changed, 81 insertions(+), 10 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Extension/Action/ActionExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/Action/ActionExtension.php
index 0edd7e920f8..7f117733649 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/Action/ActionExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/Action/ActionExtension.php
@@ -99,6 +99,17 @@ public function getPriority()
      * {@inheritDoc}
      */
     public function visitMetadata(DatagridConfiguration $config, MetadataObject $data)
+    {
+        $actionsMetadata = $this->getActionsMetadata($config);
+
+        $data->offsetAddToArray(static::METADATA_ACTION_KEY, $actionsMetadata);
+    }
+
+    /**
+     * @param DatagridConfiguration $config
+     * @return array
+     */
+    protected function getActionsMetadata(DatagridConfiguration $config)
     {
         $actionsMetadata = [];
         $actions         = $config->offsetGetOr(static::ACTION_KEY, []);
@@ -114,7 +125,7 @@ public function visitMetadata(DatagridConfiguration $config, MetadataObject $dat
             }
         }
 
-        $data->offsetAddToArray(static::METADATA_ACTION_KEY, $actionsMetadata);
+        return $actionsMetadata;
     }
 
     /**
diff --git a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassActionExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassActionExtension.php
index 594eac195a3..54c55c363ba 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassActionExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassActionExtension.php
@@ -3,6 +3,7 @@
 namespace Oro\Bundle\DataGridBundle\Extension\MassAction;
 
 use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
+use Oro\Bundle\DataGridBundle\Datagrid\Common\ResultsObject;
 use Oro\Bundle\DataGridBundle\Datagrid\DatagridInterface;
 use Oro\Bundle\DataGridBundle\Extension\Action\ActionExtension;
 use Oro\Bundle\DataGridBundle\Extension\Action\Actions\ActionInterface;
@@ -24,6 +25,18 @@ public function isApplicable(DatagridConfiguration $config)
         return true;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public function visitResult(DatagridConfiguration $config, ResultsObject $result)
+    {
+        $metadata = [
+            static::METADATA_ACTION_KEY => $this->getActionsMetadata($config)
+        ];
+
+        $result->offsetAddToArray('metadata', $metadata);
+    }
+
     /**
      * Get grid mass action by name
      *
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
index 47b1e30be8b..5dbe678bb32 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
@@ -255,11 +255,6 @@ define(function(require) {
                 rowActions[action] = modules[helpers.actionType(options.frontend_type)].extend(options);
             });
 
-            // mass actions
-            _.each(metadata.massActions, function(options, action) {
-                massActions[action] = modules[helpers.actionType(options.frontend_type)].extend(options);
-            });
-
             if (tools.isMobile()) {
                 plugins.push(FloatingHeaderPlugin);
             } else {
@@ -272,11 +267,16 @@ define(function(require) {
                 plugins.push(ColumnManagerPlugin);
             }
 
+            var self = this;
+
             return {
                 name: this.gridName,
                 columns: columns,
                 rowActions: rowActions,
-                massActions: massActions,
+                massActions: this.buildMassActionsOptions(metadata.massActions),
+                massActionsOptionsBuilder: function(massActions) {
+                    return self.buildMassActionsOptions(massActions);
+                },
                 toolbarOptions: metadata.options.toolbarOptions || {},
                 multipleSorting: metadata.options.multipleSorting || false,
                 entityHint: metadata.options.entityHint,
@@ -288,6 +288,18 @@ define(function(require) {
             };
         },
 
+        buildMassActionsOptions: function (actions) {
+            var modules = this.modules;
+
+            var massActions = {};
+
+            _.each(actions, function(options, action) {
+                massActions[action] = modules[helpers.actionType(options.frontend_type)].extend(options);
+            });
+
+            return massActions;
+        },
+
         fixStates: function(options) {
             if (options.metadata) {
                 this.fixState(options.metadata.state);
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid.js
index 2ae3fc45f59..94b13bf49fe 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid.js
@@ -485,7 +485,7 @@ define(function(require) {
                 xhr.always = function() {
                     always.apply(this, arguments);
                     if (!self.disposed) {
-                        self._afterRequest();
+                        self._afterRequest(this);
                     }
                 };
             });
@@ -676,7 +676,13 @@ define(function(require) {
          *
          * @private
          */
-        _afterRequest: function() {
+        _afterRequest: function(jqXHR) {
+
+            var json = jqXHR.responseJSON || {};
+            if (json.metadata) {
+                this._processLoadedMetadata(json.metadata);
+            }
+
             this.requestsCount -= 1;
             if (this.requestsCount === 0) {
                 this.hideLoading();
@@ -690,6 +696,23 @@ define(function(require) {
             }
         },
 
+        /**
+         * @param {Object} metadata
+         * @private
+         */
+        _processLoadedMetadata: function(metadata) {
+            var meta = _.defaults(metadata, {
+                massActions: {}
+            });
+
+            if (metadata.massActions) {
+                this.massActions = this.massActionsOptionsBuilder(meta.massActions);
+                this.metadata.massActions = meta.massActions;
+
+                this.trigger('metadata-change', meta);
+            }
+        },
+
         /**
          * Show loading mask and disable toolbar
          */
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js
index 299862d8856..bc76d882abe 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js
@@ -44,6 +44,7 @@ define([
             datagrid = this.column.get('datagrid');
             this.listenTo(datagrid, 'enable', this.enable);
             this.listenTo(datagrid, 'disable', this.disable);
+            this.listenTo(datagrid, 'metadata-change', this.rebuildAndRender);
         },
 
         /**
@@ -58,7 +59,7 @@ define([
             ActionHeaderCell.__super__.dispose.apply(this, arguments);
         },
 
-        createActionsPanel: function() {
+        buildActionsPanel: function() {
             var actions = [];
             var datagrid = this.column.get('datagrid');
 
@@ -71,7 +72,10 @@ define([
 
             this.actionsPanel = new ActionsPanel();
             this.actionsPanel.setActions(actions);
+        },
 
+        createActionsPanel: function() {
+            this.buildActionsPanel();
             this.subviews.push(this.actionsPanel);
         },
 
@@ -87,6 +91,14 @@ define([
             return this;
         },
 
+        rebuildAndRender: function() {
+            var datagrid = this.column.get('datagrid');
+            this.column.set('massActions', datagrid.massActions);
+
+            this.buildActionsPanel();
+            this.render();
+        },
+
         enable: function() {
             this.actionsPanel.enable();
             this.$(this.options.controls).removeClass('disabled');

From a9784386e0f3ea304b941e3940fa10a764f481fa Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Mon, 11 Jan 2016 13:02:47 +0200
Subject: [PATCH 392/471] CRM-4893: rename a property

---
 .../Resources/public/js/filter/abstract-filter.js         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/abstract-filter.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/abstract-filter.js
index 3b48f4e68d9..8dc2244061a 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/abstract-filter.js
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/abstract-filter.js
@@ -106,9 +106,9 @@ define([
         /**
          * Element enclosing a criteria dropdown
          *
-         * @property {string|jQuery|HTMLElement}
+         * @property {Array.<string|jQuery|HTMLElement>}
          */
-        dropdownFitContainer: ['.ui-dialog-content', '#container:visible', 'body'],
+        dropdownFitContainers: ['.ui-dialog-content', '#container:visible', 'body'],
 
         /**
          * Initialize.
@@ -240,8 +240,8 @@ define([
         _findDropdownFitContainer: function(element) {
             element = element || this.$el;
             var $container = $();
-            for (var i = 0; i < this.dropdownFitContainer.length && $container.length === 0; i += 1) {
-                $container = $(element).closest(this.dropdownFitContainer[i]);
+            for (var i = 0; i < this.dropdownFitContainers.length && $container.length === 0; i += 1) {
+                $container = $(element).closest(this.dropdownFitContainers[i]);
             }
             return $container.length === 0 ? null : $container;
         },

From 3de3bac99b129fa7a5df8b0d283bfb98f8cc5703 Mon Sep 17 00:00:00 2001
From: Yauheni Kasenka <beta.screech@gmail.com>
Date: Mon, 11 Jan 2016 14:05:32 +0300
Subject: [PATCH 393/471] BB-1720: Make (Frontend) Product - Add to Shopping
 List(s) an Action

---
 .../public/js/app/components/datagrid-component.js       | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
index 5dbe678bb32..e39ef4f1571 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
@@ -255,6 +255,9 @@ define(function(require) {
                 rowActions[action] = modules[helpers.actionType(options.frontend_type)].extend(options);
             });
 
+            // mass actions
+            massActions = this.buildMassActionsOptions(metadata.massActions);
+
             if (tools.isMobile()) {
                 plugins.push(FloatingHeaderPlugin);
             } else {
@@ -273,10 +276,8 @@ define(function(require) {
                 name: this.gridName,
                 columns: columns,
                 rowActions: rowActions,
-                massActions: this.buildMassActionsOptions(metadata.massActions),
-                massActionsOptionsBuilder: function(massActions) {
-                    return self.buildMassActionsOptions(massActions);
-                },
+                massActions: massActions,
+                massActionsOptionsBuilder: _.bind(this.buildMassActionsOptions, this),
                 toolbarOptions: metadata.options.toolbarOptions || {},
                 multipleSorting: metadata.options.multipleSorting || false,
                 entityHint: metadata.options.entityHint,

From 3a4ef5f6cdc268084c7ce953cfa8608ca302d4dd Mon Sep 17 00:00:00 2001
From: Yauheni Kasenka <beta.screech@gmail.com>
Date: Mon, 11 Jan 2016 14:09:24 +0300
Subject: [PATCH 394/471] BB-1720: Make (Frontend) Product - Add to Shopping
 List(s) an Action - cs updates

---
 .../public/js/app/components/datagrid-component.js          | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
index e39ef4f1571..13c062171af 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
@@ -270,8 +270,6 @@ define(function(require) {
                 plugins.push(ColumnManagerPlugin);
             }
 
-            var self = this;
-
             return {
                 name: this.gridName,
                 columns: columns,
@@ -289,6 +287,10 @@ define(function(require) {
             };
         },
 
+        /**
+         * @param {Object} actions
+         * @returns {Object}
+         */
         buildMassActionsOptions: function (actions) {
             var modules = this.modules;
 

From e2909134aec5184b9fabbee3d35221d444a3688b Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Mon, 11 Jan 2016 13:19:48 +0200
Subject: [PATCH 395/471] CRM-4822: Can't find tags which begins from special
 symbols

---
 .../TagBundle/Autocomplete/SearchHandler.php  | 32 +++++++++++++++++++
 .../TagBundle/Resources/config/form.yml       |  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 src/Oro/Bundle/TagBundle/Autocomplete/SearchHandler.php

diff --git a/src/Oro/Bundle/TagBundle/Autocomplete/SearchHandler.php b/src/Oro/Bundle/TagBundle/Autocomplete/SearchHandler.php
new file mode 100644
index 00000000000..f796bd707c0
--- /dev/null
+++ b/src/Oro/Bundle/TagBundle/Autocomplete/SearchHandler.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Oro\Bundle\TagBundle\Autocomplete;
+
+use Oro\Bundle\FormBundle\Autocomplete\SearchHandler as BaseSearchHandler;
+
+class SearchHandler extends BaseSearchHandler
+{
+    /**
+     * @param string $search
+     * @param int    $firstResult
+     * @param int    $maxResults
+     *
+     * @return array
+     */
+    protected function searchIds($search, $firstResult, $maxResults)
+    {
+        $ids = parent::searchIds($search, $firstResult, $maxResults);
+        // Need to make additional query cause of Mysql Full-Text Search limitation and databases stop words.
+        // http://dev.mysql.com/doc/refman/5.0/en/server-system-variables.html#sysvar_ft_min_word_len
+        // http://dev.mysql.com/doc/refman/5.0/en/fulltext-stopwords.html
+        // http://www.postgresql.org/docs/9.1/static/textsearch-dictionaries.html
+        if (empty($ids)) {
+            $object = $this->entityRepository->findOneBy(['name' => $search]);
+            if ($object !== null) {
+                $ids[] = $object->getId();
+            }
+        }
+
+        return $ids;
+    }
+}
diff --git a/src/Oro/Bundle/TagBundle/Resources/config/form.yml b/src/Oro/Bundle/TagBundle/Resources/config/form.yml
index 58792bc2e4b..a4fed51bad5 100644
--- a/src/Oro/Bundle/TagBundle/Resources/config/form.yml
+++ b/src/Oro/Bundle/TagBundle/Resources/config/form.yml
@@ -76,7 +76,7 @@ services:
 
     # Autocomplete
     oro_tag.autocomplete.tag.search_handler:
-        class: %oro_tag.autocomplete.tag.search_handler.class%
+        class: Oro\Bundle\TagBundle\Autocomplete\SearchHandler
         parent: oro_form.autocomplete.search_handler
         arguments:
             - %oro_tag.tag.entity.class%

From 90d93b2e9358e065eef8e404dde16b312683013e Mon Sep 17 00:00:00 2001
From: Vova Soroka <vsoroka@magecore.com>
Date: Mon, 11 Jan 2016 14:26:28 +0200
Subject: [PATCH 396/471] BAP-9639: 500 error is occurred on Business Units

---
 .../ActivityBundle/Manager/ActivityManager.php    | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/Oro/Bundle/ActivityBundle/Manager/ActivityManager.php b/src/Oro/Bundle/ActivityBundle/Manager/ActivityManager.php
index 67582e9a7b3..e8d25624003 100644
--- a/src/Oro/Bundle/ActivityBundle/Manager/ActivityManager.php
+++ b/src/Oro/Bundle/ActivityBundle/Manager/ActivityManager.php
@@ -413,15 +413,14 @@ public function getActivityAssociations($entityClass)
         $config = $this->activityConfigProvider->getConfig($entityClass);
         $activityClassNames = $config->get('activities', false, []);
         foreach ($activityClassNames as $activityClassName) {
-            if (!$this->isActivityAssociationEnabled($entityClass, $activityClassName)) {
+            $associationName = ExtendHelper::buildAssociationName($entityClass, ActivityScope::ASSOCIATION_KIND);
+            if (!$this->isActivityAssociationEnabled($entityClass, $activityClassName, $associationName)) {
                 continue;
             }
 
             $entityConfig   = $this->entityConfigProvider->getConfig($activityClassName);
             $activityConfig = $this->activityConfigProvider->getConfig($activityClassName);
 
-            $associationName = ExtendHelper::buildAssociationName($entityClass, ActivityScope::ASSOCIATION_KIND);
-
             $item = [
                 'className'       => $activityClassName,
                 'associationName' => $associationName,
@@ -457,15 +456,14 @@ public function getActivityActions($entityClass)
 
         $activityClassNames = $this->activityConfigProvider->getConfig($entityClass)->get('activities');
         foreach ($activityClassNames as $activityClassName) {
-            if (!$this->isActivityAssociationEnabled($entityClass, $activityClassName)) {
+            $associationName = ExtendHelper::buildAssociationName($entityClass, ActivityScope::ASSOCIATION_KIND);
+            if (!$this->isActivityAssociationEnabled($entityClass, $activityClassName, $associationName)) {
                 continue;
             }
 
             $activityConfig = $this->activityConfigProvider->getConfig($activityClassName);
             $buttonWidget   = $activityConfig->get('action_button_widget');
             if (!empty($buttonWidget)) {
-                $associationName = ExtendHelper::buildAssociationName($entityClass, ActivityScope::ASSOCIATION_KIND);
-
                 $item = [
                     'className'       => $activityClassName,
                     'associationName' => $associationName,
@@ -566,16 +564,17 @@ public function addFilterByTargetEntity(
     /**
      * @param string $entityClass
      * @param string $activityClassName
+     * @param string $activityAssociationName
      *
      * @return bool
      */
-    protected function isActivityAssociationEnabled($entityClass, $activityClassName)
+    protected function isActivityAssociationEnabled($entityClass, $activityClassName, $activityAssociationName)
     {
         $extendConfig = $this->extendConfigProvider->getConfig($activityClassName);
         $relations    = $extendConfig->get('relation', false, []);
         $relationKey  = ExtendHelper::buildRelationKey(
             $activityClassName,
-            ExtendHelper::buildAssociationName($entityClass, ActivityScope::ASSOCIATION_KIND),
+            $activityAssociationName,
             RelationType::MANY_TO_MANY,
             $entityClass
         );

From 32c96f3c8e91bf3feb17341f0d1cb2540f856fa2 Mon Sep 17 00:00:00 2001
From: Makar Sichevoy <sichevoy@gmail.com>
Date: Mon, 11 Jan 2016 15:24:04 +0200
Subject: [PATCH 397/471] CRM-4844: Search api for autocomplete of field
 Context in form

---
 .../EmailBundle/Resources/config/search.yml      | 16 ++++++----------
 .../Resources/views/Email/searchResult.html.twig | 16 ++++++++++------
 .../EmailBundle/Resources/views/macros.html.twig | 13 +++++++++++++
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/Oro/Bundle/EmailBundle/Resources/config/search.yml b/src/Oro/Bundle/EmailBundle/Resources/config/search.yml
index 1d17c7c1cbd..181398e518b 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/config/search.yml
+++ b/src/Oro/Bundle/EmailBundle/Resources/config/search.yml
@@ -1,18 +1,14 @@
-Oro\Bundle\EmailBundle\Entity\EmailUser:
+Oro\Bundle\EmailBundle\Entity\Email:
     alias: oro_email
     label: Emails
     search_template: OroEmailBundle:Email:searchResult.html.twig
     route:
         name: oro_email_thread_view
         parameters:
-            id: email.id
-    title_fields: [email.subject]
+            id: id
+    title_fields: [subject]
     fields:
         -
-            name: email
-            relation_type: many-to-one
-            relation_fields:
-                -
-                    name: subject
-                    target_type: text
-                    target_fields: [subject]
+            name: subject
+            target_type: text
+            target_fields: [subject]
diff --git a/src/Oro/Bundle/EmailBundle/Resources/views/Email/searchResult.html.twig b/src/Oro/Bundle/EmailBundle/Resources/views/Email/searchResult.html.twig
index beb39733a54..14e9440c609 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/views/Email/searchResult.html.twig
+++ b/src/Oro/Bundle/EmailBundle/Resources/views/Email/searchResult.html.twig
@@ -5,19 +5,23 @@
 #}
 {% extends 'OroSearchBundle:Search:searchResultItem.html.twig' %}
 
-{% import 'OroUIBundle::macros.html.twig' as UI %}
+{#{% import 'OroUIBundle::macros.html.twig' as UI %}#}
 {% import 'OroEmailBundle::macros.html.twig' as EA %}
 
 {% set iconType = 'envelope' %}
 
 {% set recordUrl = indexer_item.recordUrl %}
-{% set title = entity ? entity.email.subject : indexer_item.recordTitle %}
+{% set title = entity ? entity.subject : indexer_item.recordTitle %}
 
 {% set entityType = 'oro.email.entity_label'|trans %}
 
 {% set entityInfo = [
-    {'title': 'oro.email.sent_at.label'|trans, 'value': entity.email.sentAt|oro_format_datetime},
-    {'title': 'oro.email.from_name.label'|trans, 'value': EA.email_address(entity.email.fromEmailAddress, entity.email.fromName)},
-    {'title': 'oro.email.to.label'|trans, 'value': EA.recipient_email_addresses(entity.email.recipients('to'))},
-    {'title': 'oro.email.emailuser.owner.label'|trans, 'value': UI.entityOwnerLink(entity, false)},
+    {'title': 'oro.email.sent_at.label'|trans, 'value': entity.sentAt|oro_format_datetime},
+    {'title': 'oro.email.from_name.label'|trans, 'value': EA.email_address(entity.fromEmailAddress, entity.fromName)},
+    {'title': 'oro.email.to.label'|trans, 'value': EA.recipient_email_addresses(entity.recipients('to'))},
+    {'title': 'oro.email.emailuser.owner.label'|trans, 'value': EA.entityOwnerLink(entity, false)},
 ] %}
+
+{#
+    {'title': 'oro.email.emailuser.owner.label'|trans, 'value': UI.entityOwnerLink(entity, false)},
+#}
\ No newline at end of file
diff --git a/src/Oro/Bundle/EmailBundle/Resources/views/macros.html.twig b/src/Oro/Bundle/EmailBundle/Resources/views/macros.html.twig
index 38919a372aa..906256b6d7b 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/views/macros.html.twig
+++ b/src/Oro/Bundle/EmailBundle/Resources/views/macros.html.twig
@@ -611,3 +611,16 @@
         </div>
     </div>
 {% endmacro %}
+
+{#
+    Render link to email owners
+    Parameters:
+        email - entity record
+        renderLabel - need render default label
+#}
+{% macro entityOwnerLink(email, renderLabel = true) %}
+    {% import 'OroUIBundle::macros.html.twig' as UI %}
+    {% for entity in email.emailUsers %}
+        {{ UI.entityOwnerLink(entity, false) }}
+    {% endfor %}
+{% endmacro %}
\ No newline at end of file

From 4a149410f89a4f423b181140a69b4742d93d1c5d Mon Sep 17 00:00:00 2001
From: Makar Sichevoy <sichevoy@gmail.com>
Date: Mon, 11 Jan 2016 15:25:40 +0200
Subject: [PATCH 398/471] CRM-4844: Search api for autocomplete of field
 Context in form

---
 .../EmailBundle/Resources/views/Email/searchResult.html.twig | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Oro/Bundle/EmailBundle/Resources/views/Email/searchResult.html.twig b/src/Oro/Bundle/EmailBundle/Resources/views/Email/searchResult.html.twig
index 14e9440c609..8b92e530cb5 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/views/Email/searchResult.html.twig
+++ b/src/Oro/Bundle/EmailBundle/Resources/views/Email/searchResult.html.twig
@@ -5,7 +5,6 @@
 #}
 {% extends 'OroSearchBundle:Search:searchResultItem.html.twig' %}
 
-{#{% import 'OroUIBundle::macros.html.twig' as UI %}#}
 {% import 'OroEmailBundle::macros.html.twig' as EA %}
 
 {% set iconType = 'envelope' %}
@@ -21,7 +20,3 @@
     {'title': 'oro.email.to.label'|trans, 'value': EA.recipient_email_addresses(entity.recipients('to'))},
     {'title': 'oro.email.emailuser.owner.label'|trans, 'value': EA.entityOwnerLink(entity, false)},
 ] %}
-
-{#
-    {'title': 'oro.email.emailuser.owner.label'|trans, 'value': UI.entityOwnerLink(entity, false)},
-#}
\ No newline at end of file

From fe585df403402920d9f4c8af0b59632b8eb3cb40 Mon Sep 17 00:00:00 2001
From: Makar Sichevoy <sichevoy@gmail.com>
Date: Mon, 11 Jan 2016 16:01:03 +0200
Subject: [PATCH 399/471] CRM-4844: Search api for autocomplete of field
 Context in form

---
 src/Oro/Bundle/EmailBundle/Resources/views/macros.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/EmailBundle/Resources/views/macros.html.twig b/src/Oro/Bundle/EmailBundle/Resources/views/macros.html.twig
index 906256b6d7b..b9bf4f79a1e 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/views/macros.html.twig
+++ b/src/Oro/Bundle/EmailBundle/Resources/views/macros.html.twig
@@ -623,4 +623,4 @@
     {% for entity in email.emailUsers %}
         {{ UI.entityOwnerLink(entity, false) }}
     {% endfor %}
-{% endmacro %}
\ No newline at end of file
+{% endmacro %}

From 24f0727c03692daed2945c30937f97adcc730a39 Mon Sep 17 00:00:00 2001
From: Hryhorii Hrebiniuk <grebinuk@gmail.com>
Date: Fri, 8 Jan 2016 19:44:36 +0200
Subject: [PATCH 400/471] CRM-4894: Problem with long page tittle. Mobile

---
 .../Resources/views/js/grid-view.html.twig    | 14 +++++-----
 .../public/css/less/mobile/page-header.less   | 27 ++++++++++++++-----
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/views/js/grid-view.html.twig b/src/Oro/Bundle/DataGridBundle/Resources/views/js/grid-view.html.twig
index cdd2f8bde69..1012f86d539 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/views/js/grid-view.html.twig
+++ b/src/Oro/Bundle/DataGridBundle/Resources/views/js/grid-view.html.twig
@@ -2,9 +2,9 @@
     <div class="btn-toolbar">
         <% if (choices.length) { %>
             <div class="btn-group views-group">
-                <button data-toggle="dropdown" class="btn btn-link dropdown-toggle <% if (disabled) { %>disabled<% } %>">
+                <div data-toggle="dropdown" class="btn btn-link dropdown-toggle <% if (disabled) { %>disabled<% } %>">
                     <%= title %>
-                </button>
+                </div>
                 <ul class="dropdown-menu">
                     <% _.each(choices, function (choice) { %>
                         <li><a href="#" data-value="<%= choice.value %>"><%= choice.label %></a></li>
@@ -14,9 +14,9 @@
         <% } %>
         <% if (showActions) { %>
             <div class="btn-group actions-group">
-                <button class="btn btn-link dropdown-toggle" data-toggle="dropdown" href="#">
+                <div class="btn btn-link dropdown-toggle" data-toggle="dropdown" href="#">
                     <%= actionsLabel %>
-                </button>
+                </div>
                 <ul class="dropdown-menu">
                     <% _.each(actions, function(action) { %>
                         <% if (action.enabled) { %>
@@ -24,10 +24,10 @@
                         <% } %>
                     <% }); %>
                 </ul>
-            </div>
-            <% if (dirty) { %>
+                <% if (dirty) { %>
                 <div class="edited-label">&nbsp;-&nbsp;<%= editedLabel %></div>
-            <% } %>
+                <% } %>
+            </div>
         <% } %>
     </div>
 </script>
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/page-header.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/page-header.less
index bf7dd18320b..ccce2553381 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/page-header.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/page-header.less
@@ -31,20 +31,33 @@
     margin-left: 0;
   }
   .oro-subtitle {
-    white-space: nowrap;
+    text-align: left;
+    white-space: normal;
   }
   .grid-views {
     margin-left: 0;
-    .views-group>.dropdown-toggle {
-      height: auto;
+    .views-group {
+      margin-right: 25px;
+      vertical-align: baseline;
+      & > .dropdown-toggle {
+        height: auto;
+        vertical-align: baseline;
+      }
+      &.open .btn.dropdown-toggle .caret, .caret {
+        margin: 0 -13px 0 5px;
+        vertical-align: baseline;
+        display: inline;
+        line-height: initial;
+        font-size: 4px;
+      }
     }
     .actions-group {
-      line-height: @fontSizeLarge * 2;
+      margin-left: 0;
+      vertical-align: baseline;
     }
-    .actions-group+.edited-label,
+    .edited-label,
     .actions-group .dropdown-toggle {
-      line-height: @fontSizeLarge * 2;
-      vertical-align: top;
+      vertical-align: baseline;
       &:after {
         content: '';
         font-size: 20px;

From f7e353883e17954ef7e7d3740be03ebc53e9307e Mon Sep 17 00:00:00 2001
From: Hryhorii Hrebiniuk <hhrebiniuk@magecore.com>
Date: Mon, 11 Jan 2016 16:40:32 +0200
Subject: [PATCH 401/471] CRM-4894: Problem with long page tittle. Mobile

 - fixed outline for grid-views
---
 .../UIBundle/Resources/public/css/less/mobile/page-header.less | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/page-header.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/page-header.less
index ccce2553381..f8dba2f1ef7 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/page-header.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/page-header.less
@@ -33,11 +33,12 @@
   .oro-subtitle {
     text-align: left;
     white-space: normal;
+    padding-right: 13px;
   }
   .grid-views {
     margin-left: 0;
     .views-group {
-      margin-right: 25px;
+      margin-right: 12px;
       vertical-align: baseline;
       & > .dropdown-toggle {
         height: auto;

From 6bc1d3008db62c2f2dcab65d12286d220e6bac65 Mon Sep 17 00:00:00 2001
From: Makar Sichevoy <sichevoy@gmail.com>
Date: Mon, 11 Jan 2016 16:49:25 +0200
Subject: [PATCH 402/471] CRM-4845: Create grids for action add context for
 activity

---
 src/Oro/Bundle/CalendarBundle/Resources/config/datagrid.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/CalendarBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/CalendarBundle/Resources/config/datagrid.yml
index 756cabfda39..91fcfa81a5f 100644
--- a/src/Oro/Bundle/CalendarBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/CalendarBundle/Resources/config/datagrid.yml
@@ -469,6 +469,7 @@ datagrid:
 
     calendar-event-for-context-grid:
         extended_entity_name: %oro_calendar.calendar_event.entity.class%
+        acl_resource: oro_calendar_event_view
         options:
             entityHint: calendar_events
             entity_pagination: true
@@ -478,7 +479,6 @@ datagrid:
             routerEnabled: false
         source:
             type: orm
-            acl_resource: oro_calendar_event_view
             query:
                 select:
                     - event.id

From c6956aa5c18b2e53ba54b3c85c75ad1100363ce1 Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Mon, 11 Jan 2016 17:16:41 +0200
Subject: [PATCH 403/471] CRM-4880: give extra place for email action buttons

---
 .../Resources/public/css/less/mobile/thread-view.less           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/EmailBundle/Resources/public/css/less/mobile/thread-view.less b/src/Oro/Bundle/EmailBundle/Resources/public/css/less/mobile/thread-view.less
index b5aeea331d6..19d5974743b 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/public/css/less/mobile/thread-view.less
+++ b/src/Oro/Bundle/EmailBundle/Resources/public/css/less/mobile/thread-view.less
@@ -11,7 +11,7 @@
       margin-right: 100px;
     }
     .email-actions {
-      margin-top: 16px;
+      margin: 16px -10px 0 0;
       .btn-group +.btn-group {
         margin-left: 5px;
       }

From db7ab88429128cb3b4cf58eed54298576cd15189 Mon Sep 17 00:00:00 2001
From: Vova Soroka <vsoroka@magecore.com>
Date: Mon, 11 Jan 2016 18:17:23 +0200
Subject: [PATCH 404/471] CRM-4618: Impossible to define import strategy on the
 field configuration. Remove 'Use As Identity Field Even If Empty' and add
 'Only when not empty' to 'Use As Identity Field'

---
 UPGRADE-1.9.md                                 |  2 ++
 .../ImportExportBundle/Field/FieldHelper.php   | 17 +++++++++++++++++
 .../Resources/config/entity_config.yml         | 18 +++---------------
 .../Resources/translations/messages.en.yml     |  4 +++-
 .../Strategy/Import/AbstractImportStrategy.php |  2 +-
 5 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/UPGRADE-1.9.md b/UPGRADE-1.9.md
index e0b37d3780a..60e6d3c89d1 100644
--- a/UPGRADE-1.9.md
+++ b/UPGRADE-1.9.md
@@ -215,6 +215,8 @@ after:
 - Added `Oro\Bundle\ImportExportBundle\Formatter\ExcelDateTimeTypeFormatter` as default formatter for the date, time and datetime types in `Oro\Bundle\ImportExportBundle\Serializer\Normalizer\DateTimeNormalizer`. This types exported/imported depends on the application locale and timezone and recognized as dates in Microsoft Excel.
 - `Oro\Bundle\ImportExportBundle\Field\DatabaseHelper::getRegistry` is deprecated. Use class methods instead of disposed registry
 - Services with tag `oro_importexport.normalizer` was marked as private
+- Allow to omit empty identity fields. To use this feature set `Use As Identity Field` option to `Only when not empty
+` (-1 or `Oro\Bundle\ImportExportBundle\Field\FieldHelper::IDENTITY_ONLY_WHEN_NOT_EMPTY` in a code)
 
 ####InstallerBundle
 - `Oro\Bundle\InstallerBundle\EventListener\RequestListener` added to the class cache as performance improvement
diff --git a/src/Oro/Bundle/ImportExportBundle/Field/FieldHelper.php b/src/Oro/Bundle/ImportExportBundle/Field/FieldHelper.php
index f8fd8bf0c2a..929487ad626 100644
--- a/src/Oro/Bundle/ImportExportBundle/Field/FieldHelper.php
+++ b/src/Oro/Bundle/ImportExportBundle/Field/FieldHelper.php
@@ -15,6 +15,8 @@ class FieldHelper
 {
     const HAS_CONFIG = 'has_config';
 
+    const IDENTITY_ONLY_WHEN_NOT_EMPTY = -1;
+
     /** @var ConfigProvider */
     protected $configProvider;
 
@@ -313,6 +315,21 @@ public function getIdentityValues($entity)
         return $identityValues;
     }
 
+    /**
+     * Checks if a field should be used as an identity even if it has empty value
+     *
+     * @param string $entityName
+     * @param string $fieldName
+     *
+     * @return bool
+     */
+    public function isRequiredIdentityField($entityName, $fieldName)
+    {
+        $value = $this->getConfigValue($entityName, $fieldName, 'identity', false);
+
+        return $value && self::IDENTITY_ONLY_WHEN_NOT_EMPTY !== $value;
+    }
+
     /**
      * @param string $entityName
      * @return string[]
diff --git a/src/Oro/Bundle/ImportExportBundle/Resources/config/entity_config.yml b/src/Oro/Bundle/ImportExportBundle/Resources/config/entity_config.yml
index 8656c776650..b7c6854de15 100644
--- a/src/Oro/Bundle/ImportExportBundle/Resources/config/entity_config.yml
+++ b/src/Oro/Bundle/ImportExportBundle/Resources/config/entity_config.yml
@@ -41,24 +41,12 @@ oro_entity_config:
                             label:          oro.importexport.entity_config.identity.label
                             choices:
                                 false:      'No'
-                                true:       'Yes'
-                            empty_value:    false
-                            required:       false
-                            block:          import_export
-                identity_when_empty:
-                    options:
-                        value_type:         boolean
-                        allowed_type:       [string, text, integer, smallint, bigint, boolean, date, float, decimal, money, percent, enum]
-                    form:
-                        type:               choice
-                        options:
-                            label:          oro.importexport.entity_config.identity_when_empty.label
-                            choices:
-                                true:       'Yes'
-                                false:      'No'
+                                -1:         oro.importexport.entity_config.identity.only_when_not_empty
+                                true:       oro.importexport.entity_config.identity.always
                             empty_value:    false
                             required:       false
                             block:          import_export
+                            tooltip:        oro.importexport.entity_config.identity.tooltip
                 # is field must be excluded from import/export
                 excluded:
                     options:
diff --git a/src/Oro/Bundle/ImportExportBundle/Resources/translations/messages.en.yml b/src/Oro/Bundle/ImportExportBundle/Resources/translations/messages.en.yml
index 9981accd3dc..fefaf616ed3 100644
--- a/src/Oro/Bundle/ImportExportBundle/Resources/translations/messages.en.yml
+++ b/src/Oro/Bundle/ImportExportBundle/Resources/translations/messages.en.yml
@@ -16,7 +16,9 @@ oro:
             header.label:   "Column Name"
             header.tooltip: "If blank Label will be used"
             identity.label: "Use as Identity Field"
-            identity_when_empty.label: "Use as Identity Field even if empty"
+            identity.only_when_not_empty: "Only when not empty"
+            identity.always: "Always"
+            identity.tooltip: "If set to \"Only when not empty\", the field may be omitted in the identity when it has no value."
             order.label:    "Column Position"
 
         import:
diff --git a/src/Oro/Bundle/ImportExportBundle/Strategy/Import/AbstractImportStrategy.php b/src/Oro/Bundle/ImportExportBundle/Strategy/Import/AbstractImportStrategy.php
index b86d8613afc..89b01105fc6 100644
--- a/src/Oro/Bundle/ImportExportBundle/Strategy/Import/AbstractImportStrategy.php
+++ b/src/Oro/Bundle/ImportExportBundle/Strategy/Import/AbstractImportStrategy.php
@@ -150,7 +150,7 @@ protected function findExistingEntityByIdentityFields($entity, array $searchCont
         $identityValues += $this->fieldHelper->getIdentityValues($entity);
         foreach ($identityValues as $fieldName => $value) {
             if ($value !== null ||
-                $this->fieldHelper->getConfigValue($entityName, $fieldName, 'identity_when_empty', true)
+                $this->fieldHelper->isRequiredIdentityField($entityName, $fieldName)
             ) {
                 continue;
             }

From c8ea530b9c8c4de0f63e6806423b38db0f6a09db Mon Sep 17 00:00:00 2001
From: Vova Soroka <vsoroka@magecore.com>
Date: Mon, 11 Jan 2016 18:28:02 +0200
Subject: [PATCH 405/471] CRM-4618: Impossible to define import strategy on the
 field configuration. Remove 'Use As Identity Field Even If Empty' and add
 'Only when not empty' to 'Use As Identity Field'. Add unit tests

---
 .../Tests/Unit/Field/FieldHelperTest.php      | 35 ++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Field/FieldHelperTest.php b/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Field/FieldHelperTest.php
index 5f8ea39291a..210f2e55b6e 100644
--- a/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Field/FieldHelperTest.php
+++ b/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Field/FieldHelperTest.php
@@ -452,18 +452,21 @@ public function testGetIdentityValues()
         $this->config['stdClass'] = [
             'excludedField' => ['excluded' => true],
             'identityField' => ['identity' => true],
+            'onlyWhenNotEmptyIdentityField' => ['identity' => true],
             'regularField'  => [],
         ];
 
         $fields = [
             ['name' => 'excludedField'],
             ['name' => 'identityField'],
+            ['name' => 'onlyWhenNotEmptyIdentityField'],
             ['name' => 'regularField'],
         ];
 
         $entity = new \stdClass();
         $entity->excludedField = 'excludedValue';
         $entity->identityField = 'identityValue';
+        $entity->onlyWhenNotEmptyIdentityField = 'onlyWhenNotEmptyIdentityValue';
         $entity->regularField  = 'regularValue';
 
         $this->fieldProvider->expects($this->once())
@@ -472,10 +475,40 @@ public function testGetIdentityValues()
             ->will($this->returnValue($fields));
 
         $value = $this->helper->getIdentityValues($entity);
-        $this->assertEquals(['identityField' => 'identityValue'], $value);
+        $this->assertEquals(
+            [
+                'identityField' => 'identityValue',
+                'onlyWhenNotEmptyIdentityField' => 'onlyWhenNotEmptyIdentityValue'
+            ],
+            $value
+        );
         $this->assertSame($value, $this->helper->getIdentityValues($entity));
     }
 
+    /**
+     * @dataProvider isRequiredIdentityFieldProvider
+     */
+    public function testIsRequiredIdentityField($identityValue, $expectedResult)
+    {
+        $this->config['stdClass'] = [
+            'testField' => ['identity' => $identityValue]
+        ];
+
+        $this->assertEquals(
+            $expectedResult,
+            $this->helper->isRequiredIdentityField('stdClass', 'testField')
+        );
+    }
+
+    public function isRequiredIdentityFieldProvider()
+    {
+        return [
+            [false, false],
+            [true, true],
+            [FieldHelper::IDENTITY_ONLY_WHEN_NOT_EMPTY, false],
+        ];
+    }
+
     public function testProcessAsScalar()
     {
         $this->assertFalse($this->helper->processRelationAsScalar('TestEntity', 'testField'));

From c492a61797e71f308295cf2b2d200c90d9cd39e5 Mon Sep 17 00:00:00 2001
From: Hryhorii Hrebiniuk <hhrebiniuk@magecore.com>
Date: Mon, 11 Jan 2016 19:09:24 +0200
Subject: [PATCH 406/471] CRM-4903: Text on the page displayed not fully

---
 .../Resources/public/css/less/code.less       | 21 ++++------
 .../views/TrackingWebsite/view.html.twig      |  4 +-
 .../public/css/less/desktop/layout.less       | 28 ++-----------
 .../public/css/less/desktop/main.less         |  2 +-
 .../Resources/public/css/less/layout.less     | 40 +++++++++++++++----
 .../public/css/less/mobile/layout.less        |  6 ++-
 6 files changed, 51 insertions(+), 50 deletions(-)

diff --git a/src/Oro/Bundle/TrackingBundle/Resources/public/css/less/code.less b/src/Oro/Bundle/TrackingBundle/Resources/public/css/less/code.less
index 949a9dd632a..6aa997af6ed 100644
--- a/src/Oro/Bundle/TrackingBundle/Resources/public/css/less/code.less
+++ b/src/Oro/Bundle/TrackingBundle/Resources/public/css/less/code.less
@@ -1,15 +1,10 @@
-#websiteView + div .responsive-block {
-  padding: 10px;
-
-  .code {
-    width: 100%;
-
-    &.code-event {
-      height: 60px;
-    }
-
-    &.code-script {
-      height: 265px;
-    }
+.code {
+  width: 100%;
+  box-sizing: border-box;
+  &.code-event {
+    height: 60px;
+  }
+  &.code-script {
+    height: 265px;
   }
 }
diff --git a/src/Oro/Bundle/TrackingBundle/Resources/views/TrackingWebsite/view.html.twig b/src/Oro/Bundle/TrackingBundle/Resources/views/TrackingWebsite/view.html.twig
index ca7918ee19c..423d5501be0 100644
--- a/src/Oro/Bundle/TrackingBundle/Resources/views/TrackingWebsite/view.html.twig
+++ b/src/Oro/Bundle/TrackingBundle/Resources/views/TrackingWebsite/view.html.twig
@@ -36,7 +36,7 @@
 
 {% block content_data %}
     {%- set generalInformation -%}
-    <div class="row-fluid form-horizontal">
+    <div class="row-fluid">
         <div class="responsive-block">
             {{ UI.renderProperty('oro.tracking.trackingwebsite.name.label'|trans, entity.name) }}
             {{ UI.renderProperty('oro.tracking.trackingwebsite.identifier.label'|trans, entity.identifier) }}
@@ -67,7 +67,7 @@
     </div>
     {%- endset -%}
     {%- set trackingCode -%}
-    <div class="row-fluid form-horizontal">
+    <div class="row-fluid">
         <div class="responsive-block">
             <p>{{ 'oro.tracking.help.event_tooltip'|trans }}</p>
             {% if not app.request.secure %}
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/desktop/layout.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/desktop/layout.less
index 3eb7470c718..f89fd9c30f1 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/desktop/layout.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/desktop/layout.less
@@ -1,15 +1,8 @@
-@import "../mixins";
-html, body, #page, #top-page {
-  height: 100%;
-  overflow: hidden; // prevents scroll bar appearance
-}
-html{
-  overflow-x: auto;
-}
 .responsive-block{
   min-width: 340px;
   padding-right: 5px;
 }
+
 #left-panel,
 #right-panel {
   overflow: visible;
@@ -17,7 +10,8 @@ html{
 #left-panel, #right-panel, #main {
   float: left;
 }
-.desktop-version .oro-page {
+
+.oro-page {
   &.collapsible-sidebar {
     .oro-page-sidebar {
       > .dropdown-menu {
@@ -28,19 +22,3 @@ html{
     }
   }
 }
-body.backdrop:before {
-  position: absolute;
-  content: "";
-  display: block;
-  width: 100%;
-  height: 100%;
-  top: 0;
-  left: 0;
-  background: rgba(0,0,0,0.1);
-  z-index: 9999;
-}
-body.backdrop {
-  .select2-drop, #ui-datepicker-div{
-    z-index: 10001 !important;
-  }
-}
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/desktop/main.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/desktop/main.less
index 8c0e39a262a..0eb8469b95c 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/desktop/main.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/desktop/main.less
@@ -6,5 +6,5 @@
   @import "pin-bar";
   @import "form";
   @import "filter";
+  @import "layout";
 }
-@import "layout";
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/layout.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/layout.less
index c0c212154c9..3452fbb50ab 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/layout.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/layout.less
@@ -1,3 +1,11 @@
+html, body, #page, #top-page {
+  height: 100%;
+  overflow: hidden; // prevents scroll bar appearance
+}
+html{
+  overflow-x: auto;
+}
+
 .responsive-inline-position () {
   float: left;
   width: 50%;
@@ -67,13 +75,6 @@
   }
 }
 
-.ui-dialog {
-  max-width: 100%;
-  .row-fluid.row-fluid-divider {
-    background: none;
-  }
-}
-
 .container-fluid > .responsive-section {
   margin: 0 -@horizontalPadding;
   padding-right: @horizontalPadding;
@@ -93,6 +94,31 @@
     padding-right: 0;
   }
 }
+
+body.backdrop:before {
+  position: absolute;
+  content: "";
+  display: block;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  left: 0;
+  background: rgba(0,0,0,0.1);
+  z-index: 9999;
+}
+body.backdrop {
+  .select2-drop, #ui-datepicker-div{
+    z-index: 10001 !important;
+  }
+}
+
+.ui-dialog {
+  max-width: 100%;
+  .row-fluid.row-fluid-divider {
+    background: none;
+  }
+}
+
 .oro-page-menu-items {
   list-style: none;
   margin: 0;
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/layout.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/layout.less
index f426ca13089..432b6c2a642 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/layout.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/layout.less
@@ -59,8 +59,10 @@
     padding: @contentPadding 0;
   }
 }
-.container-fluid > .responsive-section .responsive-cell {
-  padding: 0 @contentPadding;
+.container-fluid > .responsive-section {
+  .responsive-cell, .responsive-cell:only-child {
+    padding: 0 @contentPadding;
+  }
 }
 .responsive-cell .box-type1{
   .filter-box {

From 144a6a3cbc2749a3c28ea6a02239fa34f2c60438 Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Mon, 11 Jan 2016 21:01:14 +0200
Subject: [PATCH 407/471] CRM-4870: change the appearance of Tags

---
 .../public/css/less/inline-editing.less       | 19 ++++++++++++---
 .../TagBundle/Resources/config/assets.yml     |  5 +---
 .../TagBundle/Resources/public/css/main.less  |  6 +++++
 .../Resources/public/css/tags-container.less  | 24 ++++++++++---------
 .../Resources/public/css/less/variables.less  |  4 ++++
 5 files changed, 40 insertions(+), 18 deletions(-)
 create mode 100644 src/Oro/Bundle/TagBundle/Resources/public/css/main.less

diff --git a/src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editing.less b/src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editing.less
index 75df439497c..6e0e5d7c8a4 100644
--- a/src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editing.less
+++ b/src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editing.less
@@ -157,9 +157,22 @@
       min-width: 130px;
       overflow: auto;
       .select2-search-choice {
-        font-size: 13px;
-        line-height: 13px;
-        padding: 4px 19px 3px 6px;
+        font-size: 11px;
+        line-height: 12px;
+        padding: 5px 20px 5px 8px;
+        color: @tagItemColor;
+        background: @tagItemBackground;
+        border: 0 none;
+        border-radius: 10px;
+        box-shadow: none;
+        margin-left: 4px;
+        margin-bottom: 0;
+        .select2-search-choice-close {
+          top: 6px;
+          &:before {
+            color: @tagItemColor;
+          }
+        }
         &.select2-locked {
           padding: 4px 5px 3px 6px !important;
         }
diff --git a/src/Oro/Bundle/TagBundle/Resources/config/assets.yml b/src/Oro/Bundle/TagBundle/Resources/config/assets.yml
index a77b75dfb22..ee834f8473c 100644
--- a/src/Oro/Bundle/TagBundle/Resources/config/assets.yml
+++ b/src/Oro/Bundle/TagBundle/Resources/config/assets.yml
@@ -1,6 +1,3 @@
 css:
   'orotag':
-      - 'bundles/orotag/css/tag-grid.less'
-      - 'bundles/orotag/css/tags-container.less'
-      - 'bundles/orotag/css/form.less'
-      - 'bundles/orotag/css/config.less'
+      - 'bundles/orotag/css/main.less'
diff --git a/src/Oro/Bundle/TagBundle/Resources/public/css/main.less b/src/Oro/Bundle/TagBundle/Resources/public/css/main.less
new file mode 100644
index 00000000000..d941f01d64b
--- /dev/null
+++ b/src/Oro/Bundle/TagBundle/Resources/public/css/main.less
@@ -0,0 +1,6 @@
+@import "oroui/css/less/mixins";
+
+@import "./tag-grid";
+@import "./tags-container";
+@import "./form";
+@import "./config";
diff --git a/src/Oro/Bundle/TagBundle/Resources/public/css/tags-container.less b/src/Oro/Bundle/TagBundle/Resources/public/css/tags-container.less
index 15140dc0145..71424053e9b 100644
--- a/src/Oro/Bundle/TagBundle/Resources/public/css/tags-container.less
+++ b/src/Oro/Bundle/TagBundle/Resources/public/css/tags-container.less
@@ -1,24 +1,26 @@
 .tags-container {
-  line-height: 27px;
+  line-height: 24px;
 }
 
 .table td.tags-container {
-  line-height: 27px;
-  padding-top: 1px;
-  padding-bottom: 1px;
+  line-height: 24px;
+  padding-top: 2px;
+  padding-bottom: 2px;
 }
 .tags-container__tag-entry {
-  border: 1px solid #ddd;
-  background: white;
-  border-radius: 3px;
+  color: @tagItemColor;
+  background-color: @tagItemBackground;
+  border-radius: 10px;
   margin-right: 0px;
-  font-size: 13px;
+  font-size: 11px;
   line-height: 20px;
-  padding: 1px 6px 0;
+  padding: 1px 8px;
   display: inline-block;
   vertical-align: baseline;
+  &:hover {
+    color: @tagItemColor;
+  }
 }
 .tags-container__tag-entry_is-my {
-  border-color: #bbbbee;
-  background: #fafaff;
+  background-color: @tagItemBackground;
 }
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/variables.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/variables.less
index ddcb2e674a7..35b88f38a18 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/variables.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/variables.less
@@ -73,6 +73,10 @@
 @infoBorder:                      #bce8f1;
 @infoClose:                       #b6d0dc;
 
+@tagItemColor:                    #fff;
+@tagItemBackground:               #aaa;
+@tagMyItemBackground:             #ccc;
+
 // Links
 @linkColor:                       #006acc;
 @linkColorHover:                  darken(@linkColor, 10%);

From b88b408cec4450c73b948cf97d2bd765ac4680ca Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Mon, 11 Jan 2016 20:09:39 +0200
Subject: [PATCH 408/471] CRM-4822: Can't find tags which begins from special
 symbols  - Add index for tag(name, organization)

---
 src/Oro/Bundle/TagBundle/Entity/Tag.php       |  7 ++++++-
 .../Schema/OroTagBundleInstaller.php          |  3 ++-
 .../v1_7/AddTagNameOrganizationIndex.php      | 20 +++++++++++++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 src/Oro/Bundle/TagBundle/Migrations/Schema/v1_7/AddTagNameOrganizationIndex.php

diff --git a/src/Oro/Bundle/TagBundle/Entity/Tag.php b/src/Oro/Bundle/TagBundle/Entity/Tag.php
index b62c95d7baf..ce8879da21b 100644
--- a/src/Oro/Bundle/TagBundle/Entity/Tag.php
+++ b/src/Oro/Bundle/TagBundle/Entity/Tag.php
@@ -15,7 +15,12 @@
 /**
  * Tag
  *
- * @ORM\Table(name="oro_tag_tag")
+ * @ORM\Table(
+ *     name="oro_tag_tag",
+ *    indexes={
+ *        @ORM\Index(name="name_organization_idx", columns={"name", "organization_id"})
+ *    }
+ * )
  * @ORM\HasLifecycleCallbacks
  * @ORM\Entity(repositoryClass="Oro\Bundle\TagBundle\Entity\Repository\TagRepository")
  * @Config(
diff --git a/src/Oro/Bundle/TagBundle/Migrations/Schema/OroTagBundleInstaller.php b/src/Oro/Bundle/TagBundle/Migrations/Schema/OroTagBundleInstaller.php
index c6001bbc986..34bae964d8d 100644
--- a/src/Oro/Bundle/TagBundle/Migrations/Schema/OroTagBundleInstaller.php
+++ b/src/Oro/Bundle/TagBundle/Migrations/Schema/OroTagBundleInstaller.php
@@ -17,7 +17,7 @@ class OroTagBundleInstaller implements Installation
      */
     public function getMigrationVersion()
     {
-        return 'v1_6';
+        return 'v1_7';
     }
 
     /**
@@ -69,6 +69,7 @@ protected function createOroTagTagTable(Schema $schema)
         $table->addColumn('name', 'string', ['length' => 50]);
         $table->addColumn('created', 'datetime', ['comment' => '(DC2Type:datetime)']);
         $table->addColumn('updated', 'datetime', ['comment' => '(DC2Type:datetime)']);
+        $table->addIndex(['name', 'organization_id'], 'name_organization_idx', []);
         $table->addIndex(['organization_id'], 'idx_caf0db5732c8a3de', []);
         $table->setPrimaryKey(['id']);
         $table->addIndex(['user_owner_id'], 'idx_caf0db579eb185f9', []);
diff --git a/src/Oro/Bundle/TagBundle/Migrations/Schema/v1_7/AddTagNameOrganizationIndex.php b/src/Oro/Bundle/TagBundle/Migrations/Schema/v1_7/AddTagNameOrganizationIndex.php
new file mode 100644
index 00000000000..1d2715ca024
--- /dev/null
+++ b/src/Oro/Bundle/TagBundle/Migrations/Schema/v1_7/AddTagNameOrganizationIndex.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Oro\Bundle\TagBundle\Migrations\Schema\v1_7;
+
+use Doctrine\DBAL\Schema\Schema;
+
+use Oro\Bundle\MigrationBundle\Migration\Migration;
+use Oro\Bundle\MigrationBundle\Migration\QueryBag;
+
+class AddTagNameOrganizationIndex implements Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function up(Schema $schema, QueryBag $queries)
+    {
+        $table = $schema->getTable('oro_tag_tag');
+        $table->addIndex(['name', 'organization_id'], 'name_organization_idx', []);
+    }
+}

From fa8ed517c75651d912c10889d012088117d90ded Mon Sep 17 00:00:00 2001
From: Mykhailo Sulyma <msulima@magecore.com>
Date: Tue, 12 Jan 2016 13:08:29 +0200
Subject: [PATCH 409/471] BB-1940: Update grid component to reload mass actions
 button on create new shopping list  - added datagrid metadata model  - added
 js listener to change massActions attribute in metadata model  - added unit
 test for mass action extension

---
 .../Extension/Action/ActionExtension.php      |  4 +-
 .../MassAction/MassActionExtension.php        | 11 ++--
 .../Resources/config/requirejs.yml            |  1 +
 .../js/app/components/datagrid-component.js   |  3 +-
 .../Resources/public/js/datagrid/grid.js      | 18 +++---
 .../header-cell/action-header-cell.js         |  2 +-
 .../public/js/datagrid/metadata-model.js      | 18 ++++++
 .../MassAction/MassActionExtensionTest.php    | 59 +++++++++++++++++++
 8 files changed, 96 insertions(+), 20 deletions(-)
 create mode 100644 src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/metadata-model.js
 create mode 100644 src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/MassAction/MassActionExtensionTest.php

diff --git a/src/Oro/Bundle/DataGridBundle/Extension/Action/ActionExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/Action/ActionExtension.php
index 7f117733649..e4cf9e50b52 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/Action/ActionExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/Action/ActionExtension.php
@@ -100,9 +100,7 @@ public function getPriority()
      */
     public function visitMetadata(DatagridConfiguration $config, MetadataObject $data)
     {
-        $actionsMetadata = $this->getActionsMetadata($config);
-
-        $data->offsetAddToArray(static::METADATA_ACTION_KEY, $actionsMetadata);
+        $data->offsetAddToArray(static::METADATA_ACTION_KEY, $this->getActionsMetadata($config));
     }
 
     /**
diff --git a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassActionExtension.php b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassActionExtension.php
index 54c55c363ba..70d64c5fb4b 100644
--- a/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassActionExtension.php
+++ b/src/Oro/Bundle/DataGridBundle/Extension/MassAction/MassActionExtension.php
@@ -30,11 +30,12 @@ public function isApplicable(DatagridConfiguration $config)
      */
     public function visitResult(DatagridConfiguration $config, ResultsObject $result)
     {
-        $metadata = [
-            static::METADATA_ACTION_KEY => $this->getActionsMetadata($config)
-        ];
-
-        $result->offsetAddToArray('metadata', $metadata);
+        $result->offsetAddToArray(
+            'metadata',
+            [
+                static::METADATA_ACTION_KEY => $this->getActionsMetadata($config)
+            ]
+        );
     }
 
     /**
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/config/requirejs.yml b/src/Oro/Bundle/DataGridBundle/Resources/config/requirejs.yml
index 36b20c2b332..a091ec04b29 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/config/requirejs.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/config/requirejs.yml
@@ -67,6 +67,7 @@ config:
         'orodatagrid/js/datagrid/grid-views/view': 'bundles/orodatagrid/js/datagrid/grid-views/view.js'
         'orodatagrid/js/datagrid/grid-views/model': 'bundles/orodatagrid/js/datagrid/grid-views/model.js'
         'orodatagrid/js/datagrid/grid-views/collection': 'bundles/orodatagrid/js/datagrid/grid-views/collection.js'
+        'orodatagrid/js/datagrid/metadata-model': 'bundles/orodatagrid/js/datagrid/metadata-model.js'
         'orodatagrid/js/datagrid/pagination-input': 'bundles/orodatagrid/js/datagrid/pagination-input.js'
         'orodatagrid/js/datagrid/pagination': 'bundles/orodatagrid/js/datagrid/pagination.js'
         'orodatagrid/js/datagrid/row': 'bundles/orodatagrid/js/datagrid/row.js'
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
index 13c062171af..f00f29bcccb 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
@@ -291,9 +291,8 @@ define(function(require) {
          * @param {Object} actions
          * @returns {Object}
          */
-        buildMassActionsOptions: function (actions) {
+        buildMassActionsOptions: function(actions) {
             var modules = this.modules;
-
             var massActions = {};
 
             _.each(actions, function(options, action) {
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid.js
index 94b13bf49fe..b584afd00eb 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid.js
@@ -21,6 +21,7 @@ define(function(require) {
     var ExportAction = require('oro/datagrid/action/export-action');
     var PluginManager = require('oroui/js/app/plugins/plugin-manager');
     var scrollHelper = require('oroui/js/tools/scroll-helper');
+    var MetadataModel = require('orodatagrid/js/datagrid/metadata-model');
 
     /**
      * Basic grid class.
@@ -84,6 +85,9 @@ define(function(require) {
         /** @property {orodatagrid.datagrid.Toolbar} */
         toolbar: Toolbar,
 
+        /** @property {orodatagrid.datagrid.MetadataModel} */
+        metadataModel: MetadataModel,
+
         /** @property {LoadingMaskView|null} */
         loadingMask: null,
 
@@ -178,6 +182,7 @@ define(function(require) {
                 opts.rowClassName = this.rowClickActionClass + ' ' + this.rowClassName;
             }
 
+            this.metadataModel = new MetadataModel(this.metadata);
             this._initColumns(opts);
 
             this.toolbar = this._createToolbar(this.toolbarOptions);
@@ -677,7 +682,6 @@ define(function(require) {
          * @private
          */
         _afterRequest: function(jqXHR) {
-
             var json = jqXHR.responseJSON || {};
             if (json.metadata) {
                 this._processLoadedMetadata(json.metadata);
@@ -701,16 +705,12 @@ define(function(require) {
          * @private
          */
         _processLoadedMetadata: function(metadata) {
-            var meta = _.defaults(metadata, {
-                massActions: {}
-            });
-
             if (metadata.massActions) {
-                this.massActions = this.massActionsOptionsBuilder(meta.massActions);
-                this.metadata.massActions = meta.massActions;
-
-                this.trigger('metadata-change', meta);
+                this.massActions = this.massActionsOptionsBuilder(metadata.massActions);
             }
+
+            this.metadata = _.defaults(metadata, this.metadata);
+            this.metadataModel.set(this.metadata);
         },
 
         /**
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js
index bc76d882abe..4b544306e76 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js
@@ -44,7 +44,7 @@ define([
             datagrid = this.column.get('datagrid');
             this.listenTo(datagrid, 'enable', this.enable);
             this.listenTo(datagrid, 'disable', this.disable);
-            this.listenTo(datagrid, 'metadata-change', this.rebuildAndRender);
+            this.listenTo(datagrid.metadataModel, 'change:massActions', this.rebuildAndRender);
         },
 
         /**
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/metadata-model.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/metadata-model.js
new file mode 100644
index 00000000000..1e2a8167c19
--- /dev/null
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/metadata-model.js
@@ -0,0 +1,18 @@
+define(['backbone'], function(Backbone) {
+    'use strict';
+
+    var MetadataModel;
+
+    /**
+     * Datagrid metadata model
+     *
+     * @export  orodatagrid/js/datagrid/metadata-model
+     * @class   orodatagrid.datagrid.MetadataModel
+     * @extends Backbone.Model
+     */
+    MetadataModel = Backbone.Model.extend({
+        defaults: {}
+    });
+
+    return MetadataModel;
+});
diff --git a/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/MassAction/MassActionExtensionTest.php b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/MassAction/MassActionExtensionTest.php
new file mode 100644
index 00000000000..977675b98f0
--- /dev/null
+++ b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Extension/MassAction/MassActionExtensionTest.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Oro\Bundle\DataGridBundle\Tests\Unit\Extension\MassAction;
+
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\Translation\TranslatorInterface;
+
+use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
+use Oro\Bundle\DataGridBundle\Datagrid\Common\ResultsObject;
+use Oro\Bundle\DataGridBundle\Extension\MassAction\MassActionExtension;
+use Oro\Bundle\SecurityBundle\SecurityFacade;
+
+class MassActionExtensionTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var ContainerInterface */
+    protected $container;
+
+    /** @var SecurityFacade */
+    protected $securityFacade;
+
+    /** @var TranslatorInterface */
+    protected $translator;
+
+    /** @var MassActionExtension */
+    protected $extension;
+
+    protected function setUp()
+    {
+        $this->container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+
+        $this->securityFacade = $this->getMockBuilder('Oro\Bundle\SecurityBundle\SecurityFacade')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->translator = $this->getMock('Symfony\Component\Translation\TranslatorInterface');
+
+        $this->extension = new MassActionExtension($this->container, $this->securityFacade, $this->translator);
+    }
+
+    protected function tearDown()
+    {
+        unset($this->extension, $this->container, $this->securityFacade, $this->translator);
+    }
+
+    public function testIsApplicable()
+    {
+        $this->assertTrue($this->extension->isApplicable(DatagridConfiguration::create([])));
+    }
+
+    public function testVisitResult()
+    {
+        $result = ResultsObject::create([]);
+
+        $this->extension->visitResult(DatagridConfiguration::create([]), $result);
+
+        $this->assertArrayHasKey('metadata', $result);
+        $this->assertInternalType('array', $result['metadata']);
+    }
+}

From 66c70ed313185c5a626b5e96baa5575a898dcd3f Mon Sep 17 00:00:00 2001
From: Makar Sichevoy <sichevoy@gmail.com>
Date: Tue, 12 Jan 2016 13:33:27 +0200
Subject: [PATCH 410/471] CRM-4844: Search api for autocomplete of field
 Context in form

---
 .../BeforeMapObjectSearchListener.php         | 23 ++++++++++++++
 .../EmailBundle/Resources/config/search.yml   | 16 ++++++----
 .../EmailBundle/Resources/config/services.yml |  7 +++++
 .../views/Email/searchResult.html.twig        | 11 +++----
 .../Resources/views/macros.html.twig          | 13 --------
 .../BeforeMapObjectSearchListenerTest.php     | 30 +++++++++++++++++++
 6 files changed, 76 insertions(+), 24 deletions(-)
 create mode 100644 src/Oro/Bundle/EmailBundle/EventListener/BeforeMapObjectSearchListener.php
 create mode 100644 src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/BeforeMapObjectSearchListenerTest.php

diff --git a/src/Oro/Bundle/EmailBundle/EventListener/BeforeMapObjectSearchListener.php b/src/Oro/Bundle/EmailBundle/EventListener/BeforeMapObjectSearchListener.php
new file mode 100644
index 00000000000..7f6dbbc1959
--- /dev/null
+++ b/src/Oro/Bundle/EmailBundle/EventListener/BeforeMapObjectSearchListener.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Oro\Bundle\EmailBundle\EventListener;
+
+use Oro\Bundle\SearchBundle\Event\SearchMappingCollectEvent;
+
+class BeforeMapObjectSearchListener
+{
+    const EMAIL_CLASS_NAME = 'Oro\Bundle\EmailBundle\Entity\Email';
+    const EMAIL_USER_CLASS_NAME = 'Oro\Bundle\EmailBundle\Entity\EmailUser';
+
+    /**
+     * @param SearchMappingCollectEvent $event
+     */
+    public function addEntityMapTitleFieldEvent(SearchMappingCollectEvent $event)
+    {
+        $mapConfig     = $event->getMappingConfig();
+        //sets title fields for activity context name, alias set to empty for avoiding warnings and notices
+        $mapConfig[self::EMAIL_CLASS_NAME] = $mapConfig[self::EMAIL_USER_CLASS_NAME];
+        $mapConfig[self::EMAIL_CLASS_NAME]['title_fields'] = ['subject'];
+        $event->setMappingConfig($mapConfig);
+    }
+}
diff --git a/src/Oro/Bundle/EmailBundle/Resources/config/search.yml b/src/Oro/Bundle/EmailBundle/Resources/config/search.yml
index 181398e518b..1d17c7c1cbd 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/config/search.yml
+++ b/src/Oro/Bundle/EmailBundle/Resources/config/search.yml
@@ -1,14 +1,18 @@
-Oro\Bundle\EmailBundle\Entity\Email:
+Oro\Bundle\EmailBundle\Entity\EmailUser:
     alias: oro_email
     label: Emails
     search_template: OroEmailBundle:Email:searchResult.html.twig
     route:
         name: oro_email_thread_view
         parameters:
-            id: id
-    title_fields: [subject]
+            id: email.id
+    title_fields: [email.subject]
     fields:
         -
-            name: subject
-            target_type: text
-            target_fields: [subject]
+            name: email
+            relation_type: many-to-one
+            relation_fields:
+                -
+                    name: subject
+                    target_type: text
+                    target_fields: [subject]
diff --git a/src/Oro/Bundle/EmailBundle/Resources/config/services.yml b/src/Oro/Bundle/EmailBundle/Resources/config/services.yml
index 72a1db4cbb2..a69b2194b50 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/EmailBundle/Resources/config/services.yml
@@ -133,6 +133,8 @@ parameters:
     oro_email.workflow.action.strip_html_tags.class:    Oro\Bundle\EmailBundle\Model\Action\StripHtmlTags
     oro_email.workflow.action.add_activity_target.class: Oro\Bundle\EmailBundle\Model\Action\AddActivityTarget
 
+    oro_email.listener.before_map_object_search_listener.class: Oro\Bundle\EmailBundle\EventListener\BeforeMapObjectSearchListener
+
 services:
     oro_email.entity.cache.warmer:
         class: %oro_email.entity.cache.warmer.class%
@@ -948,3 +950,8 @@ services:
 
     oro_email.placeholder.send_email.filter:
         class: %oro_email.placeholder.send_email.filter.class%
+
+    oro_email.listener.before_map_object_search_listener:
+        class: %oro_email.listener.before_map_object_search_listener.class%
+        tags:
+            - { name: kernel.event_listener, event: oro_search.search_mapping_collect, method: addEntityMapTitleFieldEvent }
diff --git a/src/Oro/Bundle/EmailBundle/Resources/views/Email/searchResult.html.twig b/src/Oro/Bundle/EmailBundle/Resources/views/Email/searchResult.html.twig
index 8b92e530cb5..beb39733a54 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/views/Email/searchResult.html.twig
+++ b/src/Oro/Bundle/EmailBundle/Resources/views/Email/searchResult.html.twig
@@ -5,18 +5,19 @@
 #}
 {% extends 'OroSearchBundle:Search:searchResultItem.html.twig' %}
 
+{% import 'OroUIBundle::macros.html.twig' as UI %}
 {% import 'OroEmailBundle::macros.html.twig' as EA %}
 
 {% set iconType = 'envelope' %}
 
 {% set recordUrl = indexer_item.recordUrl %}
-{% set title = entity ? entity.subject : indexer_item.recordTitle %}
+{% set title = entity ? entity.email.subject : indexer_item.recordTitle %}
 
 {% set entityType = 'oro.email.entity_label'|trans %}
 
 {% set entityInfo = [
-    {'title': 'oro.email.sent_at.label'|trans, 'value': entity.sentAt|oro_format_datetime},
-    {'title': 'oro.email.from_name.label'|trans, 'value': EA.email_address(entity.fromEmailAddress, entity.fromName)},
-    {'title': 'oro.email.to.label'|trans, 'value': EA.recipient_email_addresses(entity.recipients('to'))},
-    {'title': 'oro.email.emailuser.owner.label'|trans, 'value': EA.entityOwnerLink(entity, false)},
+    {'title': 'oro.email.sent_at.label'|trans, 'value': entity.email.sentAt|oro_format_datetime},
+    {'title': 'oro.email.from_name.label'|trans, 'value': EA.email_address(entity.email.fromEmailAddress, entity.email.fromName)},
+    {'title': 'oro.email.to.label'|trans, 'value': EA.recipient_email_addresses(entity.email.recipients('to'))},
+    {'title': 'oro.email.emailuser.owner.label'|trans, 'value': UI.entityOwnerLink(entity, false)},
 ] %}
diff --git a/src/Oro/Bundle/EmailBundle/Resources/views/macros.html.twig b/src/Oro/Bundle/EmailBundle/Resources/views/macros.html.twig
index b9bf4f79a1e..38919a372aa 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/views/macros.html.twig
+++ b/src/Oro/Bundle/EmailBundle/Resources/views/macros.html.twig
@@ -611,16 +611,3 @@
         </div>
     </div>
 {% endmacro %}
-
-{#
-    Render link to email owners
-    Parameters:
-        email - entity record
-        renderLabel - need render default label
-#}
-{% macro entityOwnerLink(email, renderLabel = true) %}
-    {% import 'OroUIBundle::macros.html.twig' as UI %}
-    {% for entity in email.emailUsers %}
-        {{ UI.entityOwnerLink(entity, false) }}
-    {% endfor %}
-{% endmacro %}
diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/BeforeMapObjectSearchListenerTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/BeforeMapObjectSearchListenerTest.php
new file mode 100644
index 00000000000..39b2e8fec0c
--- /dev/null
+++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/BeforeMapObjectSearchListenerTest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Oro\Bundle\EmailBundle\Tests\Unit\EventListener;
+
+use Oro\Bundle\EmailBundle\EventListener\BeforeMapObjectSearchListener;
+use Oro\Bundle\SearchBundle\Event\SearchMappingCollectEvent;
+
+class BeforeMapObjectSearchListenerTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var BeforeMapObjectSearchListener */
+    protected $listener;
+
+    public function setUp()
+    {
+        $this->listener = new BeforeMapObjectSearchListener();
+    }
+
+    public function testAddEntityMapTitleFieldEvent()
+    {
+        $emailUserConfig = [BeforeMapObjectSearchListener::EMAIL_USER_CLASS_NAME => [
+            'title_fields' => ['email.subject'], 'alias' => '']
+        ];
+        $expectedConfig = $emailUserConfig;
+        $expectedConfig[BeforeMapObjectSearchListener::EMAIL_CLASS_NAME] =
+            ['title_fields' => ['subject'], 'alias' => ''];
+        $event = new SearchMappingCollectEvent($emailUserConfig);
+        $this->listener->addEntityMapTitleFieldEvent($event);
+        $this->assertEquals($expectedConfig, $event->getMappingConfig());
+    }
+}

From b102122c481bb2c247f55b89f84101ad6a977b88 Mon Sep 17 00:00:00 2001
From: Vova Soroka <vsoroka@magecore.com>
Date: Tue, 12 Jan 2016 13:41:50 +0200
Subject: [PATCH 411/471] BAP-7171: Implement assets version  for our JS files

---
 UPGRADE-1.9.md                                |   5 +
 .../Composer/AssetsVersionHandler.php         | 124 ++++++++++++
 .../Composer/ScriptHandler.php                |  82 +++++++-
 .../Composer/AssetsVersionHandlerTest.php     | 189 ++++++++++++++++++
 .../Resources/views/scripts.html.twig         |   4 +-
 .../UIBundle/Resources/config/oro/app.yml     |   4 -
 .../Resources/views/requirejs.config.js.twig  |   5 +-
 7 files changed, 404 insertions(+), 9 deletions(-)
 create mode 100644 src/Oro/Bundle/InstallerBundle/Composer/AssetsVersionHandler.php
 create mode 100644 src/Oro/Bundle/InstallerBundle/Tests/Unit/Composer/AssetsVersionHandlerTest.php

diff --git a/UPGRADE-1.9.md b/UPGRADE-1.9.md
index 2839bf78b10..b1100773708 100644
--- a/UPGRADE-1.9.md
+++ b/UPGRADE-1.9.md
@@ -271,6 +271,11 @@ after:
 - `/Resources/translations/tooltips.*.yml` deprecated since 1.9.0. Will be removed in 1.11.0. Use `/Resources/translations/messages.*.yml` instead
 
 ####UiBundle
+- Added `assets_version_strategy` parameter which can be used to automatically update `assets_version` parameter. Possible values are:
+  - null        - the assets version stays unchanged
+  - time_hash   - a hash of the current time (default strategy)
+  - incremental - the next assets version is the previous version is incremented by one (e.g. 'ver1' -> 'ver2' or '1' -> '2')
+- Removed `assets_version` global variable from TWIG. Use `asset_version` or `asset` TWIG functions instead
 - Added possibility to group tabs in dropdown for tabs panel. Added options to tabPanel function. Example: `{{ tabPanel(tabs, {useDropdown: true}) }}`
 - Added possibility to set content for specific tab. Example: `{{ tabPanel([{label: 'Tab', content: 'Tab content'}]) }}`
 - `Oro\Bundle\UIBundle\EventListener\ContentProviderListener` added to the class cache and constructor have container as performance improvement
diff --git a/src/Oro/Bundle/InstallerBundle/Composer/AssetsVersionHandler.php b/src/Oro/Bundle/InstallerBundle/Composer/AssetsVersionHandler.php
new file mode 100644
index 00000000000..a97e665c9c9
--- /dev/null
+++ b/src/Oro/Bundle/InstallerBundle/Composer/AssetsVersionHandler.php
@@ -0,0 +1,124 @@
+<?php
+
+namespace Oro\Bundle\InstallerBundle\Composer;
+
+use Composer\IO\IOInterface;
+
+class AssetsVersionHandler
+{
+    const ASSETS_VERSION          = 'assets_version';
+    const ASSETS_VERSION_STRATEGY = 'assets_version_strategy';
+
+    /** @var IOInterface */
+    protected $io;
+
+    /**
+     * @param IOInterface $io
+     */
+    public function __construct(IOInterface $io)
+    {
+        $this->io = $io;
+    }
+
+    /**
+     * @param array $parameters
+     * @param array $options
+     *
+     * @return bool
+     */
+    public function setAssetsVersion(array &$parameters, array $options)
+    {
+        $assetsVersion               = null;
+        $assetsVersionExists         = false;
+        $assetsVersionStrategy       = null;
+        $assetsVersionStrategyExists = false;
+        if (array_key_exists(self::ASSETS_VERSION, $parameters)) {
+            $assetsVersion       = $parameters[self::ASSETS_VERSION];
+            $assetsVersionExists = true;
+        }
+        if (array_key_exists(self::ASSETS_VERSION_STRATEGY, $parameters)) {
+            $assetsVersionStrategy       = $parameters[self::ASSETS_VERSION_STRATEGY];
+            $assetsVersionStrategyExists = true;
+        }
+
+        $hasChanges = false;
+        if (!$assetsVersionExists || !self::isEnvironmentVariable($options, self::ASSETS_VERSION)) {
+            $assetsVersion = self::generateAssetsVersion($assetsVersionStrategy, $assetsVersion);
+            if (!$assetsVersionExists || null !== $assetsVersion) {
+                $hasChanges = true;
+                $this->io->write(
+                    sprintf('<info>Updating the "%s" parameter</info>', self::ASSETS_VERSION)
+                );
+                $parameters[self::ASSETS_VERSION] = $assetsVersion;
+            }
+        }
+        if (!$assetsVersionStrategyExists) {
+            $hasChanges = true;
+            $this->io->write(
+                sprintf('<info>Initializing the "%s" parameter</info>', self::ASSETS_VERSION_STRATEGY)
+            );
+            $parameters[self::ASSETS_VERSION_STRATEGY] = $assetsVersionStrategy;
+        }
+
+        return $hasChanges;
+    }
+
+    /**
+     * @param array $options
+     *
+     * @return array
+     */
+    protected function getEnvironmentVariablesMap($options)
+    {
+        return isset($options['incenteev-parameters']['env-map'])
+            ? $options['incenteev-parameters']['env-map']
+            : [];
+    }
+
+    /**
+     * @param array  $options
+     * @param string $variableName
+     *
+     * @return bool
+     */
+    protected function isEnvironmentVariable($options, $variableName)
+    {
+        $envMap = self::getEnvironmentVariablesMap($options);
+
+        return array_key_exists($variableName, $envMap);
+    }
+
+    /**
+     * @param string      $strategy
+     * @param string|null $currentVersion
+     *
+     * @return string|null
+     */
+    protected function generateAssetsVersion($strategy, $currentVersion)
+    {
+        if ('time_hash' === $strategy) {
+            return substr(md5(date('c')), 0, 8);
+        }
+        if ('incremental' === $strategy) {
+            return self::incrementVersion(null !== $currentVersion ? $currentVersion : '0');
+        }
+
+        return null;
+    }
+
+    /**
+     * @param string $version
+     *
+     * @return string
+     */
+    protected function incrementVersion($version)
+    {
+        return preg_replace_callback(
+            '/^(.*?)(\d+)(.*?)$/',
+            function ($match) {
+                return $match[1] . ((int)$match[2] + 1) . $match[3];
+            },
+            $version
+        );
+    }
+}
diff --git a/src/Oro/Bundle/InstallerBundle/Composer/ScriptHandler.php b/src/Oro/Bundle/InstallerBundle/Composer/ScriptHandler.php
index 6d97d3f10e3..129ea3e10a3 100644
--- a/src/Oro/Bundle/InstallerBundle/Composer/ScriptHandler.php
+++ b/src/Oro/Bundle/InstallerBundle/Composer/ScriptHandler.php
@@ -4,6 +4,8 @@
 
 use Sensio\Bundle\DistributionBundle\Composer\ScriptHandler as SensioScriptHandler;
 use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\Yaml\Parser;
+use Symfony\Component\Yaml\Yaml;
 
 use Composer\Script\CommandEvent;
 
@@ -39,8 +41,7 @@ public static function setPermissions(CommandEvent $event)
         $webDir = isset($options['symfony-web-dir']) ?
             $options['symfony-web-dir'] : 'web';
 
-        $parametersFile = isset($options['incenteev-parameters']['file']) ?
-            $options['incenteev-parameters']['file'] : 'app/config/parameters.yml';
+        $parametersFile = self::getParametersFile($options);
 
         $directories = [
             'app/cache',
@@ -55,4 +56,81 @@ public static function setPermissions(CommandEvent $event)
             $permissionHandler->setPermissions($directory);
         }
     }
+
+    /**
+     * Sets the global assets version
+     *
+     * @param CommandEvent $event A instance
+     */
+    public static function setAssetsVersion(CommandEvent $event)
+    {
+        $options = self::getOptions($event);
+
+        $parametersFile = self::getParametersFile($options);
+        if (is_file($parametersFile) && is_writable($parametersFile)) {
+            $values               = self::loadParametersFile($parametersFile);
+            $parametersKey        = self::getParametersKey($options);
+            $assetsVersionHandler = new AssetsVersionHandler($event->getIO());
+            if (isset($values[$parametersKey])
+                && $assetsVersionHandler->setAssetsVersion($values[$parametersKey], $options)
+            ) {
+                self::saveParametersFile($parametersFile, $values);
+            }
+        } else {
+            $event->getIO()->write(
+                sprintf(
+                    '<comment>Cannot set assets version because "%s" file does not exist or not writable</comment>',
+                    $parametersFile
+                )
+            );
+        }
+    }
+
+    /**
+     * @param string $parametersFile
+     *
+     * @return array
+     */
+    protected static function loadParametersFile($parametersFile)
+    {
+        $yamlParser = new Parser();
+
+        return $yamlParser->parse(file_get_contents($parametersFile));
+    }
+
+    /**
+     * @param string $parametersFile
+     * @param array  $values
+     */
+    protected static function saveParametersFile($parametersFile, array $values)
+    {
+        file_put_contents(
+            $parametersFile,
+            "# This file is auto-generated during the composer install\n" . Yaml::dump($values, 99)
+        );
+    }
+
+    /**
+     * @param array $options
+     *
+     * @return string
+     */
+    protected static function getParametersFile($options)
+    {
+        return isset($options['incenteev-parameters']['file'])
+            ? $options['incenteev-parameters']['file']
+            : 'app/config/parameters.yml';
+    }
+
+    /**
+     * @param array $options
+     *
+     * @return string
+     */
+    protected static function getParametersKey($options)
+    {
+        return isset($options['incenteev-parameters']['parameter-key'])
+            ? $options['incenteev-parameters']['parameter-key']
+            : 'parameters';
+    }
 }
diff --git a/src/Oro/Bundle/InstallerBundle/Tests/Unit/Composer/AssetsVersionHandlerTest.php b/src/Oro/Bundle/InstallerBundle/Tests/Unit/Composer/AssetsVersionHandlerTest.php
new file mode 100644
index 00000000000..c00280c0e48
--- /dev/null
+++ b/src/Oro/Bundle/InstallerBundle/Tests/Unit/Composer/AssetsVersionHandlerTest.php
@@ -0,0 +1,189 @@
+<?php
+
+namespace Oro\Bundle\InstallerBundle\Tests\Unit\Composer;
+
+use Oro\Bundle\InstallerBundle\Composer\AssetsVersionHandler;
+
+class AssetsVersionHandlerTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider setAssetsVersionProvider
+     */
+    public function testSetAssetsVersion(
+        array $parameters,
+        array $options,
+        array $expectedParameters,
+        $isAssetsVersionChanged,
+        $isAssetsVersionStrategyChanged
+    ) {
+        $io = $this->getMock('Composer\IO\IOInterface');
+
+        $writeIndex = 0;
+        if ($isAssetsVersionChanged) {
+            $io->expects($this->at($writeIndex))
+                ->method('write')
+                ->with('<info>Updating the "assets_version" parameter</info>');
+            $writeIndex++;
+        }
+        if ($isAssetsVersionStrategyChanged) {
+            $io->expects($this->at($writeIndex))
+                ->method('write')
+                ->with('<info>Initializing the "assets_version_strategy" parameter</info>');
+        }
+
+        $handler        = new AssetsVersionHandler($io);
+        $result         = $handler->setAssetsVersion($parameters, $options);
+        $expectedResult = $isAssetsVersionChanged || $isAssetsVersionStrategyChanged;
+
+        // set expected assets_version for the time_hash strategy
+        // we cannot set it in the data provider because this value depends on the current time
+        if (isset($expectedParameters['assets_version_strategy'])
+            && 'time_hash' === $expectedParameters['assets_version_strategy']
+            && isset($parameters['assets_version'])
+            && 8 === strlen($parameters['assets_version'])
+        ) {
+            $expectedParameters['assets_version'] = $parameters['assets_version'];
+        }
+
+        $this->assertEquals($expectedResult, $result);
+        $this->assertEquals($expectedParameters, $parameters);
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function setAssetsVersionProvider()
+    {
+        return [
+            'empty'                                                          => [
+                'parameters'                     => [],
+                'options'                        => [],
+                'expectedParameters'             => [
+                    'assets_version'          => null,
+                    'assets_version_strategy' => null
+                ],
+                'isAssetsVersionChanged'         => true,
+                'isAssetsVersionStrategyChanged' => true
+            ],
+            'no assets_version'                                              => [
+                'parameters'                     => [
+                    'assets_version_strategy' => 'incremental'
+                ],
+                'options'                        => [],
+                'expectedParameters'             => [
+                    'assets_version'          => '1',
+                    'assets_version_strategy' => 'incremental'
+                ],
+                'isAssetsVersionChanged'         => true,
+                'isAssetsVersionStrategyChanged' => false
+            ],
+            'no assets_version_strategy'                                     => [
+                'parameters'                     => [
+                    'assets_version' => 'v10'
+                ],
+                'options'                        => [],
+                'expectedParameters'             => [
+                    'assets_version'          => 'v10',
+                    'assets_version_strategy' => null
+                ],
+                'isAssetsVersionChanged'         => false,
+                'isAssetsVersionStrategyChanged' => true
+            ],
+            'time_hash assets_version_strategy, no assets_version'           => [
+                'parameters'                     => [
+                    'assets_version_strategy' => 'time_hash'
+                ],
+                'options'                        => [],
+                'expectedParameters'             => [
+                    'assets_version'          => null, // will be set in testSetAssetsVersion
+                    'assets_version_strategy' => 'time_hash'
+                ],
+                'isAssetsVersionChanged'         => true,
+                'isAssetsVersionStrategyChanged' => false
+            ],
+            'time_hash assets_version_strategy, no initial assets_version'   => [
+                'parameters'                     => [
+                    'assets_version'          => null,
+                    'assets_version_strategy' => 'time_hash'
+                ],
+                'options'                        => [],
+                'expectedParameters'             => [
+                    'assets_version'          => null, // will be set in testSetAssetsVersion
+                    'assets_version_strategy' => 'time_hash'
+                ],
+                'isAssetsVersionChanged'         => true,
+                'isAssetsVersionStrategyChanged' => false
+            ],
+            'time_hash assets_version_strategy'                              => [
+                'parameters'                     => [
+                    'assets_version'          => '12345678',
+                    'assets_version_strategy' => 'time_hash'
+                ],
+                'options'                        => [],
+                'expectedParameters'             => [
+                    'assets_version'          => null, // will be set in testSetAssetsVersion
+                    'assets_version_strategy' => 'time_hash'
+                ],
+                'isAssetsVersionChanged'         => true,
+                'isAssetsVersionStrategyChanged' => false
+            ],
+            'incremental assets_version_strategy, no assets_version'         => [
+                'parameters'                     => [
+                    'assets_version_strategy' => 'incremental'
+                ],
+                'options'                        => [],
+                'expectedParameters'             => [
+                    'assets_version'          => '1',
+                    'assets_version_strategy' => 'incremental'
+                ],
+                'isAssetsVersionChanged'         => true,
+                'isAssetsVersionStrategyChanged' => false
+            ],
+            'incremental assets_version_strategy, no initial assets_version' => [
+                'parameters'                     => [
+                    'assets_version'          => null,
+                    'assets_version_strategy' => 'incremental'
+                ],
+                'options'                        => [],
+                'expectedParameters'             => [
+                    'assets_version'          => '1',
+                    'assets_version_strategy' => 'incremental'
+                ],
+                'isAssetsVersionChanged'         => true,
+                'isAssetsVersionStrategyChanged' => false
+            ],
+            'incremental assets_version_strategy'                            => [
+                'parameters'                     => [
+                    'assets_version'          => 'ver10',
+                    'assets_version_strategy' => 'incremental'
+                ],
+                'options'                        => [],
+                'expectedParameters'             => [
+                    'assets_version'          => 'ver11',
+                    'assets_version_strategy' => 'incremental'
+                ],
+                'isAssetsVersionChanged'         => true,
+                'isAssetsVersionStrategyChanged' => false
+            ],
+            'assets_version as environment variable'                         => [
+                'parameters'                     => [
+                    'assets_version'          => 'ver10',
+                    'assets_version_strategy' => 'incremental'
+                ],
+                'options'                        => [
+                    'incenteev-parameters' => [
+                        'env-map' => [
+                            'assets_version' => 'ASSETS_VERSION'
+                        ]
+                    ]
+                ],
+                'expectedParameters'             => [
+                    'assets_version'          => 'ver10',
+                    'assets_version_strategy' => 'incremental'
+                ],
+                'isAssetsVersionChanged'         => false,
+                'isAssetsVersionStrategyChanged' => false
+            ],
+        ];
+    }
+}
diff --git a/src/Oro/Bundle/RequireJSBundle/Resources/views/scripts.html.twig b/src/Oro/Bundle/RequireJSBundle/Resources/views/scripts.html.twig
index dbe84f3c940..8fb691f5b16 100644
--- a/src/Oro/Bundle/RequireJSBundle/Resources/views/scripts.html.twig
+++ b/src/Oro/Bundle/RequireJSBundle/Resources/views/scripts.html.twig
@@ -1,7 +1,9 @@
 {% set compressed = compressed is defined ? compressed : true %}
+{% set baseAssetParts = asset('bundles')|split('?', 2) %}
 {% set config_extend %}
     require({
-        baseUrl: {{ asset('bundles')|split('?', 2)[0]|json_encode|raw }}
+        baseUrl: {{ baseAssetParts[0]|json_encode|raw }},
+        urlArgs: '{{ baseAssetParts[1] is defined ? baseAssetParts[1] : '' }}'
     });
     {{ config_extend|default('') }}
 {% endset %}
diff --git a/src/Oro/Bundle/UIBundle/Resources/config/oro/app.yml b/src/Oro/Bundle/UIBundle/Resources/config/oro/app.yml
index 91fa55ef02e..c5a2693e6fe 100644
--- a/src/Oro/Bundle/UIBundle/Resources/config/oro/app.yml
+++ b/src/Oro/Bundle/UIBundle/Resources/config/oro/app.yml
@@ -11,10 +11,6 @@ liip_imagine:
                 thumbnail:    { size: [16, 16], mode: outbound }
                 strip:        ~
 
-twig:
-    globals:
-        assets_version:       "%assets_version%"
-
 assetic:
     assets:
         jstree:
diff --git a/src/Oro/Bundle/UIBundle/Resources/views/requirejs.config.js.twig b/src/Oro/Bundle/UIBundle/Resources/views/requirejs.config.js.twig
index dbb0f7bf72c..81a6eb79424 100644
--- a/src/Oro/Bundle/UIBundle/Resources/views/requirejs.config.js.twig
+++ b/src/Oro/Bundle/UIBundle/Resources/views/requirejs.config.js.twig
@@ -2,9 +2,10 @@
 {%- if app.user -%}
     {%- set userName = app.user.username -%}
 {%- endif -%}
-{%- if  assets_version -%}
+{%- set baseAssetParts = asset('bundles')|split('?', 2) -%}
+{%- if baseAssetParts[1] is defined -%}
 require({
-    urlArgs: 'version={{ assets_version|escape('url') }}'
+    urlArgs: '{{ baseAssetParts[1] }}'
 });
 {%- endif -%}
 require({

From 8eb0dc9df532bb3fc8d35d853209f02dc5fd39b9 Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Tue, 12 Jan 2016 14:16:01 +0200
Subject: [PATCH 412/471] CRM-4870: small UI fixes

---
 src/Oro/Bundle/TagBundle/Resources/public/css/form.less         | 2 +-
 .../Bundle/TagBundle/Resources/public/css/tags-container.less   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/TagBundle/Resources/public/css/form.less b/src/Oro/Bundle/TagBundle/Resources/public/css/form.less
index 024625a7cb6..b769ba9238c 100644
--- a/src/Oro/Bundle/TagBundle/Resources/public/css/form.less
+++ b/src/Oro/Bundle/TagBundle/Resources/public/css/form.less
@@ -1,5 +1,5 @@
 .tags-view-form-container {
-  margin-top: -5px;
+  margin-top: -4px;
   margin-left: -2px;
   min-height: 27px;
   .inline-editable-wrapper {
diff --git a/src/Oro/Bundle/TagBundle/Resources/public/css/tags-container.less b/src/Oro/Bundle/TagBundle/Resources/public/css/tags-container.less
index 71424053e9b..53d1d767eed 100644
--- a/src/Oro/Bundle/TagBundle/Resources/public/css/tags-container.less
+++ b/src/Oro/Bundle/TagBundle/Resources/public/css/tags-container.less
@@ -17,7 +17,7 @@
   padding: 1px 8px;
   display: inline-block;
   vertical-align: baseline;
-  &:hover {
+  &:hover, &:focus {
     color: @tagItemColor;
   }
 }

From c7deb3bc68f87046d2e2afa39e54ce15f0ce083c Mon Sep 17 00:00:00 2001
From: Mykhailo Sulyma <msulima@magecore.com>
Date: Tue, 12 Jan 2016 14:55:04 +0200
Subject: [PATCH 413/471] BB-1940: Update grid component to reload mass actions
 button on create new shopping list  - refactor using datagrid metadata model

---
 .../js/app/components/datagrid-component.js   | 26 ++++++-----------
 .../Resources/public/js/datagrid/grid.js      |  5 ----
 .../public/js/datagrid/metadata-model.js      | 29 +++++++++++++++++--
 3 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
index f00f29bcccb..985e5c57a6c 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
@@ -16,6 +16,7 @@ define(function(require) {
     var FloatingHeaderPlugin = require('orodatagrid/js/app/plugins/grid/floating-header-plugin');
     var FullscreenPlugin = require('orodatagrid/js/app/plugins/grid/fullscreen-plugin');
     var ColumnManagerPlugin = require('orodatagrid/js/app/plugins/grid/column-manager-plugin');
+    var MetadataModel = require('orodatagrid/js/datagrid/metadata-model');
 
     helpers = {
         cellType: function(type) {
@@ -255,8 +256,14 @@ define(function(require) {
                 rowActions[action] = modules[helpers.actionType(options.frontend_type)].extend(options);
             });
 
+            var metadataModel = new MetadataModel(this.metadata);
+
             // mass actions
-            massActions = this.buildMassActionsOptions(metadata.massActions);
+            massActions = metadataModel.getMassActionsOptions(modules);
+
+            this.listenTo(metadataModel, 'change:massActions', _.bind(function(model) {
+                this.grid.massActions = model.getMassActionsOptions(modules);
+            }, this), 100);
 
             if (tools.isMobile()) {
                 plugins.push(FloatingHeaderPlugin);
@@ -275,7 +282,6 @@ define(function(require) {
                 columns: columns,
                 rowActions: rowActions,
                 massActions: massActions,
-                massActionsOptionsBuilder: _.bind(this.buildMassActionsOptions, this),
                 toolbarOptions: metadata.options.toolbarOptions || {},
                 multipleSorting: metadata.options.multipleSorting || false,
                 entityHint: metadata.options.entityHint,
@@ -283,25 +289,11 @@ define(function(require) {
                 routerEnabled: _.isUndefined(metadata.options.routerEnabled) ? true : metadata.options.routerEnabled,
                 multiSelectRowEnabled: metadata.options.multiSelectRowEnabled || !_.isEmpty(massActions),
                 metadata: this.metadata,
+                metadataModel: metadataModel,
                 plugins: plugins
             };
         },
 
-        /**
-         * @param {Object} actions
-         * @returns {Object}
-         */
-        buildMassActionsOptions: function(actions) {
-            var modules = this.modules;
-            var massActions = {};
-
-            _.each(actions, function(options, action) {
-                massActions[action] = modules[helpers.actionType(options.frontend_type)].extend(options);
-            });
-
-            return massActions;
-        },
-
         fixStates: function(options) {
             if (options.metadata) {
                 this.fixState(options.metadata.state);
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid.js
index b584afd00eb..12bd6c48359 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid.js
@@ -182,7 +182,6 @@ define(function(require) {
                 opts.rowClassName = this.rowClickActionClass + ' ' + this.rowClassName;
             }
 
-            this.metadataModel = new MetadataModel(this.metadata);
             this._initColumns(opts);
 
             this.toolbar = this._createToolbar(this.toolbarOptions);
@@ -705,10 +704,6 @@ define(function(require) {
          * @private
          */
         _processLoadedMetadata: function(metadata) {
-            if (metadata.massActions) {
-                this.massActions = this.massActionsOptionsBuilder(metadata.massActions);
-            }
-
             this.metadata = _.defaults(metadata, this.metadata);
             this.metadataModel.set(this.metadata);
         },
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/metadata-model.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/metadata-model.js
index 1e2a8167c19..a4bd9b2d92e 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/metadata-model.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/metadata-model.js
@@ -1,7 +1,12 @@
-define(['backbone'], function(Backbone) {
+define(['backbone', 'underscore'], function(Backbone, _) {
     'use strict';
 
     var MetadataModel;
+    var helpers = {
+        actionType: function(type) {
+            return type + 'Action';
+        }
+    };
 
     /**
      * Datagrid metadata model
@@ -11,7 +16,27 @@ define(['backbone'], function(Backbone) {
      * @extends Backbone.Model
      */
     MetadataModel = Backbone.Model.extend({
-        defaults: {}
+        defaults: {
+            columns: [],
+            options: {},
+            state: {},
+            initialState: {},
+            rowActions: {},
+            massActions: {}
+        },
+
+        /**
+         * @returns {Object}
+         */
+        getMassActionsOptions: function(modules) {
+            var massActions = {};
+
+            _.each(this.get('massActions'), function(options, action) {
+                massActions[action] = modules[helpers.actionType(options.frontend_type)].extend(options);
+            });
+
+            return massActions;
+        }
     });
 
     return MetadataModel;

From 02c503511a1eb61f2abff7c52c39e7e8aecc6ec4 Mon Sep 17 00:00:00 2001
From: Denis Voronin <dvoronin@magecore.com>
Date: Tue, 12 Jan 2016 15:15:28 +0200
Subject: [PATCH 414/471] CRM-4822: Can't find tags which begins from special
 symbols

---
 .../TagBundle/Autocomplete/SearchHandler.php  | 30 ++++++++++++++++---
 .../TagBundle/Resources/config/form.yml       |  1 +
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/Oro/Bundle/TagBundle/Autocomplete/SearchHandler.php b/src/Oro/Bundle/TagBundle/Autocomplete/SearchHandler.php
index f796bd707c0..d1a1042d59b 100644
--- a/src/Oro/Bundle/TagBundle/Autocomplete/SearchHandler.php
+++ b/src/Oro/Bundle/TagBundle/Autocomplete/SearchHandler.php
@@ -3,9 +3,25 @@
 namespace Oro\Bundle\TagBundle\Autocomplete;
 
 use Oro\Bundle\FormBundle\Autocomplete\SearchHandler as BaseSearchHandler;
+use Oro\Bundle\SecurityBundle\SecurityFacade;
 
 class SearchHandler extends BaseSearchHandler
 {
+    /** @var SecurityFacade */
+    protected $securityFacade;
+
+    /**
+     * @param string         $entityName
+     * @param array          $properties
+     * @param SecurityFacade $securityFacade
+     */
+    public function __construct($entityName, array $properties, SecurityFacade $securityFacade)
+    {
+        parent::__construct($entityName, $properties);
+
+        $this->securityFacade = $securityFacade;
+    }
+
     /**
      * @param string $search
      * @param int    $firstResult
@@ -20,10 +36,16 @@ protected function searchIds($search, $firstResult, $maxResults)
         // http://dev.mysql.com/doc/refman/5.0/en/server-system-variables.html#sysvar_ft_min_word_len
         // http://dev.mysql.com/doc/refman/5.0/en/fulltext-stopwords.html
         // http://www.postgresql.org/docs/9.1/static/textsearch-dictionaries.html
-        if (empty($ids)) {
-            $object = $this->entityRepository->findOneBy(['name' => $search]);
-            if ($object !== null) {
-                $ids[] = $object->getId();
+        $object = $this->entityRepository->findOneBy(
+            [
+                'name'         => $search,
+                'organization' => $this->securityFacade->getOrganization()
+            ]
+        );
+        if ($object !== null) {
+            $id = $object->getId();
+            if (!in_array($id, $ids, true)) {
+                $ids[] = $id;
             }
         }
 
diff --git a/src/Oro/Bundle/TagBundle/Resources/config/form.yml b/src/Oro/Bundle/TagBundle/Resources/config/form.yml
index a4fed51bad5..a3c33492f83 100644
--- a/src/Oro/Bundle/TagBundle/Resources/config/form.yml
+++ b/src/Oro/Bundle/TagBundle/Resources/config/form.yml
@@ -81,6 +81,7 @@ services:
         arguments:
             - %oro_tag.tag.entity.class%
             - ["name"]
+            - @oro_security.security_facade
         tags:
             - { name: oro_form.autocomplete.search_handler, alias: tags, acl_resource: oro_tag_assign_unassign }
 

From 79fd7f0b0f204cf281f92d505dd33a4f3e2eccac Mon Sep 17 00:00:00 2001
From: Mykhailo Sulyma <msulima@magecore.com>
Date: Tue, 12 Jan 2016 16:52:06 +0200
Subject: [PATCH 415/471] BB-1940: Update grid component to reload mass actions
 button on create new shopping list  - create mass action collection  -
 trigger collection reset event on massActions change  - rerender mass action
 button on collection reset

---
 .../js/app/components/datagrid-component.js   | 36 ++++++++++++++-----
 .../header-cell/action-header-cell.js         | 20 ++++++-----
 .../public/js/datagrid/metadata-model.js      | 20 +----------
 3 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
index 985e5c57a6c..344868788e7 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
@@ -7,6 +7,7 @@ define(function(require) {
     var _ = require('underscore');
     var tools = require('oroui/js/tools');
     var mediator = require('oroui/js/mediator');
+    var Backbone = require('backbone');
     var BaseComponent = require('oroui/js/app/components/base/component');
     var PageableCollection = require('orodatagrid/js/pageable-collection');
     var Grid = require('orodatagrid/js/datagrid/grid');
@@ -113,12 +114,17 @@ define(function(require) {
                 rowActions: {},
                 massActions: {}
             });
+            this.metadataModel = new MetadataModel(this.metadata);
             this.modules = {};
 
             this.collectModules();
 
             // load all dependencies and build grid
             tools.loadModules(this.modules, this.build, this);
+
+            this.listenTo(this.metadataModel, 'change:massActions', function(model, massActions) {
+                this.grid.massActions.reset(this.buildMassActionsOptions(massActions).toArray());
+            }, this);
         },
 
         /**
@@ -256,14 +262,8 @@ define(function(require) {
                 rowActions[action] = modules[helpers.actionType(options.frontend_type)].extend(options);
             });
 
-            var metadataModel = new MetadataModel(this.metadata);
-
             // mass actions
-            massActions = metadataModel.getMassActionsOptions(modules);
-
-            this.listenTo(metadataModel, 'change:massActions', _.bind(function(model) {
-                this.grid.massActions = model.getMassActionsOptions(modules);
-            }, this), 100);
+            massActions = this.buildMassActionsOptions(this.metadata.massActions);
 
             if (tools.isMobile()) {
                 plugins.push(FloatingHeaderPlugin);
@@ -287,13 +287,31 @@ define(function(require) {
                 entityHint: metadata.options.entityHint,
                 exportOptions: metadata.options.export || {},
                 routerEnabled: _.isUndefined(metadata.options.routerEnabled) ? true : metadata.options.routerEnabled,
-                multiSelectRowEnabled: metadata.options.multiSelectRowEnabled || !_.isEmpty(massActions),
+                multiSelectRowEnabled: metadata.options.multiSelectRowEnabled || massActions.length,
                 metadata: this.metadata,
-                metadataModel: metadataModel,
+                metadataModel: this.metadataModel,
                 plugins: plugins
             };
         },
 
+        /**
+         * @param {Object} actions
+         * @returns {Object}
+         */
+        buildMassActionsOptions: function(actions) {
+            var modules = this.modules;
+            var massActions = [];
+
+            _.each(actions, function(options, action) {
+                massActions.push({
+                    action: action,
+                    module: modules[helpers.actionType(options.frontend_type)].extend(options)
+                });
+            });
+
+            return new Backbone.Collection(massActions);
+        },
+
         fixStates: function(options) {
             if (options.metadata) {
                 this.fixState(options.metadata.state);
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js
index 4b544306e76..4452711fec4 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js
@@ -44,7 +44,7 @@ define([
             datagrid = this.column.get('datagrid');
             this.listenTo(datagrid, 'enable', this.enable);
             this.listenTo(datagrid, 'disable', this.disable);
-            this.listenTo(datagrid.metadataModel, 'change:massActions', this.rebuildAndRender);
+            this.listenTo(datagrid.massActions, 'reset', this.rebuildAndRender);
         },
 
         /**
@@ -63,11 +63,14 @@ define([
             var actions = [];
             var datagrid = this.column.get('datagrid');
 
-            _.each(this.column.get('massActions'), function(Action) {
-                var action = new Action({
-                    datagrid: datagrid
-                });
-                actions.push(action);
+            this.column.get('massActions').each(function(Action) {
+                var ActionModule = Action.get('module');
+
+                actions.push(
+                    new ActionModule({
+                        datagrid: datagrid
+                    })
+                );
             });
 
             this.actionsPanel = new ActionsPanel();
@@ -91,9 +94,8 @@ define([
             return this;
         },
 
-        rebuildAndRender: function() {
-            var datagrid = this.column.get('datagrid');
-            this.column.set('massActions', datagrid.massActions);
+        rebuildAndRender: function(massActions) {
+            this.column.set('massActions', massActions);
 
             this.buildActionsPanel();
             this.render();
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/metadata-model.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/metadata-model.js
index a4bd9b2d92e..7b7b88625b9 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/metadata-model.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/metadata-model.js
@@ -1,12 +1,7 @@
-define(['backbone', 'underscore'], function(Backbone, _) {
+define(['backbone'], function(Backbone) {
     'use strict';
 
     var MetadataModel;
-    var helpers = {
-        actionType: function(type) {
-            return type + 'Action';
-        }
-    };
 
     /**
      * Datagrid metadata model
@@ -23,19 +18,6 @@ define(['backbone', 'underscore'], function(Backbone, _) {
             initialState: {},
             rowActions: {},
             massActions: {}
-        },
-
-        /**
-         * @returns {Object}
-         */
-        getMassActionsOptions: function(modules) {
-            var massActions = {};
-
-            _.each(this.get('massActions'), function(options, action) {
-                massActions[action] = modules[helpers.actionType(options.frontend_type)].extend(options);
-            });
-
-            return massActions;
         }
     });
 

From 830d35dec0a1372a3318c8bc6b8b254c8361192a Mon Sep 17 00:00:00 2001
From: Mykhailo Sulyma <msulima@magecore.com>
Date: Tue, 12 Jan 2016 16:58:50 +0200
Subject: [PATCH 416/471] BB-1940: Update grid component to reload mass actions
 button on create new shopping list  - switch all components to use mass
 action collection

---
 .../public/js/app/components/datagrid-component.js         | 3 +--
 .../Resources/public/js/datagrid/column/action-column.js   | 7 ++++---
 .../DataGridBundle/Resources/public/js/datagrid/grid.js    | 5 +++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
index 344868788e7..1ca9573bb7e 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
@@ -235,7 +235,6 @@ define(function(require) {
         combineGridOptions: function() {
             var columns;
             var rowActions = {};
-            var massActions = {};
             var defaultOptions = {
                 sortable: false
             };
@@ -263,7 +262,7 @@ define(function(require) {
             });
 
             // mass actions
-            massActions = this.buildMassActionsOptions(this.metadata.massActions);
+            var massActions = this.buildMassActionsOptions(this.metadata.massActions);
 
             if (tools.isMobile()) {
                 plugins.push(FloatingHeaderPlugin);
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/column/action-column.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/column/action-column.js
index 4eb3b479aaf..9ecaa01c2fc 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/column/action-column.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/column/action-column.js
@@ -1,9 +1,10 @@
 define([
+    'backbone',
     'underscore',
     'backgrid',
     'oro/datagrid/cell/action-cell',
     '../header-cell/action-header-cell'
-], function(_, Backgrid, ActionCell, ActionHeaderCell) {
+], function(Backbone, _, Backgrid, ActionCell, ActionHeaderCell) {
     'use strict';
 
     var ActionColumn;
@@ -26,7 +27,7 @@ define([
             headerCell: ActionHeaderCell,
             datagrid: null,
             actions: [],
-            massActions: []
+            massActions: new Backbone.Collection()
         }, Backgrid.Column.prototype.defaults),
 
         /**
@@ -40,7 +41,7 @@ define([
             if (!attrs.name) {
                 attrs.name = this.defaults.name;
             }
-            if (_.isEmpty(attrs.actions) && _.isEmpty(attrs.massActions)) {
+            if (_.isEmpty(attrs.actions) && attrs.massActions.length) {
                 this.set('renderable', false);
             }
             ActionColumn.__super__.initialize.apply(this, arguments);
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid.js
index 12bd6c48359..45362000b74 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid.js
@@ -4,6 +4,7 @@ define(function(require) {
     var Grid;
     var $ = require('jquery');
     var _ = require('underscore');
+    var Backbone = require('backbone');
     var Backgrid = require('backgrid');
     var __ = require('orotranslation/js/translator');
     var mediator = require('oroui/js/mediator');
@@ -112,7 +113,7 @@ define(function(require) {
             rowClickAction:         undefined,
             multipleSorting:        true,
             rowActions:             [],
-            massActions:            [],
+            massActions:            new Backbone.Collection(),
             enableFullScreenLayout: false
         },
 
@@ -133,7 +134,7 @@ define(function(require) {
          * @param {Object} [options.toolbarOptions] Options for toolbar
          * @param {Object} [options.exportOptions] Options for export
          * @param {Array<oro.datagrid.action.AbstractAction>} [options.rowActions] Array of row actions prototypes
-         * @param {Array<oro.datagrid.action.AbstractAction>} [options.massActions] Array of mass actions prototypes
+         * @param {Backbone.Collection<oro.datagrid.action.AbstractAction>} [options.massActions] Collection of mass actions prototypes
          * @param {Boolean} [options.multiSelectRowEnabled] Option for enabling multi select row
          * @param {oro.datagrid.action.AbstractAction} [options.rowClickAction] Prototype for
          *  action that handles row click

From e08d385f73389d1adba7664d0f3e704cb6164e1c Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Tue, 12 Jan 2016 17:12:18 +0200
Subject: [PATCH 417/471] CRM-4890: fix UI dialog form elements on mobile

---
 src/Oro/Bundle/FormBundle/Resources/config/assets.yml     | 3 +--
 .../Bundle/FormBundle/Resources/public/css/less/form.less | 2 --
 .../public/css/{ => less}/inline-editable-wrapper.less    | 0
 .../Resources/public/css/less/inline-editing.less         | 1 -
 .../Bundle/FormBundle/Resources/public/css/less/main.less | 6 ++++++
 .../FormBundle/Resources/public/css/less/mobile/main.less | 6 ++++++
 .../ReminderBundle/Resources/public/less/mobile/main.less | 8 ++++++++
 .../ReminderBundle/Resources/public/less/style.less       | 2 ++
 .../UIBundle/Resources/public/css/less/mobile/form.less   | 1 +
 9 files changed, 24 insertions(+), 5 deletions(-)
 rename src/Oro/Bundle/FormBundle/Resources/public/css/{ => less}/inline-editable-wrapper.less (100%)
 create mode 100644 src/Oro/Bundle/FormBundle/Resources/public/css/less/main.less
 create mode 100644 src/Oro/Bundle/FormBundle/Resources/public/css/less/mobile/main.less
 create mode 100644 src/Oro/Bundle/ReminderBundle/Resources/public/less/mobile/main.less

diff --git a/src/Oro/Bundle/FormBundle/Resources/config/assets.yml b/src/Oro/Bundle/FormBundle/Resources/config/assets.yml
index 72eb2e5b54e..e200a664609 100644
--- a/src/Oro/Bundle/FormBundle/Resources/config/assets.yml
+++ b/src/Oro/Bundle/FormBundle/Resources/config/assets.yml
@@ -1,4 +1,3 @@
 css:
     'oroconfig':
-      - 'bundles/oroform/css/less/form.less'
-      - 'bundles/oroform/css/inline-editable-wrapper.less'
+      - 'bundles/oroform/css/less/main.less'
diff --git a/src/Oro/Bundle/FormBundle/Resources/public/css/less/form.less b/src/Oro/Bundle/FormBundle/Resources/public/css/less/form.less
index 18fcc0fe31c..d434f884859 100644
--- a/src/Oro/Bundle/FormBundle/Resources/public/css/less/form.less
+++ b/src/Oro/Bundle/FormBundle/Resources/public/css/less/form.less
@@ -1,5 +1,3 @@
-@import "oroui/css/less/mixins";
-@import "./inline-editing";
 .mce-tinymce {
   &.mce-panel{
     border:1px solid #ccc;
diff --git a/src/Oro/Bundle/FormBundle/Resources/public/css/inline-editable-wrapper.less b/src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editable-wrapper.less
similarity index 100%
rename from src/Oro/Bundle/FormBundle/Resources/public/css/inline-editable-wrapper.less
rename to src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editable-wrapper.less
diff --git a/src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editing.less b/src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editing.less
index 75df439497c..fece478b866 100644
--- a/src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editing.less
+++ b/src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editing.less
@@ -1,4 +1,3 @@
-@import "./multi-checkbox-editor";
 .oro-datagrid.grid-editable .grid {
   .number-cell, .integer-cell, .align-right, .editable {
     padding-right: 28px;
diff --git a/src/Oro/Bundle/FormBundle/Resources/public/css/less/main.less b/src/Oro/Bundle/FormBundle/Resources/public/css/less/main.less
new file mode 100644
index 00000000000..3eaceb872a6
--- /dev/null
+++ b/src/Oro/Bundle/FormBundle/Resources/public/css/less/main.less
@@ -0,0 +1,6 @@
+@import "oroui/css/less/mixins";
+@import "./multi-checkbox-editor";
+@import "./inline-editing";
+@import "./form";
+@import "./inline-editable-wrapper";
+@import "./mobile/main";
diff --git a/src/Oro/Bundle/FormBundle/Resources/public/css/less/mobile/main.less b/src/Oro/Bundle/FormBundle/Resources/public/css/less/mobile/main.less
new file mode 100644
index 00000000000..8f5791d5206
--- /dev/null
+++ b/src/Oro/Bundle/FormBundle/Resources/public/css/less/mobile/main.less
@@ -0,0 +1,6 @@
+.mobile-version {
+  fieldset .span6{
+    margin-left: 0;
+    margin-right: 10px;
+  }
+}
diff --git a/src/Oro/Bundle/ReminderBundle/Resources/public/less/mobile/main.less b/src/Oro/Bundle/ReminderBundle/Resources/public/less/mobile/main.less
new file mode 100644
index 00000000000..190650f2ca4
--- /dev/null
+++ b/src/Oro/Bundle/ReminderBundle/Resources/public/less/mobile/main.less
@@ -0,0 +1,8 @@
+.mobile-version {
+  .reminders-collection, .ui-dialog .form-horizontal .control-group .controls .reminders-collection {
+    input.number {
+      height: 30px;
+      width: 40px !important;
+    }
+  }
+}
diff --git a/src/Oro/Bundle/ReminderBundle/Resources/public/less/style.less b/src/Oro/Bundle/ReminderBundle/Resources/public/less/style.less
index 0a941810610..3dbeb53377f 100644
--- a/src/Oro/Bundle/ReminderBundle/Resources/public/less/style.less
+++ b/src/Oro/Bundle/ReminderBundle/Resources/public/less/style.less
@@ -55,3 +55,5 @@
     padding: 0 9px 0 8px;
   }
 }
+
+@import "./mobile/main";
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/form.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/form.less
index f26e4b96b8f..fe9a1272f12 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/form.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/form.less
@@ -68,6 +68,7 @@
 }
 .select2-container-multi .select2-choices li {
   float: none;
+  margin-right: 5px;
 }
 .oro-item-collection {
   input[type="email"],

From 720fbf4bbb1086a6701db0675fec9c475f23d026 Mon Sep 17 00:00:00 2001
From: Makar Sichevoy <sichevoy@gmail.com>
Date: Tue, 12 Jan 2016 17:31:04 +0200
Subject: [PATCH 418/471] CRM-4844: Search api for autocomplete of field
 Context in form

---
 .../Autocomplete/ContextSearchHandler.php     | 12 ++--
 .../Event/SearchAliasesEvent.php              | 59 +++++++++++++++
 .../Unit/Event/SearchAliasesEventTest.php     | 18 +++++
 .../BeforeMapObjectSearchListener.php         | 23 ------
 .../PrepareResultItemListener.php             | 40 +++++++++++
 .../EventListener/SearchAliasListener.php     | 22 ++++++
 .../EmailBundle/Resources/config/services.yml | 17 +++--
 .../BeforeMapObjectSearchListenerTest.php     |  4 +-
 .../PrepareResultItemListenerTest.php         | 71 +++++++++++++++++++
 9 files changed, 231 insertions(+), 35 deletions(-)
 create mode 100644 src/Oro/Bundle/ActivityBundle/Event/SearchAliasesEvent.php
 create mode 100644 src/Oro/Bundle/ActivityBundle/Tests/Unit/Event/SearchAliasesEventTest.php
 delete mode 100644 src/Oro/Bundle/EmailBundle/EventListener/BeforeMapObjectSearchListener.php
 create mode 100644 src/Oro/Bundle/EmailBundle/EventListener/PrepareResultItemListener.php
 create mode 100644 src/Oro/Bundle/EmailBundle/EventListener/SearchAliasListener.php
 create mode 100644 src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/PrepareResultItemListenerTest.php

diff --git a/src/Oro/Bundle/ActivityBundle/Autocomplete/ContextSearchHandler.php b/src/Oro/Bundle/ActivityBundle/Autocomplete/ContextSearchHandler.php
index 6eacb7c800b..ac33bc562fa 100644
--- a/src/Oro/Bundle/ActivityBundle/Autocomplete/ContextSearchHandler.php
+++ b/src/Oro/Bundle/ActivityBundle/Autocomplete/ContextSearchHandler.php
@@ -2,6 +2,7 @@
 
 namespace Oro\Bundle\ActivityBundle\Autocomplete;
 
+use Oro\Bundle\ActivityBundle\Event\SearchAliasesEvent;
 use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
@@ -183,17 +184,14 @@ protected function searchById($targetsString)
      */
     public function convertItem($item)
     {
+        $this->dispatcher->dispatch(PrepareResultItemEvent::EVENT_NAME, new PrepareResultItemEvent($item));
+
         /** @var Item $item */
         $text      = $item->getRecordTitle();
         $className = $item->getEntityName();
 
         $entityMapParameter = $this->mapper->getEntityMapParameter($className, 'title_fields');
 
-        if ($text === null && $entityMapParameter) {
-            $this->dispatcher->dispatch(PrepareResultItemEvent::EVENT_NAME, new PrepareResultItemEvent($item));
-            $text = $item->getRecordTitle();
-        }
-
         if (strlen($text) === 0 && !$entityMapParameter) {
             $text = $this->translator->trans('oro.entity.item', ['%id%' => $item->getRecordId()]);
         }
@@ -406,6 +404,10 @@ protected function getSearchAliases()
                 $aliases[] = $alias;
             }
         }
+        /** dispatch oro_activity.search_aliases event */
+        $event = new SearchAliasesEvent($aliases, $targetEntityClasses);
+        $this->dispatcher->dispatch(SearchAliasesEvent::EVENT_NAME, $event);
+        $aliases = $event->getAliases();
 
         return $aliases;
     }
diff --git a/src/Oro/Bundle/ActivityBundle/Event/SearchAliasesEvent.php b/src/Oro/Bundle/ActivityBundle/Event/SearchAliasesEvent.php
new file mode 100644
index 00000000000..bdfe8fcc567
--- /dev/null
+++ b/src/Oro/Bundle/ActivityBundle/Event/SearchAliasesEvent.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Oro\Bundle\ActivityBundle\Event;
+
+use Symfony\Component\EventDispatcher\Event;
+
+/**
+ * This event allow to change aliases config before the usage in context search
+ */
+class SearchAliasesEvent extends Event
+{
+    const EVENT_NAME = 'oro_activity.search_aliases';
+
+    /** @var array */
+    protected $aliases;
+
+    /** @var array */
+    protected $targetClasses;
+
+    /**
+     * @param array $aliases
+     * @param array $targetClasses
+     */
+    public function __construct($aliases, $targetClasses)
+    {
+        $this->aliases = $aliases;
+        $this->targetClasses = $targetClasses;
+    }
+
+    /**
+     * Return aliases config array
+     *
+     * @return array
+     */
+    public function getAliases()
+    {
+        return $this->aliases;
+    }
+
+    /**
+     * Set the aliases config array
+     *
+     * @param array $aliases
+     */
+    public function setAliases($aliases)
+    {
+        $this->aliases = $aliases;
+    }
+
+    /**
+     * Return target classes array
+     *
+     * @return array
+     */
+    public function getTargetClasses()
+    {
+        return $this->aliases;
+    }
+}
diff --git a/src/Oro/Bundle/ActivityBundle/Tests/Unit/Event/SearchAliasesEventTest.php b/src/Oro/Bundle/ActivityBundle/Tests/Unit/Event/SearchAliasesEventTest.php
new file mode 100644
index 00000000000..a73fa873400
--- /dev/null
+++ b/src/Oro/Bundle/ActivityBundle/Tests/Unit/Event/SearchAliasesEventTest.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Oro\Bundle\ActivityBundle\Tests\Unit\Event;
+
+use Oro\Bundle\ActivityBundle\Event\SearchAliasesEvent;
+
+class SearchAliasesEventTest extends \PHPUnit_Framework_TestCase
+{
+    public function testEvent()
+    {
+        $aliases = ['test'];
+        $event = new SearchAliasesEvent($aliases, []);
+        $this->assertSame($aliases, $event->getAliases());
+        $updatedAliases = array_merge($aliases, ['customEntity']);
+        $event->setAliases($updatedAliases);
+        $this->assertSame($updatedAliases, $event->getAliases());
+    }
+}
diff --git a/src/Oro/Bundle/EmailBundle/EventListener/BeforeMapObjectSearchListener.php b/src/Oro/Bundle/EmailBundle/EventListener/BeforeMapObjectSearchListener.php
deleted file mode 100644
index 7f6dbbc1959..00000000000
--- a/src/Oro/Bundle/EmailBundle/EventListener/BeforeMapObjectSearchListener.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace Oro\Bundle\EmailBundle\EventListener;
-
-use Oro\Bundle\SearchBundle\Event\SearchMappingCollectEvent;
-
-class BeforeMapObjectSearchListener
-{
-    const EMAIL_CLASS_NAME = 'Oro\Bundle\EmailBundle\Entity\Email';
-    const EMAIL_USER_CLASS_NAME = 'Oro\Bundle\EmailBundle\Entity\EmailUser';
-
-    /**
-     * @param SearchMappingCollectEvent $event
-     */
-    public function addEntityMapTitleFieldEvent(SearchMappingCollectEvent $event)
-    {
-        $mapConfig     = $event->getMappingConfig();
-        //sets title fields for activity context name, alias set to empty for avoiding warnings and notices
-        $mapConfig[self::EMAIL_CLASS_NAME] = $mapConfig[self::EMAIL_USER_CLASS_NAME];
-        $mapConfig[self::EMAIL_CLASS_NAME]['title_fields'] = ['subject'];
-        $event->setMappingConfig($mapConfig);
-    }
-}
diff --git a/src/Oro/Bundle/EmailBundle/EventListener/PrepareResultItemListener.php b/src/Oro/Bundle/EmailBundle/EventListener/PrepareResultItemListener.php
new file mode 100644
index 00000000000..a6151ad8ec1
--- /dev/null
+++ b/src/Oro/Bundle/EmailBundle/EventListener/PrepareResultItemListener.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Oro\Bundle\EmailBundle\EventListener;
+
+use Symfony\Component\Routing\Router;
+
+use Oro\Bundle\SearchBundle\Event\PrepareResultItemEvent;
+
+class PrepareResultItemListener
+{
+    const EMAIL_USER_CLASS_NAME = 'Oro\Bundle\EmailBundle\Entity\EmailUser';
+    const EMAIL_CLASS_NAME = 'Oro\Bundle\EmailBundle\Entity\Email';
+
+    /** @var Router */
+    protected $router;
+
+    /**
+     * Constructor
+     *
+     * @param Router $router
+     */
+    public function __construct(Router $router)
+    {
+        $this->router = $router;
+    }
+
+    /**
+     * @param PrepareResultItemEvent $event
+     */
+    public function prepareEmailItemDataEvent(PrepareResultItemEvent $event)
+    {
+        if ($event->getResultItem()->getEntityName() === self::EMAIL_USER_CLASS_NAME) {
+            $id = $event->getResultItem()->getEntity()->getEmail()->getId();
+            $event->getResultItem()->setRecordId($id);
+            $event->getResultItem()->setEntityName(self::EMAIL_CLASS_NAME);
+            $route = $this->router->generate('oro_email_thread_view', ['id' => $id], true);
+            $event->getResultItem()->setRecordUrl($route);
+        }
+    }
+}
diff --git a/src/Oro/Bundle/EmailBundle/EventListener/SearchAliasListener.php b/src/Oro/Bundle/EmailBundle/EventListener/SearchAliasListener.php
new file mode 100644
index 00000000000..4a34a3d57ac
--- /dev/null
+++ b/src/Oro/Bundle/EmailBundle/EventListener/SearchAliasListener.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Oro\Bundle\EmailBundle\EventListener;
+
+use Oro\Bundle\ActivityBundle\Event\SearchAliasesEvent;
+
+class SearchAliasListener
+{
+    const EMAIL_CLASS_NAME = 'Oro\Bundle\EmailBundle\Entity\Email';
+
+    /**
+     * @param SearchAliasesEvent $event
+     */
+    public function addEmailAliasEvent(SearchAliasesEvent $event)
+    {
+        $aliases = $event->getAliases();
+//        if (in_array(self::EMAIL_CLASS_NAME, $event->getTargetClasses(), true)) {
+            $aliases[] = 'oro_email';
+            $event->setAliases($aliases);
+//        }
+    }
+}
diff --git a/src/Oro/Bundle/EmailBundle/Resources/config/services.yml b/src/Oro/Bundle/EmailBundle/Resources/config/services.yml
index a69b2194b50..244ef548fd5 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/EmailBundle/Resources/config/services.yml
@@ -104,7 +104,6 @@ parameters:
     oro_email.manager.email_attachment_manager.class: Oro\Bundle\EmailBundle\Manager\EmailAttachmentManager
     oro_email.provider.email_attachment_provider.class: Oro\Bundle\EmailBundle\Provider\EmailAttachmentProvider
     oro_email.acl.voter.email_voter.class: Oro\Bundle\EmailBundle\Acl\Voter\EmailVoter
-    oro_email.acl.voter.email_user_voter.class: Oro\Bundle\EmailBundle\Acl\Voter\EmailUserVoter
 
     # Email DataGrid
     oro_email.datagrid.origin_folder.provider.class: Oro\Bundle\EmailBundle\Datagrid\OriginFolderFilterProvider
@@ -133,7 +132,8 @@ parameters:
     oro_email.workflow.action.strip_html_tags.class:    Oro\Bundle\EmailBundle\Model\Action\StripHtmlTags
     oro_email.workflow.action.add_activity_target.class: Oro\Bundle\EmailBundle\Model\Action\AddActivityTarget
 
-    oro_email.listener.before_map_object_search_listener.class: Oro\Bundle\EmailBundle\EventListener\BeforeMapObjectSearchListener
+    oro_email.listener.search_aliases_listener.class: Oro\Bundle\EmailBundle\EventListener\SearchAliasListener
+    oro_email.listener.prepare_result_item_listener.class: Oro\Bundle\EmailBundle\EventListener\PrepareResultItemListener
 
 services:
     oro_email.entity.cache.warmer:
@@ -951,7 +951,14 @@ services:
     oro_email.placeholder.send_email.filter:
         class: %oro_email.placeholder.send_email.filter.class%
 
-    oro_email.listener.before_map_object_search_listener:
-        class: %oro_email.listener.before_map_object_search_listener.class%
+    oro_email.listener.search_aliases_listener:
+        class: %oro_email.listener.search_aliases_listener.class%
         tags:
-            - { name: kernel.event_listener, event: oro_search.search_mapping_collect, method: addEntityMapTitleFieldEvent }
+            - { name: kernel.event_listener, event: oro_activity.search_aliases, method: addEmailAliasEvent }
+
+    oro_email.listener.prepare_result_item_listener:
+        class: %oro_email.listener.prepare_result_item_listener.class%
+        arguments:
+            - @router
+        tags:
+            - { name: kernel.event_listener, event: oro_search.prepare_result_item, method: prepareEmailItemDataEvent }
diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/BeforeMapObjectSearchListenerTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/BeforeMapObjectSearchListenerTest.php
index 39b2e8fec0c..9cb2bd72b63 100644
--- a/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/BeforeMapObjectSearchListenerTest.php
+++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/BeforeMapObjectSearchListenerTest.php
@@ -15,7 +15,7 @@ public function setUp()
         $this->listener = new BeforeMapObjectSearchListener();
     }
 
-    public function testAddEntityMapTitleFieldEvent()
+    public function testAddEntityMapConfigEvent()
     {
         $emailUserConfig = [BeforeMapObjectSearchListener::EMAIL_USER_CLASS_NAME => [
             'title_fields' => ['email.subject'], 'alias' => '']
@@ -24,7 +24,7 @@ public function testAddEntityMapTitleFieldEvent()
         $expectedConfig[BeforeMapObjectSearchListener::EMAIL_CLASS_NAME] =
             ['title_fields' => ['subject'], 'alias' => ''];
         $event = new SearchMappingCollectEvent($emailUserConfig);
-        $this->listener->addEntityMapTitleFieldEvent($event);
+        $this->listener->addEntityMapConfigEvent($event);
         $this->assertEquals($expectedConfig, $event->getMappingConfig());
     }
 }
diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/PrepareResultItemListenerTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/PrepareResultItemListenerTest.php
new file mode 100644
index 00000000000..a70b5589d7c
--- /dev/null
+++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/PrepareResultItemListenerTest.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Oro\Bundle\EmailBundle\Tests\Unit\EventListener;
+
+use Symfony\Component\Routing\Router;
+
+use Oro\Bundle\SearchBundle\Query\Result\Item;
+use Oro\Bundle\EmailBundle\EventListener\PrepareResultItemListener;
+use Oro\Bundle\SearchBundle\Event\PrepareResultItemEvent;
+
+class PrepareResultItemListenerTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var PrepareResultItemListener */
+    protected $listener;
+
+    /** @var \PHPUnit_Framework_MockObject_MockObject|Router */
+    protected $router;
+
+    /** @var \PHPUnit_Framework_MockObject_MockObject|Item */
+    protected $item;
+
+    public function setUp()
+    {
+        $this->router = $this->getMockBuilder('Symfony\Component\Routing\Router')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->item = $this->getMockBuilder('Oro\Bundle\SearchBundle\Query\Result\Item')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->listener = new PrepareResultItemListener($this->router);
+    }
+
+    public function testPrepareEmailItemDataEventSkippEntity()
+    {
+        $this->item->expects($this->once())
+            ->method('getEntityName')
+            ->willReturn('test');
+        $this->item->expects($this->never())
+            ->method('getEntity');
+
+        $event = new PrepareResultItemEvent($this->item);
+        $this->listener->prepareEmailItemDataEvent($event);
+    }
+
+    public function testPrepareEmailItemDataEvent()
+    {
+        $entity = $this->getMockBuilder('Oro\Bundle\EmailBundle\Entity\EmailUser')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $email = $this->getMockBuilder('Oro\Bundle\EmailBundle\Entity\Email')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->item->expects($this->once())
+            ->method('getEntityName')
+            ->willReturn(PrepareResultItemListener::EMAIL_USER_CLASS_NAME);
+        $this->item->expects($this->once())
+            ->method('getEntity')
+            ->willReturn($entity);
+        $entity->expects($this->once())
+            ->method('getEmail')
+            ->willReturn($email);
+        $email->expects($this->once())
+            ->method('getId');
+
+        $event = new PrepareResultItemEvent($this->item);
+        $this->listener->prepareEmailItemDataEvent($event);
+    }
+}

From 97adcc233f88fba99c8315fb58364d97abb57399 Mon Sep 17 00:00:00 2001
From: Maksym Perepelytsya <mperepelytsya@magecore.com>
Date: Tue, 12 Jan 2016 17:37:51 +0200
Subject: [PATCH 419/471] CRM-4589: Can't import file with Date Time fields  -
 detect time pattern by value in ExcelDateTimeFormatter

---
 .../Formatter/ExcelDateTimeTypeFormatter.php  | 22 ++++++++++++-------
 .../Formatter/DateTimeFormatter.php           | 20 ++++++++++-------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/Oro/Bundle/ImportExportBundle/Formatter/ExcelDateTimeTypeFormatter.php b/src/Oro/Bundle/ImportExportBundle/Formatter/ExcelDateTimeTypeFormatter.php
index 5fb4f793ba7..db4f1ea0cb5 100644
--- a/src/Oro/Bundle/ImportExportBundle/Formatter/ExcelDateTimeTypeFormatter.php
+++ b/src/Oro/Bundle/ImportExportBundle/Formatter/ExcelDateTimeTypeFormatter.php
@@ -54,7 +54,7 @@ public function convert(
         }
 
         if ($value) {
-            $formatter = $this->getFormatter($dateType, $timeType, $locale, $timeZone, $pattern);
+            $formatter = $this->getFormatter($dateType, $timeType, $locale, $timeZone, $pattern, $value);
             $timestamp = $formatter->parse($value);
             if (intl_get_error_code() === 0) {
                 return $this->getDateTime($timestamp);
@@ -97,11 +97,11 @@ public function convertToTime($value, $timeType = null, $locale = null, $timezon
     /**
      * {@inheritdoc}
      */
-    public function getPattern($dateType, $timeType, $locale = null)
+    public function getPattern($dateType, $timeType, $locale = null, $value = null)
     {
         $pattern = parent::getPattern($dateType, $timeType, $locale);
 
-        return $this->modifyPattern($pattern, $dateType, $timeType);
+        return $this->modifyPattern($pattern, $dateType, $timeType, $value);
     }
 
     /**
@@ -110,13 +110,15 @@ public function getPattern($dateType, $timeType, $locale = null)
      *
      * @link http://userguide.icu-project.org/formatparse/datetime
      *
-     * @param string $pattern
-     * @param int    $timeType Constant IntlDateFormatter (NONE, FULL, LONG, MEDIUM, SHORT) or it's string name
-     * @param int    $dateType Constant IntlDateFormatter (NONE, FULL, LONG, MEDIUM, SHORT) or it's string name
+     * @param string      $pattern
+     * @param int         $dateType Constant IntlDateFormatter (NONE, FULL, LONG, MEDIUM, SHORT) or it's string name
+     *
+     * @param int         $timeType Constant IntlDateFormatter (NONE, FULL, LONG, MEDIUM, SHORT) or it's string name
+     * @param string|null $value
      *
      * @return string
      */
-    protected function modifyPattern($pattern, $dateType, $timeType)
+    protected function modifyPattern($pattern, $dateType, $timeType, $value = null)
     {
         $patternParts = [];
 
@@ -129,7 +131,11 @@ protected function modifyPattern($pattern, $dateType, $timeType)
         }
 
         if ($timeType !== \IntlDateFormatter::NONE) {
-            $patternParts[] = 'HH:mm:ss';
+            $timePattern = 'HH:mm:ss';
+            if ($value !== null && substr_count($value, ':') < 2) {
+                $timePattern = 'HH:mm';
+            }
+            $patternParts[] = $timePattern;
         }
 
         return implode(' ', $patternParts);
diff --git a/src/Oro/Bundle/LocaleBundle/Formatter/DateTimeFormatter.php b/src/Oro/Bundle/LocaleBundle/Formatter/DateTimeFormatter.php
index 348becd9051..a5a35624f19 100644
--- a/src/Oro/Bundle/LocaleBundle/Formatter/DateTimeFormatter.php
+++ b/src/Oro/Bundle/LocaleBundle/Formatter/DateTimeFormatter.php
@@ -100,12 +100,14 @@ public function formatTime($date, $timeType = null, $locale = null, $timeZone =
     /**
      * Get the pattern used for the IntlDateFormatter
      *
-     * @param int|string $dateType Constant of IntlDateFormatter (NONE, FULL, LONG, MEDIUM, SHORT) or it's string name
-     * @param int|string $timeType Constant IntlDateFormatter (NONE, FULL, LONG, MEDIUM, SHORT) or it's string name
+     * @param int|string  $dateType Constant of IntlDateFormatter (NONE, FULL, LONG, MEDIUM, SHORT) or it's string name
+     * @param int|string  $timeType Constant IntlDateFormatter (NONE, FULL, LONG, MEDIUM, SHORT) or it's string name
      * @param string|null $locale
+     * @param string|null $value
+     *
      * @return string
      */
-    public function getPattern($dateType, $timeType, $locale = null)
+    public function getPattern($dateType, $timeType, $locale = null, $value = null)
     {
         if (!$locale) {
             $locale = $this->localeSettings->getLocale();
@@ -131,15 +133,17 @@ public function getPattern($dateType, $timeType, $locale = null)
      *
      * @param string|int|null $dateType
      * @param string|int|null $timeType
-     * @param string|null $locale
-     * @param string|null $timeZone
-     * @param string|null $pattern
+     * @param string|null     $locale
+     * @param string|null     $timeZone
+     * @param string|null     $pattern
+     * @param string|null     $value
+     *
      * @return \IntlDateFormatter
      */
-    protected function getFormatter($dateType, $timeType, $locale, $timeZone, $pattern)
+    protected function getFormatter($dateType, $timeType, $locale, $timeZone, $pattern, $value = null)
     {
         if (!$pattern) {
-            $pattern = $this->getPattern($dateType, $timeType, $locale);
+            $pattern = $this->getPattern($dateType, $timeType, $locale, $value);
         }
         return new \IntlDateFormatter(
             $this->localeSettings->getLanguage(),

From c8e61a3b3af92279f9cb3b3d9ac25cd7a7814b22 Mon Sep 17 00:00:00 2001
From: Mykhailo Sulyma <msulima@magecore.com>
Date: Tue, 12 Jan 2016 17:44:07 +0200
Subject: [PATCH 420/471] BB-1940: Update grid component to reload mass actions
 button on create new shopping list  - CR fixes

---
 .../public/js/app/components/datagrid-component.js    |  8 ++++----
 .../Resources/public/js/datagrid/grid.js              | 11 +++++++----
 .../js/datagrid/header-cell/action-header-cell.js     |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
index 1ca9573bb7e..63b57c063fd 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/app/components/datagrid-component.js
@@ -123,7 +123,7 @@ define(function(require) {
             tools.loadModules(this.modules, this.build, this);
 
             this.listenTo(this.metadataModel, 'change:massActions', function(model, massActions) {
-                this.grid.massActions.reset(this.buildMassActionsOptions(massActions).toArray());
+                this.grid.massActions.reset(this.buildMassActionsOptions(massActions));
             }, this);
         },
 
@@ -280,7 +280,7 @@ define(function(require) {
                 name: this.gridName,
                 columns: columns,
                 rowActions: rowActions,
-                massActions: massActions,
+                massActions: new Backbone.Collection(massActions),
                 toolbarOptions: metadata.options.toolbarOptions || {},
                 multipleSorting: metadata.options.multipleSorting || false,
                 entityHint: metadata.options.entityHint,
@@ -295,7 +295,7 @@ define(function(require) {
 
         /**
          * @param {Object} actions
-         * @returns {Object}
+         * @returns {Array}
          */
         buildMassActionsOptions: function(actions) {
             var modules = this.modules;
@@ -308,7 +308,7 @@ define(function(require) {
                 });
             });
 
-            return new Backbone.Collection(massActions);
+            return massActions;
         },
 
         fixStates: function(options) {
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid.js
index 45362000b74..fe4257da293 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid.js
@@ -22,7 +22,6 @@ define(function(require) {
     var ExportAction = require('oro/datagrid/action/export-action');
     var PluginManager = require('oroui/js/app/plugins/plugin-manager');
     var scrollHelper = require('oroui/js/tools/scroll-helper');
-    var MetadataModel = require('orodatagrid/js/datagrid/metadata-model');
 
     /**
      * Basic grid class.
@@ -87,7 +86,7 @@ define(function(require) {
         toolbar: Toolbar,
 
         /** @property {orodatagrid.datagrid.MetadataModel} */
-        metadataModel: MetadataModel,
+        metadataModel: null,
 
         /** @property {LoadingMaskView|null} */
         loadingMask: null,
@@ -167,6 +166,10 @@ define(function(require) {
                 this.noColumnsFlag = true;
             }
 
+            if (!opts.metadataModel) {
+                throw new TypeError('"metadataModel" is required');
+            }
+
             // Init properties values based on options and defaults
             _.extend(this, this.defaults, opts);
             this.toolbarOptions = {};
@@ -705,8 +708,8 @@ define(function(require) {
          * @private
          */
         _processLoadedMetadata: function(metadata) {
-            this.metadata = _.defaults(metadata, this.metadata);
-            this.metadataModel.set(this.metadata);
+            _.extend(this.metadata, metadata)
+            this.metadataModel.set(metadata);
         },
 
         /**
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js
index 4452711fec4..aeaf6c008bd 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js
@@ -75,11 +75,11 @@ define([
 
             this.actionsPanel = new ActionsPanel();
             this.actionsPanel.setActions(actions);
+            this.subviews.push(this.actionsPanel);
         },
 
         createActionsPanel: function() {
             this.buildActionsPanel();
-            this.subviews.push(this.actionsPanel);
         },
 
         render: function() {

From d5f8f173f73659b041953cc77826978607012c1e Mon Sep 17 00:00:00 2001
From: Mykhailo Sulyma <msulima@magecore.com>
Date: Tue, 12 Jan 2016 17:50:04 +0200
Subject: [PATCH 421/471] BB-1940: Update grid component to reload mass actions
 button on create new shopping list  - CR fixes

---
 .../public/js/datagrid/header-cell/action-header-cell.js    | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js
index aeaf6c008bd..8656a469453 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js
@@ -59,7 +59,7 @@ define([
             ActionHeaderCell.__super__.dispose.apply(this, arguments);
         },
 
-        buildActionsPanel: function() {
+        createActionsPanel: function() {
             var actions = [];
             var datagrid = this.column.get('datagrid');
 
@@ -78,10 +78,6 @@ define([
             this.subviews.push(this.actionsPanel);
         },
 
-        createActionsPanel: function() {
-            this.buildActionsPanel();
-        },
-
         render: function() {
             var panel = this.actionsPanel;
             this.$el.empty();

From b458d25278f950c488d34335f51c773d06ca6075 Mon Sep 17 00:00:00 2001
From: Mykhailo Sulyma <msulima@magecore.com>
Date: Tue, 12 Jan 2016 17:51:08 +0200
Subject: [PATCH 422/471] BB-1940: Update grid component to reload mass actions
 button on create new shopping list

---
 .../Bundle/DataGridBundle/Resources/public/js/datagrid/grid.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid.js
index fe4257da293..3a649eec977 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/grid.js
@@ -708,7 +708,7 @@ define(function(require) {
          * @private
          */
         _processLoadedMetadata: function(metadata) {
-            _.extend(this.metadata, metadata)
+            _.extend(this.metadata, metadata);
             this.metadataModel.set(metadata);
         },
 

From b2157ca29b3631b2868da7aa3e05f1f65088ca88 Mon Sep 17 00:00:00 2001
From: Makar Sichevoy <sichevoy@gmail.com>
Date: Tue, 12 Jan 2016 17:54:01 +0200
Subject: [PATCH 423/471] CRM-4844: Search api for autocomplete of field
 Context in form

---
 .../Autocomplete/ContextSearchHandler.php     |  2 +-
 .../Event/SearchAliasesEvent.php              |  2 +-
 ...Listener.php => SearchAliasesListener.php} |  6 +--
 .../EmailBundle/Resources/config/services.yml |  2 +-
 .../BeforeMapObjectSearchListenerTest.php     | 30 ---------------
 .../SearchAliasesListenerTest.php             | 37 +++++++++++++++++++
 6 files changed, 43 insertions(+), 36 deletions(-)
 rename src/Oro/Bundle/EmailBundle/EventListener/{SearchAliasListener.php => SearchAliasesListener.php} (78%)
 delete mode 100644 src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/BeforeMapObjectSearchListenerTest.php
 create mode 100644 src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/SearchAliasesListenerTest.php

diff --git a/src/Oro/Bundle/ActivityBundle/Autocomplete/ContextSearchHandler.php b/src/Oro/Bundle/ActivityBundle/Autocomplete/ContextSearchHandler.php
index ac33bc562fa..7f5dfb00f0b 100644
--- a/src/Oro/Bundle/ActivityBundle/Autocomplete/ContextSearchHandler.php
+++ b/src/Oro/Bundle/ActivityBundle/Autocomplete/ContextSearchHandler.php
@@ -2,7 +2,6 @@
 
 namespace Oro\Bundle\ActivityBundle\Autocomplete;
 
-use Oro\Bundle\ActivityBundle\Event\SearchAliasesEvent;
 use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
@@ -20,6 +19,7 @@
 use Oro\Bundle\EntityBundle\Tools\EntityClassNameHelper;
 use Oro\Bundle\EntityConfigBundle\Config\ConfigManager;
 use Oro\Bundle\ActivityBundle\Manager\ActivityManager;
+use Oro\Bundle\ActivityBundle\Event\SearchAliasesEvent;
 use Oro\Bundle\FormBundle\Autocomplete\ConverterInterface;
 use Oro\Bundle\SearchBundle\Engine\Indexer;
 use Oro\Bundle\SearchBundle\Query\Result\Item;
diff --git a/src/Oro/Bundle/ActivityBundle/Event/SearchAliasesEvent.php b/src/Oro/Bundle/ActivityBundle/Event/SearchAliasesEvent.php
index bdfe8fcc567..cd1c2e78314 100644
--- a/src/Oro/Bundle/ActivityBundle/Event/SearchAliasesEvent.php
+++ b/src/Oro/Bundle/ActivityBundle/Event/SearchAliasesEvent.php
@@ -54,6 +54,6 @@ public function setAliases($aliases)
      */
     public function getTargetClasses()
     {
-        return $this->aliases;
+        return $this->targetClasses;
     }
 }
diff --git a/src/Oro/Bundle/EmailBundle/EventListener/SearchAliasListener.php b/src/Oro/Bundle/EmailBundle/EventListener/SearchAliasesListener.php
similarity index 78%
rename from src/Oro/Bundle/EmailBundle/EventListener/SearchAliasListener.php
rename to src/Oro/Bundle/EmailBundle/EventListener/SearchAliasesListener.php
index 4a34a3d57ac..c6966c99613 100644
--- a/src/Oro/Bundle/EmailBundle/EventListener/SearchAliasListener.php
+++ b/src/Oro/Bundle/EmailBundle/EventListener/SearchAliasesListener.php
@@ -4,7 +4,7 @@
 
 use Oro\Bundle\ActivityBundle\Event\SearchAliasesEvent;
 
-class SearchAliasListener
+class SearchAliasesListener
 {
     const EMAIL_CLASS_NAME = 'Oro\Bundle\EmailBundle\Entity\Email';
 
@@ -14,9 +14,9 @@ class SearchAliasListener
     public function addEmailAliasEvent(SearchAliasesEvent $event)
     {
         $aliases = $event->getAliases();
-//        if (in_array(self::EMAIL_CLASS_NAME, $event->getTargetClasses(), true)) {
+        if (in_array(self::EMAIL_CLASS_NAME, $event->getTargetClasses(), true)) {
             $aliases[] = 'oro_email';
             $event->setAliases($aliases);
-//        }
+        }
     }
 }
diff --git a/src/Oro/Bundle/EmailBundle/Resources/config/services.yml b/src/Oro/Bundle/EmailBundle/Resources/config/services.yml
index 244ef548fd5..36da57be286 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/EmailBundle/Resources/config/services.yml
@@ -132,7 +132,7 @@ parameters:
     oro_email.workflow.action.strip_html_tags.class:    Oro\Bundle\EmailBundle\Model\Action\StripHtmlTags
     oro_email.workflow.action.add_activity_target.class: Oro\Bundle\EmailBundle\Model\Action\AddActivityTarget
 
-    oro_email.listener.search_aliases_listener.class: Oro\Bundle\EmailBundle\EventListener\SearchAliasListener
+    oro_email.listener.search_aliases_listener.class: Oro\Bundle\EmailBundle\EventListener\SearchAliasesListener
     oro_email.listener.prepare_result_item_listener.class: Oro\Bundle\EmailBundle\EventListener\PrepareResultItemListener
 
 services:
diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/BeforeMapObjectSearchListenerTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/BeforeMapObjectSearchListenerTest.php
deleted file mode 100644
index 9cb2bd72b63..00000000000
--- a/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/BeforeMapObjectSearchListenerTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Oro\Bundle\EmailBundle\Tests\Unit\EventListener;
-
-use Oro\Bundle\EmailBundle\EventListener\BeforeMapObjectSearchListener;
-use Oro\Bundle\SearchBundle\Event\SearchMappingCollectEvent;
-
-class BeforeMapObjectSearchListenerTest extends \PHPUnit_Framework_TestCase
-{
-    /** @var BeforeMapObjectSearchListener */
-    protected $listener;
-
-    public function setUp()
-    {
-        $this->listener = new BeforeMapObjectSearchListener();
-    }
-
-    public function testAddEntityMapConfigEvent()
-    {
-        $emailUserConfig = [BeforeMapObjectSearchListener::EMAIL_USER_CLASS_NAME => [
-            'title_fields' => ['email.subject'], 'alias' => '']
-        ];
-        $expectedConfig = $emailUserConfig;
-        $expectedConfig[BeforeMapObjectSearchListener::EMAIL_CLASS_NAME] =
-            ['title_fields' => ['subject'], 'alias' => ''];
-        $event = new SearchMappingCollectEvent($emailUserConfig);
-        $this->listener->addEntityMapConfigEvent($event);
-        $this->assertEquals($expectedConfig, $event->getMappingConfig());
-    }
-}
diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/SearchAliasesListenerTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/SearchAliasesListenerTest.php
new file mode 100644
index 00000000000..cb131a83de5
--- /dev/null
+++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/SearchAliasesListenerTest.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Oro\Bundle\EmailBundle\Tests\Unit\EventListener;
+
+use Oro\Bundle\ActivityBundle\Event\SearchAliasesEvent;
+use Oro\Bundle\EmailBundle\EventListener\SearchAliasesListener;
+
+class SearchAliasesListenerTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var SearchAliasesListener */
+    protected $listener;
+
+    public function setUp()
+    {
+        $this->listener = new SearchAliasesListener();
+    }
+
+    public function testAddEmailAliasEventSkipped()
+    {
+        $expectedAliases = [];
+        $targetClasses = [];
+        $aliases = [];
+        $event = new SearchAliasesEvent($aliases, $targetClasses);
+        $this->listener->addEmailAliasEvent($event);
+        $this->assertEquals($expectedAliases, $event->getAliases());
+    }
+
+    public function testAddEmailAliasEvent()
+    {
+        $expectedAliases = ['oro_email'];
+        $targetClasses = [SearchAliasesListener::EMAIL_CLASS_NAME];
+        $aliases = [];
+        $event = new SearchAliasesEvent($aliases, $targetClasses);
+        $this->listener->addEmailAliasEvent($event);
+        $this->assertEquals($expectedAliases, $event->getAliases());
+    }
+}

From b7db4642c7a52ac21d9430711e944d015d0adc9d Mon Sep 17 00:00:00 2001
From: Mykhailo Sulyma <msulima@magecore.com>
Date: Tue, 12 Jan 2016 18:08:50 +0200
Subject: [PATCH 424/471] BB-1940: Update grid component to reload mass actions
 button on create new shopping list

---
 .../public/js/datagrid/header-cell/action-header-cell.js        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js
index 8656a469453..651fc05f1e4 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js
@@ -93,7 +93,7 @@ define([
         rebuildAndRender: function(massActions) {
             this.column.set('massActions', massActions);
 
-            this.buildActionsPanel();
+            this.createActionsPanel();
             this.render();
         },
 

From 57a75eb3556dd49471d9582a4ba958d009a59e3c Mon Sep 17 00:00:00 2001
From: Ignat Shcheglovskyi <ignat@orocrm.com>
Date: Tue, 12 Jan 2016 11:31:28 -0800
Subject: [PATCH 425/471] BAP-9594: Role grid shows organization column
 incorrectly - fixed issue with BC - updated phpdocs for
 Oro\Bundle\DataGridBundle\Common\Object  - added method
 Oro\Bundle\DataGridBundle\Common\Object::offsetExistByPath  - added tests  -
 fixed typo in doc

---
 UPGRADE-1.9.md                                |   2 +-
 .../Bundle/DataGridBundle/Common/Object.php   |  40 ++++--
 .../Datagrid/Common/DatagridConfiguration.php |  14 +-
 .../Tests/Unit/Common/ObjectTest.php          |  76 +++++++++++
 .../Common/DatagridConfigurationTest.php      | 120 ++++++++++++++++++
 5 files changed, 235 insertions(+), 17 deletions(-)
 create mode 100644 src/Oro/Bundle/DataGridBundle/Tests/Unit/Common/ObjectTest.php

diff --git a/UPGRADE-1.9.md b/UPGRADE-1.9.md
index 2839bf78b10..f38eb33a6cd 100644
--- a/UPGRADE-1.9.md
+++ b/UPGRADE-1.9.md
@@ -40,7 +40,7 @@ UPGRADE FROM 1.8 to 1.9
 - `Oro\Bundle\DataGridBundle\Datagrid\Builder::BASE_DATAGRID_CLASS_PATH` marked as deprecated. Use `Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration::BASE_DATAGRID_CLASS_PATH`.
 - `Oro\Bundle\DataGridBundle\Datagrid\Builder::DATASOURCE_SKIP_ACL_CHECK` marked as deprecated. Use `Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration::isDatasourceSkipAclApply`.
 - `Oro\Bundle\DataGridBundle\Datagrid\Builder::DATASOURCE_SKIP_COUNT_WALKER_PATH` marked as deprecated. Use `Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration::DATASOURCE_SKIP_COUNT_WALKER_PATH`.
-- Option "acl_resource" moved from option "source" too root node of datagrid configuration:
+- Option "acl_resource" moved from option "source" to root node of datagrid configuration:
 
 Before
 
diff --git a/src/Oro/Bundle/DataGridBundle/Common/Object.php b/src/Oro/Bundle/DataGridBundle/Common/Object.php
index e6ad3a01e23..7d7c5526a5e 100644
--- a/src/Oro/Bundle/DataGridBundle/Common/Object.php
+++ b/src/Oro/Bundle/DataGridBundle/Common/Object.php
@@ -6,6 +6,7 @@
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
+use Symfony\Component\PropertyAccess\PropertyPathInterface;
 
 use Oro\Component\PropertyAccess\PropertyAccessor;
 
@@ -135,8 +136,8 @@ public function offsetGetOr($offset, $default = null)
     /**
      * Try to get property using PropertyAccessor
      *
-     * @param string $path
-     * @param null   $default
+     * @param string|PropertyPathInterface $path
+     * @param null                         $default
      *
      * @return mixed
      */
@@ -155,6 +156,25 @@ public function offsetGetByPath($path, $default = null)
         return $value ? : $default;
     }
 
+    /**
+     * Check property existence using PropertyAccessor
+     *
+     * @param string|PropertyPathInterface $path
+     *
+     * @return mixed
+     */
+    public function offsetExistByPath($path)
+    {
+        try {
+            $value = $this->accessor->getValue($this, $path);
+        } catch (NoSuchPropertyException $e) {
+            return false;
+        }
+
+        // If NULL then result is FALSE, same behavior as function isset() has
+        return $value !== null;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -168,8 +188,8 @@ public function offsetSet($offset, $value)
     /**
      * Set property using PropertyAccessor
      *
-     * @param string $path
-     * @param mixed  $value
+     * @param string|PropertyPathInterface $path
+     * @param mixed                        $value
      *
      * @return $this
      */
@@ -191,9 +211,11 @@ public function offsetUnset($offset)
     }
 
     /**
-     * Expects data format for array data
+     * Unset property using PropertyAccessor
      *
-     * {@inheritDoc}
+     * @param string|PropertyPathInterface $path
+     *
+     * @return $this
      */
     public function offsetUnsetByPath($path)
     {
@@ -220,7 +242,7 @@ public function offsetUnsetByPath($path)
     }
 
     /**
-     * @param string $path
+     * @param string|PropertyPathInterface $path
      * @return array
      */
     protected function explodeArrayPath($path)
@@ -270,8 +292,8 @@ public function offsetAddToArray($offset, array $value)
     /**
      * Merge value to array property, if property not isset creates new one
      *
-     * @param  string $path
-     * @param array   $value
+     * @param string|PropertyPathInterface $path
+     * @param array                        $value
      *
      * @return $this
      */
diff --git a/src/Oro/Bundle/DataGridBundle/Datagrid/Common/DatagridConfiguration.php b/src/Oro/Bundle/DataGridBundle/Datagrid/Common/DatagridConfiguration.php
index 3ff560bd141..ea220b9bcf9 100644
--- a/src/Oro/Bundle/DataGridBundle/Datagrid/Common/DatagridConfiguration.php
+++ b/src/Oro/Bundle/DataGridBundle/Datagrid/Common/DatagridConfiguration.php
@@ -48,11 +48,11 @@ public function getDatasourceType()
      */
     public function getAclResource()
     {
-        $result = $this->offsetGetByPath(self::ACL_RESOURCE_PATH);
-
-        if (!$result) {
+        if ($this->offsetExistByPath(self::ACL_RESOURCE_PATH)) {
+            $result = $this->offsetGetByPath(self::ACL_RESOURCE_PATH);
+        } else {
             // Support backward compatibility until 1.11 to get this option from deprecated path.
-            $result = $this->offsetGetByPath(Builder::DATASOURCE_ACL_PATH);
+            $result = $this->offsetGetByPath(Builder::DATASOURCE_ACL_PATH, false);
         }
 
         return $result;
@@ -65,9 +65,9 @@ public function getAclResource()
      */
     public function isDatasourceSkipAclApply()
     {
-        $result = $this->offsetGetByPath(self::DATASOURCE_SKIP_ACL_APPLY_PATH, false);
-
-        if (!$result) {
+        if ($this->offsetExistByPath(self::DATASOURCE_SKIP_ACL_APPLY_PATH)) {
+            $result = $this->offsetGetByPath(self::DATASOURCE_SKIP_ACL_APPLY_PATH);
+        } else {
             // Support backward compatibility until 1.11 to get this option from deprecated path.
             $result = $this->offsetGetByPath(Builder::DATASOURCE_SKIP_ACL_CHECK, false);
         }
diff --git a/src/Oro/Bundle/DataGridBundle/Tests/Unit/Common/ObjectTest.php b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Common/ObjectTest.php
new file mode 100644
index 00000000000..04f43a27d42
--- /dev/null
+++ b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Common/ObjectTest.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Oro\Bundle\DataGridBundle\Tests\Unit\Datagrid\Common;
+
+use Oro\Bundle\DataGridBundle\Common\Object;
+
+class ObjectTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @param array $params
+     * @param string $path
+     * @param bool $expected
+     * @dataProvider getOffsetGetByPathDataProvider
+     */
+    public function testOffsetGetByPath(array $params, $path, $expected)
+    {
+        $object = Object::create($params);
+        $this->assertEquals($expected, $object->offsetExistByPath($path));
+    }
+
+    public function getOffsetGetByPathDataProvider()
+    {
+        $params = [
+            'true' => true,
+            'false' => false,
+            'null' => null,
+            'array' => [
+                'true' => true,
+                'false' => false,
+                'null' => null,
+            ],
+        ];
+        return [
+            [
+                'params' => $params,
+                'path' => '[true]',
+                'expected' => true,
+            ],
+            [
+                'params' => $params,
+                'path' => '[false]',
+                'expected' => true,
+            ],
+            [
+                'params' => $params,
+                'path' => '[null]',
+                'expected' => false,
+            ],
+            [
+                'params' => $params,
+                'path' => '[unknown]',
+                'expected' => false,
+            ],
+            [
+                'params' => $params,
+                'path' => '[array][false]',
+                'expected' => true,
+            ],
+            [
+                'params' => $params,
+                'path' => '[array][true]',
+                'expected' => true,
+            ],
+            [
+                'params' => $params,
+                'path' => '[array][null]',
+                'expected' => false,
+            ],
+            [
+                'params' => $params,
+                'path' => '[array][unknown]',
+                'expected' => false,
+            ],
+        ];
+    }
+}
diff --git a/src/Oro/Bundle/DataGridBundle/Tests/Unit/Datagrid/Common/DatagridConfigurationTest.php b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Datagrid/Common/DatagridConfigurationTest.php
index 5c253b6ae2c..0266428d513 100644
--- a/src/Oro/Bundle/DataGridBundle/Tests/Unit/Datagrid/Common/DatagridConfigurationTest.php
+++ b/src/Oro/Bundle/DataGridBundle/Tests/Unit/Datagrid/Common/DatagridConfigurationTest.php
@@ -14,6 +14,126 @@ protected function setUp()
         $this->configuration = DatagridConfiguration::create([]);
     }
 
+    /**
+     * @param array $params
+     * @param bool $expected
+     * @dataProvider getAclResourceDataProvider
+     */
+    public function testGetAclResource(array $params, $expected)
+    {
+        $this->configuration->merge($params);
+        $this->assertEquals($expected, $this->configuration->getAclResource());
+    }
+
+    public function getAclResourceDataProvider()
+    {
+        return [
+            [
+                'params' => [
+                    'acl_resource' => false,
+                    'source' => ['acl_resource' => false],
+                ],
+                'expected' => false,
+            ],
+            [
+                'params' => [
+                    'acl_resource' => false,
+                    'source' => ['acl_resource' => true],
+                ],
+                'expected' => false,
+            ],
+            [
+                'params' => [
+                    'acl_resource' => true,
+                    'source' => ['acl_resource' => false],
+                ],
+                'expected' => true,
+            ],
+            [
+                'params' => [
+                    'acl_resource' => true,
+                    'source' => ['acl_resource' => true],
+                ],
+                'expected' => true,
+            ],
+            [
+                'params' => ['acl_resource' => true],
+                'expected' => true,
+            ],
+            [
+                'params' => [
+                    'acl_resource' => false,
+                ],
+                'expected' => false,
+            ],
+            [
+                'params' => [
+                    'source' => ['acl_resource' => false],
+                ],
+                'expected' => false,
+            ],
+            [
+                'params' => [
+                    'source' => ['acl_resource' => true],
+                ],
+                'expected' => true,
+            ],
+        ];
+    }
+
+    /**
+     * @param array $params
+     * @param bool $expected
+     * @dataProvider isDatasourceSkipAclApplyDataProvider
+     */
+    public function testIsDatasourceSkipAclApply(array $params, $expected)
+    {
+        $this->configuration->merge($params);
+        $this->assertEquals($expected, $this->configuration->isDatasourceSkipAclApply());
+    }
+
+    public function isDatasourceSkipAclApplyDataProvider()
+    {
+        return [
+            [
+                'params' => [
+                    'source' => [
+                        'skip_acl_apply' => false,
+                        'skip_acl_check' => false,
+                    ],
+                ],
+                'expected' => false,
+            ],
+            [
+                'params' => [
+                    'source' => [
+                        'skip_acl_apply' => false,
+                        'skip_acl_check' => true,
+                    ],
+                ],
+                'expected' => false,
+            ],
+            [
+                'params' => [
+                    'source' => [
+                        'skip_acl_apply' => true,
+                        'skip_acl_check' => false,
+                    ],
+                ],
+                'expected' => true,
+            ],
+            [
+                'params' => [
+                    'source' => [
+                        'skip_acl_apply' => true,
+                        'skip_acl_check' => true,
+                    ],
+                ],
+                'expected' => true,
+            ],
+        ];
+    }
+
     /**
      * @dataProvider addColumnDataProvider
      *

From 655e0c68488d0b5a5641a45c14baee450b98a67e Mon Sep 17 00:00:00 2001
From: Vova Soroka <vsoroka@magecore.com>
Date: Wed, 13 Jan 2016 04:23:38 +0200
Subject: [PATCH 426/471] BAP-7171: Implement assets version  for our JS files.
 Add assets version for JS routes

---
 .../public/js/init-entity-extend-apply.js     |  5 +-
 .../Event/JsRoutingDumpListener.php           | 31 ++++++++
 .../NavigationBundle/OroNavigationBundle.php  |  2 +
 .../Resources/config/oro/app.yml              | 10 +++
 .../Resources/config/services.yml             |  7 ++
 .../views/Js/requirejs.config.js.twig         |  2 +-
 .../Tests/Unit/OroNavigationBundleTest.php    | 29 -------
 .../Asset/DynamicAssetVersionManager.php      | 73 ++++++++++++++++++
 .../Asset/DynamicAssetVersionStrategy.php     | 73 ++++++++++++++++++
 .../Compiler/DynamicAssetVersionPass.php      | 53 +++++++++++++
 .../UIBundle/Resources/config/services.yml    | 12 +++
 .../Resources/views/requirejs.config.js.twig  |  6 --
 .../Asset/DynamicAssetVersionManagerTest.php  | 76 +++++++++++++++++++
 .../Asset/DynamicAssetVersionStrategyTest.php | 52 +++++++++++++
 14 files changed, 392 insertions(+), 39 deletions(-)
 create mode 100644 src/Oro/Bundle/NavigationBundle/Event/JsRoutingDumpListener.php
 create mode 100644 src/Oro/Bundle/NavigationBundle/Resources/config/oro/app.yml
 delete mode 100644 src/Oro/Bundle/NavigationBundle/Tests/Unit/OroNavigationBundleTest.php
 create mode 100644 src/Oro/Bundle/UIBundle/Asset/DynamicAssetVersionManager.php
 create mode 100644 src/Oro/Bundle/UIBundle/Asset/DynamicAssetVersionStrategy.php
 create mode 100644 src/Oro/Bundle/UIBundle/DependencyInjection/Compiler/DynamicAssetVersionPass.php
 create mode 100644 src/Oro/Bundle/UIBundle/Tests/Unit/Asset/DynamicAssetVersionManagerTest.php
 create mode 100644 src/Oro/Bundle/UIBundle/Tests/Unit/Asset/DynamicAssetVersionStrategyTest.php

diff --git a/src/Oro/Bundle/EntityExtendBundle/Resources/public/js/init-entity-extend-apply.js b/src/Oro/Bundle/EntityExtendBundle/Resources/public/js/init-entity-extend-apply.js
index aa4516c1176..00635f27db1 100644
--- a/src/Oro/Bundle/EntityExtendBundle/Resources/public/js/init-entity-extend-apply.js
+++ b/src/Oro/Bundle/EntityExtendBundle/Resources/public/js/init-entity-extend-apply.js
@@ -39,9 +39,8 @@ require([
                     mediator.once('page:afterChange', function() {
                         mediator.execute('showFlashMessage', 'success', __('oro.entity_extend.schema_updated'));
                     });
-                    mediator.execute('redirectTo', {
-                        url: routing.generate('oro_entityconfig_index', {'_enableContentProviders': 'mainMenu'})
-                    });
+                    // force reload of the application to make sure 'js/routes' is reloaded
+                    window.location.href = routing.generate('oro_entityconfig_index');
                 }).fail(function() {
                     modal.close();
                     mediator.execute('showFlashMessage', 'error', __('oro.entity_extend.schema_update_failed'));
diff --git a/src/Oro/Bundle/NavigationBundle/Event/JsRoutingDumpListener.php b/src/Oro/Bundle/NavigationBundle/Event/JsRoutingDumpListener.php
new file mode 100644
index 00000000000..e0ce0c7ac24
--- /dev/null
+++ b/src/Oro/Bundle/NavigationBundle/Event/JsRoutingDumpListener.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Oro\Bundle\NavigationBundle\Event;
+
+use Symfony\Component\Console\Event\ConsoleCommandEvent;
+
+use Oro\Bundle\UIBundle\Asset\DynamicAssetVersionManager;
+
+class JsRoutingDumpListener
+{
+    /** @var DynamicAssetVersionManager */
+    protected $assetVersionManager;
+
+    /**
+     * @param DynamicAssetVersionManager $assetVersionManager
+     */
+    public function __construct(DynamicAssetVersionManager $assetVersionManager)
+    {
+        $this->assetVersionManager = $assetVersionManager;
+    }
+
+    /**
+     * @param ConsoleCommandEvent $event
+     */
+    public function onConsoleCommand(ConsoleCommandEvent $event)
+    {
+        if ('fos:js-routing:dump' === $event->getCommand()->getName()) {
+            $this->assetVersionManager->updateAssetVersion('routing');
+        }
+    }
+}
diff --git a/src/Oro/Bundle/NavigationBundle/OroNavigationBundle.php b/src/Oro/Bundle/NavigationBundle/OroNavigationBundle.php
index 650f573ae67..817c28a6192 100644
--- a/src/Oro/Bundle/NavigationBundle/OroNavigationBundle.php
+++ b/src/Oro/Bundle/NavigationBundle/OroNavigationBundle.php
@@ -8,6 +8,7 @@
 use Oro\Bundle\NavigationBundle\DependencyInjection\Compiler\TagGeneratorPass;
 use Oro\Bundle\NavigationBundle\DependencyInjection\Compiler\MenuBuilderChainPass;
 use Oro\Bundle\NavigationBundle\DependencyInjection\Compiler\ChainBreadcrumbManagerPass;
+use Oro\Bundle\UIBundle\DependencyInjection\Compiler\DynamicAssetVersionPass;
 
 class OroNavigationBundle extends Bundle
 {
@@ -21,5 +22,6 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new MenuBuilderChainPass());
         $container->addCompilerPass(new TagGeneratorPass());
         $container->addCompilerPass(new ChainBreadcrumbManagerPass());
+        $container->addCompilerPass(new DynamicAssetVersionPass('routing'));
     }
 }
diff --git a/src/Oro/Bundle/NavigationBundle/Resources/config/oro/app.yml b/src/Oro/Bundle/NavigationBundle/Resources/config/oro/app.yml
new file mode 100644
index 00000000000..4f665b6449e
--- /dev/null
+++ b/src/Oro/Bundle/NavigationBundle/Resources/config/oro/app.yml
@@ -0,0 +1,10 @@
+framework:
+    templating:
+        packages:
+            routing:
+                version: %assets_version%
+                version_format: %%s?dynamic_version=%%s
+                # the default format cannot be used due the problem with urlArgs in require js
+                # in case if both static and dynamic versions exist we have duplicate of asset version parameter,
+                # something like this: routes.js?version=v123&version=v123-1
+                # version_format: ~ # use the default format
diff --git a/src/Oro/Bundle/NavigationBundle/Resources/config/services.yml b/src/Oro/Bundle/NavigationBundle/Resources/config/services.yml
index 8a954840038..24bfc914cf9 100644
--- a/src/Oro/Bundle/NavigationBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/NavigationBundle/Resources/config/services.yml
@@ -244,6 +244,13 @@ services:
         tags:
             - { name: kernel.event_listener, event: kernel.request, method: onKernelRequest }
 
+    oro_navigation.event.js_routing_dump_listener:
+        class: Oro\Bundle\NavigationBundle\Event\JsRoutingDumpListener
+        arguments:
+            - @oro_ui.dynamic_asset_version_manager
+        tags:
+            - { name: kernel.event_listener, event: console.command, method: onConsoleCommand }
+
     oro_navigation.content.topic_sender:
         class: %oro_navigation.content.topic_sender.class%
         arguments:
diff --git a/src/Oro/Bundle/NavigationBundle/Resources/views/Js/requirejs.config.js.twig b/src/Oro/Bundle/NavigationBundle/Resources/views/Js/requirejs.config.js.twig
index e6134340824..f4e4740d5bc 100644
--- a/src/Oro/Bundle/NavigationBundle/Resources/views/Js/requirejs.config.js.twig
+++ b/src/Oro/Bundle/NavigationBundle/Resources/views/Js/requirejs.config.js.twig
@@ -26,7 +26,7 @@ require({
     {% if app.debug %}
         'oro/routes': '{{ path('fos_js_routing_js', {"callback": "fos.Router.setData"}) }}'
     {% else %}
-        'oro/routes': '../js/routes'
+        'oro/routes': {{ asset('../js/routes', 'routing')|json_encode|raw }}
     {% endif %}
     }
 });
diff --git a/src/Oro/Bundle/NavigationBundle/Tests/Unit/OroNavigationBundleTest.php b/src/Oro/Bundle/NavigationBundle/Tests/Unit/OroNavigationBundleTest.php
deleted file mode 100644
index 07aef7f203b..00000000000
--- a/src/Oro/Bundle/NavigationBundle/Tests/Unit/OroNavigationBundleTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-namespace Oro\Bundle\NavigationBundle\Tests\Unit;
-
-use Oro\Bundle\NavigationBundle\OroNavigationBundle;
-
-class OroNavigationBundleTest extends \PHPUnit_Framework_TestCase
-{
-    public function testBuild()
-    {
-        $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder');
-        $container->expects($this->at(0))
-            ->method('addCompilerPass')
-            ->with(
-                $this->isInstanceOf(
-                    'Oro\Bundle\NavigationBundle\DependencyInjection\Compiler\MenuBuilderChainPass'
-                )
-            );
-        $container->expects($this->at(1))
-            ->method('addCompilerPass')
-            ->with(
-                $this->isInstanceOf(
-                    'Oro\Bundle\NavigationBundle\DependencyInjection\Compiler\TagGeneratorPass'
-                )
-            );
-
-        $bundle = new OroNavigationBundle();
-        $bundle->build($container);
-    }
-}
diff --git a/src/Oro/Bundle/UIBundle/Asset/DynamicAssetVersionManager.php b/src/Oro/Bundle/UIBundle/Asset/DynamicAssetVersionManager.php
new file mode 100644
index 00000000000..b9383fb5753
--- /dev/null
+++ b/src/Oro/Bundle/UIBundle/Asset/DynamicAssetVersionManager.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Oro\Bundle\UIBundle\Asset;
+
+use Doctrine\Common\Cache\CacheProvider;
+
+/**
+ * Provides routines to work with a version of asset packages that can be changed at runtime.
+ */
+class DynamicAssetVersionManager
+{
+    /** @var array */
+    protected $localCache;
+
+    /** @var CacheProvider */
+    protected $cache;
+
+    /**
+     * @param CacheProvider $cache
+     */
+    public function __construct(CacheProvider $cache)
+    {
+        $this->cache      = $cache;
+        $this->localCache = [];
+    }
+
+    /**
+     * Gets the current version of a given asset package.
+     *
+     * @param string $packageName
+     *
+     * @return string the current version of the given asset package
+     */
+    public function getAssetVersion($packageName)
+    {
+        $versionNumber = $this->getCachedAssetVersion($packageName);
+
+        return 0 !== $versionNumber
+            ? (string)$versionNumber
+            : '';
+    }
+
+    /**
+     * Increase the number of the current version of a given asset package.
+     *
+     * @param string $packageName
+     */
+    public function updateAssetVersion($packageName)
+    {
+        $versionNumber = $this->getCachedAssetVersion($packageName) + 1;
+
+        $this->localCache[$packageName] = $versionNumber;
+        $this->cache->save($packageName, $versionNumber);
+    }
+
+    /**
+     * @param string $packageName
+     *
+     * @return int
+     */
+    protected function getCachedAssetVersion($packageName)
+    {
+        if (!array_key_exists($packageName, $this->localCache)) {
+            $version = $this->cache->fetch($packageName);
+
+            $this->localCache[$packageName] = false !== $version
+                ? $version
+                : 0;
+        }
+
+        return $this->localCache[$packageName];
+    }
+}
diff --git a/src/Oro/Bundle/UIBundle/Asset/DynamicAssetVersionStrategy.php b/src/Oro/Bundle/UIBundle/Asset/DynamicAssetVersionStrategy.php
new file mode 100644
index 00000000000..e9c69c5c9e2
--- /dev/null
+++ b/src/Oro/Bundle/UIBundle/Asset/DynamicAssetVersionStrategy.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Oro\Bundle\UIBundle\Asset;
+
+use Symfony\Component\Asset\VersionStrategy\VersionStrategyInterface;
+
+/**
+ * Allows to change the version of an asset package at runtime.
+ */
+class DynamicAssetVersionStrategy implements VersionStrategyInterface
+{
+    /** @var string */
+    protected $staticVersion;
+
+    /** @var string */
+    protected $format;
+
+    /** @var DynamicAssetVersionManager */
+    protected $assetVersionManager;
+
+    /** @var string */
+    protected $packageName;
+
+    /**
+     * @param string      $staticVersion
+     * @param string|null $format
+     */
+    public function __construct($staticVersion, $format = null)
+    {
+        $this->staticVersion = $staticVersion;
+        $this->format        = $format ?: '%s?%s';
+    }
+
+    /**
+     * @param DynamicAssetVersionManager $assetVersionManager
+     */
+    public function setAssetVersionManager(DynamicAssetVersionManager $assetVersionManager)
+    {
+        $this->assetVersionManager = $assetVersionManager;
+    }
+
+    /**
+     * @param string $packageName
+     */
+    public function setAssetPackageName($packageName)
+    {
+        $this->packageName = $packageName;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getVersion($path)
+    {
+        $dynamicVersion = $this->assetVersionManager->getAssetVersion($this->packageName);
+
+        return !empty($dynamicVersion)
+            ? $this->staticVersion . '-' . $dynamicVersion
+            : $this->staticVersion;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function applyVersion($path)
+    {
+        $versionized = sprintf($this->format, ltrim($path, '/'), $this->getVersion($path));
+
+        return $path && '/' === $path[0]
+            ? '/' . $versionized
+            : $versionized;
+    }
+}
diff --git a/src/Oro/Bundle/UIBundle/DependencyInjection/Compiler/DynamicAssetVersionPass.php b/src/Oro/Bundle/UIBundle/DependencyInjection/Compiler/DynamicAssetVersionPass.php
new file mode 100644
index 00000000000..f7083222da6
--- /dev/null
+++ b/src/Oro/Bundle/UIBundle/DependencyInjection/Compiler/DynamicAssetVersionPass.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Oro\Bundle\UIBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * This compiler pass can be used to set the dynamic version strategy for an asset package.
+ */
+class DynamicAssetVersionPass implements CompilerPassInterface
+{
+    const ASSET_VERSION_SERVICE_TEMPLATE = 'assets._version_%s';
+    const ASSET_VERSION_SERVICE_CLASS    = 'Oro\Bundle\UIBundle\Asset\DynamicAssetVersionStrategy';
+    const ASSET_VERSION_MANAGER_SERVICE  = 'oro_ui.dynamic_asset_version_manager';
+
+    /** @var string */
+    protected $packageName;
+
+    /**
+     * @param string $packageName The name of the asset package for which the dynamic version strategy should be set
+     */
+    public function __construct($packageName)
+    {
+        $this->packageName = $packageName;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        $assetVersionServiceId = sprintf(self::ASSET_VERSION_SERVICE_TEMPLATE, $this->packageName);
+        if (!$container->hasDefinition($assetVersionServiceId)) {
+            return;
+        }
+        if (!$container->hasDefinition(self::ASSET_VERSION_MANAGER_SERVICE)) {
+            return;
+        }
+
+        $assetVersionDef = $container->getDefinition($assetVersionServiceId);
+        $assetVersionDef->setClass(self::ASSET_VERSION_SERVICE_CLASS);
+        $assetVersionDef->addMethodCall(
+            'setAssetVersionManager',
+            [new Reference(self::ASSET_VERSION_MANAGER_SERVICE)]
+        );
+        $assetVersionDef->addMethodCall(
+            'setAssetPackageName',
+            [$this->packageName]
+        );
+    }
+}
diff --git a/src/Oro/Bundle/UIBundle/Resources/config/services.yml b/src/Oro/Bundle/UIBundle/Resources/config/services.yml
index e5dc4a76a14..6555ee844a2 100644
--- a/src/Oro/Bundle/UIBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/UIBundle/Resources/config/services.yml
@@ -48,6 +48,18 @@ services:
         scope: request
         arguments: [@request, @router, @oro_security.security_facade]
 
+    oro_ui.dynamic_asset_version_manager:
+        class: Oro\Bundle\UIBundle\Asset\DynamicAssetVersionManager
+        public: false
+        arguments:
+            - @oro_ui.dynamic_asset_version.cache
+
+    oro_ui.dynamic_asset_version.cache:
+        public: false
+        parent: oro.cache.abstract
+        calls:
+            - [ setNamespace, [ 'oro_dynamic_asset_version' ] ]
+
     oro_ui.view.listener:
         class: %oro_ui.view.listener.class%
         arguments:
diff --git a/src/Oro/Bundle/UIBundle/Resources/views/requirejs.config.js.twig b/src/Oro/Bundle/UIBundle/Resources/views/requirejs.config.js.twig
index 81a6eb79424..3d7f67c11c9 100644
--- a/src/Oro/Bundle/UIBundle/Resources/views/requirejs.config.js.twig
+++ b/src/Oro/Bundle/UIBundle/Resources/views/requirejs.config.js.twig
@@ -2,12 +2,6 @@
 {%- if app.user -%}
     {%- set userName = app.user.username -%}
 {%- endif -%}
-{%- set baseAssetParts = asset('bundles')|split('?', 2) -%}
-{%- if baseAssetParts[1] is defined -%}
-require({
-    urlArgs: '{{ baseAssetParts[1] }}'
-});
-{%- endif -%}
 require({
     config: {
         'oroui/js/app': {
diff --git a/src/Oro/Bundle/UIBundle/Tests/Unit/Asset/DynamicAssetVersionManagerTest.php b/src/Oro/Bundle/UIBundle/Tests/Unit/Asset/DynamicAssetVersionManagerTest.php
new file mode 100644
index 00000000000..def376a7100
--- /dev/null
+++ b/src/Oro/Bundle/UIBundle/Tests/Unit/Asset/DynamicAssetVersionManagerTest.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Oro\Bundle\UIBundle\Tests\Unit\Asset;
+
+use Oro\Bundle\UIBundle\Asset\DynamicAssetVersionManager;
+
+class DynamicAssetVersionManagerTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var \PHPUnit_Framework_MockObject_MockObject */
+    protected $cache;
+
+    /** @var DynamicAssetVersionManager */
+    protected $assetVersionManager;
+
+    protected function setUp()
+    {
+        $this->cache               = $this->getMockBuilder('Doctrine\Common\Cache\CacheProvider')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->assetVersionManager = new DynamicAssetVersionManager($this->cache);
+    }
+
+    public function testGetAssetVersionWithEmptyCache()
+    {
+        $this->cache->expects($this->once())
+            ->method('fetch')
+            ->with('test')
+            ->willReturn(false);
+
+        $this->assertSame('', $this->assetVersionManager->getAssetVersion('test'));
+        // test local cache
+        $this->assertSame('', $this->assetVersionManager->getAssetVersion('test'));
+    }
+
+    public function testGetAssetVersion()
+    {
+        $this->cache->expects($this->once())
+            ->method('fetch')
+            ->with('test')
+            ->willReturn(123);
+
+        $this->assertSame('123', $this->assetVersionManager->getAssetVersion('test'));
+        // test local cache
+        $this->assertSame('123', $this->assetVersionManager->getAssetVersion('test'));
+    }
+
+    public function testUpdateAssetVersionWithEmptyCache()
+    {
+        $this->cache->expects($this->once())
+            ->method('fetch')
+            ->with('test')
+            ->willReturn(false);
+        $this->cache->expects($this->once())
+            ->method('save')
+            ->with('test')
+            ->willReturn(1);
+
+        $this->assetVersionManager->updateAssetVersion('test');
+        $this->assertSame('1', $this->assetVersionManager->getAssetVersion('test'));
+    }
+
+    public function testUpdateAssetVersion()
+    {
+        $this->cache->expects($this->once())
+            ->method('fetch')
+            ->with('test')
+            ->willReturn(123);
+        $this->cache->expects($this->once())
+            ->method('save')
+            ->with('test')
+            ->willReturn(124);
+
+        $this->assetVersionManager->updateAssetVersion('test');
+        $this->assertSame('124', $this->assetVersionManager->getAssetVersion('test'));
+    }
+}
diff --git a/src/Oro/Bundle/UIBundle/Tests/Unit/Asset/DynamicAssetVersionStrategyTest.php b/src/Oro/Bundle/UIBundle/Tests/Unit/Asset/DynamicAssetVersionStrategyTest.php
new file mode 100644
index 00000000000..3fcc6e3a36e
--- /dev/null
+++ b/src/Oro/Bundle/UIBundle/Tests/Unit/Asset/DynamicAssetVersionStrategyTest.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Oro\Bundle\UIBundle\Tests\Unit\Asset;
+
+use Oro\Bundle\UIBundle\Asset\DynamicAssetVersionStrategy;
+
+class DynamicAssetVersionStrategyTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider applyVersionProvider
+     */
+    public function testApplyVersion($expectedPath, $path, $format = null, $dynamicVersion = '')
+    {
+        $assetVersionManager  = $this->getMockBuilder('Oro\Bundle\UIBundle\Asset\DynamicAssetVersionManager')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $assetVersionStrategy = new DynamicAssetVersionStrategy(
+            '123',
+            $format
+        );
+        $assetVersionStrategy->setAssetVersionManager($assetVersionManager);
+        $assetVersionStrategy->setAssetPackageName('test_package');
+
+        $assetVersionManager->expects($this->once())
+            ->method('getAssetVersion')
+            ->with('test_package')
+            ->willReturn($dynamicVersion);
+
+        $this->assertEquals(
+            $expectedPath,
+            $assetVersionStrategy->applyVersion($path)
+        );
+    }
+
+    public function applyVersionProvider()
+    {
+        return [
+            ['/css/test.css?123', '/css/test.css'],
+            ['css/test.css?123', 'css/test.css'],
+            ['/css/test.css?123-456', '/css/test.css', null, '456'],
+            ['css/test.css?123-456', 'css/test.css', null, '456'],
+            ['/css/test.css?version=123', '/css/test.css', '%s?version=%s'],
+            ['css/test.css?version=123', 'css/test.css', '%s?version=%s'],
+            ['/css/test.css?version=123-456', '/css/test.css', '%s?version=%s', '456'],
+            ['css/test.css?version=123-456', 'css/test.css', '%s?version=%s', '456'],
+            ['/123/css/test.css', '/css/test.css', '%2$s/%1$s'],
+            ['123/css/test.css', 'css/test.css', '%2$s/%1$s'],
+            ['/123-456/css/test.css', '/css/test.css', '%2$s/%1$s', '456'],
+            ['123-456/css/test.css', 'css/test.css', '%2$s/%1$s', '456'],
+        ];
+    }
+}

From 4509b75dfa5052963eb412cd9d409e01f4400cf3 Mon Sep 17 00:00:00 2001
From: Vova Soroka <vsoroka@magecore.com>
Date: Wed, 13 Jan 2016 05:34:57 +0200
Subject: [PATCH 427/471] BAP-7171: Implement assets version  for our JS files.
 Add assets version for JS routes. Add documentation

---
 src/Oro/Bundle/UIBundle/README.md             |  1 +
 .../UIBundle/Resources/config/services.yml    |  1 -
 .../UIBundle/Resources/doc/dynamic-assets.md  | 83 +++++++++++++++++++
 3 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 src/Oro/Bundle/UIBundle/Resources/doc/dynamic-assets.md

diff --git a/src/Oro/Bundle/UIBundle/README.md b/src/Oro/Bundle/UIBundle/README.md
index e92af524cdc..dcac0ba1e1f 100644
--- a/src/Oro/Bundle/UIBundle/README.md
+++ b/src/Oro/Bundle/UIBundle/README.md
@@ -16,6 +16,7 @@ User interface layouts and controls.
 - [Loading Mask View](./Resources/doc/reference/client-side/loading-mask-view.md)
 - [Scroll Data Customization](./Resources/doc/reference/scroll-data-customization.md)
 - [formatters](./Resources/doc/reference/formatters.md)
+- [Dynamic Assets](./Resources/doc/dynamic-assets.md)
 
 ## Configuration Settings
 
diff --git a/src/Oro/Bundle/UIBundle/Resources/config/services.yml b/src/Oro/Bundle/UIBundle/Resources/config/services.yml
index 6555ee844a2..7b43dd995df 100644
--- a/src/Oro/Bundle/UIBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/UIBundle/Resources/config/services.yml
@@ -50,7 +50,6 @@ services:
 
     oro_ui.dynamic_asset_version_manager:
         class: Oro\Bundle\UIBundle\Asset\DynamicAssetVersionManager
-        public: false
         arguments:
             - @oro_ui.dynamic_asset_version.cache
 
diff --git a/src/Oro/Bundle/UIBundle/Resources/doc/dynamic-assets.md b/src/Oro/Bundle/UIBundle/Resources/doc/dynamic-assets.md
new file mode 100644
index 00000000000..e84c28b6393
--- /dev/null
+++ b/src/Oro/Bundle/UIBundle/Resources/doc/dynamic-assets.md
@@ -0,0 +1,83 @@
+Dynamic Assets
+==============
+
+Sometime assets can be changed during an application life cycle, for instance when an administrator does some configuration of a site. When such situation happens the assets cache should be busted properly. Unfortunately Symfony does not manage this case out of the box. But, fortunately, the [Asset Component](http://symfony.com/doc/current/components/asset/introduction.html) can be easily enhanced to support this feature.
+
+The following samples of code show how to add dynamic versioning for any asset package.
+
+Lets suppose that `acme` asset package should use the dynamic versioning.
+
+At first the package should be registered. You can use `Resources/config/oro/app.yml` in your bundle or `app/config/config.yml`:
+
+```yaml
+framework:
+    templating:
+        packages:
+            acme:
+                version: %assets_version%
+                version_format: ~ # use the default format
+```
+
+The next step is to set [DynamicAssetVersionStrategy](../../Asset/DynamicAssetVersionStrategy.php) for this package. It can be done be DI compiler pass:
+
+```php
+<?php
+
+namespace Acme\Bundle\SomeBundle;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+use Oro\Bundle\UIBundle\DependencyInjection\Compiler\DynamicAssetVersionPass;
+
+class AcmeSomeBundle extends Bundle
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function build(ContainerBuilder $container)
+    {
+        parent::build($container);
+
+        $container->addCompilerPass(new DynamicAssetVersionPass('acme'));
+    }
+}
+```
+
+That's all, the configuration is finished.
+
+Now you need to take care about updating of a version of package when your assets are changed. The following code shows how to update the version:
+
+```php
+<?php
+
+namespace Acme\Bundle\SomeBundle\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+
+class SomeController extends Controller
+{
+    public function updateAction()
+    {
+        ...
+
+        /** @var Oro\Bundle\UIBundle\Asset\DynamicAssetVersionManager $assetVersionManager */
+        $assetVersionManager = $this->get('oro_ui.dynamic_asset_version_manager');
+        $assetVersionManager->updateAssetVersion('acme');
+
+        ...
+    }
+}
+```
+
+The using of you assets are the same as other assets, for example by the well-known `asset()` Twig function:
+
+```twig
+{{ asset('test.js', 'acme') }}
+{# the result may be something like this: test.js?version=123-2 #}
+{# where #}
+{# '123' is the static asset version specified in %assets_version% parameter #}
+{# '2' is the dynamic asset version, this number is increased each time you call $assetVersionManager->updateAssetVersion('acme') #}
+```
+
+Please pay attention that the package name should be passed to the `asset()` function. This tells Symfony that the asset belongs your asset package and the dynamic versioning strategy should be applied.

From 8fb27603dc6a15316c1631f8f799f5e305f7fecc Mon Sep 17 00:00:00 2001
From: Vova Soroka <vsoroka@magecore.com>
Date: Wed, 13 Jan 2016 05:41:34 +0200
Subject: [PATCH 428/471] BAP-7171: Implement assets version  for our JS files.
 Add assets version for JS routes. Add documentation

---
 src/Oro/Bundle/UIBundle/Resources/doc/dynamic-assets.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Oro/Bundle/UIBundle/Resources/doc/dynamic-assets.md b/src/Oro/Bundle/UIBundle/Resources/doc/dynamic-assets.md
index e84c28b6393..8bdeed4f6b7 100644
--- a/src/Oro/Bundle/UIBundle/Resources/doc/dynamic-assets.md
+++ b/src/Oro/Bundle/UIBundle/Resources/doc/dynamic-assets.md
@@ -46,7 +46,7 @@ class AcmeSomeBundle extends Bundle
 
 That's all, the configuration is finished.
 
-Now you need to take care about updating of a version of package when your assets are changed. The following code shows how to update the version:
+Now you need to take care about updating of the package version when your assets are changed. The following code shows how to update the version:
 
 ```php
 <?php
@@ -70,14 +70,14 @@ class SomeController extends Controller
 }
 ```
 
-The using of you assets are the same as other assets, for example by the well-known `asset()` Twig function:
+The usage of your assets is the same as other assets, for example by the well-known `asset()` Twig function:
 
 ```twig
 {{ asset('test.js', 'acme') }}
 {# the result may be something like this: test.js?version=123-2 #}
 {# where #}
 {# '123' is the static asset version specified in %assets_version% parameter #}
-{# '2' is the dynamic asset version, this number is increased each time you call $assetVersionManager->updateAssetVersion('acme') #}
+{# '2' is the dynamic asset version; this number is increased each time you call $assetVersionManager->updateAssetVersion('acme') #}
 ```
 
-Please pay attention that the package name should be passed to the `asset()` function. This tells Symfony that the asset belongs your asset package and the dynamic versioning strategy should be applied.
+Please pay attention that the package name should be passed to the `asset()` function. This tells Symfony that the asset belongs your package and the dynamic versioning strategy should be applied.

From ae5eb8fbd4b4e461415d0ca2ba059a471e36bdd4 Mon Sep 17 00:00:00 2001
From: Vova Soroka <vsoroka@magecore.com>
Date: Wed, 13 Jan 2016 06:58:57 +0200
Subject: [PATCH 429/471] BAP-7171: Implement assets version  for our JS files.
 Fix unit tests

---
 .../Tests/Unit/Asset/DynamicAssetVersionManagerTest.php        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/UIBundle/Tests/Unit/Asset/DynamicAssetVersionManagerTest.php b/src/Oro/Bundle/UIBundle/Tests/Unit/Asset/DynamicAssetVersionManagerTest.php
index def376a7100..345a74c173f 100644
--- a/src/Oro/Bundle/UIBundle/Tests/Unit/Asset/DynamicAssetVersionManagerTest.php
+++ b/src/Oro/Bundle/UIBundle/Tests/Unit/Asset/DynamicAssetVersionManagerTest.php
@@ -16,7 +16,8 @@ protected function setUp()
     {
         $this->cache               = $this->getMockBuilder('Doctrine\Common\Cache\CacheProvider')
             ->disableOriginalConstructor()
-            ->getMock();
+            ->setMethods(['fetch', 'save'])
+            ->getMockForAbstractClass();
         $this->assetVersionManager = new DynamicAssetVersionManager($this->cache);
     }
 

From a2ed5aee636bdde7362a7236d53861c36015dea2 Mon Sep 17 00:00:00 2001
From: Vova Soroka <vsoroka@magecore.com>
Date: Wed, 13 Jan 2016 07:37:08 +0200
Subject: [PATCH 430/471] BAP-7171: Implement assets version  for our JS files.
 Fix functional tests

---
 .../Resources/views/Layout/php/script_widget.html.php          | 1 +
 .../Bundle/LayoutBundle/Tests/Functional/LayoutTestCase.php    | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/script_widget.html.php b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/script_widget.html.php
index daab0c869d0..be2f522bb64 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/script_widget.html.php
+++ b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/script_widget.html.php
@@ -1,5 +1,6 @@
 <?php //@codingStandardsIgnoreFile ?>
 <?php if (!empty($attr['src'])): ?>
+    <?php $attr['src'] = $view['assets']->getUrl($attr['src']); ?>
     <script <?php echo $view['layout']->block($block, 'block_attributes', array('attr' => $attr)) ?>></script>
 <?php else: ?>
     <script <?php echo $view['layout']->block($block, 'block_attributes', array('attr' => $attr)) ?>>
diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Functional/LayoutTestCase.php b/src/Oro/Bundle/LayoutBundle/Tests/Functional/LayoutTestCase.php
index 0a81147c37a..bd8d9075e95 100644
--- a/src/Oro/Bundle/LayoutBundle/Tests/Functional/LayoutTestCase.php
+++ b/src/Oro/Bundle/LayoutBundle/Tests/Functional/LayoutTestCase.php
@@ -51,6 +51,9 @@ protected function normalizeHtml($html)
 
         $html = rtrim($html);
 
+        // remove asset version from HTML attributes
+        $html = preg_replace('/\?version=.*?"/', '"', $html);
+
         return $html;
     }
 }

From a6e2a5c97dc154a0c57a5f92e66ea889e9f42482 Mon Sep 17 00:00:00 2001
From: Vova Soroka <vsoroka@magecore.com>
Date: Wed, 13 Jan 2016 13:42:45 +0200
Subject: [PATCH 431/471] BAP-7171: Implement assets version  for our JS files

---
 .../Resources/public/js/init-entity-extend-apply.js    | 10 ++++------
 .../Resources/views/Js/requirejs.config.js.twig        |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Oro/Bundle/EntityExtendBundle/Resources/public/js/init-entity-extend-apply.js b/src/Oro/Bundle/EntityExtendBundle/Resources/public/js/init-entity-extend-apply.js
index 00635f27db1..077832f4256 100644
--- a/src/Oro/Bundle/EntityExtendBundle/Resources/public/js/init-entity-extend-apply.js
+++ b/src/Oro/Bundle/EntityExtendBundle/Resources/public/js/init-entity-extend-apply.js
@@ -33,12 +33,10 @@ require([
                 progress.show();
 
                 $.post(url, function() {
-                    mediator.once('page:beforeChange', function() {
-                        modal.close();
-                    });
-                    mediator.once('page:afterChange', function() {
-                        mediator.execute('showFlashMessage', 'success', __('oro.entity_extend.schema_updated'));
-                    });
+                    modal.close();
+                    mediator.execute('showFlashMessage', 'success', __('oro.entity_extend.schema_updated'));
+                    mediator.execute('showMessage', 'info', __('Please wait until page will be reloaded...'));
+                    mediator.execute('showLoading');
                     // force reload of the application to make sure 'js/routes' is reloaded
                     window.location.href = routing.generate('oro_entityconfig_index');
                 }).fail(function() {
diff --git a/src/Oro/Bundle/NavigationBundle/Resources/views/Js/requirejs.config.js.twig b/src/Oro/Bundle/NavigationBundle/Resources/views/Js/requirejs.config.js.twig
index f4e4740d5bc..ec5202e0c99 100644
--- a/src/Oro/Bundle/NavigationBundle/Resources/views/Js/requirejs.config.js.twig
+++ b/src/Oro/Bundle/NavigationBundle/Resources/views/Js/requirejs.config.js.twig
@@ -26,7 +26,7 @@ require({
     {% if app.debug %}
         'oro/routes': '{{ path('fos_js_routing_js', {"callback": "fos.Router.setData"}) }}'
     {% else %}
-        'oro/routes': {{ asset('../js/routes', 'routing')|json_encode|raw }}
+        'oro/routes': {{ asset('../js/routes.js', 'routing')|json_encode|raw }}
     {% endif %}
     }
 });

From 2108d5ba89802410dd8b0c75349f662f61e7694b Mon Sep 17 00:00:00 2001
From: Vova Soroka <vsoroka@magecore.com>
Date: Wed, 13 Jan 2016 13:51:09 +0200
Subject: [PATCH 432/471] BAP-7171: Implement assets version  for our JS files

---
 .../InstallerBundle/Composer/AssetsVersionHandler.php     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Oro/Bundle/InstallerBundle/Composer/AssetsVersionHandler.php b/src/Oro/Bundle/InstallerBundle/Composer/AssetsVersionHandler.php
index a97e665c9c9..cc0b209e0f7 100644
--- a/src/Oro/Bundle/InstallerBundle/Composer/AssetsVersionHandler.php
+++ b/src/Oro/Bundle/InstallerBundle/Composer/AssetsVersionHandler.php
@@ -42,8 +42,8 @@ public function setAssetsVersion(array &$parameters, array $options)
         }
 
         $hasChanges = false;
-        if (!$assetsVersionExists || !self::isEnvironmentVariable($options, self::ASSETS_VERSION)) {
-            $assetsVersion = self::generateAssetsVersion($assetsVersionStrategy, $assetsVersion);
+        if (!$assetsVersionExists || !$this->isEnvironmentVariable($options, self::ASSETS_VERSION)) {
+            $assetsVersion = $this->generateAssetsVersion($assetsVersionStrategy, $assetsVersion);
             if (!$assetsVersionExists || null !== $assetsVersion) {
                 $hasChanges = true;
                 $this->io->write(
@@ -83,7 +83,7 @@ protected function getEnvironmentVariablesMap($options)
      */
     protected function isEnvironmentVariable($options, $variableName)
     {
-        $envMap = self::getEnvironmentVariablesMap($options);
+        $envMap = $this->getEnvironmentVariablesMap($options);
 
         return array_key_exists($variableName, $envMap);
     }
@@ -100,7 +100,7 @@ protected function generateAssetsVersion($strategy, $currentVersion)
             return substr(md5(date('c')), 0, 8);
         }
         if ('incremental' === $strategy) {
-            return self::incrementVersion(null !== $currentVersion ? $currentVersion : '0');
+            return $this->incrementVersion(null !== $currentVersion ? $currentVersion : '0');
         }
 
         return null;

From f51be80c86c53d7c28f628ea51a1a0623ccf72f5 Mon Sep 17 00:00:00 2001
From: Mykhailo Sulyma <msulima@magecore.com>
Date: Wed, 13 Jan 2016 14:03:46 +0200
Subject: [PATCH 433/471] BB-1720: Make (Frontend) Product - Add to Shopping
 List(s) an Action  - fix increment of subviews in action header cell on grid
 refresh

---
 .../public/js/datagrid/header-cell/action-header-cell.js         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js
index 651fc05f1e4..fbcab955062 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js
@@ -92,6 +92,7 @@ define([
 
         rebuildAndRender: function(massActions) {
             this.column.set('massActions', massActions);
+            this.subviews = _.without(this.subviews, this.actionsPanel);
 
             this.createActionsPanel();
             this.render();

From 7a6a853f9c945a7eed659d3976d5167e073a18d6 Mon Sep 17 00:00:00 2001
From: Maksym Perepelytsya <mperepelytsya@magecore.com>
Date: Wed, 13 Jan 2016 14:10:03 +0200
Subject: [PATCH 434/471] CRM-4589: Can't import file with Date Time fields  -
 fix tests  - add tests for getPattern with value cases

---
 .../ExcelDateTimeTypeFormatterTest.php        | 25 +++++++++
 .../AbstractFormatConverterTestCase.php       | 56 ++++++++++---------
 2 files changed, 55 insertions(+), 26 deletions(-)

diff --git a/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Formatter/ExcelDateTimeTypeFormatterTest.php b/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Formatter/ExcelDateTimeTypeFormatterTest.php
index 906658c5370..cc18e916fca 100644
--- a/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Formatter/ExcelDateTimeTypeFormatterTest.php
+++ b/src/Oro/Bundle/ImportExportBundle/Tests/Unit/Formatter/ExcelDateTimeTypeFormatterTest.php
@@ -29,6 +29,7 @@ public function setUp()
 
     /**
      * @dataProvider testGetPatternProvider
+     *
      * @param int    $timeType
      * @param string $locale
      * @param string $result
@@ -38,6 +39,19 @@ public function testGetPattern($timeType, $locale, $result)
         $this->assertEquals($result, $this->formatter->getPattern(1, $timeType, $locale));
     }
 
+    /**
+     * @dataProvider testGetPatternWithValueProvider
+     *
+     * @param int    $timeType
+     * @param string $locale
+     * @param        $value
+     * @param string $result
+     */
+    public function testGetPatternWithValue($timeType, $locale, $value, $result)
+    {
+        $this->assertEquals($result, $this->formatter->getPattern(1, $timeType, $locale, $value));
+    }
+
     /**
      * @return array
      */
@@ -56,4 +70,15 @@ public function testGetPatternProvider()
             'locale "en_US" without time' => [\IntlDateFormatter::NONE, 'en_US', 'MM/dd/y']
         ];
     }
+
+    /**
+     * @return array
+     */
+    public function testGetPatternWithValueProvider()
+    {
+        return [
+            'with seconds'    => [null, 'en', '20.01.1999 12:00:00', 'MM/dd/y HH:mm:ss'],
+            'without seconds' => [null, 'en', '20.01.1999 12:00', 'MM/dd/y HH:mm'],
+        ];
+    }
 }
diff --git a/src/Oro/Bundle/LocaleBundle/Tests/Unit/Converter/AbstractFormatConverterTestCase.php b/src/Oro/Bundle/LocaleBundle/Tests/Unit/Converter/AbstractFormatConverterTestCase.php
index 8c53f87618f..9190ba3c756 100644
--- a/src/Oro/Bundle/LocaleBundle/Tests/Unit/Converter/AbstractFormatConverterTestCase.php
+++ b/src/Oro/Bundle/LocaleBundle/Tests/Unit/Converter/AbstractFormatConverterTestCase.php
@@ -30,27 +30,27 @@ abstract class AbstractFormatConverterTestCase extends \PHPUnit_Framework_TestCa
     /**
      * @var array
      */
-    protected $localFormatMap = array(
-        array(null,                       null,                       self::LOCALE_EN, "MMM d, y h:mm a"),
-        array(\IntlDateFormatter::LONG,   \IntlDateFormatter::MEDIUM, self::LOCALE_EN, "MMMM d, y h:mm:ss a"),
-        array(\IntlDateFormatter::LONG,   \IntlDateFormatter::NONE,   self::LOCALE_EN, "MMMM d, y"),
-        array(\IntlDateFormatter::MEDIUM, \IntlDateFormatter::SHORT,  self::LOCALE_EN, "MMM d, y h:mm a"),
-        array(\IntlDateFormatter::MEDIUM, \IntlDateFormatter::NONE,   self::LOCALE_EN, "MMM d, y"),
-        array(null,                       \IntlDateFormatter::NONE,   self::LOCALE_EN, "MMM d, y"),
-        array(\IntlDateFormatter::NONE,   \IntlDateFormatter::MEDIUM, self::LOCALE_EN, "h:mm:ss a"),
-        array(\IntlDateFormatter::NONE,   \IntlDateFormatter::SHORT,  self::LOCALE_EN, "h:mm a"),
-        array(\IntlDateFormatter::NONE,   null,                       self::LOCALE_EN, "h:mm a"),
-
-        array(null,                       null,                       self::LOCALE_RU, "dd.MM.yyyy H:mm"),
-        array(\IntlDateFormatter::LONG,   \IntlDateFormatter::MEDIUM, self::LOCALE_RU, "d MMMM y 'г.' H:mm:ss"),
-        array(\IntlDateFormatter::LONG,   \IntlDateFormatter::NONE,   self::LOCALE_RU, "d MMMM y 'г.'"),
-        array(\IntlDateFormatter::MEDIUM, \IntlDateFormatter::SHORT,  self::LOCALE_RU, "dd.MM.yyyy H:mm"),
-        array(\IntlDateFormatter::MEDIUM, \IntlDateFormatter::NONE,   self::LOCALE_RU, "dd.MM.yyyy"),
-        array(null,                       \IntlDateFormatter::NONE,   self::LOCALE_RU, "dd.MM.yyyy"),
-        array(\IntlDateFormatter::NONE,   \IntlDateFormatter::MEDIUM, self::LOCALE_RU, "H:mm:ss"),
-        array(\IntlDateFormatter::NONE,   \IntlDateFormatter::SHORT,  self::LOCALE_RU, "H:mm"),
-        array(\IntlDateFormatter::NONE,   null,                       self::LOCALE_RU, "H:mm"),
-    );
+    protected $localFormatMap = [
+        [null, null, self::LOCALE_EN, null, "MMM d, y h:mm a"],
+        [\IntlDateFormatter::LONG, \IntlDateFormatter::MEDIUM, self::LOCALE_EN, null, "MMMM d, y h:mm:ss a"],
+        [\IntlDateFormatter::LONG, \IntlDateFormatter::NONE, self::LOCALE_EN, null, "MMMM d, y"],
+        [\IntlDateFormatter::MEDIUM, \IntlDateFormatter::SHORT, self::LOCALE_EN, null, "MMM d, y h:mm a"],
+        [\IntlDateFormatter::MEDIUM, \IntlDateFormatter::NONE, self::LOCALE_EN, null, "MMM d, y"],
+        [null, \IntlDateFormatter::NONE, self::LOCALE_EN, null, "MMM d, y"],
+        [\IntlDateFormatter::NONE, \IntlDateFormatter::MEDIUM, self::LOCALE_EN, null, "h:mm:ss a"],
+        [\IntlDateFormatter::NONE, \IntlDateFormatter::SHORT, self::LOCALE_EN, null, "h:mm a"],
+        [\IntlDateFormatter::NONE, null, self::LOCALE_EN, null, "h:mm a"],
+
+        [null, null, self::LOCALE_RU, null, "dd.MM.yyyy H:mm"],
+        [\IntlDateFormatter::LONG, \IntlDateFormatter::MEDIUM, self::LOCALE_RU, null, "d MMMM y 'г.' H:mm:ss"],
+        [\IntlDateFormatter::LONG, \IntlDateFormatter::NONE, self::LOCALE_RU, null, "d MMMM y 'г.'"],
+        [\IntlDateFormatter::MEDIUM, \IntlDateFormatter::SHORT, self::LOCALE_RU, null, "dd.MM.yyyy H:mm"],
+        [\IntlDateFormatter::MEDIUM, \IntlDateFormatter::NONE, self::LOCALE_RU, null, "dd.MM.yyyy"],
+        [null, \IntlDateFormatter::NONE, self::LOCALE_RU, null, "dd.MM.yyyy"],
+        [\IntlDateFormatter::NONE, \IntlDateFormatter::MEDIUM, self::LOCALE_RU, null, "H:mm:ss"],
+        [\IntlDateFormatter::NONE, \IntlDateFormatter::SHORT, self::LOCALE_RU, null, "H:mm"],
+        [\IntlDateFormatter::NONE, null, self::LOCALE_RU, null, "H:mm"],
+    ];
 
     /**
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
@@ -59,7 +59,7 @@ protected function setUp()
     {
         $this->formatter = $this->getMockBuilder('Oro\Bundle\LocaleBundle\Formatter\DateTimeFormatter')
             ->disableOriginalConstructor()
-            ->setMethods(array('getPattern'))
+            ->setMethods(['getPattern'])
             ->getMock();
 
         $this->formatter->expects($this->any())
@@ -103,8 +103,9 @@ abstract protected function createFormatConverter();
 
     /**
      * @param string $expected
-     * @param int $dateFormat
+     * @param int    $dateFormat
      * @param string $locale
+     *
      * @dataProvider getDateFormatDataProvider
      */
     public function testGetDateFormat($expected, $dateFormat, $locale)
@@ -119,8 +120,9 @@ abstract public function getDateFormatDataProvider();
 
     /**
      * @param string $expected
-     * @param int $timeFormat
+     * @param int    $timeFormat
      * @param string $locale
+     *
      * @dataProvider getTimeFormatDataProvider
      */
     public function testGetTimeFormat($expected, $timeFormat, $locale)
@@ -135,9 +137,10 @@ abstract public function getTimeFormatDataProvider();
 
     /**
      * @param string $expected
-     * @param int $dateFormat
-     * @param int $timeFormat
+     * @param int    $dateFormat
+     * @param int    $timeFormat
      * @param string $locale
+     *
      * @dataProvider getDateTimeFormatDataProvider
      */
     public function testGetDateTimeFormat($expected, $dateFormat, $timeFormat, $locale)
@@ -153,6 +156,7 @@ abstract public function getDateTimeFormatDataProvider();
     /**
      * @param string $expected
      * @param string $locale
+     *
      * @dataProvider getDateFormatDayProvider
      */
     public function testGetDayFormat($expected, $locale)

From d879d76cc61bdad32bb0d86a99e70319ba89f142 Mon Sep 17 00:00:00 2001
From: Mykhailo Sulyma <msulima@magecore.com>
Date: Wed, 13 Jan 2016 14:27:42 +0200
Subject: [PATCH 435/471] BB-1720: Make (Frontend) Product - Add to Shopping
 List(s) an Action  - now action header cell extends BaseView

---
 .../header-cell/action-header-cell.js         | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js
index fbcab955062..f1c31e8ffe7 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js
+++ b/src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/header-cell/action-header-cell.js
@@ -2,8 +2,9 @@ define([
     'underscore',
     'backbone',
     'backgrid',
-    '../actions-panel'
-], function(_, Backbone, Backgrid, ActionsPanel) {
+    '../actions-panel',
+    'oroui/js/app/views/base/view'
+], function(_, Backbone, Backgrid, ActionsPanel, BaseView) {
     'use strict';
 
     var ActionHeaderCell;
@@ -14,9 +15,9 @@ define([
      *
      * @export  orodatagrid/js/datagrid/header-cell/action-header-cell
      * @class   orodatagrid.datagrid.headerCell.ActionHeaderCell
-     * @extends Backbone.View
+     * @extends oroui/js/app/views/base/view
      */
-    ActionHeaderCell = Backbone.View.extend({
+    ActionHeaderCell = BaseView.extend({
         /** @property */
         className: 'action-column renderable',
 
@@ -31,17 +32,16 @@ define([
         },
 
         initialize: function(options) {
-            var datagrid;
+            ActionHeaderCell.__super__.initialize.apply(this, arguments);
 
             this.column = options.column;
             if (!(this.column instanceof Backgrid.Column)) {
                 this.column = new Backgrid.Column(this.column);
             }
 
-            this.subviews = [];
             this.createActionsPanel();
 
-            datagrid = this.column.get('datagrid');
+            var datagrid = this.column.get('datagrid');
             this.listenTo(datagrid, 'enable', this.enable);
             this.listenTo(datagrid, 'disable', this.disable);
             this.listenTo(datagrid.massActions, 'reset', this.rebuildAndRender);
@@ -54,7 +54,6 @@ define([
             if (this.disposed) {
                 return;
             }
-            delete this.actionsPanel;
             delete this.column;
             ActionHeaderCell.__super__.dispose.apply(this, arguments);
         },
@@ -73,13 +72,11 @@ define([
                 );
             });
 
-            this.actionsPanel = new ActionsPanel();
-            this.actionsPanel.setActions(actions);
-            this.subviews.push(this.actionsPanel);
+            this.subview('actionsPanel', new ActionsPanel({'actions': actions}));
         },
 
         render: function() {
-            var panel = this.actionsPanel;
+            var panel = this.subview('actionsPanel');
             this.$el.empty();
             if (panel.haveActions()) {
                 this.$el.append($(this.template).text());
@@ -92,19 +89,18 @@ define([
 
         rebuildAndRender: function(massActions) {
             this.column.set('massActions', massActions);
-            this.subviews = _.without(this.subviews, this.actionsPanel);
 
             this.createActionsPanel();
             this.render();
         },
 
         enable: function() {
-            this.actionsPanel.enable();
+            this.subview('actionsPanel').enable();
             this.$(this.options.controls).removeClass('disabled');
         },
 
         disable: function() {
-            this.actionsPanel.disable();
+            this.subview('actionsPanel').disable();
             this.$(this.options.controls).addClass('disabled');
         }
     });

From fcc1b9b372500750c2772b036fbf10aeb08f8acf Mon Sep 17 00:00:00 2001
From: Makar Sichevoy <sichevoy@gmail.com>
Date: Wed, 13 Jan 2016 14:30:33 +0200
Subject: [PATCH 436/471] CRM-4844: Search api for autocomplete of field
 Context in form

---
 .../ActivityContextApiEntityManager.php       | 32 +++++++---
 .../Event/PrepareContextTitleEvent.php        | 59 +++++++++++++++++++
 .../Resources/config/services.yml             |  1 +
 .../Bundle/EmailBundle/Entity/EmailUser.php   |  2 +
 .../PrepareContextTitleListener.php           | 49 +++++++++++++++
 .../PrepareResultItemListener.php             |  2 +
 .../EventListener/SearchAliasesListener.php   |  2 +
 .../EmailBundle/Resources/config/services.yml |  9 +++
 8 files changed, 147 insertions(+), 9 deletions(-)
 create mode 100644 src/Oro/Bundle/ActivityBundle/Event/PrepareContextTitleEvent.php
 create mode 100644 src/Oro/Bundle/EmailBundle/EventListener/PrepareContextTitleListener.php

diff --git a/src/Oro/Bundle/ActivityBundle/Entity/Manager/ActivityContextApiEntityManager.php b/src/Oro/Bundle/ActivityBundle/Entity/Manager/ActivityContextApiEntityManager.php
index 5712efe1246..9cc3aa91091 100644
--- a/src/Oro/Bundle/ActivityBundle/Entity/Manager/ActivityContextApiEntityManager.php
+++ b/src/Oro/Bundle/ActivityBundle/Entity/Manager/ActivityContextApiEntityManager.php
@@ -5,11 +5,12 @@
 use Doctrine\Common\Util\ClassUtils;
 use Doctrine\Common\Persistence\ObjectManager;
 
-use Oro\Bundle\ActivityBundle\Model\ActivityInterface;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
+use Oro\Bundle\ActivityBundle\Model\ActivityInterface;
 use Oro\Bundle\ActivityBundle\Manager\ActivityManager;
 use Oro\Bundle\EntityBundle\ORM\DoctrineHelper;
 use Oro\Bundle\EntityBundle\ORM\EntityAliasResolver;
@@ -17,6 +18,7 @@
 use Oro\Bundle\EntityExtendBundle\Tools\ExtendHelper;
 use Oro\Bundle\SearchBundle\Engine\ObjectMapper;
 use Oro\Bundle\SoapBundle\Entity\Manager\ApiEntityManager;
+use Oro\Bundle\ActivityBundle\Event\PrepareContextTitleEvent;
 
 class ActivityContextApiEntityManager extends ApiEntityManager
 {
@@ -44,6 +46,9 @@ class ActivityContextApiEntityManager extends ApiEntityManager
     /** @var DoctrineHelper */
     protected $doctrineHelper;
 
+    /** @var EventDispatcherInterface */
+    protected $dispatcher;
+
     /**
      * @param ObjectManager         $om
      * @param ActivityManager       $activityManager
@@ -54,6 +59,7 @@ class ActivityContextApiEntityManager extends ApiEntityManager
      * @param ObjectMapper          $objectMapper
      * @param TranslatorInterface   $translator
      * @param DoctrineHelper        $doctrineHelper
+     * @param EventDispatcherInterface $dispatcher
      */
     public function __construct(
         ObjectManager $om,
@@ -64,7 +70,8 @@ public function __construct(
         EntityAliasResolver $entityAliasResolver,
         ObjectMapper $objectMapper,
         TranslatorInterface $translator,
-        DoctrineHelper $doctrineHelper
+        DoctrineHelper $doctrineHelper,
+        EventDispatcherInterface $dispatcher
     ) {
         parent::__construct(null, $om);
 
@@ -76,6 +83,7 @@ public function __construct(
         $this->mapper               = $objectMapper;
         $this->translator           = $translator;
         $this->doctrineHelper       = $doctrineHelper;
+        $this->dispatcher           = $dispatcher;
     }
 
     /**
@@ -128,14 +136,16 @@ public function getActivityContext($class, $id)
                 );
             }
 
-            if ($fields = $this->mapper->getEntityMapParameter($targetClass, 'title_fields')) {
-                $text = [];
-                foreach ($fields as $field) {
-                    $text[] = $this->mapper->getFieldValue($target, $field);
+            if (!array_key_exists('title', $item) || !$item['title']) {
+                if ($fields = $this->mapper->getEntityMapParameter($targetClass, 'title_fields')) {
+                    $text = [];
+                    foreach ($fields as $field) {
+                        $text[] = $this->mapper->getFieldValue($target, $field);
+                    }
+                    $item['title'] = implode(' ', $text);
+                } else {
+                    $item['title'] = $this->translator->trans('oro.entity.item', ['%id%' => $targetId]);
                 }
-                $item['title'] = implode(' ', $text);
-            } else {
-                $item['title'] = $this->translator->trans('oro.entity.item', ['%id%' => $targetId]);
             }
 
             $item['activityClassAlias'] = $this->entityAliasResolver->getPluralAlias($class);
@@ -147,6 +157,10 @@ public function getActivityContext($class, $id)
             $item['icon'] = $config->get('icon');
             $item['link'] = $link;
 
+            $event = new PrepareContextTitleEvent($item, $targetClass);
+            $this->dispatcher->dispatch(PrepareContextTitleEvent::EVENT_NAME, $event);
+            $item = $event->getItem();
+
             $result[] = $item;
         }
 
diff --git a/src/Oro/Bundle/ActivityBundle/Event/PrepareContextTitleEvent.php b/src/Oro/Bundle/ActivityBundle/Event/PrepareContextTitleEvent.php
new file mode 100644
index 00000000000..c259e92adc4
--- /dev/null
+++ b/src/Oro/Bundle/ActivityBundle/Event/PrepareContextTitleEvent.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Oro\Bundle\ActivityBundle\Event;
+
+use Symfony\Component\EventDispatcher\Event;
+
+/**
+ * This event allow to change context title
+ */
+class PrepareContextTitleEvent extends Event
+{
+    const EVENT_NAME = 'oro_activity.context_title';
+
+    /** @var array */
+    protected $item;
+
+    /** @var string */
+    protected $targetClass;
+
+    /**
+     * @param array $item
+     * @param string $targetClass
+     */
+    public function __construct($item, $targetClass)
+    {
+        $this->item = $item;
+        $this->targetClass = $targetClass;
+    }
+
+    /**
+     * Return item array
+     *
+     * @return array
+     */
+    public function getItem()
+    {
+        return $this->item;
+    }
+
+    /**
+     * Set the item array
+     *
+     * @param array $item
+     */
+    public function setItem($item)
+    {
+        $this->item = $item;
+    }
+
+    /**
+     * Return target class
+     *
+     * @return string
+     */
+    public function getTargetClass()
+    {
+        return $this->targetClass;
+    }
+}
diff --git a/src/Oro/Bundle/ActivityBundle/Resources/config/services.yml b/src/Oro/Bundle/ActivityBundle/Resources/config/services.yml
index af8b51bb7cf..38de8178c3f 100644
--- a/src/Oro/Bundle/ActivityBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/ActivityBundle/Resources/config/services.yml
@@ -170,3 +170,4 @@ services:
             - @oro_search.mapper
             - @translator
             - @oro_entity.doctrine_helper
+            - @event_dispatcher
diff --git a/src/Oro/Bundle/EmailBundle/Entity/EmailUser.php b/src/Oro/Bundle/EmailBundle/Entity/EmailUser.php
index ab29708b512..430492d706d 100644
--- a/src/Oro/Bundle/EmailBundle/Entity/EmailUser.php
+++ b/src/Oro/Bundle/EmailBundle/Entity/EmailUser.php
@@ -42,6 +42,8 @@
  */
 class EmailUser
 {
+    const ENTITY_CLASS = 'Oro\Bundle\EmailBundle\Entity\EmailUser';
+
     /**
      * @var integer
      *
diff --git a/src/Oro/Bundle/EmailBundle/EventListener/PrepareContextTitleListener.php b/src/Oro/Bundle/EmailBundle/EventListener/PrepareContextTitleListener.php
new file mode 100644
index 00000000000..d29c0a9145e
--- /dev/null
+++ b/src/Oro/Bundle/EmailBundle/EventListener/PrepareContextTitleListener.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Oro\Bundle\EmailBundle\EventListener;
+
+use Oro\Bundle\EmailBundle\Entity\Email;
+use Symfony\Component\Routing\Router;
+
+use Oro\Bundle\ActivityBundle\Event\PrepareContextTitleEvent;
+use Oro\Bundle\EntityBundle\ORM\DoctrineHelper;
+
+class PrepareContextTitleListener
+{
+    /** @var Router */
+    protected $router;
+
+    /** @var DoctrineHelper */
+    protected $doctrineHelper;
+
+    /**
+     * Constructor
+     *
+     * @param Router $router
+     * @param DoctrineHelper $doctrineHelper
+     */
+    public function __construct(
+        Router $router,
+        DoctrineHelper $doctrineHelper
+    ) {
+        $this->router = $router;
+        $this->doctrineHelper = $doctrineHelper;
+    }
+
+    /**
+     * Correct link and title for email context by EmailUser entity index
+     *
+     * @param PrepareContextTitleEvent $event
+     */
+    public function prepareEmailContextTitleEvent(PrepareContextTitleEvent $event)
+    {
+        if ($event->getTargetClass() === Email::ENTITY_CLASS) {
+            $item = $event->getItem();
+            /** @var Email $email */
+            $email = $this->doctrineHelper->getEntity(Email::ENTITY_CLASS, $item['targetId']);
+            $item['title'] = $email->getSubject();
+            $item['link'] = $this->router->generate('oro_email_thread_view', ['id' => $item['targetId']], true);
+            $event->setItem($item);
+        }
+    }
+}
diff --git a/src/Oro/Bundle/EmailBundle/EventListener/PrepareResultItemListener.php b/src/Oro/Bundle/EmailBundle/EventListener/PrepareResultItemListener.php
index a6151ad8ec1..834038becc3 100644
--- a/src/Oro/Bundle/EmailBundle/EventListener/PrepareResultItemListener.php
+++ b/src/Oro/Bundle/EmailBundle/EventListener/PrepareResultItemListener.php
@@ -25,6 +25,8 @@ public function __construct(Router $router)
     }
 
     /**
+     * Change search results view for Email entity
+     *
      * @param PrepareResultItemEvent $event
      */
     public function prepareEmailItemDataEvent(PrepareResultItemEvent $event)
diff --git a/src/Oro/Bundle/EmailBundle/EventListener/SearchAliasesListener.php b/src/Oro/Bundle/EmailBundle/EventListener/SearchAliasesListener.php
index c6966c99613..26ff7bec68c 100644
--- a/src/Oro/Bundle/EmailBundle/EventListener/SearchAliasesListener.php
+++ b/src/Oro/Bundle/EmailBundle/EventListener/SearchAliasesListener.php
@@ -9,6 +9,8 @@ class SearchAliasesListener
     const EMAIL_CLASS_NAME = 'Oro\Bundle\EmailBundle\Entity\Email';
 
     /**
+     * Add search alias to correct search by EmailUser index for Email entity
+     *
      * @param SearchAliasesEvent $event
      */
     public function addEmailAliasEvent(SearchAliasesEvent $event)
diff --git a/src/Oro/Bundle/EmailBundle/Resources/config/services.yml b/src/Oro/Bundle/EmailBundle/Resources/config/services.yml
index 36da57be286..394c66dd56e 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/EmailBundle/Resources/config/services.yml
@@ -134,6 +134,7 @@ parameters:
 
     oro_email.listener.search_aliases_listener.class: Oro\Bundle\EmailBundle\EventListener\SearchAliasesListener
     oro_email.listener.prepare_result_item_listener.class: Oro\Bundle\EmailBundle\EventListener\PrepareResultItemListener
+    oro_email.listener.prepare_context_title_listener.class: Oro\Bundle\EmailBundle\EventListener\PrepareContextTitleListener
 
 services:
     oro_email.entity.cache.warmer:
@@ -962,3 +963,11 @@ services:
             - @router
         tags:
             - { name: kernel.event_listener, event: oro_search.prepare_result_item, method: prepareEmailItemDataEvent }
+
+    oro_email.listener.prepare_context_title_listener:
+        class: %oro_email.listener.prepare_context_title_listener.class%
+        arguments:
+            - @router
+            - @oro_entity.doctrine_helper
+        tags:
+            - { name: kernel.event_listener, event: oro_activity.context_title, method: prepareEmailContextTitleEvent }

From eb436ebdae2137021058b76a0d77bd68fda16b0f Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Wed, 13 Jan 2016 14:12:41 +0100
Subject: [PATCH 437/471] BAP-9646: User Edit page is hung with a lot of IMAP
 folders

- optimize memory consumption used by folders
---
 .../Form/Type/EmailFolderTreeType.php         | 61 ++++++++++++++++---
 .../Resources/views/Form/fields.html.twig     | 25 ++++++--
 2 files changed, 74 insertions(+), 12 deletions(-)

diff --git a/src/Oro/Bundle/EmailBundle/Form/Type/EmailFolderTreeType.php b/src/Oro/Bundle/EmailBundle/Form/Type/EmailFolderTreeType.php
index a36a9a7a7bc..7f9f7008dff 100644
--- a/src/Oro/Bundle/EmailBundle/Form/Type/EmailFolderTreeType.php
+++ b/src/Oro/Bundle/EmailBundle/Form/Type/EmailFolderTreeType.php
@@ -2,28 +2,73 @@
 
 namespace Oro\Bundle\EmailBundle\Form\Type;
 
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormEvent;
+use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
+use Oro\Bundle\EmailBundle\Entity\EmailFolder;
+
 class EmailFolderTreeType extends AbstractType
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $resolver->setDefaults([
-            'type' => 'oro_email_email_folder',
-            'allow_add' => true,
-        ]);
+        $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
+            $data = $event->getData();
+            if ($data !== null) {
+                return;
+            }
+
+            $event->setData(new ArrayCollection());
+        });
+
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
+            $collection = $event->getForm()->getData();
+            $data = $event->getData();
+            if (!$data || !$collection instanceof Collection) {
+                return;
+            }
+
+            array_map(
+                [$collection, 'add'],
+                array_map([$this, 'createFolder'], $data)
+            );
+        });
+    }
+
+    /**
+     * @param array $data
+     *
+     * @return EmailFolder
+     */
+    protected function createFolder(array $data)
+    {
+        return (new EmailFolder())
+            ->setSyncEnabled(isset($data['syncEnabled']))
+            ->setFullName($data['fullName'])
+            ->setName($data['name'])
+            ->setType($data['type'])
+            ->setSubFolders(new ArrayCollection(array_map(
+                [$this, 'createFolder'],
+                isset($data['subFolders']) ? $data['subFolders'] : []
+            )));
     }
 
     /**
      * {@inheritDoc}
      */
-    public function getParent()
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        return 'collection';
+        $resolver->setDefaults([
+            'allow_extra_fields' => true,
+        ]);
     }
 
     /**
diff --git a/src/Oro/Bundle/EmailBundle/Resources/views/Form/fields.html.twig b/src/Oro/Bundle/EmailBundle/Resources/views/Form/fields.html.twig
index 4e61a35f22a..14daa5a206f 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/views/Form/fields.html.twig
+++ b/src/Oro/Bundle/EmailBundle/Resources/views/Form/fields.html.twig
@@ -230,10 +230,8 @@
     <div class="folder-tree-widget">
         <input id="check-all" type="checkbox"/><label class="folder-label">All</label>
         <div id="folder-list">
-            {% for child in form.children %}
-                {% if child.vars.value.parentFolder is null and child.vars.value.outdatedAt is null %}
-                    {{ form_row(child) }}
-                {% endif %}
+            {% for key, folder in form.vars.value if folder.parentFolder is null and folder.outdatedAt is null %}
+                {{ _self.renderFolder(key, folder, form.vars.full_name) }}
             {% endfor %}
         </div>
     </div>
@@ -354,3 +352,22 @@
         {{ form_widget(form) }}
     </div>
 {% endmacro %}
+
+{% macro renderFolder(key, folder, namePrefix, maxDepth = 10) %}
+    {% if maxDepth %}
+        <div>
+            <input type="checkbox" name="{{ namePrefix }}[{{ key }}][syncEnabled]"{% if folder.syncEnabled %}checked="checked"{% endif %}>
+            <label class="folder-label">{{ folder.name }}</label>
+            <input type="hidden" name="{{ namePrefix }}[{{ key }}][fullName]" value="{{ folder.fullName }}">
+            <input type="hidden" name="{{ namePrefix }}[{{ key }}][name]" value="{{ folder.name }}">
+            <input type="hidden" name="{{ namePrefix }}[{{ key }}][type]" value="{{ folder.type }}">
+            {% if maxDepth > 1 and folder.subFolders|length > 0 %}
+                <div class="folder-sub-folders">
+                    {% for subKey, subFolder in folder.subFolders %}
+                        {{ _self.renderFolder(subKey, subFolder, namePrefix ~ '[' ~ key ~ '][subFolders]', maxDepth - 1) }}
+                    {% endfor %}
+                </div>
+            {% endif %}
+        </div>
+    {% endif %}
+{% endmacro %}

From a05c6a75702ed515c6410c792576431c89b85aed Mon Sep 17 00:00:00 2001
From: Makar Sichevoy <sichevoy@gmail.com>
Date: Wed, 13 Jan 2016 15:13:33 +0200
Subject: [PATCH 438/471] CRM-4844: Search api for autocomplete of field
 Context in form

---
 .../ContextsToViewTransformer.php             | 24 +++++-
 .../Form/Type/ContextsSelectType.php          | 12 ++-
 .../ActivityBundle/Resources/config/form.yml  |  1 +
 .../Unit/Form/Type/ContextsSelectTypeTest.php | 19 ++++-
 .../PrepareResultItemListener.php             |  9 +--
 .../EventListener/SearchAliasesListener.php   |  5 +-
 .../PrepareContextTitleListenerTest.php       | 78 +++++++++++++++++++
 .../PrepareResultItemListenerTest.php         |  3 +-
 .../SearchAliasesListenerTest.php             |  3 +-
 9 files changed, 134 insertions(+), 20 deletions(-)
 create mode 100644 src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/PrepareContextTitleListenerTest.php

diff --git a/src/Oro/Bundle/ActivityBundle/Form/DataTransformer/ContextsToViewTransformer.php b/src/Oro/Bundle/ActivityBundle/Form/DataTransformer/ContextsToViewTransformer.php
index bf74880d7ad..f534bb32f77 100644
--- a/src/Oro/Bundle/ActivityBundle/Form/DataTransformer/ContextsToViewTransformer.php
+++ b/src/Oro/Bundle/ActivityBundle/Form/DataTransformer/ContextsToViewTransformer.php
@@ -5,10 +5,12 @@
 use Doctrine\Common\Util\ClassUtils;
 use Doctrine\ORM\EntityManager;
 
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
+use Oro\Bundle\ActivityBundle\Event\PrepareContextTitleEvent;
 use Oro\Bundle\EntityConfigBundle\Config\ConfigManager;
 use Oro\Bundle\SearchBundle\Engine\ObjectMapper;
 
@@ -29,25 +31,31 @@ class ContextsToViewTransformer implements DataTransformerInterface
     /* @var TokenStorageInterface */
     protected $securityTokenStorage;
 
+    /** @var EventDispatcherInterface */
+    protected $dispatcher;
+
     /**
      * @param EntityManager         $entityManager
      * @param ConfigManager         $configManager
      * @param TranslatorInterface   $translator
      * @param ObjectMapper          $mapper
      * @param TokenStorageInterface $securityTokenStorage
+     * @param EventDispatcherInterface $dispatcher
      */
     public function __construct(
         EntityManager $entityManager,
         ConfigManager $configManager,
         TranslatorInterface $translator,
         ObjectMapper $mapper,
-        TokenStorageInterface $securityTokenStorage
+        TokenStorageInterface $securityTokenStorage,
+        EventDispatcherInterface $dispatcher
     ) {
         $this->entityManager        = $entityManager;
         $this->configManager        = $configManager;
         $this->translator           = $translator;
         $this->mapper               = $mapper;
         $this->securityTokenStorage = $securityTokenStorage;
+        $this->dispatcher           = $dispatcher;
     }
 
     /**
@@ -64,13 +72,14 @@ public function transform($value)
             $user   = $this->securityTokenStorage->getToken()->getUser();
             foreach ($value as $target) {
                 // Exclude current user
-                if (ClassUtils::getClass($user) === ClassUtils::getClass($target) &&
+                $targetClass = ClassUtils::getClass($target);
+                if (ClassUtils::getClass($user) === $targetClass &&
                     $user->getId() === $target->getId()
                 ) {
                     continue;
                 }
 
-                if ($fields = $this->mapper->getEntityMapParameter(ClassUtils::getClass($target), 'title_fields')) {
+                if ($fields = $this->mapper->getEntityMapParameter($targetClass, 'title_fields')) {
                     $text = [];
                     foreach ($fields as $field) {
                         $text[] = $this->mapper->getFieldValue($target, $field);
@@ -79,10 +88,17 @@ public function transform($value)
                     $text = [$this->translator->trans('oro.entity.item', ['%id%' => $target->getId()])];
                 }
                 $text = implode(' ', $text);
-                if ($label = $this->getClassLabel(ClassUtils::getClass($target))) {
+                if ($label = $this->getClassLabel($targetClass)) {
                     $text .= ' (' . $label . ')';
                 }
 
+                $item['title'] = $text;
+                $item['targetId'] = $target->getId();
+                $event = new PrepareContextTitleEvent($item, $targetClass);
+                $this->dispatcher->dispatch(PrepareContextTitleEvent::EVENT_NAME, $event);
+                $item = $event->getItem();
+                $text = $item['title'];
+
                 $result[] = json_encode(
                     [
                         'text' => $text,
diff --git a/src/Oro/Bundle/ActivityBundle/Form/Type/ContextsSelectType.php b/src/Oro/Bundle/ActivityBundle/Form/Type/ContextsSelectType.php
index 4bbc7deee86..0522b96a998 100644
--- a/src/Oro/Bundle/ActivityBundle/Form/Type/ContextsSelectType.php
+++ b/src/Oro/Bundle/ActivityBundle/Form/Type/ContextsSelectType.php
@@ -12,6 +12,7 @@
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 use Oro\Bundle\ActivityBundle\Form\DataTransformer\ContextsToViewTransformer;
 use Oro\Bundle\EntityConfigBundle\Config\ConfigManager;
@@ -36,25 +37,31 @@ class ContextsSelectType extends AbstractType
     /* @var TokenStorageInterface */
     protected $securityTokenStorage;
 
+    /** @var EventDispatcherInterface */
+    protected $dispatcher;
+
     /**
      * @param EntityManager         $entityManager
      * @param ConfigManager         $configManager
      * @param TranslatorInterface   $translator
      * @param ObjectMapper          $mapper
      * @param TokenStorageInterface $securityTokenStorage
+     * @param EventDispatcherInterface $dispatcher
      */
     public function __construct(
         EntityManager $entityManager,
         ConfigManager $configManager,
         TranslatorInterface $translator,
         ObjectMapper $mapper,
-        TokenStorageInterface $securityTokenStorage
+        TokenStorageInterface $securityTokenStorage,
+        EventDispatcherInterface $dispatcher
     ) {
         $this->entityManager        = $entityManager;
         $this->configManager        = $configManager;
         $this->translator           = $translator;
         $this->mapper               = $mapper;
         $this->securityTokenStorage = $securityTokenStorage;
+        $this->dispatcher           = $dispatcher;
     }
 
     /**
@@ -69,7 +76,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 $this->configManager,
                 $this->translator,
                 $this->mapper,
-                $this->securityTokenStorage
+                $this->securityTokenStorage,
+                $this->dispatcher
             )
         );
     }
diff --git a/src/Oro/Bundle/ActivityBundle/Resources/config/form.yml b/src/Oro/Bundle/ActivityBundle/Resources/config/form.yml
index 2c45598d918..392202a64c4 100644
--- a/src/Oro/Bundle/ActivityBundle/Resources/config/form.yml
+++ b/src/Oro/Bundle/ActivityBundle/Resources/config/form.yml
@@ -7,6 +7,7 @@ services:
             - @translator
             - @oro_search.mapper
             - @security.token_storage
+            - @event_dispatcher
         tags:
             - { name: form.type, alias: oro_activity_contexts_select }
 
diff --git a/src/Oro/Bundle/ActivityBundle/Tests/Unit/Form/Type/ContextsSelectTypeTest.php b/src/Oro/Bundle/ActivityBundle/Tests/Unit/Form/Type/ContextsSelectTypeTest.php
index 60b9720aaf7..42b3fff444b 100644
--- a/src/Oro/Bundle/ActivityBundle/Tests/Unit/Form/Type/ContextsSelectTypeTest.php
+++ b/src/Oro/Bundle/ActivityBundle/Tests/Unit/Form/Type/ContextsSelectTypeTest.php
@@ -26,6 +26,9 @@ class ContextsSelectTypeTest extends TypeTestCase
     /* @var \PHPUnit_Framework_MockObject_MockObject */
     protected $securityTokenStorage;
 
+    /* @var \PHPUnit_Framework_MockObject_MockObject */
+    protected $dispatcher;
+
     protected function setUp()
     {
         parent::setUp();
@@ -45,6 +48,10 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->securityTokenStorage =
             $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')
                 ->disableOriginalConstructor()
@@ -73,7 +80,8 @@ public function testBuildForm()
             $this->configManager,
             $this->translator,
             $this->mapper,
-            $this->securityTokenStorage
+            $this->securityTokenStorage,
+            $this->dispatcher
         );
         $type->buildForm($builder, []);
     }
@@ -102,7 +110,8 @@ public function testSetDefaultOptions()
             $this->configManager,
             $this->translator,
             $this->mapper,
-            $this->securityTokenStorage
+            $this->securityTokenStorage,
+            $this->dispatcher
         );
         $type->setDefaultOptions($resolver);
     }
@@ -114,7 +123,8 @@ public function testGetParent()
             $this->configManager,
             $this->translator,
             $this->mapper,
-            $this->securityTokenStorage
+            $this->securityTokenStorage,
+            $this->dispatcher
         );
         $this->assertEquals('genemu_jqueryselect2_hidden', $type->getParent());
 
@@ -127,7 +137,8 @@ public function testGetName()
             $this->configManager,
             $this->translator,
             $this->mapper,
-            $this->securityTokenStorage
+            $this->securityTokenStorage,
+            $this->dispatcher
         );
         $this->assertEquals('oro_activity_contexts_select', $type->getName());
     }
diff --git a/src/Oro/Bundle/EmailBundle/EventListener/PrepareResultItemListener.php b/src/Oro/Bundle/EmailBundle/EventListener/PrepareResultItemListener.php
index 834038becc3..42b8558649a 100644
--- a/src/Oro/Bundle/EmailBundle/EventListener/PrepareResultItemListener.php
+++ b/src/Oro/Bundle/EmailBundle/EventListener/PrepareResultItemListener.php
@@ -4,13 +4,12 @@
 
 use Symfony\Component\Routing\Router;
 
+use Oro\Bundle\EmailBundle\Entity\Email;
+use Oro\Bundle\EmailBundle\Entity\EmailUser;
 use Oro\Bundle\SearchBundle\Event\PrepareResultItemEvent;
 
 class PrepareResultItemListener
 {
-    const EMAIL_USER_CLASS_NAME = 'Oro\Bundle\EmailBundle\Entity\EmailUser';
-    const EMAIL_CLASS_NAME = 'Oro\Bundle\EmailBundle\Entity\Email';
-
     /** @var Router */
     protected $router;
 
@@ -31,10 +30,10 @@ public function __construct(Router $router)
      */
     public function prepareEmailItemDataEvent(PrepareResultItemEvent $event)
     {
-        if ($event->getResultItem()->getEntityName() === self::EMAIL_USER_CLASS_NAME) {
+        if ($event->getResultItem()->getEntityName() === EmailUser::ENTITY_CLASS) {
             $id = $event->getResultItem()->getEntity()->getEmail()->getId();
             $event->getResultItem()->setRecordId($id);
-            $event->getResultItem()->setEntityName(self::EMAIL_CLASS_NAME);
+            $event->getResultItem()->setEntityName(Email::ENTITY_CLASS);
             $route = $this->router->generate('oro_email_thread_view', ['id' => $id], true);
             $event->getResultItem()->setRecordUrl($route);
         }
diff --git a/src/Oro/Bundle/EmailBundle/EventListener/SearchAliasesListener.php b/src/Oro/Bundle/EmailBundle/EventListener/SearchAliasesListener.php
index 26ff7bec68c..9866b98a442 100644
--- a/src/Oro/Bundle/EmailBundle/EventListener/SearchAliasesListener.php
+++ b/src/Oro/Bundle/EmailBundle/EventListener/SearchAliasesListener.php
@@ -3,11 +3,10 @@
 namespace Oro\Bundle\EmailBundle\EventListener;
 
 use Oro\Bundle\ActivityBundle\Event\SearchAliasesEvent;
+use Oro\Bundle\EmailBundle\Entity\Email;
 
 class SearchAliasesListener
 {
-    const EMAIL_CLASS_NAME = 'Oro\Bundle\EmailBundle\Entity\Email';
-
     /**
      * Add search alias to correct search by EmailUser index for Email entity
      *
@@ -16,7 +15,7 @@ class SearchAliasesListener
     public function addEmailAliasEvent(SearchAliasesEvent $event)
     {
         $aliases = $event->getAliases();
-        if (in_array(self::EMAIL_CLASS_NAME, $event->getTargetClasses(), true)) {
+        if (in_array(Email::ENTITY_CLASS, $event->getTargetClasses(), true)) {
             $aliases[] = 'oro_email';
             $event->setAliases($aliases);
         }
diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/PrepareContextTitleListenerTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/PrepareContextTitleListenerTest.php
new file mode 100644
index 00000000000..16011144c7b
--- /dev/null
+++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/PrepareContextTitleListenerTest.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace Oro\Bundle\EmailBundle\Tests\Unit\EventListener;
+
+use Symfony\Component\Routing\Router;
+
+use Oro\Bundle\EmailBundle\Entity\Email;
+use Oro\Bundle\EntityBundle\ORM\DoctrineHelper;
+use Oro\Bundle\ActivityBundle\Event\PrepareContextTitleEvent;
+use Oro\Bundle\EmailBundle\EventListener\PrepareContextTitleListener;
+
+class PrepareContextTitleListenerTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var PrepareContextTitleListener */
+    protected $listener;
+
+    /** @var \PHPUnit_Framework_MockObject_MockObject|Router */
+    protected $router;
+
+    /** @var \PHPUnit_Framework_MockObject_MockObject|DoctrineHelper */
+    protected $doctrineHelper;
+
+    public function setUp()
+    {
+        $this->router = $this->getMockBuilder('Symfony\Component\Routing\Router')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->doctrineHelper = $this->getMockBuilder('Oro\Bundle\EntityBundle\ORM\DoctrineHelper')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->listener = new PrepareContextTitleListener($this->router, $this->doctrineHelper);
+    }
+
+    public function testPrepareContextTitleEventSkippEntity()
+    {
+        $item = [];
+        $item['title'] = 'title';
+        $targetClass = 'test';
+        $expectedItem = ['title' => 'title'];
+
+        $event = new PrepareContextTitleEvent($item, $targetClass);
+        $this->listener->prepareEmailContextTitleEvent($event);
+
+        $this->assertEquals($expectedItem, $event->getItem());
+    }
+
+    public function testPrepareContextTitleDataEvent()
+    {
+        $item = [];
+        $item['title'] = 'title';
+        $item['targetId'] = 1;
+        $targetClass = Email::ENTITY_CLASS;
+        $expectedItem = ['title' => 'new title', 'link' => 'link', 'targetId' => 1];
+
+        $entity = $this->getMockBuilder('Oro\Bundle\EmailBundle\Entity\Email')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->doctrineHelper->expects($this->once())
+            ->method('getEntity')
+            ->willReturn($entity);
+
+        $this->router->expects($this->once())
+            ->method('generate')
+            ->willReturn('link');
+
+        $entity->expects($this->once())
+            ->method('getSubject')
+            ->willReturn('new title');
+
+        $event = new PrepareContextTitleEvent($item, $targetClass);
+        $this->listener->prepareEmailContextTitleEvent($event);
+
+        $this->assertEquals($expectedItem, $event->getItem());
+    }
+}
diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/PrepareResultItemListenerTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/PrepareResultItemListenerTest.php
index a70b5589d7c..1da4cc2975f 100644
--- a/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/PrepareResultItemListenerTest.php
+++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/PrepareResultItemListenerTest.php
@@ -2,6 +2,7 @@
 
 namespace Oro\Bundle\EmailBundle\Tests\Unit\EventListener;
 
+use Oro\Bundle\EmailBundle\Entity\EmailUser;
 use Symfony\Component\Routing\Router;
 
 use Oro\Bundle\SearchBundle\Query\Result\Item;
@@ -55,7 +56,7 @@ public function testPrepareEmailItemDataEvent()
 
         $this->item->expects($this->once())
             ->method('getEntityName')
-            ->willReturn(PrepareResultItemListener::EMAIL_USER_CLASS_NAME);
+            ->willReturn(EmailUser::ENTITY_CLASS);
         $this->item->expects($this->once())
             ->method('getEntity')
             ->willReturn($entity);
diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/SearchAliasesListenerTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/SearchAliasesListenerTest.php
index cb131a83de5..5587fa58bbc 100644
--- a/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/SearchAliasesListenerTest.php
+++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/SearchAliasesListenerTest.php
@@ -3,6 +3,7 @@
 namespace Oro\Bundle\EmailBundle\Tests\Unit\EventListener;
 
 use Oro\Bundle\ActivityBundle\Event\SearchAliasesEvent;
+use Oro\Bundle\EmailBundle\Entity\Email;
 use Oro\Bundle\EmailBundle\EventListener\SearchAliasesListener;
 
 class SearchAliasesListenerTest extends \PHPUnit_Framework_TestCase
@@ -28,7 +29,7 @@ public function testAddEmailAliasEventSkipped()
     public function testAddEmailAliasEvent()
     {
         $expectedAliases = ['oro_email'];
-        $targetClasses = [SearchAliasesListener::EMAIL_CLASS_NAME];
+        $targetClasses = [Email::ENTITY_CLASS];
         $aliases = [];
         $event = new SearchAliasesEvent($aliases, $targetClasses);
         $this->listener->addEmailAliasEvent($event);

From 8fc6417b7e952de8565cf21238a034bec8e427c7 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Wed, 13 Jan 2016 14:29:47 +0100
Subject: [PATCH 439/471] BAP-9646: User Edit page is hung with a lot of IMAP
 folders

- fix unit tests
---
 .../Tests/Unit/Form/Type/EmailFolderTreeTypeTest.php       | 5 ++---
 .../Tests/Unit/Form/Type/ConfigurationTypeTest.php         | 7 +------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailFolderTreeTypeTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailFolderTreeTypeTest.php
index 3198b80f534..072e537e7e0 100644
--- a/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailFolderTreeTypeTest.php
+++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailFolderTreeTypeTest.php
@@ -32,8 +32,7 @@ public function testSetDefaultOptions()
         $resolver->expects($this->at(0))
             ->method('setDefaults')
             ->with([
-                'type' => 'oro_email_email_folder',
-                'allow_add' => true,
+                'allow_extra_fields' => true
             ]);
 
         $this->emailFolderTreeType->setDefaultOptions($resolver);
@@ -41,7 +40,7 @@ public function testSetDefaultOptions()
 
     public function testGetParent()
     {
-        $this->assertEquals('collection', $this->emailFolderTreeType->getParent());
+        $this->assertEquals('form', $this->emailFolderTreeType->getParent());
     }
 
     public function testGetName()
diff --git a/src/Oro/Bundle/ImapBundle/Tests/Unit/Form/Type/ConfigurationTypeTest.php b/src/Oro/Bundle/ImapBundle/Tests/Unit/Form/Type/ConfigurationTypeTest.php
index 7801e81d1a8..92313b11c62 100644
--- a/src/Oro/Bundle/ImapBundle/Tests/Unit/Form/Type/ConfigurationTypeTest.php
+++ b/src/Oro/Bundle/ImapBundle/Tests/Unit/Form/Type/ConfigurationTypeTest.php
@@ -6,7 +6,6 @@
 use Symfony\Component\Form\PreloadedExtension;
 use Symfony\Component\Form\Test\FormIntegrationTestCase;
 
-use Oro\Bundle\EmailBundle\Form\Type\EmailFolderType;
 use Oro\Bundle\EmailBundle\Form\Type\EmailFolderTreeType;
 use Oro\Bundle\FormBundle\Form\Extension\TooltipFormExtension;
 use Oro\Bundle\ImapBundle\Entity\UserEmailOrigin;
@@ -72,20 +71,16 @@ protected function setUp()
 
     protected function getExtensions()
     {
-        $tooltipExtension = new TooltipFormExtension($this->configProvider, $this->translator);
-
         return array_merge(
             parent::getExtensions(),
             [
                 new PreloadedExtension(
                     [
                         'oro_imap_configuration_check' => new CheckButtonType(),
-                        'oro_email_email_folder' => new EmailFolderType(),
                         'oro_email_email_folder_tree' => new EmailFolderTreeType(),
                     ],
                     [
-                        'text' => [$tooltipExtension],
-                        'collection' => [$tooltipExtension],
+                        'form' => [new TooltipFormExtension($this->configProvider, $this->translator)],
                     ]
                 ),
             ]

From 3bf941140535f09eb796cd6f2098c81cfb178d25 Mon Sep 17 00:00:00 2001
From: Hryhorii Hrebiniuk <hhrebiniuk@magecore.com>
Date: Wed, 13 Jan 2016 13:08:09 +0200
Subject: [PATCH 440/471] CRM-4869: Change the appearance of the highlight for
 phones & emails; change the appearance of buttons

- unified approach for tags and phone/email fields
- fixed issue in firefox with outline
---
 .../Resources/views/macros.html.twig          |  6 +-
 .../inline-editable-view-component.md         |  2 +-
 .../css/less/inline-editable-wrapper.less     | 69 +++++--------------
 .../inline-editable-view-component.js         |  2 +-
 .../inline-editable-wrapper-view.html         | 11 +--
 .../TagBundle/Resources/public/css/form.less  |  8 ---
 .../Resources/public/css/tags-container.less  |  5 +-
 .../public/templates/viewer/tags-view.html    |  4 +-
 .../Resources/views/macros.html.twig          |  2 +-
 .../Resources/public/css/less/mixins.less     | 14 ++++
 ...ntact-element.less => inline-actions.less} | 22 +++---
 .../Resources/public/css/less/oro/main.less   |  2 +-
 .../Resources/public/css/less/variables.less  |  2 +-
 .../UIBundle/Resources/views/macros.html.twig |  6 +-
 14 files changed, 67 insertions(+), 88 deletions(-)
 rename src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/{contact-element.less => inline-actions.less} (65%)

diff --git a/src/Oro/Bundle/EmailBundle/Resources/views/macros.html.twig b/src/Oro/Bundle/EmailBundle/Resources/views/macros.html.twig
index 38919a372aa..ce1c6bc932a 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/views/macros.html.twig
+++ b/src/Oro/Bundle/EmailBundle/Resources/views/macros.html.twig
@@ -359,10 +359,10 @@
             {%- placeholder email_actions with {email: email, entity: entity} -%}
         {% endset -%}
         {% set actions = actions|trim %}
-        <span class="contact-element{% if actions is empty %} contact-element-no-actions{% endif %}">
-            <span class="contact-element-wrapper">{{ _self.email_address_simple(email) }}</span>
+        <span class="inline-actions-element{% if actions is empty %} inline-actions-element_no-actions{% endif %}">
+            <span class="inline-actions-element_wrapper">{{ _self.email_address_simple(email) }}</span>
             {% if actions is not empty -%}
-                <span class="contact-element-actions email-actions">{{ actions|raw }}</span>
+                <span class="inline-actions-element_actions email-actions">{{ actions|raw }}</span>
             {%- endif %}
         </span>
     {% endif %}
diff --git a/src/Oro/Bundle/FormBundle/Resources/doc/reference/inline-editable-view-component.md b/src/Oro/Bundle/FormBundle/Resources/doc/reference/inline-editable-view-component.md
index 98ae75d1257..44738b097cb 100644
--- a/src/Oro/Bundle/FormBundle/Resources/doc/reference/inline-editable-view-component.md
+++ b/src/Oro/Bundle/FormBundle/Resources/doc/reference/inline-editable-view-component.md
@@ -12,7 +12,7 @@ Sample:
 
 ```twig
 {% import 'OroUIBundle::macros.html.twig' as UI %}
-<div class="tags-view-form-container" {{ UI.renderPageComponentAttributes({
+<div {{ UI.renderPageComponentAttributes({
    module: 'oroform/js/app/components/inline-editable-view-component',
    options: {
        frontend_type: 'tags',
diff --git a/src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editable-wrapper.less b/src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editable-wrapper.less
index 48551c1a976..5308943d12a 100644
--- a/src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editable-wrapper.less
+++ b/src/Oro/Bundle/FormBundle/Resources/public/css/less/inline-editable-wrapper.less
@@ -1,68 +1,33 @@
-.inline-editable-wrapper__start-editing-button {
-  display: none !important;
-  position: absolute;
-  top: 1px;
-  right: -2px;
-  width: 25px;
-  height: 25px;
-  line-height: 35px !important;
-  background-color: #fff !important;
-  text-align: center;
-  border: solid 1px #ddd !important;
-  border-radius: 4px;
-  padding-left: 2px;
-  &:hover {
-    box-shadow: 0 2px 5px rgba(0,0,0,0.2);
-  }
-}
-.mobile-version .inline-editable-wrapper:not(.loading) .inline-editable-wrapper__start-editing-button {
-  display: block !important;
-  background-color: #f7f7f7;
-  background-image: -moz-linear-gradient(top,#fdfdfd,#efefef);
-  background-image: -webkit-gradient(linear,0 0,0 100%,from(#fdfdfd),to(#efefef));
-  background-image: -webkit-linear-gradient(top,#fdfdfd,#efefef);
-  background-image: -o-linear-gradient(top,#fdfdfd,#efefef);
-  background-image: linear-gradient(to bottom,#fdfdfd,#efefef);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd', endColorstr='#ffefefef', GradientType=0);
-}
 .inline-editable-wrapper {
-  &.save-success .inline-editable-container{
-    background: #F4FEE2;
-  }
-  &.save-success .inline-editable-container{
+  &.save-success .inline-actions-element {
     background: #F4FEE2;
+    .inline-actions-element-outline(#F4FEE2);
+    .inline-actions-element_actions {
+      visibility: visible;
+    }
   }
-  &.save-fail .inline-editable-container{
+  &.save-fail .inline-actions-element {
     background: #FFEEEE;
+    .inline-actions-element-outline(#FFEEEE);
+    .inline-actions-element_actions {
+      visibility: visible;
+    }
   }
-
-  &.loading .inline-editable-container {
+  &.loading .inline-actions-element {
     background: #f5f5f5;
-    :before {
+    .inline-actions-element-outline(#f5f5f5);
+    &:after {
       background: url('../../../../bundles/oroui/img/loader-16.gif') no-repeat center center rgba(245,245,245,0.7);
       display: block !important;
       content: "";
       position: absolute;
       top: 0;
       right: 1px;
-      width: 27px;
-      height: 27px;
+      width: 24px;
+      height: 24px;
     }
-    &:hover .inline-editable-wrapper__start-editing-button {
-      display: none !important;
-    }
-  }
-  .inline-editable-container {
-    position: relative;
-    display: inline-block;
-    padding-right: 30px;
-    &:hover {
-      background: #f4efd4;
-      outline: 2px #f4efd4 solid;
-      .inline-editable-wrapper__start-editing-button {
-        display: block !important;
-      }
+    &:hover .inline-actions-element_actions {
+      visibility: hidden !important;
     }
   }
 }
diff --git a/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js b/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js
index 966c7cfda40..5edc6b33d05 100644
--- a/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js
+++ b/src/Oro/Bundle/FormBundle/Resources/public/js/app/components/inline-editable-view-component.js
@@ -11,7 +11,7 @@ define(function(require) {
      *
      * ```twig
      * {% import 'OroUIBundle::macros.html.twig' as UI %}
-     * <div class="tags-view-form-container" {{ UI.renderPageComponentAttributes({
+     * <div {{ UI.renderPageComponentAttributes({
      *    module: 'oroform/js/app/components/inline-editable-view-component',
      *    options: {
      *        frontend_type: 'tags',
diff --git a/src/Oro/Bundle/FormBundle/Resources/public/templates/inline-editable-wrapper-view.html b/src/Oro/Bundle/FormBundle/Resources/public/templates/inline-editable-wrapper-view.html
index 13fb7783f3f..7b91581df96 100644
--- a/src/Oro/Bundle/FormBundle/Resources/public/templates/inline-editable-wrapper-view.html
+++ b/src/Oro/Bundle/FormBundle/Resources/public/templates/inline-editable-wrapper-view.html
@@ -1,4 +1,7 @@
-<div class="inline-editable-container">
-    <div data-role="container"></div>
-    <i data-role="start-editing" class="icon-edit hide-text inline-editable-wrapper__start-editing-button">Edit</i>
-</div>
+<span class="inline-actions-element">
+    <span class="inline-actions-element_wrapper" data-role="container"></span>
+    <span class="inline-actions-element_actions">
+        <a href="javascript:void(0);" data-role="start-editing" class="btn icons-holder-text no-hash"
+            title="<%= _.__('Edit') %>"><i class="icon-edit hide-text"><%= _.__('Edit') %></i><%= _.__('Edit') %></a>
+    </span>
+</span>
diff --git a/src/Oro/Bundle/TagBundle/Resources/public/css/form.less b/src/Oro/Bundle/TagBundle/Resources/public/css/form.less
index b769ba9238c..82ee6d2c4a3 100644
--- a/src/Oro/Bundle/TagBundle/Resources/public/css/form.less
+++ b/src/Oro/Bundle/TagBundle/Resources/public/css/form.less
@@ -1,11 +1,3 @@
-.tags-view-form-container {
-  margin-top: -4px;
-  margin-left: -2px;
-  min-height: 27px;
-  .inline-editable-wrapper {
-    padding-left: 2px;
-  }
-}
 .tags-select-editor {
   .select2-container {
     width: calc(~"100% - 62px") !important;
diff --git a/src/Oro/Bundle/TagBundle/Resources/public/css/tags-container.less b/src/Oro/Bundle/TagBundle/Resources/public/css/tags-container.less
index 53d1d767eed..1d8e5add78c 100644
--- a/src/Oro/Bundle/TagBundle/Resources/public/css/tags-container.less
+++ b/src/Oro/Bundle/TagBundle/Resources/public/css/tags-container.less
@@ -1,5 +1,5 @@
 .tags-container {
-  line-height: 24px;
+  line-height: 23px;
 }
 
 .table td.tags-container {
@@ -16,9 +16,10 @@
   line-height: 20px;
   padding: 1px 8px;
   display: inline-block;
-  vertical-align: baseline;
+  vertical-align: bottom;
   &:hover, &:focus {
     color: @tagItemColor;
+    outline-style: none;
   }
 }
 .tags-container__tag-entry_is-my {
diff --git a/src/Oro/Bundle/TagBundle/Resources/public/templates/viewer/tags-view.html b/src/Oro/Bundle/TagBundle/Resources/public/templates/viewer/tags-view.html
index 82d8322f7ba..f2b5ce593ae 100644
--- a/src/Oro/Bundle/TagBundle/Resources/public/templates/viewer/tags-view.html
+++ b/src/Oro/Bundle/TagBundle/Resources/public/templates/viewer/tags-view.html
@@ -1,4 +1,4 @@
-<div class="tags-container">
+<span class="tags-container">
     <% if (tags.length > 0) { %>
         <% _.each(tags , function(tag) { %>
         <a href="<%= tag.url %>"
@@ -9,4 +9,4 @@
     <% } else if (showDefault){ %>
         <%= _.__('N/A') %>
     <% } %>
-</div>
+</span>
diff --git a/src/Oro/Bundle/TagBundle/Resources/views/macros.html.twig b/src/Oro/Bundle/TagBundle/Resources/views/macros.html.twig
index 9a7899a3973..e07637dfaf5 100644
--- a/src/Oro/Bundle/TagBundle/Resources/views/macros.html.twig
+++ b/src/Oro/Bundle/TagBundle/Resources/views/macros.html.twig
@@ -1,7 +1,7 @@
 {% macro renderView(entity) %}
     {% set tagCloudElId = 'tags-' ~ random() %}
     {% import 'OroUIBundle::macros.html.twig' as UI %}
-    <div class="tags-view-form-container" {{ UI.renderPageComponentAttributes({
+    <div {{ UI.renderPageComponentAttributes({
         module: 'oroform/js/app/components/inline-editable-view-component',
         options: {
             frontend_type: 'tags',
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mixins.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mixins.less
index e5dba6fe26f..9b1d53bb39a 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mixins.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mixins.less
@@ -164,3 +164,17 @@
     margin-top: -6px;
   }
 }
+
+.inline-actions-element-outline(@color) {
+  &:before {
+    /* replacement for outline, that renders lines with artifact in FF */
+    content: '';
+    background: transparent;
+    position: absolute;
+    border: 2px solid @color;
+    top: -2px;
+    right: -2px;
+    bottom: -2px;
+    left: -2px;
+  }
+}
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/contact-element.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/inline-actions.less
similarity index 65%
rename from src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/contact-element.less
rename to src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/inline-actions.less
index c1ea5cc1cc1..19e99af408d 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/contact-element.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/inline-actions.less
@@ -1,34 +1,38 @@
-.contact-element {
+.inline-actions-element {
   position: relative;
   top: -4px;
   left: -2px;
-  padding: 0 0 0 2px;
   line-height: 19px;
   display: inline-block;
-  .contact-element-actions {
+  margin-bottom: -3px;
+  .inline-actions-element_actions {
     visibility: hidden;
   }
   &:hover {
     background: @rowSelectedBackground;
-    outline: solid 2px @rowSelectedBackground;
-    .contact-element-actions {
+    .inline-actions-element-outline(@rowSelectedBackground);
+    .inline-actions-element_actions {
       visibility: visible;
     }
   }
-  &.contact-element-no-actions:hover {
+  &.inline-actions-element_no-actions:hover {
     background: transparent;
     outline: none;
   }
-  .contact-element-wrapper {
+  .inline-actions-element_wrapper {
     word-break: break-all;
     padding: 5px 0 3px;
     line-height: 23px;
-    margin-right: 5px;
+    margin-right: 2px;
+    position: relative;
+    z-index: 1;// to get over inline-actions-element-outline
   }
 }
-.contact-element-actions {
+.inline-actions-element_actions {
   display: inline-block;
   vertical-align: top;
+  position: relative;
+  z-index: 1;// to get over inline-actions-element-outline
   .btn {
     font: 0/0 a;
     color: transparent;
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/main.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/main.less
index a6a9ff3224a..00220f49666 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/main.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/main.less
@@ -13,4 +13,4 @@
 @import "footer";
 @import "fs-toolbar";
 @import "flash-messages";
-@import "contact-element";
+@import "inline-actions";
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/variables.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/variables.less
index 35b88f38a18..93b3fd82190 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/variables.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/variables.less
@@ -29,7 +29,7 @@
 @headerIconButtonTextColor:       #2a313a;
 @headerTextColor:                 #cad2da;
 @rowHighlightBackground:          #fffeea;
-@rowSelectedBackground:           #f4efd4;
+@rowSelectedBackground:           #edf5fb;
 @sideBarClosedWidth:              33px;
 @sideBarOpenedWidth:              200px;
 
diff --git a/src/Oro/Bundle/UIBundle/Resources/views/macros.html.twig b/src/Oro/Bundle/UIBundle/Resources/views/macros.html.twig
index e13dc99ec09..d979504f143 100644
--- a/src/Oro/Bundle/UIBundle/Resources/views/macros.html.twig
+++ b/src/Oro/Bundle/UIBundle/Resources/views/macros.html.twig
@@ -929,10 +929,10 @@
             {%- placeholder phone_actions with {phone: phone, entity: entity} -%}
         {% endset -%}
         {% set actions = actions|trim %}
-        <span class="contact-element{% if actions is empty %} contact-element-no-actions{% endif %}">
-            <span class="contact-element-wrapper">{{ _self.renderPhone(phone) }}</span>
+        <span class="inline-actions-element{% if actions is empty %} inline-actions-element_no-actions{% endif %}">
+            <span class="inline-actions-element_wrapper">{{ _self.renderPhone(phone) }}</span>
             {% if actions is not empty -%}
-                <span class="contact-element-actions phone-actions">{{ actions|raw }}</span>
+                <span class="inline-actions-element_actions phone-actions">{{ actions|raw }}</span>
             {%- endif %}
         </span>
     {% endif %}

From 5880de490e70d7d138da43cf225a9adc870ea033 Mon Sep 17 00:00:00 2001
From: Hryhorii Hrebiniuk <hhrebiniuk@magecore.com>
Date: Wed, 13 Jan 2016 14:51:57 +0200
Subject: [PATCH 441/471] CRM-4869: Change the appearance of the highlight for
 phones & emails; change the appearance of buttons

- updated icons
---
 .../templates/inline-editable-wrapper-view.html    |  2 +-
 .../public/css/less/oro/inline-actions.less        | 14 ++++++--------
 .../Resources/public/css/less/variables.less       |  5 ++++-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/Oro/Bundle/FormBundle/Resources/public/templates/inline-editable-wrapper-view.html b/src/Oro/Bundle/FormBundle/Resources/public/templates/inline-editable-wrapper-view.html
index 7b91581df96..382eef30a52 100644
--- a/src/Oro/Bundle/FormBundle/Resources/public/templates/inline-editable-wrapper-view.html
+++ b/src/Oro/Bundle/FormBundle/Resources/public/templates/inline-editable-wrapper-view.html
@@ -2,6 +2,6 @@
     <span class="inline-actions-element_wrapper" data-role="container"></span>
     <span class="inline-actions-element_actions">
         <a href="javascript:void(0);" data-role="start-editing" class="btn icons-holder-text no-hash"
-            title="<%= _.__('Edit') %>"><i class="icon-edit hide-text"><%= _.__('Edit') %></i><%= _.__('Edit') %></a>
+            title="<%= _.__('Edit') %>"><i class="icon-pencil hide-text"><%= _.__('Edit') %></i><%= _.__('Edit') %></a>
     </span>
 </span>
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/inline-actions.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/inline-actions.less
index 19e99af408d..df56e829a37 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/inline-actions.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/inline-actions.less
@@ -9,8 +9,8 @@
     visibility: hidden;
   }
   &:hover {
-    background: @rowSelectedBackground;
-    .inline-actions-element-outline(@rowSelectedBackground);
+    background: @inlineActionBackground;
+    .inline-actions-element-outline(@inlineActionBackground);
     .inline-actions-element_actions {
       visibility: visible;
     }
@@ -37,16 +37,17 @@
     font: 0/0 a;
     color: transparent;
     text-shadow: none;
-    background-color: transparent;
+    border-color: transparent;
+    background: transparent none;
     width: 23px;
     height: 23px;
     padding: 0;
     [class^="icon-"], [class*=" icon-"] {
       width: 14px;
       height: 20px;
-      font: @baseFontSize/26px 'FontAwesome';
-      color: @btnTextColor;
       &:before {
+        font: @baseFontSize/26px 'FontAwesome';
+        color: @inlineActionColor;
         font-size: 15px;
         line-height: 22px;
         height: 22px;
@@ -55,8 +56,5 @@
         .hide-text();
       }
     }
-    &:hover{
-      box-shadow: 0 1px 4px rgba(0,0,0,0.2);
-    }
   }
 }
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/variables.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/variables.less
index 93b3fd82190..d1698d0367b 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/variables.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/variables.less
@@ -28,8 +28,11 @@
 @headerIconButtonColorEnd:        #454f58;
 @headerIconButtonTextColor:       #2a313a;
 @headerTextColor:                 #cad2da;
+@inlineActionColor:               #94b4c9;
+@inlineActionBackground:          #edf5fb;
 @rowHighlightBackground:          #fffeea;
-@rowSelectedBackground:           #edf5fb;
+@rowSelectedBackground:           @inlineActionBackground;
+@cellSelectedBorder:              @inlineActionColor;
 @sideBarClosedWidth:              33px;
 @sideBarOpenedWidth:              200px;
 

From f6a9d3e3e5bc9f5c81bdbf03a4dae7fac16f5295 Mon Sep 17 00:00:00 2001
From: Miloslav Nenadal <miloslav.nenadal@imatic.cz>
Date: Wed, 13 Jan 2016 14:46:20 +0100
Subject: [PATCH 442/471] BAP-9646: User Edit page is hung with a lot of IMAP
 folders

- remove unused code
---
 .../EmailBundle/Form/Type/EmailFolderType.php | 50 -----------
 .../EmailBundle/Resources/config/form.yml     |  6 --
 .../Resources/views/Form/fields.html.twig     | 16 ----
 .../Unit/Form/Type/EmailFolderTypeTest.php    | 86 -------------------
 4 files changed, 158 deletions(-)
 delete mode 100644 src/Oro/Bundle/EmailBundle/Form/Type/EmailFolderType.php
 delete mode 100644 src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailFolderTypeTest.php

diff --git a/src/Oro/Bundle/EmailBundle/Form/Type/EmailFolderType.php b/src/Oro/Bundle/EmailBundle/Form/Type/EmailFolderType.php
deleted file mode 100644
index 021bac3e7bb..00000000000
--- a/src/Oro/Bundle/EmailBundle/Form/Type/EmailFolderType.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-namespace Oro\Bundle\EmailBundle\Form\Type;
-
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
-
-class EmailFolderType extends AbstractType
-{
-    /**
-     * {@inheritDoc}
-     */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
-    {
-        $resolver->setDefaults([
-            'data_class' => 'Oro\Bundle\EmailBundle\Entity\EmailFolder',
-            'nesting_level' => 10,
-        ]);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        if ($options['nesting_level'] > 0) {
-            $builder
-                ->add('syncEnabled', 'checkbox')
-                ->add('fullName', 'hidden')
-                ->add('name', 'hidden')
-                ->add('type', 'hidden')
-                ->add('subFolders', 'collection', [
-                    'type' => 'oro_email_email_folder',
-                    'allow_add' => true,
-                    'options' => [
-                        'nesting_level' => --$options['nesting_level'],
-                    ],
-                ]);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getName()
-    {
-        return 'oro_email_email_folder';
-    }
-}
diff --git a/src/Oro/Bundle/EmailBundle/Resources/config/form.yml b/src/Oro/Bundle/EmailBundle/Resources/config/form.yml
index 1a7ce1eb9ef..1c4eb3c51fe 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/config/form.yml
+++ b/src/Oro/Bundle/EmailBundle/Resources/config/form.yml
@@ -25,7 +25,6 @@ parameters:
     oro_email.form.type.mailbox.class:                    Oro\Bundle\EmailBundle\Form\Type\MailboxType
     oro_email.form.handler.mailbox.class:                 Oro\Bundle\EmailBundle\Form\Handler\MailboxHandler
     oro_email.form.factory.class:                         Oro\Bundle\EmailBundle\Form\Model\Factory
-    oro_email.form.type.email_folder.class:               Oro\Bundle\EmailBundle\Form\Type\EmailFolderType
     oro_email.form.type.email_folder_tree.class:          Oro\Bundle\EmailBundle\Form\Type\EmailFolderTreeType
     oro_email.form.type.filter.originfolder.class:        Oro\Bundle\EmailBundle\Form\Type\Filter\ChoiceOriginFolderFilterType
     oro_email.form.type.email_address_from.class:         Oro\Bundle\EmailBundle\Form\Type\EmailAddressFromType
@@ -225,11 +224,6 @@ services:
     oro_email.form.factory:
         class: %oro_email.form.factory.class%
 
-    oro_email.form.type.email_folder:
-        class: %oro_email.form.type.email_folder.class%
-        tags:
-            - { name: form.type, alias: oro_email_email_folder }
-
     oro_email.form.type.email_folder_tree:
         class: %oro_email.form.type.email_folder_tree.class%
         tags:
diff --git a/src/Oro/Bundle/EmailBundle/Resources/views/Form/fields.html.twig b/src/Oro/Bundle/EmailBundle/Resources/views/Form/fields.html.twig
index 14daa5a206f..6076910bd15 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/views/Form/fields.html.twig
+++ b/src/Oro/Bundle/EmailBundle/Resources/views/Form/fields.html.twig
@@ -204,22 +204,6 @@
     </script>
 {% endblock %}
 
-{% block oro_email_email_folder_row %}
-    {% if form.vars.value is not null and form.vars.value.outdatedAt is null %}
-        <div>
-            {{ form_widget(form.syncEnabled) }}<label class="folder-label">{{ form.vars.value.name }}</label>
-            {{ form_widget(form.fullName) }}
-            {{ form_widget(form.name) }}
-            {{ form_widget(form.type) }}
-            {% if form.vars.value.subFolders|length > 0 %}
-                <div class="folder-sub-folders">
-                    {{ form_widget(form.subFolders) }}
-                </div>
-            {% endif %}
-        </div>
-    {% endif %}
-{% endblock %}
-
 {% block oro_email_email_folder_tree_row %}
     {% if form.vars.value is not null and form.vars.value|length > 0 %}
         {{ form_row(form) }}
diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailFolderTypeTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailFolderTypeTest.php
deleted file mode 100644
index 58a05d49118..00000000000
--- a/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailFolderTypeTest.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-namespace Oro\Bundle\EmailBundle\Tests\Unit\Form\Type;
-
-use Symfony\Component\Form\Test\FormIntegrationTestCase;
-
-use Oro\Bundle\EmailBundle\Form\Type\EmailFolderType;
-
-class EmailFolderTypeTest extends FormIntegrationTestCase
-{
-    /**
-     * @var EmailFolderType|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $emailFolderType;
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function setUp()
-    {
-        $this->emailFolderType = new EmailFolderType();
-
-        parent::setUp();
-    }
-
-    public function testSetDefaultOptions()
-    {
-        $resolver = $this->getMockBuilder('Symfony\Component\OptionsResolver\OptionsResolver')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $resolver->expects($this->at(0))
-            ->method('setDefaults')
-            ->with([
-                'data_class' => 'Oro\Bundle\EmailBundle\Entity\EmailFolder',
-                'nesting_level' => 10,
-            ]);
-
-        $this->emailFolderType->setDefaultOptions($resolver);
-    }
-
-    public function testBuildForm()
-    {
-        $builder = $this->getMockBuilder('Symfony\Component\Form\FormBuilder')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $builder->expects($this->at(0))
-            ->method('add')
-            ->with('syncEnabled', 'checkbox')
-            ->willReturn($builder);
-
-        $builder->expects($this->at(1))
-            ->method('add')
-            ->with('fullName', 'hidden')
-            ->willReturn($builder);
-
-        $builder->expects($this->at(2))
-            ->method('add')
-            ->with('name', 'hidden')
-            ->willReturn($builder);
-
-        $builder->expects($this->at(3))
-            ->method('add')
-            ->with('type', 'hidden')
-            ->willReturn($builder);
-
-        $builder->expects($this->at(4))
-            ->method('add')
-            ->with('subFolders', 'collection', [
-                'type' => 'oro_email_email_folder',
-                'allow_add' => true,
-                'options' => [
-                    'nesting_level' => 4,
-                ],
-            ])
-            ->willReturn($builder);
-
-        $this->emailFolderType->buildForm($builder, ['nesting_level' => 5]);
-    }
-
-    public function testGetName()
-    {
-        $this->assertEquals('oro_email_email_folder', $this->emailFolderType->getName());
-    }
-}

From e8279041f556714491c42a95afd77473c33db44a Mon Sep 17 00:00:00 2001
From: Oleg Popadko <oleg@popadko.com>
Date: Wed, 13 Jan 2016 13:55:44 +0200
Subject: [PATCH 443/471] BB-1944: No "Activity" tab on the entity editing page
 - placeholder applicable if supported and applicable activity lists exists

---
 .../Placeholder/PlaceholderFilter.php         | 50 ++++++++++++-------
 .../Placeholder/PlaceholderFilterTest.php     | 47 ++++++++++++++++-
 2 files changed, 77 insertions(+), 20 deletions(-)

diff --git a/src/Oro/Bundle/ActivityListBundle/Placeholder/PlaceholderFilter.php b/src/Oro/Bundle/ActivityListBundle/Placeholder/PlaceholderFilter.php
index c7b2931ecca..9e4b8c3a5fa 100644
--- a/src/Oro/Bundle/ActivityListBundle/Placeholder/PlaceholderFilter.php
+++ b/src/Oro/Bundle/ActivityListBundle/Placeholder/PlaceholderFilter.php
@@ -66,29 +66,11 @@ public function isApplicable($entity = null, $pageType = null)
         }
 
         $entityClass = $this->doctrineHelper->getEntityClass($entity);
-        if (!$this->configProvider->hasConfig($entityClass)) {
-            return false;
-        }
-
-        $hasAppliedActivityAssociation = false;
-        $activityAssociations          = $this->activityManager->getActivityAssociations($entityClass);
-        foreach ($activityAssociations as $activityAssociation) {
-            $isAssociationAccessible = ExtendHelper::isFieldAccessible(
-                $this->configProvider->getConfig(
-                    $activityAssociation['className'],
-                    $activityAssociation['associationName']
-                )
-            );
-            if ($isAssociationAccessible) {
-                $hasAppliedActivityAssociation = true;
-                break;
-            }
-        }
 
         /**
          * If at least one activity is accessible we can continue otherwise no.
          */
-        if (!$hasAppliedActivityAssociation) {
+        if (!$this->hasApplicableActivityAssociations($entityClass)) {
             return false;
         }
 
@@ -102,6 +84,36 @@ public function isApplicable($entity = null, $pageType = null)
         );
     }
 
+    /**
+     * @param string $entityClass
+     * @return bool
+     */
+    protected function hasApplicableActivityAssociations($entityClass)
+    {
+        if (!$this->configProvider->hasConfig($entityClass)) {
+            return false;
+        }
+        $supportedActivities = $this->activityListProvider->getSupportedActivities();
+        foreach ($supportedActivities as $supportedActivity) {
+            if ($this->activityListProvider->isApplicableTarget($entityClass, $supportedActivity)) {
+                return true;
+            }
+        }
+        $activityAssociations = $this->activityManager->getActivityAssociations($entityClass);
+        foreach ($activityAssociations as $activityAssociation) {
+            $isAssociationAccessible = ExtendHelper::isFieldAccessible(
+                $this->configProvider->getConfig(
+                    $activityAssociation['className'],
+                    $activityAssociation['associationName']
+                )
+            );
+            if ($isAssociationAccessible) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * @param string $entityClass
      * @param int    $pageType
diff --git a/src/Oro/Bundle/ActivityListBundle/Tests/Unit/Placeholder/PlaceholderFilterTest.php b/src/Oro/Bundle/ActivityListBundle/Tests/Unit/Placeholder/PlaceholderFilterTest.php
index 60db6fd0b71..7be178c53b8 100644
--- a/src/Oro/Bundle/ActivityListBundle/Tests/Unit/Placeholder/PlaceholderFilterTest.php
+++ b/src/Oro/Bundle/ActivityListBundle/Tests/Unit/Placeholder/PlaceholderFilterTest.php
@@ -5,12 +5,14 @@
 use Doctrine\Common\Persistence\ManagerRegistry;
 
 use Oro\Bundle\ActivityBundle\EntityConfig\ActivityScope;
+use Oro\Bundle\ActivityBundle\Manager\ActivityManager;
 use Oro\Bundle\ActivityListBundle\Placeholder\PlaceholderFilter;
 use Oro\Bundle\ActivityListBundle\Provider\ActivityListChainProvider;
 use Oro\Bundle\ActivityListBundle\Tests\Unit\Placeholder\Fixture\TestNonActiveTarget;
 use Oro\Bundle\ActivityListBundle\Tests\Unit\Placeholder\Fixture\TestNonManagedTarget;
 use Oro\Bundle\ActivityListBundle\Tests\Unit\Placeholder\Fixture\TestTarget;
 use Oro\Bundle\EntityBundle\ORM\DoctrineHelper;
+use Oro\Bundle\EntityConfigBundle\Config\ConfigManager;
 use Oro\Bundle\EntityConfigBundle\Tests\Unit\ConfigProviderMock;
 use Oro\Bundle\UIBundle\Event\BeforeGroupingChainWidgetEvent;
 
@@ -19,7 +21,7 @@ class PlaceholderFilterTest extends \PHPUnit_Framework_TestCase
     /** @var \PHPUnit_Framework_MockObject_MockObject|ActivityListChainProvider */
     protected $activityListProvider;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject|ActivityListChainProvider */
+    /** @var \PHPUnit_Framework_MockObject_MockObject|ActivityManager */
     protected $activityManager;
 
     /** @var \PHPUnit_Framework_MockObject_MockObject|ManagerRegistry */
@@ -80,6 +82,7 @@ public function setUp()
                 return !$entity instanceof TestNonManagedTarget;
             });
 
+        /** @var ConfigManager $configManager */
         $configManager        = $this->getMockBuilder('Oro\Bundle\EntityConfigBundle\Config\ConfigManager')
             ->disableOriginalConstructor()
             ->getMock();
@@ -105,6 +108,10 @@ public function testIsApplicable()
         );
         $this->configProvider->addFieldConfig($entityClass, 'associationField');
 
+        $this->activityListProvider->expects($this->once())
+            ->method('getSupportedActivities')
+            ->willReturn([]);
+
         $this->activityManager
             ->expects($this->once())
             ->method('getActivityAssociations')
@@ -119,6 +126,35 @@ public function testIsApplicable()
         $this->assertFalse($this->filter->isApplicable(null, ActivityScope::VIEW_PAGE));
     }
 
+    public function testIsApplicableWithSupportedActivityList()
+    {
+        $testTarget = new TestTarget(1);
+
+        $entityClass = get_class($testTarget);
+        $this->configProvider->addEntityConfig(
+            $entityClass,
+            [ActivityScope::SHOW_ON_PAGE => '\Oro\Bundle\ActivityBundle\EntityConfig\ActivityScope::VIEW_PAGE']
+        );
+
+        $supportedActivity = 'Class/Name';
+        $this->activityListProvider->expects($this->once())
+            ->method('getSupportedActivities')
+            ->willReturn([$supportedActivity]);
+
+        $this->activityListProvider->expects($this->exactly(1))
+            ->method('isApplicableTarget')
+            ->with($entityClass, $supportedActivity)
+            ->willReturn(true);
+
+        $this->activityManager
+            ->expects($this->never())
+            ->method('getActivityAssociations')
+            ->with($entityClass)
+            ->willReturn([]);
+
+        $this->assertTrue($this->filter->isApplicable($testTarget, ActivityScope::VIEW_PAGE));
+    }
+
     public function testIsApplicableWithNonManagedEntity()
     {
         $testTarget = new TestNonManagedTarget(1);
@@ -134,6 +170,11 @@ public function testIsApplicableWithShowOnPageConfiguration()
             $entityClass,
             [ActivityScope::SHOW_ON_PAGE => '\Oro\Bundle\ActivityBundle\EntityConfig\ActivityScope::UPDATE_PAGE']
         );
+
+        $this->activityListProvider->expects($this->exactly(2))
+            ->method('getSupportedActivities')
+            ->willReturn([]);
+
         $this->configProvider->addFieldConfig($entityClass, 'associationField');
         $this->activityManager->expects($this->exactly(2))
             ->method('getActivityAssociations')
@@ -174,6 +215,10 @@ public function testIsApplicableOnNonSupportedTarget()
         );
         $this->configProvider->addFieldConfig($entityClass, 'associationField');
 
+        $this->activityListProvider->expects($this->once())
+            ->method('getSupportedActivities')
+            ->willReturn([]);
+
         $this->activityManager
             ->expects($this->once())
             ->method('getActivityAssociations')

From 5ef5b889c615f045ab8bb48f669347bf2c85abf2 Mon Sep 17 00:00:00 2001
From: dmitrosh <dshykalenko@magecore.com>
Date: Wed, 13 Jan 2016 17:25:05 +0200
Subject: [PATCH 444/471] CRM-4888: resole view promise in case tinymce was not
 initialized and remove old fix

---
 .../wysiwig-editor/wysiwyg-editor-view.js     | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/Oro/Bundle/FormBundle/Resources/public/js/app/views/wysiwig-editor/wysiwyg-editor-view.js b/src/Oro/Bundle/FormBundle/Resources/public/js/app/views/wysiwig-editor/wysiwyg-editor-view.js
index 4f67d7b7903..f0eb0a57fb7 100644
--- a/src/Oro/Bundle/FormBundle/Resources/public/js/app/views/wysiwig-editor/wysiwyg-editor-view.js
+++ b/src/Oro/Bundle/FormBundle/Resources/public/js/app/views/wysiwig-editor/wysiwyg-editor-view.js
@@ -11,6 +11,7 @@ define(function(require) {
     WysiwygEditorView = BaseView.extend({
         TINYMCE_UI_HEIGHT: 3,
         TEXTAREA_UI_HEIGHT: 22,
+        TINYMCE_TIMEOUT: 1000, //after this time view promise will be resolved anyway
 
         autoRender: true,
         firstRender: true,
@@ -92,17 +93,6 @@ define(function(require) {
             }
             this.$el.tinymce(_.extend({
                 'init_instance_callback': function(editor) {
-                    /**
-                     * fix of https://magecore.atlassian.net/browse/BAP-7130
-                     * "WYSWING editor does not work with IE"
-                     * Please check if it's still required after tinyMCE update
-                     */
-                    setTimeout(function() {
-                        var focusedElement = $(':focus');
-                        editor.focus();
-                        focusedElement.focus();
-                    }, 0);
-
                     self.removeSubview('loadingMask');
                     self.tinymceInstance = editor;
                     _.defer(function() {
@@ -115,6 +105,23 @@ define(function(require) {
                 }
             }, options));
             this.tinymceConnected = true;
+
+            /**
+             * In case when TinyMCE in some reason wasn't initialized we resolve the view anyway
+             */
+            _.delay(function() {
+                if ('deferredRender' in self === false) {
+                    return;
+                }
+                if (window.console && window.console.warn) {
+                    window.console.warn('TinyMCE initialization fault');
+                }
+                self.removeSubview('loadingMask');
+                self.tinymceInstance = null;
+                self.tinymceConnected = false;
+                self.$el.css('visibility', '');
+                self._resolveDeferredRender();
+            }, this.TINYMCE_TIMEOUT);
         },
 
         setEnabled: function(enabled) {

From 6ab711d5f96ae5d5fc5d740d5595db903bdfbd9e Mon Sep 17 00:00:00 2001
From: Hryhorii Hrebiniuk <hhrebiniuk@magecore.com>
Date: Wed, 13 Jan 2016 18:28:07 +0200
Subject: [PATCH 445/471] CRM-4869: Change the appearance of the highlight for
 phones & emails; change the appearance of buttons

- fixed mobile version
---
 .../TagBundle/Resources/public/css/main.less      |  2 ++
 .../Resources/public/css/mobile/main.less         |  3 +++
 .../public/css/mobile/tags-container.less         |  6 ++++++
 .../Resources/public/css/less/mixins.less         | 14 ++------------
 .../{contact-element.less => inline-actions.less} |  8 ++++----
 .../Resources/public/css/less/mobile/main.less    |  2 +-
 .../public/css/less/oro/inline-actions.less       | 15 +++++++--------
 7 files changed, 25 insertions(+), 25 deletions(-)
 create mode 100644 src/Oro/Bundle/TagBundle/Resources/public/css/mobile/main.less
 create mode 100644 src/Oro/Bundle/TagBundle/Resources/public/css/mobile/tags-container.less
 rename src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/{contact-element.less => inline-actions.less} (74%)

diff --git a/src/Oro/Bundle/TagBundle/Resources/public/css/main.less b/src/Oro/Bundle/TagBundle/Resources/public/css/main.less
index d941f01d64b..74b39e2d149 100644
--- a/src/Oro/Bundle/TagBundle/Resources/public/css/main.less
+++ b/src/Oro/Bundle/TagBundle/Resources/public/css/main.less
@@ -4,3 +4,5 @@
 @import "./tags-container";
 @import "./form";
 @import "./config";
+
+@import "./mobile/main";
diff --git a/src/Oro/Bundle/TagBundle/Resources/public/css/mobile/main.less b/src/Oro/Bundle/TagBundle/Resources/public/css/mobile/main.less
new file mode 100644
index 00000000000..d23dba9b2a4
--- /dev/null
+++ b/src/Oro/Bundle/TagBundle/Resources/public/css/mobile/main.less
@@ -0,0 +1,3 @@
+.mobile-version {
+  @import "./tags-container";
+}
diff --git a/src/Oro/Bundle/TagBundle/Resources/public/css/mobile/tags-container.less b/src/Oro/Bundle/TagBundle/Resources/public/css/mobile/tags-container.less
new file mode 100644
index 00000000000..7fd6f6f14d1
--- /dev/null
+++ b/src/Oro/Bundle/TagBundle/Resources/public/css/mobile/tags-container.less
@@ -0,0 +1,6 @@
+.inline-actions-element {
+  .tags-container {
+    top: -3px;
+    position: relative;
+  }
+}
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mixins.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mixins.less
index 9b1d53bb39a..f91a8b6b71e 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mixins.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mixins.less
@@ -165,16 +165,6 @@
   }
 }
 
-.inline-actions-element-outline(@color) {
-  &:before {
-    /* replacement for outline, that renders lines with artifact in FF */
-    content: '';
-    background: transparent;
-    position: absolute;
-    border: 2px solid @color;
-    top: -2px;
-    right: -2px;
-    bottom: -2px;
-    left: -2px;
-  }
+.inline-actions-element-outline(@color, @width: 2px) {
+  box-shadow: 0 0 0 @width @color;
 }
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/contact-element.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/inline-actions.less
similarity index 74%
rename from src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/contact-element.less
rename to src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/inline-actions.less
index 62205c8a006..8a64c4deaf3 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/contact-element.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/inline-actions.less
@@ -1,13 +1,13 @@
-.contact-element {
+.inline-actions-element {
   top: 0;
-  .contact-element-actions {
+  .inline-actions-element_actions {
     visibility: visible;
   }
-  .contact-element-wrapper {
+  .inline-actions-element_wrapper {
     line-height: 28px;
   }
 }
-.contact-element-actions {
+.inline-actions-element_actions {
   .btn {
     width: 28px;
     height: 28px;
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/main.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/main.less
index 1a893e6cb24..f37da202523 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/main.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/mobile/main.less
@@ -13,5 +13,5 @@
   @import "page-header";
   @import "scrollspy";
   @import "flash-messages";
-  @import "contact-element";
+  @import "inline-actions";
 }
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/inline-actions.less b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/inline-actions.less
index df56e829a37..c9599d07afb 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/inline-actions.less
+++ b/src/Oro/Bundle/UIBundle/Resources/public/css/less/oro/inline-actions.less
@@ -24,24 +24,23 @@
     padding: 5px 0 3px;
     line-height: 23px;
     margin-right: 2px;
-    position: relative;
-    z-index: 1;// to get over inline-actions-element-outline
   }
 }
 .inline-actions-element_actions {
   display: inline-block;
   vertical-align: top;
-  position: relative;
-  z-index: 1;// to get over inline-actions-element-outline
   .btn {
     font: 0/0 a;
-    color: transparent;
-    text-shadow: none;
-    border-color: transparent;
-    background: transparent none;
     width: 23px;
     height: 23px;
     padding: 0;
+    &, &:focus, &:active, &:hover {
+      color: transparent;
+      text-shadow: none;
+      border-color: transparent;
+      background: transparent none;
+      box-shadow: none;
+    }
     [class^="icon-"], [class*=" icon-"] {
       width: 14px;
       height: 20px;

From bd6763a446e3aa450ce5eda777b4329b7ce43b2a Mon Sep 17 00:00:00 2001
From: Makar Sichevoy <sichevoy@gmail.com>
Date: Wed, 13 Jan 2016 18:37:42 +0200
Subject: [PATCH 446/471] CRM-4846: Grid on activity page

---
 .../Entity/Manager/ActivityListManager.php    |  17 ++-
 .../Repository/ActivityListRepository.php     |  21 +++-
 .../Event/ActivityListPreQueryBuildEvent.php  |  68 ++++++++++++
 .../Resources/config/services.yml             |   1 +
 .../ActivityListPreQueryBuildEventTest.php    |  24 +++++
 .../ActivityListPreQueryBuildListener.php     |  44 ++++++++
 .../PrepareContextTitleListener.php           |   4 +-
 .../PrepareResultItemListener.php             |   2 -
 .../EmailBundle/Resources/config/services.yml |   8 ++
 .../ActivityListPreQueryBuildListenerTest.php | 101 ++++++++++++++++++
 10 files changed, 277 insertions(+), 13 deletions(-)
 create mode 100644 src/Oro/Bundle/ActivityListBundle/Event/ActivityListPreQueryBuildEvent.php
 create mode 100644 src/Oro/Bundle/ActivityListBundle/Tests/Unit/Event/ActivityListPreQueryBuildEventTest.php
 create mode 100644 src/Oro/Bundle/EmailBundle/EventListener/ActivityListPreQueryBuildListener.php
 create mode 100644 src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/ActivityListPreQueryBuildListenerTest.php

diff --git a/src/Oro/Bundle/ActivityListBundle/Entity/Manager/ActivityListManager.php b/src/Oro/Bundle/ActivityListBundle/Entity/Manager/ActivityListManager.php
index 48feaa073c1..78a82dea3f9 100644
--- a/src/Oro/Bundle/ActivityListBundle/Entity/Manager/ActivityListManager.php
+++ b/src/Oro/Bundle/ActivityListBundle/Entity/Manager/ActivityListManager.php
@@ -6,6 +6,8 @@
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\QueryBuilder;
 
+use Oro\Bundle\ActivityListBundle\Event\ActivityListPreQueryBuildEvent;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Security\Core\Util\ClassUtils;
 
 use Oro\Bundle\ActivityListBundle\Helper\ActivityInheritanceTargetsHelper;
@@ -55,6 +57,9 @@ class ActivityListManager
     /** @var ActivityInheritanceTargetsHelper */
     protected $activityInheritanceTargetsHelper;
 
+    /** @var EventDispatcherInterface */
+    protected $eventDispatcher;
+
     /**
      * @param SecurityFacade                $securityFacade
      * @param EntityNameResolver            $entityNameResolver
@@ -66,6 +71,7 @@ class ActivityListManager
      * @param DoctrineHelper                $doctrineHelper
      * @param ActivityListAclCriteriaHelper $aclHelper
      * @param ActivityInheritanceTargetsHelper $activityInheritanceTargetsHelper
+     * @param EventDispatcherInterface      $eventDispatcher
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -79,7 +85,8 @@ public function __construct(
         CommentApiManager $commentManager,
         DoctrineHelper $doctrineHelper,
         ActivityListAclCriteriaHelper $aclHelper,
-        ActivityInheritanceTargetsHelper $activityInheritanceTargetsHelper
+        ActivityInheritanceTargetsHelper $activityInheritanceTargetsHelper,
+        EventDispatcherInterface $eventDispatcher
     ) {
         $this->securityFacade           = $securityFacade;
         $this->entityNameResolver       = $entityNameResolver;
@@ -91,6 +98,7 @@ public function __construct(
         $this->doctrineHelper           = $doctrineHelper;
         $this->activityListAclHelper    = $aclHelper;
         $this->activityInheritanceTargetsHelper = $activityInheritanceTargetsHelper;
+        $this->eventDispatcher = $eventDispatcher;
     }
 
     /**
@@ -260,15 +268,18 @@ public function getEntityViewModel(ActivityList $entity, $targetEntityData = [])
 
     /**
      * @param string $entityClass
-     * @param string $entityId
+     * @param int $entityId
      *
      * @return QueryBuilder
      */
     protected function getBaseQB($entityClass, $entityId)
     {
+        $event = new ActivityListPreQueryBuildEvent($entityClass, $entityId);
+        $this->eventDispatcher->dispatch(ActivityListPreQueryBuildEvent::EVENT_NAME, $event);
+        $entityIds = $event->getTargetIds();
         return $this->getRepository()->getBaseActivityListQueryBuilder(
             $entityClass,
-            $entityId,
+            $entityIds,
             $this->config->get('oro_activity_list.sorting_field'),
             $this->config->get('oro_activity_list.sorting_direction'),
             $this->config->get('oro_activity_list.grouping')
diff --git a/src/Oro/Bundle/ActivityListBundle/Entity/Repository/ActivityListRepository.php b/src/Oro/Bundle/ActivityListBundle/Entity/Repository/ActivityListRepository.php
index 9732ad34c46..c0b0d1f9c3d 100644
--- a/src/Oro/Bundle/ActivityListBundle/Entity/Repository/ActivityListRepository.php
+++ b/src/Oro/Bundle/ActivityListBundle/Entity/Repository/ActivityListRepository.php
@@ -54,7 +54,7 @@ public function getActivityListQueryBuilder(
 
     /**
      * @param string  $entityClass
-     * @param integer $entityId
+     * @param integer|integer[] $entityIds
      * @param string  $orderField
      * @param string  $orderDirection
      * @param boolean $grouping
@@ -63,16 +63,27 @@ public function getActivityListQueryBuilder(
      */
     public function getBaseActivityListQueryBuilder(
         $entityClass,
-        $entityId,
+        $entityIds,
         $orderField = 'updatedAt',
         $orderDirection = 'DESC',
         $grouping = false
     ) {
+        if (is_scalar($entityIds)) {
+            $entityIds = [$entityIds];
+        }
         $queryBuilder = $this->createQueryBuilder('activity')
             ->leftJoin('activity.' . $this->getAssociationName($entityClass), 'r')
-            ->leftJoin('activity.activityOwners', 'ao')
-            ->where('r.id = :entityId')
-            ->setParameter('entityId', $entityId)
+            ->leftJoin('activity.activityOwners', 'ao');
+        if (count($entityIds) > 1) {
+            $queryBuilder
+                ->where('r.id IN (:entityIds)')
+                ->setParameter('entityIds', $entityIds);
+        } else {
+            $queryBuilder
+                ->where('r.id = :entityIds')
+                ->setParameter('entityIds', reset($entityIds));
+        }
+        $queryBuilder
             ->orderBy('activity.' . $orderField, $orderDirection)
             ->groupBy('activity.id');
 
diff --git a/src/Oro/Bundle/ActivityListBundle/Event/ActivityListPreQueryBuildEvent.php b/src/Oro/Bundle/ActivityListBundle/Event/ActivityListPreQueryBuildEvent.php
new file mode 100644
index 00000000000..ea1ed789a5d
--- /dev/null
+++ b/src/Oro/Bundle/ActivityListBundle/Event/ActivityListPreQueryBuildEvent.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Oro\Bundle\ActivityListBundle\Event;
+
+use Symfony\Component\EventDispatcher\Event;
+
+/**
+ * This event allow to change activity target ids
+ */
+class ActivityListPreQueryBuildEvent extends Event
+{
+    const EVENT_NAME = 'oro_activity_list.activity_list_pre_query_build';
+
+    /** @var string */
+    protected $targetClass;
+
+    /** @var integer */
+    protected $targetId;
+
+    /** @var integer[] */
+    protected $targetIds;
+
+    /**
+     * @param string $targetClass
+     * @param integer $targetId
+     */
+    public function __construct($targetClass, $targetId)
+    {
+        $this->targetClass = $targetClass;
+        $this->targetId = $targetId;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTargetClass()
+    {
+        return $this->targetClass;
+    }
+
+    /**
+     * @return integer[]
+     */
+    public function getTargetIds()
+    {
+        if (!$this->targetIds) {
+            $this->targetIds = [$this->targetId];
+        }
+
+        return $this->targetIds;
+    }
+
+    /**
+     * @return integer
+     */
+    public function getTargetId()
+    {
+        return $this->targetId;
+    }
+
+    /**
+     * @param integer[] $targetIds
+     */
+    public function setTargetIds(array $targetIds)
+    {
+        $this->targetIds = $targetIds;
+    }
+}
diff --git a/src/Oro/Bundle/ActivityListBundle/Resources/config/services.yml b/src/Oro/Bundle/ActivityListBundle/Resources/config/services.yml
index dbd8e6e20c9..60a5bd74b9a 100644
--- a/src/Oro/Bundle/ActivityListBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/ActivityListBundle/Resources/config/services.yml
@@ -50,6 +50,7 @@ services:
             - @oro_entity.doctrine_helper
             - @oro_activity_list.helper.acl_criteria
             - @oro_activity_list.helper.activity_inheritance_targets
+            - @event_dispatcher
 
     oro_activity_list.collect_manager:
         class: %oro_activity_list.collect_manager.class%
diff --git a/src/Oro/Bundle/ActivityListBundle/Tests/Unit/Event/ActivityListPreQueryBuildEventTest.php b/src/Oro/Bundle/ActivityListBundle/Tests/Unit/Event/ActivityListPreQueryBuildEventTest.php
new file mode 100644
index 00000000000..8746530ae42
--- /dev/null
+++ b/src/Oro/Bundle/ActivityListBundle/Tests/Unit/Event/ActivityListPreQueryBuildEventTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Oro\Bundle\ActivityListBundle\Tests\Unit\Event;
+
+use Oro\Bundle\ActivityListBundle\Event\ActivityListPreQueryBuildEvent;
+
+class ActivityListPreQueryBuildEventTest extends \PHPUnit_Framework_TestCase
+{
+    public function testEvent()
+    {
+        $targetClass = 'testClass';
+        $targetId = 1;
+        $targetIds = [2, 3];
+
+        $event = new ActivityListPreQueryBuildEvent($targetClass, $targetId);
+        $this->assertEquals($targetId, $event->getTargetId());
+        $this->assertEquals([$targetId], $event->getTargetIds());
+        $this->assertEquals($targetClass, $event->getTargetClass());
+
+        $event = new ActivityListPreQueryBuildEvent($targetClass, $targetId);
+        $event->setTargetIds($targetIds);
+        $this->assertEquals($targetIds, $event->getTargetIds());
+    }
+}
diff --git a/src/Oro/Bundle/EmailBundle/EventListener/ActivityListPreQueryBuildListener.php b/src/Oro/Bundle/EmailBundle/EventListener/ActivityListPreQueryBuildListener.php
new file mode 100644
index 00000000000..d5a979e68f2
--- /dev/null
+++ b/src/Oro/Bundle/EmailBundle/EventListener/ActivityListPreQueryBuildListener.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Oro\Bundle\EmailBundle\EventListener;
+
+use Oro\Bundle\EmailBundle\Entity\Email;
+use Oro\Bundle\ActivityListBundle\Event\ActivityListPreQueryBuildEvent;
+use Oro\Bundle\EntityBundle\ORM\DoctrineHelper;
+
+class ActivityListPreQueryBuildListener
+{
+    /** @var DoctrineHelper */
+    protected $doctrineHelper;
+
+    /**
+     * @param DoctrineHelper $doctrineHelper
+     */
+    public function __construct(
+        DoctrineHelper $doctrineHelper
+    ) {
+        $this->doctrineHelper = $doctrineHelper;
+    }
+
+    /**
+     * Add email thread ids to qb params
+     *
+     * @param ActivityListPreQueryBuildEvent $event
+     */
+    public function prepareIdsForEmailThreadEvent(ActivityListPreQueryBuildEvent $event)
+    {
+        if ($event->getTargetClass() === Email::ENTITY_CLASS) {
+            /** @var Email $email */
+            $email = $this->doctrineHelper->getEntity(Email::ENTITY_CLASS, $event->getTargetId());
+            if ($email->getThread()) {
+                $emailIds = array_map(
+                    function ($email) {
+                        return $email->getId();
+                    },
+                    $email->getThread()->getEmails()
+                );
+                $event->setTargetIds($emailIds);
+            }
+        }
+    }
+}
diff --git a/src/Oro/Bundle/EmailBundle/EventListener/PrepareContextTitleListener.php b/src/Oro/Bundle/EmailBundle/EventListener/PrepareContextTitleListener.php
index d29c0a9145e..727eafd839d 100644
--- a/src/Oro/Bundle/EmailBundle/EventListener/PrepareContextTitleListener.php
+++ b/src/Oro/Bundle/EmailBundle/EventListener/PrepareContextTitleListener.php
@@ -2,9 +2,9 @@
 
 namespace Oro\Bundle\EmailBundle\EventListener;
 
-use Oro\Bundle\EmailBundle\Entity\Email;
 use Symfony\Component\Routing\Router;
 
+use Oro\Bundle\EmailBundle\Entity\Email;
 use Oro\Bundle\ActivityBundle\Event\PrepareContextTitleEvent;
 use Oro\Bundle\EntityBundle\ORM\DoctrineHelper;
 
@@ -17,8 +17,6 @@ class PrepareContextTitleListener
     protected $doctrineHelper;
 
     /**
-     * Constructor
-     *
      * @param Router $router
      * @param DoctrineHelper $doctrineHelper
      */
diff --git a/src/Oro/Bundle/EmailBundle/EventListener/PrepareResultItemListener.php b/src/Oro/Bundle/EmailBundle/EventListener/PrepareResultItemListener.php
index 42b8558649a..59a118f4898 100644
--- a/src/Oro/Bundle/EmailBundle/EventListener/PrepareResultItemListener.php
+++ b/src/Oro/Bundle/EmailBundle/EventListener/PrepareResultItemListener.php
@@ -14,8 +14,6 @@ class PrepareResultItemListener
     protected $router;
 
     /**
-     * Constructor
-     *
      * @param Router $router
      */
     public function __construct(Router $router)
diff --git a/src/Oro/Bundle/EmailBundle/Resources/config/services.yml b/src/Oro/Bundle/EmailBundle/Resources/config/services.yml
index 394c66dd56e..56a09c1eb37 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/EmailBundle/Resources/config/services.yml
@@ -135,6 +135,7 @@ parameters:
     oro_email.listener.search_aliases_listener.class: Oro\Bundle\EmailBundle\EventListener\SearchAliasesListener
     oro_email.listener.prepare_result_item_listener.class: Oro\Bundle\EmailBundle\EventListener\PrepareResultItemListener
     oro_email.listener.prepare_context_title_listener.class: Oro\Bundle\EmailBundle\EventListener\PrepareContextTitleListener
+    oro_email.listener.activity_list_pre_query_build_listener.class: Oro\Bundle\EmailBundle\EventListener\ActivityListPreQueryBuildListener
 
 services:
     oro_email.entity.cache.warmer:
@@ -971,3 +972,10 @@ services:
             - @oro_entity.doctrine_helper
         tags:
             - { name: kernel.event_listener, event: oro_activity.context_title, method: prepareEmailContextTitleEvent }
+
+    oro_email.listener.activity_list_pre_query_build_listener:
+        class: %oro_email.listener.activity_list_pre_query_build_listener.class%
+        arguments:
+            - @oro_entity.doctrine_helper
+        tags:
+            - { name: kernel.event_listener, event: oro_activity_list.activity_list_pre_query_build, method: prepareIdsForEmailThreadEvent }
diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/ActivityListPreQueryBuildListenerTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/ActivityListPreQueryBuildListenerTest.php
new file mode 100644
index 00000000000..0eeec79dbe5
--- /dev/null
+++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/ActivityListPreQueryBuildListenerTest.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace Oro\Bundle\EmailBundle\Tests\Unit\EventListener;
+
+use Oro\Bundle\ActivityListBundle\Event\ActivityListPreQueryBuildEvent;
+use Oro\Bundle\EmailBundle\Entity\Email;
+use Oro\Bundle\EntityBundle\ORM\DoctrineHelper;
+use Oro\Bundle\EmailBundle\EventListener\ActivityListPreQueryBuildListener;
+
+class ActivityListPreQueryBuildListenerTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var ActivityListPreQueryBuildListener */
+    protected $listener;
+
+    /** @var \PHPUnit_Framework_MockObject_MockObject|DoctrineHelper */
+    protected $doctrineHelper;
+
+    public function setUp()
+    {
+        $this->doctrineHelper = $this->getMockBuilder('Oro\Bundle\EntityBundle\ORM\DoctrineHelper')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->listener = new ActivityListPreQueryBuildListener($this->doctrineHelper);
+    }
+
+    public function testPrepareIdsForEmailThreadEventSkippEntity()
+    {
+        $targetClass = 'testClass';
+        $targetId = 1;
+
+        $event = new ActivityListPreQueryBuildEvent($targetClass, $targetId);
+        $this->listener->prepareIdsForEmailThreadEvent($event);
+        $this->doctrineHelper->expects($this->never())
+            ->method('getEntity');
+    }
+
+    public function testPrepareIdsForEmailThreadWithoutThreadsEvent()
+    {
+        $targetClass = Email::ENTITY_CLASS;
+        $targetId = 1;
+
+        $email = $this->getMockBuilder('Oro\Bundle\EmailBundle\Entity\Email')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->doctrineHelper->expects($this->once())
+            ->method('getEntity')
+            ->willReturn($email);
+
+        $event = new ActivityListPreQueryBuildEvent($targetClass, $targetId);
+        $this->listener->prepareIdsForEmailThreadEvent($event);
+
+        $this->assertEquals([$targetId], $event->getTargetIds());
+    }
+
+    public function testPrepareIdsForEmailThreadWithThreadsEvent()
+    {
+        $targetClass = Email::ENTITY_CLASS;
+        $targetId = 1;
+        $expectedResult = [2, 3];
+
+        $email = $this->getMockBuilder('Oro\Bundle\EmailBundle\Entity\Email')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $thread = $this->getMockBuilder('Oro\Bundle\EmailBundle\Entity\EmailThread')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $email1 = $this->getMockBuilder('Oro\Bundle\EmailBundle\Entity\Email')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $email2 = $this->getMockBuilder('Oro\Bundle\EmailBundle\Entity\Email')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->doctrineHelper->expects($this->once())
+            ->method('getEntity')
+            ->willReturn($email);
+
+        $email->expects($this->exactly(2))
+            ->method('getThread')
+            ->willReturn($thread);
+
+        $email1->expects($this->once())
+            ->method('getId')
+            ->willReturn(2);
+        $email2->expects($this->once())
+            ->method('getId')
+            ->willReturn(3);
+
+        $thread->expects($this->once())
+            ->method('getEmails')
+            ->willReturn([$email1, $email2]);
+
+        $event = new ActivityListPreQueryBuildEvent($targetClass, $targetId);
+        $this->listener->prepareIdsForEmailThreadEvent($event);
+
+        $this->assertEquals($expectedResult, $event->getTargetIds());
+    }
+}

From 24573061e94797af5f00cd6692fedd32956e45f4 Mon Sep 17 00:00:00 2001
From: Makar Sichevoy <sichevoy@gmail.com>
Date: Wed, 13 Jan 2016 18:53:00 +0200
Subject: [PATCH 447/471] CRM-4846: Grid on activity page

---
 .../Entity/Manager/ActivityListManager.php                  | 4 +---
 .../Entity/Repository/ActivityListRepository.php            | 4 ++--
 .../EventListener/ActivityListPreQueryBuildListener.php     | 6 +++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/Oro/Bundle/ActivityListBundle/Entity/Manager/ActivityListManager.php b/src/Oro/Bundle/ActivityListBundle/Entity/Manager/ActivityListManager.php
index 78a82dea3f9..8a9c276663f 100644
--- a/src/Oro/Bundle/ActivityListBundle/Entity/Manager/ActivityListManager.php
+++ b/src/Oro/Bundle/ActivityListBundle/Entity/Manager/ActivityListManager.php
@@ -2,14 +2,12 @@
 
 namespace Oro\Bundle\ActivityListBundle\Entity\Manager;
 
-use Doctrine\Bundle\DoctrineBundle\Registry;
-use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\QueryBuilder;
 
-use Oro\Bundle\ActivityListBundle\Event\ActivityListPreQueryBuildEvent;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Security\Core\Util\ClassUtils;
 
+use Oro\Bundle\ActivityListBundle\Event\ActivityListPreQueryBuildEvent;
 use Oro\Bundle\ActivityListBundle\Helper\ActivityInheritanceTargetsHelper;
 use Oro\Bundle\ActivityBundle\EntityConfig\ActivityScope;
 use Oro\Bundle\ActivityListBundle\Model\ActivityListGroupProviderInterface;
diff --git a/src/Oro/Bundle/ActivityListBundle/Entity/Repository/ActivityListRepository.php b/src/Oro/Bundle/ActivityListBundle/Entity/Repository/ActivityListRepository.php
index c0b0d1f9c3d..7b1100d6208 100644
--- a/src/Oro/Bundle/ActivityListBundle/Entity/Repository/ActivityListRepository.php
+++ b/src/Oro/Bundle/ActivityListBundle/Entity/Repository/ActivityListRepository.php
@@ -80,8 +80,8 @@ public function getBaseActivityListQueryBuilder(
                 ->setParameter('entityIds', $entityIds);
         } else {
             $queryBuilder
-                ->where('r.id = :entityIds')
-                ->setParameter('entityIds', reset($entityIds));
+                ->where('r.id = :entityId')
+                ->setParameter('entityId', reset($entityIds));
         }
         $queryBuilder
             ->orderBy('activity.' . $orderField, $orderDirection)
diff --git a/src/Oro/Bundle/EmailBundle/EventListener/ActivityListPreQueryBuildListener.php b/src/Oro/Bundle/EmailBundle/EventListener/ActivityListPreQueryBuildListener.php
index d5a979e68f2..51e26af65e7 100644
--- a/src/Oro/Bundle/EmailBundle/EventListener/ActivityListPreQueryBuildListener.php
+++ b/src/Oro/Bundle/EmailBundle/EventListener/ActivityListPreQueryBuildListener.php
@@ -32,10 +32,10 @@ public function prepareIdsForEmailThreadEvent(ActivityListPreQueryBuildEvent $ev
             $email = $this->doctrineHelper->getEntity(Email::ENTITY_CLASS, $event->getTargetId());
             if ($email->getThread()) {
                 $emailIds = array_map(
-                    function ($email) {
-                        return $email->getId();
+                    function ($emailEntity) {
+                        return $emailEntity->getId();
                     },
-                    $email->getThread()->getEmails()
+                    $email->getThread()->getEmails()->toArray()
                 );
                 $event->setTargetIds($emailIds);
             }

From 91c0e8921541a7160216656628b513c77abe1dc5 Mon Sep 17 00:00:00 2001
From: Makar Sichevoy <sichevoy@gmail.com>
Date: Wed, 13 Jan 2016 19:01:25 +0200
Subject: [PATCH 448/471] CRM-4846: Grid on activity page

---
 .../EventListener/ActivityListPreQueryBuildListenerTest.php   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/ActivityListPreQueryBuildListenerTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/ActivityListPreQueryBuildListenerTest.php
index 0eeec79dbe5..8fa103b2ba1 100644
--- a/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/ActivityListPreQueryBuildListenerTest.php
+++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/ActivityListPreQueryBuildListenerTest.php
@@ -2,6 +2,8 @@
 
 namespace Oro\Bundle\EmailBundle\Tests\Unit\EventListener;
 
+use Doctrine\Common\Collections\ArrayCollection;
+
 use Oro\Bundle\ActivityListBundle\Event\ActivityListPreQueryBuildEvent;
 use Oro\Bundle\EmailBundle\Entity\Email;
 use Oro\Bundle\EntityBundle\ORM\DoctrineHelper;
@@ -91,7 +93,7 @@ public function testPrepareIdsForEmailThreadWithThreadsEvent()
 
         $thread->expects($this->once())
             ->method('getEmails')
-            ->willReturn([$email1, $email2]);
+            ->willReturn(new ArrayCollection([$email1, $email2]));
 
         $event = new ActivityListPreQueryBuildEvent($targetClass, $targetId);
         $this->listener->prepareIdsForEmailThreadEvent($event);

From ead46189bf3af5177d574ce74889cc029b35b8dd Mon Sep 17 00:00:00 2001
From: Hryhorii Hrebiniuk <hhrebiniuk@magecore.com>
Date: Wed, 13 Jan 2016 19:02:46 +0200
Subject: [PATCH 449/471] CRM-4869: Change the appearance of the highlight for
 phones & emails; change the appearance of buttons

- increased font-size for tags
---
 .../Bundle/TagBundle/Resources/public/css/tags-container.less   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/TagBundle/Resources/public/css/tags-container.less b/src/Oro/Bundle/TagBundle/Resources/public/css/tags-container.less
index 1d8e5add78c..b232e76e29a 100644
--- a/src/Oro/Bundle/TagBundle/Resources/public/css/tags-container.less
+++ b/src/Oro/Bundle/TagBundle/Resources/public/css/tags-container.less
@@ -12,7 +12,7 @@
   background-color: @tagItemBackground;
   border-radius: 10px;
   margin-right: 0px;
-  font-size: 11px;
+  font-size: 12px;
   line-height: 20px;
   padding: 1px 8px;
   display: inline-block;

From 34ca34cac33cea6431f7fbe16565fb44f9f30825 Mon Sep 17 00:00:00 2001
From: Makar Sichevoy <sichevoy@gmail.com>
Date: Wed, 13 Jan 2016 19:11:30 +0200
Subject: [PATCH 450/471] CRM-4846: Grid on activity page

---
 .../Unit/Entity/Manager/ActivityListManagerTest.php      | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/ActivityListBundle/Tests/Unit/Entity/Manager/ActivityListManagerTest.php b/src/Oro/Bundle/ActivityListBundle/Tests/Unit/Entity/Manager/ActivityListManagerTest.php
index c3124e3743a..bf988d14099 100644
--- a/src/Oro/Bundle/ActivityListBundle/Tests/Unit/Entity/Manager/ActivityListManagerTest.php
+++ b/src/Oro/Bundle/ActivityListBundle/Tests/Unit/Entity/Manager/ActivityListManagerTest.php
@@ -51,6 +51,9 @@ class ActivityListManagerTest extends \PHPUnit_Framework_TestCase
     /** @var \PHPUnit_Framework_MockObject_MockObject */
     protected $inheritanceHelper;
 
+    /** @var \PHPUnit_Framework_MockObject_MockObject */
+    protected $eventDispatcher;
+
     public function setUp()
     {
         $this->securityFacade     = $this->getMockBuilder('Oro\Bundle\SecurityBundle\SecurityFacade')
@@ -78,6 +81,9 @@ public function setUp()
         $this->inheritanceHelper = $this
             ->getMockBuilder('Oro\Bundle\ActivityListBundle\Helper\ActivityInheritanceTargetsHelper')
             ->disableOriginalConstructor()->getMock();
+        $this->eventDispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcher')
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->activityListManager = new ActivityListManager(
             $this->securityFacade,
@@ -89,7 +95,8 @@ public function setUp()
             $this->commentManager,
             $this->doctrineHelper,
             $this->aclHelper,
-            $this->inheritanceHelper
+            $this->inheritanceHelper,
+            $this->eventDispatcher
         );
     }
 

From 4c336f3b2b605ad8038b8382d8480b52a8b17104 Mon Sep 17 00:00:00 2001
From: Makar Sichevoy <sichevoy@gmail.com>
Date: Wed, 13 Jan 2016 19:14:24 +0200
Subject: [PATCH 451/471] CRM-4846: Grid on activity page

---
 .../Tests/Unit/Form/Type/EmailTypeTest.php           | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailTypeTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailTypeTest.php
index 57de375c929..d1d7312c9fc 100644
--- a/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailTypeTest.php
+++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailTypeTest.php
@@ -156,7 +156,17 @@ protected function getExtensions()
             $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')
             ->disableOriginalConstructor()
             ->getMock();
-        $contextsSelectType = new ContextsSelectType($em, $configManager, $translator, $mapper, $securityTokenStorage);
+        $eventDispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcher')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $contextsSelectType = new ContextsSelectType(
+            $em,
+            $configManager,
+            $translator,
+            $mapper,
+            $securityTokenStorage,
+            $eventDispatcher
+        );
 
         return [
             new PreloadedExtension(

From 7ea32cd65b46b5bfac6a2a41a6d56a8d45b54429 Mon Sep 17 00:00:00 2001
From: Vova Soroka <vsoroka@magecore.com>
Date: Thu, 14 Jan 2016 10:11:23 +0200
Subject: [PATCH 452/471] BAP-9554: Web installer fails when DB does not exist

---
 .../Routing/RestRouteOptionsResolver.php      |   6 +-
 .../EntityBundle/ORM/EntityAliasResolver.php  |   5 +-
 .../Unit/Tools/SafeDatabaseCheckerTest.php    | 301 ++++++++++++++++++
 .../Tools/SafeDatabaseChecker.php             |  90 ++++++
 .../Config/ConfigModelManager.php             |  12 +-
 .../Resources/public/css/style.css            |  12 +
 .../MigrationBundle/Event/MigrationEvent.php  |  29 +-
 .../Compiler/EventsCompilerPass.php           |  23 +-
 .../Compiler/EventsCompilerPassTest.php       |   5 +-
 .../UpdateDoctrineConfigurationPass.php       |  23 ++
 .../PlatformBundle/OroPlatformBundle.php      |   2 +
 .../Owner/AbstractOwnerTreeProvider.php       |  20 +-
 .../Unit/Owner/OwnerTreeProviderTest.php      |   8 +-
 .../Translation/OrmTranslationLoaderTest.php  |   8 +-
 .../Tests/Unit/Translation/TranslatorTest.php |  49 ++-
 .../Translation/OrmTranslationLoader.php      |  18 +-
 .../Translation/Translator.php                |  24 +-
 17 files changed, 533 insertions(+), 102 deletions(-)
 create mode 100644 src/Oro/Bundle/EntityBundle/Tests/Unit/Tools/SafeDatabaseCheckerTest.php
 create mode 100644 src/Oro/Bundle/EntityBundle/Tools/SafeDatabaseChecker.php
 create mode 100644 src/Oro/Bundle/PlatformBundle/DependencyInjection/Compiler/UpdateDoctrineConfigurationPass.php

diff --git a/src/Oro/Bundle/ApiBundle/Routing/RestRouteOptionsResolver.php b/src/Oro/Bundle/ApiBundle/Routing/RestRouteOptionsResolver.php
index 7ec2e85dbf4..99539765eb6 100644
--- a/src/Oro/Bundle/ApiBundle/Routing/RestRouteOptionsResolver.php
+++ b/src/Oro/Bundle/ApiBundle/Routing/RestRouteOptionsResolver.php
@@ -2,8 +2,6 @@
 
 namespace Oro\Bundle\ApiBundle\Routing;
 
-use Doctrine\ORM\Mapping\ClassMetadata;
-
 use Symfony\Component\Routing\Route;
 
 use Oro\Component\Routing\Resolver\RouteCollectionAccessor;
@@ -13,6 +11,7 @@
 use Oro\Bundle\ApiBundle\Request\ValueNormalizer;
 use Oro\Bundle\ApiBundle\Util\DoctrineHelper;
 use Oro\Bundle\EntityBundle\ORM\EntityAliasResolver;
+use Oro\Bundle\EntityBundle\Tools\SafeDatabaseChecker;
 use Oro\Bundle\EntityBundle\Provider\ExclusionProviderInterface;
 use Oro\Bundle\EntityConfigBundle\Config\EntityManagerBag;
 
@@ -101,8 +100,7 @@ protected function getSupportedEntityClasses()
         $entities       = [];
         $entityManagers = $this->entityManagerBag->getEntityManagers();
         foreach ($entityManagers as $em) {
-            /** @var ClassMetadata[] $allMetadata */
-            $allMetadata = $em->getMetadataFactory()->getAllMetadata();
+            $allMetadata = SafeDatabaseChecker::getAllMetadata($em);
             foreach ($allMetadata as $metadata) {
                 if ($metadata->isMappedSuperclass) {
                     continue;
diff --git a/src/Oro/Bundle/EntityBundle/ORM/EntityAliasResolver.php b/src/Oro/Bundle/EntityBundle/ORM/EntityAliasResolver.php
index d347ca6f0dc..0632367695a 100644
--- a/src/Oro/Bundle/EntityBundle/ORM/EntityAliasResolver.php
+++ b/src/Oro/Bundle/EntityBundle/ORM/EntityAliasResolver.php
@@ -3,7 +3,6 @@
 namespace Oro\Bundle\EntityBundle\ORM;
 
 use Doctrine\Common\Persistence\ManagerRegistry;
-use Doctrine\ORM\Mapping\ClassMetadata;
 
 use Symfony\Component\HttpKernel\CacheWarmer\WarmableInterface;
 
@@ -11,6 +10,7 @@
 use Oro\Bundle\EntityBundle\Exception\RuntimeException;
 use Oro\Bundle\EntityBundle\Model\EntityAlias;
 use Oro\Bundle\EntityBundle\Provider\EntityAliasProviderInterface;
+use Oro\Bundle\EntityBundle\Tools\SafeDatabaseChecker;
 
 class EntityAliasResolver implements WarmableInterface
 {
@@ -306,8 +306,7 @@ protected function ensureAllAliasesLoaded()
             return;
         }
 
-        /** @var ClassMetadata[] $allMetadata */
-        $allMetadata = $this->doctrine->getManager()->getMetadataFactory()->getAllMetadata();
+        $allMetadata = SafeDatabaseChecker::getAllMetadata($this->doctrine->getManager());
         foreach ($allMetadata as $metadata) {
             if (!$metadata->isMappedSuperclass && !isset($this->aliases[$metadata->name])) {
                 $this->findEntityAlias($metadata->name);
diff --git a/src/Oro/Bundle/EntityBundle/Tests/Unit/Tools/SafeDatabaseCheckerTest.php b/src/Oro/Bundle/EntityBundle/Tests/Unit/Tools/SafeDatabaseCheckerTest.php
new file mode 100644
index 00000000000..4134db8d3af
--- /dev/null
+++ b/src/Oro/Bundle/EntityBundle/Tests/Unit/Tools/SafeDatabaseCheckerTest.php
@@ -0,0 +1,301 @@
+<?php
+
+namespace Oro\Bundle\EntityBundle\Tests\Unit\Tools;
+
+use Doctrine\DBAL\DBALException;
+use Doctrine\ORM\ORMException;
+
+use Oro\Bundle\EntityBundle\Tools\SafeDatabaseChecker;
+
+class SafeDatabaseCheckerTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider tablesExistProvider
+     */
+    public function testTablesExist($tables, $tablesExistResult = true, $expectedResult = true)
+    {
+        $connection    = $this->getMockBuilder('Doctrine\DBAL\Connection')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $schemaManager = $this->getMockBuilder('Doctrine\DBAL\Schema\AbstractSchemaManager')
+            ->disableOriginalConstructor()
+            ->setMethods(['tablesExist'])
+            ->getMockForAbstractClass();
+
+        $connection->expects($this->once())
+            ->method('connect');
+        $connection
+            ->expects($this->once())
+            ->method('getSchemaManager')
+            ->willReturn($schemaManager);
+        $schemaManager
+            ->expects($this->once())
+            ->method('tablesExist')
+            ->with($tables)
+            ->willReturn($tablesExistResult);
+
+        $this->assertSame(
+            $expectedResult,
+            SafeDatabaseChecker::tablesExist($connection, $tables)
+        );
+    }
+
+    public function tablesExistProvider()
+    {
+        return [
+            ['table1'],
+            [['table1']],
+            [['table1', 'table2']],
+            ['table1', false, false],
+        ];
+    }
+
+    /**
+     * @dataProvider tablesExistWithEmptyTablesParamProvider
+     */
+    public function testTablesExistWithEmptyTablesParam($tables)
+    {
+        $connection = $this->getMockBuilder('Doctrine\DBAL\Connection')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $connection->expects($this->never())
+            ->method('connect');
+
+        $this->assertFalse(
+            SafeDatabaseChecker::tablesExist($connection, $tables)
+        );
+    }
+
+    public function tablesExistWithEmptyTablesParamProvider()
+    {
+        return [
+            [null],
+            [''],
+            [[]],
+        ];
+    }
+
+    /**
+     * @dataProvider expectedExceptionsForTablesExist
+     */
+    public function testTablesExistShouldHandleExpectedExceptions($exception)
+    {
+        $connection = $this->getMockBuilder('Doctrine\DBAL\Connection')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $connection->expects($this->once())
+            ->method('connect')
+            ->willThrowException($exception);
+
+        $this->assertFalse(
+            SafeDatabaseChecker::tablesExist($connection, 'table')
+        );
+    }
+
+    public function expectedExceptionsForTablesExist()
+    {
+        return [
+            [new \PDOException()],
+            [new DBALException()],
+        ];
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage unexpected
+     */
+    public function testTablesExistShouldRethrowUnexpectedException()
+    {
+        $connection = $this->getMockBuilder('Doctrine\DBAL\Connection')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $connection->expects($this->once())
+            ->method('connect')
+            ->willThrowException(new \Exception('unexpected'));
+
+        SafeDatabaseChecker::tablesExist($connection, 'table');
+    }
+
+    public function testGetTableName()
+    {
+        $doctrine      = $this->getMock('Doctrine\Common\Persistence\ManagerRegistry');
+        $em            = $this->getMock('Doctrine\ORM\EntityManagerInterface');
+        $classMetadata = $this->getMockBuilder('Doctrine\ORM\Mapping\ClassMetadata')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $entityName = 'Test\Entity';
+        $tableName  = 'test_table';
+
+        $doctrine->expects($this->any())
+            ->method('getManagerForClass')
+            ->with($entityName)
+            ->willReturn($em);
+        $em->expects($this->once())
+            ->method('getClassMetadata')
+            ->with($entityName)
+            ->willReturn($classMetadata);
+        $classMetadata->expects($this->once())
+            ->method('getTableName')
+            ->willReturn($tableName);
+
+        $this->assertEquals(
+            $tableName,
+            SafeDatabaseChecker::getTableName($doctrine, $entityName)
+        );
+    }
+
+    public function testGetTableNameForNotOrmEntity()
+    {
+        $doctrine = $this->getMock('Doctrine\Common\Persistence\ManagerRegistry');
+        $om       = $this->getMock('Doctrine\Common\Persistence\ObjectManager');
+
+        $entityName = 'Test\Entity';
+
+        $doctrine->expects($this->any())
+            ->method('getManagerForClass')
+            ->with($entityName)
+            ->willReturn($om);
+        $om->expects($this->never())
+            ->method('getClassMetadata');
+
+        $this->assertNull(
+            SafeDatabaseChecker::getTableName($doctrine, $entityName)
+        );
+    }
+
+    /**
+     * @dataProvider getTableNameWithEmptyEntityNameParamProvider
+     */
+    public function testGetTableNameWithEmptyEntityNameParam($entityName)
+    {
+        $doctrine = $this->getMock('Doctrine\Common\Persistence\ManagerRegistry');
+
+        $doctrine->expects($this->never())
+            ->method('getManagerForClass');
+
+        $this->assertNull(
+            SafeDatabaseChecker::getTableName($doctrine, $entityName)
+        );
+    }
+
+    public function getTableNameWithEmptyEntityNameParamProvider()
+    {
+        return [
+            [null],
+            [''],
+        ];
+    }
+
+    /**
+     * @dataProvider expectedExceptionsForGetTableName
+     */
+    public function testGetTableNameShouldHandleExpectedExceptions($exception)
+    {
+        $doctrine = $this->getMock('Doctrine\Common\Persistence\ManagerRegistry');
+
+        $doctrine->expects($this->once())
+            ->method('getManagerForClass')
+            ->willThrowException($exception);
+
+        $this->assertNull(
+            SafeDatabaseChecker::getTableName($doctrine, 'Test\Entity')
+        );
+    }
+
+    public function expectedExceptionsForGetTableName()
+    {
+        return [
+            [new \PDOException()],
+            [new DBALException()],
+            [new ORMException()],
+            [new \ReflectionException()],
+        ];
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage unexpected
+     */
+    public function testGetTableNameShouldRethrowUnexpectedException()
+    {
+        $doctrine = $this->getMock('Doctrine\Common\Persistence\ManagerRegistry');
+
+        $doctrine->expects($this->once())
+            ->method('getManagerForClass')
+            ->willThrowException(new \Exception('unexpected'));
+
+        SafeDatabaseChecker::getTableName($doctrine, 'Test\Entity');
+    }
+
+    public function testGetAllMetadata()
+    {
+        $em              = $this->getMock('Doctrine\ORM\EntityManagerInterface');
+        $metadataFactory = $this->getMockBuilder('Doctrine\ORM\Mapping\ClassMetadataFactory')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $classMetadata = $this->getMockBuilder('Doctrine\ORM\Mapping\ClassMetadata')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $allMetadata = [$classMetadata];
+
+        $em->expects($this->once())
+            ->method('getMetadataFactory')
+            ->willReturn($metadataFactory);
+        $metadataFactory->expects($this->once())
+            ->method('getAllMetadata')
+            ->willReturn($allMetadata);
+
+        $this->assertSame(
+            $allMetadata,
+            SafeDatabaseChecker::getAllMetadata($em)
+        );
+    }
+
+    /**
+     * @dataProvider expectedExceptionsForGetAllMetadata
+     */
+    public function testGetAllMetadataShouldHandleExpectedExceptions($exception)
+    {
+        $em = $this->getMock('Doctrine\ORM\EntityManagerInterface');
+
+        $em->expects($this->once())
+            ->method('getMetadataFactory')
+            ->willThrowException($exception);
+
+        $this->assertSame(
+            [],
+            SafeDatabaseChecker::getAllMetadata($em)
+        );
+    }
+
+    public function expectedExceptionsForGetAllMetadata()
+    {
+        return [
+            [new \PDOException()],
+            [new DBALException()],
+            [new ORMException()],
+            [new \ReflectionException()],
+        ];
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage unexpected
+     */
+    public function testGetAllMetadataShouldRethrowUnexpectedException()
+    {
+        $em = $this->getMock('Doctrine\ORM\EntityManagerInterface');
+
+        $em->expects($this->once())
+            ->method('getMetadataFactory')
+            ->willThrowException(new \Exception('unexpected'));
+
+        SafeDatabaseChecker::getAllMetadata($em);
+    }
+}
diff --git a/src/Oro/Bundle/EntityBundle/Tools/SafeDatabaseChecker.php b/src/Oro/Bundle/EntityBundle/Tools/SafeDatabaseChecker.php
new file mode 100644
index 00000000000..eb0d592757e
--- /dev/null
+++ b/src/Oro/Bundle/EntityBundle/Tools/SafeDatabaseChecker.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace Oro\Bundle\EntityBundle\Tools;
+
+use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\DBALException;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Mapping\ClassMetadata;
+use Doctrine\ORM\ORMException;
+
+/**
+ * Provides a set of functions that can be used to do a safe-check a state of the data access layer.
+ * "safe" means that these functions never throw exceptions
+ * and they can be used even if the data access layer is not configured properly.
+ */
+class SafeDatabaseChecker
+{
+    /**
+     * Checks whether a database connection can be established and all given tables exist in the database.
+     *
+     * @param Connection           $connection
+     * @param string[]|string|null $tables
+     *
+     * @return bool
+     */
+    public static function tablesExist(Connection $connection, $tables)
+    {
+        $result = false;
+        if (!empty($tables)) {
+            try {
+                $connection->connect();
+                $result = $connection->getSchemaManager()->tablesExist($tables);
+            } catch (\PDOException $e) {
+            } catch (DBALException $e) {
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns the table name for a given entity.
+     *
+     * @param ManagerRegistry $doctrine
+     * @param string          $entityName
+     *
+     * @return string|null the table name or NULL if it cannot be determined
+     */
+    public static function getTableName(ManagerRegistry $doctrine, $entityName)
+    {
+        $result = null;
+
+        if (!empty($entityName)) {
+            try {
+                $em = $doctrine->getManagerForClass($entityName);
+                if ($em instanceof EntityManagerInterface) {
+                    $result = $em->getClassMetadata($entityName)->getTableName();
+                }
+            } catch (\PDOException $e) {
+            } catch (DBALException $e) {
+            } catch (ORMException $e) {
+            } catch (\ReflectionException $e) {
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns metadata of all entities registered in a given entity manager.
+     *
+     * @param EntityManagerInterface $em
+     *
+     * @return ClassMetadata[]
+     */
+    public static function getAllMetadata(EntityManagerInterface $em)
+    {
+        $allMetadata = [];
+        try {
+            $allMetadata = $em->getMetadataFactory()->getAllMetadata();
+        } catch (\PDOException $e) {
+        } catch (DBALException $e) {
+        } catch (ORMException $e) {
+        } catch (\ReflectionException $e) {
+        }
+
+        return $allMetadata;
+    }
+}
diff --git a/src/Oro/Bundle/EntityConfigBundle/Config/ConfigModelManager.php b/src/Oro/Bundle/EntityConfigBundle/Config/ConfigModelManager.php
index fee0913f2e7..c1890e155e7 100644
--- a/src/Oro/Bundle/EntityConfigBundle/Config/ConfigModelManager.php
+++ b/src/Oro/Bundle/EntityConfigBundle/Config/ConfigModelManager.php
@@ -6,6 +6,7 @@
 use Doctrine\ORM\UnitOfWork;
 
 use Oro\Component\DependencyInjection\ServiceLink;
+use Oro\Bundle\EntityBundle\Tools\SafeDatabaseChecker;
 use Oro\Bundle\EntityConfigBundle\Entity\ConfigModel;
 use Oro\Bundle\EntityConfigBundle\Entity\EntityConfigModel;
 use Oro\Bundle\EntityConfigBundle\Entity\FieldConfigModel;
@@ -80,13 +81,10 @@ public function checkDatabase()
             return true;
         }
 
-        $this->dbCheck = false;
-        try {
-            $conn = $this->getEntityManager()->getConnection();
-            $conn->connect();
-            $this->dbCheck = $conn->getSchemaManager()->tablesExist($this->requiredTables);
-        } catch (\PDOException $e) {
-        }
+        $this->dbCheck = SafeDatabaseChecker::tablesExist(
+            $this->getEntityManager()->getConnection(),
+            $this->requiredTables
+        );
 
         return $this->dbCheck;
     }
diff --git a/src/Oro/Bundle/InstallerBundle/Resources/public/css/style.css b/src/Oro/Bundle/InstallerBundle/Resources/public/css/style.css
index e8edaaeb76c..ed566411b4e 100644
--- a/src/Oro/Bundle/InstallerBundle/Resources/public/css/style.css
+++ b/src/Oro/Bundle/InstallerBundle/Resources/public/css/style.css
@@ -357,6 +357,18 @@ table.table {
     border-top: 1px solid #eaeaea
 }
 
+.button-set .status-box {
+    color: #C81717;
+    margin: 7px 0 0 10px;
+    float: left;
+}
+.button-set .status-box {
+    color: #C81717;
+    margin: 7px 0 0 10px;
+    float: left;
+    line-height: 22px;
+}
+
 .pull-right {
     float: right
 }
diff --git a/src/Oro/Bundle/MigrationBundle/Event/MigrationEvent.php b/src/Oro/Bundle/MigrationBundle/Event/MigrationEvent.php
index 24f0c34a237..4933452936e 100644
--- a/src/Oro/Bundle/MigrationBundle/Event/MigrationEvent.php
+++ b/src/Oro/Bundle/MigrationBundle/Event/MigrationEvent.php
@@ -3,7 +3,10 @@
 namespace Oro\Bundle\MigrationBundle\Event;
 
 use Doctrine\DBAL\Connection;
+
 use Symfony\Component\EventDispatcher\Event;
+
+use Oro\Bundle\EntityBundle\Tools\SafeDatabaseChecker;
 use Oro\Bundle\MigrationBundle\Migration\Migration;
 
 class MigrationEvent extends Event
@@ -61,7 +64,7 @@ public function getMigrations()
      */
     public function getData($sql, array $params = array(), $types = array())
     {
-        $this->ensureConnected();
+        $this->connection->connect();
 
         return $this->connection->fetchAll($sql, $params, $types);
     }
@@ -74,28 +77,6 @@ public function getData($sql, array $params = array(), $types = array())
      */
     public function isTableExist($tableName)
     {
-        $result = false;
-        try {
-            $this->ensureConnected();
-
-            $result = $this->connection->isConnected()
-                && (bool)array_intersect(
-                    [$tableName],
-                    $this->connection->getSchemaManager()->listTableNames()
-                );
-        } catch (\PDOException $e) {
-        }
-
-        return $result;
-    }
-
-    /**
-     * Makes sure that the connection is open
-     */
-    protected function ensureConnected()
-    {
-        if (!$this->connection->isConnected()) {
-            $this->connection->connect();
-        }
+        return SafeDatabaseChecker::tablesExist($this->connection, $tableName);
     }
 }
diff --git a/src/Oro/Bundle/NotificationBundle/DependencyInjection/Compiler/EventsCompilerPass.php b/src/Oro/Bundle/NotificationBundle/DependencyInjection/Compiler/EventsCompilerPass.php
index a374d94c1c2..67cd0def623 100644
--- a/src/Oro/Bundle/NotificationBundle/DependencyInjection/Compiler/EventsCompilerPass.php
+++ b/src/Oro/Bundle/NotificationBundle/DependencyInjection/Compiler/EventsCompilerPass.php
@@ -7,6 +7,8 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 
+use Oro\Bundle\EntityBundle\Tools\SafeDatabaseChecker;
+
 class EventsCompilerPass implements CompilerPassInterface
 {
     /** a table name of {@see Oro\Bundle\NotificationBundle\Entity\Event} */
@@ -33,7 +35,7 @@ public function process(ContainerBuilder $container)
         // ORM usage leads unnecessary loading of Doctrine metadata and ORO entity configs which is not needed here
         /** @var Connection $connection */
         $connection = $container->get('doctrine.dbal.default_connection');
-        if ($this->checkDatabase($connection)) {
+        if (SafeDatabaseChecker::tablesExist($connection, self::EVENT_TABLE_NAME)) {
             $dispatcher = $container->findDefinition(self::DISPATCHER_KEY);
 
             $rows = $connection->fetchAll('SELECT name FROM ' . self::EVENT_TABLE_NAME);
@@ -45,23 +47,4 @@ public function process(ContainerBuilder $container)
             }
         }
     }
-
-    /**
-     * @param Connection $connection
-     *
-     * @return bool
-     */
-    protected function checkDatabase(Connection $connection)
-    {
-        $result = false;
-        try {
-            $connection->connect();
-            $result =
-                $connection->isConnected()
-                && $connection->getSchemaManager()->tablesExist([self::EVENT_TABLE_NAME]);
-        } catch (\PDOException $e) {
-        }
-
-        return $result;
-    }
 }
diff --git a/src/Oro/Bundle/NotificationBundle/Tests/Unit/DependencyInjection/Compiler/EventsCompilerPassTest.php b/src/Oro/Bundle/NotificationBundle/Tests/Unit/DependencyInjection/Compiler/EventsCompilerPassTest.php
index 9c9874304e7..d8186158656 100644
--- a/src/Oro/Bundle/NotificationBundle/Tests/Unit/DependencyInjection/Compiler/EventsCompilerPassTest.php
+++ b/src/Oro/Bundle/NotificationBundle/Tests/Unit/DependencyInjection/Compiler/EventsCompilerPassTest.php
@@ -89,16 +89,13 @@ private function configureConnectionMock()
 
         $connection->expects($this->once())
             ->method('connect');
-        $connection->expects($this->once())
-            ->method('isConnected')
-            ->will($this->returnValue(true));
 
         $schemaManager = $this->getMockBuilder('Doctrine\DBAL\Schema\MySqlSchemaManager')
             ->disableOriginalConstructor()
             ->getMock();
         $schemaManager->expects($this->once())
             ->method('tablesExist')
-            ->with([EventsCompilerPass::EVENT_TABLE_NAME])
+            ->with(EventsCompilerPass::EVENT_TABLE_NAME)
             ->will($this->returnValue(true));
 
         $connection->expects($this->once())
diff --git a/src/Oro/Bundle/PlatformBundle/DependencyInjection/Compiler/UpdateDoctrineConfigurationPass.php b/src/Oro/Bundle/PlatformBundle/DependencyInjection/Compiler/UpdateDoctrineConfigurationPass.php
new file mode 100644
index 00000000000..49b0cc78ebd
--- /dev/null
+++ b/src/Oro/Bundle/PlatformBundle/DependencyInjection/Compiler/UpdateDoctrineConfigurationPass.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Oro\Bundle\PlatformBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+
+class UpdateDoctrineConfigurationPass implements CompilerPassInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        // to fix the failure of {@see Symfony\Bridge\Doctrine\CacheWarmer\ProxyCacheWarmer} in prod mode,
+        // we have to enable auto-generation of proxy classes if the platform is not installed yet,
+        // because Doctrine class metadata can be loaded only if a database connection is properly configured
+        $isInstalled = $container->hasParameter('installed') && $container->getParameter('installed');
+        if (!$isInstalled) {
+            $container->setParameter('doctrine.orm.auto_generate_proxy_classes', true);
+        }
+    }
+}
diff --git a/src/Oro/Bundle/PlatformBundle/OroPlatformBundle.php b/src/Oro/Bundle/PlatformBundle/OroPlatformBundle.php
index 0746bd61772..0278a8d5c52 100644
--- a/src/Oro/Bundle/PlatformBundle/OroPlatformBundle.php
+++ b/src/Oro/Bundle/PlatformBundle/OroPlatformBundle.php
@@ -2,6 +2,7 @@
 
 namespace Oro\Bundle\PlatformBundle;
 
+use Oro\Bundle\PlatformBundle\DependencyInjection\Compiler\UpdateDoctrineConfigurationPass;
 use Symfony\Component\DependencyInjection\Compiler\PassConfig;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
@@ -32,6 +33,7 @@ public function build(ContainerBuilder $container)
                 'Oro\Bundle\EntityConfigBundle\DependencyInjection\Utils\ServiceLink'
             )
         );
+        $container->addCompilerPass(new UpdateDoctrineConfigurationPass());
         if ($container instanceof ExtendedContainerBuilder) {
             $container->addCompilerPass(new UpdateDoctrineEventHandlersPass());
             $container->moveCompilerPassBefore(
diff --git a/src/Oro/Bundle/SecurityBundle/Owner/AbstractOwnerTreeProvider.php b/src/Oro/Bundle/SecurityBundle/Owner/AbstractOwnerTreeProvider.php
index 1ee2a7442f9..38f1474bae4 100644
--- a/src/Oro/Bundle/SecurityBundle/Owner/AbstractOwnerTreeProvider.php
+++ b/src/Oro/Bundle/SecurityBundle/Owner/AbstractOwnerTreeProvider.php
@@ -9,6 +9,7 @@
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
+use Oro\Bundle\EntityBundle\Tools\SafeDatabaseChecker;
 use Oro\Bundle\SecurityBundle\Owner\Metadata\MetadataProviderInterface;
 
 abstract class AbstractOwnerTreeProvider implements ContainerAwareInterface, OwnerTreeProviderInterface
@@ -142,22 +143,11 @@ protected function loadTree()
     protected function checkDatabase()
     {
         $className = $this->getOwnershipMetadataProvider()->getBasicLevelClass();
-        $em = $this->getManagerForClass($className);
-        $tableName = $em->getClassMetadata($className)->getTableName();
-        $result = false;
-        try {
-            $conn = $em->getConnection();
-
-            if (!$conn->isConnected()) {
-                $em->getConnection()->connect();
-            }
-
-            $result = $conn->isConnected()
-                && (bool)array_intersect([$tableName], $em->getConnection()->getSchemaManager()->listTableNames());
-        } catch (\PDOException $e) {
-        }
 
-        return $result;
+        return SafeDatabaseChecker::tablesExist(
+            $this->getManagerForClass($className)->getConnection(),
+            SafeDatabaseChecker::getTableName($this->getContainer()->get('doctrine'), $className)
+        );
     }
 
     /**
diff --git a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Owner/OwnerTreeProviderTest.php b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Owner/OwnerTreeProviderTest.php
index 6e53c7840f3..6a0abb9f7be 100644
--- a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Owner/OwnerTreeProviderTest.php
+++ b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Owner/OwnerTreeProviderTest.php
@@ -161,9 +161,6 @@ public function testGetTree()
         $this->em->expects($this->any())
             ->method('getConnection')
             ->will($this->returnValue($connection));
-        $connection->expects($this->any())
-            ->method('isConnected')
-            ->will($this->returnValue(true));
         $schemaManager = $this->getMockBuilder('Doctrine\DBAL\Schema\MySqlSchemaManager')
             ->disableOriginalConstructor()
             ->getMock();
@@ -171,8 +168,9 @@ public function testGetTree()
             ->method('getSchemaManager')
             ->will($this->returnValue($schemaManager));
         $schemaManager->expects($this->any())
-            ->method('listTableNames')
-            ->will($this->returnValue(['test']));
+            ->method('tablesExist')
+            ->with('test')
+            ->will($this->returnValue(true));
 
         $this->treeProvider->warmUpCache();
 
diff --git a/src/Oro/Bundle/TranslationBundle/Tests/Unit/Translation/OrmTranslationLoaderTest.php b/src/Oro/Bundle/TranslationBundle/Tests/Unit/Translation/OrmTranslationLoaderTest.php
index 544f27fa7cf..67e0b07932a 100644
--- a/src/Oro/Bundle/TranslationBundle/Tests/Unit/Translation/OrmTranslationLoaderTest.php
+++ b/src/Oro/Bundle/TranslationBundle/Tests/Unit/Translation/OrmTranslationLoaderTest.php
@@ -53,7 +53,7 @@ public function testLoadWhenDatabaseDoesNotContainTranslationTable()
             ->getMock();
         $resource      = new OrmTranslationResource($locale, $metadataCache);
 
-        $translationTable = 'translation_able';
+        $translationTable = 'translation_table';
 
         $metadata = $this->getMockBuilder('Doctrine\ORM\Mapping\ClassMetadata')
             ->disableOriginalConstructor()
@@ -77,7 +77,7 @@ public function testLoadWhenDatabaseDoesNotContainTranslationTable()
             ->willReturn($schemaManager);
         $schemaManager->expects($this->once())
             ->method('tablesExist')
-            ->with([$translationTable])
+            ->with($translationTable)
             ->willReturn(false);
 
         /** @var MessageCatalogue $result */
@@ -127,7 +127,7 @@ public function testLoad()
 
         $values = [$value1, $value2, $value3];
 
-        $translationTable = 'translation_able';
+        $translationTable = 'translation_table';
 
         $repo = $this
             ->getMockBuilder('Oro\Bundle\TranslationBundle\Entity\Repository\TranslationRepository')
@@ -164,7 +164,7 @@ public function testLoad()
             ->willReturn($schemaManager);
         $schemaManager->expects($this->once())
             ->method('tablesExist')
-            ->with([$translationTable])
+            ->with($translationTable)
             ->willReturn(true);
 
         /** @var MessageCatalogue $result */
diff --git a/src/Oro/Bundle/TranslationBundle/Tests/Unit/Translation/TranslatorTest.php b/src/Oro/Bundle/TranslationBundle/Tests/Unit/Translation/TranslatorTest.php
index eff370568f9..1fb17ecf50b 100644
--- a/src/Oro/Bundle/TranslationBundle/Tests/Unit/Translation/TranslatorTest.php
+++ b/src/Oro/Bundle/TranslationBundle/Tests/Unit/Translation/TranslatorTest.php
@@ -298,7 +298,18 @@ public function testLoadingOfDynamicResources()
         ];
 
         $container     = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+        $doctrine      = $this->getMock('Doctrine\Common\Persistence\ManagerRegistry');
         $em            = $this->getMock('Doctrine\ORM\EntityManagerInterface');
+        $connection    = $this->getMockBuilder('Doctrine\DBAL\Connection')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $schemaManager = $this->getMockBuilder('Doctrine\DBAL\Schema\AbstractSchemaManager')
+            ->disableOriginalConstructor()
+            ->setMethods(['tablesExist'])
+            ->getMockForAbstractClass();
+        $classMetadata = $this->getMockBuilder('Doctrine\ORM\Mapping\ClassMetadata')
+            ->disableOriginalConstructor()
+            ->getMock();
         $repository    = $this
             ->getMockBuilder('Oro\Bundle\TranslationBundle\Entity\Repository\TranslationRepository')
             ->disableOriginalConstructor()
@@ -315,6 +326,8 @@ public function testLoadingOfDynamicResources()
         $translator->setLocale($locale);
         $translator->setDatabaseMetadataCache($databaseCache);
 
+        $translationTable = 'translation_table';
+
         $container
             ->expects($this->any())
             ->method('hasParameter')
@@ -329,14 +342,44 @@ public function testLoadingOfDynamicResources()
             ->expects($this->any())
             ->method('get')
             ->with('doctrine')
-            ->willReturn($em);
-        $em
+            ->willReturn($doctrine);
+        $doctrine
             ->expects($this->any())
+            ->method('getManagerForClass')
+            ->with(Translation::ENTITY_NAME)
+            ->willReturn($em);
+        $doctrine
+            ->expects($this->once())
             ->method('getRepository')
             ->with(Translation::ENTITY_NAME)
             ->willReturn($repository);
+        $em
+            ->expects($this->once())
+            ->method('getConnection')
+            ->willReturn($connection);
+        $em
+            ->expects($this->once())
+            ->method('getClassMetadata')
+            ->with(Translation::ENTITY_NAME)
+            ->willReturn($classMetadata);
+        $connection
+            ->expects($this->once())
+            ->method('connect');
+        $connection
+            ->expects($this->once())
+            ->method('getSchemaManager')
+            ->willReturn($schemaManager);
+        $schemaManager
+            ->expects($this->once())
+            ->method('tablesExist')
+            ->with($translationTable)
+            ->willReturn(true);
+        $classMetadata
+            ->expects($this->once())
+            ->method('getTableName')
+            ->willReturn($translationTable);
         $repository
-            ->expects($this->any())
+            ->expects($this->once())
             ->method('findAvailableDomainsForLocales')
             ->willReturn($translate);
 
diff --git a/src/Oro/Bundle/TranslationBundle/Translation/OrmTranslationLoader.php b/src/Oro/Bundle/TranslationBundle/Translation/OrmTranslationLoader.php
index 92ecf49639c..2be6a25458a 100644
--- a/src/Oro/Bundle/TranslationBundle/Translation/OrmTranslationLoader.php
+++ b/src/Oro/Bundle/TranslationBundle/Translation/OrmTranslationLoader.php
@@ -8,6 +8,7 @@
 use Symfony\Component\Translation\Loader\LoaderInterface;
 use Symfony\Component\Translation\MessageCatalogue;
 
+use Oro\Bundle\EntityBundle\Tools\SafeDatabaseChecker;
 use Oro\Bundle\TranslationBundle\Entity\Translation;
 use Oro\Bundle\TranslationBundle\Entity\Repository\TranslationRepository;
 
@@ -55,24 +56,17 @@ public function load($resource, $locale, $domain = 'messages')
     }
 
     /**
-     * Check if translations table exists in db
+     * Checks whether the translations table exists in the database
      *
      * @return bool
      */
     protected function checkDatabase()
     {
         if (null === $this->dbCheck) {
-            $this->dbCheck = false;
-
-            $em = $this->getEntityManager();
-            try {
-                $conn = $em->getConnection();
-                $conn->connect();
-                $this->dbCheck = $conn->getSchemaManager()->tablesExist(
-                    [$em->getClassMetadata(Translation::ENTITY_NAME)->getTableName()]
-                );
-            } catch (\PDOException $e) {
-            }
+            $this->dbCheck = SafeDatabaseChecker::tablesExist(
+                $this->getEntityManager()->getConnection(),
+                SafeDatabaseChecker::getTableName($this->doctrine, Translation::ENTITY_NAME)
+            );
         }
 
         return $this->dbCheck;
diff --git a/src/Oro/Bundle/TranslationBundle/Translation/Translator.php b/src/Oro/Bundle/TranslationBundle/Translation/Translator.php
index 834ff1a5c22..562a5a42593 100644
--- a/src/Oro/Bundle/TranslationBundle/Translation/Translator.php
+++ b/src/Oro/Bundle/TranslationBundle/Translation/Translator.php
@@ -8,6 +8,7 @@
 use Symfony\Component\Translation\Loader\LoaderInterface;
 use Symfony\Bundle\FrameworkBundle\Translation\Translator as BaseTranslator;
 
+use Oro\Bundle\EntityBundle\Tools\SafeDatabaseChecker;
 use Oro\Bundle\TranslationBundle\Entity\Translation;
 
 class Translator extends BaseTranslator
@@ -35,6 +36,9 @@ class Translator extends BaseTranslator
      */
     protected $dynamicResources = [];
 
+    /** @var bool|null */
+    protected $dbCheck;
+
     /**
      * Collector of translations
      *
@@ -231,7 +235,7 @@ protected function ensureDynamicResourcesLoaded($locale)
                     }
                 }
             }
-            if (!$hasDatabaseResources) {
+            if (!$hasDatabaseResources && $this->checkDatabase()) {
                 $locales = $this->getFallbackLocales();
                 array_unshift($locales, $locale);
                 $locales = array_unique($locales);
@@ -261,4 +265,22 @@ protected function isInstalled()
     {
         return $this->container->hasParameter('installed') && $this->container->getParameter('installed');
     }
+
+    /**
+     * Checks whether the translations table exists in the database
+     *
+     * @return bool
+     */
+    protected function checkDatabase()
+    {
+        if (null === $this->dbCheck) {
+            $doctrine      = $this->container->get('doctrine');
+            $this->dbCheck = SafeDatabaseChecker::tablesExist(
+                $doctrine->getManagerForClass(Translation::ENTITY_NAME)->getConnection(),
+                SafeDatabaseChecker::getTableName($doctrine, Translation::ENTITY_NAME)
+            );
+        }
+
+        return $this->dbCheck;
+    }
 }

From bf07b4434d9d5179fdd92047302ba9ffb054494c Mon Sep 17 00:00:00 2001
From: Vova Soroka <vsoroka@magecore.com>
Date: Thu, 14 Jan 2016 12:00:49 +0200
Subject: [PATCH 453/471] BAP-9554: Web installer fails when DB does not exist.
 Fix CS

---
 src/Oro/Bundle/PlatformBundle/OroPlatformBundle.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/PlatformBundle/OroPlatformBundle.php b/src/Oro/Bundle/PlatformBundle/OroPlatformBundle.php
index 0278a8d5c52..790a78676e6 100644
--- a/src/Oro/Bundle/PlatformBundle/OroPlatformBundle.php
+++ b/src/Oro/Bundle/PlatformBundle/OroPlatformBundle.php
@@ -2,7 +2,6 @@
 
 namespace Oro\Bundle\PlatformBundle;
 
-use Oro\Bundle\PlatformBundle\DependencyInjection\Compiler\UpdateDoctrineConfigurationPass;
 use Symfony\Component\DependencyInjection\Compiler\PassConfig;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
@@ -12,6 +11,7 @@
 
 use Oro\Bundle\PlatformBundle\DependencyInjection\Compiler\LazyServicesCompilerPass;
 use Oro\Bundle\PlatformBundle\DependencyInjection\Compiler\OptionalListenersCompilerPass;
+use Oro\Bundle\PlatformBundle\DependencyInjection\Compiler\UpdateDoctrineConfigurationPass;
 use Oro\Bundle\PlatformBundle\DependencyInjection\Compiler\UpdateDoctrineEventHandlersPass;
 
 class OroPlatformBundle extends Bundle

From 722e675ced267c2eaaaea54cb07dcc1a75a0951e Mon Sep 17 00:00:00 2001
From: Vova Soroka <vsoroka@magecore.com>
Date: Thu, 14 Jan 2016 15:45:58 +0200
Subject: [PATCH 454/471] BAP-9554: Web installer fails when DB does not exist.
 Fix Selenium tests

---
 .../InstallerBundle/Tests/Selenium/Pages/OroRequirements.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/InstallerBundle/Tests/Selenium/Pages/OroRequirements.php b/src/Oro/Bundle/InstallerBundle/Tests/Selenium/Pages/OroRequirements.php
index f83b0bee350..7eb93f19d33 100644
--- a/src/Oro/Bundle/InstallerBundle/Tests/Selenium/Pages/OroRequirements.php
+++ b/src/Oro/Bundle/InstallerBundle/Tests/Selenium/Pages/OroRequirements.php
@@ -43,8 +43,8 @@ public function assertPhpSettings()
 
     public function next()
     {
-        $this->test->moveto($this->test->byXpath("//a[@class = 'button next primary']"));
-        $this->test->byXpath("//a[@class = 'button next primary']")->click();
+        $this->test->moveto($this->test->byXpath("//a[@id = 'next-button']"));
+        $this->test->byXpath("//a[@id = 'next-button']")->click();
         $this->waitPageToLoad();
         $this->waitForAjax();
         $this->assertTitle('Configuration - Oro Application installation');

From f0af0e0d5ed1a767d54aad45ba2378dd26ed5250 Mon Sep 17 00:00:00 2001
From: Makar Sichevoy <sichevoy@gmail.com>
Date: Thu, 14 Jan 2016 16:17:18 +0200
Subject: [PATCH 455/471] CRM-4846: Grid on activity page

---
 .../Type/MultipleAssociationChoiceType.php    | 71 +++++++++++++++++++
 .../Resources/config/entity_config.yml        |  2 +-
 .../ActivityBundle/Resources/config/form.yml  | 11 +++
 3 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 src/Oro/Bundle/ActivityBundle/Form/Type/MultipleAssociationChoiceType.php

diff --git a/src/Oro/Bundle/ActivityBundle/Form/Type/MultipleAssociationChoiceType.php b/src/Oro/Bundle/ActivityBundle/Form/Type/MultipleAssociationChoiceType.php
new file mode 100644
index 00000000000..679f7ff93b3
--- /dev/null
+++ b/src/Oro/Bundle/ActivityBundle/Form/Type/MultipleAssociationChoiceType.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Oro\Bundle\ActivityBundle\Form\Type;
+
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\Options;
+
+use Oro\Bundle\EntityConfigBundle\Config\Id\EntityConfigId;
+use Oro\Bundle\EntityExtendBundle\Form\Type\MultipleAssociationChoiceType as BaseMultipleAssociationChoiceType;
+
+class MultipleAssociationChoiceType extends BaseMultipleAssociationChoiceType
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        parent::setDefaultOptions($resolver);
+
+        $resolver->setDefaults(
+            [
+                'empty_value' => false,
+                'choices'     => function (Options $options) {
+                    return $this->getChoices($options);
+                },
+                'multiple'    => true,
+                'expanded'    => true
+            ]
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return 'oro_activity_multiple_association_choice';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getParent()
+    {
+        return 'oro_entity_extend_multiple_association_choice';
+    }
+
+    /**
+     * @param Options $options
+     *
+     * @return array
+     */
+    protected function getChoices($options)
+    {
+        $groupName = $options['association_class'];
+        /** @var EntityConfigId $configId */
+        $configId  = $options['config_id'];
+        $targetClassName = $configId->getClassName();
+
+        $choices = [];
+        $entityConfigProvider = $this->configManager->getProvider('entity');
+        $owningSideEntities = $this->typeHelper->getOwningSideEntities($groupName);
+        foreach ($owningSideEntities as $className) {
+            if ($targetClassName !== $className) {
+                $choices[$className] = $entityConfigProvider->getConfig($className)->get('plural_label');
+            }
+        }
+
+        return $choices;
+    }
+}
diff --git a/src/Oro/Bundle/ActivityBundle/Resources/config/entity_config.yml b/src/Oro/Bundle/ActivityBundle/Resources/config/entity_config.yml
index 84ba0b116c3..22c6920dbc0 100644
--- a/src/Oro/Bundle/ActivityBundle/Resources/config/entity_config.yml
+++ b/src/Oro/Bundle/ActivityBundle/Resources/config/entity_config.yml
@@ -8,7 +8,7 @@ oro_entity_config:
                         require_schema_update: true
                         priority:           250
                     form:
-                        type:               oro_entity_extend_multiple_association_choice
+                        type:               oro_activity_multiple_association_choice
                         options:
                             block:          associations
                             required:       false
diff --git a/src/Oro/Bundle/ActivityBundle/Resources/config/form.yml b/src/Oro/Bundle/ActivityBundle/Resources/config/form.yml
index 392202a64c4..02ae491ca4d 100644
--- a/src/Oro/Bundle/ActivityBundle/Resources/config/form.yml
+++ b/src/Oro/Bundle/ActivityBundle/Resources/config/form.yml
@@ -1,3 +1,6 @@
+parameters:
+    oro_activity.type.multiple_association_choice.class: Oro\Bundle\ActivityBundle\Form\Type\MultipleAssociationChoiceType
+
 services:
     oro_activity.form.type.contexts_select:
         class: Oro\Bundle\ActivityBundle\Form\Type\ContextsSelectType
@@ -22,3 +25,11 @@ services:
             - [setRequest, [@?request=]]
         tags:
             - { name: form.type_extension, alias: form }
+
+    oro_activity.type.multiple_association_choice:
+        class: %oro_activity.type.multiple_association_choice.class%
+        arguments:
+            - @oro_entity_extend.association_type_helper
+            - @oro_entity_config.config_manager
+        tags:
+            - { name: form.type, alias: oro_activity_multiple_association_choice }

From 68ebdeffbfabd001a029164a2c1a1e60ae9b3b91 Mon Sep 17 00:00:00 2001
From: Makar Sichevoy <sichevoy@gmail.com>
Date: Thu, 14 Jan 2016 16:25:16 +0200
Subject: [PATCH 456/471] CRM-4846: Grid on activity page

---
 .../Type/MultipleAssociationChoiceType.php    | 56 ++++++-------------
 1 file changed, 18 insertions(+), 38 deletions(-)

diff --git a/src/Oro/Bundle/ActivityBundle/Form/Type/MultipleAssociationChoiceType.php b/src/Oro/Bundle/ActivityBundle/Form/Type/MultipleAssociationChoiceType.php
index 679f7ff93b3..346ac062b9c 100644
--- a/src/Oro/Bundle/ActivityBundle/Form/Type/MultipleAssociationChoiceType.php
+++ b/src/Oro/Bundle/ActivityBundle/Form/Type/MultipleAssociationChoiceType.php
@@ -2,8 +2,8 @@
 
 namespace Oro\Bundle\ActivityBundle\Form\Type;
 
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
-use Symfony\Component\OptionsResolver\Options;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
 
 use Oro\Bundle\EntityConfigBundle\Config\Id\EntityConfigId;
 use Oro\Bundle\EntityExtendBundle\Form\Type\MultipleAssociationChoiceType as BaseMultipleAssociationChoiceType;
@@ -13,20 +13,24 @@ class MultipleAssociationChoiceType extends BaseMultipleAssociationChoiceType
     /**
      * {@inheritdoc}
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function finishView(FormView $view, FormInterface $form, array $options)
     {
-        parent::setDefaultOptions($resolver);
+        parent::finishView($view, $form, $options);
+
+        /** @var EntityConfigId $configId */
+        $configId  = $options['config_id'];
+        $targetClassName = $configId->getClassName();
+
+        /** @var FormView $choiceView */
+        foreach ($view->children as $choiceView) {
+            // disable activity with same class as target entity
+            if ((isset($view->vars['disabled']) && $view->vars['disabled'])
+                || ($choiceView->vars['value'] === $targetClassName)
+            ) {
+                $choiceView->vars['disabled'] = true;
+            }
+        }
 
-        $resolver->setDefaults(
-            [
-                'empty_value' => false,
-                'choices'     => function (Options $options) {
-                    return $this->getChoices($options);
-                },
-                'multiple'    => true,
-                'expanded'    => true
-            ]
-        );
     }
 
     /**
@@ -44,28 +48,4 @@ public function getParent()
     {
         return 'oro_entity_extend_multiple_association_choice';
     }
-
-    /**
-     * @param Options $options
-     *
-     * @return array
-     */
-    protected function getChoices($options)
-    {
-        $groupName = $options['association_class'];
-        /** @var EntityConfigId $configId */
-        $configId  = $options['config_id'];
-        $targetClassName = $configId->getClassName();
-
-        $choices = [];
-        $entityConfigProvider = $this->configManager->getProvider('entity');
-        $owningSideEntities = $this->typeHelper->getOwningSideEntities($groupName);
-        foreach ($owningSideEntities as $className) {
-            if ($targetClassName !== $className) {
-                $choices[$className] = $entityConfigProvider->getConfig($className)->get('plural_label');
-            }
-        }
-
-        return $choices;
-    }
 }

From de16449184ce3e589c2b0f8c497e937a49932b85 Mon Sep 17 00:00:00 2001
From: Makar Sichevoy <sichevoy@gmail.com>
Date: Thu, 14 Jan 2016 17:17:12 +0200
Subject: [PATCH 457/471] CRM-4846: Grid on activity page - add ut

---
 .../MultipleAssociationChoiceTypeTest.php     | 97 +++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 src/Oro/Bundle/ActivityBundle/Tests/Unit/Form/Type/MultipleAssociationChoiceTypeTest.php

diff --git a/src/Oro/Bundle/ActivityBundle/Tests/Unit/Form/Type/MultipleAssociationChoiceTypeTest.php b/src/Oro/Bundle/ActivityBundle/Tests/Unit/Form/Type/MultipleAssociationChoiceTypeTest.php
new file mode 100644
index 00000000000..07ffcae8ccc
--- /dev/null
+++ b/src/Oro/Bundle/ActivityBundle/Tests/Unit/Form/Type/MultipleAssociationChoiceTypeTest.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace Oro\Bundle\ActivityBundle\Tests\Unit\Form\Type;
+
+use Symfony\Component\Form\Form;
+use Symfony\Component\Form\FormView;
+
+use Oro\Bundle\EntityConfigBundle\Config\Id\EntityConfigId;
+use Oro\Bundle\ActivityBundle\Form\Type\MultipleAssociationChoiceType;
+use Oro\Bundle\EntityExtendBundle\Form\Util\AssociationTypeHelper;
+use Oro\Bundle\EntityExtendBundle\Tests\Unit\Form\Type\AssociationTypeTestCase;
+
+class MultipleAssociationChoiceTypeTest extends AssociationTypeTestCase
+{
+    /** @var \PHPUnit_Framework_MockObject_MockObject */
+    protected $entityConfigProvider;
+
+    /** @var MultipleAssociationChoiceType */
+    protected $type;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $entityClassResolver = $this->getMockBuilder('Oro\Bundle\EntityBundle\ORM\EntityClassResolver')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->type = new MultipleAssociationChoiceType(
+            new AssociationTypeHelper($this->configManager, $entityClassResolver),
+            $this->configManager
+        );
+    }
+
+    public function testFinishViewForDisabled()
+    {
+        $this->configManager->expects($this->any())
+            ->method('getProvider')
+            ->will(
+                $this->returnValueMap(
+                    [
+                        ['test', $this->testConfigProvider],
+                    ]
+                )
+            );
+
+        $this->testConfigProvider->expects($this->once())
+            ->method('hasConfig')
+            ->with('Test\Entity2')
+            ->will($this->returnValue(false));
+        $this->testConfigProvider->expects($this->never())
+            ->method('getConfig');
+
+        $view    = new FormView();
+        $form    = new Form($this->getMock('Symfony\Component\Form\FormConfigInterface'));
+        $options = [
+            'config_id'         => new EntityConfigId('test', 'Test\Entity2'),
+            'association_class' => 'test'
+        ];
+
+        $view->vars['disabled'] = false;
+
+        $view->children[0] = new FormView($view);
+        $view->children[1] = new FormView($view);
+
+        $view->children[0]->vars['value'] = 'Test\Entity1';
+        $view->children[1]->vars['value'] = 'Test\Entity2';
+
+        $this->type->finishView($view, $form, $options);
+
+        $this->assertEquals(
+            [
+                'attr'     => [],
+                'value'    => 'Test\Entity1'
+            ],
+            $view->children[0]->vars
+        );
+        $this->assertEquals(
+            [
+                'attr'     => [],
+                'disabled' => true,
+                'value'    => 'Test\Entity2'
+            ],
+            $view->children[1]->vars
+        );
+    }
+
+    public function testGetName()
+    {
+        $this->assertEquals('oro_activity_multiple_association_choice', $this->type->getName());
+    }
+
+    public function testGetParent()
+    {
+        $this->assertEquals('oro_entity_extend_multiple_association_choice', $this->type->getParent());
+    }
+}

From 7fad13796aa29a1560e8751f78e65a2e44958022 Mon Sep 17 00:00:00 2001
From: Makar Sichevoy <sichevoy@gmail.com>
Date: Thu, 14 Jan 2016 17:18:18 +0200
Subject: [PATCH 458/471] CRM-4846: Grid on activity page

---
 .../Tests/Unit/EventListener/PrepareResultItemListenerTest.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/PrepareResultItemListenerTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/PrepareResultItemListenerTest.php
index 1da4cc2975f..854a84d9cd6 100644
--- a/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/PrepareResultItemListenerTest.php
+++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/PrepareResultItemListenerTest.php
@@ -2,9 +2,9 @@
 
 namespace Oro\Bundle\EmailBundle\Tests\Unit\EventListener;
 
-use Oro\Bundle\EmailBundle\Entity\EmailUser;
 use Symfony\Component\Routing\Router;
 
+use Oro\Bundle\EmailBundle\Entity\EmailUser;
 use Oro\Bundle\SearchBundle\Query\Result\Item;
 use Oro\Bundle\EmailBundle\EventListener\PrepareResultItemListener;
 use Oro\Bundle\SearchBundle\Event\PrepareResultItemEvent;

From 145a26c4645117f6a58fc07ad8cb7f966fa8353f Mon Sep 17 00:00:00 2001
From: Vova Soroka <vsoroka@magecore.com>
Date: Thu, 14 Jan 2016 19:30:48 +0200
Subject: [PATCH 459/471] BB-1944: No Activity tab on the entity editing page.
 Refactor ActivityListChainProvider::isApplicableTarget

---
 .../Provider/ActivityListChainProvider.php    | 27 ++++----
 .../ActivityListChainProviderTest.php         | 68 +++++++++++++++++++
 .../Provider/Fixture/TestActivityProvider.php |  4 +-
 3 files changed, 83 insertions(+), 16 deletions(-)

diff --git a/src/Oro/Bundle/ActivityListBundle/Provider/ActivityListChainProvider.php b/src/Oro/Bundle/ActivityListBundle/Provider/ActivityListChainProvider.php
index 2cf79f7df5f..269f1d4d1b6 100644
--- a/src/Oro/Bundle/ActivityListBundle/Provider/ActivityListChainProvider.php
+++ b/src/Oro/Bundle/ActivityListBundle/Provider/ActivityListChainProvider.php
@@ -20,8 +20,6 @@
 use Oro\Bundle\UIBundle\Tools\HtmlTagHelper;
 
 /**
- * Class ActivityListChainProvider
- * @package Oro\Bundle\ActivityListBundle\Provider
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  */
@@ -90,9 +88,9 @@ public function addProvider(ActivityListProviderInterface $provider)
     }
 
     /**
-     * Get array providers
+     * Get all registered providers
      *
-     * @return \Oro\Bundle\ActivityListBundle\Model\ActivityListProviderInterface[]
+     * @return ActivityListProviderInterface[] [activity class => provider, ...]
      */
     public function getProviders()
     {
@@ -133,19 +131,16 @@ public function getTargetEntityClasses()
      */
     public function isApplicableTarget($targetClassName, $activityClassName)
     {
-        /** @var ConfigIdInterface[] $configIds */
-        $configIds = $this->configManager->getIds('entity', null, false);
-        foreach ($configIds as $configId) {
-            if (array_key_exists($activityClassName, $this->providers)) {
-                $provider = $this->getProviderByClass($activityClassName);
-                if ($provider->isApplicableTarget($configId, $this->configManager)
-                    && $configId->getClassName() === $targetClassName) {
-                    return true;
-                }
-            }
+        if (!isset($this->providers[$activityClassName])
+            || !$this->configManager->hasConfig($targetClassName)
+        ) {
+            return false;
         }
 
-        return false;
+        return $this->providers[$activityClassName]->isApplicableTarget(
+            $this->configManager->getId('entity', $targetClassName),
+            $this->configManager
+        );
     }
 
     /**
@@ -394,6 +389,8 @@ public function getProviderForEntity($activityEntity)
      * @param string $className
      *
      * @return ActivityListProviderInterface
+     *
+     * @deprecated since 1.9.
      */
     public function getProviderByClass($className)
     {
diff --git a/src/Oro/Bundle/ActivityListBundle/Tests/Unit/Provider/ActivityListChainProviderTest.php b/src/Oro/Bundle/ActivityListBundle/Tests/Unit/Provider/ActivityListChainProviderTest.php
index b9e4fe5a4cb..ca31bc941ff 100644
--- a/src/Oro/Bundle/ActivityListBundle/Tests/Unit/Provider/ActivityListChainProviderTest.php
+++ b/src/Oro/Bundle/ActivityListBundle/Tests/Unit/Provider/ActivityListChainProviderTest.php
@@ -62,6 +62,74 @@ public function setUp()
         $this->provider->addProvider($this->testActivityProvider);
     }
 
+    public function testIsApplicableTarget()
+    {
+        $targetClassName   = TestActivityProvider::SUPPORTED_TARGET_CLASS_NAME;
+        $activityClassName = TestActivityProvider::ACTIVITY_CLASS_NAME;
+
+        $this->configManager->expects($this->any())
+            ->method('hasConfig')
+            ->with($targetClassName)
+            ->willReturn(true);
+        $this->configManager->expects($this->any())
+            ->method('getId')
+            ->with('entity', $targetClassName)
+            ->willReturn(new EntityConfigId('entity', $targetClassName));
+
+        $this->assertTrue(
+            $this->provider->isApplicableTarget($targetClassName, $activityClassName)
+        );
+    }
+
+    public function testIsApplicableTargetForNotSupportedTargetEntity()
+    {
+        $targetClassName   = 'Test\NotSupportedTargetEntity';
+        $activityClassName = TestActivityProvider::ACTIVITY_CLASS_NAME;
+
+        $this->configManager->expects($this->any())
+            ->method('hasConfig')
+            ->with($targetClassName)
+            ->willReturn(true);
+        $this->configManager->expects($this->any())
+            ->method('getId')
+            ->with('entity', $targetClassName)
+            ->willReturn(new EntityConfigId('entity', $targetClassName));
+
+        $this->assertFalse(
+            $this->provider->isApplicableTarget($targetClassName, $activityClassName)
+        );
+    }
+
+    public function testIsApplicableTargetForNotRegisteredActivityEntity()
+    {
+        $targetClassName   = TestActivityProvider::SUPPORTED_TARGET_CLASS_NAME;
+        $activityClassName = 'Test\NotRegisteredActivityEntity';
+
+        $this->configManager->expects($this->never())
+            ->method('hasConfig');
+
+        $this->assertFalse(
+            $this->provider->isApplicableTarget($targetClassName, $activityClassName)
+        );
+    }
+
+    public function testIsApplicableTargetForNotConfigurableTargetEntity()
+    {
+        $targetClassName   = 'Test\NotConfigurableTargetEntity';
+        $activityClassName = TestActivityProvider::ACTIVITY_CLASS_NAME;
+
+        $this->configManager->expects($this->any())
+            ->method('hasConfig')
+            ->with($targetClassName)
+            ->willReturn(false);
+        $this->configManager->expects($this->never())
+            ->method('getId');
+
+        $this->assertFalse(
+            $this->provider->isApplicableTarget($targetClassName, $activityClassName)
+        );
+    }
+
     public function testGetSupportedActivities()
     {
         $this->assertEquals(
diff --git a/src/Oro/Bundle/ActivityListBundle/Tests/Unit/Provider/Fixture/TestActivityProvider.php b/src/Oro/Bundle/ActivityListBundle/Tests/Unit/Provider/Fixture/TestActivityProvider.php
index 6320476594b..fb26017bb50 100644
--- a/src/Oro/Bundle/ActivityListBundle/Tests/Unit/Provider/Fixture/TestActivityProvider.php
+++ b/src/Oro/Bundle/ActivityListBundle/Tests/Unit/Provider/Fixture/TestActivityProvider.php
@@ -17,6 +17,8 @@ class TestActivityProvider implements
     const ACTIVITY_CLASS_NAME = 'Test\Entity';
     const ACL_CLASS = 'Test\Entity';
 
+    const SUPPORTED_TARGET_CLASS_NAME = 'Acme\DemoBundle\Entity\CorrectEntity';
+
     protected $targets;
 
     /**
@@ -24,7 +26,7 @@ class TestActivityProvider implements
      */
     public function isApplicableTarget(ConfigIdInterface $configId, ConfigManager $configManager)
     {
-        if ($configId->getClassName() === 'Acme\\DemoBundle\\Entity\\CorrectEntity') {
+        if ($configId->getClassName() === self::SUPPORTED_TARGET_CLASS_NAME) {
             return true;
         }
 

From df83d339a8dff5553116b1a99d4b2d0da3ba51dc Mon Sep 17 00:00:00 2001
From: Vova Soroka <vsoroka@magecore.com>
Date: Thu, 14 Jan 2016 19:33:38 +0200
Subject: [PATCH 460/471] BB-1944: No Activity tab on the entity editing page.
 Refactor ActivityListChainProvider::isApplicableTarget. Revert invalid
 comment

---
 .../ActivityListBundle/Provider/ActivityListChainProvider.php   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Oro/Bundle/ActivityListBundle/Provider/ActivityListChainProvider.php b/src/Oro/Bundle/ActivityListBundle/Provider/ActivityListChainProvider.php
index 269f1d4d1b6..8847ede7b4b 100644
--- a/src/Oro/Bundle/ActivityListBundle/Provider/ActivityListChainProvider.php
+++ b/src/Oro/Bundle/ActivityListBundle/Provider/ActivityListChainProvider.php
@@ -389,8 +389,6 @@ public function getProviderForEntity($activityEntity)
      * @param string $className
      *
      * @return ActivityListProviderInterface
-     *
-     * @deprecated since 1.9.
      */
     public function getProviderByClass($className)
     {

From 2984ba86dc4804c5ca4913f503f82071c3188d4a Mon Sep 17 00:00:00 2001
From: Makar Sichevoy <sichevoy@gmail.com>
Date: Thu, 14 Jan 2016 20:33:15 +0200
Subject: [PATCH 461/471] CRM-4841: Activities as contexts for other activities
 - added view links from activities

---
 .../CalendarBundle/Resources/translations/messages.en.yml  | 1 +
 .../views/CalendarEvent/js/activityItemTemplate.js.twig    | 7 +++++++
 .../EmailBundle/Resources/translations/messages.en.yml     | 1 +
 .../views/Email/js/groupedActivityItemTemplate.js.twig     | 7 +++++++
 4 files changed, 16 insertions(+)

diff --git a/src/Oro/Bundle/CalendarBundle/Resources/translations/messages.en.yml b/src/Oro/Bundle/CalendarBundle/Resources/translations/messages.en.yml
index 7535861e972..cb98c922b3e 100644
--- a/src/Oro/Bundle/CalendarBundle/Resources/translations/messages.en.yml
+++ b/src/Oro/Bundle/CalendarBundle/Resources/translations/messages.en.yml
@@ -19,6 +19,7 @@ oro:
         view_events:                Events
         add_to_calendar:            Add to %name%
         organization_calendar:      Organization Calendar
+        view:                       View event
 
         action:
             public_calendar_management: Manage system calendars
diff --git a/src/Oro/Bundle/CalendarBundle/Resources/views/CalendarEvent/js/activityItemTemplate.js.twig b/src/Oro/Bundle/CalendarBundle/Resources/views/CalendarEvent/js/activityItemTemplate.js.twig
index 8d48c0229c2..8cdd17a74cc 100644
--- a/src/Oro/Bundle/CalendarBundle/Resources/views/CalendarEvent/js/activityItemTemplate.js.twig
+++ b/src/Oro/Bundle/CalendarBundle/Resources/views/CalendarEvent/js/activityItemTemplate.js.twig
@@ -27,6 +27,13 @@
     {% endset %}
     {% set actions = [action] %}
 
+    {% set action %}
+        <a href="<%= routing.generate('oro_calendar_event_view', {'id': relatedActivityId}) %>"
+           title="{{ 'oro.calendar.view'|trans|raw }}"><i
+                class="icon-eye-open hide-text">{{ 'oro.calendar.view'|trans|raw }}</i></a>
+    {% endset %}
+    {% set actions = actions|merge([action]) %}
+
     {% set action %}
         <% if (editable) { %>
         <a href="#" class="action item-edit-button"
diff --git a/src/Oro/Bundle/EmailBundle/Resources/translations/messages.en.yml b/src/Oro/Bundle/EmailBundle/Resources/translations/messages.en.yml
index 1cc9137f0b3..22879605a13 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/translations/messages.en.yml
+++ b/src/Oro/Bundle/EmailBundle/Resources/translations/messages.en.yml
@@ -241,6 +241,7 @@ oro:
         reply:                    Reply
         reply_all:                Reply All
         forward:                  Forward
+        view:                     View email
         forwarded_message:        Forwarded message
         parent_message_header:    "On %date% %user% wrote:"
         load_more_emails:         "%quantity% older messages"
diff --git a/src/Oro/Bundle/EmailBundle/Resources/views/Email/js/groupedActivityItemTemplate.js.twig b/src/Oro/Bundle/EmailBundle/Resources/views/Email/js/groupedActivityItemTemplate.js.twig
index 2c6eaa1292f..722748b6a72 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/views/Email/js/groupedActivityItemTemplate.js.twig
+++ b/src/Oro/Bundle/EmailBundle/Resources/views/Email/js/groupedActivityItemTemplate.js.twig
@@ -138,6 +138,13 @@
     {% endset %}
     {% set actions = actions|merge([action]) %}
 
+    {% set action %}
+        <a href="<%= routing.generate('oro_email_thread_view', {'id': relatedActivityId}) %>"
+           title="{{ 'oro.email.view'|trans|raw }}"><i
+                class="icon-eye-open hide-text">{{ 'oro.email.view'|trans|raw }}</i></a>
+    {% endset %}
+    {% set actions = actions|merge([action]) %}
+
     {{ parent() }}
 {% endblock %}
 

From db4ee3adbb48677b80d01f8a78f2325ef99c63a8 Mon Sep 17 00:00:00 2001
From: Yurii Muratov <yurio@ua.fm>
Date: Thu, 14 Jan 2016 22:05:33 +0200
Subject: [PATCH 462/471] Fix code standarts

---
 .../QueryDesignerBundle/Model/GroupNode.php   | 65 ++++++++++---------
 .../SecurityBundle/Search/AclHelper.php       | 49 ++++++++------
 .../Config/Resolver/SystemAwareResolver.php   |  3 +
 3 files changed, 64 insertions(+), 53 deletions(-)

diff --git a/src/Oro/Bundle/QueryDesignerBundle/Model/GroupNode.php b/src/Oro/Bundle/QueryDesignerBundle/Model/GroupNode.php
index 5483c7d53ae..42d6a220ce6 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Model/GroupNode.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/Model/GroupNode.php
@@ -6,11 +6,11 @@
 
 class GroupNode
 {
-    const TYPE_COMPUTED = 'computed';
+    const TYPE_COMPUTED   = 'computed';
     const TYPE_UNCOMPUTED = 'uncomputed';
-    const TYPE_MIXED = 'mixed';
+    const TYPE_MIXED      = 'mixed';
 
-    /** @var string*/
+    /** @var string */
     protected $condition;
 
     /** @var GroupNode[]|Restriction[] */
@@ -83,47 +83,48 @@ public function getCondition()
      */
     public function getType()
     {
-        $mixed = ArrayUtil::some(
-            function ($node) {
-                if ($node instanceof GroupNode) {
-                    return $node->getType() === GroupNode::TYPE_MIXED;
-                }
-
-                return false;
-            },
-            $this->nodes
-        );
+        $mixed = $this->typedNodesExists(GroupNode::TYPE_MIXED);
 
         if ($mixed) {
             return GroupNode::TYPE_MIXED;
         }
 
-        $computed = ArrayUtil::some(
-            function ($node) {
-                if ($node instanceof GroupNode) {
-                    return $node->getType() === GroupNode::TYPE_COMPUTED;
-                }
+        $computed   = $this->typedNodesExists(GroupNode::TYPE_COMPUTED);
+        $unComputed = $this->typedNodesExists(GroupNode::TYPE_UNCOMPUTED);
 
-                return $node->isComputed();
-            },
-            $this->nodes
-        );
+        if ($computed && $unComputed) {
+            return static::TYPE_MIXED;
+        }
+
+        return $computed ? static::TYPE_COMPUTED : static::TYPE_UNCOMPUTED;
+    }
+
+    /**
+     * @param $type
+     *
+     * @return bool
+     */
+    protected function typedNodesExists($type)
+    {
+        return ArrayUtil::some(
+            function ($node) use ($type) {
+                $exists = false;
 
-        $unComputed = ArrayUtil::some(
-            function ($node) {
                 if ($node instanceof GroupNode) {
-                    return $node->getType() === GroupNode::TYPE_UNCOMPUTED;
+                    $exists = $node->getType() === $type;
+                } else {
+                    switch ($type) {
+                        case GroupNode::TYPE_COMPUTED:
+                            $exists = $node->isComputed();
+                            break;
+                        case GroupNode::TYPE_UNCOMPUTED:
+                            $exists = !$node->isComputed();
+                    }
                 }
 
-                return !$node->isComputed();
+                return $exists;
             },
             $this->nodes
         );
-
-        if ($computed && $unComputed) {
-            return static::TYPE_MIXED;
-        }
-
-        return $computed ? static::TYPE_COMPUTED : static::TYPE_UNCOMPUTED;
     }
 }
diff --git a/src/Oro/Bundle/SecurityBundle/Search/AclHelper.php b/src/Oro/Bundle/SecurityBundle/Search/AclHelper.php
index 3d83cdb5f14..706b96c332e 100644
--- a/src/Oro/Bundle/SecurityBundle/Search/AclHelper.php
+++ b/src/Oro/Bundle/SecurityBundle/Search/AclHelper.php
@@ -46,18 +46,13 @@ public function __construct(
      */
     public function apply(Query $query, $permission = 'VIEW')
     {
-        $queryFromEntities = $query->getFrom();
-
-        // in query, from record !== '*'
-        if ($queryFromEntities[0] === '*') {
-            $queryFromEntities = $this->mappingProvider->getEntitiesListAliases();
-        }
+        $querySearchAliases = $this->getSearchAliases($query);
 
         $allowedAliases   = [];
         $ownerExpressions = [];
         $expr             = $query->getCriteria()->expr();
-        if (!empty($queryFromEntities)) {
-            foreach ($queryFromEntities as $entityAlias) {
+        if (count($querySearchAliases) !== 0) {
+            foreach ($querySearchAliases as $entityAlias) {
                 $className = $this->mappingProvider->getEntityClass($entityAlias);
                 if ($className) {
                     $ownerField = sprintf('%s_owner', $entityAlias);
@@ -72,25 +67,19 @@ public function apply(Query $query, $permission = 'VIEW')
                             continue;
                         }
 
-                        $owners = [SearchListener::EMPTY_OWNER_ID];
-                        if (!empty($condition[1])) {
-                            $owners = $condition[1];
-                            if (is_array($owners) && count($owners) === 1) {
-                                $owners = $owners[0];
-                            }
-                        }
+                        $owners = !empty($condition[1])
+                            ? $condition[1]
+                            : SearchListener::EMPTY_OWNER_ID;
 
-                        if (is_array($owners)) {
-                            $ownerExpressions[] = $expr->in('integer.' . $ownerField, $owners);
-                        } else {
-                            $ownerExpressions[] = $expr->eq('integer.' . $ownerField, $owners);
-                        }
+                        $ownerExpressions[] = (!is_array($owners) ||  count($owners) === 1)
+                            ? $expr->eq('integer.' . $ownerField, $owners)
+                            : $expr->in('integer.' . $ownerField, $owners);
                     }
                 }
             }
 
         }
-        if (!empty($ownerExpressions)) {
+        if (count($ownerExpressions) !== 0) {
             $query->getCriteria()->andWhere(new CompositeExpression(CompositeExpression::TYPE_OR, $ownerExpressions));
         }
         $query->from($allowedAliases);
@@ -121,4 +110,22 @@ protected function addOrganizationLimits(Query $query, $expr)
             );
         }
     }
+
+    /**
+     * Get search query 'from' aliases
+     *
+     * @param Query $query
+     *
+     * @return array Return search aliases from Query. In case if from part = *, return all search aliases
+     */
+    protected function getSearchAliases(Query $query)
+    {
+        $queryAliases = $query->getFrom();
+
+        if ($queryAliases[0] === '*') {
+            $queryAliases = $this->mappingProvider->getEntitiesListAliases();
+        }
+
+        return $queryAliases;
+    }
 }
diff --git a/src/Oro/Component/Config/Resolver/SystemAwareResolver.php b/src/Oro/Component/Config/Resolver/SystemAwareResolver.php
index 3c7972561fa..a4aefa4bbd1 100644
--- a/src/Oro/Component/Config/Resolver/SystemAwareResolver.php
+++ b/src/Oro/Component/Config/Resolver/SystemAwareResolver.php
@@ -8,6 +8,9 @@
 
 use Oro\Component\PropertyAccess\PropertyAccessor;
 
+/**
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ */
 class SystemAwareResolver implements ResolverInterface, ContainerAwareInterface
 {
     const PARENT_NODE = 'parent_node';

From d9a73919d932d93fd7eb6dcc164aaa5c8a1f8902 Mon Sep 17 00:00:00 2001
From: Vova Soroka <vsoroka@magecore.com>
Date: Thu, 14 Jan 2016 22:57:24 +0200
Subject: [PATCH 463/471] BAP-7171: Implement assets version  for our JS files.
 Fix Selenium tests

---
 .../public/js/init-entity-extend-apply.js     |  2 +-
 .../UIBundle/Resources/public/js/messenger.js | 27 ++++++++++++-------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/Oro/Bundle/EntityExtendBundle/Resources/public/js/init-entity-extend-apply.js b/src/Oro/Bundle/EntityExtendBundle/Resources/public/js/init-entity-extend-apply.js
index 077832f4256..bec935ef849 100644
--- a/src/Oro/Bundle/EntityExtendBundle/Resources/public/js/init-entity-extend-apply.js
+++ b/src/Oro/Bundle/EntityExtendBundle/Resources/public/js/init-entity-extend-apply.js
@@ -34,7 +34,7 @@ require([
 
                 $.post(url, function() {
                     modal.close();
-                    mediator.execute('showFlashMessage', 'success', __('oro.entity_extend.schema_updated'));
+                    mediator.execute('showFlashMessage', 'success', __('oro.entity_extend.schema_updated'), {afterReload: true});
                     mediator.execute('showMessage', 'info', __('Please wait until page will be reloaded...'));
                     mediator.execute('showLoading');
                     // force reload of the application to make sure 'js/routes' is reloaded
diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/messenger.js b/src/Oro/Bundle/UIBundle/Resources/public/js/messenger.js
index 701033917c8..83d111d519a 100644
--- a/src/Oro/Bundle/UIBundle/Resources/public/js/messenger.js
+++ b/src/Oro/Bundle/UIBundle/Resources/public/js/messenger.js
@@ -53,19 +53,26 @@ define([
              *      or false - means to not close automatically
              * @param {Function} options.template template function
              * @param {boolean} options.flash flag to turn on default delay close call, it's 5s
+             * @param {boolean} options.afterReload whether the message should be shown after a page is reloaded
              *
              * @return {Object} collection of methods - actions over message element,
              *      at the moment there's only one method 'close', allows to close the message
              */
             notificationMessage:  function(type, message, options) {
-                var container = (options || {}).container ||  defaults.container;
+                var container = (options || {}).container || defaults.container;
+                var afterReload = (options || {}).afterReload || false;
+                var afterReloadQueue = [];
                 var args = Array.prototype.slice.call(arguments);
                 var actions = {close: $.noop};
-                if (container && $(container).length) {
+                if (afterReload && window.localStorage) {
+                    afterReloadQueue = JSON.parse(localStorage.getItem('oroAfterReloadMessages') || '[]');
+                    afterReloadQueue.push(args);
+                    localStorage.setItem('oroAfterReloadMessages', JSON.stringify(afterReloadQueue));
+                } else if (container && $(container).length) {
                     actions = showMessage.apply(null, args);
                 } else {
                     // if container is not ready then save message for later
-                    queue.push([args, actions]);
+                    queue.push(args);
                 }
                 return actions;
             },
@@ -82,6 +89,7 @@ define([
              *      or false - means to not close automatically
              * @param {Function} options.template template function
              * @param {boolean} options.flash flag to turn on default delay close call, it's 5s
+             * @param {boolean} options.afterReload whether the message should be shown after a page is reloaded
              *
              * @return {Object} collection of methods - actions over message element,
              *      at the moment there's only one method 'close', allows to close the message
@@ -137,17 +145,18 @@ define([
             setup: function(options) {
                 _.extend(defaults, options);
 
+                if (window.localStorage) {
+                    queue = queue.concat(JSON.parse(localStorage.getItem('oroAfterReloadMessages') || '[]'));
+                    localStorage.removeItem('oroAfterReloadMessages');
+                }
+
                 while (queue.length) {
-                    var args = queue.shift();
-                    _.extend(args[1], showMessage.apply(null, args[0]));
+                    showMessage.apply(null, queue.shift());
                 }
             },
 
             addMessage: function(type, message, options) {
-                var args = [type, message, _.extend({flash: true}, options)];
-                var actions = {close: $.noop};
-
-                queue.push([args, actions]);
+                queue.push([type, message, _.extend({flash: true}, options)]);
             },
 
             showProcessingMessage: function(message, promise, type) {

From d577ece253867e3f28a58c73dba2a9e952eb7011 Mon Sep 17 00:00:00 2001
From: Vova Soroka <vsoroka@magecore.com>
Date: Fri, 15 Jan 2016 00:19:11 +0200
Subject: [PATCH 464/471] BAP-7171: Implement assets version  for our JS files.
 Fix CS

---
 .../Resources/public/js/init-entity-extend-apply.js        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/EntityExtendBundle/Resources/public/js/init-entity-extend-apply.js b/src/Oro/Bundle/EntityExtendBundle/Resources/public/js/init-entity-extend-apply.js
index bec935ef849..f327a8c02d2 100644
--- a/src/Oro/Bundle/EntityExtendBundle/Resources/public/js/init-entity-extend-apply.js
+++ b/src/Oro/Bundle/EntityExtendBundle/Resources/public/js/init-entity-extend-apply.js
@@ -34,7 +34,12 @@ require([
 
                 $.post(url, function() {
                     modal.close();
-                    mediator.execute('showFlashMessage', 'success', __('oro.entity_extend.schema_updated'), {afterReload: true});
+                    mediator.execute(
+                        'showFlashMessage',
+                        'success',
+                        __('oro.entity_extend.schema_updated'),
+                        {afterReload: true}
+                    );
                     mediator.execute('showMessage', 'info', __('Please wait until page will be reloaded...'));
                     mediator.execute('showLoading');
                     // force reload of the application to make sure 'js/routes' is reloaded

From 1b3d8ae634d1ccdebdce7993e43b9a232c196551 Mon Sep 17 00:00:00 2001
From: Makar Sichevoy <sichevoy@gmail.com>
Date: Fri, 15 Jan 2016 12:48:39 +0200
Subject: [PATCH 465/471] CRM-4841: Activities as contexts for other activities

---
 .../Entity/Manager/ActivityContextApiEntityManager.php           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Oro/Bundle/ActivityBundle/Entity/Manager/ActivityContextApiEntityManager.php b/src/Oro/Bundle/ActivityBundle/Entity/Manager/ActivityContextApiEntityManager.php
index defccbdcee7..83c2efb3040 100644
--- a/src/Oro/Bundle/ActivityBundle/Entity/Manager/ActivityContextApiEntityManager.php
+++ b/src/Oro/Bundle/ActivityBundle/Entity/Manager/ActivityContextApiEntityManager.php
@@ -118,6 +118,7 @@ public function getActivityContext($class, $id)
 
             $item          = [];
             $config        = $entityProvider->getConfig($targetClass);
+            $metadata      = $this->configManager->getEntityMetadata($targetClass);
             $safeClassName = $this->entityClassNameHelper->getUrlSafeClassName($targetClass);
 
             $link = null;

From 7eafe3e7cc24cce71553839a243cdb0f850540cf Mon Sep 17 00:00:00 2001
From: Makar Sichevoy <sichevoy@gmail.com>
Date: Fri, 15 Jan 2016 12:52:01 +0200
Subject: [PATCH 466/471] CRM-4841: Activities as contexts for other activities

---
 .../Manager/ActivityContextApiEntityManager.php  | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/Oro/Bundle/ActivityBundle/Entity/Manager/ActivityContextApiEntityManager.php b/src/Oro/Bundle/ActivityBundle/Entity/Manager/ActivityContextApiEntityManager.php
index 83c2efb3040..c2704256e8f 100644
--- a/src/Oro/Bundle/ActivityBundle/Entity/Manager/ActivityContextApiEntityManager.php
+++ b/src/Oro/Bundle/ActivityBundle/Entity/Manager/ActivityContextApiEntityManager.php
@@ -118,24 +118,8 @@ public function getActivityContext($class, $id)
 
             $item          = [];
             $config        = $entityProvider->getConfig($targetClass);
-            $metadata      = $this->configManager->getEntityMetadata($targetClass);
             $safeClassName = $this->entityClassNameHelper->getUrlSafeClassName($targetClass);
 
-            $link = null;
-            if ($metadata) {
-                $link = $this->router->generate($metadata->getRoute(), ['id' => $targetId]);
-            } elseif ($link === null && ExtendHelper::isCustomEntity($targetClass)) {
-                // Generate view link for the custom entity
-                $link = $this->router->generate(
-                    'oro_entity_view',
-                    [
-                        'id'         => $targetId,
-                        'entityName' => $safeClassName
-
-                    ]
-                );
-            }
-
             if (!array_key_exists('title', $item) || !$item['title']) {
                 if ($fields = $this->mapper->getEntityMapParameter($targetClass, 'title_fields')) {
                     $text = [];

From df5ac1f7fc66ba6d9c6e368beb8e54fe3a6f6797 Mon Sep 17 00:00:00 2001
From: Makar Sichevoy <sichevoy@gmail.com>
Date: Fri, 15 Jan 2016 13:21:02 +0200
Subject: [PATCH 467/471] CRM-4841: Activities as contexts for other activities
 - fix contexts after master back merge

---
 src/Oro/Bundle/CalendarBundle/Entity/CalendarEvent.php | 7 +++++--
 src/Oro/Bundle/EmailBundle/Entity/Email.php            | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Oro/Bundle/CalendarBundle/Entity/CalendarEvent.php b/src/Oro/Bundle/CalendarBundle/Entity/CalendarEvent.php
index 505585d2037..81820ee8c40 100644
--- a/src/Oro/Bundle/CalendarBundle/Entity/CalendarEvent.php
+++ b/src/Oro/Bundle/CalendarBundle/Entity/CalendarEvent.php
@@ -30,8 +30,7 @@
  *      routeView="oro_calendar_event_view",
  *      defaultValues={
  *          "entity"={
- *              "icon"="icon-time",
- *              "context-grid"="calendar-event-for-context-grid"
+ *              "icon"="icon-time"
  *          },
  *          "dataaudit"={
  *              "auditable"=true
@@ -59,6 +58,10 @@
  *          },
  *          "attachment"={
  *              "immutable"=true
+ *          },
+ *          "grid"={
+ *              "default"="calendar-event-grid",
+ *              "context"="calendar-event-for-context-grid"
  *          }
  *      }
  * )
diff --git a/src/Oro/Bundle/EmailBundle/Entity/Email.php b/src/Oro/Bundle/EmailBundle/Entity/Email.php
index e3eed3bcf00..441341ebc86 100644
--- a/src/Oro/Bundle/EmailBundle/Entity/Email.php
+++ b/src/Oro/Bundle/EmailBundle/Entity/Email.php
@@ -31,8 +31,7 @@
  * @Config(
  *      defaultValues={
  *          "entity"={
- *              "icon"="icon-envelope",
- *              "context-grid"="email-for-context-grid"
+ *              "icon"="icon-envelope"
  *          },
  *          "grouping"={
  *              "groups"={"activity"}
@@ -42,6 +41,10 @@
  *              "acl"="oro_email_email_view",
  *              "action_button_widget"="oro_send_email_button",
  *              "action_link_widget"="oro_send_email_link"
+ *          },
+ *          "grid"={
+ *              "default"="email-grid",
+ *              "context"="email-for-context-grid"
  *          }
  *      }
  * )

From 7e8ed3ed082fc0c5cb81a9bf44f290a037bcadaf Mon Sep 17 00:00:00 2001
From: Ivan Klymenko <iklymenko@magecore.com>
Date: Fri, 15 Jan 2016 17:15:01 +0200
Subject: [PATCH 468/471] BAP-9656: Review and process community PRs - added
 article 'the' - removed unused translation - unified confirmation messages

---
 .../DataGridBundle/Resources/translations/jsmessages.en.yml     | 1 -
 .../DataGridBundle/Resources/translations/messages.en.yml       | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml b/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
index d222387e18f..240fa779ad1 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
@@ -1,7 +1,6 @@
 "Item deleted": "Item deleted"
 "Are you sure you want to delete this item?": "Are you sure you want to delete this item?"
 "Delete Error": "Delete Error"
-"Are you sure you want to do remove selected items?": "Are you sure you want to remove selected items?"
 "Are you sure you want to do remove these items?": "Are you sure you want to remove these items?"
 "Are you sure you want to remove this item?": "Are you sure you want to remove this item?"
 "Selected items were removed.": "Selected items were removed."
diff --git a/src/Oro/Bundle/DataGridBundle/Resources/translations/messages.en.yml b/src/Oro/Bundle/DataGridBundle/Resources/translations/messages.en.yml
index 009193e8868..c6eaf5e1ce3 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/translations/messages.en.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/translations/messages.en.yml
@@ -33,7 +33,7 @@ oro:
             delete:
                 label: Delete
                 confirm_title: Mass Delete Confirmation
-                confirm_content: Are you sure you want to delete selected items?
+                confirm_content: Are you sure you want to remove these items?
                 success_message: "{0} No entities were removed|{1} One entity was removed|]1,Inf[ %count% entities were removed"
         datagrid.page_size.all: All
         export.csv: CSV

From 1ecf2c773426821a28953a6a4ea87ac7e304aa4f Mon Sep 17 00:00:00 2001
From: Ivan Klymenko <iklymenko@magecore.com>
Date: Fri, 15 Jan 2016 17:19:30 +0200
Subject: [PATCH 469/471] BAP-9656: Review and process community PRs - fixed
 confirmation message alias

---
 .../DataGridBundle/Resources/translations/jsmessages.en.yml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml b/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
index 240fa779ad1..116883e8aa9 100644
--- a/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
+++ b/src/Oro/Bundle/DataGridBundle/Resources/translations/jsmessages.en.yml
@@ -1,7 +1,7 @@
 "Item deleted": "Item deleted"
 "Are you sure you want to delete this item?": "Are you sure you want to delete this item?"
 "Delete Error": "Delete Error"
-"Are you sure you want to do remove these items?": "Are you sure you want to remove these items?"
+"Are you sure you want to remove these items?": "Are you sure you want to remove these items?"
 "Are you sure you want to remove this item?": "Are you sure you want to remove this item?"
 "Selected items were removed.": "Selected items were removed."
 "Selected items were not removed.": "Selected items were removed."

From c5832bd8f0e2eba6cd8d1aef39435689c336a18b Mon Sep 17 00:00:00 2001
From: Vova Soroka <vsoroka@magecore.com>
Date: Fri, 15 Jan 2016 17:21:45 +0200
Subject: [PATCH 470/471] BAP-9669: Cannot edit roles

---
 .../Persistence/AclPrivilegeRepository.php    | 38 ++++++++++---------
 .../AclPrivilegeRepositoryTest.php            | 15 +++-----
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/src/Oro/Bundle/SecurityBundle/Acl/Persistence/AclPrivilegeRepository.php b/src/Oro/Bundle/SecurityBundle/Acl/Persistence/AclPrivilegeRepository.php
index ec8b772c23c..2a7dc117db3 100644
--- a/src/Oro/Bundle/SecurityBundle/Acl/Persistence/AclPrivilegeRepository.php
+++ b/src/Oro/Bundle/SecurityBundle/Acl/Persistence/AclPrivilegeRepository.php
@@ -449,34 +449,38 @@ protected function findAcls(SID $sid, array $oids)
      * Sorts the given privileges by name in alphabetical order.
      * The root privilege is moved at the top of the list.
      *
-     * @param ArrayCollection|AclPrivilege[] $privileges [input/output]
+     * @param ArrayCollection $privileges
      */
-    protected function sortPrivileges(ArrayCollection &$privileges)
+    protected function sortPrivileges(ArrayCollection $privileges)
     {
-        /** @var \ArrayIterator $iterator */
-        $iterator = $privileges->getIterator();
-        $iterator->uasort(
-            function (AclPrivilege $a, AclPrivilege $b) {
-                if (strpos($a->getIdentity()->getId(), ObjectIdentityFactory::ROOT_IDENTITY_TYPE)) {
+        $data = [];
+        /** @var AclPrivilege $privilege */
+        foreach ($privileges->getIterator() as $privilege) {
+            $isRoot = false !== strpos($privilege->getIdentity()->getId(), ObjectIdentityFactory::ROOT_IDENTITY_TYPE);
+            $label  = !$isRoot
+                ? $this->translator->trans($privilege->getIdentity()->getName())
+                : null;
+
+            $data[] = [$privilege, $isRoot, $label];
+        }
+        uasort(
+            $data,
+            function ($a, $b) {
+                if ($a[1]) {
                     return -1;
                 }
-                if (strpos($b->getIdentity()->getId(), ObjectIdentityFactory::ROOT_IDENTITY_TYPE)) {
+                if ($b[1]) {
                     return 1;
                 }
 
-                return strcmp(
-                    $this->translator->trans($a->getIdentity()->getName()),
-                    $this->translator->trans($b->getIdentity()->getName())
-                );
+                return strcmp($a[2], $b[2]);
             }
         );
 
-        $result = new ArrayCollection();
-        foreach ($iterator as $item) {
-            $result->add($item);
+        $privileges->clear();
+        foreach ($data as $item) {
+            $privileges->add($item[0]);
         }
-
-        $privileges = $result;
     }
 
     /**
diff --git a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Persistence/AclPrivilegeRepositoryTest.php b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Persistence/AclPrivilegeRepositoryTest.php
index 3d173d66454..4f3a7e1d88d 100644
--- a/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Persistence/AclPrivilegeRepositoryTest.php
+++ b/src/Oro/Bundle/SecurityBundle/Tests/Unit/Acl/Persistence/AclPrivilegeRepositoryTest.php
@@ -3,18 +3,18 @@
 namespace Oro\Bundle\SecurityBundle\Tests\Unit\Acl\Persistence;
 
 use Doctrine\Common\Collections\ArrayCollection;
+
+use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
+use Symfony\Component\Security\Acl\Exception\NotAllAclsFoundException;
+
 use Oro\Bundle\SecurityBundle\Acl\AccessLevel;
 use Oro\Bundle\SecurityBundle\Acl\Domain\ObjectIdentityFactory;
 use Oro\Bundle\SecurityBundle\Acl\Extension\EntityMaskBuilder;
 use Oro\Bundle\SecurityBundle\Acl\Permission\MaskBuilder;
-use Oro\Bundle\SecurityBundle\Acl\Persistence\AclManager;
 use Oro\Bundle\SecurityBundle\Acl\Persistence\AclPrivilegeRepository;
 use Oro\Bundle\SecurityBundle\Model\AclPermission;
 use Oro\Bundle\SecurityBundle\Model\AclPrivilege;
 use Oro\Bundle\SecurityBundle\Model\AclPrivilegeIdentity;
-use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
-use Symfony\Component\Security\Acl\Exception\NotAllAclsFoundException;
-use Symfony\Component\Security\Acl\Model\EntryInterface;
 
 /**
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
@@ -307,13 +307,8 @@ function ($acl, $type, $field) use (&$rootAcl, &$oid1Acl) {
                 )
             );
 
-        $this->translator->expects($this->at(0))
-            ->method('trans')
-            ->with('Class 1')
-            ->will($this->returnArgument(0));
-        $this->translator->expects($this->at(1))
+        $this->translator->expects($this->exactly(2))
             ->method('trans')
-            ->with('Class 2')
             ->will($this->returnArgument(0));
 
         $result = $this->repository->getPrivileges($sid);

From c184566226e84408c3cfe6049de49ffacec9a6af Mon Sep 17 00:00:00 2001
From: Vova Soroka <vsoroka@magecore.com>
Date: Fri, 15 Jan 2016 19:10:06 +0200
Subject: [PATCH 471/471] Fix
 Oro\Bundle\EntityExtendBundle\Tests\Unit\Mapping\ExtendClassMetadataFactoryTest

---
 .../Mapping/ExtendClassMetadataFactoryTest.php  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Mapping/ExtendClassMetadataFactoryTest.php b/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Mapping/ExtendClassMetadataFactoryTest.php
index d0278d7ef4d..bf34cecfcec 100644
--- a/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Mapping/ExtendClassMetadataFactoryTest.php
+++ b/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Mapping/ExtendClassMetadataFactoryTest.php
@@ -35,12 +35,17 @@ public function testSetMetadataFor()
         );
 
         $cacheSalt = '$CLASSMETADATA';
-        $this->assertAttributeSame(
-            [
-                '[Oro\Bundle\UserBundle\Entity\User'.$cacheSalt .'][1]' => $metadata
-            ],
-            'data',
-            $this->cmf->getCacheDriver()
+        $this->assertTrue(
+            $this->cmf->getCacheDriver()->contains('Oro\Bundle\UserBundle\Entity\User' . $cacheSalt)
+        );
+    }
+
+    public function testSetMetadataForWithoutCacheDriver()
+    {
+        $metadata = new ClassMetadata('Oro\Bundle\UserBundle\Entity\User');
+        $this->cmf->setMetadataFor(
+            'Oro\Bundle\UserBundle\Entity\User',
+            $metadata
         );
     }
 }