comparison app/controllers/watchers_controller.rb @ 1517:dffacf8a6908 redmine-2.5

Update to Redmine SVN revision 13367 on 2.5-stable branch

 
   before_filter :find_project, :authorize, :only => [:new, :create, :append, :destroy, :autocomplete_for_user]
   accept_api_auth :create, :destroy
 
   def new
+    @users = users_for_new_watcher
   end
 
   def create
     user_ids = []
     if params[:watcher].is_a?(Hash)

     user_ids.flatten.compact.uniq.each do |user_id|
       Watcher.create(:watchable => @watched, :user_id => user_id)
     end
     respond_to do |format|
       format.html { redirect_to_referer_or {render :text => 'Watcher added.', :layout => true}}
-      format.js
+      format.js { @users = users_for_new_watcher }
       format.api { render_api_ok }
     end
   end
 
   def append
     if params[:watcher].is_a?(Hash)
       user_ids = params[:watcher][:user_ids] || [params[:watcher][:user_id]]
-      @users = User.active.find_all_by_id(user_ids)
+      @users = User.active.where(:id => user_ids).all
+    end
+    if @users.blank?
+      render :nothing => true
     end
   end
 
   def destroy
     @watched.set_watcher(User.find(params[:user_id]), false)

       format.api { render_api_ok }
     end
   end
 
   def autocomplete_for_user
-    @users = User.active.sorted.like(params[:q]).limit(100).all
-    if @watched
-      @users -= @watched.watcher_users
-    end
+    @users = users_for_new_watcher
     render :layout => false
   end
 
   private
 

   end
 
   def find_watchables
     klass = Object.const_get(params[:object_type].camelcase) rescue nil
     if klass && klass.respond_to?('watched_by')
-      @watchables = klass.find_all_by_id(Array.wrap(params[:object_id]))
-      raise Unauthorized if @watchables.any? {|w| w.respond_to?(:visible?) && !w.visible?}
+      @watchables = klass.where(:id => Array.wrap(params[:object_id])).all
+      raise Unauthorized if @watchables.any? {|w|
+        if w.respond_to?(:visible?)
+          !w.visible?
+        elsif w.respond_to?(:project) && w.project
+          !w.project.visible?
+        end
+      }
     end
     render_404 unless @watchables.present?
   end
 
   def set_watcher(watchables, user, watching)

     respond_to do |format|
       format.html { redirect_to_referer_or {render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true}}
       format.js { render :partial => 'set_watcher', :locals => {:user => user, :watched => watchables} }
     end
   end
+
+  def users_for_new_watcher
+    users = []
+    if params[:q].blank? && @project.present?
+      users = @project.users.sorted
+    else
+      users = User.active.sorted.like(params[:q]).limit(100)
+    end
+    if @watched
+      users -= @watched.watcher_users
+    end
+    users
+  end
 end