From df7d50d5ecb8d7df7adc8fcc10d42afad4d254dd Mon Sep 17 00:00:00 2001
From: ArtOfCode- <hello@artofcode.co.uk>
Date: Wed, 1 Jul 2020 00:38:51 +0100
Subject: [PATCH] Thaaaanks rubocop
---
app/controllers/tags_controller.rb | 6 +++---
app/models/tag.rb | 4 +++-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index f055fc9b2..ad6a20dea 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -10,7 +10,7 @@ class TagsController < ApplicationController
@tags = if params[:term].present?
(@tag_set&.tags || Tag).search(params[:term])
else
- (@tag_set&.tags|| Tag.all).order(:name)
+ (@tag_set&.tags || Tag.all).order(:name)
end.paginate(page: params[:page], per_page: 50)
respond_to do |format|
format.json do
@@ -26,7 +26,7 @@ class TagsController < ApplicationController
else
@tag_set.tags.order(Arel.sql('COUNT(posts.id) DESC'))
end.left_joins(:posts).group(Arel.sql('tags.id')).select(Arel.sql('tags.*, COUNT(posts.id) AS post_count'))
- .paginate(per_page: 96, page: params[:page])
+ .paginate(per_page: 96, page: params[:page])
end
def show
@@ -68,7 +68,7 @@ class TagsController < ApplicationController
else
@tag.children.order(Arel.sql('COUNT(posts.id) DESC'))
end.left_joins(:posts).group(Arel.sql('tags.id')).select(Arel.sql('tags.*, COUNT(posts.id) AS post_count'))
- .paginate(per_page: 96, page: params[:page])
+ .paginate(per_page: 96, page: params[:page])
end
private
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 5ee4ccc71..d6629cbdb 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -7,7 +7,7 @@ class Tag < ApplicationRecord
belongs_to :parent, class_name: 'Tag', optional: true
validates :excerpt, length: { maximum: 600 }, allow_blank: true
- validates :wiki_markdown, length: { maximum: 30000 }, allow_blank: true
+ validates :wiki_markdown, length: { maximum: 30_000 }, allow_blank: true
validate :parent_not_self
validate :parent_not_own_child
@@ -26,6 +26,7 @@ class Tag < ApplicationRecord
def parent_not_self
return unless parent_id.present?
+
if parent_id == id
errors.add(:base, 'A tag cannot be its own parent.')
end
@@ -33,6 +34,7 @@ class Tag < ApplicationRecord
def parent_not_own_child
return unless parent_id.present?
+
if all_children.include? parent_id
errors.add(:base, "The #{parent.name} tag is already a child of this tag.")
end
--
GitLab