X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0366c2eabb065f08312f494a58c29d0ed575759d..80a241f7985fec6ec853e48a25823446b59b7682:/app/views/issues/index.html.erb?ds=inline diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index b9f0b6e7d..0edf364ec 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -4,7 +4,7 @@ <%= form_tag(issues_path, :method => :get) do %>

<%= t ".search_guidance" %>

-<%= select :status, nil, Issue.aasm.states.map(&:name).map{|state| [t(".states.#{state}"), state]}, { :include_blank => t(".select_status")}, data: { behavior: 'category_dropdown' } %> +<%= select :status, nil, Issue.aasm.states.map(&:name).map{|state| [t("issues.states.#{state}"), state]}, { :include_blank => t(".select_status")}, data: { behavior: 'category_dropdown' } %> <%= select :issue_type, nil, @issue_types, { :include_blank => t(".select_type")}, data: { behavior: 'category_dropdown' } %> <%= text_field_tag :search_by_user, params[:search_by_user], placeholder: t(".reported_user") %> <%= select :last_updated_by, nil, @users.all.collect {|f| [f.display_name, f.id]} << [ t(".not_updated"), "nil"], { :include_blank => t(".select_last_updated_by")}, data: { behavior: 'category_dropdown' } %> @@ -33,13 +33,13 @@ <% @issues.each do |issue| %> - <%= issue.status.humanize %> + <%= t "issues.states.#{issue.status}" %> <%= issue.reports_count %> <%= l(issue.updated_at.to_datetime, :format => :friendly) %> <% if issue.user_updated %> <%= issue.user_updated.display_name %> <% else %> - <% end %> - <%= reports_url(issue) %> - <%= link_to issue.reported_user.display_name , :controller => :user, :action => :view, :display_name => issue.reported_user.display_name %> - <%= instance_url(issue.reportable) %> + <%= link_to reportable_title(issue.reportable), issue %> + <%= link_to issue.reported_user.display_name, :controller => :user, :action => :view, :display_name => issue.reported_user.display_name if issue.reported_user %> + <%= link_to t(".show_instance"), reportable_url(issue.reportable) %> <% end %>