ifl/iflrandevu
1
1
Fork 0
forked from mirrors/easyappointments
Code Issues 6 Pull requests Releases 3 Activity

Add missing field filtering and the optional model method

Browse source
This commit is contained in:
Alex Tselegidis 2023-01-14 09:38:49 +01:00
parent 71fa900ea7
commit 2e3e766f73
3 changed files with 85 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
application/controllers/Providers.php
View file

@ -155,6 +155,17 @@ class Providers extends EA_Controller {
'services', 'services',
]); ]);
$this->providers_model->only($provider['settings'], [
'username',
'password',
'notifications',
'calendar_view'
]);
$this->providers_model->optional($provider, [
'services' => [],
]);
$provider_id = $this->providers_model->save($provider); $provider_id = $this->providers_model->save($provider);
$provider = $this->providers_model->find($provider_id); $provider = $this->providers_model->find($provider_id);
@ -206,6 +217,10 @@ class Providers extends EA_Controller {
'services', 'services',
]); ]);
$this->providers_model->optional($provider, [
'services' => [],
]);
$provider_id = $this->providers_model->save($provider); $provider_id = $this->providers_model->save($provider);
$provider = $this->providers_model->find($provider_id); $provider = $this->providers_model->find($provider_id);

62
application/controllers/Secretaries.php
View file

@ -136,6 +136,36 @@ class Secretaries extends EA_Controller {
$secretary = request('secretary'); $secretary = request('secretary');
$this->secretaries_model->only($secretary, [
'first_name',
'last_name',
'email',
'alt_number',
'phone_number',
'address',
'city',
'state',
'zip_code',
'notes',
'timezone',
'language',
'is_private',
'id_roles',
'settings',
'secretaries',
]);
$this->secretaries_model->only($secretary['settings'], [
'username',
'password',
'notifications',
'calendar_view'
]);
$this->secretaries_model->optional($secretary, [
'providers' => [],
]);
$secretary_id = $this->secretaries_model->save($secretary); $secretary_id = $this->secretaries_model->save($secretary);
$secretary = $this->secretaries_model->find($secretary_id); $secretary = $this->secretaries_model->find($secretary_id);
@ -167,6 +197,38 @@ class Secretaries extends EA_Controller {
$secretary = request('secretary'); $secretary = request('secretary');
$this->secretaries_model->only($secretary, [
'id',
'first_name',
'last_name',
'email',
'alt_number',
'phone_number',
'address',
'city',
'state',
'zip_code',
'notes',
'timezone',
'language',
'is_private',
'id_roles',
'settings',
'secretaries',
]);
$this->secretaries_model->only($secretary['settings'], [
'username',
'password',
'notifications',
'calendar_view'
]);
$this->secretaries_model->optional($secretary, [
'providers' => [],
]);
$secretary_id = $this->secretaries_model->save($secretary); $secretary_id = $this->secretaries_model->save($secretary);
$secretary = $this->secretaries_model->find($secretary_id); $secretary = $this->secretaries_model->find($secretary_id);

14
application/core/EA_Model.php
View file

@ -195,19 +195,21 @@ class EA_Model extends CI_Model {
*/ */
public function optional(array &$record, array $fields) public function optional(array &$record, array $fields)
{ {
$sanitize = function ($field) use (&$record) {
return $record[$field] ?? NULL;
};
if (is_assoc($record)) if (is_assoc($record))
{ {
$record = array_map($sanitize, $fields); foreach ($fields as $field => $default)
{
$record[$field] = $record[$field] ?? $default;
}
} }
else else
{ {
foreach ($record as &$record_item) foreach ($record as &$record_item)
{ {
$record_item = array_map($sanitize, $fields); foreach ($fields as $field => $default)
{
$record_item[$field] = $record_item[$field] ?? $default;
}
} }
} }
} }