Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 174

Přidáno uživatelem Michal Kliment před více než 15 roky(ů)

Upraven vypis zarizeni jednotlivych uzivatelu - drive pro to bylo
vlastni funkce show_by_member, nyni jde pouze o specialni pripad volani
metody show_all, kdy posleme v query_stringu promennou member_id s
hodnotou id existujiciho clena. Spise zatim pouze v testovaci fazi,
pokud se osvedci, budou podobnym zpusobem opraveny i podobne metody u
ostatnich kontroleru.

Zobrazit rozdíly:

freenetis/trunk/kohana/application/i18n/cs_CZ/texts.php
'back to interfaces list' => 'Zpět na seznam rozhraní',
'back to ip addresses list' => 'Zpět na seznam IP adres',
'back to list of members'=> 'Zpět na seznam členů',
'back to list of all devices'=> 'Zpět na seznam všech zařízení',
'back to login' => 'Zpět na přihlášení',
'back to ports list' => 'Zpět na seznam portů',
'back to segments list' => 'Zpět na seznam segmentů',
......
'contact value'=> 'Data kontaktu',
'cookies must be anabled.'=> 'Musí být zapnuty cookies.',
'create new devices' => 'Vytvořit nové zařízení',
'create whole new device for member' => 'Vytvořit celé nové zařízení pro člena',
'create new devices for member' => 'Vytvořit nové zařízení pro člena',
'create new interface' => 'Vytvořit nové rozhraní',
'create new ip address' => 'Vytvořit novou IP adresu',
......
'ip address is successfully updated' => 'IP adresa byla úspěšně upravena.',
'ip address' => 'IP adresa',
'ip addresses list' => 'Seznam IP adres',
'ip addresses list of member' => 'Seznam IP adres člena',
'ip addresses' => 'IP adresy',
'list of all members'=> 'Seznam všech členů',
'list of all users'=> 'Seznam všech uživatelů',
freenetis/trunk/kohana/application/models/device.php
protected $has_many = array('ifaces','ports');
protected $belongs_to = array('user');
public $arr_sql = array('id' => 'd.id', 'name' => 'd.name', 'user' => 'concat(users.name,\' \',users.surname)', 'device_type'=>'d.type');
public $arr_sql = array('id' => 'd.id', 'name' => 'd.name', 'user' => 'concat(users.name,\' \',users.surname)', 'device_type'=>'d.type', 'member_id' => 'users.member_id');
public function count_all_devices($filter_values = array())
{
......
if($key!='submit')
{
if($where!='WHERE ') $where .= ' AND ';
$where .= ($key!='device_type') ? $this->arr_sql[$key].' LIKE \'%'.$value.'%\' COLLATE utf8_general_ci' : $this->arr_sql[$key].' = '.$value;
$where .= ($key!='device_type' AND $key!='member_id') ? $this->arr_sql[$key].' LIKE \'%'.$value.'%\' COLLATE utf8_general_ci' : $this->arr_sql[$key].' = '.$value;
}
}
......
if($key!='submit')
{
if($where!='WHERE ') $where .= ' AND ';
$where .= ($key!='device_type') ? $this->arr_sql[$key].' LIKE \'%'.$value.'%\' COLLATE utf8_general_ci' : $this->arr_sql[$key].' = '.$value;
$where .= ($key!='device_type' AND $key!='member_id') ? $this->arr_sql[$key].' LIKE \'%'.$value.'%\' COLLATE utf8_general_ci' : $this->arr_sql[$key].' = '.$value;
}
}
freenetis/trunk/kohana/application/controllers/members.php
unset($url_array);
$sql_offset = ($sql_offset>$total_members) ? 0 : $sql_offset;
$arr_gets = array();
foreach ($this->input->get() as $key=>$value) $arr_gets[] = $key.'='.$value;
$query_string = '?'.implode('&',$arr_gets);
// $dotaz = $model_members
// -> like($filter->values())
// -> orderby($order_by, $order_by_direction)
......
'order_by' => $order_by,
'order_by_direction' => $order_by_direction,
'limit_results' => $limit_results,
'query_string' => $this->input->get()
'query_string' => $query_string
));
if ($this->acl_check_2D('freenetis', 'new_all'))
freenetis/trunk/kohana/application/controllers/users.php
$dotaz = $model_users->get_all_users($sql_offset, (int)$limit_results, $order_by, $order_by_direction, $filter->values());
$arr_gets = array();
foreach ($this->input->get() as $key=>$value) $arr_gets[] = $key.'='.$value;
$query_string = '?'.implode('&',$arr_gets);
$grid = new Grid(url_lang::base().'users', url_lang::lang('texts.List of all users'),array(
//'separator' => '',
......
'order_by' => $order_by,
'order_by_direction' => $order_by_direction,
'limit_results' => $limit_results,
'query_string' => $this->input->get()
'query_string' => $query_string
));
//$grid->add_new_button(url_lang::base().'users/add', url_lang::lang('texts.Add new user'));
freenetis/trunk/kohana/application/controllers/devices.php
$device_model = new Device_Model;
$member_id = NULL;
if (is_numeric($this->input->get('member_id'))) $member_id = $this->input->get('member_id');
$member = new Member_Model($member_id);
if ($member->id) $this->session->set('ssMember_id',$member_id);
//$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();
......
$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('hidden','member_id','',array($member_id)),
"td",
new Table_Form_Item('submit','submit','Filter')
)
);
$filter_values = $filter->values();
$total_devices = $device_model->count_all_devices($filter->values());
if ($member->id) $filter_values["member_id"] = (int) $this->input->get('member_id');
$total_devices = $device_model->count_all_devices($filter_values);
// get new selector
if (is_numeric($this->input->get('record_per_page'))) $limit_results = (int) $this->input->get('record_per_page');
......
unset($url_array);
$sql_offset = ($sql_offset>$total_devices) ? 0 : $sql_offset;
$query = $device_model->get_all_devices($sql_offset, (int)$limit_results, $order_by, $order_by_direction, NULL, $filter->values());
$query = $device_model->get_all_devices($sql_offset, (int)$limit_results, $order_by, $order_by_direction, NULL, $filter_values);
$grid = new Grid(url_lang::base().'devices', url_lang::lang('texts.Devices list'),array(
$arr_gets = array();
foreach ($this->input->get() as $key=>$value) $arr_gets[] = $key.'='.$value;
$query_string = '?'.implode('&',$arr_gets);
$headline = ($member->id) ? url_lang::lang('texts.Devices list of member').' '.$member->name : url_lang::lang('texts.Devices list');
$grid = new Grid(url_lang::base().'devices', $headline, array(
//'separator' => '<br />-----------',
//'use_paginator' => false,
//'use_selector' => false,
......
'order_by' => $order_by,
'order_by_direction' => $order_by_direction,
'limit_results' => $limit_results,
'query_string' => $this->input->get()
'query_string' => $query_string
));
if ($member->id) $grid->add_new_button(url_lang::base().'devices/show_all', url_lang::lang('texts.Back to list of all devices'));
$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'));
......
//=============================================================================
function show_by_member($member_id=NULL, $limit_results = 500, $order_by = 'id', $order_by_direction = 'ASC')
{
if (!isset($member_id)) {
url::redirect(url_lang::base().'devices/show_all?member_id='.$member_id);
/**if (!isset($member_id)) {
Controller::warning(1);
} else {
......
$view->render(TRUE);
}
**/
}
//----- end show_by_member ----------------------------------------------------------
//=============================================================================
freenetis/trunk/kohana/application/libraries/Order_field.php
$this->create_order_by_link($new_order,$arguments['order_by'],$arguments['order_by_direction'],$arguments['limit_results'],$arguments['url_array_ofset'],$arguments['variables'],$arguments['query_string']);
}
public function create_order_by_link($new_order_by = 'users.id', $order_by = 'users.id', $order_by_direction = 'ASC', $record_per_page = NULL, $url_array_ofset = 0, $variables = '', $query_string = array())
public function create_order_by_link($new_order_by = 'users.id', $order_by = 'users.id', $order_by_direction = 'ASC', $record_per_page = NULL, $url_array_ofset = 0, $variables = '', $query_string = '')
{
$url_array = explode('/', trim(url::current(), '/'));
if (count($url_array)<7)
......
}
$this->return_link = url_lang::base().$pre_url.$new_order_by.'/'.$order_by_direction.'/';
$this->return_link .= ($this->use_paginator) ? $url_array[6+$url_array_ofset].'/'.$url_array[7+$url_array_ofset] : '';
if(count($query_string)>0)
if($query_string!='')
{
$query_link = '';
foreach($query_string as $key => $value) $query_link .= '&'.$key.'='.$value;
$query_link[0] = '?';
$this->return_link .= $query_link;
$this->return_link .= $query_string;
}
}
}
freenetis/trunk/kohana/application/libraries/Grid.php
protected $limit_results;
protected $record_per_page = NULL;
protected $url_array_ofset = 0;
protected $query_string = array();
protected $query_string;
public function __construct($base_uri, $title, $config = NULL, $template = FALSE)
{
freenetis/trunk/kohana/application/views/table_form.php
echo " <td><input name='submit' type='submit' value='"
.url_lang::lang("texts.".$value->label)."' class=\"submit\" /></td>\n";
break;
case "hidden":
echo " <input name='".$value->name."' value='".$value->values[0]."' type='hidden'>\n";
break;
case "select":
echo " <td><label for='".$value->name."'>".url_lang::lang('texts.'.$value->label).":</label></td><td><select name='".$value->name."'>\n";
foreach ($value->values as $key => $val_value)

Také k dispozici: Unified diff