Merge remote-tracking branch 'apmon/openstreetbugs2' into openstreetbugs

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

diff --git a/app/controllers/map_bugs_controller.rb b/app/controllers/map_bugs_controller.rb
index 8412d17f37496f0192cd49645de7d685b66cb24c..a967384b6ab1da4ef7a1178621178499fcf952c2 100644 (file)
--- a/app/controllers/map_bugs_controller.rb
+++ b/app/controllers/map_bugs_controller.rb
@@ -206,7 +206,7 @@ class MapBugsController < ApplicationController
   def my_bugs
  
     if params[:display_name] 
-      @user2 = User.find_by_display_name(params[:display_name], :conditions => { :visible => true }) 
+      @user2 = User.find_by_display_name(params[:display_name], :conditions => { :status => ["active", "confirmed"] }) 
  
       if @user2  
         if @user2.data_public? or @user2 == @user 
@@ -214,10 +214,11 @@ class MapBugsController < ApplicationController
         else 
           conditions = ['false'] 
         end 
-      elsif request.format == :html 
+      else #if request.format == :html 
         @title = t 'user.no_such_user.title' 
         @not_found_user = params[:display_name] 
         render :template => 'user/no_such_user', :status => :not_found 
+               return
       end 
     end
 
@@ -310,7 +311,18 @@ private
     end
     bug_comment.save; 
     bug.last_changed = t 
-    bug.save 
+    bug.save
+
+       sent_to = Set.new;
+       bug.map_bug_comment.each do | cmt |
+         if cmt.user
+               unless sent_to.include?(cmt.user)
+          Notifier.deliver_bug_comment_notification(bug_comment, cmt.user) unless cmt.user == @user;
+          sent_to.add(cmt.user);
+        end
+      end
+    end
+       
   end
 
 end