Merge branch 'pu/sd/DockAppOnBadgeSet' into 'main'

pin app on dock, when setting it's badge See merge request tine20/tine20!6579
tine-groupware · Feb 12, 2025 · 26f1394 · 26f1394
2 parents 17f69d6 + 6da80a4
commit 26f1394
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/tine20/Tinebase/js/Application.js b/tine20/Tinebase/js/Application.js
@@ -102,6 +102,7 @@ Ext.extend(Tine.Tinebase.Application, Ext.util.Observable , {
      */
     setDockBadge: function(value) {
         this.dockBadge.value = parseInt(value) || 0
+        if(this.dockBadge.value) Tine.Tinebase.MainScreen.getDock().pinAppToDock(this)
     },
 
     /**

diff --git a/tine20/Tinebase/js/TineDock/index.js b/tine20/Tinebase/js/TineDock/index.js
@@ -8,6 +8,7 @@
 
 import TineDock from "./TineDock.vue";
 import BootstrapVueNext from "bootstrap-vue-next";
+
 Ext.ns('Tine.Tinebase');
 
 Tine.Tinebase.TineDock = Ext.extend(Ext.BoxComponent, {
@@ -54,15 +55,19 @@ Tine.Tinebase.TineDock = Ext.extend(Ext.BoxComponent, {
         Tine.Tinebase.TineDock.superclass.initComponent.call(this)
     },
 
-    _setState: function(app){
+    pinAppToDock: function(app) {
         const appName = app.name
-        this.vueProps.state.activeApp = appName
-        if (_.indexOf(this.vueProps.state.dockedApps, appName) === -1) {
-            this.vueProps.state.dockedApps.push(appName)
-        }
+        if (_.indexOf(this.vueProps.state.dockedApps, appName) !== -1) return // app already pinned
+        this.vueProps.state.dockedApps.push(appName)
         this.fireEvent('syncState', this)
     },
 
+    _setState: function(app){
+        this.vueProps.state.activeApp = app.name
+        this.pinAppToDock(app)
+        // this.fireEvent('syncState', this)
+    },
+
     activateApp: function(appName) {
         const app = Tine.Tinebase.appMgr.get(appName)
         Tine.Tinebase.MainScreen.activate(app)
-Original file line number
+Diff line change
@@ Expand Up @@
          */
         setDockBadge: function(value) {
             this.dockBadge.value = parseInt(value) || 0
+            if(this.dockBadge.value) Tine.Tinebase.MainScreen.getDock().pinAppToDock(this)
         },
         /**
@@ Expand Down @@