Merge remote-tracking branch 'private/public/master' into dev

* private/public/master: BAP-7696: Update jsTree library Updated submodule references: BAP-9554: Web installer fails when DB does not exist BAP-7171: Implement assets version for our JS files BAP-8029: Installer doesn't support filesystem with file name length different from 255 CRM-4725 Update jshint and jscs to allow comments be longer than 120 symbols Fixed repository links. CRM-4624: Fix cross bundle less import in symlink assets mode Updated submodule references:
oroinc · Jan 26, 2016 · 272e8a9 · 272e8a9
2 parents c51b474 + d6dea74
commit 272e8a9
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 17 deletions.
diff --git a/.jscsrc b/.jscsrc
@@ -7,7 +7,12 @@
     "**/*.min.js"
   ],
   "validateIndentation": 4,
-  "maximumLineLength": 120,
+  "maximumLineLength": {
+	 "value": 120,
+	 "tabSize": 4,
+	 "allowComments": true,
+	 "allowRegex": true
+  },
   "requireCamelCaseOrUpperCaseIdentifiers": "ignoreProperties",
   "disallowSpaceAfterObjectKeys": true,
   "requireSpaceBeforeObjectValues": true,

diff --git a/.jshintrc b/.jshintrc
@@ -18,7 +18,6 @@
     "maxdepth": 5,
     "maxstatements": 35,
     "quotmark": "single",
-    "maxlen": 120,
     "browser": true,
     "white": true,
 

diff --git a/README.md b/README.md
@@ -38,10 +38,10 @@ http://getcomposer.org/ or just run the following command:
 curl -s https://getcomposer.org/installer | php
 ```
 
-- Clone https://github.com/orocrm/orocommerce-application.git repository with
+- Clone https://github.com/orocommerce/orocommerce-application.git repository with
 
 ```bash
-git clone --recursive https://github.com/orocrm/orocommerce-application.git
+git clone --recursive https://github.com/orocommerce/orocommerce-application.git
 ```
 
 - Make sure that you have [NodeJS][2] installed

diff --git a/app/OroRequirements.php b/app/OroRequirements.php
@@ -96,8 +96,11 @@ class_exists('COM'),
         if (!defined('PHP_WINDOWS_VERSION_BUILD')) {
             $this->addRequirement(
                 $this->checkFileNameLength(),
-                'Cache folder should not be inside encrypted directory',
-                'Move <strong>app/cache</strong> folder outside encrypted directory.'
+                'Maximum supported filename length must be greater or equal 242 characters.' .
+                ' Make sure that the cache folder is not inside the encrypted directory.',
+                'Move <strong>app/cache</strong> folder outside encrypted directory.',
+                'Maximum supported filename length must be greater or equal 242 characters.' .
+                ' Move app/cache folder outside encrypted directory.'
             );
         }
 
@@ -353,7 +356,7 @@ protected function checkFileNameLength()
 
         $fileLength = trim($getConf->getOutput());
 
-        return $fileLength == 255;
+        return $fileLength >= 242;
     }
 
     /**

diff --git a/app/Resources/translations/install.en.yml b/app/Resources/translations/install.en.yml
@@ -27,3 +27,5 @@ process:
     button:
         next:               Next
         refresh:            Refresh
+
+    wait_for_warming_up_cache: Waiting for warming up application cache
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -48,6 +48,7 @@ assetic:
         lessphp:
             file: %kernel.root_dir%/../vendor/leafo/lessphp/lessc.inc.php
             apply_to: "\.less$"
+            paths: ["%kernel.root_dir%/../web/bundles"]
         cssmin:
             file: %kernel.root_dir%/Resources/php/cssmin-v3.0.1.php
 

diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
@@ -30,3 +30,7 @@ parameters:
     secret:                 ThisTokenIsNotSoSecretChangeIt
     installed:              ~
     assets_version:         ~
+    assets_version_strategy: time_hash # A strategy should be used to generate the global assets version, can be:
+                                       # null        - the assets version stays unchanged
+                                       # time_hash   - a hash of the current time
+                                       # incremental - the next assets version is the previous version is incremented by one (e.g. 'ver1' -> 'ver2' or '1' -> '2')
diff --git a/app/config/parameters_test.yml.dist b/app/config/parameters_test.yml.dist
@@ -30,4 +30,5 @@ parameters:
     secret:                 ThisTokenIsNotSoSecretChangeIt
     installed:              ~
     assets_version:         ~
+    assets_version_strategy: time_hash
 
diff --git a/composer.json b/composer.json
@@ -74,7 +74,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"
@@ -88,14 +89,16 @@
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
             "Oro\\Bundle\\InstallerBundle\\Composer\\ScriptHandler::setPermissions",
-            "Oro\\Bundle\\InstallerBundle\\Composer\\ScriptHandler::installAssets"
+            "Oro\\Bundle\\InstallerBundle\\Composer\\ScriptHandler::installAssets",
+            "Oro\\Bundle\\InstallerBundle\\Composer\\ScriptHandler::setAssetsVersion"
         ],
         "post-update-cmd": [
             "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
             "Oro\\Bundle\\InstallerBundle\\Composer\\ScriptHandler::setPermissions",
-            "Oro\\Bundle\\InstallerBundle\\Composer\\ScriptHandler::installAssets"
+            "Oro\\Bundle\\InstallerBundle\\Composer\\ScriptHandler::installAssets",
+            "Oro\\Bundle\\InstallerBundle\\Composer\\ScriptHandler::setAssetsVersion"
         ]
     },
     "minimum-stability": "dev",

diff --git a/src/Oro b/src/Oro
diff --git a/src/OroB2B b/src/OroB2B
diff --git a/src/OroPackages/src/Oro/Bundle/EntitySerializedFieldsBundle b/src/OroPackages/src/Oro/Bundle/EntitySerializedFieldsBundle
diff --git a/web/install.php b/web/install.php
@@ -19,9 +19,8 @@
     $data = Yaml::parse($paramFile);
 
     if (is_array($data)
-        && isset($data['parameters'])
         && isset($data['parameters']['installed'])
-        && false != $data['parameters']['installed']
+        && $data['parameters']['installed']
     ) {
         require_once __DIR__ . '/../app/DistributionKernel.php';
 
@@ -90,7 +89,13 @@ function iterateRequirements(array $collection)
         $(function() {
             <?php if (!count($majorProblems)) : ?>
             // initiate application in background
-            $.get('installer/flow/oro_installer/configure');
+            $('#status')
+                .text(<?php echo json_encode($translator->trans('process.wait_for_warming_up_cache')); ?>)
+                .prepend($('<span class="icon-wait"></span>'))
+            $.get('installer/flow/oro_installer/configure').always(function() {
+                $('#status').empty();
+                $('#next-button').addClass('primary').removeClass('disabled');
+            });
             <?php endif; ?>
         });
     </script>
@@ -186,13 +191,14 @@ function iterateRequirements(array $collection)
                 <?php endforeach; ?>
             </div>
             <div class="button-set">
+                <div id="status" class="status-box"></div>
                 <div class="pull-right">
                     <?php if (count($majorProblems) || count($minorProblems)): ?>
                     <a href="install.php" class="button icon-reset">
                         <span><?php echo $translator->trans('process.button.refresh'); ?></span>
                     </a>
                     <?php endif; ?>
-                    <a href="<?php echo count($majorProblems) ? 'javascript: void(0);' : 'app.php/installer'; ?>" class="button next <?php echo count($majorProblems) ? 'disabled' : 'primary'; ?>">
+                    <a id="next-button" href="<?php echo count($majorProblems) ? 'javascript: void(0);' : 'app.php/installer'; ?>" class="button next disabled">
                         <span><?php echo $translator->trans('process.button.next'); ?></span>
                     </a>
                 </div>