From 04e6965eff15b54a31cf23bd6184b514055d0d63 Mon Sep 17 00:00:00 2001
From: xamgore <xamgore@ya.ru>
Date: Wed, 2 Sep 2015 17:19:06 +0300
Subject: [PATCH] Closes #26, auto selected menu item

---
 .../application/views/controls/searchStudent.twig    |  2 +-
 .../application/views/office/subjects/upload.twig    | 12 ++++++++----
 .../application/views/office/teachers/search.twig    |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/~dev_rating/application/views/controls/searchStudent.twig b/~dev_rating/application/views/controls/searchStudent.twig
index e01ef9adf..267a26448 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 5b0f78b47..64c50bdd1 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 dd6708eee..553048e9c 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 %}
-- 
GitLab