Skip to content

Commit

Permalink
Merge branch 'main' into enabledworkgroups-only-for-edit-user
Browse files Browse the repository at this point in the history
  • Loading branch information
tschumpr authored Jul 29, 2024
2 parents 5782013 + 1156a95 commit 49187f8
Show file tree
Hide file tree
Showing 81 changed files with 4,084 additions and 555 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,28 @@

## [Unreleased]

### Added

- Tooltips to main side navigation.
- Location hash for tabs in borehole detail view.
- Language dropdown in the header.

### Changed

- Renamed technical attributes `kind_id_cli` to `borehole_type_id`, `top_bedrock` to `top_bedrock_fresh` and `qt_top_bedrock` to `top_bedrock_weathered`.
- Moved groundwater radio buttons in borehole form to the bottom.
- Made `startTime` and `reliability` optional for hydrogeology.
- Removed title from prompt dialog.
- Use standard prompt dialog for deleting boreholes.

### Fixed

- Attribute `top_bedrock_weathered` could not be imported.
- Badge with number of active filters on sidebar did not include polygon filter.
- Fixed label for water ingress menu item.
- Location precision filter caused an internal error.
- Base maps were loaded beyond their maximum zoom level.
- `layer_depth_to` was displayed in filter even though it was not selected in the filter settings.
- Users can now only import or add new boreholes to workgroups where they have an editor role.

## v2.1.772 - 2024-06-27
Expand Down
2 changes: 1 addition & 1 deletion src/api-legacy/v1/action.py
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ def filterBorehole(self, filter={}):
'location_precision'] not in ['', None]:
params.append(int(filter['location_precision']))
where.append("""
location_precision_id_cli = %s
qt_location_id_cli = %s
""" % self.getIdx())

if 'reference_elevation_from' in keys and filter['reference_elevation_from'] not in ['', None]:
Expand Down
Loading

0 comments on commit 49187f8

Please sign in to comment.