Merge branch...

Merge branch 'hotline#122044_cosmogramme_les_commentaires_ont_disparus_de_l_ecran_de_variables_cosmozendifie' into 'hotline'

hotline #122044 Cosmogramme / variables Adds comment column in table description

See merge request !3735

VERSIONS_HOTLINE/122044

+ - ticket #122044 : Cosmogramme / écran variables : réintroduction de la description des variables qui avait disparu suite à la refonte de l'écran
\ No newline at end of file

cosmogramme/cosmozend/tests/CosmoControllerTestCase.php

@@ -33,6 +33,8 @@ abstract class CosmoControllerTestCase extends Zend_Test_PHPUnit_ControllerTestC
     Storm_Model_Abstract::unsetLoaders();
     Storm_Cache::setDefaultZendCache(null);
     Class_AdminVar::set('NOM_DOMAINE', 'http://localhost');
+    Zend_Registry::get('locale')->setLocale('fr');
+    Zend_Registry::get('translate')->setLocale('fr');
     if ($this->_storm_default_to_volatile)
       Storm_Model_Loader::defaultToVolatile();
 

cosmogramme/cosmozend/tests/application/modules/cosmo/controllers/VariableTest.php

@@ -21,7 +21,6 @@
 
 
 class Cosmo_VariableIndexTest extends CosmoControllerTestCase {
-
   public function setUp() {
     parent::setUp();
     Class_CosmoVar::newInstance(['clef' => 'oui_non',
@@ -41,6 +40,7 @@ class Cosmo_VariableIndexTest extends CosmoControllerTestCase {
 
     Class_CosmoVar::newInstance(['clef' => 'log_path',
                                  'valeur' => '/path/to/log',
+                                 'commentaire' => 'path to logs',
                                  'groupe' => 1,
                                  'ordre' => 1,
                                  'hidden' => 0])
@@ -99,7 +99,13 @@ class Cosmo_VariableIndexTest extends CosmoControllerTestCase {
 
   /** @test */
   public function firstElementShouldBeLogPath() {
-    $this->assertXPathContentContains('//table[@id="variables"]//tr[1]', 'log_path', $this->_response->getBody());
+    $this->assertXPathContentContains('//table[@id="variables"]//tr[1]', 'log_path');
+  }
+
+
+  /** @test */
+  public function firstElementLogPathShouldHaveColumnWithCommentPathToLogs() {
+    $this->assertXPathContentContains('//table[@id="variables"]//tr[1]', 'path to logs');
   }
 
 

library/Class/TableDescription/CosmoVar.php

@@ -33,6 +33,7 @@ class Class_TableDescription_CosmoVar extends Class_TableDescription {
                        $model->acceptValueVisitor($this);
                        return $this->_value;
                      })
+         ->addColumn($this->_('Description'), 'commentaire')
 
          ->addRowPluginsActions();
   }