Revize 1431
Přidáno uživatelem Michal Kliment před asi 12 roky(ů)
freenetis/branches/testing/application/models/device.php | ||
---|---|---|
u.name AS user_name, u.surname AS user_surname, u.login AS user_login,
|
||
d.login, d.password, d.price, d.trade_name, d.payment_rate,
|
||
d.buy_date, m.name AS member_name, s.street, t.town,
|
||
ap.street_number, d.comment
|
||
ap.street_number, d.comment, c.cloud
|
||
FROM devices d
|
||
JOIN users u ON d.user_id = u.id
|
||
JOIN members m ON u.member_id = m.id
|
||
... | ... | |
LEFT JOIN (
|
||
SELECT *
|
||
FROM translations
|
||
WHERE lang = ?) f ON e.value = f.original_term
|
||
WHERE lang = ?
|
||
) f ON e.value = f.original_term
|
||
LEFT JOIN
|
||
(
|
||
SELECT c.id AS cloud, IFNULL(i1.device_id,i2.device_id) AS device_id
|
||
FROM clouds c
|
||
JOIN clouds_subnets cs ON cs.cloud_id = c.id
|
||
JOIN subnets s ON cs.subnet_id = s.id
|
||
JOIN ip_addresses ip ON ip.subnet_id = s.id
|
||
LEFT JOIN ifaces i1 ON ip.iface_id = i1.id
|
||
LEFT JOIN vlan_ifaces vi ON ip.vlan_iface_id = vi.id
|
||
LEFT JOIN ifaces i2 ON vi.iface_id = i2.id
|
||
) c ON c.device_id = d.id
|
||
) d
|
||
$where
|
||
ORDER BY $order_by $order_by_direction
|
||
... | ... | |
u.name AS user_name, u.surname AS user_surname, u.login AS user_login,
|
||
d.login, d.password, d.price, d.trade_name, d.payment_rate,
|
||
d.buy_date, m.name AS member_name, s.street, t.town,
|
||
ap.street_number, d.comment
|
||
ap.street_number, d.comment, c.cloud
|
||
FROM devices d
|
||
JOIN users u ON d.user_id = u.id
|
||
JOIN members m ON u.member_id = m.id
|
||
... | ... | |
LEFT JOIN (
|
||
SELECT *
|
||
FROM translations
|
||
WHERE lang = ?) f ON e.value = f.original_term
|
||
WHERE lang = ?
|
||
) f ON e.value = f.original_term
|
||
LEFT JOIN
|
||
(
|
||
SELECT c.id AS cloud, IFNULL(i1.device_id,i2.device_id) AS device_id
|
||
FROM clouds c
|
||
JOIN clouds_subnets cs ON cs.cloud_id = c.id
|
||
JOIN subnets s ON cs.subnet_id = s.id
|
||
JOIN ip_addresses ip ON ip.subnet_id = s.id
|
||
LEFT JOIN ifaces i1 ON ip.iface_id = i1.id
|
||
LEFT JOIN vlan_ifaces vi ON ip.vlan_iface_id = vi.id
|
||
LEFT JOIN ifaces i2 ON vi.iface_id = i2.id
|
||
) c ON c.device_id = d.id
|
||
) d
|
||
$where
|
||
", Config::get('lang'))->current()->total;
|
freenetis/branches/testing/application/models/member.php | ||
---|---|---|
a_comment, a_comments_thread_id, type, entrance_date, leaving_date,
|
||
GROUP_CONCAT(redirect_type SEPARATOR ', ') AS redirect,
|
||
GROUP_CONCAT(redirect_type_text SEPARATOR ', \n') AS redirect_text,
|
||
whitelisted, interrupt, 1 AS redirection, 1 AS email, 1 AS sms
|
||
whitelisted, interrupt, 1 AS redirection, 1 AS email, 1 AS sms,
|
||
cloud
|
||
FROM
|
||
(
|
||
SELECT
|
||
... | ... | |
a.balance, a_comment,
|
||
a.comments_thread_id AS a_comments_thread_id,
|
||
m.type, m.entrance_date, m.leaving_date, redirect_type,
|
||
redirect_type_text, whitelisted, interrupt
|
||
redirect_type_text, whitelisted, interrupt,
|
||
cl.cloud
|
||
FROM
|
||
(
|
||
SELECT m.id,
|
||
... | ... | |
) ip
|
||
GROUP BY member_id
|
||
) ip ON ip.member_id = m.id
|
||
LEFT JOIN
|
||
(
|
||
SELECT c.id AS cloud, IFNULL(u.member_id, c.member_id) AS member_id
|
||
FROM
|
||
(
|
||
SELECT c.*, IFNULL(i1.device_id,i2.device_id) AS device_id, ip.member_id
|
||
FROM clouds c
|
||
JOIN clouds_subnets cs ON cs.cloud_id = c.id
|
||
JOIN subnets s ON cs.subnet_id = s.id
|
||
JOIN ip_addresses ip ON ip.subnet_id = s.id
|
||
LEFT JOIN ifaces i1 ON ip.iface_id = i1.id
|
||
LEFT JOIN vlan_ifaces vi ON ip.vlan_iface_id = vi.id
|
||
LEFT JOIN ifaces i2 ON vi.iface_id = i2.id
|
||
) c
|
||
LEFT JOIN devices d ON c.device_id = d.id
|
||
LEFT JOIN users u ON d.user_id = u.id
|
||
) cl ON cl.member_id = m.id
|
||
$where
|
||
) AS q
|
||
GROUP BY q.id
|
||
... | ... | |
) ip
|
||
GROUP BY member_id
|
||
) ip ON ip.member_id = m.id
|
||
LEFT JOIN
|
||
(
|
||
SELECT c.id AS cloud, IFNULL(u.member_id, c.member_id) AS member_id
|
||
FROM
|
||
(
|
||
SELECT c.*, IFNULL(i1.device_id,i2.device_id) AS device_id, ip.member_id
|
||
FROM clouds c
|
||
JOIN clouds_subnets cs ON cs.cloud_id = c.id
|
||
JOIN subnets s ON cs.subnet_id = s.id
|
||
JOIN ip_addresses ip ON ip.subnet_id = s.id
|
||
LEFT JOIN ifaces i1 ON ip.iface_id = i1.id
|
||
LEFT JOIN vlan_ifaces vi ON ip.vlan_iface_id = vi.id
|
||
LEFT JOIN ifaces i2 ON vi.iface_id = i2.id
|
||
) c
|
||
LEFT JOIN devices d ON c.device_id = d.id
|
||
LEFT JOIN users u ON d.user_id = u.id
|
||
) cl ON cl.member_id = m.id
|
||
$where
|
||
ORDER BY c.datetime DESC
|
||
) AS q
|
freenetis/branches/testing/application/controllers/members.php | ||
---|---|---|
Ip_address_Model::PERNAMENT_WHITELIST => __('Permanent whitelist'),
|
||
Ip_address_Model::TEMPORARY_WHITELIST => __('Temporary whitelist')
|
||
));
|
||
|
||
$filter_form->add('cloud')
|
||
->table('cl')
|
||
->type('select')
|
||
->values(ORM::factory('cloud')->select_list());
|
||
|
||
// gets new selector
|
||
if (is_numeric($this->input->get('record_per_page')))
|
freenetis/branches/testing/application/controllers/devices.php | ||
---|---|---|
|
||
$filter_form->add('comment');
|
||
|
||
$filter_form->add('cloud')
|
||
->type('select')
|
||
->values(ORM::factory('cloud')->select_list());
|
||
|
||
// get new selector
|
||
if (is_numeric($this->input->get('record_per_page')))
|
||
$limit_results = (int) $this->input->get('record_per_page');
|
Také k dispozici: Unified diff
Upravy:
- pridana moznost vyhledavani podle oblasti u clenu a zarizeni (implementace #192)