Revize 1139
Přidáno uživatelem Ondřej Fibich před asi 13 roky(ů)
freenetis/branches/testing/application/models/device_admin.php | ||
---|---|---|
* @param integer $device_user_id
|
||
* @return MySQL iterator object
|
||
*/
|
||
public function get_all_devices_in_user_device_admins($user_id, $query = '', $device_user_id = NULL)
|
||
public function get_all_devices_in_user_device_admins(
|
||
$user_id, $query = '', $device_user_id = NULL)
|
||
{
|
||
$sql = array();
|
||
|
freenetis/branches/testing/application/models/user.php | ||
---|---|---|
public function select_list_grouped()
|
||
{
|
||
$users = $this->db->query("
|
||
SELECT id, CONCAT(name, ' ', surname, ' - ', login) AS value
|
||
SELECT id, CONCAT(surname, ' ', name, ' - ', login) AS value
|
||
FROM users
|
||
ORDER BY name, surname, login
|
||
");
|
freenetis/branches/testing/application/models/aro.php | ||
---|---|---|
) ORDER BY name
|
||
", array("%$name%", $id));
|
||
}
|
||
}
|
||
}
|
||
|
||
/**
|
||
* Funkce vraci vsechny zaznamy z aro, ktere jsou v dane device_admins skupine (dle id zarizeni).
|
||
*/
|
||
|
||
|
||
/**
|
||
* Function gets all records, which are in given aro device_admins group by id of group
|
||
*
|
||
... | ... | |
*/
|
||
public function get_all_from_device_admins_by_aro_group_id($id, $name = NULL)
|
||
{
|
||
if (empty($query))
|
||
if (empty($name))
|
||
{
|
||
return $this->db->query("
|
||
SELECT * FROM aro
|
||
... | ... | |
*/
|
||
public function get_all_not_in_from_device_admins_by_aro_group_id($id, $name = NULL)
|
||
{
|
||
if (empty($query))
|
||
if (empty($name))
|
||
{
|
||
return $this->db->query("
|
||
SELECT * FROM aro
|
freenetis/branches/testing/application/controllers/device_admins.php | ||
---|---|---|
$right_user = $this->input->post('right_user');
|
||
|
||
//pridani uzivatele do skupiny
|
||
if ($this->input->post('add') != NULL && $this->input->post("system_devices") != '')
|
||
if ($this->input->post('add') != NULL &&
|
||
$this->input->post("system_devices") != '')
|
||
{
|
||
foreach ($this->input->post("system_devices") as $device_id)
|
||
{
|
freenetis/branches/testing/application/controllers/works.php | ||
---|---|---|
Controller::error(RECORD);
|
||
|
||
// access control
|
||
if (!$this->acl_check_view('Users_Controller','work',$work->user->member_id))
|
||
if (!$this->acl_check_view('Users_Controller', 'work', $work->user->member_id))
|
||
Controller::error(ACCESS);
|
||
|
||
// breadcrumbs navigation
|
||
... | ... | |
$this->breadcrumbs->link('members/show_all', 'Members',
|
||
$this->acl_check_view('Members_Controller', 'members'))
|
||
->disable_translation()
|
||
->link('members/show/'.$user->member->id,
|
||
'ID ' . $user->member->id . ' - ' . $user->member->name,
|
||
->link('members/show/'.$work->user->member->id,
|
||
'ID ' . $work->user->member->id . ' - ' .
|
||
$work->user->member->name,
|
||
$this->acl_check_view(
|
||
'Members_Controller', 'members',
|
||
$user->member->id
|
||
$work->user->member->id
|
||
)
|
||
)->enable_translation()
|
||
->link('users/show_by_member/' . $user->member_id,
|
||
->link('users/show_by_member/' . $work->user->member_id,
|
||
'Users',
|
||
$this->acl_check_view(
|
||
'Users_Controller', 'users',
|
||
$user->member_id
|
||
$work->user->member_id
|
||
)
|
||
)->disable_translation()
|
||
->link('users/show/'.$user->id,
|
||
$user->name . ' ' . $user->surname .
|
||
' (' . $user->login . ')',
|
||
->link('users/show/'.$work->user->id,
|
||
$work->user->name . ' ' . $work->user->surname .
|
||
' (' . $work->user->login . ')',
|
||
$this->acl_check_view(
|
||
'Users_Controller','users',
|
||
$user->member_id
|
||
$work->user->member_id
|
||
)
|
||
)->enable_translation()
|
||
->link('works/show_by_user/'.$work->user->id, 'Works',
|
freenetis/branches/testing/application/views/members_show.php | ||
---|---|---|
</tr>
|
||
<?php } ?>
|
||
<tr>
|
||
<th colspan="2">
|
||
<?php echo ($member->members_domicile->address_point->id) ? url_lang::lang('texts.Address of connecting place').' '.help::hint('address_point_member_connecting_place') : url_lang::lang('texts.Address') ?>
|
||
|
||
<a href="http://maps.google.com/maps?f=q&hl=<?php echo $lang ?>&geocode=&q=<?php echo $map_query ?>&z=18&t=h&ie=UTF8" target="_blank" style="float: right; text-decoration: none;">
|
||
<?php echo html::image(array
|
||
(
|
||
'width' => 16,
|
||
'height' => 16,
|
||
'alt' => 'Map ico',
|
||
'src' => 'media/images/icons/map_icon.gif',
|
||
'style' => 'margin-right: 5px; vertical-align:middle; border: none;'
|
||
)) . url_lang::lang('texts.Map') ?>
|
||
</a>
|
||
<th>
|
||
<?php echo ($member->members_domicile->address_point->id) ?
|
||
url_lang::lang('texts.Address of connecting place').' '.help::hint('address_point_member_connecting_place') :
|
||
url_lang::lang('texts.Address') ?>
|
||
</th>
|
||
<th>
|
||
<table style="float: right">
|
||
<tr>
|
||
<td style="border: none; padding: 0;">
|
||
<a href="http://maps.google.com/maps?f=q&hl=<?php echo $lang ?>&geocode=&q=<?php echo $map_query ?>&z=18&t=h&ie=UTF8" target="_blank" style="float: right; text-decoration: none;">
|
||
<?php echo html::image(array
|
||
(
|
||
'width' => 16,
|
||
'height' => 16,
|
||
'alt' => 'Map ico',
|
||
'src' => 'media/images/icons/map_icon.gif',
|
||
'style' => 'margin-right: 5px; vertical-align:middle; border: none;'
|
||
)) . url_lang::lang('texts.Map') ?>
|
||
</a>
|
||
</td>
|
||
<td style="border: none; padding: 0 0 0 10px;">
|
||
<a href="<?php echo url_lang::base() ?>address_points/show/<?php echo $member->address_point->id ?>" target="_blank" style="float: right; text-decoration: none;">
|
||
<?php echo html::image(array
|
||
(
|
||
'width' => 16,
|
||
'height' => 16,
|
||
'alt' => 'Address point ico',
|
||
'src' => 'media/images/icons/address_point.png',
|
||
'style' => 'margin-right: 5px; vertical-align:middle; border: none;'
|
||
)) . url_lang::lang('texts.Address point') ?>
|
||
</a>
|
||
</td>
|
||
</tr>
|
||
</table>
|
||
</th>
|
||
</tr>
|
||
<tr>
|
||
<th><?php echo url_lang::lang('texts.Street') ?></th>
|
freenetis/branches/testing/application/views/devices_show.php | ||
---|---|---|
<td>
|
||
<a href="<?php echo url_lang::base() ?>address_points/show/<?php echo $device->address_point->id ?>">
|
||
<?php
|
||
if ($device->address_point->name)
|
||
echo '„' . $device->address_point->name . '“, ';
|
||
if ($device->address_point->street_id && $device->address_point->street_number)
|
||
echo $device->address_point->street->street.' '.$device->address_point->street_number.', ';
|
||
else if ($device->address_point->street_id)
|
Také k dispozici: Unified diff
Opravy:
- Vyhledavani uzivatelu v devices_admin/edit
- Zobrazeni prace
- Prehozeni jmena a prijmeni u dropdownu s technikem a vlastnikem v controlleru device
Drobne zmeny:
- Pridani odkazu na adresni bod z profilu clena
- Pridani jmena adresniho bodu u zobrazeni zarizeni