diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9c27ce3cb..c43071c2f 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -640,7 +640,7 @@ module ApplicationHelper end def authoring(created, author, options={}) - l(options[:label] || :label_added_time_by, :author => link_to_user(author), :age => time_tag(created)).html_safe + l(options[:label] || :label_added_time_by, :author => link_to_user(author), :badge => options[:badge], :age => time_tag(created)).html_safe end def time_tag(time) diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb index d947f8233..fd5932482 100644 --- a/app/helpers/journals_helper.rb +++ b/app/helpers/journals_helper.rb @@ -68,4 +68,19 @@ module JournalsHelper css_classes = journal.private_notes? ? 'badge badge-private private' : '' content_tag('span', content.html_safe, :id => "journal-#{journal.id}-private_notes", :class => css_classes) end + + def journal_user_badge(journal) + issue = journal&.journalized + return '' if issue.nil? + + # Show only "Author" badge if the user is both an author and an assignee + case journal.user + when issue.author + content_tag('span', l(:label_author), class: 'badge badge-status-open') + when issue.assigned_to + content_tag('span', l(:field_assigned_to), class: 'badge badge-status-open') + else + '' + end + end end diff --git a/app/helpers/messages_helper.rb b/app/helpers/messages_helper.rb index 51824a334..f5d11393f 100644 --- a/app/helpers/messages_helper.rb +++ b/app/helpers/messages_helper.rb @@ -18,4 +18,13 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. module MessagesHelper + def message_user_badge(message) + return '' if message&.parent.nil? + + if message.parent.author == message.author + content_tag('span', l(:label_author), class: 'badge badge-status-open') + else + '' + end + end end diff --git a/app/helpers/news_helper.rb b/app/helpers/news_helper.rb index f807f9cc8..95cad0e24 100644 --- a/app/helpers/news_helper.rb +++ b/app/helpers/news_helper.rb @@ -18,4 +18,13 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. module NewsHelper + def news_comment_user_badge(comment) + return '' if comment&.commented.nil? + + if comment.commented.author == comment.author + content_tag('span', l(:label_author), class: 'badge badge-status-open') + else + '' + end + end end diff --git a/app/helpers/wiki_helper.rb b/app/helpers/wiki_helper.rb index 6690b04fc..d0a29a32c 100644 --- a/app/helpers/wiki_helper.rb +++ b/app/helpers/wiki_helper.rb @@ -66,6 +66,6 @@ module WikiHelper end def wiki_content_update_info(content) - l(:label_updated_time_by, :author => link_to_user(content.author), :age => time_tag(content.updated_on)).html_safe + l(:label_updated_time_by, :author => link_to_user(content.author), :age => time_tag(content.updated_on), :badge => '').html_safe end end diff --git a/app/views/issues/tabs/_history.html.erb b/app/views/issues/tabs/_history.html.erb index 0769f5725..1895bdb16 100644 --- a/app/views/issues/tabs/_history.html.erb +++ b/app/views/issues/tabs/_history.html.erb @@ -13,7 +13,7 @@