fix translates

docs/mysql/mysql.sql

@@ -414,9 +414,9 @@ CREATE TABLE `device_types` (
 -- Дамп данных таблицы `device_types`
 --
 
-INSERT INTO `device_types` (`id`, `name.russian`, `name.english`) VALUES(0, 'Маршрутизатор', 'Router');
+INSERT INTO `device_types` (`id`, `name.russian`, `name.english`) VALUES(0, 'Роутер', 'Router');
 INSERT INTO `device_types` (`id`, `name.russian`, `name.english`) VALUES(1, 'Свич', 'Switch');
-INSERT INTO `device_types` (`id`, `name.russian`, `name.english`) VALUES(2, 'Роутер', 'Gateway');
+INSERT INTO `device_types` (`id`, `name.russian`, `name.english`) VALUES(2, 'Шлюз', 'Gateway');
 INSERT INTO `device_types` (`id`, `name.russian`, `name.english`) VALUES(3, 'Сервер', 'Server');
 INSERT INTO `device_types` (`id`, `name.russian`, `name.english`) VALUES(4, 'Точка доступа', 'Access Point');
 INSERT INTO `device_types` (`id`, `name.russian`, `name.english`) VALUES(5, 'Сетевое устройство', 'Network device');

html/admin/devices/index.php

@@ -52,7 +52,7 @@ if (!empty($sort_field) and !empty($order)) { $sort_sql = " ORDER BY $sort_field
 <?php
 $filter = '';
 if ($f_building_id > 0) { $filter .= ' and building_id=' . $f_building_id; }
-if ($f_devtype_id > 0) { $filter .= ' and device_type=' . $f_devtype_id; } else { $filter .= ' and device_type<=2'; }
+if ($f_devtype_id >= 0) { $filter .= ' and device_type=' . $f_devtype_id; } else { $filter .= ' and device_type<=2'; }
 
 $dSQL = 'SELECT * FROM devices WHERE deleted=0 '.$filter.' '.$sort_sql;
 $switches = get_records_sql($db_link,$dSQL);

html/inc/common.php

@@ -744,7 +744,7 @@ function print_building_select($db, $building_name, $building_value)
 function print_devtypes_select($db, $devtype_name, $devtype_value, $mode)
 {
     print "<select name=\"$devtype_name\">\n";
-    print_select_item(WEB_select_item_all, 0, $devtype_value);
+    print_select_item(WEB_select_item_all, -1, $devtype_value);
     $filter = '';
     if (!empty($mode)) {
         $filter = "WHERE $mode";

updates/2-4-12/mysql-devices-patch.sql

@@ -1,10 +1,11 @@
 ALTER TABLE `connections` ADD `last_found` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP AFTER `auth_id`;
 UPDATE `connections` as C set last_found=(SELECT last_found FROM User_auth AS U WHERE U.last_found>0 and U.id=C.`auth_id`);
 ALTER TABLE `devices` ADD `login` VARCHAR(50) NULL DEFAULT NULL AFTER `ip`, ADD `password` VARCHAR(255) NULL DEFAULT NULL AFTER `login`, ADD `protocol` INT NOT NULL DEFAULT '1' AFTER `password`, ADD `control_port` INT NOT NULL DEFAULT '23' AFTER `protocol`;
-INSERT INTO `device_types` (`id`, `name`) VALUES ('6', 'Маршрутизатор');
+INSERT INTO `device_types` (`id`, `name`) VALUES ('6', 'Роутер');
 UPDATE `device_types` SET `id` = '0' WHERE `device_types`.`id` = 6;
 ALTER TABLE `device_types` CHANGE `name` `name.russian` VARCHAR(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL;
 ALTER TABLE `device_types` ADD `name.english` VARCHAR(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL AFTER `name.russian`;
+UPDATE `device_types` SET `name.russian` = 'Шлюз' WHERE `device_types`.`id` = 2;
 UPDATE `device_types` SET `name.english` = 'Router' WHERE `device_types`.`id` = 0;
 UPDATE `device_types` SET `name.english` = 'Switch' WHERE `device_types`.`id` = 1;
 UPDATE `device_types` SET `name.english` = 'Gateway' WHERE `device_types`.`id` = 2;