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

Merge branch '2.4' of github.com:MISP/MISP into 2.4

pull/5005/head
iglocska 2019-08-14 17:04:28 +02:00
parent 7a56d9ff43 bb475784f0
commit cf6bc6f204
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/SharingGroupsController.php
View File

@ -21,7 +21,7 @@ class SharingGroupsController extends AppController
'order' => array(
'SharingGroup.name' => 'ASC'
),
'fields' => array('SharingGroup.id', 'SharingGroup.name', 'SharingGroup.description', 'SharingGroup.releasability', 'SharingGroup.local', 'SharingGroup.active'),
'fields' => array('SharingGroup.id', 'SharingGroup.uuid', 'SharingGroup.name', 'SharingGroup.description', 'SharingGroup.releasability', 'SharingGroup.local', 'SharingGroup.active'),
'contain' => array(
'SharingGroupOrg' => array(
'Organisation' => array('fields' => array('Organisation.name', 'Organisation.id', 'Organisation.uuid'))

2
app/View/SharingGroups/index.ctp
View File

@ -40,6 +40,7 @@
<table class="table table-striped table-hover table-condensed">
<tr>
<th><?php echo $this->Paginator->sort('id');?></th>
<th><?php echo __('uuid');?></th>
<th><?php echo $this->Paginator->sort('name');?></th>
<th><?php echo $this->Paginator->sort('Creator');?></th>
<th><?php echo __('Description');?></th>
@ -51,6 +52,7 @@ foreach ($sharingGroups as $k => $sharingGroup):
?>
<tr>
<td class="short"><?php echo h($sharingGroup['SharingGroup']['id']); ?></td>
<td class="short"><?php echo h($sharingGroup['SharingGroup']['uuid']); ?></td>
<td class="short"><?php echo h($sharingGroup['SharingGroup']['name']); ?></td>
<td class="short"><a href="/organisations/view/<?php echo h($sharingGroup['Organisation']['id']);?>"><?php echo h($sharingGroup['Organisation']['name']); ?></a></td>
<td><?php echo h($sharingGroup['SharingGroup']['description']); ?></td>

2
app/View/SharingGroups/view.ctp
View File

@ -1,7 +1,7 @@
<div class="roles view">
<h2><?php echo __('Sharing Group');?></h2>
<?php
$fields = array('id', 'name', 'releasability', 'description', 'active');
$fields = array('id', 'uuid', 'name', 'releasability', 'description', 'active');
?>
<dl>
<?php