diff --git a/VERSIONS_HOTLINE/88295 b/VERSIONS_HOTLINE/88295 new file mode 100644 index 0000000000000000000000000000000000000000..2396849e37b494773028edcb40dde1445076bd24 --- /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 ca6054c6a5b479d4149a2f0e860af6c952b3ada7..22d548a54aeffedabd058e0de07c1cdcdacc3ec0 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 b962d0618fe83c37339eadd8a565e636cd14d9b9..708050e009e398f5badedb5575dd7f0082b7ce60 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")]'); + } }