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

fix: taxonomy view filter is not kept when switching pages, fixes #8875

pull/9432/head
Luciano Righetti 2023-11-15 12:04:28 +01:00
parent 39d827baaa
commit bc07446a82
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/TaxonomiesController.php
View File

@ -99,12 +99,12 @@ class TaxonomiesController extends AppController
$taxonomy['entries'][$key]['events'] = $count;
$taxonomy['entries'][$key]['attributes'] = $count_a;
}
$this->set('filter', $filter);
$customPagination = new CustomPaginationTool();
$params = $customPagination->createPaginationRules($taxonomy['entries'], $this->passedArgs, 'TaxonomyEntry');
if ($params['sort'] == 'id') {
$params['sort'] = 'tag';
}
$params['options'] = ['filter' => $filter];
$this->params->params['paging'] = array($this->modelClass => $params);
$params = $customPagination->applyRulesOnArray($taxonomy['entries'], $params, 'taxonomies');
if ($this->_isRest()) {

1
app/View/Taxonomies/ajax/taxonomy_tags.ctp
View File

@ -191,7 +191,6 @@ echo $this->element('/genericElements/IndexTable/scaffold', ['scaffold_data' =>
'paginatorOptions' => [
'url' => [$taxonomy['id']]
],
'persistUrlParams' => ['filter']
],
'containerId' => 'preview_taxonomy_tags_container'
]]);