Author: bricks Date: 2017-02-16 12:53:18 +0100 (Thu, 16 Feb 2017) New Revision: 27686
Modified: trunk/gsa/ChangeLog trunk/gsa/src/html/classic/ng/src/web/powerfilter/powerfilter.js Log: * src/html/classic/ng/src/web/powerfilter/powerfilter.js: Don't update filter and allow to edit or delete filter if the current filter has not been loaded yet. E.g. if a request may take a while it won't be possible to edit the filter yet. Modified: trunk/gsa/ChangeLog =================================================================== --- trunk/gsa/ChangeLog 2017-02-16 11:53:17 UTC (rev 27685) +++ trunk/gsa/ChangeLog 2017-02-16 11:53:18 UTC (rev 27686) @@ -1,5 +1,12 @@ 2017-02-16 Bj�rn Ricks <bjoern.ri...@greenbone.net> + * src/html/classic/ng/src/web/powerfilter/powerfilter.js: Don't update filter + and allow to edit or delete filter if the current filter has not been loaded + yet. E.g. if a request may take a while it won't be possible to edit the + filter yet. + +2017-02-16 Bj�rn Ricks <bjoern.ri...@greenbone.net> + * src/html/classic/ng/src/web/icons/editicon.js: Allow to show inactive edit image via EditIcon component. Modified: trunk/gsa/src/html/classic/ng/src/web/powerfilter/powerfilter.js =================================================================== --- trunk/gsa/src/html/classic/ng/src/web/powerfilter/powerfilter.js 2017-02-16 11:53:17 UTC (rev 27685) +++ trunk/gsa/src/html/classic/ng/src/web/powerfilter/powerfilter.js 2017-02-16 11:53:18 UTC (rev 27686) @@ -31,6 +31,8 @@ import Layout from '../layout.js'; import {render_options} from '../render.js'; +import DeleteIcon from '../icons/deleteicon.js'; +import EditIcon from '../icons/editicon.js'; import Icon from '../icons/icon.js'; import HelpIcon from '../icons/helpicon.js'; import NewIcon from '../icons/newicon.js'; @@ -68,6 +70,11 @@ updateFilter(filter) { let {onUpdate} = this.props; + if (!is_defined(this.state.filter)) { + // filter hasn't been loaded yet + return; + } + if (onUpdate) { onUpdate(filter); } @@ -184,14 +191,18 @@ filtername.trim().length > 0; return ( - <Layout flex align={['end', 'center']} className="powerfilter"> + <Layout flex align={['end', 'center']} + className="powerfilter"> <Layout flex="column" align={['center', 'start']}> <Layout flex align={['end', 'center']}> <FormGroup flex align={['start', 'center']}> <label className="control-label"> <b>{_('Filter')}</b> </label> - <TextField name="userfilter" size="53" maxLength="1000" + <TextField + name="userfilter" + size="53" + maxLength="1000" value={userfilter} onKeyDown={this.onUserFilterKeyPress} onChange={this.onValueChange}/> @@ -201,20 +212,28 @@ onClick={this.onUpdateFilter}/> {onResetClick && - <Icon img="delete.svg" title={_('Reset Filter')} + <DeleteIcon + img="delete.svg" + title={_('Reset Filter')} + active={is_defined(filter)} onClick={this.onResetClick}/> } <HelpIcon page="powerfilter" /> {onEditClick && - <Icon img="edit.svg" title={_('Edit Filter')} + <EditIcon + title={_('Edit Filter')} + active={is_defined(filter)} onClick={onEditClick}/> } </FormGroup> <FormGroup flex align={['start', 'center']}> {capabilities.mayOp('create_filter') && - <TextField name="filtername" size="10" maxLength="80" + <TextField + name="filtername" + size="10" + maxLength="80" value={filtername} onChange={this.onValueChange}/> }
_______________________________________________ Openvas-commits mailing list Openvas-commits@wald.intevation.org https://lists.wald.intevation.org/cgi-bin/mailman/listinfo/openvas-commits