Merge branch 'hotfix2.3.1' into develop

media/js/office/export.js

@@ -196,7 +196,6 @@ $(document).ready(() => {
 
         let getDisciplines = function (groupID, url, onSuccess, onFail, successText, errorText) {
             $.post(g_URLdir + url, {groupID: groupID}).success((disciplines) => {
-                //Popup.success(successText);
                 onSuccess(JSON.parse(JSON.parse(disciplines).response));
             }).fail(jqXHR => {
                 onFail();

~dev_rating/application/classes/Model/Group.php

@@ -60,6 +60,7 @@ class Model_Group extends Model
         return $list;
     }
 
+
     public function getDisciplinesForExport($semesterID = null) {
         $semesterID = $semesterID ?: User::instance()->SemesterID;
         $sql = 'SELECT * FROM GetDisciplinesForExport(:id, :semesterID)';

~dev_rating/application/classes/Model/Logs.php

@@ -41,6 +41,7 @@ class Model_Logs extends Model
         return $result;
     }
 
+
     public static function logFormExport($accountID, $disciplineID, $groupID, $semesterID, $error = 0) {
         $query = 'SELECT * FROM LogFormExport(:account, :discipline, :group, :semester, :error)';