From: Shrey <shrey14099@iiitd.ac.in>
Date: Fri, 14 Aug 2015 09:24:08 +0000 (+0530)
Subject: Added helper + minor UI changes
X-Git-Tag: live~3501^2~129
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/916f2c9036d280d1de451e35847d8b37c6550109?ds=sidebyside

Added helper + minor UI changes

(cherry picked from commit 3a6550ff54eb08ec282d13ebf85dc3461cca2983)
---

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index bcae2e224..92fe74ca7 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -89,4 +89,21 @@ module IssuesHelper
 		end
 		link_to title, params.merge(:sort => column, :direction => direction)
 	end
+
+	def report_type(report_class) 
+		case report_class
+		when "DiaryEntry"
+			t('activerecord.models.diary_entry')
+		when "User"
+			t('activerecord.models.user')
+		when "DiaryComment"
+			t('activerecord.models.diary_comment')
+		when "Changeset"
+			t('activerecord.models.changeset')
+		when "Note"
+			t('activerecord.models.note')				
+		else
+			nil
+		end
+	end
 end
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 12cd79b37..340f5ab9b 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -19,13 +19,13 @@
 	<thead>
 		<tr>
 			<tr>
-				<td><b> <%= sortable("status") %></b></td>
-				<td><b> <%= sortable("report_count", "Number of Reports") %></b></td>
-				<td><b> <%= sortable("updated_at","Last updated at") %></b></td>
-				<td><b> <%= sortable("updated_by","Last updated by") %></b></td>
-				<td><b> Link to reports </b></td>
-				<td><b> <%= sortable("reported_user_id","Reported User") %> </b></td>
-				<td><b> Link to reported instance</b></td>
+				<td style="width:40px;"><b> <%= sortable("status") %></b></td>
+				<td style="width:160px;"><b> <%= sortable("report_count", "Number of Reports") %></b></td>
+				<td style="width:141px;"><b> <%= sortable("updated_at","Last updated at") %></b></td>
+				<td style="width:140px;"><b> <%= sortable("updated_by","Last updated by") %></b></td>
+				<td style="width:203px;"><b> Link to reports </b></td>
+				<td style="width:128px;"><b> <%= sortable("reported_user_id","Reported User") %> </b></td>
+				<td style="width:67px;"><b> Link to reported instance</b></td>
 			</tr>
 		</tr>
 	</thead>
@@ -33,7 +33,7 @@
 		<% @issues.each do |issue| %>
 			<tr>
 				<td><%= issue.status.humanize %></td>
-				<td><%= issue.report_count %></td>
+				<td style="text-align:center;"><%= issue.report_count %></td>
 				<td><%= l(issue.updated_at.to_datetime, :format => :friendly) %></td>
 				<td><% if issue.user_updated %> <%= issue.user_updated.display_name %> <% else %> - <% end %></td>
 				<td> <%= reports_url(issue) %></td>
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 51e179da1..4611324f3 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -1,6 +1,6 @@
 <% content_for :heading do %>
 	<h2> <%= @issue.status.humanize %> Issue #<%= @issue.id %> <br/></h2>
-	<p><%= @issue.reportable_type %> : <%= reportable_url(@issue.reportable) %></p>
+	<p><%= report_type(@issue.reportable_type) %> : <%= reportable_url(@issue.reportable) %></p>
 	<p class="deemphasize">
 		<small>
 			<%= @issue.reports.count %> reports | First reported: <%= l @issue.created_at.to_datetime, :format => :friendly %>  <%= "| Last resolved at #{l(@issue.resolved_at.to_datetime, :format =>:friendly)}" if @issue.resolved_at? %> <%= "| Last updated at #{l(@issue.updated_at.to_datetime, :format => :friendly)} by #{@updated_by_admin.display_name}" if @updated_by_admin %>