Fix "Assign to all" when runner already assigned to some projects

gitlabhq · Mar 21, 2014 · 079ad59 · 079ad59
1 parent 1a92de7
commit 079ad59
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/app/controllers/admin/runners_controller.rb b/app/controllers/admin/runners_controller.rb
@@ -29,7 +29,7 @@ def destroy
   end
 
   def assign_all
-    Project.all.each { |project| @runner.assign_to(project, current_user) }
+    Project.unassigned(@runner).all.each { |project| @runner.assign_to(project, current_user) }
 
     respond_to do |format|
       format.js

diff --git a/app/models/project.rb b/app/models/project.rb
@@ -90,6 +90,12 @@ def from_gitlab(user, page, per_page, scope = :owned)
     def already_added?(project)
       where(gitlab_url: project.web_url).any?
     end
+
+    def unassigned(runner)
+      joins('LEFT JOIN runner_projects ON runner_projects.project_id = projects.id ' \
+        "AND runner_projects.runner_id = #{runner.id}").
+      where('runner_projects.project_id' => nil)
+    end
   end
 
   def set_default_values