Merge remote-tracking branch 'openstreetmap/pull/1154'

diff --git a/app/helpers/changeset_helper.rb b/app/helpers/changeset_helper.rb
index c3141297ce537c5ebcdfd2fecfd42af928313b21..45c8be681972bf1f0a12a18a7fb2df456b3e6295 100644 (file)
--- a/app/helpers/changeset_helper.rb
+++ b/app/helpers/changeset_helper.rb
@@ -1,6 +1,8 @@
 module ChangesetHelper
   def changeset_user_link(changeset)
-    if changeset.user.data_public?
+    if changeset.user.status == "deleted"
+      t("user.no_such_user.deleted")
+    elsif changeset.user.data_public?
       link_to(changeset.user.display_name, user_path(changeset.user.display_name))
     else
       t("browse.anonymous")

diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb
index 87bd86f428e4edd7e1e821d84a9840694c8758c7..2a101612928db938e68d3ccb51ce946cc467776a 100644 (file)
--- a/app/helpers/note_helper.rb
+++ b/app/helpers/note_helper.rb
@@ -17,6 +17,8 @@ module NoteHelper
   def note_author(author, link_options = {})
     if author.nil?
       ""
+    elsif author.status == "deleted"
+      t("user.no_such_user.deleted")
     else
       link_to h(author.display_name), link_options.merge(:controller => "user", :action => "view", :display_name => author.display_name)
     end

diff --git a/config/locales/en.yml b/config/locales/en.yml
index ae8294e95ae3d4aacc41abc26bdb0cdff0436455..d61879a9cb234a27ee2135f33ae44f3761c666d1 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1810,6 +1810,7 @@ en:
       title: "No such user"
       heading: "The user %{user} does not exist"
       body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong."
+      deleted: "deleted"
     view:
       my diary: My Diary
       new diary entry: new diary entry

diff --git a/test/controllers/changeset_controller_test.rb b/test/controllers/changeset_controller_test.rb
index 4ce264d62dfb4c1f0b0802bdd6269e3e73d70097..5b1dfdbe43afb7c062f5c2f0c975f85199d47c63 100644 (file)
--- a/test/controllers/changeset_controller_test.rb
+++ b/test/controllers/changeset_controller_test.rb
@@ -1574,7 +1574,7 @@ EOF
 
     get :query, :closed => "true"
     assert_response :success, "can't get changesets by closed-ness"
-    assert_changesets [3, 5, 6, 7, 8]
+    assert_changesets [3, 5, 6, 7, 8, 9]
 
     get :query, :closed => "true", :user => users(:normal_user).id
     assert_response :success, "can't get changesets by closed-ness and user"

diff --git a/test/fixtures/changesets.yml b/test/fixtures/changesets.yml
index 3cfec5bbb089f7c97aed2ec6232bfafa5177d305..2d5ce4e2aaf7703922d081e149555876afdb9d28 100644 (file)
--- a/test/fixtures/changesets.yml
+++ b/test/fixtures/changesets.yml
@@ -21,6 +21,13 @@ public_user_first_change:
   closed_at: <%= Time.now.utc + 86400 %>
   num_changes: 0
 
+deleted_user_first_change:
+  id: 9
+  user_id: 11
+  created_at: "2007-01-01 00:00:00"
+  closed_at: "2007-01-02 00:00:00"
+  num_changes: 0
+
 normal_user_closed_change:
   id: 3
   user_id: 1

diff --git a/test/helpers/changeset_helper_test.rb b/test/helpers/changeset_helper_test.rb
index bf3de4525e2a5a3f5cdfca687ebada03a65b934b..8342f99d251693eefbc7ba6e58fda0d9c7b8224f 100644 (file)
--- a/test/helpers/changeset_helper_test.rb
+++ b/test/helpers/changeset_helper_test.rb
@@ -6,6 +6,7 @@ class ChangesetHelperTest < ActionView::TestCase
   def test_changeset_user_link
     assert_equal "<a href=\"/user/test2\">test2</a>", changeset_user_link(changesets(:public_user_first_change))
     assert_equal "anonymous", changeset_user_link(changesets(:normal_user_first_change))
+    assert_equal "deleted", changeset_user_link(changesets(:deleted_user_first_change))
   end
 
   def test_changeset_details

diff --git a/test/helpers/note_helper_test.rb b/test/helpers/note_helper_test.rb
index eb7b999385fb78268c187c78abf1acf3ced63d92..8495e21a9998f1b2cb52a3b7dfc53f08101a94bd 100644 (file)
--- a/test/helpers/note_helper_test.rb
+++ b/test/helpers/note_helper_test.rb
@@ -15,6 +15,7 @@ class NoteHelperTest < ActionView::TestCase
 
   def test_note_author
     assert_equal "", note_author(nil)
+    assert_equal "deleted", note_author(users(:deleted_user))
     assert_equal "<a href=\"/user/test2\">test2</a>", note_author(users(:public_user))
     assert_equal "<a href=\"http://test.host/user/test2\">test2</a>", note_author(users(:public_user), :only_path => false)
   end

diff --git a/test/models/changeset_test.rb b/test/models/changeset_test.rb
index b4229b20324b164d1959beddb67cbcf1e4754bf4..89200c9b5bfc1dd8a8073d91a49b56c41c9af752 100644 (file)
--- a/test/models/changeset_test.rb
+++ b/test/models/changeset_test.rb
@@ -4,7 +4,7 @@ class ChangesetTest < ActiveSupport::TestCase
   api_fixtures
 
   def test_changeset_count
-    assert_equal 8, Changeset.count
+    assert_equal 9, Changeset.count
   end
 
   def test_from_xml_no_text