diff --git a/app/models/application_record.rb b/app/models/application_record.rb index 2aa76e8e6c7c565c063c8dbdf83afe52ce42baef..289eb912a683599b1ea0b06060e863f0ff63ab6c 100644 --- a/app/models/application_record.rb +++ b/app/models/application_record.rb @@ -32,7 +32,7 @@ class ApplicationRecord < ActiveRecord::Base end def self.sanitize_sql_in(ary) - return "(NULL)" unless ary.present? && ary.respond_to?(:map) + return '(NULL)' unless ary.present? && ary.respond_to?(:map) ary = ary.map { |el| ActiveRecord::Base.sanitize_sql_array(['?', el]) } "(#{ary.join(', ')})" diff --git a/app/models/tag.rb b/app/models/tag.rb index cd89a7d0d35a75be50baf01908b569ee4031c212..b3b52854418b78e7cc876500a3d1e88e61857f03 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -1,12 +1,11 @@ class Tag < ApplicationRecord include CommunityRelated - scope :category_order, -> (required_ids, topic_ids) do - helpers = ActionController::Base.helpers + scope :category_order, lambda { |required_ids, topic_ids| order(Arel.sql("id IN #{sanitize_sql_in(required_ids)} DESC"), Arel.sql("id IN #{sanitize_sql_in(topic_ids)} DESC"), name: :asc) - end + } has_and_belongs_to_many :posts belongs_to :tag_set