Revize 1521
Přidáno uživatelem Ondřej Fibich před asi 12 roky(ů)
| freenetis/branches/network/application/i18n/cs_CZ/texts.php | ||
|---|---|---|
|
'add new enum type' => 'Přidat nový výčet',
|
||
|
'add new ethernet interface' => 'Přidat nové ethernetové rozhraní',
|
||
|
'add new fee' => 'Přidat nový poplatek',
|
||
|
'add new filter' => 'Přidat nový filter',
|
||
|
'add new filter' => 'Přidat nový filtr',
|
||
|
'add new group' => 'Přidat novou skupinu',
|
||
|
'add new interface' => 'Přidat nové rozhraní',
|
||
|
'add new interface to device' => 'Přidat nové rozhraní k zařízení',
|
||
| freenetis/branches/network/application/models/device.php | ||
|---|---|---|
|
(
|
||
|
SELECT d.id AS device_id, d.name AS device_name, u.id AS user,
|
||
|
CONCAT(u.surname, ' ', u.name, ' - ', u.login) AS user_name, s.id AS subnet,
|
||
|
d.type, ip.ip_address
|
||
|
d.type, ip.ip_address, ap.street_id AS street,
|
||
|
ap.town_id AS town, ap.street_number
|
||
|
FROM devices d
|
||
|
JOIN users u ON d.user_id = u.id
|
||
|
JOIN address_points ap ON ap.id = d.address_point_id
|
||
|
LEFT JOIN ifaces i ON i.device_id = d.id
|
||
|
LEFT JOIN ip_addresses ip ON ip.iface_id = i.id
|
||
|
JOIN subnets s ON ip.subnet_id = s.id
|
||
| freenetis/branches/network/application/models/iface.php | ||
|---|---|---|
|
(
|
||
|
SELECT i2.id AS iface_id, d2.id AS device_id,
|
||
|
d2.user_id AS user, ip.subnet_id AS subnet, d2.type,
|
||
|
d2.name AS device_name
|
||
|
d2.name AS device_name, ap2.street_id AS street,
|
||
|
ap2.town_id AS town, ap2.street_number
|
||
|
FROM devices d
|
||
|
JOIN ifaces i ON i.device_id = d.id
|
||
|
JOIN links l ON i.link_id = l.id
|
||
|
JOIN ifaces i2 ON i2.link_id = l.id AND i2.id <> i.id
|
||
|
LEFT JOIN ip_addresses ip ON ip.iface_id = i2.id
|
||
|
JOIN devices d2 ON i2.device_id = d2.id
|
||
|
JOIN address_points ap2 ON ap2.id = d2.address_point_id
|
||
|
WHERE i.type = ? AND i2.type IN(" . implode(',', $can_connect) . ") AND
|
||
|
d.user_id = ? AND d2.user_id IN (" . implode(',', $usearch) . ")
|
||
|
) df
|
||
| ... | ... | |
|
(
|
||
|
SELECT i2.id AS iface_id, d2.id AS device_id, 2 AS priority,
|
||
|
d2.user_id AS user, ip2.subnet_id AS subnet, d2.type,
|
||
|
ap2.gps, d2.name AS device_name
|
||
|
ap2.gps, d2.name AS device_name, ap2.street_id AS street,
|
||
|
ap2.town_id AS town, ap2.street_number
|
||
|
FROM devices d2
|
||
|
JOIN ifaces i2 ON i2.device_id = d2.id
|
||
|
LEFT JOIN ip_addresses ip2 ON ip2.iface_id = i2.id
|
||
| ... | ... | |
|
(
|
||
|
SELECT i2.id AS iface_id, d2.id AS device_id, 2 AS priority,
|
||
|
d2.user_id AS user, ip2.subnet_id AS subnet, d2.type,
|
||
|
ap2.gps, d2.name AS device_name
|
||
|
ap2.gps, d2.name AS device_name, ap2.street_id AS street,
|
||
|
ap2.town_id AS town, ap2.street_number
|
||
|
FROM devices d2
|
||
|
JOIN ifaces i2 ON i2.device_id = d2.id
|
||
|
LEFT JOIN ip_addresses ip2 ON ip2.iface_id = i2.id
|
||
| freenetis/branches/network/application/controllers/devices.php | ||
|---|---|---|
|
$filter_form->add('device_name')
|
||
|
->callback('json/device_name');
|
||
|
|
||
|
$filter_form->add('town')
|
||
|
->type('select')
|
||
|
->values(array_unique(ORM::factory('town')->select_list('id', 'town')));
|
||
|
|
||
|
$filter_form->add('street')
|
||
|
->type('select')
|
||
|
->values(array_unique(ORM::factory('street')->select_list('id', 'street')));
|
||
|
|
||
|
$filter_form->add('street_number')
|
||
|
->type('number');
|
||
|
|
||
|
// validates form and saves data
|
||
|
if($form->validate())
|
||
|
{
|
||
| freenetis/branches/network/application/views/js/devices_add.php | ||
|---|---|---|
|
if (made)
|
||
|
{
|
||
|
var type = $p.find('input[name^="type["]').val();
|
||
|
var connected_text = $(this).parent().find('select[name^="connected["] option:selected').text();
|
||
|
var connected_val = /^([0-9.]+: )?(.+) \(.+\)$/.exec(connected_text);
|
||
|
var default_name = (type == <?php echo Iface_Model::TYPE_WIRELESS ?>) ? '<?php echo __('air') ?>' : '<?php echo __('cable') ?>';
|
||
|
default_name += ' ' + (/^([0-9.]+: )?(.+) \([^(]+\)$/.exec($(this).parent().find('select[name^="connected["] option:selected').text())[2]);
|
||
|
|
||
|
if (connected_val && connected_val[2] != undefined)
|
||
|
{
|
||
|
default_name += ' ' + connected_val[2];
|
||
|
}
|
||
|
else if ((connected_val = /^(.+): ([0-9.]+)?(.+)$/.exec(connected_text)) &&
|
||
|
connected_val[1] != undefined)
|
||
|
{
|
||
|
default_name += ' ' + connected_val[1];
|
||
|
}
|
||
|
else if ((connected_val = /^([0-9.]+: )?(.+) *$/.exec(connected_text)) &&
|
||
|
connected_val[2] != undefined)
|
||
|
{
|
||
|
default_name += ' ' + connected_val[2];
|
||
|
}
|
||
|
|
||
|
default_name += ' - ' + $('#device_name').val();
|
||
|
|
||
|
$p.find('input[name^="link_id["]').val(null);
|
||
Také k dispozici: Unified diff
Upravy:
- ve fomulari pro pridavani zarizeni pridana moznost filtrovat dle mesta. cp a ulice
Opravy:
- oprava nekonzistence aut. nacitani jmena linku ve fomulari pro pridavani zarizeni s novym stylem zobrazeni polozek dropdownu