Refactor user preference into admin setting

RocketChat · Jul 25, 2017 · 8722ed9 · 8722ed9
1 parent 95c6aa0
commit 8722ed9
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 15 deletions.
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -330,8 +330,8 @@
   "Clear_all_unreads_question": "Clear all unreads?",
   "Click_here": "Click here",
   "Click_here_for_more_info": "Click here for more info",
-  "Click_Direct_Message": "Click to Create Direct Message",
-  "Click_Direct_Message_Description": "Skip opening profile tab, instead go straight to conversation",
+  "UI_Click_Direct_Message": "Click to Create Direct Message",
+  "UI_Click_Direct_Message_Description": "Skip opening profile tab, instead go straight to conversation",
   "Client_ID": "Client ID",
   "Client_Secret": "Client Secret",
   "Clients_will_refresh_in_a_few_seconds": "Clients will refresh in a few seconds",

diff --git a/packages/rocketchat-lib/server/startup/settings.js b/packages/rocketchat-lib/server/startup/settings.js
@@ -1036,6 +1036,10 @@ RocketChat.settings.addGroup('Layout', function() {
 			type: 'boolean',
 			'public': true
 		});
+		this.add('UI_Click_Direct_Message', false, {
+			type: 'boolean',
+			'public': true
+		});
 	});
 });
 

diff --git a/packages/rocketchat-ui-account/client/accountPreferences.html b/packages/rocketchat-ui-account/client/accountPreferences.html
@@ -139,15 +139,6 @@ <h1>{{_ "Messages"}}</h1>
 									<label><input type="radio" name="mergeChannels" value="-1" checked="{{checked 'mergeChannels' undefined true}}" /> {{_ "Default"}}</label>
 								</div>
 							</div>
-							<div class="input-line double-col" id="clickToDirectMessage">
-								<label>{{_ "Click_Direct_Message"}}</label>
-								<div>
-									<label><input type="radio" name="clickToDirectMessage" value="1" checked="{{checked 'clickToDirectMessage' true}}"/> {{_ "True"}}</label>
-									<label><input type="radio" name="clickToDirectMessage" value="0" checked="{{checked 'clickToDirectMessage' false true}}"/> {{_ "False"}}</label>
-								</div>
-								<div class="info">{{_ "Click_Direct_Message_Description"}}</div>
-
-							</div>
 							<div class="input-line double-col" id="sendOnEnter">
 								<label>{{_ "Enter_Behaviour"}}</label>
 								<div>

diff --git a/packages/rocketchat-ui-account/client/accountPreferences.js b/packages/rocketchat-ui-account/client/accountPreferences.js
@@ -114,7 +114,6 @@ Template.accountPreferences.onCreated(function() {
 		data.hideFlexTab = $('#hideFlexTab').find('input:checked').val();
 		data.hideAvatars = $('#hideAvatars').find('input:checked').val();
 		data.mergeChannels = $('#mergeChannels').find('input:checked').val();
-		data.clickToDirectMessage = $('#clickToDirectMessage').find('input:checked').val();
 		data.sendOnEnter = $('#sendOnEnter').find('select').val();
 		data.unreadRoomsMode = $('input[name=unreadRoomsMode]:checked').val();
 		data.autoImageLoad = $('input[name=autoImageLoad]:checked').val();

diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
@@ -474,8 +474,7 @@ Template.room.events({
 		if (!Meteor.userId() || !this._arguments) {
 			return;
 		}
-		const clickToDirectMessage = Meteor.user() && Meteor.user().settings && Meteor.user().settings.preferences && Meteor.user().settings.preferences.clickToDirectMessage;
-		if (clickToDirectMessage) {
+		if (RocketChat.settings.get('UI_Click_Direct_Message')) {
 			return Meteor.call('createDirectMessage', this._arguments[1].u.username, (error, result) => {
 				if (error) {
 					if (error.isClientSafe) {

diff --git a/server/methods/saveUserPreferences.js b/server/methods/saveUserPreferences.js
@@ -60,7 +60,6 @@ Meteor.methods({
 			preferences.hideUsernames = settings.hideUsernames === '1';
 			preferences.hideRoles = settings.hideRoles === '1';
 			preferences.hideAvatars = settings.hideAvatars === '1';
-			preferences.clickToDirectMessage = settings.clickToDirectMessage === '1';
 			preferences.hideFlexTab = settings.hideFlexTab === '1';
 			preferences.highlights = settings.highlights;
 			preferences.sendOnEnter = settings.sendOnEnter;