Merge branch 'hotfix/v2.5.5'

db/postgresql/hotfix_2_5_5.sql

+drop function if exists public.findgroup(pgradeid integer, pgroupnum integer, pfacultyid integer, pformid integer);
+CREATE OR REPLACE FUNCTION public.findgroup(pgradeid integer, pgroupnum integer, pfacultyid integer, pformid integer)
+  RETURNS integer
+LANGUAGE plpgsql
+AS $function$
+begin
+
+  RETURN COALESCE((
+                    SELECT study_groups.ID FROM study_groups
+                    WHERE   study_groups.GradeID = pGradeID
+                            AND study_groups.GroupNum = pGroupNum
+                            AND study_groups.FacultyID = pFacultyID
+                    AND study_groups.formid = pFormID
+                    LIMIT 1
+                  ), -1);
+END
+$function$;
\ No newline at end of file

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

@@ -31,12 +31,12 @@ class Model_Group extends Model
     }
 
     public static function find($gradeID, $groupNum, $formID, $facultyID) {
-        $sql = 'SELECT * FROM FindGroup(:gradeID, :groupNum, :form, :facultyID) AS "ID"';
+        $sql = 'SELECT * FROM FindGroup(:gradeID, :groupNum, :facultyID, :form ) AS "ID"';
         $id = DB::query(Database::SELECT, $sql)
             ->param(':gradeID', $gradeID)
             ->param(':groupNum', (int)$groupNum)
-            ->param(':form', $formID)
             ->param(':facultyID', $facultyID)
+            ->param(':form', $formID)
             ->execute()->get('ID');
         if ($id <= 0) {
             return null;