From 406c6d679a11d1ef04a2426931459ebf5cb8278a Mon Sep 17 00:00:00 2001 From: Jeff Wong Date: Tue, 19 Jun 2018 17:40:24 -0700 Subject: [PATCH] FIX: correct display for unlocking on tl0 --- .../javascripts/admin/controllers/admin-user-index.js.es6 | 1 + app/assets/javascripts/admin/templates/user-index.hbs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 index 092a8b62032..59329021b70 100644 --- a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 @@ -16,6 +16,7 @@ export default Ember.Controller.extend(CanCheckEmails, { showApproval: setting("must_approve_users"), showBadges: setting("enable_badges"), + hasLockedTrustLevel: Ember.computed.notEmpty("model.manual_locked_trust_level"), primaryGroupDirty: propertyNotEqual( "originalPrimaryGroupId", diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs index a76d764e4a0..88d3b6bfcca 100644 --- a/app/assets/javascripts/admin/templates/user-index.hbs +++ b/app/assets/javascripts/admin/templates/user-index.hbs @@ -304,7 +304,7 @@
{{#if model.canLockTrustLevel}} - {{#if model.manual_locked_trust_level}} + {{#if hasLockedTrustLevel}} {{d-icon "lock" title="admin.user.trust_level_locked_tip"}} {{d-button action="lockTrustLevel" actionParam=false label="admin.user.unlock_trust_level"}} {{else}}