From 7b692e0481d2bb0c199655dad2a68ed9f8d2230d Mon Sep 17 00:00:00 2001
From: ArtOfCode- <hello@artofcode.co.uk>
Date: Sun, 10 May 2020 15:32:23 +0100
Subject: [PATCH] Rubocop
---
app/models/application_record.rb | 2 +-
app/models/tag.rb | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index 2aa76e8e6..289eb912a 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 cd89a7d0d..b3b528544 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
--
GitLab