Fix media path

patrick477 · patrick477 · commit abed638f88c2 · 2018-06-27T12:13:23.000+02:00
diff --git a/src/Controller/Action/Admin/UploadEditorImageAction.php b/src/Controller/Action/Admin/UploadEditorImageAction.php
@@ -58,7 +58,7 @@ public function __invoke(Request $request): Response
         return new JsonResponse([
             'uploaded' => 1,
             'fileName' => $image->getFilename(),
-            'url' => '/media/image/' . $media->getPath(),
+            'url' => '/'. $media->getPath(),
         ]);
     }
 
diff --git a/src/Resources/config/config.yml b/src/Resources/config/config.yml
@@ -17,7 +17,7 @@ knp_gaufrette:
     adapters:
         bitbag_sylius_cms_plugin_media:
             local:
-                directory: "%kernel.project_dir%"
+                directory: "%kernel.project_dir%/web"
                 create: true
     filesystems:
         bitbag_sylius_cms_plugin_media:
diff --git a/src/Resources/config/services/provider.yml b/src/Resources/config/services/provider.yml
@@ -5,7 +5,7 @@ services:
             - "@bitbag_sylius_cms_plugin.media_uploader"
             - "@templating.engine.twig"
             - "@@BitBagSyliusCmsPlugin/Shop/Media/Show/image.html.twig"
-            - "web/media/image"
+            - "media/image"
         tags:
             - { name: bitbag_sylius_cms_plugin.media_provider, type: image, label: bitbag_sylius_cms_plugin.ui.image_provider }
 
@@ -15,7 +15,7 @@ services:
             - "@bitbag_sylius_cms_plugin.media_uploader"
             - "@templating.engine.twig"
             - "@@BitBagSyliusCmsPlugin/Shop/Media/Show/video.html.twig"
-            - "web/media/video"
+            - "media/video"
         tags:
             - { name: bitbag_sylius_cms_plugin.media_provider, type: video, label: bitbag_sylius_cms_plugin.ui.video_provider }
 
@@ -25,6 +25,6 @@ services:
             - "@bitbag_sylius_cms_plugin.media_uploader"
             - "@templating.engine.twig"
             - "@@BitBagSyliusCmsPlugin/Shop/Media/Show/file.html.twig"
-            - "web/media/file"
+            - "media/file"
         tags:
             - { name: bitbag_sylius_cms_plugin.media_provider, type: file, label: bitbag_sylius_cms_plugin.ui.file_provider }
diff --git a/src/Resources/views/Shop/Media/Show/image.html.twig b/src/Resources/views/Shop/Media/Show/image.html.twig
@@ -1,3 +1,3 @@
-{% set path = '/media/image/'~media.path %}
+{% set path = '/'~media.path %}
 
 <img class="ui fluid image" src="{{ path }}" alt="{{ media.name }}"/>
diff --git a/src/Resources/views/Shop/Media/Show/video.html.twig b/src/Resources/views/Shop/Media/Show/video.html.twig
@@ -1,4 +1,4 @@
-{% set path = '/media/image/'~media.path %}
+{% set path = '/'~media.path %}
 
 <div>
     {% if null != media.name %}

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function __invoke(Request $request): Response`
`58`	`58`	`return new JsonResponse([`
`59`	`59`	`'uploaded' => 1,`
`60`	`60`	`'fileName' => $image->getFilename(),`
`61`		`- 'url' => '/media/image/' . $media->getPath(),`
	`61`	`+ 'url' => '/'. $media->getPath(),`
`62`	`62`	`]);`
`63`	`63`	`}`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-{% set path = '/media/image/'~media.path %}`
	`1`	`+{% set path = '/'~media.path %}`
`2`	`2`
`3`	`3`	`<img class="ui fluid image" src="{{ path }}" alt="{{ media.name }}"/>`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% set path = '/media/image/'~media.path %}`
	`1`	`+{% set path = '/'~media.path %}`
`2`	`2`
`3`	`3`	`<div>`
`4`	`4`	`{% if null != media.name %}`