Revize 1766
Přidáno uživatelem Ondřej Fibich před téměř 12 roky(ů)
| freenetis/branches/1.1/application/controllers/devices.php | ||
|---|---|---|
|
$dm->transaction_start();
|
||
|
|
||
|
// device //////////////////////////////////////////////////////
|
||
|
$dm->user_id = $form_data['user_id'];
|
||
|
$device = new Device_Model();
|
||
|
$device->user_id = $form_data['user_id'];
|
||
|
|
||
|
if (!isset($user_id))
|
||
|
{
|
||
|
$um = new User_Model($dm->user_id);
|
||
|
$um = new User_Model($device->user_id);
|
||
|
}
|
||
|
|
||
|
if (empty($form_data['device_name']))
|
||
|
{
|
||
|
$dm->name = $um->login.'_'.$types[$form_data['device_type']];
|
||
|
$device->name = $um->login.'_'.$types[$form_data['device_type']];
|
||
|
}
|
||
|
else
|
||
|
{
|
||
|
$dm->name = $form_data['device_name'];
|
||
|
$device->name = $form_data['device_name'];
|
||
|
}
|
||
|
|
||
|
$device_template = new Device_template_Model($form_data['device_template_id']);
|
||
|
|
||
|
if ($device_template && $device_template->id)
|
||
|
{
|
||
|
$dm->trade_name = $device_template->name;
|
||
|
$device->trade_name = $device_template->name;
|
||
|
}
|
||
|
|
||
|
$dm->type = $form_data['device_type'];
|
||
|
$dm->PPPoE_logging_in = $form_data['PPPoE_logging_in'];
|
||
|
$device->type = $form_data['device_type'];
|
||
|
$device->PPPoE_logging_in = $form_data['PPPoE_logging_in'];
|
||
|
|
||
|
if ($this->acl_check_new(get_class($this), 'login'))
|
||
|
{
|
||
|
$dm->login = $form_data['login'];
|
||
|
$device->login = $form_data['login'];
|
||
|
}
|
||
|
|
||
|
if ($this->acl_check_new(get_class($this), 'password'))
|
||
|
{
|
||
|
$dm->password = $form_data['login_password'];
|
||
|
$device->password = $form_data['login_password'];
|
||
|
}
|
||
|
|
||
|
$dm->price = $form_data['price'];
|
||
|
$dm->payment_rate = $form_data['payment_rate'];
|
||
|
$dm->buy_date = date('Y-m-d', $form_data['buy_date']);
|
||
|
$dm->comment = $form_data['device_comment'];
|
||
|
$device->price = $form_data['price'];
|
||
|
$device->payment_rate = $form_data['payment_rate'];
|
||
|
$device->buy_date = date('Y-m-d', $form_data['buy_date']);
|
||
|
$device->comment = $form_data['device_comment'];
|
||
|
|
||
|
// address point ///////////////////////////////////////////////////
|
||
|
|
||
| ... | ... | |
|
$ap->save_throwable();
|
||
|
}
|
||
|
|
||
|
$dm->address_point_id = $ap->id;
|
||
|
$dm->save_throwable();
|
||
|
$device->address_point_id = $ap->id;
|
||
|
$device->save_throwable();
|
||
|
|
||
|
// device engineer ////////////////////////////////////////////
|
||
|
|
||
|
$device_engineer = new Device_engineer_Model();
|
||
|
$device_engineer->device_id = $dm->id;
|
||
|
$device_engineer->device_id = $device->id;
|
||
|
$device_engineer->user_id = $form_data['first_engineer_id'];
|
||
|
$device_engineer->save_throwable();
|
||
|
|
||
| ... | ... | |
|
}
|
||
|
// save iface
|
||
|
$im = new Iface_Model();
|
||
|
$im->device_id = $dm->id;
|
||
|
$im->device_id = $device->id;
|
||
|
$im->name = htmlspecialchars($_POST['name'][$i]);
|
||
|
$im->comment = htmlspecialchars($_POST['comment'][$i]);
|
||
|
$im->type = intval($_POST['type'][$i]);
|
||
| ... | ... | |
|
$im_connect_to->wireless_mode == Iface_Model::WIRELESS_MODE_AP)
|
||
|
{
|
||
|
$name .= $im_connect_to->device->name;
|
||
|
$name .= ' - ' . $dm->name;
|
||
|
$name .= ' - ' . $device->name;
|
||
|
}
|
||
|
else
|
||
|
{
|
||
|
$name .= $dm->name . ' - ';
|
||
|
$name .= $device->name . ' - ';
|
||
|
$name .= $im_connect_to->device->name;
|
||
|
}
|
||
|
|
||
| ... | ... | |
|
// allowed subnet to added IP
|
||
|
$update_allowed_params[] = array
|
||
|
(
|
||
|
'member_id' => $dm->user->member_id,
|
||
|
'member_id' => $device->user->member_id,
|
||
|
'to_enable' => array($ipm->subnet_id)
|
||
|
);
|
||
|
}
|
||
| ... | ... | |
|
status::success('Device has been successfully saved.');
|
||
|
}
|
||
|
|
||
|
url::redirect('devices/show/'.$dm->id);
|
||
|
url::redirect('devices/show/'.$device->id);
|
||
|
}
|
||
|
catch (Exception $e) // failed => rollback and wait 100ms before next attempt
|
||
|
{
|
||
| freenetis/branches/1.1/application/views/js/ifaces_add.php | ||
|---|---|---|
|
if ($('#dialog_link_detail form').valid())
|
||
|
{
|
||
|
// fill in hidden fields
|
||
|
switch (parseInt($('#type').val()))
|
||
|
switch (parseInt($('#itype').val()))
|
||
|
{
|
||
|
case <?php echo Iface_Model::TYPE_WIRELESS ?>:
|
||
|
$('#medium').val($('#wl_medium_input').val());
|
||
Také k dispozici: Unified diff
Opravy:
- #396: Nefunguje zmena media linky pri uprave rozhrani
- oprava chybne interpretovane chyby u pridavani zarizeni spojene s #402