Revize 94
Přidáno uživatelem Tomáš Dulík před asi 16 roky(ů)
| freenetis/trunk/kohana/application/i18n/cs_CZ/texts.php | ||
|---|---|---|
|
'fee or penalty comment'=> 'Komentář k poplatku/pokutě',
|
||
|
'from/to'=> 'Od/komu',
|
||
|
'gps' => 'GPS souřadnice',
|
||
|
'honest member'=> 'řádný člen',
|
||
|
'regular member'=> 'Řádný člen',
|
||
|
'change'=> 'Změnit',
|
||
|
'change password'=> 'Změnit heslo',
|
||
|
'id is required' => 'ID je vyžadováno.',
|
||
| ... | ... | |
|
'vlan name' => 'Název VLANu',
|
||
|
'vlans list' => 'Seznam VLANů',
|
||
|
'vlans' => 'VLANy',
|
||
|
'wanna be a member'=> 'Čekatel na členství',
|
||
|
'applicant'=> 'Čekatel na členství',
|
||
|
'work confirmation'=> 'Potvrzení práce',
|
||
|
'work successfully added.'=> 'Práce úspěšně přidána',
|
||
|
'work successfully deleted.'=> 'Práce úspěšně smazána',
|
||
| freenetis/trunk/kohana/application/controllers/ifaces.php | ||
|---|---|---|
|
//=============================================================================
|
||
|
//----- SHOW_ALL --------------------------------------------------------------
|
||
|
//=============================================================================
|
||
|
function show_all($limit_results = 50, $order_by = 'id', $order_by_direction = 'ASC')
|
||
|
function show_all($limit_results = 200, $order_by = 'id', $order_by_direction = 'ASC')
|
||
|
{
|
||
|
//---- delete session device ----
|
||
|
$this->session->del('ssDevice_id');
|
||
| ... | ... | |
|
|
||
|
//die();
|
||
|
|
||
|
$query = $iface_model->select(array('devices.name as device_name', 'segments.name as segment_name', 'ifaces.*'))->join('devices', 'devices.id = ifaces.device_id')->join('segments', 'segments.id = ifaces.segment_id')->orderby($order_by,$order_by_direction)->limit($limit_results,$sql_offset)->find_all();
|
||
|
$query = $iface_model->select(array('devices.name as device_name', 'segments.name as segment_name', 'ifaces.*'))->join('devices', 'devices.id = ifaces.device_id')->join('segments', 'segments.id = ifaces.segment_id', NULL, 'LEFT')->orderby($order_by,$order_by_direction)->limit($limit_results,$sql_offset)->find_all();
|
||
|
|
||
|
$grid = new Grid(url_lang::base().'ifaces', null,array(
|
||
|
//'separator' => '<br />-----------',
|
||
|
//'use_paginator' => false,
|
||
|
//'use_selector' => false,
|
||
|
'current' => $limit_results, // current selected 'records_per_page' value
|
||
|
'selector_increace' => 10, // increace
|
||
|
'selector_min' => 10, // minimum where selector start
|
||
|
'selector_max_multiplier' => 5,
|
||
|
'selector_increace' => 200, // increace
|
||
|
'selector_min' => 200, // minimum where selector start
|
||
|
'selector_max_multiplier' => 10,
|
||
|
'base_url' => Config::item('locale.lang').'/ifaces/show_all/'.$limit_results.'/'.$order_by.'/'.$order_by_direction ,
|
||
|
'uri_segment' => 'page', // pass a string as uri_segment to trigger former 'label' functionality
|
||
|
'total_items' => $total_ifaces, // use db count query here of course
|
||
| freenetis/trunk/kohana/application/controllers/members.php | ||
|---|---|---|
|
$form->input('middle_name')->label(url_lang::lang('texts.middle name').':')->rules('length[3,30]')->value($member_data->middle_name);
|
||
|
if ($this->gacl_class->acl_check('freenetis', 'edit_own', 'all', $_SESSION['username'],get_class($this),'edit_surname'))$form->input('surname')->label(url_lang::lang('texts.surname').':')->rules('required|length[3,60]')->value($member_data->surname);
|
||
|
$form->input('post_title')->label(url_lang::lang('texts.post title').':')->rules('length[3,30]')->value($member_data->post_title);
|
||
|
if ($this->gacl_class->acl_check('freenetis', 'edit_own', 'all', $_SESSION['username'],get_class($this),'edit_type'))$form->dropdown('type')->label(url_lang::lang('texts.Type').':')->options(array('member'=>url_lang::lang('texts.Honest member'),'wannabe'=>url_lang::lang('texts.Wanna be a member')))->selected($member_data->type);
|
||
|
if ($this->gacl_class->acl_check('freenetis', 'edit_own', 'all', $_SESSION['username'],get_class($this),'edit_type'))$form->dropdown('type')->label(url_lang::lang('texts.Type').':')->options(array('regular'=>url_lang::lang('texts.Regular member'),'applicant'=>url_lang::lang('texts.applicant')))->selected($member_data->type);
|
||
|
if ($this->gacl_class->acl_check('freenetis', 'edit_own', 'all', $_SESSION['username'],get_class($this),'edit_membersname'))$form->input('membername')->label(url_lang::lang('texts.Members name').':')->rules('required|length[3,60]')->value($member_data->namem);
|
||
|
|
||
|
$form->group('')->label(url_lang::lang('texts.Contact informations'));
|
||
Také k dispozici: Unified diff
1. V ifaces.php u výpisu interface-ů byl čistý JOIN, přitom iface může být připojen k neznámému segmentu a pak je segment_id=NULL, takový iface se pak vůbec nezobrazoval. Oprava: náhrada JOINu za LEFT JOIN
2. members.php, texts.php - přijmenován "honest member" na "regular", "wanna be" na "applicant"