Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 18ac9009

Přidáno uživatelem Ondřej Fibich před asi 9 roky(ů)

Fix merge issue that removed all staff from developer branch :-).

Zobrazit rozdíly:

application/helpers/action_logs.php
if ($log_model->count_all_object_logs($table, $object_id) == 0)
{
//no modification in last 30 days
return html::image(array
(
'src' => 'media/images/icons/action_logs_none.png'
)).
'&nbsp'.__('No changes in last 30 days');
return html::image(array
(
'src' => 'media/images/icons/grid_action/action_logs_none.png'
)) . '&nbsp'.__('No changes in last 30 days');
}
// get last modification time of object
......
if (!Controller::instance()->acl_check_view('Logs_Controller', 'logs'))
{
// only last modification date
$html = html::image(array
(
'src' => 'media/images/icons/action_logs.png',
'title' => __('Last changed date')
)).
'&nbsp<span title="'.__('Last changed date').'">'.$time.'</span>';
return html::image(array
(
'src' => 'media/images/icons/grid_action/action_logs.png',
'title' => __('Last changed date')
)) . '&nbsp<span title="'.__('Last changed date').'">'.$time.'</span>';
}
else
{
$img = html::image(array
(
'src' => 'media/images/icons/grid_action/action_logs.png',
'title' => __('Show object action logs')
));
// link to details
$html = html::anchor('logs/show_object/'.$table.'/'.$object_id,
html::image(array
(
'src' => 'media/images/icons/action_logs.png',
'title' => __('Show object action logs')
))).
'&nbsp<span title="'.__('Last changed date').'">'.$time.'</span>';
return html::anchor('logs/show_object/'.$table.'/'.$object_id, $img)
. '&nbsp<span title="'.__('Last changed date').'">'.$time.'</span>';
}
return $html;
}
}

Také k dispozici: Unified diff