Fixes show_description when updating sessions see BT#8617

chamilo · Feb 3, 2015 · 762c4b3 · 762c4b3
1 parent f14dfa4
commit 762c4b3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/main/cron/import_csv.php b/main/cron/import_csv.php
@@ -1071,6 +1071,8 @@ private function importSessionsStatic($file)
                             $accessAfter = intval($this->daysCoachAccessAfterBeginning);
                         }
 
+                        $showDescription = isset($sessionInfo['show_description']) ? $sessionInfo['show_description'] : 1;
+
                         $result = SessionManager::edit_session(
                             $sessionId,
                             $session['SessionName'],
@@ -1089,7 +1091,7 @@ private function importSessionsStatic($file)
                             true, //$start_limit =
                             true, //$end_limit =
                             null, //$description
-                            1 // $showDescription = null,
+                            $showDescription // $showDescription = null,
                         );
 
                         if (is_numeric($result)) {

diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php
@@ -3646,6 +3646,7 @@ public static function get_sessions_by_user($user_id, $ignore_visibility_for_adm
      * @param bool $deleteUsersNotInList
      * @param bool $updateCourseCoaches
      * @param bool $sessionWithCoursesModifier
+     * @param int $showDescription
      * @return array
      */
     static function importCSV(
@@ -3907,10 +3908,6 @@ static function importCSV(
                             $params['description'] = $sessionDescription;
                         }
 
-                        if (!is_null($showDescription)) {
-                            $params['show_description'] = intval($showDescription);
-                        }
-
                         if (!empty($fieldsToAvoidUpdate)) {
                             foreach ($fieldsToAvoidUpdate as $field) {
                                 unset($params[$field]);
@@ -3934,6 +3931,9 @@ static function importCSV(
                             }
 
                             $sessionInfo = api_get_session_info($session_id);
+
+                            $params['show_description'] = isset($sessionInfo['show_description']) ? $sessionInfo['show_description'] : intval($showDescription);
+
                             if (!empty($daysCoachAccessBeforeBeginning) && !empty($daysCoachAccessAfterBeginning)) {
                                 if (empty($sessionInfo['nb_days_access_before_beginning']) ||
                                     (!empty($sessionInfo['nb_days_access_before_beginning']) &&