Remove reporting of changesets

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index dc04606f7b9044233a73a5ea04d140c2b2114db8..90fd0306dc2d7523326554e430775046b779e471 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -88,7 +88,7 @@ class IssuesController < ApplicationController
 
   def set_issues
     @admin_issues = %w[DiaryEntry DiaryComment User]
 
   def set_issues
     @admin_issues = %w[DiaryEntry DiaryComment User]

-    @moderator_issues = %w[Changeset Note]
+    @moderator_issues = %w[Note]

   end
 
   def check_if_updated
   end
 
   def check_if_updated

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 36837d228ced3e365b5188c1eb60210545691d2f..3c13c65369e8446d30b09ec0209aaf7fff60348c 100644 (file)
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -7,8 +7,6 @@ module IssuesHelper
       url_for(:controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.display_name)
     when DiaryComment
       url_for(:controller => reportable.diary_entry.class.name.underscore, :action => :view, :display_name => reportable.diary_entry.user.display_name, :id => reportable.diary_entry.id, :anchor => "comment#{reportable.id}")
       url_for(:controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.display_name)
     when DiaryComment
       url_for(:controller => reportable.diary_entry.class.name.underscore, :action => :view, :display_name => reportable.diary_entry.user.display_name, :id => reportable.diary_entry.id, :anchor => "comment#{reportable.id}")

-    when Changeset
-      url_for(:controller => :browse, :action => :changeset, :id => reportable.id)

     when Note
       url_for(:controller => :browse, :action => :note, :id => reportable.id)
     end
     when Note
       url_for(:controller => :browse, :action => :note, :id => reportable.id)
     end


@@ -22,8 +20,6 @@ module IssuesHelper
       reportable.display_name
     when DiaryComment
       "#{reportable.diary_entry.title}, Comment id ##{reportable.id}"
       reportable.display_name
     when DiaryComment
       "#{reportable.diary_entry.title}, Comment id ##{reportable.id}"

-    when Changeset
-      "Changeset ##{reportable.id}"

     when Note
       "Note ##{reportable.id}"
     end
     when Note
       "Note ##{reportable.id}"
     end

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 9eb6aac4c73455dcf3901307535dabc956e26da7..d13f297a9a443e007540f9e8f15b1f38317d1ebb 100644 (file)
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -93,7 +93,7 @@ class Issue < ActiveRecord::Base
   end
 
   def set_default_assigned_role
   end
 
   def set_default_assigned_role

-    role = %w[Changeset Note].include?(reportable.class.name) ? "moderator" : "administrator"
+    role = %w[Note].include?(reportable.class.name) ? "moderator" : "administrator"

     self.assigned_role = role if assigned_role.blank?
   end
 end
     self.assigned_role = role if assigned_role.blank?
   end
 end

diff --git a/app/models/report.rb b/app/models/report.rb
index eda70f86516e2c65eb8ae4eba27bb2722ae9cdb4..fcfa61b98a794cd74a6d0833afbd991076be6bca 100644 (file)
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -33,7 +33,6 @@ class Report < ActiveRecord::Base
     when "DiaryEntry" then %w[spam offensive threat other]
     when "DiaryComment" then %w[spam offensive threat other]
     when "User" then %w[spam offensive threat vandal other]
     when "DiaryEntry" then %w[spam offensive threat other]
     when "DiaryComment" then %w[spam offensive threat other]
     when "User" then %w[spam offensive threat vandal other]

-    when "Changeset" then %w[undiscussed_import mechanical_edit edit_error spam vandalism other]

     when "Note" then %w[spam vandalism personal abusive other]
     else %w[other]
     end
     when "Note" then %w[spam vandalism personal abusive other]
     else %w[other]
     end

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index afc3fc16cbd24d8bb8fa7fe1d790d13cb4f538c0..6a3e856802c2b4c3d4c7bde5090d96e0a17a585b 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -3,11 +3,6 @@
 <h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
   <%= t('browse.changeset.title', :id => @changeset.id) %>
 <h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
   <%= t('browse.changeset.title', :id => @changeset.id) %>

-  <% if current_user and current_user.id != @changeset.user.id %>
-    <%= link_to new_report_url(reportable_id: @changeset.id, reportable_type: @changeset.class.name), :title => t('browse.changeset.report') do %>
-        &nbsp;&#9872;
-    <% end %>
-  <% end %>

 </h2>
 
 <div class="browse-section">
 </h2>
 
 <div class="browse-section">

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3e8af685c392d3562302488da78e4657104e7a04..3ff6b8c12bfcb5abb31605cd4c3457e103ac5da3 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -131,7 +131,6 @@ en:
         title_comment: "Changeset %{id} - %{comment}"
       join_discussion: "Log in to join the discussion"
       discussion: Discussion
         title_comment: "Changeset %{id} - %{comment}"
       join_discussion: "Log in to join the discussion"
       discussion: Discussion

-      report: Report this changeset?

       still_open: "Changeset still open - discussion will open once the changeset is closed."
     node:
       title: "Node: %{name}"
       still_open: "Changeset still open - discussion will open once the changeset is closed."
     node:
       title: "Node: %{name}"


@@ -1000,13 +999,6 @@ en:
         threat: This User profile contains a threat
         vandal: This User is a vandal
         other: Other
         threat: This User profile contains a threat
         vandal: This User is a vandal
         other: Other

-      Changeset:
-        undiscussed_import: This changeset is an undiscussed import
-        mechanical_edit: This changeset is a mechanical edit
-        edit_error: This changeset contains a newbie or an editor error
-        spam: This changeset is/contains spam
-        vandalism: This changeset is/contains vandalism
-        other: Other

       Note:
         spam: This note is spam
         vandalism: This note is vandalism
       Note:
         spam: This note is spam
         vandalism: This note is vandalism

diff --git a/test/models/issue_test.rb b/test/models/issue_test.rb
index 49649eede79c5279f9dad1e1d0afdf39d7d1d920..5af3779b574ba3a1a24cbe855d00d94d20410185 100644 (file)
--- a/test/models/issue_test.rb
+++ b/test/models/issue_test.rb
@@ -25,7 +25,7 @@ class IssueTest < ActiveSupport::TestCase
   def test_default_assigned_role
     create(:language, :code => "en")
     diary_entry = create(:diary_entry)
   def test_default_assigned_role
     create(:language, :code => "en")
     diary_entry = create(:diary_entry)

-    changeset = create(:changeset)
+    note = create(:note_with_comments)

 
     issue = Issue.new
     issue.reportable = diary_entry
 
     issue = Issue.new
     issue.reportable = diary_entry


@@ -33,7 +33,7 @@ class IssueTest < ActiveSupport::TestCase
     assert_equal "administrator", issue.assigned_role
 
     issue = Issue.new
     assert_equal "administrator", issue.assigned_role
 
     issue = Issue.new

-    issue.reportable = changeset
+    issue.reportable = note

     issue.save!
     assert_equal "moderator", issue.assigned_role
 
     issue.save!
     assert_equal "moderator", issue.assigned_role