From 9b4b2149fff6d8fbc282b3ea2673d32adcfbecd8 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Wed, 17 Mar 2021 16:35:51 +0200
Subject: [PATCH] FIX: Allow group owners manage group flair (#12415)

Follow up to commit 901cee55cdeefa64cb65efa9a02a81297e416051.
---
 .../discourse/app/components/groups-form-membership-fields.js  | 3 +++
 .../app/templates/components/groups-form-membership-fields.hbs | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/components/groups-form-membership-fields.js b/app/assets/javascripts/discourse/app/components/groups-form-membership-fields.js
index e7239ce385..7603df532c 100644
--- a/app/assets/javascripts/discourse/app/components/groups-form-membership-fields.js
+++ b/app/assets/javascripts/discourse/app/components/groups-form-membership-fields.js
@@ -1,6 +1,7 @@
 import Component from "@ember/component";
 import I18n from "I18n";
 import { computed } from "@ember/object";
+import { not } from "@ember/object/computed";
 import discourseComputed from "discourse-common/utils/decorators";
 
 export default Component.extend({
@@ -21,6 +22,8 @@ export default Component.extend({
     ];
   },
 
+  canEdit: not("model.automatic"),
+
   groupTrustLevel: computed(
     "model.grant_trust_level",
     "trustLevelOptions",
diff --git a/app/assets/javascripts/discourse/app/templates/components/groups-form-membership-fields.hbs b/app/assets/javascripts/discourse/app/templates/components/groups-form-membership-fields.hbs
index 181d0abc76..bce462add0 100644
--- a/app/assets/javascripts/discourse/app/templates/components/groups-form-membership-fields.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/groups-form-membership-fields.hbs
@@ -96,7 +96,9 @@
       {{i18n "admin.groups.default_title_description"}}
     </div>
   </div>
+{{/if}}
 
+{{#if canEdit}}
   <div class="control-group">
     {{group-flair-inputs model=model}}
   </div>