Merge branch 'hotline#88295_probleme_avec_le_module_formation' into 'hotline'

hotline #88295 fix activities links in session forms

See merge request !3064

VERSIONS_HOTLINE/88295

+ - ticket #88295 : Administration : correction des liens concernant les activités dans l'écran de modification des sessions
+ 
\ No newline at end of file

application/modules/admin/views/scripts/activity/_activity_actions.phtml

 <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é')));

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")]');
+  }
 }