jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

arreglados varios fallos de la comprobación del editor (JJO)

Browse Source
This commit is contained in:
Jaime Jiménez
2023-06-16 12:25:09 +02:00
parent 51552bc594
commit 39c69ddd03
7 changed files with 89 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ci4/app/Controllers/Tarifas/Tarifaacabado.php
View File

@ -105,7 +105,8 @@ class Tarifaacabado extends \App\Controllers\GoBaseResourceController {
if ($thenRedirect) :
if (!empty($this->indexRoute)) :
return redirect()->to(route_to($this->indexRoute))->with('sweet-success', $message);
return redirect()->to(route_to('tarifas/tarifaacabado/edit/'.$id))->with('sweet-success', $message);
//return redirect()->to(route_to($this->indexRoute))->with('sweet-success', $message);
else:
return $this->redirect2listView('sweet-success', $message);
endif;

24
ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php
View File

@ -295,12 +295,20 @@ class Tarifaacabadolineas extends \App\Controllers\GoBaseResourceController {
->validator( function($editor, $action, $data){
if ($action === Editor::ACTION_CREATE || $action === Editor::ACTION_EDIT){
foreach ($data['data'] as $pkey => $values ){
$count = $this->model->select('*')
->where(array('tirada_min'=> $values['tirada_min'], 'tirada_max'=> $values['tirada_max'], 'is_deleted'=> 0))
->countAllResults();
if ($count >= 1){
return lang('TarifaAcabadoLineas.validation.duplicated_tirada');
}
// Si no se quiere borrar...
if($data['data'][$pkey]['is_deleted'] != 1)
{
$count = $this->model->select('*')
->where(array( 'tarifa_acabado_id'=> $values['tarifa_acabado_id'],
'tirada_min'=> $values['tirada_min'],
'tirada_max'=> $values['tirada_max'],
'is_deleted'=> 0
))
->countAllResults();
if ($count >= 1){
return lang('TarifaAcabadoLineas.validation.duplicated_tirada');
}
}
}
}
})
@ -329,12 +337,12 @@ class Tarifaacabadolineas extends \App\Controllers\GoBaseResourceController {
->data();
// if unique key is set in DB
if(isset($response['error'])){
/*if(isset($response['error'])){
if(str_contains($response['error'], "tirada_min_tirada_max") &&
str_contains($response['error'], "Duplicate entry ")){
$response['error'] = lang('TarifaAcabadoLineas.validation.duplicated_tirada');
}
}
}*/
$newTokenHash = csrf_hash();
$csrfTokenName = csrf_token();

12
ci4/app/Controllers/Test.php
View File

@ -2,7 +2,7 @@
namespace App\Controllers;
use App\Controllers\Configuracion\Papelesimpresion;
use App\Models\Tarifas\TarifaAcabadoLineaModel;
class Test extends BaseController
{
@ -15,8 +15,14 @@ class Test extends BaseController
public function index()
{
$papel = new Papelesimpresion();
var_dump($papel->datatablePG());
$t_model = new TarifaAcabadoLineaModel();
$count = $t_model->select('*')
->where(array( 'tarifa_acabado_id'=> 13,
'tirada_min'=> 1,
'tirada_max'=> 1,
'is_deleted'=> 0))
->countAllResults();
var_dump($count);
}
}