Added report strings for Changesets and Notes + minor controller changes

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 49984b804bd50cbcf5caef05caa2153d7670875c..beb1425cd3775744b3bd42554c3c34138034c219 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 622d912ce06c99e20643a4670d859459d826c2fd..ec8845b5b12feeb45c9d4dd1c43313e1582b86a4 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6e5a08b24f849a51575c97d10771a125b4969301..b7a6a189580a9991f385fdf71cd4fab6f8ad53dc 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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: