Skip to content
Snippets Groups Projects
Commit 68ecad1c authored by Camille Simiand's avatar Camille Simiand
Browse files

Fix flash message types

parent d0f029b9
No related branches found
No related tags found
1 merge request!44tuleap-80-duplicate-a-capsule
Pipeline #731 passed
...@@ -159,7 +159,7 @@ class CapsuleController extends AbstractController ...@@ -159,7 +159,7 @@ class CapsuleController extends AbstractController
if (! $do_capsule_belongs_to_user) { if (! $do_capsule_belongs_to_user) {
$this->addFlash( $this->addFlash(
'capsule_deleted_error', 'warning',
$translator->trans( $translator->trans(
'capsule.delete.error', 'capsule.delete.error',
[ [
...@@ -176,7 +176,7 @@ class CapsuleController extends AbstractController ...@@ -176,7 +176,7 @@ class CapsuleController extends AbstractController
$entityManager->flush(); $entityManager->flush();
$this->addFlash( $this->addFlash(
'capsule_deleted_success', 'success',
$translator->trans( $translator->trans(
'capsule.delete.success', 'capsule.delete.success',
[ [
...@@ -222,9 +222,9 @@ class CapsuleController extends AbstractController ...@@ -222,9 +222,9 @@ class CapsuleController extends AbstractController
if (! $capsule_repository->doCapsuleBelongsToUser($parent_capsule, $current_user)) { if (! $capsule_repository->doCapsuleBelongsToUser($parent_capsule, $current_user)) {
$this->addFlash( $this->addFlash(
'capsule_deleted_error', 'warning',
$translator->trans( $translator->trans(
'capsule.delete.error', 'capsule.duplicate.error',
[ [
'capsule_name' => $parent_capsule->getName() 'capsule_name' => $parent_capsule->getName()
] ]
...@@ -238,7 +238,7 @@ class CapsuleController extends AbstractController ...@@ -238,7 +238,7 @@ class CapsuleController extends AbstractController
$parent_directory_exists = $file_system->exists('../legacy/' . $parent_directory_name); $parent_directory_exists = $file_system->exists('../legacy/' . $parent_directory_name);
if (! $parent_directory_exists) { if (! $parent_directory_exists) {
$this->addFlash( $this->addFlash(
'project_does_not_exist', 'warning',
$translator->trans( $translator->trans(
'project.not_exist', 'project.not_exist',
[ [
......
...@@ -51,7 +51,7 @@ class ProjectController extends AbstractController ...@@ -51,7 +51,7 @@ class ProjectController extends AbstractController
$this->createOrUpdatePasswordFile($capsule_directory, $capsule->getPassword()); $this->createOrUpdatePasswordFile($capsule_directory, $capsule->getPassword());
$this->addFlash( $this->addFlash(
'capsule_created_success', 'success',
$translator->trans( $translator->trans(
'capsule.created_success', 'capsule.created_success',
[ [
...@@ -80,7 +80,7 @@ class ProjectController extends AbstractController ...@@ -80,7 +80,7 @@ class ProjectController extends AbstractController
if (file_exists($capsule_directory)) { if (file_exists($capsule_directory)) {
$this->addFlash( $this->addFlash(
'project_already_exists', 'warning',
$translator->trans( $translator->trans(
'project.already_exists', 'project.already_exists',
[ [
...@@ -97,7 +97,7 @@ class ProjectController extends AbstractController ...@@ -97,7 +97,7 @@ class ProjectController extends AbstractController
$this->createOrUpdatePasswordFile($capsule_directory, $capsule->getPassword()); $this->createOrUpdatePasswordFile($capsule_directory, $capsule->getPassword());
$this->addFlash( $this->addFlash(
'capsule_duplicated_success', 'success',
$translator->trans( $translator->trans(
'capsule.duplicate.success', 'capsule.duplicate.success',
[ [
......
...@@ -29,41 +29,12 @@ ...@@ -29,41 +29,12 @@
</div> </div>
{% endfor %} {% endfor %}
{% for flashSuccess in app.flashes('capsule_created_success') %} {% for flashSuccess in app.flashes('success') %}
<div class="text-center alert alert-success col-5 mx-auto my-5" role="alert"> <div class="text-center alert alert-success col-5 mx-auto my-5" role="alert">
{{ flashSuccess }} {{ flashSuccess }}
</div> </div>
{% endfor %} {% endfor %}
{% for flashSuccess in app.flashes('capsule_deleted_success') %}
<div class="text-center alert alert-success col-5 mx-auto my-5" role="alert">
{{ flashSuccess }}
</div>
{% endfor %}
{% for flashSuccess in app.flashes('capsule_deleted_error') %}
<div class="text-center alert alert-warning col-5 mx-auto my-5" role="alert">
{{ flashSuccess }}
</div>
{% endfor %}
{% for flashWarning in app.flashes('project_does_not_exist') %}
<div class="text-center alert alert-warning col-5 mx-auto my-5" role="alert">
{{ flashWarning }}
</div>
{% endfor %}
{% for flashSuccess in app.flashes('capsule_duplicated_success') %}
<div class="text-center alert alert-success col-5 mx-auto my-5" role="alert">
{{ flashSuccess }}
</div>
{% endfor %}
{% for flashSuccess in app.flashes('capsule_duplicated_error') %}
<div class="text-center alert alert-warning> col-5 mx-auto my-5" role="alert">
{{ flashSuccess }}
</div>
{% endfor %}
</div> </div>
<div class="capsules-list d-flex flex-column m-6"> <div class="capsules-list d-flex flex-column m-6">
......
...@@ -75,7 +75,7 @@ capsule: ...@@ -75,7 +75,7 @@ capsule:
title_name: Duplicate capsule %capsule_name% title_name: Duplicate capsule %capsule_name%
new_name: Enter the name of the new capsule new_name: Enter the name of the new capsule
success: The capsule has been successfully duplicated into capsule_name. You can see it at the end of your list success: The capsule has been successfully duplicated into capsule_name. You can see it at the end of your list
error: You don't have the permission to delete this capsule error: You don't have the permission to duplicate this capsule
delete: delete:
link: Delete capsule link: Delete capsule
button: Delete button: Delete
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment