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

Merge branch 'main' into 'dev/proveedores'

Browse Source 
# Conflicts:
#   ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/_maquinaFormItems.php
This commit is contained in:
Jaime Jimenez Ortega
2023-07-15 10:13:37 +00:00
parent 2fca432213 87ff336d30
commit 63dc8cee6a
21 changed files with 895 additions and 590 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ci4/app/Controllers/Configuracion/Maquinas.php
View File

@ -38,6 +38,12 @@ class Maquinas extends \App\Controllers\GoBaseResourceController {
$this->viewData = ['usingServerSideDataTable' => true]; // JJO
// Breadcrumbs (IMN)
$this->viewData['breadcrumb'] = [
['title' => lang("App.menu_configuration"), 'route' => "", 'active' => false],
['title' => lang("App.menu_maquina"), 'route' => site_url('configuracion/maquinas'), 'active' => true]
];
parent::initController($request, $response, $logger);
}

2
ci4/app/Controllers/Configuracion/Papelesgenericos.php
View File

@ -40,7 +40,7 @@ class Papelesgenericos extends \App\Controllers\GoBaseResourceController
// Se indica el flag para los ficheros borrados
$this->delete_flag = 1;
// Breadcrumbs
// Breadcrumbs (IMN)
$this->viewData['breadcrumb'] = [
['title' => lang("App.menu_configuration"), 'route' => "", 'active' => false],
['title' => lang("App.menu_papelgenerico"), 'route' => site_url('configuracion/papelesgenericos'), 'active' => true]