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

Merge master into HEAD

Browse Source 
Conflicts:
	include/dokument_export.class.php
	include/studiengang.class.php
	vilesci/stammdaten/reihungstestverwaltung.php
This commit is contained in:
Paolo
2016-08-18 16:23:11 +02:00
parent 64aa1cfd4f da3409cf1d
commit 40a2b53858
116 changed files with 10682 additions and 5335 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/student/studentDBDML.php
+2 -2
View File
@@ -933,10 +933,10 @@ if(!$error)
{
if($row = $db->db_fetch_object($result))
{
if($row->anzahl<=1)
if($row->anzahl<=1 && !$rechte->isBerechtigt('admin', null, 'suid'))
{
$return = false;
$errormsg = 'Die letzte Rolle darf nicht geloescht werden';
$errormsg = 'Die letzte Rolle kann nur durch den Administrator geloescht werden';
$error = true;
}
}
content/student/studentenoverlay.xul.php
+10
View File
@@ -284,6 +284,14 @@ else
class="sortDirectionIndicator"
sort="rdf:http://www.technikum-wien.at/student/rdf#punkte3" onclick="StudentTreeSort()"/>
<splitter class="tree-splitter"/>
<treecol id="student-treecol-rt_datum" label="RT Datum" flex="1" hidden="true" persist="hidden, width, ordinal"
class="sortDirectionIndicator"
sort="rdf:http://www.technikum-wien.at/student/rdf#rt_datum" onclick="StudentTreeSort()"/>
<splitter class="tree-splitter"/>
<treecol id="student-treecol-rt_anmeldung" label="RT Anmeldung" flex="1" hidden="true" persist="hidden, width, ordinal"
class="sortDirectionIndicator"
sort="rdf:http://www.technikum-wien.at/student/rdf#rt_anmeldung" onclick="StudentTreeSort()"/>
<splitter class="tree-splitter"/>
<treecol id="student-treecol-dual" label="Dual" flex="1" hidden="true" persist="hidden, width, ordinal"
class="sortDirectionIndicator"
sort="rdf:http://www.technikum-wien.at/student/rdf#dual_bezeichnung" onclick="StudentTreeSort()"/>
@@ -344,6 +352,8 @@ else
<treecell label="rdf:http://www.technikum-wien.at/student/rdf#punkte1" />
<treecell label="rdf:http://www.technikum-wien.at/student/rdf#punkte2" />
<treecell label="rdf:http://www.technikum-wien.at/student/rdf#punkte3" />
<treecell label="rdf:http://www.technikum-wien.at/student/rdf#rt_datum" />
<treecell label="rdf:http://www.technikum-wien.at/student/rdf#rt_anmeldung" />
<treecell label="rdf:http://www.technikum-wien.at/student/rdf#dual_bezeichnung" />
<treecell label="rdf:http://www.technikum-wien.at/student/rdf#matr_nr" />
<treecell label="rdf:http://www.technikum-wien.at/student/rdf#studienplan_bezeichnung" />