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 'fix/maquina_form_variantes' into 'main'

Browse Source 
arreglado

See merge request jjimenez/safekat!646
This commit is contained in:
Jaime Jimenez Ortega
2025-04-02 18:42:41 +00:00
parent 2ff4a8fb9d 0a10c91159
commit 5f3bc61a41
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -341,7 +341,7 @@ class Maquinas extends \App\Controllers\BaseResourceController
$onlyActiveOnes = false;
$columns2select = [$reqId ?? 'id', $reqText ?? 'nombre'];
$onlyActiveOnes = false;
$menu = $this->model->getSelect2MenuItems($columns2select, $columns2select[1], $onlyActiveOnes, $searchStr);
$menu = $this->model->getSelect2MenuItems($columns2select, $columns2select[1], $onlyActiveOnes, $searchStr, true);
$nonItem = new \stdClass;
$nonItem->id = '';
$nonItem->text = '- ' . lang('Basic.global.None') . ' -';

2
ci4/app/Views/themes/vuexy/form/configuracion/maquinas/_maquinaFormItems.php
View File

@ -135,7 +135,7 @@
</label>
</div>
</div>
<div id="selectVariante" class="col-md-3" style="display:none">
<div id="selectVariante" class="col-md-3" <?= $maquina->is_padre != true ? 'style="display:none"' : ''; ?>>
<select id="padreId" name="padre_id" class="form-control select2" style="width: 100%;">
<?php if (isset($maquinaList) && is_array($maquinaList) && !empty($maquinaList)) :
foreach ($maquinaList as $k => $v) : ?>