Merge branch 'master' into permissions

This commit is contained in:
Paolo
2018-06-28 14:52:09 +02:00
72 changed files with 655 additions and 381 deletions
@@ -24,9 +24,6 @@ class CheckUserAuth extends REST_Controller
public function __construct()
{
parent::__construct();
// Loads the authentication library
$this->load->library('AuthLib');
}
/**
+1 -1
View File
@@ -13,7 +13,7 @@ class Test extends REST_Controller
{
parent::__construct();
// Loads return messages
// Loads helper message to manage returning messages
$this->load->helper('message');
}
@@ -23,7 +23,7 @@ class Gemeinde extends APIv1_Controller
{
parent::__construct(array('Gemeinde' => 'basis/gemeinde:rw', 'GemeindeByPlz' => 'basis/gemeinde:r'));
// Load model GemeindeModel
$this->load->model("codex/gemeinde_model", "GemeindeModel");
$this->load->model('codex/gemeinde_model', 'GemeindeModel');
}
/**
@@ -23,7 +23,7 @@ class RtPerson extends APIv1_Controller
{
parent::__construct(array('RtPerson' => 'basis/rtperson:rw'));
// Load model StatusModel
$this->load->model("crm/RtPerson_model", "RtPersonModel");
$this->load->model('crm/RtPerson_model', 'RtPersonModel');
}
/**
@@ -29,7 +29,7 @@ class Studienplan extends APIv1_Controller
)
);
// Load model PersonModel
$this->load->model("organisation/studienplan_model", "StudienplanModel");
$this->load->model('organisation/studienplan_model', 'StudienplanModel');
}
public function getStudienplan()
@@ -23,7 +23,7 @@ class Ort extends APIv1_Controller
{
parent::__construct(array('Ort' => 'basis/ort:rw', 'All' => 'basis/ort:r'));
// Load model OrtModel
$this->load->model("ressource/ort_model", "OrtModel");
$this->load->model('ressource/ort_model', 'OrtModel');
}
/**