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

Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite

Browse Source
This commit is contained in:
Andreas Österreicher
2025-03-27 09:32:59 +01:00
parent b18b3b62a7 f55c309692
commit 392c15da77
18 changed files with 309 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/dbupdate_3.4.php
+2
View File
@@ -61,6 +61,7 @@ require_once('dbupdate_3.4/41134_C4_bookmark_dashboardWidget.php');
require_once('dbupdate_3.4/28575_softwarebereitstellung.php');
require_once('dbupdate_3.4/41150_oe-pfad_db_view.php');
require_once('dbupdate_3.4/44031_stv_favorites.php');
require_once('dbupdate_3.4/37620_reihungslisten.php');
require_once('dbupdate_3.4/40896_kennzeichnung_unruly_person.php');
require_once('dbupdate_3.4/39911_tabulator_in_contentmittitel.php');
require_once('dbupdate_3.4/25999_C4_permission.php');
@@ -72,6 +73,7 @@ require_once('dbupdate_3.4/53903_valorisierung.php');
require_once('dbupdate_3.4/55968_index_anrechnung.php');
require_once('dbupdate_3.4/25999_locale_update.php');
require_once('dbupdate_3.4/55289_pep_fine_tuning.php');
require_once('dbupdate_3.4/55614_perm_verwaltetoe.php');
// *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
echo '<H2>Pruefe Tabellen und Attribute!</H2>';
system/dbupdate_3.4/37620_reihungslisten.php
+13
View File
@@ -0,0 +1,13 @@
<?php
// Added Buchungstyp "StudiengebuehrErhoeht"
if ($result = @$db->db_query("SELECT 1 FROM public.tbl_buchungstyp WHERE buchungstyp_kurzbz = 'KautionDrittStaat';"))
{
if ($db->db_num_rows($result) == 0)
{
$qry = "INSERT INTO public.tbl_buchungstyp (buchungstyp_kurzbz, beschreibung, standardtext, standardbetrag) VALUES ('KautionDrittStaat', 'Kaution', 'Deposit for application, third countries', '-250');";
if (!$db->db_query($qry))
echo '<strong>public.tbl_buchungstyp '.$db->db_last_error().'</strong><br>';
else
echo ' public.tbl_buchungstyp: Added buchungstyp "KautionDrittStaat" <br>';
}
}
system/dbupdate_3.4/55614_perm_verwaltetoe.php
+41
View File
@@ -0,0 +1,41 @@
<?php
/* Copyright (C) 2017 fhcomplete.org
*
* 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 the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Harald Bamberger <[email protected]>,
*
* Beschreibung:
* Permission basis/verwaltet_oe
*/
if (! defined('DB_NAME')) exit('No direct script access allowed');
// Add permission: basis/gehaelter
if($result = @$db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berechtigung_kurzbz = 'basis/verwaltet_oe';"))
{
if($db->db_num_rows($result) == 0)
{
$qry = "INSERT INTO system.tbl_berechtigung(berechtigung_kurzbz, beschreibung) VALUES('basis/verwaltet_oe', 'Rechteinhaberin hat etwas mit der Verwaltung der OE zu tun.');";
if(!$db->db_query($qry))
{
echo '<strong>system.tbl_berechtigung '.$db->db_last_error().'</strong><br>';
}
else
{
echo 'system.tbl_berechtigung: Added permission "basis/verwaltet_oe"<br>';
}
}
}
system/phrasesupdate.php
+106 -4
View File
@@ -38359,7 +38359,7 @@ array(
'insertvon' => 'system'
)
)
),
),
array(
'app' => 'core',
'category' => 'betriebsmittel',
@@ -38379,7 +38379,7 @@ array(
'insertvon' => 'system'
)
)
),
),
array(
'app' => 'core',
'category' => 'betriebsmittel',
@@ -40712,7 +40712,7 @@ array(
)
)
),
array(
array(
'app' => 'core',
'category' => 'mobility',
'phrase' => 'mobility_bearbeiten',
@@ -40733,6 +40733,108 @@ array(
)
),
// FHC4 Phrases Mobility End
// feature-55614 begin
array(
'app' => 'core',
'category' => 'kvp',
'phrase' => 'lvdev_uebersichten',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'LV-Weiterentwicklung Übersichten',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'Course Development Overviews',
'description' => '',
'insertvon' => 'system'
)
)
),
array(
'app' => 'core',
'category' => 'lehre',
'phrase' => 'kompetenzfeld',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'Kompetenzfeld',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'competence field',
'description' => '',
'insertvon' => 'system'
)
)
),
array(
'app' => 'core',
'category' => 'ui',
'phrase' => 'expand_all',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'alle ausklappen',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'expand all',
'description' => '',
'insertvon' => 'system'
)
)
),
array(
'app' => 'core',
'category' => 'ui',
'phrase' => 'collapse_all',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'alle einklappen',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'collapse all',
'description' => '',
'insertvon' => 'system'
)
)
),
array(
'app' => 'core',
'category' => 'lehre',
'phrase' => 'quellkurs',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'Quellkurs',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'Source Course',
'description' => '',
'insertvon' => 'system'
)
)
),
// feature-55614 end
array(
'app' => 'softwarebereitstellung',
'category' => 'global',
@@ -40813,7 +40915,7 @@ array(
)
)
),
array(
array(
'app' => 'softwarebereitstellung',
'category' => 'global',
'phrase' => 'lizenzkategorieKurzbz',