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

Show the number of events for each tag in the tag index

pull/304/merge
iglocska 2014-08-20 14:55:10 +02:00
parent 08b2db6895
commit 7e2b8ceb85
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/Controller/TagsController.php
View File

@ -25,7 +25,27 @@ class TagsController extends AppController {
}
public function index() {
$this->set('list', $this->paginate());
$this->loadModel('Event');
$this->Event->recursive = -1;
$this->paginate['contain'] = array('EventTag' => array('fields' => 'event_id'));
$paginated = $this->paginate();
foreach ($paginated as $k => &$tag) {
$eventIDs = array();
if (empty($tag['EventTag'])) $tag['Tag']['count'] = 0;
else {
foreach ($tag['EventTag'] as $eventTag) {
$eventIDs[] = $eventTag['event_id'];
}
$conditions = array('Event.id' => $eventIDs);
if (!$this->_isSiteAdmin()) $conditions = array_merge($conditions, array('OR' => array(array('Event.distribution >' => 0), array('Event.orgc' => $this->Auth->user('org')))));
$events = $this->Event->find('all', array(
'fields' => array('Event.id', 'Event.distribution', 'Event.orgc'),
'conditions' => $conditions
));
$tag['Tag']['count'] = count($events);
}
}
$this->set('list', $paginated);
// send perm_tagger to view for action buttons
}

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

@ -20,6 +20,7 @@
<tr>
<th><?php echo $this->Paginator->sort('id');?></th>
<th><?php echo $this->Paginator->sort('name');?></th>
<th>Count</th>
<?php if ($isAclTagger): ?>
<th class="actions"><?php echo __('Actions');?></th>
<?php endif; ?>
@ -28,6 +29,7 @@ foreach ($list as $item): ?>
<tr>
<td class="short"><?php echo h($item['Tag']['id']); ?>&nbsp;</td>
<td><a href="/events/index/searchtag:<?php echo $item['Tag']['id']; ?>" class="tag" style="background-color: <?php echo h($item['Tag']['colour']); ?>;color:<?php echo $this->TextColour->getTextColour($item['Tag']['colour']); ?>"><?php echo h($item['Tag']['name']); ?></a></td>
<td class="short"><?php echo h($item['Tag']['count']); ?>&nbsp;</td>
<?php if ($isAclTagger): ?>
<td class="short action-links">
<?php echo $this->Html->link('', array('action' => 'edit', $item['Tag']['id']), array('class' => 'icon-edit', 'title' => 'Edit'));?>