Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 1859

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

Upravy:
- #397: Nepovinne Pripojeno k rozhrani u pridavani/editace zarizeni/rozhrani - upozorneni na rozpojeni zarizeni

Zobrazit rozdíly:

freenetis/branches/1.1/application/i18n/cs_CZ/texts.php
'param id with same value was used for another message before' => 'Byl použit parametr id s hodnotou, která již byla použita pro jinou zprávu',
'if for any reason this automatic config file creation doesn\'t work, don\'t worry' => 'Jestliže z nějakého důvodu toto automatické vytvoření konfiguračního souboru nebude fungovat, nezoufejte.',
'if message does not arrive in 20 minutes, please contact support' => 'Pokud zpráva nedorazí do 20 minut, kontaktujte prosím podporu',
'if you do not change this connected to option, link between these devices will be destroyed' => 'Pokud nezměníte toto připojeno k, spojení mezi těmito zařízeními bude zrušeno',
'if you want to run more than one freenetis in a single database' => 'pokud chcete provozovat více než jednu FreenetIS instalaci v jedné databázi',
'if you want to run multiple freenetis installations in a single database, change this' => 'Jestliže chcete provozovat několik FreenetIS instalací v jedné databázi, změňte toto.',
'if your database is not prepared, on next page you will be asked to set some information about main user and organization' => 'Pokud není vaše databáze připravena, budete na následující straně vyzváni k zadání několika informací o hlavním uživateli a organizaci.',
......
'interval is required' => 'Interval je povinný',
'interval of interruption collides with another interruption of this member' => 'Interval přerušení koliduje s jiným přerušením tohoto člena',
'interval of loop' => 'Interval opakování',
'interface that you choosed is connected to another interface' => 'Rozhraní, které jste vybrali je připojeno k jinému rozhraní',
'interval of whitelist collides with another whitelist of this member' => 'Interval bílé listiny koliduje s jinou bílou listinou člena.',
'interval of update' => 'Interval aktualizace',
'invalid connect to interface - already has different link' => 'Nelze se připojit k rozhraní - již má jinou linku',
freenetis/branches/1.1/application/controllers/json.php
}
/**
* Callback AJAX function to return iface and device that are connected
* to given iface.
*
* @author Ondřej Fibich
*/
public function get_iface_and_device_connected_to_iface()
{
$iface = new Iface_Model($this->input->get('iface_id'));
$parent_iface = new Iface_Model($this->input->get('parent_iface_id'));
if ($iface->id)
{
$connected_iface = $iface->get_iface_connected_to_iface();
if ($connected_iface && (!$parent_iface->id || $parent_iface->id != $connected_iface->id))
{
die(json_encode(array
(
'iface' => $connected_iface->as_array(),
'device' => $connected_iface->device->as_array()
)));
}
}
die(json_encode(null));
}
/**
* Callback AJAX function to filter's whisper for SSID
*
* @author Michal Kliment
freenetis/branches/1.1/application/controllers/js.php
$add_button = FALSE, $connect_type = NULL)
{
$this->views['ifaces_add'] = View::factory('js/ifaces_add');
$this->views['ifaces_add']->iface_id = NULL;
$this->views['ifaces_add']->device_id = $device_id;
$this->views['ifaces_add']->itype = $itype;
$this->views['ifaces_add']->add_button = $add_button;
......
$this->views['ifaces_edit'] = View::factory('js/ifaces_add');
$this->views['ifaces_edit']->device_id = $iface->device_id;
$this->views['ifaces_edit']->iface_id = $iface->id;
$this->views['ifaces_edit']->itype = $type;
$this->views['ifaces_edit']->add_button = $add_button;
$this->views['ifaces_edit']->connect_type = $connect_type;
freenetis/branches/1.1/application/views/js/devices_add.php
}
});
}
var type = $p.find('input[name^="type["]').val();
if (!made)
{
var type = $p.find('input[name^="type["]').val();
var default_name = (type == <?php echo Iface_Model::TYPE_WIRELESS ?>) ? '<?php echo __('air') ?>' : '<?php echo __('cable') ?>';
var device_id = $(this).parent().find('select[name^="connected["] option:selected').val();
......
$p.find('input[name^="wireless_channel_width["]').val(null);
$p.find('input[name^="wireless_polarization["]').val(null);
}
// inform user if the new connection will break some old connection (#397)
if (type == <?php echo Iface_Model::TYPE_PORT ?> || type == <?php echo Iface_Model::TYPE_ETHERNET ?>)
{
$.ajax({
method: 'get',
dataType: 'json',
url: '<?php echo url_lang::base(); ?>json/get_iface_and_device_connected_to_iface?iface_id=' + iface_id,
success: function (v)
{
if (v && v.device && v.iface)
{
var m = '<?php echo __('Interface that you choosed is connected to another interface') ?>:\n\n';
m += '<?php echo __('Device') ?>: ' + v.device.id + ', ' + v.device.name + '\n';
m += '<?php echo __('Interface') ?>: ' + v.iface.name + ', ' + v.iface.mac + '\n\n';
m += '<?php echo __('If you do not change this connected to option, link between these devices will be destroyed') ?>!';
alert(m);
}
}
});
}
}
/**
freenetis/branches/1.1/application/views/js/ifaces_add.php
{
$link_add_detail.hide();
}
var type = $('#itype').val();
if (!made)
{
var type = $('#itype').val();
var default_name = (type == <?php echo Iface_Model::TYPE_WIRELESS ?>) ? '<?php echo __('air') ?>' : '<?php echo __('cable') ?>';
$.ajax({
......
$('#wireless_channel_width').val(null);
$('#wireless_polarization').val(null);
}
// inform user if the new connection will break some old connection (#397)
if (type == <?php echo Iface_Model::TYPE_PORT ?> || type == <?php echo Iface_Model::TYPE_ETHERNET ?>)
{
$.ajax({
method: 'get',
dataType: 'json',
url: '<?php echo url_lang::base(); ?>json/get_iface_and_device_connected_to_iface?iface_id=' + iface_id<?php if ($iface_id): echo " + '&parent_iface_id=$iface_id'"; endif; ?>,
success: function (v)
{
if (v && v.device && v.iface)
{
var m = '<?php echo __('Interface that you choosed is connected to another interface') ?>:\n\n';
m += '<?php echo __('Device') ?>: ' + v.device.id + ', ' + v.device.name + '\n';
m += '<?php echo __('Interface') ?>: ' + v.iface.name + ', ' + v.iface.mac + '\n\n';
m += '<?php echo __('If you do not change this connected to option, link between these devices will be destroyed') ?>!';
alert(m);
}
}
});
}
}
// on add of new item to one of multiple selectboxes for port - vlan relationship

Také k dispozici: Unified diff