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

- Create new function getError in helper hlp_return_object_helper that should just returns retval

Browse Source 
- Replace all show_error(getData( with show_error(getError(
- Replace all error($...->retval) with error(getError($...))
- Replace all ->outputJsonError(getData( with ->outputJsonError(getError(
- Replace all show_error($...->retval with show_error(getError($...
- Replace all outputJsonError($...->retval with outputJsonError(getError$...
- Replace all return error($...->retval) with return $...
This commit is contained in:
Paolo
2019-12-18 18:35:19 +01:00
parent 8f3aadd3e2
commit 4e6fc7c607
32 changed files with 174 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/system/Vorlage.php
+9 -9
View File
@@ -49,7 +49,7 @@ class Vorlage extends Auth_Controller
$vorlage = $this->vorlagelib->getVorlageByMimetype($mimetype);
if ($vorlage->error)
show_error($vorlage->retval);
show_error(getError($vorlage));
$data = array (
'mimetype' => $mimetype,
@@ -66,7 +66,7 @@ class Vorlage extends Auth_Controller
$vorlagentext = $this->vorlagelib->getVorlagetextByVorlage($vorlage_kurzbz);
if ($vorlagentext->error)
show_error($vorlagentext->retval);
show_error(getError($vorlagentext));
$data = array (
'vorlage_kurzbz' => $vorlage_kurzbz,
@@ -83,7 +83,7 @@ class Vorlage extends Auth_Controller
$vorlage = $this->vorlagelib->getVorlage($vorlage_kurzbz);
if ($vorlage->error)
show_error($vorlage->retval);
show_error(getError($vorlage));
if (count($vorlage->retval) != 1)
show_error('Nachricht nicht vorhanden! ID: '.$vorlage_kurzbz);
@@ -119,7 +119,7 @@ class Vorlage extends Auth_Controller
$vorlage = $this->vorlagelib->saveVorlage($vorlage_kurzbz, $data);
if ($vorlage->error)
show_error($vorlage->retval);
show_error(getError($vorlage));
$vorlage_kurzbz = $vorlage->retval;
@@ -137,7 +137,7 @@ class Vorlage extends Auth_Controller
$resultOE = $this->OrganisationseinheitModel->loadWhere(array('aktiv' => true, 'oe_parent_kurzbz' => null));
if ($resultOE->error)
show_error($resultOE->retval);
show_error(getError($resultOE));
if (hasData($resultOE))
{
@@ -153,7 +153,7 @@ class Vorlage extends Auth_Controller
$vorlagetext = $this->vorlagelib->insertVorlagetext($data);
if ($vorlagetext->error)
show_error($vorlagetext->retval);
show_error(getError($vorlagetext));
$vorlagestudiengang_id = $vorlagetext->retval;
@@ -170,7 +170,7 @@ class Vorlage extends Auth_Controller
$vorlagetext = $this->vorlagelib->getVorlagetextById($vorlagestudiengang_id);
if ($vorlagetext->error)
show_error($vorlagetext->retval);
show_error(getError($vorlagetext));
$data = $vorlagetext->retval[0];
@@ -254,7 +254,7 @@ class Vorlage extends Auth_Controller
$vorlagetext = $this->vorlagelib->updateVorlagetext($data['vorlagestudiengang_id'], $data);
if ($vorlagetext->error)
show_error($vorlagetext->retval);
show_error(getError($vorlagetext));
redirect('/system/vorlage/editText/'.$data['vorlagestudiengang_id']);
}
@@ -266,7 +266,7 @@ class Vorlage extends Auth_Controller
$vorlagetext = $this->vorlagelib->getVorlagetextById($vorlagestudiengang_id);
if ($vorlagetext->error)
show_error($vorlagetext->retval);
show_error(getError($vorlagetext));
$data = array(
'text' => $this->vorlagelib->parseVorlagetext($vorlagetext->retval[0]->text, $jsonDecodedForm)