Skip to content

Commit b55618c

Browse files
author
Tatiana
committed
5.13.60.0
2 parents 7286a58 + bc3b707 commit b55618c

File tree

11 files changed

+83
-24
lines changed

11 files changed

+83
-24
lines changed

‎http/css/main.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎http/js/main.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎totum/commands/CleanSchemaTmpTables.php

+19-16
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
3131
if ($schema = $input->getArgument('schema')) {
3232
}
3333
}
34-
if (empty($schema)){
34+
if (empty($schema)) {
3535
$schema = $Conf->getSchema(true);
3636
}
3737

@@ -48,27 +48,30 @@ static function doSqlWorks(string $schema, ConfParent $Conf)
4848
$plus24 = date_create();
4949
$plus24->modify('-24 hours');
5050

51+
try {
52+
$sql->exec('delete from "' . $schema . '"._tmp_tables where touched<\'' . $plus24->format('Y-m-d H:i') . '\'');
5153

52-
$sql->exec('delete from "'.$schema.'"._tmp_tables where touched<\'' . $plus24->format('Y-m-d H:i') . '\'');
54+
$minusHour = date_create();
55+
$minusHour->modify('-1 hour');
56+
try {
57+
$sql->exec('delete from "' . $schema . '"._services_vars where expire<\'' . $minusHour->format('Y-m-d H:i:s') . '\'');
58+
} catch (\Exception $exception) {
59+
/*if ($exception->getCode() === '42P01') {
5360
54-
$minusHour = date_create();
55-
$minusHour->modify('-1 hour');
56-
try {
57-
$sql->exec('delete from "'.$schema.'"._services_vars where expire<\'' . $minusHour->format('Y-m-d H:i:s') . '\'');
58-
}catch (\Exception $exception){
59-
if($exception->getCode()==='42P01'){
60-
$Services = Services::init($Conf);
61-
$Services->createServicesTable();
61+
}*/
6262
}
63-
}
6463

65-
$minus10 = date_create();
66-
$minus10->modify('-2 hours');
64+
$minus10 = date_create();
65+
$minus10->modify('-2 hours');
6766

68-
$sql->exec('delete from "'.$schema.'"._tmp_tables where table_name SIMILAR TO \'\_%\' AND touched<\''
69-
. $minus10->format('Y-m-d H:i') . '\'');
67+
$sql->exec('delete from "' . $schema . '"._tmp_tables where table_name SIMILAR TO \'\_%\' AND touched<\''
68+
. $minus10->format('Y-m-d H:i') . '\'');
7069

71-
$sql->exec('VACUUM "'.$schema.'"._tmp_tables');
70+
$sql->exec('VACUUM "' . $schema . '"._tmp_tables');
71+
} catch (\Exception $e) {
72+
echo $e->getMessage();
73+
debug_print_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
74+
}
7275
}
7376

7477
}

‎totum/common/Totum.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
*/
2828
class Totum
2929
{
30-
public const VERSION = '5.12.60.0';
30+
public const VERSION = '5.13.60.0';
3131

3232

3333
public const TABLE_CODE_PARAMS = ['row_format', 'table_format', 'on_duplicate', 'default_action'];

‎totum/moduls/install/de.json

+14
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,19 @@
189189
"{{Cycle}}": "Schleife",
190190
"{{DATA}}": "DATEN",
191191
"{{DELETE_FROM_INDEX}}": "AUS DEM INDEX LÖSCHEN",
192+
"{{Daemon_activate}}": "Aktivieren",
193+
"{{Daemon_activation_code}}": "Aktivierungscode",
194+
"{{Daemon_activation_interval}}": "Aktivierungsintervall",
195+
"{{Daemon_code}}": "Daemon-Code",
196+
"{{Daemon_do_it_now}}": "Ausführen",
197+
"{{Daemon_name}}": "Name",
198+
"{{Daemon_pause}}": "Pause",
199+
"{{Daemon_status}}": "Status",
200+
"{{Daemons_ACTIVATE}}": "AKTIVIEREN",
201+
"{{Daemons_DISACTIVATE}}": "DEAKTIVIEREN",
202+
"{{Daemons_DO_IT_NOW}}": "JETZT MACHEN",
203+
"{{Daemons_folder}}": "Dämonen",
204+
"{{Daemons_table}}": "Daemons",
192205
"{{Data_1}}": "Daten 1",
193206
"{{Data_2}}": "Daten 2",
194207
"{{Data_3_right_axis}}": "Daten 3 (rechte Achse)",
@@ -354,6 +367,7 @@
354367
"{{Hide_from_tree}}": "Verstecken aus Baum",
355368
"{{Hide_in_kanban}}": "Versteckt",
356369
"{{Hide_teh_plate}}": "Verstecken die Technikplatte",
370+
"{{Hide_the_window_after_execution}}": "Fenster nach der Ausführung ausblenden",
357371
"{{Hide}}": "Ausblenden",
358372
"{{Hold_down_the_left_mouse_button_and_drag_to_scroll_through_the_wide_table}}": "Halten Sie die linke Maustaste gedrückt und ziehen Sie, um in der breiten Tabelle zu blättern",
359373
"{{Host_in_databases}}": "Host",

‎totum/moduls/install/en.json

+14
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,19 @@
189189
"{{Cycle}}": "Cycle",
190190
"{{DATA}}": "DATA",
191191
"{{DELETE_FROM_INDEX}}": "DELETE FROM INDEX",
192+
"{{Daemon_activate}}": "Activate",
193+
"{{Daemon_activation_code}}": "Activation code",
194+
"{{Daemon_activation_interval}}": "Activation interval",
195+
"{{Daemon_code}}": "Daemon code",
196+
"{{Daemon_do_it_now}}": "Execute",
197+
"{{Daemon_name}}": "Name",
198+
"{{Daemon_pause}}": "Pause",
199+
"{{Daemon_status}}": "Status",
200+
"{{Daemons_ACTIVATE}}": "ACTIVATE",
201+
"{{Daemons_DISACTIVATE}}": "DISACTIVATE",
202+
"{{Daemons_DO_IT_NOW}}": "DO IT NOW",
203+
"{{Daemons_folder}}": "Daemons",
204+
"{{Daemons_table}}": "Daemons",
192205
"{{Data_1}}": "Data 1",
193206
"{{Data_2}}": "Data 2",
194207
"{{Data_3_right_axis}}": "Data 3 (right axis)",
@@ -354,6 +367,7 @@
354367
"{{Hide_from_tree}}": "Hide from tree",
355368
"{{Hide_in_kanban}}": "Hide",
356369
"{{Hide_teh_plate}}": "Hide teh plate",
370+
"{{Hide_the_window_after_execution}}": "Hide the window after execution",
357371
"{{Hide}}": "Hide",
358372
"{{Hold_down_the_left_mouse_button_and_drag_to_scroll_through_the_wide_table}}": "Hold down the left mouse button and drag to scroll through the wide table",
359373
"{{Host_in_databases}}": "Host",

‎totum/moduls/install/es.json

+14
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,19 @@
189189
"{{Cycle}}": "Ciclo",
190190
"{{DATA}}": "DATOS",
191191
"{{DELETE_FROM_INDEX}}": "ELIMINAR DEL ÍNDICE",
192+
"{{Daemon_activate}}": "Activar",
193+
"{{Daemon_activation_code}}": "Código de activación",
194+
"{{Daemon_activation_interval}}": "Intervalo de Activación",
195+
"{{Daemon_code}}": "Código del Daemon",
196+
"{{Daemon_do_it_now}}": "Ejecutar",
197+
"{{Daemon_name}}": "Nombre",
198+
"{{Daemon_pause}}": "Pausa",
199+
"{{Daemon_status}}": "Estado",
200+
"{{Daemons_ACTIVATE}}": "ACTIVAR",
201+
"{{Daemons_DISACTIVATE}}": "DESACTIVAR",
202+
"{{Daemons_DO_IT_NOW}}": "HAZLO AHORA",
203+
"{{Daemons_folder}}": "Demonios",
204+
"{{Daemons_table}}": "Demonios",
192205
"{{Data_1}}": "Datos 1",
193206
"{{Data_2}}": "Datos 2",
194207
"{{Data_3_right_axis}}": "Datos 3 (eje derecho)",
@@ -354,6 +367,7 @@
354367
"{{Hide_from_tree}}": "Ocultar del árbol",
355368
"{{Hide_in_kanban}}": "Oculto en Kanban",
356369
"{{Hide_teh_plate}}": "Ocultar la placa técnica",
370+
"{{Hide_the_window_after_execution}}": "Ocultar la ventana después de la ejecución",
357371
"{{Hide}}": "Ocultar",
358372
"{{Hold_down_the_left_mouse_button_and_drag_to_scroll_through_the_wide_table}}": "Mantenga presionado el botón izquierdo del mouse y arrastre para desplazarse por la tabla ancha",
359373
"{{Host_in_databases}}": "Host en bases de datos",

‎totum/moduls/install/ru.json

+14
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,19 @@
189189
"{{Cycle}}": "Цикл",
190190
"{{DATA}}": "ДАННЫЕ",
191191
"{{DELETE_FROM_INDEX}}": "УДАЛИТЬ ИЗ ИНДЕКСА",
192+
"{{Daemon_activate}}": "Активировать",
193+
"{{Daemon_activation_code}}": "Код активации",
194+
"{{Daemon_activation_interval}}": "Интервал активации",
195+
"{{Daemon_code}}": "Код демона",
196+
"{{Daemon_do_it_now}}": "Выполнить",
197+
"{{Daemon_name}}": "Name",
198+
"{{Daemon_pause}}": "Пауза",
199+
"{{Daemon_status}}": "Статус",
200+
"{{Daemons_ACTIVATE}}": "ACTIVATE",
201+
"{{Daemons_DISACTIVATE}}": "DISACTIVATE",
202+
"{{Daemons_DO_IT_NOW}}": "DO IT NOW",
203+
"{{Daemons_folder}}": "Daemons",
204+
"{{Daemons_table}}": "Daemons",
192205
"{{Data_1}}": "Данные 1",
193206
"{{Data_2}}": "Данные 2",
194207
"{{Data_3_right_axis}}": "Данные 3 (ось справа)",
@@ -354,6 +367,7 @@
354367
"{{Hide_from_tree}}": "Скрыть из дерева",
355368
"{{Hide_in_kanban}}": "Скрытый",
356369
"{{Hide_teh_plate}}": "Скрыть тех-плашку",
370+
"{{Hide_the_window_after_execution}}": "Скрыть окно после выполнения",
357371
"{{Hide}}": "Скрывать",
358372
"{{Hold_down_the_left_mouse_button_and_drag_to_scroll_through_the_wide_table}}": "Зажмите левую кнопку мыши и потяните для прокрутки широкой таблицы",
359373
"{{Host_in_databases}}": "Host",

‎totum/moduls/install/start.json.gz.ttm

963 Bytes
Binary file not shown.

‎totum/templates/page_template.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<script src="/js/libs.js?v=b101ece"></script>
88
<link rel="stylesheet"
99
type="text/css"
10-
href="/css/main.css?v=de85130">
10+
href="/css/main.css?v=df6dd09">
1111

1212
<?php
1313
if ($isCreatorView ?? null) { ?>
@@ -18,7 +18,7 @@
1818
<?php
1919
} ?>
2020

21-
<script src="/js/main.js?v=707fff3"></script>
21+
<script src="/js/main.js?v=f453624"></script>
2222
<script src="/js/i18n/<?= $this->Config->getLang() ?>.js?10"></script>
2323
<script>App.lang = App.langs["<?= $this->Config->getLang() ?>"]</script>
2424

‎totum/templates/page_template_simple.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<script src="/js/libs.js?v=b101ece"></script>
88
<link rel="stylesheet"
99
type="text/css"
10-
href="/css/main.css?v=de85130">
11-
<script src="/js/main.js?v=707fff3"></script>
10+
href="/css/main.css?v=df6dd09">
11+
<script src="/js/main.js?v=f453624"></script>
1212
<script src="/js/i18n/<?= $this->Config->getLang() ?>.js?10"></script>
1313
<script>App.lang = App.langs["<?= $this->Config->getLang() ?>"]</script>
1414

0 commit comments

Comments
 (0)