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

Merge pull request #7902 from JakubOnderka/attribute-list-link 

fix: [UI] Add link to full attribute
pull/7905/head
Jakub Onderka 2021-10-29 15:04:40 +02:00 committed by GitHub
parent a8c480f198 268b071427
commit 7c77d1d6fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/View/Attributes/index.ctp
View File

@ -20,7 +20,12 @@ echo $this->element('/genericElements/IndexTable/index_table', [
[
'name' => __('Event'),
'sort' => 'Attribute.event_id',
'data_path' => 'Attribute.event_id'
'data_path' => 'Attribute.event_id',
'element' => 'attributeLink',
'link_title_path' => 'Event.info',
'url' => function (array $row) {
return '/events/view/' . $row['Attribute']['event_id'] . '#focus:' . $row['Attribute']['uuid'];
}
],
[
'name' => __('Org'),

20
app/View/Elements/genericElements/IndexTable/Fields/feedHits.ctp
View File

@ -1,7 +1,7 @@
<?php
$object = Hash::extract($row, $field['data']['object']['value_path']);
$li = [];
if (isset($object['Feed'])) {
foreach ($object['Feed'] as $feed) {
$relatedData = array(
@ -46,23 +46,21 @@ if (isset($object['Feed'])) {
h($feed['id'])
);
}
echo "<li>$liContents</li>";
$li[] = "<li>$liContents</li>";
}
}
if (isset($object['Server'])) {
foreach ($object['Server'] as $server) {
$popover = '';
foreach ($server as $k => $v) {
if ($k == 'id') continue;
if ($k === 'id') continue;
if (is_array($v)) {
foreach ($v as $k2 => $v2) {
$v[$k2] = h($v2);
}
$v = implode('<br />', $v);
$v = array_map('h', $v);
$v = implode('<br>', $v);
} else {
$v = h($v);
}
$popover .= '<span class=\'bold black\'>' . Inflector::humanize(h($k)) . '</span>: <span class="blue">' . $v . '</span><br />';
$popover .= '<span class=\'bold black\'>' . Inflector::humanize(h($k)) . '</span>: <span class="blue">' . $v . '</span><br>';
}
foreach ($server['event_uuids'] as $k => $event_uuid) {
$liContents = '';
@ -81,7 +79,11 @@ if (isset($object['Server'])) {
'S' . h($server['id']) . ':' . ($k + 1)
);
}
echo "<li>$liContents</li>";
$li[] = "<li>$liContents</li>";
}
}
}
if (!empty($li)) {
echo '<ul class="inline">' . implode('', $li) .'</ul>';
}

12
app/View/Elements/genericElements/IndexTable/Fields/simple_link.ctp Normal file
View File

@ -0,0 +1,12 @@
<?php
$data = Hash::get($row, $field['data_path']);
$linkTitle = isset($field['link_title_path']) ? h(Hash::get($row, $field['link_title_path'])) : null;
$url = is_callable($field['url']) ? $field['url']($row) : $field['url'];
if ($url[0] === '/') {
$url = $baseurl . $url;
}
echo "<a href=\"$url\"";
if ($linkTitle) {
echo " title=\"$linkTitle\"";
}
echo '>' . h($data) . '</a>';