diff --git a/src/Builder/CapsuleBuilder.php b/src/Builder/CapsuleBuilder.php index 30be954608b7f120dae3f01792278ddb7215845c..83cde2ccdfd5403633dddbdbd49229198f2b3f3f 100644 --- a/src/Builder/CapsuleBuilder.php +++ b/src/Builder/CapsuleBuilder.php @@ -46,7 +46,7 @@ class CapsuleBuilder public function withPreviewLink(string $preview_link): CapsuleBuilder { - $this->capsule->setPath($preview_link); + $this->capsule->setLinkPath($preview_link); $this->hasRequiredPreviewLink = true; return $this; } @@ -63,7 +63,7 @@ class CapsuleBuilder "The call of CapsuleBuilder::withPassword should be " . "called before CapsuleBuilder::createEditionLink" ); - $this->capsule->setEditionLink($this->capsule->getPath() . + $this->capsule->setEditionLink($this->capsule->getLinkPath() . "/?p=" . $this->capsule->getPassword()); $this->hasRequiredEditionLink = true; } diff --git a/src/Controller/ProjectController.php b/src/Controller/ProjectController.php index 6dcc988400a5e8798611f787d6782710c7db85c1..e386f3936f420add02bc1d06041eeaaf0f27a6d3 100644 --- a/src/Controller/ProjectController.php +++ b/src/Controller/ProjectController.php @@ -27,7 +27,7 @@ class ProjectController extends AbstractController chdir('../legacy/'); $capsule_name = $capsule->getName(); - $capsule_directory = $capsule->getPath(); + $capsule_directory = $capsule->getLinkPath(); if (file_exists($capsule_directory)) { $this->addFlash( diff --git a/src/Entity/Capsule.php b/src/Entity/Capsule.php index 6fbe87cb1764e160b242ed4a88a5fb377b438db1..497fa3377354d73958331c735b73e236c76ffbff 100644 --- a/src/Entity/Capsule.php +++ b/src/Entity/Capsule.php @@ -121,14 +121,14 @@ class Capsule return $this; } - public function getPath(): string + public function getLinkPath(): string { return $this->link_path; } - public function setPath(string $preview_link): Capsule + public function setLinkPath(string $link_path): Capsule { - $this->link_path = $preview_link; + $this->link_path = $link_path; return $this; } diff --git a/templates/capsule/index.html.twig b/templates/capsule/index.html.twig index 37abbc1311ac905d4d5611331394af6c56967034..2a29b767c20149b47d1f923a045ccc97df8b4fae 100644 --- a/templates/capsule/index.html.twig +++ b/templates/capsule/index.html.twig @@ -39,7 +39,7 @@ <div class="capsule-item pb-4 m-5"> <div class="d-flex flex-column flex-md-row justify-content-center align-items-center mt-sm-4"> <div class="list-item"> - <a href="/capsule/preview/{{ capsule.getPath() }}" class="capsule-title"> + <a href="/capsule/preview/{{ capsule.getLinkPath() }}" class="capsule-title"> {{ capsule.getName() }} </a> </div> @@ -51,7 +51,7 @@ <div class="d-flex flex-column flex-md-row justify-content-center align-items-center"> <div class="m-4 ratio ratio-16x9"> <iframe - src="/capsule/preview/{{ capsule.getPath() }}" + src="/capsule/preview/{{ capsule.getLinkPath() }}" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen> </iframe> @@ -74,7 +74,7 @@ Delete capsule </a> </div> - <a href="capsule/edit/{{ capsule.getPath() }}" class="list-item lh-md"> + <a href="capsule/edit/{{ capsule.getLinkPath() }}" class="list-item lh-md"> <button class="standard-button p-2"> Edit capsule </button> diff --git a/tests/functional/ProjectControllerTest.php b/tests/functional/ProjectControllerTest.php index 7160a29d91798910189639cb9cab74a6afc3ef74..45d2830bc0ce78bd636c70bdfb674763c642cc7e 100644 --- a/tests/functional/ProjectControllerTest.php +++ b/tests/functional/ProjectControllerTest.php @@ -117,7 +117,7 @@ class ProjectControllerTest extends WebTestCase } $capsule_name_in_db = $capsule_in_db->getName(); - $capsule_directory = $capsule_in_db->getPath(); + $capsule_directory = $capsule_in_db->getLinkPath(); $this->assertDirectoryExists($capsule_directory); $this->assertDirectoryIsReadable($capsule_directory); @@ -160,7 +160,7 @@ class ProjectControllerTest extends WebTestCase } $capsule_name_in_db = $capsule_in_db->getName(); - $capsule_directory = $capsule_in_db->getPath(); + $capsule_directory = $capsule_in_db->getLinkPath(); $this->assertDirectoryExists($capsule_directory); $this->assertDirectoryIsReadable($capsule_directory);