Fix queries of previous commit - refs #7538

main/install/data.sql

@@ -1627,7 +1627,6 @@ INSERT INTO sequence_type_entity VALUES
 (2,'Quiz', 'Quiz and Tests','c_quiz'),
 (3,'LpItem', 'Items of a Learning Path','c_lp_item');
 
-<<<<<<< HEAD
 -- Version 1.10.0.40
 
 INSERT INTO settings_current
@@ -1635,7 +1634,7 @@ INSERT INTO settings_current
 VALUES
 ('hide_home_top_when_connected', '', 'radio', 'Platform', 'false', 'HideHomeTopContentWhenLoggedInText', 'HideHomeTopContentWhenLoggedInComment', NULL, '', true),
 ('hide_global_announcements_when_not_connected','','radio','Platform','true', 'HideGlobalAnnouncementsWhenNotLoggedInText','HideGlobalAnnouncementsWhenNotLoggedInComment',NULL,'', true),
-('course_creation_use_template','','radio','Course','','CourseCreationUsesTemplateText','CourseCreationUsesTemplateComment',NULL,'',true),
+('course_creation_use_template','','text','Course','','CourseCreationUsesTemplateText','CourseCreationUsesTemplateComment',NULL,'',true),
 ('allow_strength_pass_checker','','radio','Security','true','EnablePasswordStrengthCheckerText','EnablePasswordStrengthCheckerComment',NULL,'',true),
 ('allow_captcha','','radio','Security','true','EnableCaptchaText','EnableCaptchaComment',NULL,'',true),
 ('captcha_number_mistakes_to_block_account','','text','Security',5,'CaptchaNumberOfMistakesBeforeBlockingAccountText','CaptchaNumberOfMistakesBeforeBlockingAccountComment',NULL,'',true),
@@ -1644,4 +1643,22 @@ VALUES
 ('display_groups_forum_in_general_tool','','radio','Tools','true','ShowGroupForaInGeneralToolText','ShowGroupForaInGeneralToolComment',NULL,'',true),
 ('allow_tutors_to_assign_students_to_session','','radio','Session','false','TutorsCanAssignStudentsToSessionsText','TutorsCanAssignStudentsToSessionsComment',NULL,'',true);
 
+INSERT INTO settings_options (variable, value, display_text)
+VALUES
+('hide_home_top_when_connected','true','Yes'),
+('hide_home_top_when_connected','false','No'),
+('hide_global_announcements_when_not_connected','true','Yes'),
+('hide_global_announcements_when_not_connected','false','No'),
+('allow_strength_pass_checker','true','Yes'),
+('allow_strength_pass_checker','false','No'),
+('allow_captcha','true','Yes'),
+('allow_captcha','false','No'),
+('drh_can_access_all_session_content','true','Yes'),
+('drh_can_access_all_session_content','false','No'),
+('display_groups_forum_in_general_tool','true','Yes'),
+('display_groups_forum_in_general_tool','false','No'),
+('allow_tutors_to_assign_students_to_session','true','Yes'),
+('allow_tutors_to_assign_students_to_session','false','No');
+
+
 UPDATE settings_current SET selected_value = '1.10.0.39' WHERE variable = 'chamilo_database_version';

src/Chamilo/CoreBundle/Migrations/Schema/V110/Version20150507152600.php

@@ -68,7 +68,7 @@ class Version20150507152600 extends AbstractMigrationChamilo
         $this->addSettingCurrent(
             'course_creation_use_template',
             '',
-            'radio',
+            'text',
             'Course',
             ($value?$value:''),
             'CourseCreationUsesTemplateText',