merge branch v2 (release 2.0.0-beta.32)

marcantondahmen · marcantondahmen · commit d9dc838ab916 · 2026-05-11T11:44:31.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,16 @@
 # Changelog
 
-## [v2.0.0-beta.31](https://github.com/marcantondahmen/automad/commit/a7c4b9459ef02cff4ae0f6d4ca6e2349f438f1a8)
+## [v2.0.0-beta.32](https://github.com/marcantondahmen/automad/commit/8713cccebb050201735f8cf91d8e6d794300466f)
 
-Sun, 10 May 2026 12:28:25 +0200
+Mon, 11 May 2026 11:40:57 +0200
+
+### Bugfixes
+
+- fix dashboard navigation being locked when api request has failed due to bad connection ([a78951362](https://github.com/marcantondahmen/automad/commit/a789513622579b9183d61e0020e97d296c778a55))
+
+## [v2.0.0-beta.31](https://github.com/marcantondahmen/automad/commit/c7bbdb71cd2b384dd258035392869077ff9b4f55)
+
+Sun, 10 May 2026 12:32:26 +0200
 
 ### New Features
 
diff --git a/automad/src/client/admin/components/Forms/Form.ts b/automad/src/client/admin/components/Forms/Form.ts
@@ -388,14 +388,12 @@ export class FormComponent extends BaseComponent {
 					if (this.hasAttribute(Attr.event)) {
 						fire(this.getAttribute(Attr.event));
 					}
-
-					App.removeNavigationLock(lockId);
 				}
 			);
-		} else {
-			App.removeNavigationLock(lockId);
 		}
 
+		App.removeNavigationLock(lockId);
+
 		this.submitButtons.forEach((button) => {
 			button.classList.remove(CSS.buttonLoading);
 		});
diff --git a/automad/src/client/admin/core/request.ts b/automad/src/client/admin/core/request.ts
@@ -43,7 +43,6 @@ import {
 	fire,
 	getLogger,
 	listen,
-	notifyError,
 	notifyFormError,
 	query,
 	RequestKey,
diff --git a/automad/src/server/App.php b/automad/src/server/App.php
@@ -56,7 +56,7 @@
  * @license See LICENSE.md for license information
  */
 class App {
-	const VERSION = '2.0.0-beta.31';
+	const VERSION = '2.0.0-beta.32';
 
 	/**
 	 * Required PHP version.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "automad",
-  "version": "2.0.0-beta.31",
+  "version": "2.0.0-beta.32",
   "description": "Automad",
   "author": "Marc Anton Dahmen",
   "private": true,

Original file line number	Diff line number	Diff line change
`@@ -388,14 +388,12 @@ export class FormComponent extends BaseComponent {`
`388`	`388`	`if (this.hasAttribute(Attr.event)) {`
`389`	`389`	`fire(this.getAttribute(Attr.event));`
`390`	`390`	`}`
`391`		`-`
`392`		`- App.removeNavigationLock(lockId);`
`393`	`391`	`}`
`394`	`392`	`);`
`395`		`- } else {`
`396`		`- App.removeNavigationLock(lockId);`
`397`	`393`	`}`
`398`	`394`
	`395`	`+ App.removeNavigationLock(lockId);`
	`396`	`+`
`399`	`397`	`this.submitButtons.forEach((button) => {`
`400`	`398`	`button.classList.remove(CSS.buttonLoading);`
`401`	`399`	`});`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "automad",`
`3`		`- "version": "2.0.0-beta.31",`
	`3`	`+ "version": "2.0.0-beta.32",`
`4`	`4`	`"description": "Automad",`
`5`	`5`	`"author": "Marc Anton Dahmen",`
`6`	`6`	`"private": true,`