Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 1522

Přidáno uživatelem Ondřej Fibich před asi 12 roky(ů)

Upravy:

- zobrazeni zarizeni v gridu rozhrani se v klasickem modu nezobrazuji rozhrani bez MAC a zaroven IP adresy

Zobrazit rozdíly:

freenetis/branches/network/application/models/device.php
*
* @author Michal Kliment
* @param int $user_id
* @param bool $display_empty
* @param int $limit_from
* @param int $limit_results
* @param string $order_by
......
* @return Mysql_Result
*/
public function get_devices_of_user(
$user_id, $limit_from = 0, $limit_results = NULL, $order_by = 'ip',
$order_by_direction = 'asc')
$user_id, $display_empty = TRUE, $limit_from = 0,
$limit_results = NULL, $order_by = 'ip', $order_by_direction = 'asc')
{
// order by check
if (!$this->has_column($order_by) && $order_by != 'ip')
......
}
$limit = "";
if ($limit_results)
$limit = "LIMIT " . intval($limit_from) . ", " . intval($limit_results);
$display_empty_sql = '';
if (!$display_empty)
{
$display_empty_sql = "AND NOT (
(ISNULL(ip.ip_address) OR LENGTH(ip.ip_address) = 0) AND
(ISNULL(i.mac) OR LENGTH(i.mac) = 0)
)";
}
return $this->db->query("
SELECT d.*, IF(COUNT(d.id)>1,1,0) AS more_ips,
......
LEFT JOIN translations t ON e.value LIKE t.original_term AND t.lang = ?
LEFT JOIN ifaces i ON d.id = i.device_id
LEFT JOIN ip_addresses ip ON ip.iface_id = i.id
WHERE user_id = ?
WHERE user_id = ? $display_empty_sql
) AS d
ORDER BY $order_by $order_by_direction
) AS d
freenetis/branches/network/application/controllers/devices.php
);
}
$devices = $device_model->get_devices_of_user($user_id);
$devices = $device_model->get_devices_of_user($user_id, FALSE);
$base_grid = new Grid('devices', null, array
(
......
$base_grid->datasource($devices);
$devices = $device_model->get_devices_of_user(
$user_id, $sql_offset, $limit_results,
$user_id, TRUE, $sql_offset, $limit_results,
$order_by, $order_by_direction
);

Také k dispozici: Unified diff