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

Fixed #2210 #2327 fixed synch tool and cql_filter creation #2426

Merged
merged 19 commits into from
Nov 29, 2017
Merged
Show file tree
Hide file tree
Changes from 18 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
8 changes: 7 additions & 1 deletion web/client/actions/__tests__/featuregrid-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ const {
zoomAll, ZOOM_ALL,
openAdvancedSearch, OPEN_ADVANCED_SEARCH,
initPlugin, INIT_PLUGIN,
sizeChange, SIZE_CHANGE
sizeChange, SIZE_CHANGE,
START_SYNC_WMS, startSyncWMS
} = require('../featuregrid');

const idFeature = "2135";
Expand Down Expand Up @@ -223,6 +224,11 @@ describe('Test correctness of featurgrid actions', () => {
expect(retval).toExist();
expect(retval.type).toBe(ZOOM_ALL);
});
it('Test startSyncWMS', () => {
const retval = startSyncWMS();
expect(retval).toExist();
expect(retval.type).toBe(START_SYNC_WMS);
});
it('Test openAdvancedSearch', () => {
const retval = openAdvancedSearch();
expect(retval).toExist();
Expand Down
7 changes: 6 additions & 1 deletion web/client/actions/featuregrid.js
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,11 @@ function zoomAll() {
type: ZOOM_ALL
};
}
function startSyncWMS() {
return {
type: START_SYNC_WMS
};
}
function sizeChange(size, dockProps) {
return {
type: SIZE_CHANGE,
Expand Down Expand Up @@ -353,6 +358,6 @@ module.exports = {
toggleEditMode,
toggleViewMode,
initPlugin, INIT_PLUGIN,
START_SYNC_WMS,
START_SYNC_WMS, startSyncWMS,
STOP_SYNC_WMS
};
2 changes: 1 addition & 1 deletion web/client/components/misc/combobox/PagedCombobox.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class PagedCombobox extends React.Component {
</CustomTooltip>);
}
const tooltip = (<Tooltip id={this.props.tooltip.id}>
this.props.tooltip.message</Tooltip>);
{this.props.tooltip.message}</Tooltip>);
return (<OverlayTrigger key={this.props.tooltip.overlayTriggerKey} placement={this.props.tooltip.placement} overlay={tooltip}>
{ field }
</OverlayTrigger>);
Expand Down
Loading