cerebrate-project
/
cerebrate
mirror of https://github.com/cerebrate-project/cerebrate
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'develop' of github.com:cerebrate-project/cerebrate into develop

pull/85/head
iglocska 2021-12-22 12:27:04 +01:00
parent 136148705a 30ec856dc3
commit aa23b3e293
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Controller/LocalToolsController.php
View File

@ -68,7 +68,11 @@ class LocalToolsController extends AppController
foreach ($connections as $connection) {
$actionDetails = $this->LocalTools->getActionDetails($actionName);
$params['connection'] = $connection;
$tmpResult = $this->LocalTools->action($this->ACL->getUser()['id'], $connection->connector, $actionName, $params, $this->request);
try {
$tmpResult = $this->LocalTools->action($this->ACL->getUser()['id'], $connection->connector, $actionName, $params, $this->request);
} catch (\Exception $e) {
$tmpResult = ['success' => false, 'message' => $e->getMessage(), 'data' => []];
}
$tmpResult['connection'] = $connection;
$results[$connection->id] = $tmpResult;
$successes += $tmpResult['success'] ? 1 : 0;

2
src/Lib/default/local_tool_connectors/MispConnector.php
View File

@ -819,7 +819,7 @@ class MispConnector extends CommonConnectorTools
[
'field' => 'connection_ids',
'type' => 'hidden',
'value' => $params['connection_ids']
'value' => json_encode($params['connection_ids'])
],
[
'field' => 'method',

2
templates/LocalTools/connector_index.php
View File

@ -155,7 +155,7 @@ echo $this->element('genericElements/IndexTable/index_table', [
tableData
)
const $footer = $(modalObject.ajaxApi.statusNode).parent()
modalObject.ajaxApi.statusNode.remove()
modalObject.ajaxApi.options.statusNode.remove()
const $cancelButton = $footer.find('button[data-dismiss="modal"]')
$cancelButton.text('<?= __('OK') ?>').removeClass('btn-secondary').addClass('btn-primary')
}

10
webroot/js/main.js
View File

@ -279,10 +279,12 @@ $(document).ready(() => {
overloadBSDropdown();
addSupportOfNestedDropdown();
const debouncedGlobalSearch = debounce(performGlobalSearch, 400)
$('#globalSearch')
.keydown(debouncedGlobalSearch)
.keydown(focusSearchResults);
if (window.debounce) {
const debouncedGlobalSearch = debounce(performGlobalSearch, 400)
$('#globalSearch')
.keydown(debouncedGlobalSearch)
.keydown(focusSearchResults);
}
$('.lock-sidebar a.btn-lock-sidebar').click(() => {
const $sidebar = $('.sidebar')