blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 12:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fehler behoben beim Speichern der Sortierung im Studienplan über Vilesci GUI

Browse Source
This commit is contained in:
Andreas Österreicher
2019-09-05 15:51:51 +02:00
parent 934d56c32c
commit 39f63c10df
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/studienplan.class.php
+3 -3
View File
@@ -902,7 +902,7 @@ class studienplan extends basis_db
* @param type $tudienplan_lehrveranstaltung_id * @param type $tudienplan_lehrveranstaltung_id
* @param type $sort * @param type $sort
*/ */
function saveSortierung($studienplan_lehrveranstaltung_id, $sort) function saveSortierung($studienplan_lehrveranstaltung_id = null, $sort = null)
{ {
if($studienplan_lehrveranstaltung_id==NULL) if($studienplan_lehrveranstaltung_id==NULL)
$studienplan_lehrveranstaltung_id = $this->studienplan_lehrveranstaltung_id; $studienplan_lehrveranstaltung_id = $this->studienplan_lehrveranstaltung_id;
@@ -1182,10 +1182,10 @@ class studienplan extends basis_db
public.tbl_studiensemester ON (tbl_studienordnung.gueltigvon = tbl_studiensemester.studiensemester_kurzbz) public.tbl_studiensemester ON (tbl_studienordnung.gueltigvon = tbl_studiensemester.studiensemester_kurzbz)
WHERE WHERE
1=1"; 1=1";
if ($aktiv != '' && ($aktiv == true || $aktiv == false)) if ($aktiv != '' && ($aktiv == true || $aktiv == false))
$qry.=" AND tbl_studienplan.aktiv=".$this->db_add_param($aktiv, FHC_BOOLEAN); $qry.=" AND tbl_studienplan.aktiv=".$this->db_add_param($aktiv, FHC_BOOLEAN);
if ($gueltigInStudiensemester != '') if ($gueltigInStudiensemester != '')
$qry.=" AND tbl_studienplan_semester.studiensemester_kurzbz=".$this->db_add_param($gueltigInStudiensemester); $qry.=" AND tbl_studienplan_semester.studiensemester_kurzbz=".$this->db_add_param($gueltigInStudiensemester);
soap/fhcomplete.php
+11 -9
View File
@@ -1,22 +1,22 @@
<?php <?php
/* /*
* Copyright 2013 fhcomplete.org * Copyright 2013 fhcomplete.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA. * MA 02110-1301, USA.
* *
* *
* Authors: Andreas Österreicher <andreas.oesterreicher@technikum-wien.at> * Authors: Andreas Österreicher <andreas.oesterreicher@technikum-wien.at>
*/ */
@@ -48,7 +48,7 @@ for($i=0;$i<100;$i++)
$parameter[]=null; $parameter[]=null;
else else
$parameter[]=$_REQUEST['parameter_'.$i]; $parameter[]=$_REQUEST['parameter_'.$i];
} }
else else
break; break;
} }
@@ -69,12 +69,13 @@ if(!$wsrecht->isUserAuthorized($uid, $method, $class))
$obj = new $class(); $obj = new $class();
$error=false; $error=false;
// Bei Save Funktionen werden alle Parameter zugewiesen // Bei Save Funktionen werden alle Parameter zugewiesen
if(mb_stristr($method,'save')) if(mb_stristr($method,'save'))
{ {
if(isset($_REQUEST['loaddata']))
$loaddata=json_decode($_REQUEST['loaddata'], true); $loaddata=json_decode($_REQUEST['loaddata'], true);
else
$loaddata=null;
$savedata=json_decode($_REQUEST['savedata'], true); $savedata=json_decode($_REQUEST['savedata'], true);
if(isset($loaddata['method'])) if(isset($loaddata['method']))
@@ -114,6 +115,7 @@ if(mb_stristr($method,'save'))
} }
} }
} }
$return = ''; $return = '';
if(!$error && ($return = call_user_func_array(array($obj, $method), $parameter))) if(!$error && ($return = call_user_func_array(array($obj, $method), $parameter)))
{ {