Skip to content
Snippets Groups Projects
Commit 1cef45e5 authored by Sebastien's avatar Sebastien
Browse files

rename capsule.Path get/set to capsule.LinkPath get/set

parent 62aa7258
No related branches found
No related tags found
3 merge requests!43tuleap-83-access-my-capsules,!42Draft: access-my-capsules-conflicts-fixed,!40Draft: Tuleap 83 access my capsules
Pipeline #705 passed
......@@ -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;
}
......
......@@ -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(
......
......@@ -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;
}
......
......@@ -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>
......
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment