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

fix: [generic_picker] fix #4219 (Adding ObjectReference)

pull/4237/head
mokaddem 2019-02-26 15:23:40 +01:00
parent 1b418e39ad
commit 85f9ec97f0
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,7 @@
$use_select = count($items) > $select_threshold;
$countThresholdReached = count($items) > 1000;
$option_templates = array();
$option_additionalData = array();
$options_additionalData = array();
?>
<script>
@ -224,7 +224,7 @@ function submitFunction(clicked, callback) {
$option_templates[h($param['value'])] = $template;
}
if (isset($param['additionalData'])) {
$additionalData = json_encode($param['additionalData']);
$additionalData = $param['additionalData'];
$options_additionalData[h($param['value'])] = $additionalData;
}
}
@ -242,7 +242,7 @@ function submitFunction(clicked, callback) {
if (isset($param['isPill']) && $param['isPill']) {
echo $this->GenericPicker->add_pill($param, $defaults);
if (isset($param['additionalData'])) {
$additionalData = json_encode($param['additionalData']);
$additionalData = $param['additionalData'];
$options_additionalData[h($param['value'])] = $additionalData;
}
}
@ -264,7 +264,7 @@ function submitFunction(clicked, callback) {
foreach ($items as $k => $param) {
echo $this->GenericPicker->add_pill($param, $defaults);
if (isset($param['additionalData'])) {
$additionalData = json_encode($param['additionalData']);
$additionalData = $param['additionalData'];
$options_additionalData[h($param['value'])] = $additionalData;
}
}
@ -282,7 +282,7 @@ function submitFunction(clicked, callback) {
var options_additionalData = {}
}
options_templates['<?php echo $select_id; ?>'] = <?php echo json_encode($option_templates); ?>;
options_additionalData['<?php echo $select_id; ?>'] = <?php echo json_encode($option_additionalData); ?>;
options_additionalData['<?php echo $select_id; ?>'] = <?php echo json_encode($options_additionalData); ?>;
</script>
</div>

2
app/View/Helper/GenericPickerHelper.php
View File

@ -63,7 +63,7 @@ class GenericPickerHelper extends AppHelper {
foreach ($param as $paramName => $paramValue) {
if ($paramName === 'value') {
$param_html .= sprintf('value="%s" ', h($paramValue));
} else if ($paramName === 'template') {
} else if ($paramName === 'template' || $paramName === 'additionalData') {
continue;
} else {
$param_html .= sprintf('data-%s="%s" ', h($paramName), h($paramValue));

5
app/webroot/css/main.css
View File

@ -966,6 +966,11 @@ a.pill-pre-picker {
color: #fff;
line-height: 13px;
}
li .generic-picker-item-element-check {
margin-top: -3px;
margin-left: 5px;
}
.generic-picker-item-element-check .fa:before {
margin-right: 0px;
}