From 8366b711764426d343cfb4efb66557583c9bbfdb Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Mon, 11 May 2015 12:06:28 +0530 Subject: [PATCH] FEATURE: check nofollow setting when showing website --- app/assets/javascripts/discourse/controllers/user.js.es6 | 4 ++++ app/assets/javascripts/discourse/templates/user/user.hbs | 6 +++++- config/site_settings.yml | 4 +++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6 index 4a0e666cf..512df986e 100644 --- a/app/assets/javascripts/discourse/controllers/user.js.es6 +++ b/app/assets/javascripts/discourse/controllers/user.js.es6 @@ -19,6 +19,10 @@ export default ObjectController.extend(CanCheckEmails, { linkWebsite: Em.computed.not('isBasic'), + removeNoFollow: function() { + return this.get('trust_level') > 2 && !this.siteSettings.tl3_links_no_follow; + }.property('trust_level'), + canSeePrivateMessages: Ember.computed.or('viewingSelf', 'currentUser.admin'), canSeeNotificationHistory: Em.computed.alias('canSeePrivateMessages'), diff --git a/app/assets/javascripts/discourse/templates/user/user.hbs b/app/assets/javascripts/discourse/templates/user/user.hbs index 973faae83..f15a4f9e4 100644 --- a/app/assets/javascripts/discourse/templates/user/user.hbs +++ b/app/assets/javascripts/discourse/templates/user/user.hbs @@ -71,7 +71,11 @@ {{#if websiteName}} {{fa-icon "globe"}} {{#if linkWebsite}} - {{websiteName}} + {{#if removeNoFollow}} + {{websiteName}} + {{else}} + {{websiteName}} + {{/if}} {{else}} {{websiteName}} {{/if}} diff --git a/config/site_settings.yml b/config/site_settings.yml index 30270d020..8bb55f956 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -611,7 +611,9 @@ trust: tl3_requires_likes_received: default: 20 min: 0 - tl3_links_no_follow: false + tl3_links_no_follow: + default: false + client: true security: use_https: false