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

Added tooltip for event ID in attribute search results, fixes #351

pull/375/head
iglocska 2014-12-03 17:23:32 +01:00
parent d895fb1834
commit 2e28dd2dde
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controller/AttributesController.php
View File

@ -81,7 +81,7 @@ class AttributesController extends AppController {
*/
public function index() {
$this->Attribute->recursive = 0;
$this->Attribute->contain = array('Event.id', 'Event.orgc', 'Event.org');
$this->Attribute->contain = array('Event.id', 'Event.orgc', 'Event.org', 'Event.info');
$this->set('isSearch', 0);
$this->set('attributes', $this->paginate());
$this->set('attrDescriptions', $this->Attribute->fieldDescriptions);
@ -1270,7 +1270,7 @@ class AttributesController extends AppController {
'limit' => 60,
'maxLimit' => 9999, // LATER we will bump here on a problem once we have more than 9999 attributes?
'conditions' => $conditions,
'contain' => array('Event.orgc', 'Event.id', 'Event.org', 'Event.user_id')
'contain' => array('Event.orgc', 'Event.id', 'Event.org', 'Event.user_id', 'Event.info')
);
if (!$this->_isSiteAdmin()) {
// merge in private conditions

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

@ -59,7 +59,7 @@ foreach ($attributes as $attribute):
?>
<tr>
<td class="short">
<div onclick="document.location='/events/view/<?php echo $attribute['Event']['id'];?>';">
<div onclick="document.location='/events/view/<?php echo $attribute['Event']['id'];?>';" title="<?php echo h($attribute['Event']['info']); ?>">
<?php
if ($attribute['Event']['orgc'] == $me['org']) {
$style='style="color:red;"';