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

chg: [UI] WIP - generic_picker slightly improved tag template

pull/4024/head
mokaddem 2019-01-14 15:01:47 +01:00
parent 492fdacdf1
commit b9886e536a
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/TagsController.php
View File

@ -710,7 +710,7 @@ class TagsController extends AppController
$items = array();
foreach ($tags as $k => $tag) {
$tagTemplate = '<a href="#" class="tagComplete" style="background-color:{{=it.background}}; color:{{=it.color}}">{{=it.name}}</a>';
$tagTemplate = '<span href="#" class="tagComplete" style="background-color:{{=it.background}}; color:{{=it.color}}">{{=it.name}}</span>';
$tagName = $tag['name'];
$choice_id = $k;

1
app/View/Elements/generic_picker.ctp
View File

@ -253,6 +253,7 @@ function submitFunction(clicked, callback) {
selected = $clicked.attr('value');
additionalData = $clicked.data('additionaldata');
}
execAndClose(clicked);
callback(selected, additionalData);
}
</script>

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

@ -3381,7 +3381,6 @@ function addGalaxyListener(id) {
popoverPopup(id, target_type + '/' + target_id, 'galaxies', 'selectGalaxyNamespace');
}
// function quickSubmitGalaxyForm(scope, cluster_id, event_id) {
function quickSubmitGalaxyForm(cluster_ids, additionalData) {
scope = additionalData['target_id'];
scope_id = additionalData['target_type'];