From 3e5e9aed229c4de3bacf65270334aa671546d657 Mon Sep 17 00:00:00 2001
From: Jure Grabnar <jgrabnar@biosistemika.com>
Date: Wed, 24 Aug 2016 11:09:03 +0200
Subject: [PATCH] Fix 404 on move experiment

[fixes SCI-378]
---
 app/controllers/experiments_controller.rb  | 4 ++--
 app/views/experiments/_move_modal.html.erb | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb
index e1f4345b4..7b3264dbd 100644
--- a/app/controllers/experiments_controller.rb
+++ b/app/controllers/experiments_controller.rb
@@ -106,7 +106,7 @@ class ExperimentsController < ApplicationController
 
   # POST: clone_experiment(id)
   def clone
-    project = Project.find_by_id(params[:experiment][:project_id])
+    project = Project.find_by_id(params[:experiment].try(:[], :project_id))
 
     # Try to clone the experiment
     success = true
@@ -157,7 +157,7 @@ class ExperimentsController < ApplicationController
 
   # POST: move_experiment(id)
   def move
-    project = Project.find_by_id(params[:experiment][:project_id])
+    project = Project.find_by_id(params[:experiment].try(:[], :project_id))
     old_project = @experiment.project
 
     # Try to move the experiment
diff --git a/app/views/experiments/_move_modal.html.erb b/app/views/experiments/_move_modal.html.erb
index 5a676dfe1..df3aa9f52 100644
--- a/app/views/experiments/_move_modal.html.erb
+++ b/app/views/experiments/_move_modal.html.erb
@@ -25,7 +25,9 @@
           <% end %>
         </div>
         <div class="modal-footer">
-          <%= f.submit t("experiments.move.modal_submit"), class: "btn btn-primary" %>
+          <% if !@projects.blank? %>
+            <%= f.submit t("experiments.move.modal_submit"), class: "btn btn-primary" %>
+          <% end %>
           <button type="button" class="btn btn-default" data-dismiss="modal"><%=t "general.cancel" %></button>
         </div>
       </div>