Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 1963

Přidáno uživatelem Ondřej Fibich před více než 11 roky(ů)

Novinky:
- closes #578: Moznost nezobrazeni nekterych typu zarizeni v pozadavku na pripojeni a moznost nastavit defaultni typ zarizeni

Zobrazit rozdíly:

freenetis/branches/1.1/application/i18n/cs_CZ/texts.php
'all users' => 'Všichni uživatelé',
'allow' => 'Povolit',
'allow additional payment' => 'Povolit doplatek',
'allowed device types' => 'Povolené typy zařízení',
'allowed subnet' => 'Povolená podsíť',
'allowed subnets' => 'Povolené podsítě',
'allowed subnets update' => 'Povolené podsítě',
......
'default' => 'Výchozí',
'default approval template' => 'Výchozí hlasovací šablona',
'default count' => 'Výchozí počet',
'default device type' => 'Výchozí typ zařízení',
'default driver' => 'Výchozí ovladač',
'default e-mail' => 'Výchozí e-mail',
'default fee for date %s have not been set!' => 'Výchozí příspěvek pro datum %s není nastaven!',
freenetis/branches/1.1/application/controllers/settings.php
->style('width:50px')
->help('dhcp_server_reload_timeout');
$this->form->group('Connection requests');
$this->form->html_textarea('connection_request_info')
->label('Add form information')
->help(help::hint('connection_request_info_form'))
->rows(5)
->cols(100)
->value(Settings::get('connection_request_info'));
if (Settings::get('connection_request_enable'))
{
$this->form->group('Connection requests');
// enum types for device
$enum_type_model = new Enum_type_Model();
$types = $enum_type_model->get_values(Enum_type_Model::DEVICE_TYPE_ID);
$allowed_types = explode(':', Settings::get('connection_request_device_types'));
$default_types = $types;
// throw away unallowed types
if (Settings::get('connection_request_device_types'))
{
foreach ($default_types as $key => $val)
{
if (array_search($key, $allowed_types) === FALSE)
{
unset($default_types[$key]);
}
}
}
$default_types[NULL] = '--- ' . __('Select type') . ' ---';
asort($default_types);
$this->form->dropdown('connection_request_device_default_type')
->label('Default device type')
->options($default_types)
->selected(Settings::get('connection_request_device_default_type'))
->style('width:200px');
$this->form->dropdown('connection_request_device_types[]')
->label('Allowed device types')
->options($types)
->selected($allowed_types)
->multiple('multiple')
->size(10);
$this->form->html_textarea('connection_request_info')
->label('Add form information')
->help(help::hint('connection_request_info_form'))
->rows(5)
->cols(100)
->value(Settings::get('connection_request_info'));
}
$this->form->submit('Save');
......
{
$value = str_replace("\n", ",", $value);
}
else if ($name == 'connection_request_device_types')
{
$value = empty($value) ? '' : implode(':', $value);
}
else if ($name == 'dns_servers')
{
$old_value = Settings::get('dns_servers');
freenetis/branches/1.1/application/controllers/connection_requests.php
// enum types for device
$enum_type_model = new Enum_type_Model();
$types = $enum_type_model->get_values(Enum_type_Model::DEVICE_TYPE_ID);
// throw away unallowed types
if (Settings::get('connection_request_device_types'))
{
$allowed_types = explode(':', Settings::get('connection_request_device_types'));
foreach ($types as $key => $val)
{
if (array_search($key, $allowed_types) === FALSE)
{
unset($types[$key]);
}
}
}
$types[NULL] = '----- '.__('Select type').' -----';
asort($types);
......
$form->dropdown('device_type_id')
->options($types)
->selected($enum_type_model->get_type_id('PC', Enum_type_Model::DEVICE_TYPE_ID))
->selected(Settings::get('connection_request_device_default_type'))
->label('Device type')
->rules('required')
->style('width:200px')

Také k dispozici: Unified diff