From e286e70b0b8e387895884b9e09af2d2f83143596 Mon Sep 17 00:00:00 2001 From: Stefan Puraner Date: Thu, 31 Mar 2016 10:05:20 +0200 Subject: [PATCH 1/3] changed default values of column lvinfo and benotung --- system/dbupdate_3.2.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/dbupdate_3.2.php b/system/dbupdate_3.2.php index 34324ab7d..5f78a37b4 100755 --- a/system/dbupdate_3.2.php +++ b/system/dbupdate_3.2.php @@ -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 'lehre.tbl_lehrveranstaltung: ' . $db->db_last_error() . '
'; @@ -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 'lehre.tbl_lehrveranstaltung: ' . $db->db_last_error() . '
'; From 093c70eeb46da0d64cbd344e15a14ca0d335e361 Mon Sep 17 00:00:00 2001 From: Stefan Puraner Date: Thu, 31 Mar 2016 11:57:50 +0200 Subject: [PATCH 2/3] fixed bugs --- include/lehrveranstaltung.class.php | 2 +- include/studienplan.class.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/lehrveranstaltung.class.php b/include/lehrveranstaltung.class.php index 2173a1b23..6c163e8df 100755 --- a/include/lehrveranstaltung.class.php +++ b/include/lehrveranstaltung.class.php @@ -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) diff --git a/include/studienplan.class.php b/include/studienplan.class.php index 17611725c..61325f6c4 100644 --- a/include/studienplan.class.php +++ b/include/studienplan.class.php @@ -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; } From 9a6cf6ee7ba051225a2b3f47645e72d75489d5d9 Mon Sep 17 00:00:00 2001 From: oesi Date: Fri, 1 Apr 2016 08:08:07 +0200 Subject: [PATCH 3/3] =?UTF-8?q?Fehler=20behoben=20wodurch=20das=20Kopieren?= =?UTF-8?q?=20von=20Studienordnungen=20zu=20Fehlermeldungen=20f=C3=BChrte?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/studienplan.class.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/include/studienplan.class.php b/include/studienplan.class.php index 61325f6c4..9a353eb5c 100644 --- a/include/studienplan.class.php +++ b/include/studienplan.class.php @@ -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 {