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

Added report strings for Changesets and Notes + minor controller changes

Browse source
This commit is contained in:
Shrey 2015-06-21 13:56:45 +05:30 • committed by Matt Amos
parent b17f9a6157
commit 4b4b67aa96
3 changed files with 74 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/controllers/issues_controller.rb
View file

@ -5,15 +5,9 @@ class IssuesController < ApplicationController
before_action :require_user
before_action :check_permission, only: [:index, :show, :resolve,:open,:ignore,:comment]
before_action :find_issue, only: [:show, :resolve, :reopen, :ignore]
before_action :get_user_role, only: [:show, :index]
def index
# Get user role
if @user.administrator?
@user_role = "administrator"
else
@user_role = "moderator"
end
# If search
if params[:search_by_user]
@find_user = User.find_by_display_name(params[:search_by_user])
@ -42,7 +36,7 @@ class IssuesController < ApplicationController
@read_reports = @issue.read_reports
@unread_reports = @issue.unread_reports
@comments = @issue.comments
@related_issues = @issue.user.issues
@related_issues = @issue.user.issues.where(issue_type: @user_role)
if @issue.updated_by
@updated_by_admin = User.find(@issue.updated_by)
end
@ -200,6 +194,15 @@ class IssuesController < ApplicationController
private
def get_user_role
# Get user role
if @user.administrator?
@user_role = "administrator"
else
@user_role = "moderator"
end
end
def check_if_updated
if @issue.reportable and (@issue.ignored? or @issue.resolved?) and @issue.reportable.updated_at > @last_report.updated_at
return true

42
config/locales/en-GB.yml
View file

@ -1008,18 +1008,40 @@ en-GB:
type: "[OTHER]"
details: Other
Changeset:
type1:
type: "[TYPE1]"
details: Placeholder 1
type2:
type: "[TYPE1]"
details: Placeholder 2
type3:
type: "[TYPE3]"
details: Placeholder 3
undiscussed_import:
type: "[UNDISCUSSED-IMPORT]"
details: This changeset is an undiscussed import
mechanical_edit:
type: "[MECH-EDIT]"
details: This changeset is a mechanical edit
edit_error:
type: "[EDIT-ERROR]"
details: This changeset contains a newbie or an editor error
spam:
type: "[SPAM]"
details: This changeset is/contains spam
vandalism:
type: "[VANDALISM]"
details: This changeset is/contains vandalism
other:
type: "[OTHER]"
details: Other
details: Other
Note:
spam:
type: "[SPAM]"
details: This note is spam
vandalism:
type: "[VANDALISM]"
details: This note is vandalism
personal:
type: "[PERSONAL]"
details: This note contains personal data
abusive:
type: "[ABUSIVE]"
details: This note is abusive
other:
type: "[OTHER]"
details: Other
layouts:
project_name:
title: OpenStreetMap

40
config/locales/en.yml
View file

@ -978,16 +978,38 @@ en:
type: "[OTHER]"
details: Other
Changeset:
type1:
type: "[TYPE1]"
details: Placeholder 1
type2:
type: "[TYPE1]"
details: Placeholder 2
type3:
type: "[TYPE3]"
details: Placeholder 3
undiscussed_import:
type: "[UNDISCUSSED-IMPORT]"
details: This changeset is an undiscussed import
mechanical_edit:
type: "[MECH-EDIT]"
details: This changeset is a mechanical edit
edit_error:
type: "[EDIT-ERROR]"
details: This changeset contains a newbie or an editor error
spam:
type: "[SPAM]"
details: This changeset is/contains spam
vandalism:
type: "[VANDALISM]"
details: This changeset is/contains vandalism
other:
type: "[OTHER]"
details: Other
Note:
spam:
type: "[SPAM]"
details: This note is spam
vandalism:
type: "[VANDALISM]"
details: This note is vandalism
personal:
type: "[PERSONAL]"
details: This note contains personal data
abusive:
type: "[ABUSIVE]"
details: This note is abusive
other:
type: "[OTHER]"
details: Other
layouts: