From e0f05c8197bf2f380b5580c62011e2b138e77eaa Mon Sep 17 00:00:00 2001
From: xamgore <xamgore@ya.ru>
Date: Wed, 24 Jun 2015 18:10:01 +0300
Subject: [PATCH] Removed methods dependency
---
.../classes/Model/Helper/CourseWorkBuilder.php | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/~dev_rating/application/classes/Model/Helper/CourseWorkBuilder.php b/~dev_rating/application/classes/Model/Helper/CourseWorkBuilder.php
index ecb120e97..c4cf43cd9 100644
--- a/~dev_rating/application/classes/Model/Helper/CourseWorkBuilder.php
+++ b/~dev_rating/application/classes/Model/Helper/CourseWorkBuilder.php
@@ -2,7 +2,7 @@
class Model_Helper_CourseWorkBuilder extends Model_Helper_Builder
{
- const COURSEWORK_DISCIPLINE_ID = 346;
+ const COURSEWORK_DISCIPLINE_ID = 346; # todo: move to config
public function create() {
$this->data += [
@@ -46,7 +46,6 @@ class Model_Helper_CourseWorkBuilder extends Model_Helper_Builder
return $this;
}
- /** Must be called after subtype() */
function & subject($id) {
if ($this->data['Subtype'] === Model_CourseWork::SCIENTIFIC)
$id = self::COURSEWORK_DISCIPLINE_ID;
@@ -63,9 +62,13 @@ class Model_Helper_CourseWorkBuilder extends Model_Helper_Builder
throw new InvalidArgumentException('Type is incorrect');
switch ($name) {
- case Model_CourseWork::DISCIPLINARY:
case Model_CourseWork::SCIENTIFIC:
+ $this->data['SubjectID'] = self::COURSEWORK_DISCIPLINE_ID;
break;
+
+ case Model_CourseWork::DISCIPLINARY:
+ break;
+
default:
throw new InvalidArgumentException('Subtype is incorrect');
}
--
GitLab