Merge branch 'hotfix/v2.7.13'

db/postgresql/issue497_mark_global.sql

@@ -13,3 +13,19 @@ EXCEPTION
         then RETURN -1;
 end
 $function$;
+
+CREATE OR REPLACE FUNCTION public.discipline_setnotglobal(pdisciplineid integer)
+    RETURNS integer
+    LANGUAGE plpgsql
+AS $function$
+BEGIN
+
+    UPDATE disciplines SET isglobal=FALSE
+    WHERE disciplines.id = pdisciplineid;
+
+    RETURN 0;
+EXCEPTION
+    when others
+        then RETURN -1;
+end
+$function$;
\ No newline at end of file

~dev_rating/application/classes/Controller/Api/V0/StudyPlan.php

@@ -83,6 +83,8 @@ class Controller_Api_V0_StudyPlan extends Controller_Handler_Api
             if ($disciplineData->global) {
                 $discipline->setInactive();
                 $discipline->setGlobal();
+            } else {
+                $discipline->setNotGlobal();
             }
         }
 

~dev_rating/application/classes/Model/Discipline.php

@@ -344,6 +344,15 @@ class Model_Discipline extends Model_Container
         return $res;
     }
 
+    public function setNotGlobal() {
+        $sql = 'SELECT * FROM Discipline_setNotGlobal(:discipline) as "Num"';
+        $res =  DB::query(Database::SELECT, $sql)
+            ->parameters([
+                ':discipline' => $this->ID
+            ])->execute()->get("Num");
+        return $res;
+    }
+
     public function setActive() {
         $sql = 'SELECT * FROM Discipline_setActive(:discipline) as "Num"';
         $res =  DB::query(Database::SELECT, $sql)