From 24d732b12a4616db2421d45af04d24c4bdf29c7d Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 24 Oct 2013 12:25:20 +1100 Subject: [PATCH] regressions post merge --- app/assets/javascripts/discourse/models/category.js | 3 --- app/models/category.rb | 6 ------ 2 files changed, 9 deletions(-) diff --git a/app/assets/javascripts/discourse/models/category.js b/app/assets/javascripts/discourse/models/category.js index 499df75d354..cf32f9d93ff 100644 --- a/app/assets/javascripts/discourse/models/category.js +++ b/app/assets/javascripts/discourse/models/category.js @@ -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; diff --git a/app/models/category.rb b/app/models/category.rb index dd45d05d869..77d56f9fc2f 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -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