Static modifiers; removed create method

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

@@ -77,9 +77,9 @@ class Controller_Handler_AdmTeachers extends Controller_Handler {
             $this->response->body($twig);
         }
         
-        public function action_getDepartmentsList()
-        {
+        public function action_getDepartmentsList() {
             $facultyID = $this->post->offsetGet('facultyID');
-            $this->response->body(Model_Departments::create()->byFaculty($facultyID)->asJSON());
+            $departments = Model_Departments::byFaculty($facultyID);
+            $this->response->body(json_encode($departments));
         }
 }
\ No newline at end of file

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

@@ -519,9 +519,10 @@ class Controller_Handler_Map extends Controller_Handler {
             $this->post -> rule('FacultyID', 'not_empty')
                         -> rule('FacultyID', 'digit');
             if($this->post->check()) {
-				$DepList = Model_Departments::create()->byFaculty($this->post->offsetGet('FacultyID'))->asJSON();
+                $faculty = $this->post->offsetGet('FacultyID');
+                $departments = Model_Departments::byFaculty($faculty);
             }
-			$this->response->body($DepList);
+			$this->response->body(json_encode($departments));
 		}
 		
 		// Поиск преподавателей

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

@@ -80,8 +80,8 @@ class Controller_Handler_Settings extends Controller_Handler {
         public function action_getDepartmentsList()
         {
             $facultyID = $this->post->offsetGet('facultyID');
-            $deps = Model_Departments::create()->byFaculty($facultyID)->asArray();
-            $this->response->body(json_encode($deps));  
+            $departments = Model_Departments::byFaculty($facultyID);
+            $this->response->body(json_encode($departments));
         }
         
         public function action_changeEMail()

~dev_rating/application/classes/Controller/Teacher/Discipline.php

@@ -146,7 +146,7 @@ class Controller_Teacher_Discipline extends Controller_UserEnvi {
         $twig->Discipline = $this->getDisciplineInfo($db, $id);
         $twig->BindTeachersList = Model_Teachers::create()->forDiscipline($id)->asArray();
         $twig->FacultiesList = Model_Faculties::create()->common()->asArray();
-        $twig->Departments = Model_Departments::create()->byFaculty($this->UserInfo['FacultyID'])->asArray();
+        $twig->Departments = Model_Departments::byFaculty($this->UserInfo['FacultyID']);
         
         $this->response->body($twig);
     }

~dev_rating/application/classes/Controller/Teacher/Profile.php

@@ -6,7 +6,7 @@ class Controller_Teacher_Profile extends Controller_UserEnvi {
         $twig = Twig::factory('profile/settings');
         $twig->JobPositions = $this->getJobPositions();
         $twig->Faculties = $this->getFaculties();
-        $twig->Departments = Model_Departments::create()->byFaculty($this->UserInfo['FacultyID'])->asArray();
+        $twig->Departments = Model_Departments::byFaculty($this->UserInfo['FacultyID']);
         $twig->User = $this->UserInfo;
         $this->response->body($twig);
     }

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

@@ -2,27 +2,21 @@
 
 class Model_Departments extends Model
 {
-    public static function create() {
-        return new self();
-    }
-
-    public function getDepartmentsByFaculty($facultyID) {
+    public static function ofFaculty($facultyID) {
         $sql = "CALL `GetDepartments`('$facultyID'); ";
         return DB::query(Database::SELECT, $sql)->execute();
     }
 
-    public function byFaculty($facultyID) {
+    public static function byFaculty($facultyID) {
         $list = array();
-        if ($facultyID != 0) {
-            $departments = $this->getDepartmentsByFaculty($facultyID);
-
-            $i = 0;
+        if ($facultyID > 0) {
+            $departments = self::ofFaculty($facultyID);
             foreach ($departments as $row) {
                 if ($row['Name'] == null)
                     $row['Name'] = '<служебная кафедра>';
-                $list[$i++] = $row;
+                $list[] = $row;
             }
         }
-        return new DataArray_Result($list);
+        return $list;
     }
 }