consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rubocop style autocorrections

Browse Source
This commit is contained in:
Bertocq
2017-12-16 17:52:50 +01:00
parent cf8cfe363b
commit b02e2729e7
4 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/related_contents_controller.rb
View File

@@ -22,21 +22,19 @@ class RelatedContentsController < ApplicationController
end
def relationable_object
@relationable = (params[:relationable_klass].singularize.camelize.constantize).find_by_id(params[:relationable_id])
@relationable = params[:relationable_klass].singularize.camelize.constantize.find_by(id: params[:relationable_id])
end
def related_object
begin
if valid_url?
url = params[:url]
related_klass = url.match(/\/(#{RelatedContent::RELATIONABLE_MODELS.join("|")})\//)[0].gsub("/", "")
related_id = url.match(/\/[0-9]+/)[0].gsub("/", "")
related_klass = url.match(/\/(#{RelatedContent::RELATIONABLE_MODELS.join("|")})\//)[0].delete("/")
related_id = url.match(/\/[0-9]+/)[0].delete("/")
@related = (related_klass.singularize.camelize.constantize).find_by_id(related_id)
@related = related_klass.singularize.camelize.constantize.find_by(id: related_id)
end
rescue
nil
end
end
end

4
app/models/concerns/notifiable.rb
View File

@@ -25,8 +25,8 @@ module Notifiable
def check_availability(resource)
resource.present? &&
resource.try(:hidden_at) == nil &&
resource.try(:retired_at) == nil
resource.try(:hidden_at).nil? &&
resource.try(:retired_at).nil?
end
def linkable_resource

2
app/models/related_content.rb
View File

@@ -1,6 +1,6 @@
class RelatedContent < ActiveRecord::Base
RELATED_CONTENTS_REPORT_THRESHOLD = Setting['related_contents_report_threshold'].to_i
RELATIONABLE_MODELS = %w{proposals debates}
RELATIONABLE_MODELS = %w{proposals debates}.freeze
belongs_to :parent_relationable, polymorphic: true
belongs_to :child_relationable, polymorphic: true