diff --git a/~dev_rating/application/classes/Controller/Teacher/Discipline.php b/~dev_rating/application/classes/Controller/Teacher/Discipline.php index 1d61be65f42976882f43303b61ddad34fb7911c6..aa9f04d47859dd168bcbe45ff67f7d7d87911be1 100644 --- a/~dev_rating/application/classes/Controller/Teacher/Discipline.php +++ b/~dev_rating/application/classes/Controller/Teacher/Discipline.php @@ -65,7 +65,7 @@ class Controller_Teacher_Discipline extends Controller_UserEnvironment { $twig->User = $this->user; $twig->Discipline = $this->GetDisciplineInfo($id); $twig->GradesList = Model_Grades::toArray(); - $twig->Groups = Model_Groups::orderByGroups($twig->Discipline['GradeID'], $twig->Discipline['FacultyID']); + $twig->GroupsList = Model_Groups::orderByGroups($twig->Discipline['GradeID'], $twig->Discipline['FacultyID']); $students = Model_Students::ofDiscipline($id); $stdHandled = array(); diff --git a/~dev_rating/application/views/teacher/discipline/EditStudents.twig b/~dev_rating/application/views/teacher/discipline/EditStudents.twig index b1c3e7bb413c4f6a219928fb95cb8a0ff722b99b..ceda6a7c9dc7f7ade43ab72520528066126095df 100644 --- a/~dev_rating/application/views/teacher/discipline/EditStudents.twig +++ b/~dev_rating/application/views/teacher/discipline/EditStudents.twig @@ -74,7 +74,7 @@ </select> <select class="SelectStudyGroup defaultForm"> <option value="0">Выберите группу:</option> - {% for Group in Groups %} + {% for Group in GroupsList %} <option value="{{ Group.ID }}">Группа {{ Group.GroupNum }} - {{ Group.SpecName }}</option> {% endfor %} </select> diff --git a/~dev_rating/media/js/discipline/EditStudents.js b/~dev_rating/media/js/discipline/EditStudents.js index e338f060582db6d51cf1ac4c26e9a38551943823..1e4e653dcecf97d33d01a7157ab5052c766aa98e 100644 --- a/~dev_rating/media/js/discipline/EditStudents.js +++ b/~dev_rating/media/js/discipline/EditStudents.js @@ -22,7 +22,7 @@ $(function() { var jStudentEmptyPrototype = $($.parseHTML( "<p class='notification'>Нет результатов... Возможно, студенты, соответствующие критериям поиска, уже прикреплены.</p>")); - var jGroupWrapPrototype = $($.parseHTML( "<select class='SelectStudyGroup default_select'>\ + var jGroupWrapPrototype = $($.parseHTML( "<select class='SelectStudyGroup defaultForm'>\ <option value='0'>Выберите группу:</option>"));