-
-
-
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index e8c56fd4e..b55eefb7a 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -124,8 +124,6 @@ export default {
return { ...item, ...placement, weight };
});
- if (this.editModeIsActive)
- return placedItems;
return placedItems.filter(item => !item.hidden);
}
},
@@ -141,22 +139,12 @@ export default {
handleConfigClosed() {
this.configOpened = false
},
- removeWidget(item, revert) {
+ removeWidget(item) {
if (item.custom) {
BsConfirm.popup(this.$p.t('dashboard', 'alert_deleteWidget')).then(() => this.$emit('widgetRemove', item.id, this.name));
} else {
let update = {};
- update[item.id] = { hidden: !revert };
-
- if (!revert) {
- // NOTE(chris): move to last line
- update[item.id].place = [];
- let y = this.gridHeight;
- if (this.additionalRow)
- y--;
- update[item.id].place[this.gridWidth] = { x: 0, y };
- }
-
+ update[item.id] = { hidden: true };
this.updatePreset(update);
}
},
@@ -251,13 +239,12 @@ export default {
:loading="item.loading"
:config="item.config"
:custom="item.custom"
- :hidden="item.hidden"
:editMode="editModeIsActive"
:place="item.place[gridWidth]"
:widget-template="indexedWidgetsTemplates[item.widget]"
:source="adminMode ? null : item.source || 'custom'"
@change="saveConfig($event, item)"
- @remove="removeWidget(item, $event)"
+ @remove="removeWidget(item)"
@config-opened="handleConfigOpened"
@config-closed="handleConfigClosed"
@pin-item="updatePositions"
diff --git a/public/js/components/Dashboard/Widget/Picker.js b/public/js/components/Dashboard/Widget/Picker.js
index 260b95874..5d738213a 100644
--- a/public/js/components/Dashboard/Widget/Picker.js
+++ b/public/js/components/Dashboard/Widget/Picker.js
@@ -7,11 +7,21 @@ export default {
WidgetIcon,
},
props: [
- "widgets"
+ "widgets",
+ "hiddenWidgets"
],
data: () => ({
callbacks: {}
}),
+ computed: {
+ hasAnyWidgets() {
+ if (!this.widgets)
+ return false;
+ if (!this.widgets.length && !this.hiddenWidgets?.length)
+ return false;
+ return true;
+ }
+ },
methods: {
getWidget() {
return new Promise((resolve,reject) => {
@@ -37,23 +47,46 @@ export default {
{{ $p.t('dashboard/createWidget') }}
-
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 6d9777c28..d4d8c90d9 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -233,6 +233,14 @@ export default {
if (value == oldValue)
return;
+ /** NOTE(chris): tempPositionUpdates depends on the cols not to be
+ * updated. So if they do we reset to get a clean value. In case the
+ * drag and drop operation is still motion on the next tick this
+ * will be correct again and if there is no such operation we clean
+ * up.
+ */
+ this.tempPositionUpdates = null;
+
this.reinitGrid();
},
rows: {
@@ -246,6 +254,11 @@ export default {
},
indexedItems: {
handler(value) {
+ /** NOTE(chris): there was an update of the items, so in case
+ * it came from a drag and drop operation we need to clean up
+ */
+ this.tempPositionUpdates = null;
+
this.reinitGrid();
},
immediate: true,
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 3b73c44f2..8fb4a5cd4 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -40,7 +40,7 @@ export default {
query: Vue.computed(() => this.lastQuery),
};
},
- inject: ["isMobile"],
+ inject: { isMobile: { default: false } },
data: function () {
return {
searchtimer: null,
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 4f29de1d6..5e5c47589 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -29742,6 +29742,46 @@ array(
)
)
),
+ array(
+ 'app' => 'core',
+ 'category' => 'profil',
+ 'phrase' => 'name_title_clipboard_copy_confirmation',
+ 'insertvon' => 'system',
+ 'phrases' => array(
+ array(
+ 'sprache' => 'German',
+ 'text' => 'Name mit Titel in die Zwischenablage kopiert.',
+ 'description' => '',
+ 'insertvon' => 'system'
+ ),
+ array(
+ 'sprache' => 'English',
+ 'text' => 'Full name with title copied to clipboard.',
+ 'description' => '',
+ 'insertvon' => 'system'
+ )
+ )
+ ),
+ array(
+ 'app' => 'core',
+ 'category' => 'profil',
+ 'phrase' => 'name_title_copy',
+ 'insertvon' => 'system',
+ 'phrases' => array(
+ array(
+ 'sprache' => 'German',
+ 'text' => 'Name mit Titel kopieren',
+ 'description' => '',
+ 'insertvon' => 'system'
+ ),
+ array(
+ 'sprache' => 'English',
+ 'text' => 'Copy full name with title',
+ 'description' => '',
+ 'insertvon' => 'system'
+ )
+ )
+ ),
array(
'app' => 'core',
'category' => 'profil',
@@ -60932,6 +60972,26 @@ I have been informed that I am under no obligation to consent to the transmissio
)
)
),
+ array(
+ 'app' => 'core',
+ 'category' => 'LvPlan',
+ 'phrase' => 'copy',
+ 'insertvon' => 'system',
+ 'phrases' => array(
+ array(
+ 'sprache' => 'German',
+ 'text' => 'Kopieren',
+ 'description' => '',
+ 'insertvon' => 'system'
+ ),
+ array(
+ 'sprache' => 'English',
+ 'text' => 'Copy',
+ 'description' => '',
+ 'insertvon' => 'system'
+ )
+ )
+ ),
// ### LvPlanStgOrg END ###
// DMS-Link Phrasen Start
array(
-
+
+
- {{ $p.t('dashboard/noWidgetsAvailable') }}
-
+
-
+
+
+
+
+
+
+