Revize 1470
Přidáno uživatelem Ondřej Fibich před asi 12 roky(ů)
| freenetis/branches/network/application/models/device.php | ||
|---|---|---|
|
public function select_list_device_with_user()
|
||
|
{
|
||
|
$devices = $this->db->query("
|
||
|
SELECT d.id,
|
||
|
CONCAT(IF(ISNULL(d.name) OR LENGTH(d.name) = 0,d.id,d.name),
|
||
|
' (', CONCAT(u.surname,' ',u.name), ')') AS name
|
||
|
SELECT d.id, CONCAT(IFNULL(CONCAT(ip.ip_address, ': '), ''),
|
||
|
IF(ISNULL(d.name) OR LENGTH(d.name) = 0,d.id,d.name),
|
||
|
' (', CONCAT(u.surname,' ',u.name), ')') AS name
|
||
|
FROM devices d
|
||
|
JOIN users u ON d.user_id = u.id
|
||
|
ORDER BY IF(ISNULL(d.name) OR LENGTH(d.name) = 0,1,0), d.name, u.id
|
||
|
LEFT JOIN ifaces i ON i.device_id = d.id
|
||
|
LEFT JOIN ip_addresses ip ON ip.iface_id = i.id
|
||
|
ORDER BY IF(ISNULL(ip.ip_address) OR LENGTH(ip.ip_address) = 0, INET_ATON(ip.ip_address), 0),
|
||
|
IF(ISNULL(d.name) OR LENGTH(d.name) = 0, 1, 0),
|
||
|
u.id, d.name
|
||
|
");
|
||
|
|
||
|
$arr_devices = array();
|
||
| ... | ... | |
|
{
|
||
|
$devices = $this->db->query("
|
||
|
SELECT device_id AS id,
|
||
|
CONCAT(IF(ISNULL(device_name) OR LENGTH(device_name) = 0,device_id,device_name),
|
||
|
CONCAT(IFNULL(CONCAT(ip_address, ': '), ''),
|
||
|
IF(ISNULL(device_name) OR LENGTH(device_name) = 0,device_id,device_name),
|
||
|
' (', user_name, ')') AS name
|
||
|
FROM
|
||
|
(
|
||
|
SELECT d.id AS device_id, d.name AS device_name, u.id AS user,
|
||
|
CONCAT(u.surname,' ',u.name) AS user_name, s.id AS subnet,
|
||
|
d.type
|
||
|
d.type, ip.ip_address
|
||
|
FROM devices d
|
||
|
JOIN users u ON d.user_id = u.id
|
||
|
LEFT JOIN ifaces i ON i.device_id = d.id
|
||
| ... | ... | |
|
JOIN subnets s ON ip.subnet_id = s.id
|
||
|
) df
|
||
|
WHERE $filter_sql
|
||
|
ORDER BY IF(ISNULL(device_name) OR LENGTH(device_name) = 0,1,0), device_name, user
|
||
|
ORDER BY IF(ISNULL(ip_address) OR LENGTH(ip_address) = 0, INET_ATON(ip_address), 0),
|
||
|
IF(ISNULL(device_name) OR LENGTH(device_name) = 0, 1, 0),
|
||
|
user, device_name
|
||
|
");
|
||
|
}
|
||
|
|
||
| freenetis/branches/network/application/controllers/json.php | ||
|---|---|---|
|
public function __construct()
|
||
|
{
|
||
|
parent::__construct();
|
||
|
// self::send_json_headers();
|
||
|
self::send_json_headers();
|
||
|
}
|
||
|
|
||
|
/**
|
||
| freenetis/branches/network/application/views/js/devices_add.php | ||
|---|---|---|
|
|
||
|
if (data['has_mac'])
|
||
|
{
|
||
|
html_buffer.push('<th><?php echo __('Interface') ?></th>');
|
||
|
html_buffer.push('<th style="width: 150px"><?php echo __('Interface') ?></th>');
|
||
|
}
|
||
|
else if (data['type'] == <?php echo Iface_Model::TYPE_PORT ?>)
|
||
|
{
|
||
| ... | ... | |
|
|
||
|
if (data['has_ip'])
|
||
|
{
|
||
|
html_buffer.push('<th><?php echo __('IP address') ?></th>');
|
||
|
html_buffer.push('<th style="width: 150px"><?php echo __('IP address') ?></th>');
|
||
|
}
|
||
|
|
||
|
if (data['has_link'])
|
||
|
{
|
||
|
html_buffer.push('<th><?php echo __('Connected to device') ?></th>');
|
||
|
html_buffer.push('<th style="width: 180px"><?php echo __('Connected to device') ?></th>');
|
||
|
}
|
||
|
|
||
|
html_buffer.push('</tr>');
|
||
| ... | ... | |
|
|
||
|
if (data['has_link'])
|
||
|
{
|
||
|
html_buffer.push('<td style="width: 160px">');
|
||
|
html_buffer.push('<td style="width: 180px">');
|
||
|
html_buffer.push('<select name="connected[');
|
||
|
html_buffer.push(i);
|
||
|
html_buffer.push(']" style="width: 13em"');
|
||
|
html_buffer.push(']" style="width: 16em"');
|
||
|
|
||
|
if (first_row)
|
||
|
{
|
||
| ... | ... | |
|
html_buffer.push('</a><br />');
|
||
|
html_buffer.push('<select name="connected_iface[');
|
||
|
html_buffer.push(i);
|
||
|
html_buffer.push(']" style="width: 13em"');
|
||
|
html_buffer.push(']" style="width: 16em"');
|
||
|
|
||
|
if (first_row)
|
||
|
{
|
||
Také k dispozici: Unified diff
Upravy:
- uprava vzhledu formulare pro pridavani zarizeni
- uzprava formatu dropdownu se zarizenimi ve formulari pro pridavani zarizeni