Handle current_user being both an admin and a moderator for building user list

[rails.git] / app / helpers / changeset_helper.rb

diff --git a/app/helpers/changeset_helper.rb b/app/helpers/changeset_helper.rb
index cae1335c4c1d80e08f3a76d51863d9e1ec2adb54..7eb389023ba54a9cfc373dda4ee6f7a39ea51215 100644 (file)
--- a/app/helpers/changeset_helper.rb
+++ b/app/helpers/changeset_helper.rb
@@ -1,14 +1,16 @@
 module ChangesetHelper
   def changeset_user_link(changeset)
 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
       link_to(changeset.user.display_name, user_path(changeset.user.display_name))
     else

-      t('browse.anonymous')
+      t("browse.anonymous")

     end
   end
 
   def changeset_details(changeset)
     end
   end
 
   def changeset_details(changeset)

-    if changeset.closed_at > DateTime.now
+    if changeset.closed_at > Time.now

       action = :created
       time = distance_of_time_in_words_to_now(changeset.created_at)
       title = l(changeset.created_at)
       action = :created
       time = distance_of_time_in_words_to_now(changeset.created_at)
       title = l(changeset.created_at)


@@ -29,4 +31,16 @@ module ChangesetHelper
         :user => changeset_user_link(changeset)
     end
   end
         :user => changeset_user_link(changeset)
     end
   end

+
+  def changeset_list_title(params, user)
+    if params[:friends] && user
+      t "changeset.list.title_friend"
+    elsif params[:nearby] && user
+      t "changeset.list.title_nearby"
+    elsif params[:display_name]
+      t "changeset.list.title_user", :user => params[:display_name]
+    else
+      t "changeset.list.title"
+    end
+  end

 end
 end