From cbbabcbc649e811a7b3cb81d309677f723730a9e Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Tue, 15 Jun 2021 12:18:22 +0200 Subject: [PATCH] backports murph-skeleton --- Makefile | 4 ++-- assets/js/admin/components/file-manager/Files.vue | 3 ++- public/js/fos_js_routes.json | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 public/js/fos_js_routes.json diff --git a/Makefile b/Makefile index 486f0e8..fd25973 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ doctrine-migration: deploy-prod: mage deploy prod + ssh webdeblanio@asuka "cd blog && make clean" + ssh webdeblanio@asuka "cd blog && make js-routing" ssh webdeblanio@asuka "cd blog && npm run build" ssh webdeblanio@asuka "cd blog && make doctrine-migration" - ssh webdeblanio@asuka "cd blog && make clean" - ssh webdeblanio@asuka "cd blog && make jsroute" diff --git a/assets/js/admin/components/file-manager/Files.vue b/assets/js/admin/components/file-manager/Files.vue index 8bc2d20..c165e98 100644 --- a/assets/js/admin/components/file-manager/Files.vue +++ b/assets/js/admin/components/file-manager/Files.vue @@ -171,6 +171,8 @@ const routes = require('../../../../../public/js/fos_js_routes.json') import Routing from '../../../../../vendor/friendsofsymfony/jsrouting-bundle/Resources/public/js/router.min.js'; import FileIcon from './FileIcon'; +Routing.setRoutingData(routes); + export default { name: "Files", components: { @@ -240,7 +242,6 @@ export default { } }, mounted() { - Routing.setRoutingData(routes) let view = localStorage.getItem('file-manager.view') if (['grid', 'list'].indexOf(view) !== -1) { diff --git a/public/js/fos_js_routes.json b/public/js/fos_js_routes.json deleted file mode 100644 index 67abbc6..0000000 --- a/public/js/fos_js_routes.json +++ /dev/null @@ -1 +0,0 @@ -{"base_url":"","routes":{"api_blog_comment_preview":{"tokens":[["text","\/api\/blog\/comment\/preview"]],"defaults":[],"requirements":[],"hosttokens":[],"methods":[],"schemes":[]},"admin_file_manager_api_directory":{"tokens":[["text","\/admin\/file_manager\/api\/directory"]],"defaults":[],"requirements":[],"hosttokens":[],"methods":[],"schemes":[]},"admin_file_manager_info":{"tokens":[["text","\/admin\/file_manager\/info"]],"defaults":[],"requirements":[],"hosttokens":[],"methods":[],"schemes":[]},"admin_file_manager_directory_new":{"tokens":[["text","\/admin\/file_manager\/directory\/new"]],"defaults":[],"requirements":[],"hosttokens":[],"methods":["GET","POST"],"schemes":[]},"admin_file_manager_upload":{"tokens":[["text","\/admin\/file_manager\/upload"]],"defaults":[],"requirements":[],"hosttokens":[],"methods":["GET","POST"],"schemes":[]},"blog_tech_form_without_javascript":{"tokens":[["text","\/nojs"]],"defaults":[],"requirements":{"_locale":"fr"},"hosttokens":[["text","local.deblan"]],"methods":[],"schemes":[]}},"prefix":"","host":"localhost","port":"","scheme":"http","locale":[]} \ No newline at end of file