Merge branch 'dev/maquinas_defecto' into 'main'

Añadida funcionalidad maquinas por defecto

See merge request jjimenez/safekat!30
This commit is contained in:
2023-07-13 10:10:24 +00:00
30 changed files with 1172 additions and 37 deletions

View File

@ -83,9 +83,8 @@ class Tarifaacabado extends \App\Controllers\GoBaseResourceController
$sanitizedData = $this->sanitized($postData, $nullIfEmpty);
// JJO
if (isset($this->model->user_update_id)) {
$sanitizedData['user_created_id'] = $session->id_user;
}
$sanitizedData['user_created_id'] = $session->id_user;
$noException = true;
if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :
@ -166,9 +165,8 @@ class Tarifaacabado extends \App\Controllers\GoBaseResourceController
$sanitizedData = $this->sanitized($postData, $nullIfEmpty);
// JJO
if (isset($this->model->user_update_id)) {
$sanitizedData['user_update_id'] = $session->id_user;
}
$sanitizedData['user_updated_id'] = $session->id_user;
$noException = true;
if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) :

View File

@ -136,8 +136,8 @@ class Tarifapreimpresion extends \App\Controllers\GoBaseController {
$sanitizedData = $this->sanitized($postData, $nullIfEmpty);
// JJO
if(isset($this->model->user_update_id)){
$sanitizedData['user_update_id'] = $session->id_user;
if(isset($this->model->user_updated_id)){
$sanitizedData['user_updated_id'] = $session->id_user;
}
$noException = true;

View File

@ -80,7 +80,7 @@ class Tarifasmanipulado extends \App\Controllers\GoBaseResourceController {
$sanitizedData = $this->sanitized($postData, $nullIfEmpty);
// JJO
if(isset($this->model->user_update_id)){
if(isset($this->model->user_updated_id)){
$sanitizedData['user_created_id'] = $session->id_user;
}
@ -162,7 +162,7 @@ class Tarifasmanipulado extends \App\Controllers\GoBaseResourceController {
$sanitizedData = $this->sanitized($postData, $nullIfEmpty);
// JJO
if(isset($this->model->user_update_id)){
if(isset($this->model->user_updated_id)){
$sanitizedData['user_updated_id'] = $session->id_user;
}