Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 1754

Přidáno uživatelem Ondřej Fibich před téměř 12 roky(ů)

Novinky:

- fixes #345: Upravy ve formulari pro pridavani zarizeni

Upravy:

- zvetseni polu pro podsit pri pridavani zarizeni
- umozneni loginu aplikanta

Zobrazit rozdíly:

freenetis/branches/1.1/application/i18n/cs_CZ/texts.php
'connection owner' => 'Vlastník připojení',
'connection request has been rejected' => 'Požadavek na připojení byl zamítnut.',
'connection request has been succesfully edited' => 'Žádost o připojení byla úspěšně editována.',
'connection request has been succesfully approved' => 'Žádost o připojení byla úspěšně schválena.',
'connection requests' => 'Požadavky na připojení',
'connection requests are not enabled' => 'Požadavky na připojení nejsou povoleny.',
'connections' => 'Připojení',
freenetis/branches/1.1/application/models/member.php
* @property date $entrance_form_accepted
* @property date $leaving_date
* @property datetime $applicant_registration_datetime
* @property datetime $applicant_connected_from
* @property date $applicant_connected_from
* @property integer $locked
* @property integer $voip_billing_limit
* @property integer $voip_billing_type
freenetis/branches/1.1/application/controllers/login.php
$error = __('Your accout has been locked.').' '
.__('Please contact administrator.');
}
else if ($member->type == Member_Model::TYPE_APPLICANT)
{
$error = __('Your request for membership has not been approved yet').'.<br>'
.__('Please contact administrator.');
}
else
{
$this->session->set('username', $this->input->post('username'));
......
}
else
{
if ($user_type != User_Model::USER)
if ($member->type == Member_Model::TYPE_APPLICANT)
{
url::redirect('connection_requests/show_by_member/'.$member_id);
}
else if ($user_type != User_Model::USER)
{
url::redirect('members/show/'.$member_id);
}
else
freenetis/branches/1.1/application/controllers/js.php
}
}
private function _js_devices_add($user_id = NULL)
private function _js_devices_add($user_id = NULL, $connection_request_id = NULL)
{
$user = new User_Model($user_id);
......
$user_id = User_Model::ASSOCIATION;
}
$cr_model = new Connection_request_Model($connection_request_id);
$this->address_point_streets();
$this->address_point_gps();
......
$this->views['devices_add'] = View::factory('js/devices_add');
$this->views['devices_add']->arr_subnets = $subnet->select_list_by_net();
$this->views['devices_add']->arr_devices = $device->select_list_device_with_user($user_id);
$this->views['devices_add']->connection_request_model = ($cr_model->loaded) ? $cr_model : NULL;
}
private function _js_devices_add_simple()
freenetis/branches/1.1/application/controllers/devices.php
* and new ip address assigned to this interface.
*
* @param integer $user_id
* @param integer $connection_request_id If device added from connection request
*/
public function add($user_id = null)
public function add($user_id = null, $connection_request_id = NULL)
{
if (!$this->acl_check_new(get_class($this), 'devices'))
{
......
Controller::error(RECORD);
}
$device_name = $um->surname;
$selected = $um->id;
$selected_country_id = $um->member->address_point->country_id;
$selected_street_id = $um->member->address_point->street_id;
......
}
$arr_users[$um->id] = $um->get_name_with_login();
// connection request
if (!empty($connection_request_id))
{
$cr_model = new Connection_request_Model($connection_request_id);
if (!$cr_model->id)
Controller::error(RECORD);
// device name
$device_name = $um->surname . '_' . $cr_model->device_type->get_value();
// all device templates
$arr_device_templates = array
(
NULL => '----- '.__('Select template').' -----'
) + ORM::factory('device_template')
->where('enum_type_id', $cr_model->device_type_id)
->select_list();
}
else
{
// all device templates
$arr_device_templates = array
(
NULL => '----- '.__('Select template').' -----'
) + ORM::factory('device_template')->select_list();
}
}
else
{
......
$selected_street_id = 0;
$selected_street_number = '';
$selected_town_id = 0;
$device_name = '';
$arr_users = array
(
NULL => '----- '.__('select user').' -----'
) + $um->select_list_grouped();
// all device templates
$arr_device_templates = array
(
NULL => '----- '.__('Select template').' -----'
) + ORM::factory('device_template')->select_list();
}
// enum types for device
......
NULL => '----- '.__('Select antenna').' -----'
) + Iface_Model::get_wireless_antennas();
// all device templates
$arr_device_templates = array
(
NULL => '----- '.__('Select template').' -----'
) + ORM::factory('device_template')->select_list();
// country
$arr_countries = ORM::factory('country')->select_list('id', 'country_name');
......
}
// forge form
$form = new Forge('devices/add' . (isset($user_id) ? '/' . $user_id : ''));
$form = new Forge();
$form->set_attr('id', 'device_add_form');
......
$group_device->input('device_name')
->label('Device name')
->value(($user_id) ? $um->surname : '')
->value($device_name)
->rules('required|length[2,200]')
->style('width: 520px');
......
$group_device->dropdown('device_type')
->options($types)
->rules('required')
->selected(isset($cr_model) ? $cr_model->device_type_id : NULL)
->style('width: 200px');
$group_device->dropdown('device_template_id')
->options($arr_device_templates)
->label('Device template')
->rules('required')
->selected(isset($cr_model) ? $cr_model->device_template_id : NULL)
->style('width: 200px')
->add_button('device_templates');
......
);
}
}
// connection request //////////////////////////////////////////
if (isset($cr_model))
{
// change connection request
$cr_model->state = Connection_request_Model::STATE_APPROVED;
$cr_model->save_throwable();
// change connected from if member is applicant and if
// he is not connected yet
if ($cr_model->member->type == Member_Model::TYPE_APPLICANT && (
empty($cr_model->member->applicant_connected_from) ||
$cr_model->member->applicant_connected_from == '0000-00-00'
))
{
// connected from now
$cr_model->member->applicant_connected_from = date('Y-m-d');
$cr_model->member->save_throwable();
}
}
// done
// done ////////////////////////////////////////////////////////
unset($form_data);
$dm->transaction_commit();
//Update allowed subnets after transaction is successfully commited
// connection request - notice /////////////////////////////////
// only if request made by owner of device
if (isset($cr_model) && ($cr_model->member_id == $cr_model->user->member_id))
{
// create comment for user
$comment = NULL;
// trigger notice for member
Message_Model::activate_special_notice(
Message_Model::CONNECTION_REQUEST_APPROVE,
$cr_model->member_id, $this->session->get('user_id'),
Notifications_Controller::ACTIVATE,
Notifications_Controller::KEEP, $comment
);
}
// Update allowed subnets after transaction is successfully commited
foreach ($update_allowed_params as $params)
{
Allowed_subnets_Controller::update_enabled(
......
);
}
status::success('Device has been successfully saved.');
if (isset($cr_model))
{
status::success('Connection request has been succesfully approved.');
}
else
{
status::success('Device has been successfully saved.');
}
url::redirect('devices/show/'.$dm->id);
}
catch (Exception $e)
freenetis/branches/1.1/application/views/menu.php
<li class="account"><h2><?php echo __('My profile')?></h2>
<ul>
<li>
<?php if ($this->session->get('user_type') == User_Model::MAIN_USER): ?>
<?php if ($this->session->get('user_type') == User_Model::MAIN_USER && $this->acl_check_view('Members_Controller', 'members', $this->member_id)): ?>
<?php echo html::anchor('members/show/'.$this->member_id, __('My profile')); ?>
<?php else: ?>
<?php elseif ($this->acl_check_view('Users_Controller', 'members', $this->member_id)): ?>
<?php echo html::anchor('users/show/'.$this->user_id, __('My profile')); ?>
<?php endif ?>
</li>
<?php if ($this->member_account_id): ?>
<?php if ($this->member_account_id && ($this->acl_check_view('Accounts_Controller', 'transfers', $this->member_id) || $this->acl_check_view('Members_Controller', 'currentcredit'))): ?>
<li><?php echo html::anchor('transfers/show_by_account/'.$this->member_account_id, __('My transfers')) ?></li>
<?php endif ?>
freenetis/branches/1.1/application/views/js/devices_add.php
* @param $group Group on which the form is created
* @param data Data (device templates form)
* @param start_index Start index of counter
* @param default_iface Default iface index or -1 if there is no default in this group
* @return integer The value of counter after creating
*/
function create_form_of_group($group, data, start_index)
function create_form_of_group($group, data, start_index, default_iface)
{
var html_buffer = ['<tr><td colspan="2">'];
......
html_buffer.push('<label class="device_add_label">MAC: </label>');
html_buffer.push('<input type="text" name="mac[');
html_buffer.push(i);
html_buffer.push(']" class="mac_address" style="width: 12em" />');
html_buffer.push(']" ');
<?php if (!empty($connection_request_model)): ?>
// add mac from request
if ((default_iface >= 0) && (i == default_iface))
{
html_buffer.push('value="<?php echo $connection_request_model->mac_address ?>" ');
}
<?php endif; ?>
html_buffer.push('class="mac_address" style="width: 12em" />');
}
else if (data['type'] == <?php echo Iface_Model::TYPE_PORT ?>)
{
......
html_buffer.push('<label class="device_add_label">IP: </label>');
html_buffer.push('<input type="text" name="ip[');
html_buffer.push(i);
html_buffer.push(']" style="width:11em" class="ip_address ip_address_check" />');
html_buffer.push(']" ');
<?php if (!empty($connection_request_model)): ?>
// add mac from request
if ((default_iface >= 0) && (i == default_iface))
{
html_buffer.push('value="<?php echo $connection_request_model->ip_address ?>" ');
}
<?php endif; ?>
html_buffer.push('style="width:11em" class="ip_address ip_address_check" />');
html_buffer.push(ip_hiddden);
html_buffer.push('<a href="#" class="device_add_detail_button add_detail_to_ip" title="<?php echo __('Add details to IP address') ?>">');
html_buffer.push('<?php echo html::image(array('src' => 'media/images/icons/settings.gif')) ?>');
......
html_buffer.push('<label class="device_add_label"><?php echo __('Subnet') ?>: </label>');
html_buffer.push('<select name="subnet[');
html_buffer.push(i);
html_buffer.push(']" style="width: 11em">');
html_buffer.push(']" ');
<?php if (!empty($connection_request_model)): ?>
// add mac from request
if ((default_iface >= 0) && (i == default_iface))
{
html_buffer.push('class="subnet_fill_in_connection_request_model_value" ');
}
<?php endif; ?>
html_buffer.push('style="width: 14em">');
html_buffer.push(subnets_options);
html_buffer.push('</select>');
html_buffer.push('</td>');
......
var internals = device_template_value[<?php echo Iface_Model::TYPE_INTERNAL ?>];
var i = 0;
// get default iface
var default_iface = null;
// not set? => choose any thing
if (device_template_value['default_iface'] == undefined)
{
if (eths.count)
default_iface = '<?php echo Iface_Model::TYPE_ETHERNET ?>:0';
else if (wlans.count)
default_iface = '<?php echo Iface_Model::TYPE_WIRELESS ?>:0';
else if (ports.count)
default_iface = '<?php echo Iface_Model::TYPE_PORT ?>:0';
else if (internals.count)
default_iface = '<?php echo Iface_Model::TYPE_INTERNAL ?>:0';
else
default_iface = '-1:-1'; // undefined
}
else
{
default_iface = device_template_value['default_iface'];
}
// default values
var default_parts = default_iface.split(':');
var default_eth = (default_parts[0] == '<?php echo Iface_Model::TYPE_ETHERNET ?>') ? default_parts[1] : -1;
var default_wlan = (default_parts[0] == '<?php echo Iface_Model::TYPE_WIRELESS ?>') ? default_parts[1] : -1;
var default_port = (default_parts[0] == '<?php echo Iface_Model::TYPE_PORT ?>') ? default_parts[1] : -1;
var default_int = (default_parts[0] == '<?php echo Iface_Model::TYPE_INTERNAL ?>') ? default_parts[1] : -1;
// trade name
$eth_ifaces_group.before($('<input>', {
name: 'trade_name',
......
// ethernet
if (eths['count'] > 0)
{
i = create_form_of_group($eth_ifaces_group, eths, i);
i = create_form_of_group($eth_ifaces_group, eths, i, default_eth);
$eth_ifaces_group.show();
}
else
......
// wireless
if (wlans['max_count'] > 0)
{
i = create_form_of_group($wlan_ifaces_group, wlans, i);
i = create_form_of_group($wlan_ifaces_group, wlans, i, default_wlan);
$wlan_ifaces_group.show();
}
else
......
// port
if (ports['count'] > 0)
{
i = create_form_of_group($port_group, ports, i);
i = create_form_of_group($port_group, ports, i, default_port);
$port_group.show();
}
else
......
// internal
if (internals['count'] > 0)
{
i = create_form_of_group($internal_group, internals, i);
i = create_form_of_group($internal_group, internals, i, default_int);
$internal_group.show();
}
else
......
$('select[name^="connected["]').change(change_connected);
$('select[name^="connected_iface["]').change(change_connected_iface);
$('input[name^="_device_filter["]').change(change_filter_connected);
<?php if (!empty($connection_request_model)): ?>
$('.subnet_fill_in_connection_request_model_value').val(<?php echo $connection_request_model->subnet_id ?>);
<?php endif; ?>
// set default value of filter
var $filters = $('input[name^="_device_filter["]');
......
button.attr('href', rtrim(parts[0], '0123456789/') + '/' + value + parts[1]);
}
});
<?php if (!empty($connection_request_model)): ?>
// confirm first part of form after loading
$('#device_add_form').submit();
<?php endif ?>

Také k dispozici: Unified diff