From e062a6bc678ef7e0801862c3ba10dbc7dd83c1c7 Mon Sep 17 00:00:00 2001
From: RomanSteinberg <romanofficial@yandex.ru>
Date: Sun, 17 May 2015 12:19:06 +0300
Subject: [PATCH] FIX: group selection on discipline creation page (students
 step)

---
 .../application/classes/Controller/Teacher/Discipline.php       | 2 +-
 .../application/views/teacher/discipline/EditStudents.twig      | 2 +-
 ~dev_rating/media/js/discipline/EditStudents.js                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/~dev_rating/application/classes/Controller/Teacher/Discipline.php b/~dev_rating/application/classes/Controller/Teacher/Discipline.php
index 1d61be65f..aa9f04d47 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 b1c3e7bb4..ceda6a7c9 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 e338f0605..1e4e653dc 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>"));
 
 
-- 
GitLab