1
0
mirror of https://github.com/devcode-it/openstamanager.git synced 2025-06-05 22:09:38 +02:00

Miglioramento condizione per visualizzazione record eliminati

This commit is contained in:
loviuz
2021-03-19 18:18:16 +01:00
parent e86f4f7d62
commit f2617f95e8

View File

@@ -39,9 +39,21 @@ if (!empty($id_record)) {
]); ]);
Util\Query::setSegments(true); Util\Query::setSegments(true);
} }
// Replace automatico del campo deleted_at se non specifico a una tabella // Rimozione della condizione deleted_at IS NULL per visualizzare anche i record eliminati
if (!string_contains($query, '.`deleted_at`') && !string_contains($query, '.deleted_at')) { if (preg_match('/[`]*([a-z0-9_]*)[`]*[\.]*([`]*deleted_at[`]* IS NULL)/i', $query, $m)) {
$query = str_replace(['AND `deleted_at` IS NULL', '`deleted_at` IS NULL AND', '`deleted_at` IS NULL', 'AND deleted_at IS NULL', 'deleted_at IS NULL AND', 'deleted_at IS NULL'], '', $query); $conditions_to_remove = [];
$condition = trim($m[0]);
if (!empty($table_name)) {
$condition = $table_name.'.'.$condition;
}
$conditions_to_remove[] = ' AND '.$condition;
$conditions_to_remove[] = $condition.' AND ';
$query = str_replace( $conditions_to_remove, '', $query);
$query = str_replace( $condition, '', $query);
} }
$has_access = !empty($query) ? $dbo->fetchNum($query) !== 0 : true; $has_access = !empty($query) ? $dbo->fetchNum($query) !== 0 : true;
@@ -155,7 +167,7 @@ if (empty($record) || !$has_access) {
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
$("#restore").click(function(){ $("#restore, #restore-close").click(function(){
$("input[name=op]").attr("value", "restore"); $("input[name=op]").attr("value", "restore");
$("#submit").trigger("click"); $("#submit").trigger("click");
}) })
@@ -176,7 +188,7 @@ if (empty($record) || !$has_access) {
{( "name": "button", "type": "email", "id_module": "'.$id_module.'", "id_plugin": "'.$id_plugin.'", "id_record": "'.$id_record.'" )} {( "name": "button", "type": "email", "id_module": "'.$id_module.'", "id_plugin": "'.$id_plugin.'", "id_record": "'.$id_record.'" )}
<div class="btn-group" id="save-buttons"> <div class="btn-group" id="save-buttons">
<a class="btn btn-success" id="save"> <a class="btn btn-success" id="'.(!empty($record['deleted_at']) ? 'restore' : 'save').'">
<i class="fa fa-'.(!empty($record['deleted_at']) ? 'undo' : 'check').'"></i> '.(!empty($record['deleted_at']) ? tr('Salva e ripristina') : tr('Salva')).' <i class="fa fa-'.(!empty($record['deleted_at']) ? 'undo' : 'check').'"></i> '.(!empty($record['deleted_at']) ? tr('Salva e ripristina') : tr('Salva')).'
</a> </a>
<a type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -184,7 +196,7 @@ if (empty($record) || !$has_access) {
<span class="sr-only">Toggle Dropdown</span> <span class="sr-only">Toggle Dropdown</span>
</a> </a>
<ul class="dropdown-menu dropdown-menu-right"> <ul class="dropdown-menu dropdown-menu-right">
<li><a href="#" id="save-close"> <li><a href="#" id="'.(!empty($record['deleted_at']) ? 'restore' : 'save').'-close">
<i class="fa fa-'.(!empty($record['deleted_at']) ? 'undo' : 'check').'"></i> <i class="fa fa-'.(!empty($record['deleted_at']) ? 'undo' : 'check').'"></i>
'.(!empty($record['deleted_at']) ? tr('Ripristina e chiudi') : tr('Salva e chiudi')).' '.(!empty($record['deleted_at']) ? tr('Ripristina e chiudi') : tr('Salva e chiudi')).'
</a></li> </a></li>