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

fix: fix ui issues on multiple views

pull/7520/head
Luciano Righetti 2021-07-13 18:08:58 +02:00
parent dbacfeb56b
commit 443c98729c
10 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/View/Allowedlists/admin_add.ctp
View File

@ -9,6 +9,7 @@
[
'field' => 'name',
'class' => 'input-xxlarge',
'type' => 'textarea'
],
],
'submit' => [

3
app/View/AuthKeys/add.ctp
View File

@ -8,7 +8,8 @@ echo $this->element('genericElements/Form/genericForm', [
'field' => 'user_id',
'label' => __('User'),
'options' => $dropdownData['user'],
'type' => 'dropdown'
'type' => 'dropdown',
'class' => 'span6'
],
[
'field' => 'comment',

4
app/View/CorrelationExclusions/add.ctp
View File

@ -8,12 +8,14 @@ echo $this->element('genericElements/Form/genericForm', [
'field' => 'value',
'label' => __('Value'),
'class' => 'span6',
'requirements' => $this->action === 'add'
'requirements' => $this->action === 'add',
'type' => 'textarea'
],
[
'field' => 'comment',
'label' => __('Comment'),
'class' => 'span6',
'type' => 'textarea'
]
],
'submit' => [

2
app/View/Elements/genericElements/Form/genericForm.ctp
View File

@ -51,7 +51,7 @@ if (!empty($data['fields'])) {
'form' => $this->Form,
'simpleFieldAllowlist' => $simpleFieldAllowedlist,
'modelForForm' => $modelForForm,
'fieldDesc' => empty($fieldDesc) ? [] : $fieldDesc
'fieldDesc' => empty($fieldDesc)? [] : $fieldDesc
]
);

3
app/View/EventReports/add.ctp
View File

@ -28,7 +28,8 @@
),
array(
'field' => 'content',
'class' => 'textarea input span6'
'class' => 'span6',
'type' => 'textarea'
),
array(
'field' => 'event_id',

2
app/View/EventReports/ajax/replaceSuggestionInReport.ctp
View File

@ -7,7 +7,7 @@
'fields' => array(
array(
'field' => 'suggestions',
'class' => 'textarea'
'type' => 'textarea'
),
),
'submit' => array(

4
app/View/GalaxyClusterBlocklists/add.ctp
View File

@ -13,6 +13,7 @@
array(
'disabled' => $action != 'add' ? 'disabled' : '',
'field' => 'uuids',
'class' => 'span6',
'label' => __('Cluster UUID'),
'type' => 'textarea',
'default' => isset($blockEntry['GalaxyClusterBlocklist']['cluster_uuid']) ? $blockEntry['GalaxyClusterBlocklist']['cluster_uuid'] : '',
@ -24,18 +25,21 @@
array(
'field' => 'cluster_orgc',
'label' => __('Creating organisation'),
'class' => 'span6',
'type' => 'text',
'default' => isset($blockEntry['GalaxyClusterBlocklist']['cluster_orgc']) ? $blockEntry['GalaxyClusterBlocklist']['cluster_orgc'] : ''
),
array(
'field' => 'cluster_info',
'label' => __('Cluster value'),
'class' => 'span6',
'type' => 'text',
'default' => isset($blockEntry['GalaxyClusterBlocklist']['cluster_info']) ? $blockEntry['GalaxyClusterBlocklist']['cluster_info'] : ''
),
array(
'field' => 'comment',
'label' => __('Comment'),
'class' => 'span6',
'type' => 'text',
'default' => isset($blockEntry['GalaxyClusterBlocklist']['comment']) ? $blockEntry['GalaxyClusterBlocklist']['comment'] : ''
),

2
app/files/misp-galaxy

@ -1 +1 @@
Subproject commit a5d7d85dc8c7642197831eed5476dd0d198a8818
Subproject commit a3cdbc1309e36c41f6a090fdb35eeebd86dff3e1

2
app/files/misp-objects

@ -1 +1 @@
Subproject commit fca66ddd7d955968a76b1bf485671084ff765658
Subproject commit 212e4102586a34b523e53c926a5313050dcb478d

2
app/files/warninglists

@ -1 +1 @@
Subproject commit 6a454c984b36fc340d8419585b8134bd5d361790
Subproject commit 29192e0b2074a4af3f861b0a88af2e4da988a202