From ff28bc869b4e7416c354a8f44e5319fc24f8745d Mon Sep 17 00:00:00 2001
From: xamgore <xamgore@ya.ru>
Date: Wed, 18 Mar 2015 14:24:40 +0300
Subject: [PATCH] Removed create method from Disciplines model
---
.../application/classes/Controller/Handler/GetData.php | 5 ++---
~dev_rating/application/classes/Model/Disciplines.php | 8 ++------
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/~dev_rating/application/classes/Controller/Handler/GetData.php b/~dev_rating/application/classes/Controller/Handler/GetData.php
index fda586bc3..c2683ccf0 100644
--- a/~dev_rating/application/classes/Controller/Handler/GetData.php
+++ b/~dev_rating/application/classes/Controller/Handler/GetData.php
@@ -32,9 +32,8 @@ class Controller_Handler_GetData extends Controller_Handler
$this->post -> rule('GroupID', 'not_empty')
-> rule('GroupID', 'digit');
if($this->post->check()) {
- $data['data'] = Model_Disciplines::create()->forGroup(
- $this->post->offsetGet('GroupID'))->asArray();
-
+ $group = $this->post->offsetGet('GroupID');
+ $data['data'] = Model_Disciplines::forGroup($group);
$data['success'] = true;
}
$this->response->body(json_encode($data));
diff --git a/~dev_rating/application/classes/Model/Disciplines.php b/~dev_rating/application/classes/Model/Disciplines.php
index 6f26dcfba..e2fc7bbc8 100644
--- a/~dev_rating/application/classes/Model/Disciplines.php
+++ b/~dev_rating/application/classes/Model/Disciplines.php
@@ -2,11 +2,7 @@
class Model_Disciplines extends Model
{
- public static function create() {
- return new self();
- }
-
- public function forGroup($GroupID) {
+ public static function forGroup($GroupID) {
$teacherModel = new Model_Teacher_Rating;
$disciplines = $teacherModel->getDisciplinesForGroup($GroupID);
@@ -14,7 +10,7 @@ class Model_Disciplines extends Model
foreach ($disciplines as $row)
$list[] = $row;
- return new DataArray_Result($list);
+ return $list;
}
/**
--
GitLab