DEV-8308 Remove 'Announcements' functionality (#27)

drivevelocity · Aug 20, 2020 · 4c7618c · 4c7618c
1 parent ff5611d
commit 4c7618c
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 18 deletions.
diff --git a/app/channel-settings/client/views/channelSettings.html b/app/channel-settings/client/views/channelSettings.html
@@ -35,18 +35,20 @@
 			</div>
 		{{/with}}
 
-		{{#with settings.announcement}}
-			<div class="rc-user-info__row">
-				<div class="rc-input">
-					<label class="rc-input__label">
-						<div class="rc-input__title">{{_ label}}{{equal default value '*'}}</div>
-						<div class="rc-input__wrapper">
-							<input type="text" name="announcement" value="{{value}}" class="rc-input__element js-input" disabled="{{./disabled}}"/>
-						</div>
-					</label>
+		{{#if announcementEnabled}}
+			{{#with settings.announcement}}
+				<div class="rc-user-info__row">
+					<div class="rc-input">
+						<label class="rc-input__label">
+							<div class="rc-input__title">{{_ label}}{{equal default value '*'}}</div>
+							<div class="rc-input__wrapper">
+								<input type="text" name="announcement" value="{{value}}" class="rc-input__element js-input" disabled="{{./disabled}}"/>
+							</div>
+						</label>
+					</div>
 				</div>
-			</div>
-		{{/with}}
+			{{/with}}
+		{{/if}}
 		{{#unless isDirectMessage}}
 			{{#with settings.description}}
 				<div class="rc-user-info__row">
@@ -368,12 +370,14 @@ <h3 title="{{name}}" class="rc-user-info__name">{{> icon block="rc-header__icon"
 					</div>
 				</label>
 			{{/unless}}
-			<label class="rc-user-info__label">
-				{{_ "Announcement"}}
-				<div class="rc-user-info__description">
-					{{{RocketChatMarkdown announcement}}}
-				</div>
-			</label>
+			{{#if announcementEnabled}}
+				<label class="rc-user-info__label">
+					{{_ "Announcement"}}
+					<div class="rc-user-info__description">
+						{{{RocketChatMarkdown announcement}}}
+					</div>
+				</label>
+			{{/if}}
 			<label class="rc-user-info__label">
 				{{_ "Topic"}}
 				<div class="rc-user-info__description">

diff --git a/app/channel-settings/client/views/channelSettings.js b/app/channel-settings/client/views/channelSettings.js
@@ -756,6 +756,9 @@ Template.channelSettingsEditing.helpers({
 		const { room } = Template.instance();
 		return TAPi18n.__(label, { max: roomMaxAgeDefault(room.t) });
 	},
+	announcementEnabled() {
+		return settings.get('Allow_Announcements');
+	},
 });
 
 Template.channelSettings.helpers({

diff --git a/app/lib/server/startup/settings.js b/app/lib/server/startup/settings.js
@@ -812,6 +812,10 @@ settings.addGroup('General', function() {
 		type: 'boolean',
 		public: true,
 	});
+	this.add('Allow_Announcements', true, {
+		type: 'boolean',
+		public: false,
+	});
 	this.add('First_Channel_After_Login', '', {
 		type: 'string',
 		public: true,

diff --git a/app/ui/client/views/app/room.js b/app/ui/client/views/app/room.js
@@ -361,7 +361,7 @@ Template.room.helpers({
 	},
 
 	announcement() {
-		return Template.instance().state.get('announcement');
+		return settings.get('Allow_Announcements') && Template.instance().state.get('announcement');
 	},
 
 	messageboxData() {

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -286,6 +286,7 @@
   "All_messages": "All messages",
   "All_users": "All users",
   "All_users_in_the_channel_can_write_new_messages": "All users in the channel can write new messages",
+  "Allow_Announcements": "Allow Announcements",
   "Allow_collect_and_store_HTTP_header_informations": "Allow to collect and store HTTP header informations",
   "Allow_collect_and_store_HTTP_header_informations_description": "This setting determines whether Livechat is allowed to store information collected from HTTP header data, such as IP address, User-Agent, and so on.",
   "Allow_Invalid_SelfSigned_Certs": "Allow Invalid Self-Signed Certs",