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

Merge branch 'develop' of github.com:MISP/MISP into develop

pull/7468/head
mokaddem 2021-06-02 14:22:46 +02:00
parent 6bcb0ac6da 6ea2421122
commit 0513d37f94
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/OrganisationsController.php
View File

@ -45,6 +45,8 @@ class OrganisationsController extends AppController
$searchall = $this->passedArgs['all'];
} elseif (isset($this->passedArgs['searchall'])) {
$searchall = $this->passedArgs['searchall'];
} elseif (isset($this->passedArgs['quickFilter'])) {
$searchall = $this->passedArgs['quickFilter'];
}
if (isset($searchall) && !empty($searchall)) {

2
app/Controller/SharingGroupsController.php
View File

@ -22,7 +22,7 @@ class SharingGroupsController extends AppController
'order' => array(
'SharingGroup.name' => 'ASC'
),
'fields' => array('SharingGroup.id', 'SharingGroup.uuid', 'SharingGroup.name', 'SharingGroup.description', 'SharingGroup.releasability', 'SharingGroup.local', 'SharingGroup.active'),
'fields' => array('SharingGroup.id', 'SharingGroup.uuid', 'SharingGroup.name', 'SharingGroup.description', 'SharingGroup.releasability', 'SharingGroup.local', 'SharingGroup.active', 'SharingGroup.roaming'),
'contain' => array(
'SharingGroupOrg' => array(
'Organisation' => array('fields' => array('Organisation.name', 'Organisation.id', 'Organisation.uuid'))

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

@ -85,6 +85,7 @@
)
),
'metaFields' => array(
'<div id="notice_message" style="display: none;"></div>',
'<div id="bothSeenSliderContainer" style="height: 170px;"></div>'
)
)
@ -151,7 +152,7 @@
}
}
});
<?php if (!$ajax): ?>
$('#AttributeType').chosen();
$('#AttributeCategory').chosen();