Merge pull request #389 from mz3944/mz-sci-848

Unable to delete samples [SCI-848]

app/controllers/concerns/sample_actions.rb

@@ -4,7 +4,7 @@ module SampleActions
 
   def delete_samples
     check_destroy_samples_permissions
-    
+
     if params[:sample_ids].present?
       counter_user = 0
       counter_other_users = 0
@@ -14,30 +14,33 @@ module SampleActions
         if sample and can_delete_sample(sample)
           sample.destroy
           counter_user += 1
-        else 
+        else
           counter_other_users += 1
         end
       end
       if counter_user > 0
         if counter_other_users > 0
-          flash[:success] = t("samples.destroy.contains_other_samples_flash", 
-            sample_number: counter_user, other_samples_number: counter_other_users)  
+          flash[:success] = t('samples.destroy.contains_other_samples_flash',
+                              sample_number: counter_user,
+                              other_samples_number: counter_other_users)
         else
-          flash[:success] = t("samples.destroy.success_flash", 
-            sample_number: counter_user)
+          flash[:success] = t('samples.destroy.success_flash',
+                              sample_number: counter_user)
         end
-      else 
-        flash[:notice] = t("samples.destroy.no_deleted_samples_flash", 
-        other_samples_number: counter_other_users)
+      else
+        flash[:notice] = t('samples.destroy.no_deleted_samples_flash',
+                           other_samples_number: counter_other_users)
       end
     else
-      flash[:notice] = t("samples.destroy.no_sample_selected_flash")
+      flash[:notice] = t('samples.destroy.no_sample_selected_flash')
     end
 
-    if params[:controller] == "my_modules"
+    if params[:controller] == 'my_modules'
       redirect_to samples_my_module_path(@my_module)
-    elsif params[:controller] == "projects"
+    elsif params[:controller] == 'projects'
       redirect_to samples_project_path(@project)
+    elsif params[:controller] == 'experiments'
+      redirect_to samples_experiment_path(@experiment)
     end
   end
 

app/controllers/experiments_controller.rb

@@ -1,13 +1,13 @@
 class ExperimentsController < ApplicationController
+  include SampleActions
   include PermissionHelper
   include OrganizationsHelper
 
   before_action :set_experiment,
                 except: [:new, :create]
   before_action :set_project,
-                only: [:new, :create, :samples_index,
-                       :samples, :module_archive, :clone_modal,
-                       :move_modal]
+                only: [:new, :create, :samples_index, :samples, :module_archive,
+                       :clone_modal, :move_modal, :delete_samples]
   before_action :check_view_permissions,
                 only: [:canvas, :module_archive]
   before_action :check_module_archive_permissions,
@@ -20,6 +20,9 @@ class ExperimentsController < ApplicationController
   # except parameter could be used but it is not working.
   layout :choose_layout
 
+  # Action defined in SampleActions
+  DELETE_SAMPLES = I18n.t('samples.delete_samples')
+
   def new
     @experiment = Experiment.new
     respond_to do |format|

app/controllers/my_modules_controller.rb

@@ -26,11 +26,11 @@ class MyModulesController < ApplicationController
   layout "fluid"
 
   # Define submit actions constants (used in routing)
-  ASSIGN_SAMPLES = 'Assign'
-  UNASSIGN_SAMPLES = 'Unassign'
+  ASSIGN_SAMPLES = I18n.t('samples.assign_samples_to_module')
+  UNASSIGN_SAMPLES = I18n.t('samples.unassign_samples_to_module')
 
   # Action defined in SampleActions
-  DELETE_SAMPLES = 'Delete'
+  DELETE_SAMPLES = I18n.t('samples.delete_samples')
 
   def show
     respond_to do |format|

app/controllers/projects_controller.rb

@@ -21,7 +21,7 @@ class ProjectsController < ApplicationController
   layout :choose_layout
 
   # Action defined in SampleActions
-  DELETE_SAMPLES = I18n.t("samples.delete_samples")
+  DELETE_SAMPLES = I18n.t('samples.delete_samples')
 
   def index
     if params[:organization]

app/helpers/samples_helper.rb

@@ -1,5 +1,4 @@
 module SamplesHelper
-
   def can_add_samples
     module_page? && can_add_samples_to_module(@my_module)
   end
@@ -31,7 +30,8 @@ module SamplesHelper
       assign_samples_my_module_path(@my_module)
     elsif project_page?
       delete_samples_project_path(@project)
+    elsif experiment_page?
+      delete_samples_experiment_path(@experiment)
     end
   end
-
 end

app/views/shared/_samples.html.erb

@@ -99,7 +99,8 @@
       id="deleteSamplesButton" data-target="#deleteSamples" data-toggle="modal" disabled>
       <span class="glyphicon glyphicon-trash"></span>
       <span class="hidden-xs-custom"><%= t'samples.delete_samples' %></span>
-        <%= submit_tag MyModulesController::DELETE_SAMPLES, :class => "hidden delete_samples_submit" %>
+        <%= submit_tag I18n.t('samples.delete_samples'), :class => "hidden
+        delete_samples_submit" %>
     </button>
   <% end %>
 

config/routes.rb

@@ -182,7 +182,7 @@ Rails.application.routes.draw do
       post 'samples_index'
       post :delete_samples,
            constraints: CommitParamRouting.new(
-             MyModulesController::DELETE_SAMPLES
+             ExperimentsController::DELETE_SAMPLES
            ),
            action: :delete_samples
     end