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 {
-
+
{{$p.t('bookmark','editLink')}}
@@ -213,10 +213,9 @@ export default {
-
-
+
-
+
{{$p.t('bookmark','newLink')}}
@@ -231,7 +230,8 @@ export default {
- `,
+
+ `,
};
/*
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))',