From c387439fb292afbbbf2342f2137da97103f7d2ac Mon Sep 17 00:00:00 2001
From: Jure Grabnar <jgrabnar@biosistemika.com>
Date: Fri, 12 Aug 2016 11:36:52 +0200
Subject: [PATCH] Fix projects query for experiments

Remove unneeded word in view
---
 app/controllers/experiments_controller.rb  | 17 ++++++++++-------
 app/views/experiments/_move_modal.html.erb |  1 -
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb
index d32298e57..13d301544 100644
--- a/app/controllers/experiments_controller.rb
+++ b/app/controllers/experiments_controller.rb
@@ -93,7 +93,7 @@ class ExperimentsController < ApplicationController
 
   # GET: clone_modal_experiment_path(id)
   def clone_modal
-    @projects = projects_with_role_above_user
+    @projects = projects_with_role_above_user(true)
     respond_to do |format|
       format.json do
         render json: {
@@ -111,7 +111,7 @@ class ExperimentsController < ApplicationController
 
     # Try to clone the experiment
     success = true
-    if projects_with_role_above_user.include?(project)
+    if projects_with_role_above_user(true).include?(project)
       cloned_experiment = @experiment.deep_clone_to_project(current_user,
                                                             project)
       success = cloned_experiment.valid?
@@ -144,7 +144,7 @@ class ExperimentsController < ApplicationController
 
   # GET: move_modal_experiment_path(id)
   def move_modal
-    @projects = projects_with_role_above_user
+    @projects = projects_with_role_above_user(false)
     respond_to do |format|
       format.json do
         render json: {
@@ -232,12 +232,15 @@ class ExperimentsController < ApplicationController
 
   # Get projects where user is either owner or user in the same organization
   # as this experiment
-  def projects_with_role_above_user
+  # - include_this_project: whether to include project from @experiment
+  def projects_with_role_above_user(include_this_project)
     organization = @experiment.project.organization
+    projects = organization.projects.where(archived: false)
+    projects = projects
+               .where.not(id: @experiment.project.id) unless include_this_project
+
     current_user.user_projects
-                .where(project:
-                        Project.where(organization: organization)
-                              .where(archived: false))
+                .where(project: projects)
                 .where('role < 2')
                 .map(&:project)
   end
diff --git a/app/views/experiments/_move_modal.html.erb b/app/views/experiments/_move_modal.html.erb
index 694cf98eb..6a79a3b5c 100644
--- a/app/views/experiments/_move_modal.html.erb
+++ b/app/views/experiments/_move_modal.html.erb
@@ -13,7 +13,6 @@
           <h4 class="modal-title" id="move-experiment-modal-label"><%= t("experiments.move.modal_title", experiment: @experiment.name ) %></h5>
         </div>
         <div class="modal-body">
-          asdasd
           <%= f.select :project_id, options_for_select(@projects.collect { |p| [ p.name, p.id ] },
                                                        @project.id ),
                        {}, {class: "form-control selectpicker", "data-role" => "clear"} %>