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

fix: Merge issues fixed

pull/1857/head
iglocska 2017-01-13 23:16:38 +01:00
parent 7146652059
commit c5c30a21b8
4 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Controller/TagsController.php
View File

@ -467,7 +467,6 @@ class TagsController extends AppController {
unset($options[$k]);
}
}
$this->set('event_id', $event_id);
$this->set('options', $options);
$this->set('expanded', $expanded);
$this->set('custom', $taxonomy_id == 0 ? true : false);

4
app/Model/AppModel.php
View File

@ -41,7 +41,7 @@ class AppModel extends Model {
32 => false, 33 => true, 38 => true, 39 => true, 40 => false,
42 => false, 44 => false, 45 => false, 49 => true, 50 => false,
51 => false, 52 => false, 55 => true, 56 => true, 57 => true,
58 => false
58 => false, 60 => false
)
)
);
@ -524,7 +524,7 @@ class AppModel extends Model {
$this->__addIndex('correlations', '1_event_id');
$this->__addIndex('warninglist_entries', 'warninglist_id');
break;
case '2.4.59':
case '2.4.60':
if ($dataSource == 'Database/Mysql') {
$sqlArray[] = 'CREATE TABLE IF NOT EXISTS `attribute_tags` (
`id` int(11) NOT NULL AUTO_INCREMENT,

11
app/View/Tags/ajax/select_tag.ctp
View File

@ -17,17 +17,12 @@
<div class="popover_choice_main" id ="popover_choice_main">
<table style="width:100%;">
<?php foreach ($options as $k => &$option): ?>
<<<<<<< HEAD
<tr style="border-bottom:1px solid black;" class="templateChoiceButton">
<tr style="border-bottom:1px solid black;" class="templateChoiceButton" id="field_<?php echo h($k); ?>">
<?php if (isset($attributeTag)): ?>
<td style="padding-left:10px;padding-right:10px; text-align:center;width:100%;" onClick="quickSubmitAttributeTagForm('<?php echo h($object_id);?>', '<?php echo h($k); ?>');" title="<?php echo h($expanded[$k]);?>"><?php echo h($option); ?></td>
<?php else: ?>
<td style="padding-left:10px;padding-right:10px; text-align:center;width:100%;" onClick="quickSubmitTagForm('<?php echo h($object_id);?>', '<?php echo h($k); ?>');" title="<?php echo h($expanded[$k]);?>"><?php echo h($option); ?></td>
<?php endif; ?>
=======
<tr id="field_<?php echo h($k); ?>" style="border-bottom:1px solid black;" class="templateChoiceButton">
<td style="padding-left:10px;padding-right:10px; text-align:center;width:100%;" onClick="quickSubmitTagForm('<?php echo h($event_id);?>', '<?php echo h($k); ?>');" title="<?php echo h($expanded[$k]);?>"><?php echo h($option); ?></td>
>>>>>>> 2.4
</tr>
<?php endforeach; ?>
<tr style="border-bottom:1px solid black;" class="templateChoiceButton">
@ -43,7 +38,7 @@
resizePopoverBody();
$("#filterField").focus();
});
$('#filterField').keyup(function() {
var filterString = $("#filterField").val().toLowerCase();
$.each(tags, function(index, value) {
@ -54,7 +49,7 @@
}
});
});
$(window).resize(function() {
resizePopoverBody();
});

2
app/View/Tags/ajax/taxonomy_choice.ctp
View File

@ -11,7 +11,7 @@
<td style="padding-left:10px;padding-right:10px; text-align:center;width:100%;" onClick="getPopup('<?php echo h($object_id); ?>/0<?php if (isset($attributeTag)) echo '/true'; ?>', 'tags', 'selectTag');">Custom Tags</td>
</tr>
<tr style="border-bottom:1px solid black;" class="templateChoiceButton">
<td style="padding-left:10px;padding-right:10px; text-align:center;width:100%;" onClick="getPopup('<?php echo h($event_id); ?>/all', 'tags', 'selectTag');">All Tags</td>
<td style="padding-left:10px;padding-right:10px; text-align:center;width:100%;" onClick="getPopup('<?php echo h($object_id); ?>/all', 'tags', 'selectTag');">All Tags</td>
</tr>
<?php foreach ($options as $k => &$option): ?>
<tr style="border-bottom:1px solid black;" class="templateChoiceButton">