blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-16 06:22:18 +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:
Paolo
2019-06-05 13:57:31 +02:00
parent 6b17dbca52 57102409c9
commit 0aec9ee694
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/private/lehre/pruefung/pruefung.js.php
+4 -4
View File
@@ -590,11 +590,11 @@ function saveAnmeldung(lehrveranstaltung_id, termin_id)
success: function(data){
if(data.error === 'false')
{
messageBox("message", data.result, "green", "highlight", 1000);
messageBox("message", data.result, "green", "highlight", 10000);
}
else
{
messageBox("message", data.errormsg, "red", "highlight", 1000);
messageBox("message", data.errormsg, "red", "highlight", 10000);
}
resetForm();
@@ -635,11 +635,11 @@ function stornoAnmeldung(pruefungsanmeldung_id)
success: function(data){
if(data.error === 'false')
{
messageBox("message", data.result, "green", "highlight", 1000);
messageBox("message", data.result, "green", "highlight", 10000);
}
else
{
messageBox("message", data.errormsg, "red", "highlight", 1000);
messageBox("message", data.errormsg, "red", "highlight", 10000);
}
refresh();
cis/private/profile/index.php
+1 -1
View File
@@ -327,7 +327,7 @@ if ($type == 'student' && (!defined('CIS_PROFIL_STUDIENINFORMATION_ANZEIGEN') ||
".$p->t('global/gruppe').": $user->gruppe ".($user->gruppe!=' '?"<a href='#' onClick='javascript:window.open(\"../stud_in_grp.php?kz=$user->studiengang_kz&sem=$user->semester&verband=$user->verband&grp=$user->gruppe\",\"_blank\",\"width=600,height=500,location=no,menubar=no,status=no,toolbar=no,scrollbars=yes, resizable=1\");return false;'>".$p->t('benotungstool/liste')."</a>":"")."<br>";
if ($user->studiengang_kz<10000)
echo $p->t('profil/martrikelnummer').": $user->matrikelnr<br />";
echo $p->t('global/personenkennzeichen').": $user->matrikelnr<br />";
}
if ($type == 'mitarbeiter')