cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename association to reported_user, for clarity

Browse source
This commit is contained in:
Andy Allan 2017-07-12 11:44:05 +01:00
parent 6f375ef493
commit 99df5f6179
5 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/issues_controller.rb
View file

@ -59,7 +59,7 @@ class IssuesController < ApplicationController
@read_reports = @issue.read_reports
@unread_reports = @issue.unread_reports
@comments = @issue.comments
@related_issues = @issue.user.issues.where(:issue_type => @user_role)
@related_issues = @issue.reported_user.issues.where(:issue_type => @user_role)
@updated_by_admin = User.find(@issue.updated_by) if @issue.updated_by
end

2
app/models/issue.rb
View file

@ -1,6 +1,6 @@
class Issue < ActiveRecord::Base
belongs_to :reportable, :polymorphic => true
belongs_to :user, :class_name => "User", :foreign_key => :reported_user_id
belongs_to :reported_user, :class_name => "User", :foreign_key => :reported_user_id
belongs_to :user_updated, :class_name => "User", :foreign_key => :updated_by
has_many :reports, :dependent => :destroy

2
app/views/issues/index.html.erb
View file

@ -35,7 +35,7 @@ Search for a particular issue(s): <br/>
<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>
<td><%= link_to issue.user.display_name , :controller => :user, :action => :view,:display_name => issue.user.display_name %></td>
<td><%= link_to issue.reported_user.display_name , :controller => :user, :action => :view, :display_name => issue.reported_user.display_name %></td>
<td><%= instance_url(issue.reportable) %></td>
</tr>
<% end %>