blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 20:29:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modified: Now user gets back error message if upload failes

Browse Source 
...instead of hard program exit

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
This commit is contained in:
Cris
2021-04-01 13:57:18 +02:00
committed by cris-technikum
parent 7fab658954
commit fdf53ea3eb
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/lehre/anrechnung/RequestAnrechnung.php
+18 -18
View File
@@ -113,8 +113,10 @@ class requestAnrechnung extends Auth_Controller
return $this->outputJsonError($this->p->t('ui', 'errorUploadFehlt'));
}
if (isEmptyString($begruendung_id) || isEmptyString($anmerkung) ||
isEmptyString($lehrveranstaltung_id) || isEmptyString($studiensemester_kurzbz))
if (isEmptyString($begruendung_id) ||
isEmptyString($anmerkung) ||
isEmptyString($lehrveranstaltung_id) ||
isEmptyString($studiensemester_kurzbz))
{
return $this->outputJsonError($this->p->t('ui', 'errorFelderFehlen'));
}
@@ -143,7 +145,15 @@ class requestAnrechnung extends Auth_Controller
}
// Upload document
$lastInsert_dms_id = self::_uploadFile();
$result = self::_uploadFile();
if (isError($result))
{
return $this->outputJsonError($result->retval);
}
// Store just inserted DMS ID
$lastInsert_dms_id = $result->retval['dms_id'];
// Start DB transaction
$this->db->trans_start(false);
@@ -159,7 +169,7 @@ class requestAnrechnung extends Auth_Controller
'insertvon' => $this->_uid
));
// Save Anrechnungstatus 'inProgressSTGL'
// Save Anrechnungstatus
$this->AnrechnungModel->saveAnrechnungstatus($result->retval, self::ANRECHNUNGSTATUS_PROGRESSED_BY_STGL);
// Transaction complete
@@ -293,14 +303,8 @@ class requestAnrechnung extends Auth_Controller
return $studiensemester_kurzbz == $actual_ss;
}
private function _uploadFile(){
if (empty($_FILES['uploadfile']['name']))
{
show_error('Missing upload file');
}
// Upload document
private function _uploadFile()
{
$dms = array(
'kategorie_kurzbz' => 'anrechnung',
'version' => 0,
@@ -310,11 +314,7 @@ class requestAnrechnung extends Auth_Controller
'insertvon' => $this->_uid
);
if (isError($uploaddata = $this->dmslib->upload($dms, array('pdf'))))
{
show_error(getError($uploaddata));
}
return $uploaddata->retval['dms_id'];
// Upload document
return $this->dmslib->upload($dms, array('pdf'));
}
}