From 4cd9a858c5053c5624e996cec7295e9a13d93ef7 Mon Sep 17 00:00:00 2001
From: PavelBegunkov <asml.Silence@gmail.com>
Date: Mon, 8 Jun 2015 22:54:58 +0300
Subject: [PATCH] totally replace @CurrentSemesterID with session var
---
db/StoredFunctions.sql | 10 ----------
~dev_rating/modules/account/classes/Kohana/User.php | 5 +----
.../modules/account/classes/Model/Kohana/Account.php | 11 -----------
3 files changed, 1 insertion(+), 25 deletions(-)
diff --git a/db/StoredFunctions.sql b/db/StoredFunctions.sql
index 9d0f14d1f..c68a57783 100644
--- a/db/StoredFunctions.sql
+++ b/db/StoredFunctions.sql
@@ -243,16 +243,6 @@ END //
# Label: semesters
# -------------------------------------------------------------------------------------------
-# TODO: deprecated
-# set current(for user) semester, life time - db session
-DROP FUNCTION IF EXISTS SetSemesterID//
-CREATE FUNCTION `SetSemesterID` (`pSemesterID` INT) RETURNS int(11)
- NO SQL
-BEGIN
- SET @CurrentSemesterID := pSemesterID;
- RETURN 0;
-END //
-
# -------------------------------------------------------------------------------------------
diff --git a/~dev_rating/modules/account/classes/Kohana/User.php b/~dev_rating/modules/account/classes/Kohana/User.php
index 399673809..9bafaa44f 100644
--- a/~dev_rating/modules/account/classes/Kohana/User.php
+++ b/~dev_rating/modules/account/classes/Kohana/User.php
@@ -82,10 +82,7 @@ class Kohana_User implements ArrayAccess
}
public function SetSemester($semesterID) {
- $res = $this->_model->SetSemesterID($semesterID);
- if ($res >= 0) {
- $this->_session->set("SemesterID", "$semesterID");
- }
+ $this->_session->set("SemesterID", "$semesterID");
}
diff --git a/~dev_rating/modules/account/classes/Model/Kohana/Account.php b/~dev_rating/modules/account/classes/Model/Kohana/Account.php
index b6c73ea93..a76778ca0 100644
--- a/~dev_rating/modules/account/classes/Model/Kohana/Account.php
+++ b/~dev_rating/modules/account/classes/Model/Kohana/Account.php
@@ -242,15 +242,4 @@ class Model_Kohana_Account extends Model
return $id;
}
- public function SetSemesterID($semesterID)
- {
- $sql = "SELECT `SetSemesterID`('$semesterID') AS `Num`; ";
- $res = DB::query(Database::SELECT, $sql)->execute();
-
- $id = 0;
- foreach ($res as $value) {
- $id = $value['Num'];
- }
- return $id;
- }
}
\ No newline at end of file
--
GitLab