From 424d107997852c39c5fd152aae03741fabb5b806 Mon Sep 17 00:00:00 2001
From: Sebastien Curt <sebastien.curt@tetras-libre.fr>
Date: Sat, 6 Aug 2022 11:42:02 +0200
Subject: [PATCH] Ensure scheme for capsulePreview link on capsule edition mode
---
capsule-prototype/js/online-script.js | 2 +-
src/Controller/CapsuleController.php | 13 +------------
templates/project/edit.html.twig | 4 ++--
templates/project/project_view.html.twig | 2 +-
4 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/capsule-prototype/js/online-script.js b/capsule-prototype/js/online-script.js
index 9c88df2..1deedd6 100644
--- a/capsule-prototype/js/online-script.js
+++ b/capsule-prototype/js/online-script.js
@@ -547,7 +547,7 @@ function addLink(url) {
if(url.trim()=="") openAlert("Invalid URL");
else {
- if(url!="") if(url.indexOf("http")!=0) url = "http://"+url;
+ if(url!="") if(url.indexOf("http")!=0) url = "https://"+url;
uploadFiles(["NewLink"+url]);
closeAddLinkPopup();
}
diff --git a/src/Controller/CapsuleController.php b/src/Controller/CapsuleController.php
index 6fbd799..9a19f37 100755
--- a/src/Controller/CapsuleController.php
+++ b/src/Controller/CapsuleController.php
@@ -171,7 +171,6 @@ class CapsuleController extends AbstractController
'project/project_view.html.twig',
[
'url' => $url,
- 'linkHome' => $urlGenerator->generate('home', [], UrlGeneratorInterface::ABSOLUTE_URL)
]
);
}
@@ -207,17 +206,7 @@ class CapsuleController extends AbstractController
'project/edit.html.twig',
[
'url' => $url,
- 'linkHome' => $urlGenerator->generate(
- 'home',
- [],
- UrlGeneratorInterface::ABSOLUTE_URL
- )
- ,
- 'linkPreview' => $urlGenerator->generate(
- 'preview_capsule',
- [ 'path' => $capsule->getLinkPath() ],
- UrlGeneratorInterface::ABSOLUTE_URL
- )
+ 'capsule_path' => $capsule->getLinkPath()
]
);
}
diff --git a/templates/project/edit.html.twig b/templates/project/edit.html.twig
index 47ed274..6e08c1c 100644
--- a/templates/project/edit.html.twig
+++ b/templates/project/edit.html.twig
@@ -24,8 +24,8 @@
const iframe = document.getElementById('legacyContent').contentWindow;
iframe.app.rekall.Rekall('init', {
links: {
- home: '{{ linkHome }}',
- projectPreview: '{{ linkPreview }}'
+ home: '{{ absolute_url(path('home')) }}',
+ projectPreview: '{{ absolute_url(path('preview_capsule', { 'path': capsule_path })) }}'
}
}
);
diff --git a/templates/project/project_view.html.twig b/templates/project/project_view.html.twig
index 2a923da..8d10ed9 100644
--- a/templates/project/project_view.html.twig
+++ b/templates/project/project_view.html.twig
@@ -44,7 +44,7 @@
const iframe = document.getElementById('legacyContent').contentWindow;
iframe.app.rekall.Rekall('init', {
links: {
- home: '{{ linkHome }}'
+ home: '{{ absolute_url(path('home')) }}'
}
}
);
--
GitLab