diff app/controllers/issues_controller.rb @ 149:e7c03e1738fb cannam-pre-20110113-merge

Merge from branch "live"

--- a/app/controllers/issues_controller.rb	Thu Jan 20 10:01:33 2011 +0000
+++ b/app/controllers/issues_controller.rb	Mon Jan 24 14:12:44 2011 +0000
@@ -135,15 +135,12 @@
       
       call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue})
 
-      # Adds user to watcher's list
-      # @issue.add_watcher(User.current)
-
       # Also adds the assignee to the watcher's list
-      # if params[:issue][:assigned_to_id] && !params[:issue][:assigned_to_id].empty?:
-      #  unless @issue.watcher_ids.include?(params[:issue][:assigned_to_id]):
-      #    @issue.add_watcher(User.find(params[:issue][:assigned_to_id]))
-      #  end
-      # end
+      if params[:issue][:assigned_to_id] && !params[:issue][:assigned_to_id].empty?:
+       unless @issue.watcher_ids.include?(params[:issue][:assigned_to_id]):
+         @issue.add_watcher(User.find(params[:issue][:assigned_to_id]))
+       end
+      end
 
       respond_to do |format|
         format.html {
@@ -291,11 +288,11 @@
     # is in this issues watcher's list
     # if not, adds it.
 
-    # if params[:issue][:assigned_to_id] && !params[:issue][:assigned_to_id].empty?:
-    #  unless @issue.watcher_ids.include?(params[:issue][:assigned_to_id]):
-    #    @issue.add_watcher(User.find(params[:issue][:assigned_to_id]))
-    #  end
-    # end
+    if params[:issue][:assigned_to_id] && !params[:issue][:assigned_to_id].empty?:
+     unless @issue.watched_by?(User.find(params[:issue][:assigned_to_id])):
+       @issue.add_watcher(User.find(params[:issue][:assigned_to_id]))
+     end
+    end
 
 
   end