github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 07:11:34 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Autoclose message was not correct when immediate

Browse Source 
FEATURE: Warn when setting auto-close for right now
This commit is contained in:
Arpit Jalan
2015-12-08 18:13:23 +05:30
parent b09ee9cb82
commit e52852dd0f
8 changed files with 103 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/topic.rb
View File

@ -835,10 +835,12 @@ class Topic < ActiveRecord::Base
self.auto_close_at = utc.local(now.year, now.month, now.day, m[1].to_i, m[2].to_i)
self.auto_close_at += offset_minutes * 60 if offset_minutes
self.auto_close_at += 1.day if self.auto_close_at < now
self.auto_close_hours = -1
elsif arg.is_a?(String) && arg.include?("-") && timestamp = utc.parse(arg)
# a timestamp in client's time zone, like "2015-5-27 12:00"
self.auto_close_at = timestamp
self.auto_close_at += offset_minutes * 60 if offset_minutes
self.auto_close_hours = -1
self.errors.add(:auto_close_at, :invalid) if timestamp < Time.zone.now
else
num_hours = arg.to_f
@ -864,6 +866,10 @@ class Topic < ActiveRecord::Base
else
self.auto_close_user ||= (self.user.staff? || self.user.trust_level == TrustLevel[4] ? self.user : Discourse.system_user)
end
if self.auto_close_at.try(:<, Time.zone.now)
auto_close(auto_close_user)
end
end
self