changed path in require and added maxconn option (#392)

helios-ag · Jan 26, 2020 · e7433a2 · e7433a2
1 parent 44a2b78
commit e7433a2
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 1 deletion.
diff --git a/src/Configuration/ElFinderConfigurationReader.php b/src/Configuration/ElFinderConfigurationReader.php
@@ -108,6 +108,7 @@ public function getConfiguration(string $instance): array
                 'uploadAllow'       => $parameter['upload_allow'],
                 'uploadDeny'        => $parameter['upload_deny'],
                 'uploadMaxSize'     => $parameter['upload_max_size'],
+                'uploadMaxConn'     => $parameter['upload_max_conn'],
                 'defaults'          => $parameter['defaults'],
                 'attributes'        => $parameter['attributes'],
                 'acceptedName'      => $parameter['accepted_name'],

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -133,6 +133,7 @@ public function getConfigTreeBuilder()
                                                     ->defaultValue(array('deny', 'allow'))
                                                 ->end() // upload_order
                                                 ->scalarNode('upload_max_size')->defaultValue(0)->end()
+                                                ->integerNode('upload_max_conn')->defaultValue(3)->end()
                                                 ->arrayNode('defaults')
                                                     ->useAttributeAsKey('defaults')
                                                     ->normalizeKeys(false)

diff --git a/src/Resources/views/Elfinder/helper/main.js.twig b/src/Resources/views/Elfinder/helper/main.js.twig
@@ -115,7 +115,7 @@
 
     // config of RequireJS (REQUIRED)
     require.config({
-        baseUrl : 'bundles/fmelfinder/js',
+        baseUrl : '/bundles/fmelfinder/js',
         paths : {
             'jquery'   : '//cdnjs.cloudflare.com/ajax/libs/jquery/'+(old? '1.12.4' : jqver)+'/jquery.min',
             'jquery-ui': '//cdnjs.cloudflare.com/ajax/libs/jqueryui/'+uiver+'/jquery-ui.min',

diff --git a/tests/Configuration/ElFinderConfigurationReaderTest.php b/tests/Configuration/ElFinderConfigurationReaderTest.php
@@ -97,6 +97,7 @@ private function getConfigurationReader($attributesObject)
                                 'upload_allow'      => '',
                                 'upload_deny'       => '',
                                 'upload_max_size'   => '',
+                                'upload_max_conn'   => 3,
                                 'defaults'          => '',
                                 'attributes'        => '',
                                 'accepted_name'     => '',
@@ -149,6 +150,7 @@ private function getConfigurationReader($attributesObject)
                                 'upload_allow'      => '',
                                 'upload_deny'       => '',
                                 'upload_max_size'   => '',
+                                'upload_max_conn'   => 3,
                                 'defaults'          => '',
                                 'attributes'        => '',
                                 'accepted_name'     => '',
@@ -201,6 +203,7 @@ private function getConfigurationReader($attributesObject)
                                 'upload_allow'      => '',
                                 'upload_deny'       => '',
                                 'upload_max_size'   => '',
+                                'upload_max_conn'   => 3,
                                 'defaults'          => '',
                                 'attributes'        => '',
                                 'accepted_name'     => '',
@@ -253,6 +256,7 @@ private function getConfigurationReader($attributesObject)
                                 'upload_allow'      => '',
                                 'upload_deny'       => '',
                                 'upload_max_size'   => '',
+                                'upload_max_conn'   => 3,
                                 'defaults'          => '',
                                 'attributes'        => '',
                                 'accepted_name'     => '',

diff --git a/tests/DependencyInjection/ConfigurationLoadTest.php b/tests/DependencyInjection/ConfigurationLoadTest.php
@@ -116,6 +116,7 @@ public function testSupportsAllConfigFormats($path)
                                 'defaults'          => array('read' => true, 'write' => true),
                                 'upload_deny'       => array('all'),
                                 'upload_max_size'   => 0,
+                                'upload_max_conn'   => 3,
                                 'dropbox2_settings' => array(
                                     'aliasFormat'     => '%s@Dropbox',
                                     'path'            => '/',

diff --git a/tests/Fixtures/config/config.php b/tests/Fixtures/config/config.php
@@ -25,6 +25,7 @@
                         'upload_allow'      => array('image/png', 'image/jpg', 'image/jpeg'),
                         'upload_deny'       => array('all'),
                         'upload_max_size'   => 0,
+                        'upload_max_conn'   => 3,
                         'dropbox2_settings' => array(
                             'app_key'         => 'some_consumer',
                             'app_secret'      => 'con$umer',