From 40439b532fe589965873a1cb68d01dcf952ffe55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Jim=C3=A9nez?= Date: Tue, 3 Jun 2025 13:41:52 +0200 Subject: [PATCH 1/2] =?UTF-8?q?arreglada=20la=20comprobaci=C3=B3n=20de=20p?= =?UTF-8?q?=C3=A1ginas=20y=20tirada=20cuando=20se=20a=C3=B1ade=20un=20pres?= =?UTF-8?q?upuesto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ci4/app/Language/es/Presupuestos.php | 1 + ci4/app/Models/Presupuestos/PresupuestoModel.php | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/ci4/app/Language/es/Presupuestos.php b/ci4/app/Language/es/Presupuestos.php index ac209861..dde98be6 100755 --- a/ci4/app/Language/es/Presupuestos.php +++ b/ci4/app/Language/es/Presupuestos.php @@ -395,6 +395,7 @@ return [ 'gramaje_interior' => 'Seleccione el gramaje', 'pais' => 'Debe seleccionar un país', 'integer_greatherThan_0' => 'Número entero > 0 requerido', + 'greater_than_0' => 'El campo {field} debe ser mayor que 0', 'tirada_no_valida' => "Tirada no valida", 'sin_gramaje' => "Seleccione gramaje", 'tipo_cubierta' => 'Seleccione tipo de cubierta', diff --git a/ci4/app/Models/Presupuestos/PresupuestoModel.php b/ci4/app/Models/Presupuestos/PresupuestoModel.php index dc594bae..69c2a034 100755 --- a/ci4/app/Models/Presupuestos/PresupuestoModel.php +++ b/ci4/app/Models/Presupuestos/PresupuestoModel.php @@ -151,6 +151,14 @@ class PresupuestoModel extends \App\Models\BaseModel public static $labelField = "titulo"; protected $validationRulesAdd = [ + "tirada" => [ + "label" => "Presupuestos.tirada", + "rules" => "required|integer|greater_than[0]", + ], + "paginas" => [ + "label" => "Presupuestos.paginas", + "rules" => "required|integer|greater_than[0]", + ], "autor" => [ "label" => "Presupuestos.autor", "rules" => "trim|max_length[150]", @@ -190,6 +198,12 @@ class PresupuestoModel extends \App\Models\BaseModel ]; protected $validationMessagesAdd = [ + "tirada" => [ + "greater_than" => "Presupuestos.validation.greater_than_0", + ], + "paginas" => [ + "greater_than" => "Presupuestos.validation.greater_than_0", + ], "autor" => [ "max_length" => "Presupuestos.validation.max_length", "required" => "Presupuestos.validation.requerido", From c5dc026c33b3e673150576420bd9a486e25a0f86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Jim=C3=A9nez?= Date: Tue, 3 Jun 2025 15:17:11 +0200 Subject: [PATCH 2/2] resuelto el problema de que los clientes veian todos los tickets --- ci4/app/Controllers/Soporte/Ticketcontroller.php | 2 +- httpdocs/assets/js/safekat/components/table.js | 2 +- httpdocs/assets/js/safekat/pages/soporte/tickets.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci4/app/Controllers/Soporte/Ticketcontroller.php b/ci4/app/Controllers/Soporte/Ticketcontroller.php index 22bb77b8..33d0c28f 100755 --- a/ci4/app/Controllers/Soporte/Ticketcontroller.php +++ b/ci4/app/Controllers/Soporte/Ticketcontroller.php @@ -278,7 +278,7 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController $searchValues = get_filter_datatables_columns($reqData); - if (auth()->user()->can('tickets.edit')) { + if (auth()->user()->can('tickets.edit') && auth()->user()->inGroup('admin')) { $user_id = null; } else { $user_id = auth()->user()->id; diff --git a/httpdocs/assets/js/safekat/components/table.js b/httpdocs/assets/js/safekat/components/table.js index 38b26295..4e662ad1 100644 --- a/httpdocs/assets/js/safekat/components/table.js +++ b/httpdocs/assets/js/safekat/components/table.js @@ -93,7 +93,7 @@ let Table = function ( autoWidth: true, responsive: true, scrollX: true, - stateSave: false, + stateSave: true, lengthMenu: [5, 10, 25, 50, 75, 100, 250, 500, 1000, 2500], order: order, orderCellsTop: true, diff --git a/httpdocs/assets/js/safekat/pages/soporte/tickets.js b/httpdocs/assets/js/safekat/pages/soporte/tickets.js index e7acfdbe..7aa53d99 100644 --- a/httpdocs/assets/js/safekat/pages/soporte/tickets.js +++ b/httpdocs/assets/js/safekat/pages/soporte/tickets.js @@ -259,7 +259,7 @@ class Ticket { selectorPrioridad.append(''); // Opción vacía selectorPrioridad.append(''); selectorPrioridad.append(''); - selectorPrioridad.append(''); + selectorPrioridad.append(''); selectorPrioridad.on('change', function () { var val = $.fn.dataTable.util.escapeRegex(