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

fix: [feed:edit] Fixed bug preventing to recover feed data in the UI

pull/7358/head
mokaddem 2021-04-20 15:29:05 +02:00
parent 658f30b7b1
commit 514b09b4d6
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Controller/FeedsController.php
View File

@ -358,8 +358,8 @@ class FeedsController extends AppController
}
}
if (!isset($this->request->data['Feed']['settings'])) {
if (!empty($this->Feed->data['Feed']['settings'])) {
$this->request->data['Feed']['settings'] = $this->Feed->data['Feed']['settings'];
if (!empty($feed['Feed']['settings'])) {
$this->request->data['Feed']['settings'] = $feed['Feed']['settings'];
} else {
$this->request->data['Feed']['settings'] = array();
}
@ -404,9 +404,9 @@ class FeedsController extends AppController
return $this->RestResponse->describe('Feeds', 'edit', false, $this->response->type());
}
if (!isset($this->request->data['Feed'])) {
$this->request->data = $this->Feed->data;
if ($this->Feed->data['Feed']['event_id']) {
$this->request->data['Feed']['target_event'] = $this->Feed->data['Feed']['event_id'];
$this->request->data = $feed;
if ($feed['Feed']['event_id']) {
$this->request->data['Feed']['target_event'] = $feed['Feed']['event_id'];
}
}
$this->request->data['Feed']['pull_rules'] = $this->request->data['Feed']['rules'];