diff --git a/~dev_rating/application/views/controls/searchStudent.twig b/~dev_rating/application/views/controls/searchStudent.twig index e01ef9adf600f4fff8cde5b7f019e584bf820237..267a2644895dcca0b1244a7620dbe02053737202 100644 --- a/~dev_rating/application/views/controls/searchStudent.twig +++ b/~dev_rating/application/views/controls/searchStudent.twig @@ -31,7 +31,7 @@ <select class="SelectFaculty defaultForm PFullWidth"> <option value="0">-- Фильтр по учебному подразделению --</option> {% for Faculty in Faculties %} - <option value="{{ Faculty.ID }}"> + <option value="{{ Faculty.ID }}" {{ User.FacultyID == Faculty.ID ? "selected" }}> {{ Faculty.Name }} </option> {% endfor %} diff --git a/~dev_rating/application/views/office/subjects/upload.twig b/~dev_rating/application/views/office/subjects/upload.twig index 5b0f78b4711bade8cfc7b224c28a5aad25fc7251..64c50bdd1e35d462393d1a867cec9e2b28ceaa0c 100644 --- a/~dev_rating/application/views/office/subjects/upload.twig +++ b/~dev_rating/application/views/office/subjects/upload.twig @@ -13,8 +13,10 @@ <input type="text" id="SubjectName" placeholder="Введите название предмета" class="defaultForm HalfWidth FLeft"> <select id="facultySelect" name="facultyID" class="defaultForm HalfWidth FRight"> <option value="0" selected="selected">— Выберите подразделение ЮФУ —</option> - {% for row in Faculties %} - <option value="{{ row.ID }}">{{ row.Name }} ({{ row.Abbr }})</option> + {% for Faculty in Faculties %} + <option value="{{ Faculty.ID }}" {{ User.FacultyID == Faculty.ID ? "selected" }}> + {{ Faculty.Name }} ({{ Faculty.Abbr }}) + </option> {% endfor %} </select> </div> @@ -45,8 +47,10 @@ <div class="goodClearFix defaultForm marginBetween"> <select name="facultyID" class="defaultForm"> <option value="0" selected="selected">— Выберите подразделение ЮФУ —</option> - {% for row in Faculties %} - <option value="{{ row.ID }}">{{ row.Name }} ({{ row.Abbr }})</option> + {% for Faculty in Faculties %} + <option value="{{ Faculty.ID }}" {{ User.FacultyID == Faculty.ID ? "selected" }}> + {{ Faculty.Name }} ({{ Faculty.Abbr }}) + </option> {% endfor %} </select> </div> diff --git a/~dev_rating/application/views/office/teachers/search.twig b/~dev_rating/application/views/office/teachers/search.twig index dd6708eeed3b0880b43ffce3a47e683ebe5bf853..553048e9cf95e4074082f28619e1d7c71640fd31 100644 --- a/~dev_rating/application/views/office/teachers/search.twig +++ b/~dev_rating/application/views/office/teachers/search.twig @@ -27,5 +27,5 @@ {% endblock %} {% block office_content %} - {{ search.control(block('_ResultPrototype'), Faculties, Departments) }} + {{ search.control(block('_ResultPrototype'), User.isAdmin ? Faculties, Departments) }} {% endblock %}