Merge branch 'hotfix/v2.1.5'

media/js/discipline/editStructure.js

@@ -250,7 +250,7 @@ $(document).ready(function () {
 
 
     // Update module & submodule name
-    $modules.on('keydown', 'input.moduleName, input.submoduleName', e => Watcher(500, _ => updateUnitName(e)));
+    $modules.on('change input paste', 'input.moduleName, input.submoduleName', e => Watcher(500, _ => updateUnitName(e)));
 
     function updateUnitName(e) {
         let $input = $(e.target),

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

@@ -90,7 +90,7 @@ class Model_Map extends Model
 
     /** @return bool true, if err occurred */
     public static function setSubmoduleName($teacherID, $submoduleID, $name) {
-        $sql = 'SELECT `ChangeSubmoduleName`(:teacher, :submodule, :name) AS `num`';
+        $sql = 'SELECT `ChangeSubmoduleName`(:teacher, :submodule, :name) AS `Num`';
         return DB::query(Database::SELECT, $sql)
             ->parameters([
                 ':teacher'   => $teacherID,

~dev_rating/application/views/teacher/discipline/MapBase.twig

@@ -12,7 +12,7 @@
 	{{ HTML.style('static/css/common/tabs.css')|raw }}
 	{{ HTML.style('static/css/common/buttons.css')|raw }}
     <script>
-        let g_disciplineID = {{ Discipline.ID }};
+        window.g_disciplineID = {{ Discipline.ID }};
     </script>
 	{% block discipline_media %}