diff --git a/app/models/pool.rb b/app/models/pool.rb index 308aacf0e..1713e622b 100644 --- a/app/models/pool.rb +++ b/app/models/pool.rb @@ -2,7 +2,7 @@ require 'ostruct' class Pool < ActiveRecord::Base validates_uniqueness_of :name - validates_format_of :name, :with => /\A[^\s;,]+\Z/, :on => :create, :message => "cannot have whitespace, commas, or semicolons" + validates_format_of :name, :with => /\A[^\s,]+\Z/, :on => :create, :message => "cannot have whitespace or commas" validates_inclusion_of :category, :in => %w(series collection) belongs_to :creator, :class_name => "User" belongs_to :updater, :class_name => "User" diff --git a/app/models/tag_alias.rb b/app/models/tag_alias.rb index f049b829f..21e0dd2fb 100644 --- a/app/models/tag_alias.rb +++ b/app/models/tag_alias.rb @@ -16,7 +16,7 @@ class TagAlias < ActiveRecord::Base end def active - where("status = ?", "active") + where("status IN (?)", ["active", "processing"]) end def search(params) @@ -62,7 +62,7 @@ class TagAlias < ActiveRecord::Base def self.to_aliased(names) Array(names).flatten.map do |name| Cache.get("ta:#{Cache.sanitize(name)}") do - ActiveRecord::Base.select_value_sql("select consequent_name from tag_aliases where status = 'active' and antecedent_name = ?", name) || name + ActiveRecord::Base.select_value_sql("select consequent_name from tag_aliases where status in ('active', 'processing') and antecedent_name = ?", name) || name end end.uniq end diff --git a/app/models/tag_implication.rb b/app/models/tag_implication.rb index e2faa900c..a303927ee 100644 --- a/app/models/tag_implication.rb +++ b/app/models/tag_implication.rb @@ -15,7 +15,7 @@ class TagImplication < ActiveRecord::Base module ClassMethods # assumes names are normalized def with_descendants(names) - (names + where("antecedent_name in (?) and status = ?", names, "active").map(&:descendant_names_array)).flatten.uniq + (names + where("antecedent_name in (?) and status in (?)", names, ["active", "processing"]).map(&:descendant_names_array)).flatten.uniq end end @@ -26,7 +26,7 @@ class TagImplication < ActiveRecord::Base until children.empty? all.concat(children) - children = TagImplication.where("antecedent_name IN (?) and status = ?", children, "active").all.map(&:consequent_name) + children = TagImplication.where("antecedent_name IN (?) and status in (?)", children, ["active", "processing"]).all.map(&:consequent_name) end end.sort.uniq end diff --git a/app/views/pools/new.html.erb b/app/views/pools/new.html.erb index 1c379f680..b9280948d 100644 --- a/app/views/pools/new.html.erb +++ b/app/views/pools/new.html.erb @@ -4,11 +4,11 @@