github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-02 03:55:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

regressions post merge

Browse Source
This commit is contained in:
Sam 2013-10-24 12:25:20 +11:00
parent adeb987c70
commit 24d732b12a
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/models/category.js
View File

@ -140,9 +140,6 @@ Discourse.Category.reopenClass({
findBySlug: function(slug, parentSlug) {
var uncategorized = Discourse.Category.uncategorizedInstance();
if (slug === uncategorized.get('slug')) return uncategorized;
var categories = Discourse.Category.list(),
category;

6
app/models/category.rb
View File

@ -32,7 +32,6 @@ class Category < ActiveRecord::Base
validates :user_id, presence: true
validates :name, presence: true, uniqueness: true, length: { in: 1..50 }
validate :uncategorized_validator
validate :parent_category_validator
before_validation :ensure_slug
@ -186,11 +185,6 @@ SQL
MessageBus.publish('/categories', {categories: ActiveModel::ArraySerializer.new(Category.latest).as_json})
end
def uncategorized_validator
errors.add(:name, I18n.t(:is_reserved)) if name == SiteSetting.uncategorized_name
errors.add(:slug, I18n.t(:is_reserved)) if slug == SiteSetting.uncategorized_name
end
def parent_category_validator
if parent_category_id
errors.add(:parent_category_id, "You can't link a category to itself") if parent_category_id == id