diff --git a/app/assets/javascripts/discourse/app/components/user-nav.hbs b/app/assets/javascripts/discourse/app/components/user-nav.hbs index 9be451034c7..4ee9b9831ad 100644 --- a/app/assets/javascripts/discourse/app/components/user-nav.hbs +++ b/app/assets/javascripts/discourse/app/components/user-nav.hbs @@ -9,15 +9,16 @@ {{i18n "user.summary.title"}} - - {{d-icon "stream"}} - {{i18n "user.activity_stream"}} - - + {{#if @showActivityTab}} + + {{d-icon "stream"}} + {{i18n "user.activity_stream"}} + + {{/if}} {{/unless}} {{#if @showNotificationsTab}} diff --git a/app/assets/javascripts/discourse/app/controllers/user.js b/app/assets/javascripts/discourse/app/controllers/user.js index 3bf34c44fec..8dbc1c81c64 100644 --- a/app/assets/javascripts/discourse/app/controllers/user.js +++ b/app/assets/javascripts/discourse/app/controllers/user.js @@ -122,6 +122,11 @@ export default Controller.extend(CanCheckEmails, { ); }, + @discourseComputed("viewingSelf", "currentUser.admin") + showActivityTab(viewingSelf, isAdmin) { + return viewingSelf || isAdmin || !this.siteSettings.hide_user_activity_tab; + }, + @discourseComputed("viewingSelf", "currentUser.admin") showNotificationsTab(viewingSelf, isAdmin) { return viewingSelf || isAdmin; diff --git a/app/assets/javascripts/discourse/app/templates/user.hbs b/app/assets/javascripts/discourse/app/templates/user.hbs index 2bdf3c7cb5b..1e63eecad65 100644 --- a/app/assets/javascripts/discourse/app/templates/user.hbs +++ b/app/assets/javascripts/discourse/app/templates/user.hbs @@ -460,6 +460,7 @@ @user={{this.model}} @isStaff={{this.currentUser.staff}} @isMobileView={{this.site.mobileView}} + @showActivityTab={{this.showActivityTab}} @showNotificationsTab={{this.showNotificationsTab}} @showPrivateMessages={{this.showPrivateMessages}} @canInviteToForum={{this.canInviteToForum}} diff --git a/app/assets/javascripts/discourse/app/templates/user/summary.hbs b/app/assets/javascripts/discourse/app/templates/user/summary.hbs index 6f243f6cbb3..6fd464f6dc1 100644 --- a/app/assets/javascripts/discourse/app/templates/user/summary.hbs +++ b/app/assets/javascripts/discourse/app/templates/user/summary.hbs @@ -51,15 +51,25 @@ @label="user.summary.posts_read" /> -
  • - + {{#if this.model.can_see_user_actions}} +
  • + + + +
  • + {{else}} +
  • - -
  • + + {{/if}}
  • {{#if this.model.bookmark_count}} -
  • - + {{#if this.model.can_see_user_actions}} +
  • + + + +
  • + {{else}} +
  • +
  • + {{/if}} + {{/if}} + {{#if this.model.can_see_user_actions}} +
  • + +
  • - {{/if}} -
  • - + {{else}} +
  • - -
  • -
  • - +
  • + {{/if}} + {{#if this.model.can_see_user_actions}} +
  • + + + +
  • + {{else}} +
  • - -
  • + + {{/if}}