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

Merge branch 'feature-4998/FHC-IDAM_REST_Schnittstelle_zum_Setzen_des_Aktivierungscodes' into feature-5128/FHC-IDAM_account_activation

Browse Source
This commit is contained in:
Paolo
2019-12-11 18:55:10 +01:00
parent 6e89a917ae 64976c31df
commit 14e54ea48c
33 changed files with 1332 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/organisation/studienjahrEdit.php
+1 -1
View File
@@ -7,7 +7,7 @@ $this->load->view('templates/header', array('title' => 'StudienjahrEdit', 'jquer
<div class="row">
<div class="span4">
<h2>Studienjahr bearbeiten: <?php echo $jahr->studienjahr_kurzbz; ?></h2>
<form method="post" action="<?php echo site_url("organisation/studienjahr/saveStudienjahr"); ?>">
<form method="post" action="<?php echo site_url("organisation/studienjahr/updateStudienjahr"); ?>">
<table>
<?php include('studienjahrForm.php'); ?>
application/views/organisation/studiensemesterEdit.php
+1 -1
View File
@@ -8,7 +8,7 @@ $this->load->view('templates/header', array('title' => 'StudiensemesterEdit', 'd
<div class="span4">
<h2>Studiensemester bearbeiten: <?php echo $sem->studiensemester_kurzbz; ?></h2>
<form method="post"
action="<?php echo site_url("organisation/studiensemester/saveStudiensemester") ?>">
action="<?php echo site_url("organisation/studiensemester/updateStudiensemester") ?>">
<table>
<?php include('studiensemesterForm.php'); ?>
<input type="hidden" name="semkurzbz" value="<?php echo $sem->studiensemester_kurzbz; ?>"/>
application/views/system/infocenter/infocenterData.php
+1 -1
View File
@@ -394,7 +394,7 @@
if ($datasetRaw->OnholdDate != null)
{
$mark = "text-success";
$mark = "onhold";
}
// Parking has priority over locking
application/views/system/infocenter/infocenterFreigegebenData.php
+1
View File
@@ -206,6 +206,7 @@
FROM public.tbl_prestudent ps
JOIN public.tbl_studiengang sg USING(studiengang_kz)
WHERE ps.person_id = p.person_id
AND ps.reihungstestangetreten = FALSE
AND (sg.typ IN ('.$STUDIENGANG_TYP.')
OR
sg.studiengang_kz in('.$ADDITIONAL_STG.')