Browse Source

Add cidreq

jmontoyaa 9 years ago
parent
commit
f5c3c210cd

+ 1 - 1
main/exercice/exercise_report.php

@@ -415,7 +415,7 @@ if ($is_allowedToEdit)
 
 echo $actions;
 
-$url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_exercise_results&exerciseId='.$exercise_id.'&filter_by_user='.$filter_user;
+$url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_exercise_results&exerciseId='.$exercise_id.'&filter_by_user='.$filter_user.'&'.api_get_cidreq();
 
 $action_links = '';
 

+ 1 - 1
main/exercice/exercise_show.php

@@ -65,7 +65,7 @@ if (api_is_course_session_coach(
 
 $allowCoachFeedbackExercises = api_get_setting('exercise.allow_coach_feedback_exercises') === 'true';
 
-$maxEditors = intval(api_get_setting('exercise_max_ckeditors_in_page'));
+$maxEditors = intval(api_get_setting('exercise.exercise_max_ckeditors_in_page'));
 $is_allowedToEdit = api_is_allowed_to_edit(null, true) || $is_courseTutor || api_is_session_admin() || api_is_drh() || api_is_student_boss();
 $isCoachAllowedToEdit = api_is_allowed_to_edit(false, true);
 $isFeedbackAllowed = false;

+ 8 - 5
main/inc/lib/exercise.lib.php

@@ -1840,9 +1840,12 @@ HTML;
         $teacher_list = CourseManager::getTeacherListFromCourse(
             api_get_course_int_id()
         );
+
         $teacher_id_list = array();
-        foreach ($teacher_list as $teacher) {
-            $teacher_id_list[] = $teacher['user_id'];
+        if (!empty($teacher_list)) {
+            foreach ($teacher_list as $teacher) {
+                $teacher_id_list[] = $teacher['user_id'];
+            }
         }
 
         $list_info = array();
@@ -2024,9 +2027,9 @@ HTML;
                                     date('Y-m-d h:i:s'),
                                     false
                                 );
-                                $actions .= '<a href="http://www.whatsmyip.org/ip-geo-location/?ip=' . $ip . '" target="_blank"><img src="' . api_get_path(
-                                        WEB_CODE_PATH
-                                    ) . 'img/icons/22/info.png" title="' . $ip . '" /></a>';
+                                $actions .= '<a href="http://www.whatsmyip.org/ip-geo-location/?ip=' . $ip . '" target="_blank">';
+                                $actions .= Display::return_icon('info.png', $ip, ['title' => $ip]);
+                                $actions .= '</a>';
 
                                 $delete_link = '<a href="exercise_report.php?' . api_get_cidreq(
                                     ) . '&filter_by_user=' . intval(

+ 1 - 0
src/Chamilo/CoreBundle/Migrations/Schema/V2_0_0/Version20.php

@@ -108,6 +108,7 @@ class Version20 implements Migration, OrderedMigrationInterface
             'administrator_surname' => 'admin',
             'administrator_name' => 'admin',
             'administrator_phone' => 'admin',
+            'exercise_max_ckeditors_in_page' => 'exercise'
         ];
 
         foreach ($settings as $variable => $category) {

+ 3 - 1
src/Chamilo/CoreBundle/Settings/ExerciseSettingsSchema.php

@@ -26,7 +26,8 @@ class ExerciseSettingsSchema implements SchemaInterface
                     'enable_quiz_scenario' => '',
                     'allow_coach_feedback_exercises' => '',
                     'show_official_code_exercise_result_list' => '',
-                    'email_alert_manager_on_new_quiz' => ''
+                    'email_alert_manager_on_new_quiz' => '',
+                    'exercise_max_ckeditors_in_page' => ''
                 )
             )
             ->setAllowedTypes(
@@ -50,6 +51,7 @@ class ExerciseSettingsSchema implements SchemaInterface
             ->add('allow_coach_feedback_exercises', 'yes_no')
             ->add('show_official_code_exercise_result_list', 'yes_no')
             ->add('email_alert_manager_on_new_quiz', 'yes_no')
+            ->add('exercise_max_ckeditors_in_page')
         ;
     }
 }