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

Some small taxonomy fixes

pull/762/head
Iglocska 2015-11-29 22:36:14 +01:00
parent 714ed198e5
commit 184949cc9f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Controller/TagsController.php
View File

@ -29,7 +29,7 @@ class TagsController extends AppController {
$this->loadModel('Taxonomy');
$taxonomies = $this->Taxonomy->listTaxonomies(array('full' => false, 'enabled' => true));
$taxonomyNamespaces = array();
foreach ($taxonomies as &$taxonomy) $taxonomyNamespaces[$taxonomy['Taxonomy']['namespace']] = $taxonomy;
if (!empty($taxonomies)) foreach ($taxonomies as &$taxonomy) $taxonomyNamespaces[$taxonomy['namespace']] = $taxonomy;
$taxonomyTags = array();
$this->Event->recursive = -1;
$this->paginate['contain'] = array('EventTag' => array('fields' => 'event_id'));
@ -61,8 +61,8 @@ class TagsController extends AppController {
if (!empty($taxonomyNamespaces)) {
foreach (array_keys($taxonomyNamespaces) as &$tns) {
if (substr(strtoupper($tag['Tag']['name']), 0, strlen($tns)) === strtoupper($tns)) {
$tag['Tag']['Taxonomy'] = $taxonomyNamespaces[$tns]['Taxonomy'];
if (!isset($taxonomyTags[$tns])) $taxonomyTags[$tns] = $this->Taxonomy->getTaxonomyTags($taxonomyNamespaces[$tns]['Taxonomy']['id'], true);
$tag['Tag']['Taxonomy'] = $taxonomyNamespaces[$tns];
if (!isset($taxonomyTags[$tns])) $taxonomyTags[$tns] = $this->Taxonomy->getTaxonomyTags($taxonomyNamespaces[$tns]['id'], true);
$tag['Tag']['Taxonomy']['expanded'] = $taxonomyTags[$tns][strtoupper($tag['Tag']['name'])];
}
}

1
app/webroot/js/ajaxification.js
View File

@ -486,6 +486,7 @@ function getSelectedTaxonomyNames() {
if ($(this).is(":checked")) {
var row = $(this).data("id");
var temp = $('#tag_' + row).html();
temp = $("<div/>").html(temp).text();
selected.push(temp);
}
});