From 7ed4f353352b0808b41800caf68f3f3a30af0f75 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 7 Sep 2018 14:43:45 +0200
Subject: [PATCH] Minor - Fix gradebook settings with new structure

---
 main/gradebook/lib/fe/displaygradebook.php          | 2 +-
 main/gradebook/lib/scoredisplay.class.php           | 2 --
 src/CoreBundle/Settings/GradebookSettingsSchema.php | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/main/gradebook/lib/fe/displaygradebook.php b/main/gradebook/lib/fe/displaygradebook.php
index 61bf30b54f..c32aa717f7 100755
--- a/main/gradebook/lib/fe/displaygradebook.php
+++ b/main/gradebook/lib/fe/displaygradebook.php
@@ -485,7 +485,7 @@ class DisplayGradebook
                             Display::return_icon('percentage.png', get_lang('EditAllWeights'), '', ICON_SIZE_MEDIUM).'</a>';
                     }
                     $score_display_custom = api_get_setting('gradebook_score_display_custom');
-                    if (api_get_setting('teachers_can_change_score_settings') == 'true' && $score_display_custom['my_display_custom'] == 'true') {
+                    if (api_get_setting('teachers_can_change_score_settings') == 'true' && $score_display_custom == 'true') {
                         $actionsRight .= '<a href="gradebook_scoring_system.php?'.$my_api_cidreq.'&selectcat='.$catobj->get_id().'">'.
                             Display::return_icon('ranking.png', get_lang('ScoreEdit'), '', ICON_SIZE_MEDIUM).'</a>';
                     }
diff --git a/main/gradebook/lib/scoredisplay.class.php b/main/gradebook/lib/scoredisplay.class.php
index e86c68ebb9..ab25fc9e19 100755
--- a/main/gradebook/lib/scoredisplay.class.php
+++ b/main/gradebook/lib/scoredisplay.class.php
@@ -30,7 +30,6 @@ class ScoreDisplay
 
         // Loading portal settings + using standard functions.
         $value = api_get_setting('gradebook_score_display_coloring');
-        $value = $value['my_display_coloring'];
 
         // Setting coloring.
         $this->coloring_enabled = $value == 'true' ? true : false;
@@ -44,7 +43,6 @@ class ScoreDisplay
 
         // Setting custom enabled
         $value = api_get_setting('gradebook_score_display_custom');
-        $value = $value['my_display_custom'];
         $this->custom_enabled = $value == 'true' ? true : false;
 
         if ($this->custom_enabled) {
diff --git a/src/CoreBundle/Settings/GradebookSettingsSchema.php b/src/CoreBundle/Settings/GradebookSettingsSchema.php
index 3adbf99a73..6dda422b90 100644
--- a/src/CoreBundle/Settings/GradebookSettingsSchema.php
+++ b/src/CoreBundle/Settings/GradebookSettingsSchema.php
@@ -74,7 +74,7 @@ class GradebookSettingsSchema extends AbstractSettingsSchema
             ->add('gradebook_locking_enabled', YesNoType::class)
             ->add('gradebook_default_grade_model_id')
             ->add('gradebook_show_percentage_in_reports')
-            ->add('my_display_coloring')
+            ->add('my_display_coloring', YesNoType::class)
             ->add(
                 'student_publication_to_take_in_gradebook',
                 ChoiceType::class,