chore: rubocop
chore: fix api test conventions chore: rubocop -A spec/ chore: more rubocop -A fix failing test rubocop fixes removes helper methods that are in my opinion dead code more rubocop fixes rubocop -a --auto-gen-config
This commit is contained in:
parent
f6fb804bbe
commit
fb2b4d8a8a
331 changed files with 4263 additions and 4507 deletions
|
|
@ -1,61 +1,62 @@
|
|||
class Page < ApplicationRecord
|
||||
include ActsAsTree
|
||||
|
||||
belongs_to :user, :foreign_key => 'updated_by'
|
||||
belongs_to :user, foreign_key: 'updated_by'
|
||||
|
||||
acts_as_versioned version_column: :lock_version
|
||||
self.non_versioned_columns += %w(permalink created_at title)
|
||||
self.non_versioned_columns += %w[permalink created_at title]
|
||||
|
||||
acts_as_tree :order => "title"
|
||||
acts_as_tree order: 'title'
|
||||
|
||||
attr_accessor :old_title # Save title to create redirect page when editing title
|
||||
|
||||
validates_presence_of :title, :body
|
||||
validates_uniqueness_of :permalink, :title
|
||||
|
||||
before_validation :set_permalink, :on => :create
|
||||
before_validation :update_permalink, :on => :update
|
||||
before_validation :set_permalink, on: :create
|
||||
before_validation :update_permalink, on: :update
|
||||
after_update :create_redirect
|
||||
|
||||
scope :non_redirected, -> { where(:redirect => nil) }
|
||||
scope :no_parent, -> { where(:parent_id => nil) }
|
||||
scope :non_redirected, -> { where(redirect: nil) }
|
||||
scope :no_parent, -> { where(parent_id: nil) }
|
||||
|
||||
def self.permalink(title)
|
||||
title.gsub(/[\/\.,;@\s]/, "_").gsub(/[\"\']/, "")
|
||||
title.gsub(%r{[/.,;@\s]}, '_').gsub(/["']/, '')
|
||||
end
|
||||
|
||||
def homepage?
|
||||
permalink == "Home"
|
||||
permalink == 'Home'
|
||||
end
|
||||
|
||||
def self.dashboard
|
||||
where(permalink: "Dashboard").first
|
||||
where(permalink: 'Dashboard').first
|
||||
end
|
||||
|
||||
def self.public_front_page
|
||||
where(permalink: "Public_frontpage").first
|
||||
where(permalink: 'Public_frontpage').first
|
||||
end
|
||||
|
||||
def self.welcome_mail
|
||||
where(permalink: "Welcome_mail").first
|
||||
where(permalink: 'Welcome_mail').first
|
||||
end
|
||||
|
||||
def set_permalink
|
||||
unless title.blank?
|
||||
self.permalink = Page.count == 0 ? "Home" : Page.permalink(title)
|
||||
end
|
||||
return if title.blank?
|
||||
|
||||
self.permalink = Page.count == 0 ? 'Home' : Page.permalink(title)
|
||||
end
|
||||
|
||||
def diff
|
||||
current = versions.latest
|
||||
old = versions.where(["page_id = ? and lock_version < ?", current.page_id, current.lock_version]).order('lock_version DESC').first
|
||||
old = versions.where(['page_id = ? and lock_version < ?', current.page_id,
|
||||
current.lock_version]).order('lock_version DESC').first
|
||||
|
||||
if old
|
||||
o = ''
|
||||
Diffy::Diff.new(old.body, current.body).each do |line|
|
||||
case line
|
||||
when /^\+/ then o += "#{line.chomp}<br />" unless line.chomp == "+"
|
||||
when /^-/ then o += "#{line.chomp}<br />" unless line.chomp == "-"
|
||||
when /^\+/ then o += "#{line.chomp}<br />" unless line.chomp == '+'
|
||||
when /^-/ then o += "#{line.chomp}<br />" unless line.chomp == '-'
|
||||
end
|
||||
end
|
||||
o
|
||||
|
|
@ -67,19 +68,19 @@ class Page < ApplicationRecord
|
|||
protected
|
||||
|
||||
def update_permalink
|
||||
if changed.include?("title")
|
||||
set_permalink
|
||||
self.old_title = changes["title"].first # Save title for creating redirect
|
||||
end
|
||||
return unless changed.include?('title')
|
||||
|
||||
set_permalink
|
||||
self.old_title = changes['title'].first # Save title for creating redirect
|
||||
end
|
||||
|
||||
def create_redirect
|
||||
unless old_title.blank?
|
||||
Page.create :redirect => id,
|
||||
:title => old_title,
|
||||
:body => I18n.t('model.page.redirect', :title => title),
|
||||
:permalink => Page.permalink(old_title),
|
||||
:updated_by => updated_by
|
||||
end
|
||||
return if old_title.blank?
|
||||
|
||||
Page.create redirect: id,
|
||||
title: old_title,
|
||||
body: I18n.t('model.page.redirect', title: title),
|
||||
permalink: Page.permalink(old_title),
|
||||
updated_by: updated_by
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue