From 83d3f515de44124e99f14ab788533a350bfe02f7 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 10 Jun 2025 13:18:31 +0200
Subject: [PATCH] refactor(Modals and z-index): ensures dashboard modals are in
 the forground

---
 application/controllers/api/frontend/v1/LvPlan.php |  2 +-
 public/js/components/DashboardWidget/Url.js        | 10 +++++-----
 public/js/components/Drop/Grid.js                  |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index 55b59db37..b5ce2a737 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -81,7 +81,7 @@ class LvPlan extends FHCAPI_Controller
 		$end_date = $this->input->get('end_date', TRUE);
 		$lv_id = $this->input->get('lv_id', TRUE);
 
-		$lvplan_events = $this->lvplanlib->getLvPlan($start_date,$end_date,$lv_id);
+		$lvplan_events = $this->getDataOrTerminateWithError($this->lvplanlib->getLvPlan($start_date,$end_date,$lv_id));
 		if( is_null($lvplan_events) || isEmptyArray($lvplan_events) )
 		{
 			$lvplan_events = array();
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 1fcf01874..796726f04 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -198,7 +198,7 @@ export default {
         </div>
     </div>
 	<!--EDIT MODAL-->
-	<core-form draggable="true" @dragstart="stopDrag" @drag="stopDrag" @dragend="stopDrag" ref="editForm">
+	<teleport to="body">
 		<bs-modal @[\`hide.bs.modal\`]="bookmark_id=null; clearInputs();" ref="editModal">
 			<template #title>
 				<h2>{{$p.t('bookmark','editLink')}}</h2>
@@ -213,10 +213,9 @@ export default {
 				<button @click="editBookmark" class="btn btn-primary">{{$p.t('bookmark','saveLink')}}</button>
 			</template>
 		</bs-modal>
-	</core-form>
-
+	</teleport>
 	<!--CREATE MODAL-->
-	<core-form draggable="true" @dragstart="stopDrag" @drag="stopDrag" @dragend="stopDrag"  ref="createForm">
+	<teleport to="body">
 		<bs-modal @[\`hide.bs.modal\`]="clearInputs();" ref="createModal">
 			<template #title>
 				<h2>{{$p.t('bookmark','newLink')}}</h2>
@@ -231,7 +230,8 @@ export default {
 				<button @click="insertBookmark" class="btn btn-primary">{{$p.t('bookmark','saveLink')}}</button>
 			</template>
 		</bs-modal>
-	</core-form>`,
+	</teleport>
+	`,
 };
 
 /*
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 00ffe7c52..6955107e3 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -429,7 +429,7 @@ export default {
 			this._dragStart(evt);
 		},
 		dragOver(evt) {
-			if ((this.y + 1) > this.rows && this.mode == MODE_MOVE) {
+			if ((this.y + 1) > this.rows && (this.mode == MODE_MOVE || this.mode == MODE_RESIZE)) {
 				this.positionUpdates = this.positionUpdates?.filter(item => {
 					return item.widgetid == this.draggedItem.data.widgetid;
 				})
@@ -628,7 +628,7 @@ export default {
 				class="position-absolute"
 				:active="active"
 				:style="{
-					zIndex: item.resizeOverlay ? 1 : 2,
+					zIndex: item.resizeOverlay ? 1 : 'auto',
 					top: 'calc(' + item.y + ' * var(--fhc-dg-row-height))',
 					left: 'calc(' + item.x + ' * var(--fhc-dg-col-width))',
 					width: 'calc(' + item.w + ' * var(--fhc-dg-col-width))',