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

Merge branch '2.4' of github.com:MISP/MISP into 2.4

pull/5705/head
mokaddem 2020-03-10 11:22:17 +01:00
parent 495218cea8 e0ad3ec9a4
commit 3758b085a4
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
4 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
INSTALL/INSTALL.sh.sfv
View File

@ -1,5 +1,5 @@
; Generated by RHash v1.3.9 on 2020-02-03 at 13:15.37 ; Generated by RHash v1.3.9 on 2020-03-10 at 18:43.24
; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/ ; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/
; ;
; 99767 13:15.37 2020-02-03 INSTALL.sh ; 100109 18:43.24 2020-03-10 INSTALL.sh
INSTALL.sh F27125A2CD54B088B95072FF1D87C2A9EDDE3FDC 4A2F544B20AF69618BD0F744A433CBC442DAE17CC35028906DB20FB2C56DA2D6 CE625D7EB46FCC9B0228BFDD1AF62B9FC78F1D53B14CABA881C19C115F3E8F8D031EEF6A07E6E08A3B1F1D28C4EE8335 84D8940C178BFCFDA1A218D7AD7DEFA27EA62486DC7E06E165F1BE2C7738DCD384A95E62A95F7203AEDAD8593F648302E963BC3C00CCA987A415952A86192BC8 INSTALL.sh 68CED66FC4D5C4A7F0041BF7DAC60113FAB614E5 5DFCF61AEB56A736930EE8A77959BD90C2F8AD6AD11CD1B09AB60D1E68D18BD0 D03AECC77CF64A90DA971C562EB49C373954151B712966EF6482F6E032F992B568BB8E0C2FF3EAFB300DB7BF768796E4 3981E487FD3C4822F353232ABFB8A017E299702E1E5B1D75A2DC901D6CC8CF356F848CA944FBD04A25E9CA459645FDC5F03D2AA08A31C471F40E8AABEF01A0EF

3
app/Controller/DashboardsController.php
View File

@ -143,7 +143,7 @@ class DashboardsController extends AppController
$this->set('widget', $widget); $this->set('widget', $widget);
} }
public function renderWidget($force = false) public function renderWidget($widget_id, $force = false)
{ {
if ($this->request->is('post')) { if ($this->request->is('post')) {
if (empty($this->request->data['data'])) { if (empty($this->request->data['data'])) {
@ -177,6 +177,7 @@ class DashboardsController extends AppController
'render' => $dashboardWidget->render, 'render' => $dashboardWidget->render,
'autoRefreshDelay' => empty($dashboardWidget->autoRefreshDelay) ? false : $dashboardWidget->autoRefreshDelay 'autoRefreshDelay' => empty($dashboardWidget->autoRefreshDelay) ? false : $dashboardWidget->autoRefreshDelay
); );
$this->set('widget_id', $widget_id);
$this->set('data', $data); $this->set('data', $data);
$this->set('config', $config); $this->set('config', $config);
$this->render('widget_loader'); $this->render('widget_loader');

7
app/View/Dashboards/widget_loader.ctp
View File

@ -1,7 +1,4 @@
<?php <div id="widgetContentInner_<?= h($widget_id) ?>">
$randomId = rand();
?>
<div id="widgetContentInner<?= $randomId ?>">
<?php <?php
echo $this->element('/dashboard/Widgets/' . $config['render']); echo $this->element('/dashboard/Widgets/' . $config['render']);
?> ?>
@ -10,7 +7,7 @@
$(document).ready(function() { $(document).ready(function() {
if (<?= $config['autoRefreshDelay'] ? 'true' : 'false' ?>) { if (<?= $config['autoRefreshDelay'] ? 'true' : 'false' ?>) {
setTimeout( function(){ setTimeout( function(){
updateDashboardWidget($("#widgetContentInner<?= $randomId ?>").closest('.grid-stack-item'))}, updateDashboardWidget("#widget_<?= h($widget_id) ?>")},
<?= $config['autoRefreshDelay'] ? $config['autoRefreshDelay'] : 1 ?> * 1000 <?= $config['autoRefreshDelay'] ? $config['autoRefreshDelay'] : 1 ?> * 1000
); );
} }

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

@ -4889,7 +4889,6 @@ function submitDashboardForm(id) {
} }
configData = JSON.stringify(configData); configData = JSON.stringify(configData);
$('#' + id).attr('config', configData); $('#' + id).attr('config', configData);
updateDashboardWidget($('#' + id));
$('#genericModal').modal('hide'); $('#genericModal').modal('hide');
saveDashboardState(); saveDashboardState();
} }
@ -4917,10 +4916,11 @@ function submitDashboardAddWidget() {
); );
if (config !== '') { if (config !== '') {
config = JSON.parse(config); config = JSON.parse(config);
config = JSON.stringify(config);
} else {
config = '[]';
} }
config = JSON.stringify(config);
$('#widget_' + (k+1)).attr('config', config); $('#widget_' + (k+1)).attr('config', config);
updateDashboardWidget($('#widget_' + (k+1)));
saveDashboardState(); saveDashboardState();
$('#last-element-counter').data('element-counter', (k+1)); $('#last-element-counter').data('element-counter', (k+1));
}, },
@ -4966,23 +4966,27 @@ function saveDashboardState() {
} }
function updateDashboardWidget(element) { function updateDashboardWidget(element) {
var container = $(element).find('.widgetContent'); element = $(element);
var titleText = $(element).find('.widgetTitleText'); if (element.length) {
var temp = JSON.parse($(element).attr('config')); var container_id = $(element).attr('id').substring(7);
if (temp['alias'] !== undefined) { var container = $(element).find('.widgetContent');
titleText.text(temp['alias']); var titleText = $(element).find('.widgetTitleText');
var temp = JSON.parse($(element).attr('config'));
if (temp['alias'] !== undefined) {
titleText.text(temp['alias']);
}
$.ajax({
type: 'POST',
url: baseurl + '/dashboards/renderWidget/' + container_id,
data: {
config: $(element).attr('config'),
widget: $(element).attr('widget')
},
success:function (data, textStatus) {
container.html(data);
}
});
} }
$.ajax({
type: 'POST',
url: baseurl + '/dashboards/renderWidget',
data: {
config: $(element).attr('config'),
widget: $(element).attr('widget')
},
success:function (data, textStatus) {
container.html(data);
},
});
} }
function setHomePage() { function setHomePage() {