Merge remote-tracking branch 'gitlab/master'

~dev_rating/application/classes/Controller/Handler/Credits.php

@@ -24,9 +24,7 @@ class Controller_Handler_Credits extends Controller_Handler
     }
 
     public function action_setCreditMilestone() {
-        $id = (int) $this->request->param("param1");
-        $stage = (int) $this->request->param("param2");
-
+        list($id, $stage) = explode(":", $this->request->param("id"));
         Model_Discipline::load($id)->setMilestone($stage);
         $this->response->body('');
     }

~dev_rating/application/classes/Model/Discipline.php

@@ -148,7 +148,7 @@ class Model_Discipline extends Model_Container
      * @param $stage int number from 0 to 3
      */
     public function setMilestone($stage) {
-        if ($stage >= 0 && $stage <= 3)
+        if ($stage < 0 || $stage > 3)
             throw new LogicException('Milestone argument is incorrect!');
 
         $this->Milestone = $stage;

~dev_rating/application/views/dean_office/credits.twig

@@ -5,7 +5,7 @@
     {{ parent() }}
     {{ HTML.script('static/js/libs/jquery.fileDownload.js')|raw }}
     {{ HTML.style('static/css/discipline.css')|raw }}
-    {{ HTML.script('static/js/dean_office/credits.js')|raw }}
+    {{ HTML.script('static/js/dean/credits.js')|raw }}
 
     {{ HTML.script('static/js/libs/select2.js')|raw }}
     {{ HTML.style('static/css/select2.css')|raw }}

~dev_rating/application/views/dean_office/sheets.twig

@@ -5,7 +5,7 @@
     {{ parent() }}
     {{ HTML.script('static/js/libs/jquery.fileDownload.js')|raw }}
     {{ HTML.style('static/css/discipline.css')|raw }}
-    {{ HTML.script('static/js/dean_office/dean.js')|raw }}
+    {{ HTML.script('static/js/dean/dean.js')|raw }}
 {% endblock %}
 
 {% block main_top_title %}Деканат > Ведомости{% endblock %}
@@ -90,4 +90,4 @@
         </div>
     </div>
 
-{% endblock %}					
+{% endblock %}