diff --git a/db/postgresql/add_subgroups_01_12_18.sql b/db/postgresql/add_subgroups_01_12_18.sql index 262ea086421c28062ed29bb9c4cc5b687b303bc9..58cc0376f1281baa0223097875d68107f1a9f8b2 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 198540432c8f311cf8c6b4fda135a90b5ff0f141..0e1cdf288f84dd5c0bfa0e128f331371185d7498 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)); }