Merge branch 'develop' of http://itlab.mmcs.sfedu.ru/git/grade-rating into develop

~dev_rating/media/js/admin/teachers/index.js

@@ -24,7 +24,9 @@ $(function()
                 });
                 $.post(URLdir + 'handler/admTeachers/getDepartmentsList', {'facultyID': $('#facultySelect option:selected').val()}, function(data){
                     $.each(data, function(i){
-                        $("#departmentSelect").append('<option value="'+data[i].ID+'">'+data[i].Name+'</option>');
+                        var dep = data[i];
+                        if (!dep.Name) dep.Name = 'Служебная кафедра';
+                        $("#departmentSelect").append('<option value="'+dep.ID+'">'+dep.Name+'</option>');
                     });
                     $("#departmentSelect").removeAttr("disabled");
                 }, "json");

~dev_rating/media/js/discipline/EditTeachers.js

@@ -80,7 +80,9 @@ $(function() {
                     
                     jDepartmentSelect.html("<option value='0'>Выберите кафедру (не обязательно)</option>");
                     for (i in Dep) {
-                        jDepartmentSelect.append("<option value='"+ Dep[i].ID +"'>"+ Dep[i].Name +"</option>");
+                        var dep = Dep[i];
+                        if (!dep.Name) dep.Name = 'Служебная кафедра';
+                        jDepartmentSelect.append("<option value='"+ dep.ID +"'>"+ dep.Name +"</option>");
                     }
                     if (i <= 0)
                         jDepartmentSelect.html("<option value='0'>Нет кафедр</option>");     

~dev_rating/media/js/profileSettings.js

@@ -10,8 +10,10 @@ $(function()
                 $.post( URLdir + 'handler/settings/getDepartmentsList', 
                         {'facultyID': $('#facultySelect option:selected').val()}, 
                         function(data){
-                            $.each(data, function(i){
-                                $("#departmentSelect").append('<option value="'+data[i].ID+'">'+data[i].Name+'</option>');
+                            $.each(data, function(i) {
+                                var dep = data[i];
+                                if (!dep.Name) dep.Name = 'Служебная кафедра';
+                                $("#departmentSelect").append('<option value="' + dep.ID + '">' + dep.Name + '</option>');
                             });
                             $("#departmentSelect").removeAttr("disabled");
                         },