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

chg: [decaying] More consistency about `parameters.settings` when empty

pull/5032/head
mokaddem 2019-08-16 15:42:01 +02:00
parent 641a9d5b6d
commit d813460118
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/DecayingModelController.php
View File

@ -156,7 +156,7 @@ class DecayingModelController extends AppController
if ($this->request->data['DecayingModel']['formula'] == 'polynomial') {
if (isset($this->request->data['DecayingModel']['parameters']['settings'])) {
$this->request->data['DecayingModel']['parameters']['settings'] = array();
$this->request->data['DecayingModel']['parameters']['settings'] = '{}';
}
} else if (
isset($this->request->data['DecayingModel']['parameters']['settings']) &&

6
app/Model/DecayingModel.php
View File

@ -80,6 +80,9 @@ class DecayingModel extends AppModel
if (isset($this->data['DecayingModel']['parameters']['base_score_config']) && is_array($this->data['DecayingModel']['parameters']['base_score_config'])) {
$this->data['DecayingModel']['parameters']['base_score_config'] = json_encode($this->data['DecayingModel']['parameters']['base_score_config']);
}
if (isset($this->data['DecayingModel']['parameters']['settings']) && is_array($this->data['DecayingModel']['parameters']['settings'])) {
$this->data['DecayingModel']['parameters']['settings'] = json_encode($this->data['DecayingModel']['parameters']['settings']);
}
if (isset($this->data['DecayingModel']['attribute_types']) && is_array($this->data['DecayingModel']['attribute_types'])) {
$this->data['DecayingModel']['attribute_types'] = json_encode($this->data['DecayingModel']['attribute_types']);
}
@ -204,8 +207,7 @@ class DecayingModel extends AppModel
}
if (
!$user['Role']['perm_site_admin'] && // if the user is a site admin, return the model without question
$user['Organisation']['id'] != $decayingModel['DecayingModel']['org_id'] &&
!$decayingModel['DecayingModel']['all_orgs']
!($user['Organisation']['id'] == $decayingModel['DecayingModel']['org_id'] || $decayingModel['DecayingModel']['all_orgs'])
) {
throw new MethodNotAllowedException(__('No Decaying Model with the provided ID exists, or you are not authorised to view it.'));
}

1
app/webroot/js/decayingTool.js
View File

@ -680,6 +680,7 @@
$form.find('#DecayingModelParametersThreshold').val(data.parameters.threshold);
$form.find('#DecayingModelParametersDefaultBaseScore').val(data.parameters.default_base_score);
$form.find('#DecayingModelParametersBaseScoreConfig').val(JSON.stringify(data.parameters.base_score_config));
$form.find('#DecayingModelParametersSettings').val(JSON.stringify(data.parameters.settings));
},
injectDataAttributeTypes: function($form, data) {
$form.find('#DecayingModelMappingAttributetypes').val(JSON.stringify(data.attributetypes));