mirror of https://github.com/MISP/MISP
chg: [decaying] Added formula description in multiple location
parent
3a64405bd9
commit
5a9a905c8d
|
@ -83,6 +83,8 @@ class DecayingModelController extends AppController
|
||||||
$decaying_model = $this->DecayingModel->fetchModel($this->Auth->user(), $id, true);
|
$decaying_model = $this->DecayingModel->fetchModel($this->Auth->user(), $id, true);
|
||||||
$this->set('id', $id);
|
$this->set('id', $id);
|
||||||
$this->set('decaying_model', $decaying_model);
|
$this->set('decaying_model', $decaying_model);
|
||||||
|
$available_formulas = $this->DecayingModel->listAvailableFormulas();
|
||||||
|
$this->set('available_formulas', $available_formulas);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Sets pagination condition for url parameters
|
// Sets pagination condition for url parameters
|
||||||
|
@ -135,6 +137,8 @@ class DecayingModelController extends AppController
|
||||||
$passedArgsArray = $this->__setIndexFilterConditions($this->passedArgs);
|
$passedArgsArray = $this->__setIndexFilterConditions($this->passedArgs);
|
||||||
$this->set('passedArgsArray', $passedArgsArray);
|
$this->set('passedArgsArray', $passedArgsArray);
|
||||||
$this->set('decayingModels', $this->paginate());
|
$this->set('decayingModels', $this->paginate());
|
||||||
|
$available_formulas = $this->DecayingModel->listAvailableFormulas();
|
||||||
|
$this->set('available_formulas', $available_formulas);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function add()
|
public function add()
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
abstract class DecayingModelBase
|
abstract class DecayingModelBase
|
||||||
{
|
{
|
||||||
|
|
||||||
|
// Description of the formula. Will be displayed at various places in the web interface
|
||||||
|
// Should be overriden
|
||||||
public const DESCRIPTION = '';
|
public const DESCRIPTION = '';
|
||||||
|
|
||||||
public function checkLoading()
|
public function checkLoading()
|
||||||
|
|
|
@ -121,7 +121,14 @@ foreach ($decayingModels as $item): ?>
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<td data-toggle="json" ondblclick="document.location.href ='<?php echo $baseurl."/decayingModel/view/".$item['DecayingModel']['id']; ?>'"><?php echo json_encode($item['DecayingModel']['parameters']); ?> </td>
|
<td data-toggle="json" ondblclick="document.location.href ='<?php echo $baseurl."/decayingModel/view/".$item['DecayingModel']['id']; ?>'"><?php echo json_encode($item['DecayingModel']['parameters']); ?> </td>
|
||||||
<td><?php echo h($item['DecayingModel']['formula']); ?> </td>
|
<td>
|
||||||
|
<?php echo h($item['DecayingModel']['formula']); ?>
|
||||||
|
<?php if (isset($available_formulas[$item['DecayingModel']['formula']]['description'])): ?>
|
||||||
|
<i class="fas fa-question-circle" data-toggle="tooltip" title="<?php echo h($available_formulas[$item['DecayingModel']['formula']]['description']); ?>"></i>
|
||||||
|
<?php else: ?>
|
||||||
|
 
|
||||||
|
<?php endif; ?>
|
||||||
|
</td>
|
||||||
<td><?php echo count($item['DecayingModel']['attribute_types']); ?> </td>
|
<td><?php echo count($item['DecayingModel']['attribute_types']); ?> </td>
|
||||||
<td><?php echo h($item['DecayingModel']['version']); ?> </td>
|
<td><?php echo h($item['DecayingModel']['version']); ?> </td>
|
||||||
<td><i class="fas fa-<?php echo $item['DecayingModel']['enabled'] ? 'check' : 'times';?>"></i></td>
|
<td><i class="fas fa-<?php echo $item['DecayingModel']['enabled'] ? 'check' : 'times';?>"></i></td>
|
||||||
|
@ -170,7 +177,7 @@ endforeach; ?>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
|
$('[data-toggle="tooltip"]').tooltip();
|
||||||
});
|
});
|
||||||
function prettyPrintJson() {
|
function prettyPrintJson() {
|
||||||
$('[data-toggle=\"json\"]').each(function() {
|
$('[data-toggle=\"json\"]').each(function() {
|
||||||
|
|
|
@ -31,7 +31,12 @@
|
||||||
'key' => __('Enabled'),
|
'key' => __('Enabled'),
|
||||||
'html' => '<i class="fas fa-' . ($decaying_model['DecayingModel']['enabled'] ? 'check' : 'times') . '"></i>'
|
'html' => '<i class="fas fa-' . ($decaying_model['DecayingModel']['enabled'] ? 'check' : 'times') . '"></i>'
|
||||||
);
|
);
|
||||||
$table_data[] = array('key' => __('Formula'), 'value' => $decaying_model['DecayingModel']['formula']);
|
$table_data[] = array(
|
||||||
|
'key' => __('Formula'),
|
||||||
|
'html' => $decaying_model['DecayingModel']['formula'] . (
|
||||||
|
isset($available_formulas[$decaying_model['DecayingModel']['formula']]['description']) ? sprintf(' <i class="fas fa-question-circle" data-toggle="tooltip" title="%s"></i>', h($available_formulas[$decaying_model['DecayingModel']['formula']]['description'])) : ''
|
||||||
|
)
|
||||||
|
);
|
||||||
$table_data[] = array('key' => __('Parameters'), 'value' => json_encode($decaying_model['DecayingModel']['parameters']), 'class' => 'json-transform');
|
$table_data[] = array('key' => __('Parameters'), 'value' => json_encode($decaying_model['DecayingModel']['parameters']), 'class' => 'json-transform');
|
||||||
$table_data[] = array('key' => __('Reference(s)'), 'html' => implode('<br/>', (empty($decaying_model['DecayingModel']['ref']) ? array() : $decaying_model['DecayingModel']['ref'])));
|
$table_data[] = array('key' => __('Reference(s)'), 'html' => implode('<br/>', (empty($decaying_model['DecayingModel']['ref']) ? array() : $decaying_model['DecayingModel']['ref'])));
|
||||||
$table_data[] = array('key' => __('Associated types'), 'value' => json_encode($decaying_model['DecayingModel']['attribute_types']), 'class' => 'json-transform');
|
$table_data[] = array('key' => __('Associated types'), 'value' => json_encode($decaying_model['DecayingModel']['attribute_types']), 'class' => 'json-transform');
|
||||||
|
@ -50,6 +55,7 @@ $(document).ready(function() {
|
||||||
var parsedJson = syntaxHighlightJson($(this).text().trim());
|
var parsedJson = syntaxHighlightJson($(this).text().trim());
|
||||||
$(this).html(parsedJson);
|
$(this).html(parsedJson);
|
||||||
});
|
});
|
||||||
|
$('[data-toggle="tooltip"]').tooltip({placement: 'right'});
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<?php
|
<?php
|
||||||
|
|
Loading…
Reference in New Issue