Add and apply Style/SafeNavigation rubocop rule
We were already using it most of the time, but not always.
This commit is contained in:
@@ -261,5 +261,8 @@ Style/BlockDelimiters:
|
|||||||
Style/PercentLiteralDelimiters:
|
Style/PercentLiteralDelimiters:
|
||||||
Enabled: true
|
Enabled: true
|
||||||
|
|
||||||
|
Style/SafeNavigation:
|
||||||
|
Enabled: true
|
||||||
|
|
||||||
Style/StringLiterals:
|
Style/StringLiterals:
|
||||||
EnforcedStyle: double_quotes
|
EnforcedStyle: double_quotes
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ class Legislation::DraftVersionsController < Legislation::BaseController
|
|||||||
private
|
private
|
||||||
|
|
||||||
def visible_draft_versions
|
def visible_draft_versions
|
||||||
if current_user && current_user.administrator?
|
if current_user&.administrator?
|
||||||
@process.draft_versions
|
@process.draft_versions
|
||||||
else
|
else
|
||||||
@process.draft_versions.published
|
@process.draft_versions.published
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ class Legislation::ProcessesController < Legislation::BaseController
|
|||||||
set_process
|
set_process
|
||||||
@phase = :debate_phase
|
@phase = :debate_phase
|
||||||
|
|
||||||
if @process.debate_phase.started? || (current_user && current_user.administrator?)
|
if @process.debate_phase.started? || (current_user&.administrator?)
|
||||||
render :debate
|
render :debate
|
||||||
else
|
else
|
||||||
render :phase_not_open
|
render :phase_not_open
|
||||||
@@ -139,7 +139,7 @@ class Legislation::ProcessesController < Legislation::BaseController
|
|||||||
@proposals = @proposals.send(@current_filter).page(params[:page])
|
@proposals = @proposals.send(@current_filter).page(params[:page])
|
||||||
end
|
end
|
||||||
|
|
||||||
if @process.proposals_phase.started? || (current_user && current_user.administrator?)
|
if @process.proposals_phase.started? || (current_user&.administrator?)
|
||||||
legislation_proposal_votes(@proposals)
|
legislation_proposal_votes(@proposals)
|
||||||
render :proposals
|
render :proposals
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ class Verification::LetterController < ApplicationController
|
|||||||
|
|
||||||
def login_via_form
|
def login_via_form
|
||||||
user = User.find_by email: letter_params[:email]
|
user = User.find_by email: letter_params[:email]
|
||||||
if user && user.valid_password?(letter_params[:password])
|
if user&.valid_password?(letter_params[:password])
|
||||||
sign_in(user)
|
sign_in(user)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -37,32 +37,32 @@ module UsersHelper
|
|||||||
end
|
end
|
||||||
|
|
||||||
def current_administrator?
|
def current_administrator?
|
||||||
current_user && current_user.administrator?
|
current_user&.administrator?
|
||||||
end
|
end
|
||||||
|
|
||||||
def current_moderator?
|
def current_moderator?
|
||||||
current_user && current_user.moderator?
|
current_user&.moderator?
|
||||||
end
|
end
|
||||||
|
|
||||||
def current_valuator?
|
def current_valuator?
|
||||||
current_user && current_user.valuator?
|
current_user&.valuator?
|
||||||
end
|
end
|
||||||
|
|
||||||
def current_manager?
|
def current_manager?
|
||||||
current_user && current_user.manager?
|
current_user&.manager?
|
||||||
end
|
end
|
||||||
|
|
||||||
def current_poll_officer?
|
def current_poll_officer?
|
||||||
current_user && current_user.poll_officer?
|
current_user&.poll_officer?
|
||||||
end
|
end
|
||||||
|
|
||||||
def current_tracker?
|
def current_tracker?
|
||||||
current_user && current_user.tracker?
|
current_user&.tracker?
|
||||||
end
|
end
|
||||||
|
|
||||||
def show_admin_menu?(user = nil)
|
def show_admin_menu?(user = nil)
|
||||||
current_administrator? || current_moderator? || current_valuator? || current_manager? ||
|
current_administrator? || current_moderator? || current_valuator? || current_manager? ||
|
||||||
current_tracker? || (user && user.administrator?) || current_poll_officer?
|
current_tracker? || (user&.administrator?) || current_poll_officer?
|
||||||
end
|
end
|
||||||
|
|
||||||
def interests_title_text(user)
|
def interests_title_text(user)
|
||||||
|
|||||||
@@ -107,7 +107,7 @@ class Legislation::PeopleProposal < ApplicationRecord
|
|||||||
end
|
end
|
||||||
|
|
||||||
def votable_by?(user)
|
def votable_by?(user)
|
||||||
user && user.level_two_or_three_verified?
|
user&.level_two_or_three_verified?
|
||||||
end
|
end
|
||||||
|
|
||||||
def register_vote(user, vote_value)
|
def register_vote(user, vote_value)
|
||||||
@@ -145,7 +145,7 @@ class Legislation::PeopleProposal < ApplicationRecord
|
|||||||
protected
|
protected
|
||||||
|
|
||||||
def set_responsible_name
|
def set_responsible_name
|
||||||
if author && author.document_number?
|
if author&.document_number?
|
||||||
self.responsible_name = author.document_number
|
self.responsible_name = author.document_number
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -108,7 +108,7 @@ class Legislation::Proposal < ApplicationRecord
|
|||||||
end
|
end
|
||||||
|
|
||||||
def votable_by?(user)
|
def votable_by?(user)
|
||||||
user && user.level_two_or_three_verified?
|
user&.level_two_or_three_verified?
|
||||||
end
|
end
|
||||||
|
|
||||||
def register_vote(user, vote_value)
|
def register_vote(user, vote_value)
|
||||||
@@ -142,7 +142,7 @@ class Legislation::Proposal < ApplicationRecord
|
|||||||
protected
|
protected
|
||||||
|
|
||||||
def set_responsible_name
|
def set_responsible_name
|
||||||
if author && author.document_number?
|
if author&.document_number?
|
||||||
self.responsible_name = author.document_number
|
self.responsible_name = author.document_number
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -183,7 +183,7 @@ class Proposal < ApplicationRecord
|
|||||||
end
|
end
|
||||||
|
|
||||||
def votable_by?(user)
|
def votable_by?(user)
|
||||||
user && user.level_two_or_three_verified?
|
user&.level_two_or_three_verified?
|
||||||
end
|
end
|
||||||
|
|
||||||
def retired?
|
def retired?
|
||||||
@@ -269,7 +269,7 @@ class Proposal < ApplicationRecord
|
|||||||
protected
|
protected
|
||||||
|
|
||||||
def set_responsible_name
|
def set_responsible_name
|
||||||
if author && author.document_number?
|
if author&.document_number?
|
||||||
self.responsible_name = author.document_number
|
self.responsible_name = author.document_number
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ class Signature < ApplicationRecord
|
|||||||
|
|
||||||
def assign_signature_to_vote
|
def assign_signature_to_vote
|
||||||
vote = Vote.where(votable: signable, voter: user).first
|
vote = Vote.where(votable: signable, voter: user).first
|
||||||
vote.update(signature: self) if vote
|
vote&.update(signature: self)
|
||||||
end
|
end
|
||||||
|
|
||||||
def user_exists?
|
def user_exists?
|
||||||
|
|||||||
@@ -172,7 +172,7 @@ class User < ApplicationRecord
|
|||||||
end
|
end
|
||||||
|
|
||||||
def verified_organization?
|
def verified_organization?
|
||||||
organization && organization.verified?
|
organization&.verified?
|
||||||
end
|
end
|
||||||
|
|
||||||
def official?
|
def official?
|
||||||
|
|||||||
Reference in New Issue
Block a user