From 71f389703d5fec4dbbe77f3771e3784f5166b973 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Wed, 19 Jun 2024 21:36:35 +0300
Subject: [PATCH] remove action fix

---
 client/src/views/record/detail.js       | 22 ++++++++++++++++++++--
 client/src/views/stream/notes/create.js | 14 +++++++++-----
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/client/src/views/record/detail.js b/client/src/views/record/detail.js
index 95b76c009c..d11346fd91 100644
--- a/client/src/views/record/detail.js
+++ b/client/src/views/record/detail.js
@@ -2962,8 +2962,26 @@ class DetailRecordView extends BaseRecordView {
             }
         }
 
-        if (this.isRendered()) {
-            this.$el.find('.detail-button-container .action[data-action="'+name+'"]').remove();
+        if (!this.isRendered()) {
+            return;
+        }
+
+        const $container = this.$el.find('.detail-button-container');
+
+        const $action = $container.find(`ul > li > a.action[data-action="${name}"]`);
+
+        if ($action.length) {
+            $action.parent().remove();
+
+            $container.find(`ul > .divider:last-child`).remove();
+
+            return;
+        }
+
+        const $button = $container.find(`button.action[data-action="${name}"]`);
+
+        if ($button.length) {
+            $button.remove();
         }
     }
 
diff --git a/client/src/views/stream/notes/create.js b/client/src/views/stream/notes/create.js
index 4ccac6d2f4..b630858aca 100644
--- a/client/src/views/stream/notes/create.js
+++ b/client/src/views/stream/notes/create.js
@@ -59,11 +59,15 @@ class CreateNoteStreamView extends NoteStreamView {
         this.assignedUserName = data.assignedUserName || data.assignedUserId || null;
 
         this.messageData['assignee'] =
-            $('<a>')
-                .attr('href', `#User/view/${this.assignedUserId}`)
-                .text(this.assignedUserName)
-                .attr('data-scope', 'User')
-                .attr('data-id', this.assignedUserId);
+            $('<span>')
+                .append(
+                    this.getHelper().getAvatarHtml(data.assignedUserId, 'small', 16, 'avatar-link'),
+                    $('<a>')
+                        .attr('href', `#User/view/${this.assignedUserId}`)
+                        .text(this.assignedUserName)
+                        .attr('data-scope', 'User')
+                        .attr('data-id', this.assignedUserId)
+                );
 
         let isYou = false;