1
0
mirror of https://github.com/devcode-it/openstamanager.git synced 2025-02-23 06:47:40 +01:00

Migliorie minori

This commit is contained in:
Luca 2019-11-13 19:27:25 +01:00
parent 3f09b3d800
commit e678a9f114
3 changed files with 18 additions and 2 deletions

View File

@ -84,8 +84,8 @@ if (!empty($options) && $options != 'custom' && $options != 'menu') {
echo ' echo '
<div class="nav-tabs-custom"> <div class="nav-tabs-custom">
<ul class="nav nav-tabs nav-justified"> <ul class="nav nav-tabs nav-justified">
<li class="active"><a data-toggle="tab" href="#fields">'.tr('Campi').'</a></li> <li class="active"><a data-toggle="tab" href="#fields">'.tr('Campi').' <span class="badge">'.( $dbo->fetchNum('SELECT * FROM zz_views WHERE id_module='.prepare($record['id']).' ORDER BY `order` ASC')).'</a></li>
<li><a data-toggle="tab" href="#filters">'.tr('Filtri').'</a></li> <li><a data-toggle="tab" href="#filters">'.tr('Filtri').' <span class="badge">'.( $dbo->fetchNum('SELECT * FROM zz_group_module WHERE idmodule='.prepare($record['id']).' ORDER BY `id` ASC')).'</span></a></li>
</ul> </ul>
<div class="tab-content"> <div class="tab-content">

View File

@ -9,6 +9,10 @@ echo '
$num = 0; $num = 0;
$additionals = $dbo->fetchArray('SELECT * FROM zz_group_module WHERE idmodule='.prepare($record['id']).' ORDER BY `id` ASC'); $additionals = $dbo->fetchArray('SELECT * FROM zz_group_module WHERE idmodule='.prepare($record['id']).' ORDER BY `id` ASC');
if (!empty($additionals)){
foreach ($additionals as $num => $additional) { foreach ($additionals as $num => $additional) {
$editable = !($additional['default'] && $enable_readonly); $editable = !($additional['default'] && $enable_readonly);
@ -66,6 +70,15 @@ foreach ($additionals as $num => $additional) {
</div>'; </div>';
} }
}else{
echo '<br>
<div class="alert alert-info">
<i class="fa fa-info-circle"></i>
<b>'.tr('Informazione:').'</b> '.tr('Nessun filtro per questo modulo').'.
</div>';
}
echo ' echo '
</div> </div>

View File

@ -217,6 +217,9 @@ class Backup
$database = database(); $database = database();
$extraction_dir = is_dir($path) ? $path : Zip::extract($path); $extraction_dir = is_dir($path) ? $path : Zip::extract($path);
// TODO: Forzo il log out di tutti gli utenti e ne impedisco il login
// fino a ripristino ultimato
// Rimozione del database // Rimozione del database
$tables = include DOCROOT.'/update/tables.php'; $tables = include DOCROOT.'/update/tables.php';