mirror of https://github.com/MISP/MISP
Small fixes
parent
b40e0fdc7c
commit
99e8263447
|
@ -98,7 +98,8 @@ class ServersController extends AppController {
|
|||
$customPagination = new CustomPaginationTool();
|
||||
$params = $customPagination->createPaginationRules($events, $this->passedArgs, $this->alias);
|
||||
$this->params->params['paging'] = array($this->modelClass => $params);
|
||||
$customPagination->truncateByPagination($events, $params);
|
||||
if (is_array($events)) $customPagination->truncateByPagination($events, $params);
|
||||
else ($events = array());
|
||||
$this->set('events', $events);
|
||||
$this->set('eventDescriptions', $this->Event->fieldDescriptions);
|
||||
$this->set('analysisLevels', $this->Event->analysisLevels);
|
||||
|
|
|
@ -13,7 +13,7 @@ $buttonModifyStatus = $mayModify ? 'button_on':'button_off';
|
|||
</dd>
|
||||
<dt><?php echo __('Org'); ?></dt>
|
||||
<dd>
|
||||
<?php echo h($user['Organisation']['name']); ?>
|
||||
<a href="<?php echo $baseurl?>/organisations/view/<?php echo h($user['Organisation']['id']); ?>"><?php echo h($user['Organisation']['name']); ?></a>
|
||||
|
||||
</dd>
|
||||
<dt><?php echo __('Role'); ?></dt>
|
||||
|
|
Loading…
Reference in New Issue