IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 18:30:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: when allow_uncategorized_topics was false, PMs can not be created

Browse Source
This commit is contained in:
Sam 2013-10-25 09:33:18 +11:00
parent d149066ac6
commit 4929c5db71
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/models/topic.rb
View File

@ -59,7 +59,8 @@ class Topic < ActiveRecord::Base
validates :category_id, :presence => true ,:exclusion => {:in => [SiteSetting.uncategorized_category_id]},
:if => Proc.new { |t|
(t.new_record? || t.category_id_changed?) &&
!SiteSetting.allow_uncategorized_topics
!SiteSetting.allow_uncategorized_topics &&
(t.archetype.nil? || t.archetype == Archetype.default)
}
@ -106,7 +107,7 @@ class Topic < ActiveRecord::Base
# Return private message topics
scope :private_messages, lambda {
where(archetype: Archetype::private_message)
where(archetype: Archetype.private_message)
}
scope :listable_topics, lambda { where('topics.archetype <> ?', [Archetype.private_message]) }
@ -169,7 +170,7 @@ class Topic < ActiveRecord::Base
Jobs.cancel_scheduled_job(:close_topic, {topic_id: id})
true
end
if category_id.nil? && (archetype.nil? || archetype == "regular")
if category_id.nil? && (archetype.nil? || archetype == Archetype.default)
self.category_id = SiteSetting.uncategorized_category_id
end
end

5
spec/models/topic_spec.rb
View File

@ -185,6 +185,11 @@ describe Topic do
topic.errors[:category_id].should be_present
end
it "allows PMs" do
topic = Fabricate.build(:topic, category: nil, archetype: Archetype.private_message)
topic.should be_valid
end
it 'passes for topics with a category' do
Fabricate.build(:topic, category: Fabricate(:category)).should be_valid
end