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

VorlageLib->loadVorlagetext now is searching for a parent template

Browse Source 
without the orgform parameter
This commit is contained in:
bison-paolo
2017-01-24 15:43:36 +01:00
parent 31b26cf850
commit cfc34e91e1
1 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/VorlageLib.php
+30 -24
View File
@@ -101,31 +101,7 @@ class VorlageLib
{
if (empty($vorlage_kurzbz))
return error($this->ci->lang->line('fhc_'.FHC_INVALIDID, false));
// Builds where clause
$where = "vorlage_kurzbz=".$this->ci->VorlageModel->escape($vorlage_kurzbz);
if (is_null($orgform_kurzbz))
{
$where .= "AND orgform_kurzbz IS NULL";
}
else
{
$where .= "AND orgform_kurzbz = " . $this->ci->VorlageModel->escape($orgform_kurzbz);
}
$where .= " AND ";
if (is_null($sprache))
{
$where .= "sprache IS NULL";
}
else
{
$where .= "sprache = " . $this->ci->VorlageModel->escape($sprache);
}
$where .= " AND aktiv = true";
// Try to search the template with the given vorlage_kurzbz and other parameters if present
$queryParameters = array("vorlage_kurzbz" => $vorlage_kurzbz, "aktiv" => true);
@@ -146,6 +122,9 @@ class VorlageLib
// If the searched template was not found
if (!hasData($vorlage))
{
// Builds where clause
$where = $this->_where($vorlage_kurzbz, $orgform_kurzbz, $sprache);
$vorlage = $this->ci->organisationseinheitlib->treeSearch(
'public',
'tbl_vorlagestudiengang',
@@ -160,6 +139,33 @@ class VorlageLib
return $vorlage;
}
private function _where($vorlage_kurzbz, $orgform_kurzbz, $sprache)
{
// Builds where clause
$where = "vorlage_kurzbz = ".$this->ci->VorlageModel->escape($vorlage_kurzbz);
// if (is_null($orgform_kurzbz))
// {
// $where .= " AND orgform_kurzbz IS NULL";
// }
// else
// {
// $where .= " AND orgform_kurzbz = " . $this->ci->VorlageModel->escape($orgform_kurzbz);
// }
if (is_null($sprache))
{
$where .= " AND sprache IS NULL";
}
else
{
$where .= " AND sprache = " . $this->ci->VorlageModel->escape($sprache);
}
$where .= " AND aktiv = true";
return $where;
}
/**
* insertVorlagetext() - will load tbl_vorlagestudiengang for a spezific Template.