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

Merge branch 'master' of https://github.com/FH-Complete/FHC-Core

Browse Source
This commit is contained in:
Gerald Raab
2016-04-01 14:00:53 +02:00
parent dac5cd55ad 9a6cf6ee7b
commit 82c85e3ca2
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/lehrveranstaltung.class.php
+1 -1
View File
@@ -1299,7 +1299,7 @@ class lehrveranstaltung extends basis_db
/**
* Generiert die Subtrees des Lehrveranstaltungstrees
*/
protected function getLehrveranstaltungTreeChilds($studienplan_lehrveranstaltung_id)
public function getLehrveranstaltungTreeChilds($studienplan_lehrveranstaltung_id)
{
$childs = array();
foreach ($this->lehrveranstaltungen as $row)
include/studienplan.class.php
+11 -6
View File
@@ -609,8 +609,8 @@ class studienplan extends basis_db
$this->updateamum = $row->updateamum;
$this->updatevon = $row->updatevon;
$this->sort = $row->sort;
$this->curriculum = $row->curriculum;
$this->export = $row->export;
$this->curriculum = $this->db_parse_bool($row->curriculum);
$this->export = $this->db_parse_bool($row->export);
$this->new=false;
return true;
}
@@ -896,12 +896,17 @@ class studienplan extends basis_db
$this->db_add_param($key["ausbildungssemester"]) . '); ';
}
if (!$this->db_query($qry))
if($qry!='')
{
$this->errormsg = 'Fehler beim Speichern des Datensatzes';
return false;
if (!$this->db_query($qry))
{
$this->errormsg = 'Fehler beim Speichern des Datensatzes';
return false;
}
return true;
}
return true;
else
return true;
}
else
{
system/dbupdate_3.2.php
+2 -2
View File
@@ -107,7 +107,7 @@ if(!@$db->db_query("SELECT bewerbung_abgeschicktamum FROM public.tbl_prestudents
//Spalte benotung in lehre.tbl_lehrveranstaltung
if (!$result = @$db->db_query("SELECT benotung FROM lehre.tbl_lehrveranstaltung LIMIT 1;"))
{
$qry = "ALTER TABLE lehre.tbl_lehrveranstaltung ADD COLUMN benotung boolean NOT NULL DEFAULT FALSE;";
$qry = "ALTER TABLE lehre.tbl_lehrveranstaltung ADD COLUMN benotung boolean NOT NULL DEFAULT TRUE;";
if (!$db->db_query($qry))
echo '<strong>lehre.tbl_lehrveranstaltung: ' . $db->db_last_error() . '</strong><br>';
@@ -118,7 +118,7 @@ if (!$result = @$db->db_query("SELECT benotung FROM lehre.tbl_lehrveranstaltung
//Spalte lvinfo in lehre.tbl_lehrveranstaltung
if (!$result = @$db->db_query("SELECT lvinfo FROM lehre.tbl_lehrveranstaltung LIMIT 1;"))
{
$qry = "ALTER TABLE lehre.tbl_lehrveranstaltung ADD COLUMN lvinfo boolean NOT NULL DEFAULT FALSE;";
$qry = "ALTER TABLE lehre.tbl_lehrveranstaltung ADD COLUMN lvinfo boolean NOT NULL DEFAULT TRUE;";
if (!$db->db_query($qry))
echo '<strong>lehre.tbl_lehrveranstaltung: ' . $db->db_last_error() . '</strong><br>';