Split come changset display logic into a helper
This commit is contained in:
parent
4bb0785ad5
commit
694fa065c0
3 changed files with 27 additions and 22 deletions
24
app/helpers/changeset_helper.rb
Normal file
24
app/helpers/changeset_helper.rb
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
module ChangesetHelper
|
||||||
|
def changeset_time_ago(changeset)
|
||||||
|
out = ''
|
||||||
|
created_at = distance_of_time_in_words_to_now(changeset.created_at)
|
||||||
|
closed_at = distance_of_time_in_words_to_now(changeset.closed_at)
|
||||||
|
if created_at == closed_at
|
||||||
|
out << t('browse.changeset_details.closed_at') + ' '
|
||||||
|
both_times = t('browse.changeset_details.created_at') + ': ' + l(changeset.created_at)
|
||||||
|
both_times << ' '
|
||||||
|
both_times << t('browse.changeset_details.closed_at') + ': ' + l(changeset.closed_at)
|
||||||
|
out << content_tag(:abbr, t('browse.changeset_details.ago', :ago => created_at), title: both_times.html_safe)
|
||||||
|
else
|
||||||
|
out << t('browse.changeset_details.created_at') + ' '
|
||||||
|
out << content_tag(:abbr, t('browse.changeset_details.ago', :ago => created_at), title: l(changeset.created_at))
|
||||||
|
out << t('browse.changeset_details.closed_at') + ' '
|
||||||
|
out << content_tag(:abbr, t('browse.changeset_details.ago', :ago => closed_at), title: l(changeset.closed_at))
|
||||||
|
end
|
||||||
|
if changeset.user.data_public?
|
||||||
|
out << ' ' + t('browse.changeset_details.by') + ' '
|
||||||
|
out << link_to(h(changeset.user.display_name), :controller => "user", :action => "view", :display_name => changeset.user.display_name)
|
||||||
|
end
|
||||||
|
return out.html_safe
|
||||||
|
end
|
||||||
|
end
|
|
@ -4,30 +4,10 @@
|
||||||
<div class="browse-section">
|
<div class="browse-section">
|
||||||
<p>
|
<p>
|
||||||
<%=
|
<%=
|
||||||
if @changeset.tags['comment'].to_s != ''
|
@changeset.tags['comment'].to_s.presence || t('browse.changeset_details.no_comment')
|
||||||
@changeset.tags['comment'].to_s
|
|
||||||
else
|
|
||||||
t ('browse.changeset_details.no_comment')
|
|
||||||
end
|
|
||||||
%>
|
%>
|
||||||
</p>
|
</p>
|
||||||
<h4>
|
<span><%= changeset_time_ago(@changeset) %></span>
|
||||||
<%
|
|
||||||
created_at = distance_of_time_in_words_to_now(@changeset.created_at)
|
|
||||||
closed_at = distance_of_time_in_words_to_now(@changeset.closed_at)
|
|
||||||
if created_at == closed_at
|
|
||||||
%>
|
|
||||||
<%= t 'browse.changeset_details.closed_at' %>
|
|
||||||
<abbr title="<%= t 'browse.changeset_details.created_at' %>: <%= l @changeset.created_at %> <%= t 'browse.changeset_details.closed_at' %>: <%= l @changeset.closed_at %>">
|
|
||||||
<%= t('browse.changeset_details.ago', :ago => created_at) %></abbr>
|
|
||||||
<% else %>
|
|
||||||
<%= t 'browse.changeset_details.created_at' %> <abbr title="<%= l @changeset.created_at %>"><%= t('browse.changeset_details.ago', :ago => created_at) %></abbr>,
|
|
||||||
<%= t 'browse.changeset_details.closed_at' %> <abbr title="<%= l @changeset.closed_at %>"><%= t('browse.changeset_details.ago', :ago => closed_at) %><abbr>
|
|
||||||
<% end %>
|
|
||||||
<% if @changeset.user.data_public? %>
|
|
||||||
by <%= link_to h(@changeset.user.display_name), :controller => "user", :action => "view", :display_name => @changeset.user.display_name %>
|
|
||||||
<% end %>
|
|
||||||
</h4>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<%=
|
<%=
|
||||||
|
|
|
@ -135,6 +135,7 @@ en:
|
||||||
has_relations: "Relations (%{count})"
|
has_relations: "Relations (%{count})"
|
||||||
no_comment: "(no comment)"
|
no_comment: "(no comment)"
|
||||||
ago: "%{ago} ago"
|
ago: "%{ago} ago"
|
||||||
|
by: "by"
|
||||||
common_details:
|
common_details:
|
||||||
edited: "Edited"
|
edited: "Edited"
|
||||||
deleted: "Deleted"
|
deleted: "Deleted"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue