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

chg: [elements:serverRuleElements] Reset widgets state on modal close

pull/7386/head
mokaddem 2021-04-28 14:42:04 +02:00
parent f50be529da
commit 428d3875e0
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
4 changed files with 86 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/View/Elements/serverRuleElements/rules_widget.ctp
View File

@ -140,15 +140,26 @@ $pickerDisplayed = false;
<script>
function initRuleWidgetPicker<?= $seed ?>() {
$('.container-seed-<?= $seed ?> select.rules-select-picker').chosen()
$('.container-seed-<?= $seed ?> select.rules-select-data').keydown(function(evt) {
var $baseContainer = $('.container-seed-<?= $seed ?>');
$baseContainer.find('select.rules-select-picker').chosen()
$baseContainer.find('select.rules-select-data').keydown(function(evt) {
var $select = $(this)
var $pickerSelect = $select.closest('.rules-widget-container').find('select.rules-select-picker')
if (evt.keyCode === 46) { // <DELETE>
deleteSelectedRules($select, $pickerSelect)
}
});
rebuildRules($('.container-seed-<?= $seed ?>'))
rebuildRules($baseContainer)
$baseContainer.data('initial-rules-allow', $baseContainer.find('.rules-allow').children())
$baseContainer.data('initial-rules-block', $baseContainer.find('.rules-block').children())
$baseContainer.data('resetrulesfun', function() {
$baseContainer.find('.rules-allow').empty().append(
$baseContainer.data('initial-rules-allow')
)
$baseContainer.find('.rules-block').empty().append(
$baseContainer.data('initial-rules-block')
)
})
}
function deleteSelectedRules($select, $pickerSelect) {

25
app/View/Feeds/add.ctp
View File

@ -259,15 +259,24 @@ var modelContext = 'Feed';
$(document).ready(function() {
feedDistributionChange();
$("#pull_modify").click(function() {
$('#genericModal.pull-rule-modal').modal().on('shown', function () {
var $containers = $(this).find('.rules-widget-container')
$containers.each(function() {
var initFun = $(this).data('funname');
if (typeof window[initFun] === 'function') {
window[initFun]()
}
$('#genericModal.pull-rule-modal').modal()
.on('shown', function () {
var $containers = $(this).find('.rules-widget-container')
$containers.each(function() {
var initFun = $(this).data('funname');
if (typeof window[initFun] === 'function') {
window[initFun]()
}
})
})
});
.on('hidden', function () {
var $containers = $(this).find('.rules-widget-container')
$containers.each(function() {
if ($(this).data('resetrulesfun') !== undefined) {
$(this).data('resetrulesfun')()
}
})
});
});
$("#FeedDistribution").change(function() {
feedDistributionChange();

29
app/View/Feeds/edit.ctp
View File

@ -280,18 +280,27 @@ $(document).ready(function() {
rules = convertServerFilterRules(rules);
feedDistributionChange();
$("#pull_modify").click(function() {
$('#genericModal.pull-rule-modal').modal().on('shown', function () {
var $containers = $(this).find('.rules-widget-container')
$containers.each(function() {
var initFun = $(this).data('funname');
if (typeof window[initFun] === 'function') {
window[initFun]()
$('#genericModal.pull-rule-modal').modal()
.on('shown', function () {
var $containers = $(this).find('.rules-widget-container')
$containers.each(function() {
var initFun = $(this).data('funname');
if (typeof window[initFun] === 'function') {
window[initFun]()
}
})
if (typeof window['cm'] === "object") {
window['cm'].refresh()
}
})
if (typeof window['cm'] === "object") {
window['cm'].refresh()
}
});
.on('hidden', function () {
var $containers = $(this).find('.rules-widget-container')
$containers.each(function() {
if ($(this).data('resetrulesfun') !== undefined) {
$(this).data('resetrulesfun')()
}
})
});
});
$("#FeedDistribution").change(function() {
feedDistributionChange();

54
app/View/Servers/edit.ctp
View File

@ -275,29 +275,47 @@ $(document).ready(function() {
});
rules = convertServerFilterRules(rules);
$("#push_modify").click(function() {
$('#genericModal.push-rule-modal').modal().on('shown', function () {
var $containers = $(this).find('.rules-widget-container')
$containers.each(function() {
var initFun = $(this).data('funname');
if (typeof window[initFun] === 'function') {
window[initFun]()
}
$('#genericModal.push-rule-modal').modal()
.on('shown', function () {
var $containers = $(this).find('.rules-widget-container')
$containers.each(function() {
var initFun = $(this).data('funname');
if (typeof window[initFun] === 'function') {
window[initFun]()
}
})
})
});
.on('hidden', function () {
var $containers = $(this).find('.rules-widget-container')
$containers.each(function() {
if ($(this).data('resetrulesfun') !== undefined) {
$(this).data('resetrulesfun')()
}
})
});
});
$("#pull_modify").click(function() {
$('#genericModal.pull-rule-modal').modal().on('shown', function () {
var $containers = $(this).find('.rules-widget-container')
$containers.each(function() {
var initFun = $(this).data('funname');
if (typeof window[initFun] === 'function') {
window[initFun]()
$('#genericModal.pull-rule-modal').modal()
.on('shown', function () {
var $containers = $(this).find('.rules-widget-container')
$containers.each(function() {
var initFun = $(this).data('funname');
if (typeof window[initFun] === 'function') {
window[initFun]()
}
})
if (typeof window['cm'] === "object") {
window['cm'].refresh()
}
})
if (typeof window['cm'] === "object") {
window['cm'].refresh()
}
});
.on('hidden', function () {
var $containers = $(this).find('.rules-widget-container')
$containers.each(function() {
if ($(this).data('resetrulesfun') !== undefined) {
$(this).data('resetrulesfun')()
}
})
});
});
$('#add_cert_file').click(function() {