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

Merge origin/ci into ci

Browse Source
This commit is contained in:
paolo
2016-07-05 16:25:24 +02:00
parent 8e37e85ecc 1590fad8bb
commit c85a406ec6
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/v1/crm/Prestudent.php
+2 -3
View File
@@ -120,7 +120,7 @@ class Prestudent extends APIv1_Controller
{
$this->load->model('crm/RtPerson_model', 'RtPersonModel');
if(isset($ddReihungstest['new']) && $ddReihungstest['new'] === true)
if(isset($ddReihungstest['new']) && $ddReihungstest['new'] == true)
{
// Remove new parameter to avoid DB insert errors
unset($ddReihungstest['new']);
@@ -149,8 +149,7 @@ class Prestudent extends APIv1_Controller
private function _validateAddReihungstest($ddReihungstest = NULL)
{
if (!isset($ddReihungstest['person_id']) || !isset($ddReihungstest['rt_id']) ||
!isset($ddReihungstest['ort_kurzbz']))
if (!isset($ddReihungstest['person_id']) || !isset($ddReihungstest['rt_id']))
{
return false;
}
application/controllers/system/Phrases.php
+1
View File
@@ -135,6 +135,7 @@ class Phrases extends FHC_Controller
{
$phrase_inhalt_id = $this->input->post('phrase_inhalt_id', TRUE);
$data['orgeinheit_kurzbz'] = $this->input->post('oe_kurzbz', TRUE);
$data['orgform_kurzbz'] = $this->input->post('orgform_kurzbz', TRUE);
$data['text'] = $this->input->post('text', TRUE);
$data['description'] = $this->input->post('description', TRUE);
$data['sprache'] = $this->input->post('sprache', TRUE);
application/widgets/orgform_widget.php
+4 -4
View File
@@ -3,11 +3,11 @@
/*
* OrgForm widget
*/
class orgform_widget extends Widget
class orgform_widget extends Widget
{
protected $_htmltagname = 'orgform_kurzbz';
public function display($data)
public function display($data)
{
$this->load->model('codex/Orgform_model', 'OrgFormModel');
$res = $this->OrgFormModel->load();
@@ -33,10 +33,10 @@ class orgform_widget extends Widget
{
$item = array
(
'name' => $obj->orgform_kurzbz.' ('.$obj->bezeichnung.')',
'name' => $obj->orgform_kurzbz.' ('.$obj->bezeichnung.')',
'value' => $obj->orgform_kurzbz
);
if (isset($data['orgform']) && $obj->orgform_kurzbz == $data['orgform'])
if (isset($data['orgform_kurzbz']) && $obj->orgform_kurzbz == $data['orgform_kurzbz'])
$item['selected'] = true;
else
$item['selected'] = false;