1
0
Fork 0

Displate "None" as italic and muted

This commit is contained in:
Alex Kotov 2019-08-28 23:21:35 +05:00
parent 4f2a7dc08e
commit dc8e9933b5
Signed by: kotovalexarian
GPG Key ID: 553C0EBBEB5D5F08
5 changed files with 13 additions and 7 deletions

View File

@ -3,7 +3,7 @@
module AccountsHelper
def account_link_or_none(account)
if account.nil?
translate :none
none
elsif policy(account).show?
link_to account.nickname, account
else
@ -13,7 +13,7 @@ module AccountsHelper
def staff_account_link_or_none(account)
if account.nil?
translate :none
none
elsif policy([:staff, account]).show?
link_to account.nickname, [:staff, account]
elsif policy(account).show?

View File

@ -9,6 +9,12 @@ module ApplicationHelper
controller_path.start_with?('staff')
end
def none
tag.i class: 'text-muted' do
translate :none
end
end
def translate_enum(type, value)
translate value, scope: [:enums, type]
end

View File

@ -3,7 +3,7 @@
module PeopleHelper
def staff_person_link_or_none(person)
if person.nil?
translate :none
none
elsif policy([:staff, person]).show?
link_to person.full_name, [:staff, person]
else

View File

@ -3,7 +3,7 @@
module RegionalOfficesHelper
def regional_office_link_or_none(regional_office)
if regional_office.nil?
translate :none
none
elsif policy(regional_office.federal_subject).show?
link_to regional_office.federal_subject.display_name,
regional_office.federal_subject

View File

@ -3,7 +3,7 @@
module RelationshipsHelper
def relationship_from_date_or_none(relationship)
if relationship&.from_date.blank?
translate :none
none
else
localize relationship.from_date, format: :long
end
@ -15,7 +15,7 @@ module RelationshipsHelper
def relationship_position_or_none(relationship)
if relationship&.position.nil?
translate :none
none
else
translate_enum :relationship_position, relationship.position
end
@ -23,7 +23,7 @@ module RelationshipsHelper
def relationship_short_position_or_none(relationship)
if relationship&.position.nil?
translate :none
none
else
translate_enum :relationship_short_position, relationship.position
end