Validate characters in changeset comments

[rails.git] / app / controllers / notes_controller.rb

diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 2973a26c27e187802d15f9a074ee4655f083c161..d996251b3a65a23ae1ce5ffd2683ff7e2da200f4 100644 (file)
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -278,8 +278,8 @@ class NotesController < ApplicationController
   def mine
     if params[:display_name]
       if @this_user = User.active.find_by_display_name(params[:display_name])
   def mine
     if params[:display_name]
       if @this_user = User.active.find_by_display_name(params[:display_name])

-        @title =  t "note.mine.title", :user => @this_user.display_name
-        @heading =  t "note.mine.heading", :user => @this_user.display_name
+        @title = t "note.mine.title", :user => @this_user.display_name
+        @heading = t "note.mine.heading", :user => @this_user.display_name

         @description = t "note.mine.subheading", :user => render_to_string(:partial => "user", :object => @this_user)
         @page = (params[:page] || 1).to_i
         @page_size = 10
         @description = t "note.mine.subheading", :user => render_to_string(:partial => "user", :object => @this_user)
         @page = (params[:page] || 1).to_i
         @page_size = 10


@@ -319,21 +319,19 @@ class NotesController < ApplicationController
   # Generate a condition to choose which bugs we want based
   # on their status and the user's request parameters
   def closed_condition(notes)
   # Generate a condition to choose which bugs we want based
   # on their status and the user's request parameters
   def closed_condition(notes)

-    if params[:closed]
-      closed_since = params[:closed].to_i
-    else
-      closed_since = 7
-    end
+    closed_since = if params[:closed]
+                     params[:closed].to_i
+                   else
+                     7
+                   end

 
     if closed_since < 0
 
     if closed_since < 0

-      notes = notes.where("status != 'hidden'")
+      notes.where("status != 'hidden'")

     elsif closed_since > 0
     elsif closed_since > 0

-      notes = notes.where("(status = 'open' OR (status = 'closed' AND closed_at > '#{Time.now - closed_since.days}'))")
+      notes.where("(status = 'open' OR (status = 'closed' AND closed_at > '#{Time.now - closed_since.days}'))")

     else
     else

-      notes = notes.where("status = 'open'")
+      notes.where("status = 'open'")

     end
     end

-
-    notes

   end
 
   ##
   end
 
   ##


@@ -350,7 +348,7 @@ class NotesController < ApplicationController
     comment = note.comments.create(attributes)
 
     note.comments.map(&:author).uniq.each do |user|
     comment = note.comments.create(attributes)
 
     note.comments.map(&:author).uniq.each do |user|

-      if notify && user && user != @user
+      if notify && user && user != @user && user.visible?

         Notifier.note_comment_notification(comment, user).deliver_now
       end
     end
         Notifier.note_comment_notification(comment, user).deliver_now
       end
     end