Merge branch 'hotfix/v2.3.11' into develop

c0478363 · Anton Bagliy · a80b8f1c · ebab8a2e · c0478363
Commit c0478363 authored 6 years ago by Anton Bagliy
--- a/~dev_rating/application/views/office/reports/export.twig
+++ b/~dev_rating/application/views/office/reports/export.twig
@@ -27,7 +27,7 @@
                {% for grade in groups_tree %}
                    {% set grade_num = grade["grade_num"] %}
                    {% set degree = grade['degree'] %}
-                    {% set degreeTitle = ($degree == 'master' ? 'Магистратура' : ( $degree == 'bachelor' ? 'Бакалавриат' : ($degree == 'specialist' ? 'Специалитет' : 'Аспирантура'))) %}
+                    {% set degreeTitle = (degree == 'master' ? 'Магистратура' : ( degree == 'bachelor' ? 'Бакалавриат' : (degree == 'specialist' ? 'Специалитет' : 'Аспирантура'))) %}
                    <li id=Grade_{{ grade["grade_id"] }}>
                        {{ degreeTitle }} {{ grade_num }} курс
                        <ul>