From c90267db52dfc329d3f4e56f34e4ca2c7a74f829 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 8 Mar 2019 09:23:26 +0100
Subject: [PATCH] =?UTF-8?q?FIX:=20do=20not=20display=20add/remove=20partic?=
 =?UTF-8?q?ipants=20if=20you=20can=E2=80=99t=20actually=20do=20it=20(#7125?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../widgets/private-message-map.js.es6        | 21 ++++++++++++-------
 .../stylesheets/common/base/topic-post.scss   |  5 ++++-
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/discourse/widgets/private-message-map.js.es6 b/app/assets/javascripts/discourse/widgets/private-message-map.js.es6
index 40b5ce38c02..1ce3119a75f 100644
--- a/app/assets/javascripts/discourse/widgets/private-message-map.js.es6
+++ b/app/assets/javascripts/discourse/widgets/private-message-map.js.es6
@@ -152,14 +152,17 @@ export default createWidget("private-message-map", {
     }
 
     const result = [h(`div.participants${hideNamesClass}`, participants)];
+    const controls = [];
 
-    const controls = [
-      this.attach("button", {
-        action: "toggleEditing",
-        label: "private_message_info.edit",
-        className: "btn btn-default add-remove-participant-btn"
-      })
-    ];
+    if (attrs.canRemoveAllowedUsers || attrs.canRemoveSelfId) {
+      controls.push(
+        this.attach("button", {
+          action: "toggleEditing",
+          label: "private_message_info.edit",
+          className: "btn btn-default add-remove-participant-btn"
+        })
+      );
+    }
 
     if (attrs.canInvite && this.state.isEditing) {
       controls.push(
@@ -171,7 +174,9 @@ export default createWidget("private-message-map", {
       );
     }
 
-    result.push(h("div.controls", controls));
+    if (controls.length) {
+      result.push(h("div.controls", controls));
+    }
 
     return result;
   },
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 91463df6301..09247ad12b4 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -357,7 +357,10 @@ aside.quote {
     display: flex;
     flex-wrap: wrap;
     align-items: center;
-    margin-bottom: 0.5em;
+
+    & + .controls {
+      margin-top: 0.5em;
+    }
 
     &.hide-names .user {
       .username,