blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-16 22:42:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Modals and z-index): ensures dashboard modals are in the forground

Browse Source
This commit is contained in:
SimonGschnell
2025-06-10 13:18:31 +02:00
parent c080d1abb2
commit 83d3f515de
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/LvPlan.php
+1 -1
View File
@@ -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();
public/js/components/DashboardWidget/Url.js
+5 -5
View File
@@ -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>
`,
};
/*
public/js/components/Drop/Grid.js
+2 -2
View File
@@ -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))',