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/papelimp_tip3'

Browse Source 
# Conflicts:
#   ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionForm.php
This commit is contained in:
Jaime Jimenez Ortega
2023-06-12 07:43:28 +00:00
parent 4ca43ad7ef 1e228f3d67
commit f10226606c
51 changed files with 3122 additions and 1092 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ci4/app/Config/Routes.php
View File

@ -29,6 +29,7 @@ $routes->setAutoRoute(true);
//------------------------------------------------------------------
$routes->get('/', 'Home::index');
$routes->get('lang/{locale}', 'Language::index');
$routes->get('viewmode/(:alpha)', 'Viewmode::index/$1');
//API ROUTER ------------------------------------------------------
//------------------------------------------------------------------
@ -76,7 +77,7 @@ $routes->group('tarifaacabado', ['namespace' => 'App\Controllers\Tarifas'], func
$routes->post('menuitems', 'Tarifaacabado::menuItems', ['as' => 'menuItemsOfTarifasacabado']);
});
$routes->group('users', ['namespace' => 'App\Controllers\Usuarios'], function ($routes) {
$routes->group('users', ['namespace' => 'App\Controllers\Configuracion'], function ($routes) {
$routes->get('', 'Users::index', ['as' => 'userList']);
$routes->get('index', 'Users::index', ['as' => 'userIndex']);
$routes->get('list', 'Users::index', ['as' => 'userList2']);
@ -89,7 +90,7 @@ $routes->group('users', ['namespace' => 'App\Controllers\Usuarios'], function ($
$routes->post('menuitems', 'Users::menuItems', ['as' => 'menuItemsOfUsers']);
});
$routes->group('group', ['namespace' => 'App\Controllers\Usuarios'], function ($routes) {
$routes->group('group', ['namespace' => 'App\Controllers\Configuracion'], function ($routes) {
$routes->get('', 'Group::index', ['as' => 'userGroupList']);
$routes->get('index', 'Group::index', ['as' => 'groupIndex']);
$routes->post('edit/(:num)', 'Group::edit/$1', ['as' => 'updateGroup']);