From d30e82a8276574f20c2b1f03762a227051a89b61 Mon Sep 17 00:00:00 2001
From: gloas <gloas@afi-sa.fr>
Date: Tue, 12 Mar 2019 16:51:27 +0100
Subject: [PATCH] hotline #88295 fix activities links in session forms
---
VERSIONS_HOTLINE/88295 | 2 ++
.../views/scripts/activity/_activity_actions.phtml | 9 ++++++---
.../admin/controllers/ActivityControllerTest.php | 13 +++++++++++++
3 files changed, 21 insertions(+), 3 deletions(-)
create mode 100644 VERSIONS_HOTLINE/88295
diff --git a/VERSIONS_HOTLINE/88295 b/VERSIONS_HOTLINE/88295
new file mode 100644
index 00000000000..2396849e37b
--- /dev/null
+++ b/VERSIONS_HOTLINE/88295
@@ -0,0 +1,2 @@
+ - ticket #88295 : Administration : correction des liens concernant les activités dans l'écran de modification des sessions
+
\ No newline at end of file
diff --git a/application/modules/admin/views/scripts/activity/_activity_actions.phtml b/application/modules/admin/views/scripts/activity/_activity_actions.phtml
index ca6054c6a5b..22d548a54ae 100644
--- a/application/modules/admin/views/scripts/activity/_activity_actions.phtml
+++ b/application/modules/admin/views/scripts/activity/_activity_actions.phtml
@@ -1,11 +1,13 @@
<div class='actions'>
<?php
- echo $this->tagAnchor(['action' => 'edit',
+ echo $this->tagAnchor(['controller' => 'activity',
+ 'action' => 'edit',
'id' => $this->activity->getId()],
$this->boutonIco("type=edit",
'bulle='.$this->_('Modifier l\'activité')));
- echo $this->tagAnchor(['action' => ($this->activity->isVisible() ? 'hide' : 'show'),
+ echo $this->tagAnchor(['controller' => 'activity',
+ 'action' => ($this->activity->isVisible() ? 'hide' : 'show'),
'id' => $this->activity->getId()],
$this->boutonIco('picto=' . ($this->activity->isVisible() ? 'show' : 'hide'),
'bulle=' . ($this->activity->isVisible() ? $this->_('Cacher') : $this->_('Afficher'))));
@@ -17,7 +19,8 @@
'bulle='.$this->_('Ajouter une session')));
if (!$this->activity->hasSessions())
- echo $this->tagAnchor(['action' => 'delete',
+ echo $this->tagAnchor(['controller' => 'activity',
+ 'action' => 'delete',
'id' => $this->activity->getId()],
$this->boutonIco("type=del",
'bulle='.$this->_('Supprimer l\'activité')));
diff --git a/tests/application/modules/admin/controllers/ActivityControllerTest.php b/tests/application/modules/admin/controllers/ActivityControllerTest.php
index b962d0618fe..708050e009e 100644
--- a/tests/application/modules/admin/controllers/ActivityControllerTest.php
+++ b/tests/application/modules/admin/controllers/ActivityControllerTest.php
@@ -682,10 +682,23 @@ class Admin_ActivityControllerEditSessionLearningJavaFevrierTest extends Admin_
$this->assertXPath('//select[@name="field_5"]');
}
+
/** @test */
function panelActivityLearnJavaShouldBeVisible() {
$this->assertXPathContentContains('//ul//li', 'Learn Java', $this->_response->getBody());
}
+
+
+ /** @test */
+ public function linkToEditActivityLearnJavaShouldBePresent() {
+ $this->assertXPath('//a[contains(@href, "/admin/activity/edit/id/3")]');
+ }
+
+
+ /** @test */
+ public function linkToHideActivityLearnJavaShouldBePresent() {
+ $this->assertXPath('//a[contains(@href, "/admin/activity/hide/id/3")]');
+ }
}
--
GitLab