Revize 1752
Přidáno uživatelem Ondřej Fibich před asi 12 roky(ů)
| freenetis/branches/1.1/media/css/installation.css | ||
|---|---|---|
|
display: block;
|
||
|
}
|
||
|
|
||
|
.label_required {
|
||
|
color: #990000;
|
||
|
}
|
||
|
|
||
|
.label_required label {
|
||
|
color: #990000;
|
||
|
}
|
||
|
|
||
|
.status_icon {
|
||
|
vertical-align: middle;
|
||
|
padding-right: .5em;
|
||
| freenetis/branches/1.1/application/i18n/cs_CZ/texts.php | ||
|---|---|---|
|
'approval types' => 'Hlasovací typy',
|
||
|
'approve' => 'Schválit',
|
||
|
'approve application for membership' => 'Schválit žádost o členství',
|
||
|
'approve connection request' => 'Schválit žádost o připojení',
|
||
|
'approved' => 'Schváleno',
|
||
|
'approved phone operators and prefixes' => 'Povolení telefonní operátoři a předčíslí',
|
||
|
'approved work reports' => 'Schválené prácovní výkazy',
|
||
| ... | ... | |
|
'content of the message for e-mail' => 'Obsah zprávy pro e-mail',
|
||
|
'content of the message for redirection' => 'Obsah zprávy pro přesměrování',
|
||
|
'content of the message for sms' => 'Obsah zprávy pro SMS',
|
||
|
'continue' => 'Pokračovat',
|
||
|
'continue with works filling' => 'Pokračovat vyplňováním prací',
|
||
|
'contractual increase' => 'Smluvní navýšení',
|
||
|
'cookies must be enabled' => 'Musí být zapnuty cookies.',
|
||
| ... | ... | |
|
'statements' => 'Výpisy',
|
||
|
'stats' => 'Statistiky',
|
||
|
'status' => 'Stav',
|
||
|
'step' => 'Krok',
|
||
|
'steps' => 'Kroky',
|
||
|
'street' => 'Ulice',
|
||
|
'street already exists' => 'Ulice již existuje',
|
||
| freenetis/branches/1.1/application/helpers/callback.php | ||
|---|---|---|
|
echo html::image('media/images/icons/comment.png');
|
||
|
echo '</span>';
|
||
|
}
|
||
|
|
||
|
if (isset($item->member_id) && isset($item->a_comments_thread_id) &&
|
||
|
isset($item->a_comment_add) && $item->a_comment_add)
|
||
|
{
|
||
|
$url = ($item->a_comments_thread_id) ?
|
||
|
'comments/add/'.$item->a_comments_thread_id :
|
||
|
'comments_threads/add/connection_request/'.$item->id;
|
||
|
|
||
|
echo html::anchor($url, html::image('media/images/icons/ico_add.gif'), array
|
||
|
(
|
||
|
'title' => __('Add comment to connection request'),
|
||
|
'class' => 'popup_link'
|
||
|
));
|
||
|
}
|
||
|
}
|
||
|
|
||
|
/**
|
||
| freenetis/branches/1.1/application/models/connection_request.php | ||
|---|---|---|
|
u.id AS user_id, CONCAT(u.name, ' ', u.surname) AS user_name,
|
||
|
s.id AS subnet_id, s.name AS subnet_name,
|
||
|
IFNULL(t.translated_term, e.value) AS device_type,
|
||
|
co.a_comment
|
||
|
co.a_comment, cr.comments_thread_id AS a_comments_thread_id,
|
||
|
1 AS a_comment_add
|
||
|
FROM connection_requests cr
|
||
|
JOIN members m ON m.id = cr.member_id
|
||
|
JOIN subnets s ON s.id = cr.subnet_id
|
||
| freenetis/branches/1.1/application/controllers/connection_requests.php | ||
|---|---|---|
|
->url('connection_requests/edit')
|
||
|
->class('popup_link');
|
||
|
}
|
||
|
|
||
|
|
||
|
$grid->datasource($connection_requests);
|
||
|
|
||
| ... | ... | |
|
// some info were not entered?
|
||
|
if (!$cr_model->device_template_id)
|
||
|
{
|
||
|
$enum_type_model = new Enum_type_Model();
|
||
|
$templates = array
|
||
|
(
|
||
|
NULL => '--- ' . __('Select template') . ' ---'
|
||
|
);
|
||
|
|
||
|
$templates += ORM::factory('device_template')
|
||
|
->where('enum_type_id', $cr_model->device_type_id)
|
||
|
->select_list();
|
||
|
|
||
|
// form
|
||
|
$form = new Forge();
|
||
|
|
||
|
$form->dropdown('device_template_id')
|
||
|
->options($enum_type_model->get_values($cr_model->device_type_id))
|
||
|
->options($templates)
|
||
|
->rules('required')
|
||
|
->label('Device template')
|
||
|
->style('width:200px');
|
||
| ... | ... | |
|
|
||
|
status::info('Add device for acception of connection request.');
|
||
|
// hard redirect, no $this->redirect here!
|
||
|
url::redirect('devices/add_from_connection_request');
|
||
|
url::redirect('devices/add_from_connection_request/' . $cr_model->id);
|
||
|
}
|
||
|
catch (Exception $e)
|
||
|
{
|
||
| ... | ... | |
|
->link('connection_requests/show/' . $cr_model->id,
|
||
|
$cr_model->ip_address . ' (' . $cr_model->mac_address . ')',
|
||
|
$this->acl_check_view('Connection_requests_Controller', 'request', $cr_model->member_id))
|
||
|
->enable_translation()
|
||
|
->text('Approve connection request');
|
||
|
|
||
|
// view
|
||
|
$headline = __('Approve request for connection: Step 1');
|
||
|
$headline = __('Approve connection request') . ': ' . __('Step') . ' 1';
|
||
|
$view = new View('main');
|
||
|
$view->title = $headline;
|
||
|
$view->breadcrumbs = $breadcrumbs->html();
|
||
| ... | ... | |
|
else
|
||
|
{
|
||
|
// hard redirect, no $this->redirect here!
|
||
|
url::redirect('devices/add_from_connection_request');
|
||
|
url::redirect('devices/add_from_connection_request/' . $cr_model->id);
|
||
|
}
|
||
|
}
|
||
|
|
||
| freenetis/branches/1.1/application/controllers/devices.php | ||
|---|---|---|
|
$uid = ORM::factory('member')->get_main_user($connection_request->member_id);
|
||
|
|
||
|
// redirect
|
||
|
$this->add($uid, $connection_request->id);
|
||
|
url::redirect('devices/add/' . $uid . '/' . $connection_request->id);
|
||
|
}
|
||
|
|
||
|
/**
|
||
Také k dispozici: Unified diff
Novinky:
- fixes #346: Formular pro zadani zadosti.
- fixes #344: Rozhrani zobrazujici zadosti o pripojeni
Oprava:
- stylovani required poli v install CSS stylu