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

Rename 'issue_type' to 'assigned_role', set defaults in the model and test.

Browse source
This commit is contained in:
Andy Allan 2017-12-06 16:28:13 +00:00
parent c40ad9de02
commit 0df788d742
6 changed files with 38 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/issues_controller.rb
View file

@ -17,7 +17,7 @@ class IssuesController < ApplicationController
@users = User.joins(:roles).where(:user_roles => { :role => "administrator" })
end
@issues = Issue.where(:issue_type => @user_role)
@issues = Issue.where(:assigned_role => @user_role)
# If search
if params[:search_by_user] && params[:search_by_user].present?
@ -55,7 +55,7 @@ class IssuesController < ApplicationController
@read_reports = @issue.read_reports
@unread_reports = @issue.unread_reports
@comments = @issue.comments
@related_issues = @issue.reported_user.issues.where(:issue_type => @user_role)
@related_issues = @issue.reported_user.issues.where(:assigned_role => @user_role)
@new_comment = IssueComment.new(:issue => @issue)
end
@ -125,7 +125,7 @@ class IssuesController < ApplicationController
# Reassign Issues between Administrators and Moderators
def reassign_issue
@issue.issue_type = upgrade_issue(@issue.issue_type)
@issue.assigned_role = upgrade_issue(@issue.assigned_role)
@issue.save!
end