From 7fa6018a8286a5ade900dc6995cad42dac510961 Mon Sep 17 00:00:00 2001 From: JG Date: Tue, 14 Jun 2022 07:51:50 +0100 Subject: [PATCH] rubocop and redundant check removed --- app/helpers/navigation_items_helper.rb | 4 ++-- app/models/scheme.rb | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/helpers/navigation_items_helper.rb b/app/helpers/navigation_items_helper.rb index 799ecd864..179ad0607 100644 --- a/app/helpers/navigation_items_helper.rb +++ b/app/helpers/navigation_items_helper.rb @@ -41,7 +41,7 @@ private end def users_current?(path) - path == "/users" + path == "/users" || path.include?("/users/") end def supported_housing_current?(path) @@ -57,7 +57,7 @@ private end def subnav_users_path?(path) - path.include?("/organisations") && path.include?("/users") || path.include?("/users/") + path.include?("/organisations") && path.include?("/users") end def subnav_logs_path?(path) diff --git a/app/models/scheme.rb b/app/models/scheme.rb index 14de2edc9..07ae207a3 100644 --- a/app/models/scheme.rb +++ b/app/models/scheme.rb @@ -44,11 +44,11 @@ class Scheme < ApplicationRecord }.freeze INTENDED_STAY = { - "M" =>"Medium stay", - "P" =>"Permanent", - "S" =>"Short Stay", - "V" =>"Very short stay", - "X" =>"Missing", + "M" => "Medium stay", + "P" => "Permanent", + "S" => "Short Stay", + "V" => "Very short stay", + "X" => "Missing", }.freeze REGISTERED_UNDER_CARE_ACT = {