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: Show right message when permanently deleting topic (#14717)

Browse Source
This commit is contained in:
Bianca Nenciu
2021-10-26 18:31:15 +03:00
committed by GitHub
parent dfb7924105
commit 0c6f9d7c67
4 changed files with 58 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/models/topic.rb
View File

@@ -1755,6 +1755,15 @@ class Topic < ActiveRecord::Base
).performed!
end
def cannot_permanently_delete_reason(user)
if self.posts_count > 0
I18n.t('post.cannot_permanently_delete.many_posts')
elsif self.deleted_by_id == user&.id && self.deleted_at >= Post::PERMANENT_DELETE_TIMER.ago
time_left = RateLimiter.time_left(Post::PERMANENT_DELETE_TIMER.to_i - Time.zone.now.to_i + self.deleted_at.to_i)
I18n.t('post.cannot_permanently_delete.wait_or_different_admin', time_left: time_left)
end
end
private
def invite_to_private_message(invited_by, target_user, guardian)
@@ -1815,15 +1824,6 @@ class Topic < ActiveRecord::Base
def apply_per_day_rate_limit_for(key, method_name)
RateLimiter.new(user, "#{key}-per-day", SiteSetting.get(method_name), 1.day.to_i)
end
def cannot_permanently_delete_reason(user)
if self.posts_count > 1
I18n.t('post.cannot_permanently_delete.many_posts')
elsif self.deleted_by_id == user&.id && self.deleted_at >= Post::PERMANENT_DELETE_TIMER.ago
time_left = RateLimiter.time_left(Post::PERMANENT_DELETE_TIMER.to_i - Time.zone.now.to_i + self.deleted_at.to_i)
I18n.t('post.cannot_permanently_delete.wait_or_different_admin', time_left: time_left)
end
end
end
# == Schema Information