Skip to content

Commit 724244e

Browse files
committed
Merge branch 'master' of github.com:scalableminds/webknossos into prepare-25.04.0
2 parents 78aba81 + d3dd2a8 commit 724244e

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

CHANGELOG.released.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
4040
- Fixed a bug where sometimes large skeletons were not saved correctly, making them inaccessible on the next load. [#8513](https://github.com/scalableminds/webknossos/pull/8513)
4141
- Fixed that meshes weren't loaded correctly if the precomputed mesh file contained multiple levels-of-detail. [#8519](https://github.com/scalableminds/webknossos/pull/8519)
4242
- Fixed that authentication-related token renewal did not work properly in certain scenarios. [#8532](https://github.com/scalableminds/webknossos/pull/8532)
43+
- Fixed resolution of legacy links having dataset names with `-`. [#8548](https://github.com/scalableminds/webknossos/pull/8548)
44+
- Fixed that adding a layer using the dataset settings' advanced tab would crash WEBKNOSSOS. Bug was introduced by [#8503](https://github.com/scalableminds/webknossos/pull/8503). [#8550](https://github.com/scalableminds/webknossos/pull/8550)
4345

4446
### Breaking Changes
4547
- Removed `docker-compose.yml` in favor of `tools/hosting/docker-compose.yml` [#8147](https://github.com/scalableminds/webknossos/pull/8147)

frontend/javascripts/dashboard/dataset/dataset_settings_data_tab.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ function SimpleLayerForm({
359359
form: FormInstance;
360360
dataset: APIDataset | null | undefined;
361361
}) {
362-
const layerCategorySavedOnServer = dataset?.dataSource.dataLayers[index].category;
362+
const layerCategorySavedOnServer = dataset?.dataSource.dataLayers[index]?.category;
363363
const isStoredAsSegmentationLayer = layerCategorySavedOnServer === "segmentation";
364364
const dataLayers = Form.useWatch(["dataSource", "dataLayers"]);
365365
const category = Form.useWatch(["dataSource", "dataLayers", index, "category"]);

frontend/javascripts/oxalis/model/accessors/dataset_accessor.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -728,5 +728,5 @@ export function getDatasetIdOrNameFromReadableURLPart(datasetNameAndId: string)
728728
const isId = /^[a-f0-9]{24}$/.test(datasetIdOrName || "");
729729
return isId
730730
? { datasetId: datasetIdOrName, datasetName: null }
731-
: { datasetId: null, datasetName: datasetIdOrName };
731+
: { datasetId: null, datasetName: datasetNameAndId };
732732
}

0 commit comments

Comments
 (0)