Skip to content
Snippets Groups Projects
Commit d30e82a8 authored by Ghislain Loas's avatar Ghislain Loas
Browse files

hotline #88295 fix activities links in session forms

parent 97c1715e
Branches
Tags
3 merge requests!3297WIP: Master,!3067Hotline,!3064hotline #88295 fix activities links in session forms
Pipeline #6580 passed with stage
in 33 minutes and 51 seconds
- ticket #88295 : Administration : correction des liens concernant les activités dans l'écran de modification des sessions
\ No newline at end of file
<div class='actions'> <div class='actions'>
<?php <?php
echo $this->tagAnchor(['action' => 'edit', echo $this->tagAnchor(['controller' => 'activity',
'action' => 'edit',
'id' => $this->activity->getId()], 'id' => $this->activity->getId()],
$this->boutonIco("type=edit", $this->boutonIco("type=edit",
'bulle='.$this->_('Modifier l\'activité'))); '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()], 'id' => $this->activity->getId()],
$this->boutonIco('picto=' . ($this->activity->isVisible() ? 'show' : 'hide'), $this->boutonIco('picto=' . ($this->activity->isVisible() ? 'show' : 'hide'),
'bulle=' . ($this->activity->isVisible() ? $this->_('Cacher') : $this->_('Afficher')))); 'bulle=' . ($this->activity->isVisible() ? $this->_('Cacher') : $this->_('Afficher'))));
...@@ -17,7 +19,8 @@ ...@@ -17,7 +19,8 @@
'bulle='.$this->_('Ajouter une session'))); 'bulle='.$this->_('Ajouter une session')));
if (!$this->activity->hasSessions()) if (!$this->activity->hasSessions())
echo $this->tagAnchor(['action' => 'delete', echo $this->tagAnchor(['controller' => 'activity',
'action' => 'delete',
'id' => $this->activity->getId()], 'id' => $this->activity->getId()],
$this->boutonIco("type=del", $this->boutonIco("type=del",
'bulle='.$this->_('Supprimer l\'activité'))); 'bulle='.$this->_('Supprimer l\'activité')));
......
...@@ -682,10 +682,23 @@ class Admin_ActivityControllerEditSessionLearningJavaFevrierTest extends Admin_ ...@@ -682,10 +682,23 @@ class Admin_ActivityControllerEditSessionLearningJavaFevrierTest extends Admin_
$this->assertXPath('//select[@name="field_5"]'); $this->assertXPath('//select[@name="field_5"]');
} }
/** @test */ /** @test */
function panelActivityLearnJavaShouldBeVisible() { function panelActivityLearnJavaShouldBeVisible() {
$this->assertXPathContentContains('//ul//li', 'Learn Java', $this->_response->getBody()); $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")]');
}
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment