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/4237/head
iglocska 2019-02-26 14:11:52 +01:00
parent 3afc8cc304 cc6732e71e
commit 1b418e39ad
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PyMISP

@ -1 +1 @@
Subproject commit 345f055844fed0acdfb34c52d96d1751728bb82c
Subproject commit 634ecc3ac308d01ebf5f5fbb9aace7746a2b8707

2
app/Controller/EventsController.php
View File

@ -4886,7 +4886,7 @@ class EventsController extends AppController
}
}
$scores = $mergedScore;
$maxScore = max(array_values($mergedScore));
$maxScore = !empty($mergedScore) ? max(array_values($mergedScore)) : 0;
}
// end FIXME

4
app/View/Elements/view_galaxy_matrix.ctp
View File

@ -149,6 +149,8 @@ foreach($tabs as $tabName => $column):
$score = empty($scores[$tagName]) ? 0 : $scores[$tagName];
$clusterId = isset($cell['id']) ? $cell['id'] : $name;
$externalId = isset($cell['external_id']) ? $cell['external_id'] : '';
$shortDescription = isset($cell['description']) ? $cell['description'] : '';
$shortDescription = strlen($shortDescription) > 1000 ? substr($shortDescription, 0, 1000) . '[...]' : $shortDescription;
$clusetersNamesMapping[$clusterId] = $name . ($externalId !== '' ? ' (' . $externalId. ')' : '');
$td .= ' class="heatCell matrix-interaction ' . ($pickingMode ? 'cell-picking"' : '"');
@ -160,7 +162,7 @@ foreach($tabs as $tabName => $column):
$td .= ' data-target-type="attribute"';
$td .= ' data-target-id="'.h($target_id).'"';
}
$td .= ' title="'.h($externalId).'"';
$td .= ' title="' . h($externalId) . (strlen($shortDescription) > 0 ? ': 
' . h($shortDescription) : '') . '"';
$td .= '>' . h($name);
} else { // empty cell