mirror of https://github.com/MISP/MISP
chg: [analyst-data:UI] Reduced number of inline asset ressources inclusion
parent
8c59b9897d
commit
9c64255e50
|
@ -152,7 +152,7 @@ class AnalystData extends AppModel
|
|||
public function canEditAnalystData(array $user, array $analystData, $modelType): bool
|
||||
{
|
||||
if (!isset($analystData[$modelType])) {
|
||||
throw new InvalidArgumentException('Passed object does not contain a(n) ' . $modelType);
|
||||
return false; // This can happen when using find('count')
|
||||
}
|
||||
if ($user['Role']['perm_site_admin']) {
|
||||
return true;
|
||||
|
|
|
@ -129,6 +129,10 @@ $options = [
|
|||
'relationships' => $data[$modelSelection]['Relationship'] ?? [],
|
||||
];
|
||||
|
||||
echo $this->element('genericElements/assetLoader', [
|
||||
'js' => ['doT', 'moment.min'],
|
||||
'css' => ['analyst-data',],
|
||||
]);
|
||||
echo $this->element('genericElements/Analyst_data/thread', $options);
|
||||
?>
|
||||
|
||||
|
|
|
@ -1,9 +1,4 @@
|
|||
<?php
|
||||
echo $this->element('genericElements/assetLoader', [
|
||||
'js' => ['doT', 'moment.min'],
|
||||
'css' => ['analyst-data',],
|
||||
]);
|
||||
|
||||
$URL_ADD = '/analystData/add/';
|
||||
$URL_EDIT = '/analystData/edit/';
|
||||
$URL_DELETE = '/analystData/delete/';
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
echo $this->element('genericElements/assetLoader', [
|
||||
'css' => ['query-builder.default', 'attack_matrix'],
|
||||
'css' => ['query-builder.default', 'attack_matrix', 'analyst-data'],
|
||||
'js' => ['doT', 'extendext', 'moment.min', 'query-builder', 'network-distribution-graph', 'd3', 'd3.custom', 'jquery-ui.min'],
|
||||
]);
|
||||
echo $this->element(
|
||||
|
|
|
@ -174,6 +174,10 @@ $options = [
|
|||
'relationships' => $cluster['GalaxyCluster']['Relationship'] ?? [],
|
||||
];
|
||||
|
||||
echo $this->element('genericElements/assetLoader', [
|
||||
'js' => ['doT', 'moment.min'],
|
||||
'css' => ['analyst-data',],
|
||||
]);
|
||||
echo $this->element('genericElements/Analyst_data/thread', $options);
|
||||
|
||||
?>
|
Loading…
Reference in New Issue