IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: suspended users still appear suspended after their suspension expires

Browse Source
This commit is contained in:
Neil Lalonde
2013-12-03 15:53:30 -05:00
parent c4394688de
commit 915861a646
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/models/user.js
View File

@@ -99,6 +99,10 @@ Discourse.User = Discourse.Model.extend({
isSuspended: Em.computed.equal('suspended', true), isSuspended: Em.computed.equal('suspended', true),
suspended: function() {
return this.get('suspended_till') && moment(this.get('suspended_till')).isAfter();
}.property('suspended_till'),
suspendedTillDate: function() { suspendedTillDate: function() {
return Discourse.Formatter.longDate(this.get('suspended_till')); return Discourse.Formatter.longDate(this.get('suspended_till'));
}.property('suspended_till'), }.property('suspended_till'),

5
app/serializers/user_serializer.rb
View File

@@ -18,7 +18,6 @@ class UserSerializer < BasicUserSerializer
:moderator, :moderator,
:admin, :admin,
:title, :title,
:suspended,
:suspend_reason, :suspend_reason,
:suspended_till :suspended_till
@@ -99,10 +98,6 @@ class UserSerializer < BasicUserSerializer
SiteSetting.enable_names? SiteSetting.enable_names?
end end
def suspended
object.suspended?
end
def include_suspended? def include_suspended?
object.suspended? object.suspended?
end end