Skip to content
Snippets Groups Projects
Commit 01bdbc1e authored by Роман Штейнберг's avatar Роман Штейнберг
Browse files

CHG: allow nulls in binding logs to support binding by system (not teacher)

parent 6b919fdc
Branches
Tags
No related merge requests found
......@@ -1018,7 +1018,8 @@ BEGIN
DECLARE EXIT HANDLER FOR SQLEXCEPTION RETURN -3;
# todo: move to php layer
IF NOT InternalIsTeacherBound(pTeacherID, pDisciplineID) OR InternalIsMapLocked(pDisciplineID) THEN
IF (pTeacherID IS NOT NULL AND NOT InternalIsTeacherBound(pTeacherID, pDisciplineID))
OR InternalIsMapLocked(pDisciplineID) THEN
RETURN -1;
END IF;
......@@ -1045,7 +1046,8 @@ CREATE FUNCTION UnbindGroup (
NO SQL
BEGIN
# todo: move to php layer
IF NOT InternalIsTeacherBound(pTeacherID, pDisciplineID) OR InternalIsMapLocked(pDisciplineID) THEN
IF (pTeacherID IS NOT NULL AND NOT InternalIsTeacherBound(pTeacherID, pDisciplineID))
OR InternalIsMapLocked(pDisciplineID) THEN
RETURN -1;
END IF;
......@@ -1070,7 +1072,7 @@ BEGIN
DECLARE EXIT HANDLER FOR SQLEXCEPTION RETURN -1;
# todo: move to php layer
IF NOT InternalIsTeacherBound(pTeacherID, pDisciplineID) THEN
IF pTeacherID IS NOT NULL AND NOT InternalIsTeacherBound(pTeacherID, pDisciplineID) THEN
RETURN -1;
END IF;
......@@ -1110,7 +1112,7 @@ BEGIN
DECLARE EXIT HANDLER FOR SQLEXCEPTION RETURN -1;
# todo: move to php layer
IF NOT InternalIsTeacherBound(pTeacherID, pDisciplineID) THEN
IF pTeacherID IS NOT NULL AND NOT InternalIsTeacherBound(pTeacherID, pDisciplineID) THEN
RETURN -1;
END IF;
......
START TRANSACTION;
ALTER TABLE `logs_binds_groups`
CHANGE COLUMN `TeacherID` `TeacherID` INT(11) NULL;
ALTER TABLE `logs_binds_students`
CHANGE COLUMN `TeacherID` `TeacherID` INT(11) NULL;
COMMIT ;
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment