Revize 1721
Přidáno uživatelem Ondřej Fibich před asi 12 roky(ů)
| freenetis/trunk/kohana/application/controllers/ifaces.php | ||
|---|---|---|
|
$grid->datasource($vlans);
|
||
|
$detail = $grid;
|
||
|
break;
|
||
|
case Iface_Model::TYPE_INTERNAL:
|
||
|
$detail = new View('ifaces/detail');
|
||
|
$detail->ip_addresses = $grid_ip_addresses;
|
||
|
break;
|
||
|
};
|
||
|
|
||
|
$view->content->iface = $iface;
|
||
| freenetis/trunk/kohana/system/libraries/ORM.php | ||
|---|---|---|
|
$cache[$column_name] = ($this->db->query("
|
||
|
SELECT COUNT(*) AS count
|
||
|
FROM INFORMATION_SCHEMA.COLUMNS
|
||
|
WHERE table_name = " . $this->db->escape($this->table_name) . "
|
||
|
WHERE table_schema LIKE " . $this->db->escape(Config::get('db_name')) . "
|
||
|
AND table_name LIKE " . $this->db->escape($this->table_name) . "
|
||
|
AND column_name LIKE " . $this->db->escape($column_name) . "
|
||
|
")->current()->count == 1);
|
||
|
// get result
|
||
Také k dispozici: Unified diff
Merge zmen do trunku
Oprava:
- fixes #353: zacykleni po pridani tarifu - spusobeno chybnym dotazem has_column (SQL dotaz z nejakeho duvodu bere v potaz i okolni databaze)
- fixes #352: servisni rozhrani - zobrazeni IP