refs #5212 do not display the default value in case we handle radio f…

…ields
matomo-org · May 29, 2014 · bb4d352 · bb4d352
1 parent 82da315
commit bb4d352
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/plugins/CoreAdminHome/templates/pluginSettings.twig b/plugins/CoreAdminHome/templates/pluginSettings.twig
@@ -130,7 +130,7 @@
 
                             {% endif %}
 
-                            {% if setting.defaultValue and setting.uiControlType != 'checkbox' %}
+                            {% if setting.defaultValue and setting.uiControlType != 'checkbox' and setting.uiControlType != 'radio' %}
                                 <br/>
                                 <span class='form-description'>
                                     {{ 'General_Default'|translate }}

diff --git a/plugins/LeftMenu/API.php b/plugins/LeftMenu/API.php
@@ -32,7 +32,7 @@ public function isEnabled()
 
         $user = $settings->userEnabled->getValue();
 
-        if (empty($user) || $user === 'default') {
+        if (empty($user) || $user === 'system') {
             return $default;
         }
 

diff --git a/plugins/LeftMenu/Settings.php b/plugins/LeftMenu/Settings.php
@@ -48,8 +48,9 @@ private function createUserEnabledSetting()
         $this->userEnabled = new UserSetting('userEnabled', 'Enable left reporting menu');
         $this->userEnabled->type            = static::TYPE_STRING;
         $this->userEnabled->uiControlType   = static::CONTROL_RADIO;
-        $this->userEnabled->availableValues = array('default' => 'System Default', 'yes' => 'Yes', 'no' => 'No');
+        $this->userEnabled->availableValues = array('system' => 'System Default', 'yes' => 'Yes', 'no' => 'No');
         $this->userEnabled->inlineHelp      = 'This will enable or disable the left menu only for you and not affect any other users. A Super User can change the default for all users.';
+        $this->userEnabled->defaultValue    = 'system';
 
         $this->addSetting($this->userEnabled);
     }