Revize 170
Přidáno uživatelem Roman Ševčík před více než 15 roky(ů)
freenetis/trunk/kohana/application/controllers/login.php | ||
---|---|---|
$this->session->set('user_surname', $user_model->surname);
|
||
$user_model->clear();
|
||
$user_model->where('member_id='.$member_id.' AND type!=\'user\'')->find();
|
||
$this->session->set('member_login', $user_model->login);
|
||
|
||
if ($this->session->get('referer')!='') url::redirect(url_lang::base().$this->session->get('referer'));
|
||
else
|
||
$this->session->set('member_login', $user_model->login);
|
||
|
||
if ($this->session->get('referer')!='') url::redirect(url_lang::base().$this->session->get('referer'));
|
||
else
|
||
{
|
||
if ($user_type!='user') url::redirect(url_lang::base().'members/show/'.$member_id);
|
||
else url::redirect(url_lang::base().'users/show/'.$user_id);
|
||
else url::redirect(url_lang::base().'users/show/'.$user_id);
|
||
}
|
||
die();
|
||
}
|
freenetis/trunk/kohana/application/controllers/devices.php | ||
---|---|---|
|
||
//$dotaz = $this->model_members->get_all_members($sql_offset, (int)$limit_results, $order_by, $order_by_direction); // get all members from database
|
||
//$dotaz = $device_model->find_all();
|
||
//$dotaz = $device_model->select(array('CONCAT(users.name,\' \',users.surname) as u_name', 'devices.*'))->join('users', 'devices.user_id = users.id')->orderby($order_by,$order_by_direction)->limit($limit_results,$sql_offset)->find_all();
|
||
|
||
$enum_type_model = new Enum_type_Model();
|
||
$arr_types = $enum_type_model->get_values(Enum_type_model::id_type_of_device);
|
||
//$dotaz = $device_model->select(array('CONCAT(users.name,\' \',users.surname) as u_name', 'devices.*'))->join('users', 'devices.user_id = users.id')->orderby($order_by,$order_by_direction)->limit($limit_results,$sql_offset)->find_all();
|
||
|
||
$enum_type_model = new Enum_type_Model();
|
||
$arr_types = $enum_type_model->get_values(Enum_type_model::id_type_of_device);
|
||
$arr_types[0] = '----- '.url_lang::lang('texts.select type').' -----';
|
||
asort($arr_types);
|
||
|
||
|
||
$filter=new Table_Form(url_lang::base()."devices/show_all", "get", array(
|
||
new Table_Form_Item('text','name','Name'),
|
||
new Table_Form_Item('text','user','User'),
|
||
"tr",
|
||
new Table_Form_Item('select','device_type','Type',$arr_types),
|
||
new Table_Form_Item('text','user','User'),
|
||
"tr",
|
||
new Table_Form_Item('select','device_type','Type',$arr_types),
|
||
"td",
|
||
new Table_Form_Item('submit','submit','Filter')
|
||
)
|
||
... | ... | |
'query_string' => $this->input->get()
|
||
));
|
||
|
||
$grid->add_new_button(url_lang::base().'devices/add', url_lang::lang('texts.Add new device'));
|
||
$grid->add_new_button(url_lang::base().'devices/add_whole', url_lang::lang('texts.Add new device'));
|
||
$grid->order_field('id')->label('ID')->class('center');
|
||
$grid->order_field('name')->label(url_lang::lang('texts.name'));
|
||
$grid->order_field('type')->label(url_lang::lang('texts.type'));
|
Také k dispozici: Unified diff
Upraveno přídaávání zařízení z menu. Přidává se přes zjednodušený formulář.