# HG changeset patch
# User Luis Figueira <luis.figueira@eecs.qmul.ac.uk>
# Date 1294852257 0
# Node ID 66c73df314faefd6f416b4274a6dc72de350a7aa
# Parent  3e75f003034a5cc411c6bf229b9dfd1fd9888758# Parent  b0086cb55640f8f471dd6ca20cc2f09e26be751d
Merge my two branches

diff -r 3e75f003034a -r 66c73df314fa app/controllers/issues_controller.rb
--- a/app/controllers/issues_controller.rb	Wed Jan 12 17:06:18 2011 +0000
+++ b/app/controllers/issues_controller.rb	Wed Jan 12 17:10:57 2011 +0000
@@ -136,14 +136,14 @@
       call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue})
 
       # Adds user to watcher's list
-      @issue.add_watcher(User.current)
+      # @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 +291,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.watcher_ids.include?(params[:issue][:assigned_to_id]):
+    #    @issue.add_watcher(User.find(params[:issue][:assigned_to_id]))
+    #  end
+    # end
 
 
   end