Merge remote-tracking branch 'origin/master'

This commit is contained in:
Manfred Kindl
2017-11-20 18:32:44 +01:00
11 changed files with 427 additions and 170 deletions
+10 -9
View File
@@ -521,7 +521,7 @@ if(!@$db->db_query("SELECT campus.get_highest_content_version(0)"))
WHERE content_id=i_content_id
ORDER BY version desc
LIMIT 1;
RETURN rec.version;
END;
$_$;
@@ -585,13 +585,6 @@ if ($result = $db->db_query("SELECT 0 FROM pg_class WHERE relname = 'tbl_extensi
else
echo '<br>Created sequence: system.tbl_extensions_id_seq';
// ALTER SEQUENCE system.tbl_extensions_id_seq
$qry = 'ALTER SEQUENCE system.tbl_extensions_id_seq OWNED BY system.tbl_extensions.extension_id;';
if (!$db->db_query($qry))
echo '<strong>system.tbl_extensions_id_seq '.$db->db_last_error().'</strong><br>';
else
echo '<br>Altered sequence system.tbl_extensions_id_seq';
// GRANT SELECT, UPDATE ON SEQUENCE system.tbl_extensions_id_seq TO vilesci;
$qry = 'GRANT SELECT, UPDATE ON SEQUENCE system.tbl_extensions_id_seq TO vilesci;';
if (!$db->db_query($qry))
@@ -613,7 +606,7 @@ if(!@$db->db_query("SELECT 0 FROM system.tbl_extensions WHERE 0 = 1"))
{
$qry = '
CREATE TABLE system.tbl_extensions (
extension_id integer NOT NULL DEFAULT nextval(\'tbl_extensions_id_seq\'::regclass),
extension_id integer NOT NULL DEFAULT NEXTVAL(\'system.tbl_extensions_id_seq\'),
name character varying(128) NOT NULL,
version integer NOT NULL,
description text,
@@ -669,6 +662,13 @@ if(!@$db->db_query("SELECT 0 FROM system.tbl_extensions WHERE 0 = 1"))
echo '<strong>Adding comment to system.tbl_extensions.dependencies: '.$db->db_last_error().'</strong><br>';
else
echo '<br>Added comment to system.tbl_extensions.dependencies';
// ALTER SEQUENCE system.tbl_extensions_id_seq
$qry = 'ALTER SEQUENCE system.tbl_extensions_id_seq OWNED BY system.tbl_extensions.extension_id;';
if (!$db->db_query($qry))
echo '<strong>system.tbl_extensions_id_seq '.$db->db_last_error().'</strong><br>';
else
echo '<br>Altered sequence system.tbl_extensions_id_seq';
}
// UNIQUE INDEX uidx_extensions_name_version
@@ -949,6 +949,7 @@ $tabellen=array(
"system.tbl_cronjob" => array("cronjob_id","server_kurzbz","titel","beschreibung","file","last_execute","aktiv","running","jahr","monat","tag","wochentag","stunde","minute","standalone","reihenfolge","updateamum", "updatevon","insertamum","insertvon","variablen"),
"system.tbl_benutzerrolle" => array("benutzerberechtigung_id","rolle_kurzbz","berechtigung_kurzbz","uid","funktion_kurzbz","oe_kurzbz","art","studiensemester_kurzbz","start","ende","negativ","updateamum", "updatevon","insertamum","insertvon","kostenstelle_id","anmerkung"),
"system.tbl_berechtigung" => array("berechtigung_kurzbz","beschreibung"),
"system.tbl_extensions" => array("extension_id","name","version","description","license","url","core_version","dependencies","enabled"),
"system.tbl_phrase" => array("phrase_id","app","phrase","insertamum","insertvon"),
"system.tbl_phrasentext" => array("phrasentext_id","phrase_id","sprache","orgeinheit_kurzbz","orgform_kurzbz","text","description","insertamum","insertvon"),
"system.tbl_rolle" => array("rolle_kurzbz","beschreibung"),