From 9d6d3284e5c267a1adbcd3e97163d120d3ed8dbd Mon Sep 17 00:00:00 2001 From: Shalimov Anton <solidovic@yandex.ru> Date: Sat, 30 Aug 2014 11:15:19 +0400 Subject: [PATCH] =?UTF-8?q?fix=20=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BE?= =?UTF-8?q?=D0=B3=D1=80=D0=B0=D0=BD=D0=B8=D1=87=D0=B5=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?100=20=D0=B1=D0=B0=D0=BB=D0=BB=D0=BE=D0=B2=20(=D0=BF=D0=BE?= =?UTF-8?q?=D0=B7=D0=B6=D0=B5=20=D0=B2=D0=B5=D1=80=D0=BD=D1=83)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ~dev_rating/application/views/teacher/map/EditDiscipline.twig | 4 ++-- ~dev_rating/media/js/construct/edit.js | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/~dev_rating/application/views/teacher/map/EditDiscipline.twig b/~dev_rating/application/views/teacher/map/EditDiscipline.twig index e7496c47f..bc9910820 100644 --- a/~dev_rating/application/views/teacher/map/EditDiscipline.twig +++ b/~dev_rating/application/views/teacher/map/EditDiscipline.twig @@ -33,7 +33,7 @@ <div class="title">Предмет:</div> <div class="field"> <select class="SelectSubject default_select"> - <option value="0">-Не выбран-</option> + <option>-Не выбран-</option> {% for Subject in SubjectsList %} <option value="{{ Subject.ID }}" {% if Discipline.SubjectID == Subject.ID %}selected{% endif %}>{{ Subject.Title }}</option> {% endfor %} @@ -46,7 +46,7 @@ <div class="title">Курс:</div> <div class="field"> <select class="SelectGrade default_select"> - <option value="0">-Не выбран-</option> + <option>-Не выбран-</option> {% for Grade in GradesList %} <option value="{{ Grade.ID }}" {% if Grade.ID == Discipline.GradeID %}selected{% endif %}>{{ Grade.Title }}</option> {% endfor %} diff --git a/~dev_rating/media/js/construct/edit.js b/~dev_rating/media/js/construct/edit.js index 39728a8ef..bb328b043 100644 --- a/~dev_rating/media/js/construct/edit.js +++ b/~dev_rating/media/js/construct/edit.js @@ -107,6 +107,7 @@ $(function() { if (thisObj.val() != '') NewMaxRate = parseInt(thisObj.val()); + /* // Ограничение 100 баллов var currentControl = 0; $('.moduleHead .currentControl').each(function(){ @@ -126,6 +127,7 @@ $(function() { thisObj.val(OldMaxRate); return 0; } + */ // Меняем max балл if (NewMaxRate != OldMaxRate) { -- GitLab