MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Small fixes

pull/762/head
Iglocska 2015-12-09 02:29:04 +01:00
parent b40e0fdc7c
commit 99e8263447
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Controller/ServersController.php
View File

@ -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);

2
app/View/Users/admin_view.ctp
View File

@ -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>
&nbsp;
</dd>
<dt><?php echo __('Role'); ?></dt>