dev #47593 fix default value to adminvars

application/modules/admin/controllers/IndexController.php

@@ -53,7 +53,7 @@ class Admin_IndexController extends ZendAfi_Controller_Action {
     // creer les variables manquantes
     foreach (Class_AdminVar::getKnownVarsKeys() as $name)
       if (!in_array($name, $existing_clefs))
-        $existing_variables[] = Class_AdminVar::set($name, '');
+        $existing_variables[] = Class_AdminVar::set($name, Class_AdminVar::getValueOrDefault($name));
 
     $this->view->titre = $this->_('Gestion des variables');
     $this->view->vars = Class_AdminVar::filterByUserRole($existing_variables);

application/modules/admin/views/scripts/index/adminvar.phtml

@@ -19,7 +19,7 @@ Class_ScriptLoader::getInstance()->addSearchInputToContent($this->_('Filtrer les
                               'action' => 'adminvaredit',
                               'cle' => $var->getClef()]);
       ?>
-      <tr class="<?php echo ($ligne & 1) ? "first" : "second";?>">
+      <tr data-adminvar= "<?php echo $var->getClef(); ?>" class="<?php echo ($ligne & 1) ? "first" : "second";?>">
         <td style="vertical-align:top;" >
           <?php echo $var->getDescription();?>
           <br><sub><a data-popup="true" href="<?php echo $edit_url; ?>">
@@ -27,8 +27,9 @@ Class_ScriptLoader::getInstance()->addSearchInputToContent($this->_('Filtrer les
         </td>
         <td>
           <?php
-          echo ($renderer = $var->getRenderer()) ?
-                $renderer($var->getValeur(), $this) : $this->adminVar($var);
+          echo ($renderer = $var->getRenderer())
+                                             ? $renderer($var->getValeur(), $this)
+                                                                        : $this->adminVar($var);
           ?>
         </td>
         <td style="width:2%;text-align:center">

tests/application/modules/admin/controllers/IndexControllerTest.php

@@ -317,3 +317,27 @@ class Admin_IndexControllerWithOutLoggedAdminTest extends Admin_AbstractControll
     $this->assertNotXPath('//link[contains(@href, "bokeh74/colors/")]');
   }
 }
+
+
+
+class Admin_IndexControllerAdminvarActionTest extends Admin_AbstractControllerTestCase {
+  protected $_storm_default_to_volatile = true;
+
+
+  public function setUp() {
+    parent::setUp();
+    $this->dispatch('/admin/index/adminvar', true);
+  }
+
+
+  /** @test */
+  public function varLimitedMultipleSelecttionDefaultValueShouldBe200() {
+    $this->assertXPathContentContains('//tr[@data-adminvar="LIMIT_MULTIPLE_SELECTION"]//td', '200');
+  }
+
+
+  /** @test */
+  public function varNewsletterUnsubscribeTextShouldBeLienPourSeDesinscrire() {
+    $this->assertXPathContentContains('//tr[@data-adminvar="NEWSLETTER_UNSUBSCRIBE_TEXT"]//td', 'Lien pour se ');
+  }
+}