Fix some issues and improve code

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

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index f9a84ba7dd979bdc71fca2955f4eeafa6eb1f28d..43ca98c9134c5e13d1547570da74867c2dc42d45 100644 (file)
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -2,11 +2,11 @@ module IssuesHelper
   def reportable_url(reportable)
     case reportable
     when DiaryEntry
   def reportable_url(reportable)
     case reportable
     when DiaryEntry

-      url_for(:controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.user.display_name, :id => reportable.id)
+      diary_entry_url(reportable.user, reportable)

     when User
     when User

-      url_for(:controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.display_name)
+      user_url(reportable)

     when DiaryComment
     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}")
+      diary_entry_url(reportable.diary_entry.user, reportable.diary_entry, :anchor => "comment#{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


@@ -29,7 +29,7 @@ module IssuesHelper
     count = Issue.visible_to(current_user).open.limit(100).size
     if count > 99
       content_tag(:span, "99+", :class => "count-number")
     count = Issue.visible_to(current_user).open.limit(100).size
     if count > 99
       content_tag(:span, "99+", :class => "count-number")

-    elsif count > 0
+    elsif count.positive?

       content_tag(:span, count, :class => "count-number")
     end
   end
       content_tag(:span, count, :class => "count-number")
     end
   end