From a4fd69c2921aceeeb197588f3b3b2bcb81ceb14c Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Tue, 15 Dec 2020 07:36:49 +0100 Subject: [PATCH] Add 'archived' to smart annotation for repository item --- app/services/smart_annotations/html_preview.rb | 14 +++++--------- .../_repository_row_info_modal.html.erb | 6 +++++- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/services/smart_annotations/html_preview.rb b/app/services/smart_annotations/html_preview.rb index 33b2a04fe..2ee459306 100644 --- a/app/services/smart_annotations/html_preview.rb +++ b/app/services/smart_annotations/html_preview.rb @@ -37,16 +37,12 @@ module SmartAnnotations def generate_rep_item_snippet(name, object) if object&.repository repository_name = fetch_repository_name(object) - if object.archived? - return "#{trim_repository_name(repository_name)} " \ - "#{object.name} #{I18n.t('atwho.res.archived')}" - else - return "#{trim_repository_name(repository_name)}#{object.name}" - end + "#{trim_repository_name(repository_name)}" \ + "#{object.name} #{object.archived? ? I18n.t('atwho.res.archived') : ''}" + else + "Inv #{name} #{I18n.t('atwho.res.deleted')}" end - "Inv " \ - "#{name} #{I18n.t('atwho.res.deleted')}" end def trim_repository_name(name) diff --git a/app/views/repositories/_repository_row_info_modal.html.erb b/app/views/repositories/_repository_row_info_modal.html.erb index 2b3597148..a121aa76f 100644 --- a/app/views/repositories/_repository_row_info_modal.html.erb +++ b/app/views/repositories/_repository_row_info_modal.html.erb @@ -3,13 +3,17 @@