From 35a88fdf940333b33e617564b52473c2226456fb Mon Sep 17 00:00:00 2001
From: Anton Bagliy <taccessviolation@gmail.com>
Date: Tue, 4 Dec 2018 16:40:01 +0300
Subject: [PATCH] FIX: attaching one teacher to subgroup #299
---
db/postgresql/add_subgroups_01_12_18.sql | 10 +++++++---
.../classes/Controller/Handler/Subgroup.php | 2 +-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/db/postgresql/add_subgroups_01_12_18.sql b/db/postgresql/add_subgroups_01_12_18.sql
index 262ea0864..58cc0376f 100644
--- a/db/postgresql/add_subgroups_01_12_18.sql
+++ b/db/postgresql/add_subgroups_01_12_18.sql
@@ -197,8 +197,12 @@ LANGUAGE plpgsql
AS $function$
declare vID int default -1;
begin
- insert into subgroups_teachers(teacher_id, subgroup_id)
- values(pteacherid, psubgroupid) returning id into vID;
- RETURN vID;
+ --insert into subgroups_teachers(teacher_id, subgroup_id)
+ --values(pteacherid, psubgroupid) returning id into vID;
+ --RETURN vID;
+ update subgroups
+ set teacher_id = pteacherid
+ where id = psubgroupid returning teacher_id into vID;
+ return vID;
end
$function$;
\ No newline at end of file
diff --git a/~dev_rating/application/classes/Controller/Handler/Subgroup.php b/~dev_rating/application/classes/Controller/Handler/Subgroup.php
index 198540432..0e1cdf288 100644
--- a/~dev_rating/application/classes/Controller/Handler/Subgroup.php
+++ b/~dev_rating/application/classes/Controller/Handler/Subgroup.php
@@ -77,7 +77,7 @@ class Controller_Handler_Subgroup extends Controller_Handler
$teacherAttached = Model_Subgroup::attachTeacher($teacher, $subgroup);
//Kohana::$log->add(Log::WARNING, $teacherAttached . ' != '. $teacher . ' from '. $subgroup);
- $response = ['success' => ($teacher == $teacherAttached ? 1 : -1)];
+ $response = ['success' => ($teacher == $teacherAttached ? "1" : "-1")];
$this->response->body(json_encode($response));
}
--
GitLab