github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-22 23:45:58 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

BUGFIX: category name is reserved in multisite

Browse Source
This commit is contained in:
Sam 2014-04-24 09:19:59 +10:00
parent ee8bbadfe8
commit 759f4b4fe9
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/models/topic.rb
View File

@ -55,13 +55,17 @@ class Topic < ActiveRecord::Base
:case_sensitive => false, :case_sensitive => false,
:collection => Proc.new{ Topic.listable_topics } } :collection => Proc.new{ Topic.listable_topics } }
validates :category_id, :presence => true ,:exclusion => {:in => [SiteSetting.uncategorized_category_id]}, validates :category_id,
:if => Proc.new { |t| :presence => true,
(t.new_record? || t.category_id_changed?) && :exclusion => {
!SiteSetting.allow_uncategorized_topics && :in => Proc.new{[SiteSetting.uncategorized_category_id]}
(t.archetype.nil? || t.archetype == Archetype.default) && },
(!t.user_id || !t.user.staff?) :if => Proc.new { |t|
} (t.new_record? || t.category_id_changed?) &&
!SiteSetting.allow_uncategorized_topics &&
(t.archetype.nil? || t.archetype == Archetype.default) &&
(!t.user_id || !t.user.staff?)
}
before_validation do before_validation do