Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow to load all permission filters at the permissions list page #1306

Merged
merged 2 commits into from
Apr 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Cleanup get_report function in gsad [#1263](https://github.com/greenbone/gsa/pull/1263)

### Fixed

- Fix loading filters at permission list page [#1306](https://github.com/greenbone/gsa/pull/1306)
- Fix filter in Report Results view cannot be saved & Fix error for create filter with no available results [#1303](https://github.com/greenbone/gsa/pull/1303)
- Fix creating permissions via the create multiple permissions dialog [#1302](https://github.com/greenbone/gsa/pull/1302)
- Fix showing host in Scanner dialog [#1301](https://github.com/greenbone/gsa/pull/1301)
Expand Down
1 change: 1 addition & 0 deletions gsa/src/gmp/models/filter.js
Original file line number Diff line number Diff line change
Expand Up @@ -730,6 +730,7 @@ export const OS_FILTER_FILTER = Filter.fromString('type=os');
export const OVALDEFS_FILTER_FILTER = Filter.fromString('type=info');
export const OVERRIDES_FILTER_FILTER = Filter.fromString('type=override');
export const PORTLISTS_FILTER_FILTER = Filter.fromString('type=port_list');
export const PERMISSIONS_FILTER_FILTER = Filter.fromString('type=permission');
export const REPORT_FORMATS_FILTER_FILTER = Filter.fromString(
'type=report_format',
);
Expand Down
3 changes: 3 additions & 0 deletions gsa/src/web/pages/permissions/listpage.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ import React from 'react';

import _ from 'gmp/locale';

import {PERMISSIONS_FILTER_FILTER} from 'gmp/models/filter';

import PropTypes from 'web/utils/proptypes';
import withCapabilities from 'web/utils/withCapabilities';

Expand Down Expand Up @@ -87,6 +89,7 @@ const Page = ({onChanged, onDownloaded, onError, onInteraction, ...props}) => (
sectionIcon={<PermissionIcon size="large" />}
table={Table}
filterEditDialog={FilterDialog}
filtersFilter={PERMISSIONS_FILTER_FILTER}
title={_('Permissions')}
toolBarIcons={ToolBarIcons}
onError={onError}
Expand Down