Merge pull request #10 from Khorsa/dev

minor installation bags fix
Khorsa · Jun 14, 2021 · 05655b0 · 05655b0
2 parents 9949ecf + 030b64f
commit 05655b0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "flexycms/flexyadminframe-bundle",
-  "version": "0.1.4.5",
+  "version": "0.1.4.6",
   "type": "symfony-bundle",
   "description": "Main frame for admin panel",
   "license": "proprietary",

diff --git a/config/services.yaml b/config/services.yaml
@@ -1,7 +1,6 @@
 parameters:
 # Здесь могут быть параметры бандла
   panelMenuTemplate: "@@FlexyAdminFrame/panelmenu.html.twig"
-  uploads_path: '/public/uploads/embedded'
 
 services:
 

diff --git a/src/FlexyAdminFrameBundle.php b/src/FlexyAdminFrameBundle.php
@@ -23,10 +23,13 @@ public function build(ContainerBuilder $container)
 #Options +FollowSymlinks
 RewriteRule ^(.+)$ /public/ [QSA,L]";
 
-        $rootDir = __DIR__ . "../../../../..";
+        $rootDir = $container->getParameter('kernel.project_dir');
 
-        if (is_file($rootDir . "/.htaccess")) unlink($rootDir . "/.htaccess");
-        file_put_contents($rootDir . "/.htaccess", $htaccess);
+        dump($rootDir);
+
+        if (!is_file($rootDir . "/.htaccess")) {
+            file_put_contents($rootDir . "/.htaccess", $htaccess);
+        }
 
         if (!is_dir($rootDir . "/public")) mkdir($rootDir . "/public");
         if (!is_dir($rootDir . "/public/uploads")) mkdir($rootDir . "/public/uploads");