Browse Source

Merge branch '1.11.x' of https://github.com/chamilo/chamilo-lms into 1.11.x

Alex Aragon 7 years ago
parent
commit
17817467b5

+ 2 - 1
main/admin/course_edit.php

@@ -203,8 +203,9 @@ if (array_key_exists('add_teachers_to_sessions_courses', $courseInfo)) {
     );
 }
 
+$allowEditSessionCoaches = api_get_configuration_value('disabled_edit_session_coaches_course_editing_course') === false;
 $coursesInSession = SessionManager::get_session_by_course($courseInfo['real_id']);
-if (!empty($coursesInSession)) {
+if (!empty($coursesInSession) && $allowEditSessionCoaches) {
     foreach ($coursesInSession as $session) {
         $sessionId = $session['id'];
         $coaches = SessionManager::getCoachesByCourseSession(

+ 3 - 1
main/install/configuration.dist.php

@@ -676,4 +676,6 @@ $_configuration['gradebook_badge_sidebar'] = [
 // Redirect to home tool after uploading a student publication or a adding a comment
 //$_configuration['allow_redirect_to_main_page_after_work_upload'] = false;
 // Empty the session student list when subscribing multiple users
-//$_configuration['not_empty_session_student_list_for_multiple_subscription'] = false;
+//$_configuration['session_multiple_subscription_students_list_avoid_emptying'] = false;
+// Disable the option to set course coach in session when editing course
+//$_configuration['disabled_edit_session_coaches_course_editing_course'] = false;

+ 1 - 1
main/session/add_users_to_session.php

@@ -330,7 +330,7 @@ if (isset($_POST['form_sent']) && $_POST['form_sent']) {
     }
 
     if ($form_sent == 1) {
-        $notEmptyList = api_get_configuration_value('not_empty_session_student_list_for_multiple_subscription');
+        $notEmptyList = api_get_configuration_value('session_multiple_subscription_students_list_avoid_emptying');
 
         // Added a parameter to send emails when registering a user
         SessionManager::subscribe_users_to_session(