mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2024-09-20 14:45:56 +08:00
fixing hound warnings
This commit is contained in:
parent
9581e2751f
commit
f184ee3f2d
|
@ -1,8 +1,8 @@
|
|||
class ExperimentsController < ApplicationController
|
||||
include PermissionHelper
|
||||
before_action :set_experiment, except: [:new, :create]
|
||||
before_action :set_project, only: [:new, :create, :samples_index, :samples ]
|
||||
# before_action :check_view_permissions, only: [:canvas]
|
||||
before_action :set_project, only: [:new, :create, :samples_index, :samples]
|
||||
before_action :check_view_permissions, only: [:canvas]
|
||||
|
||||
# except parameter could be used but it is not working.
|
||||
layout :choose_layout
|
||||
|
@ -26,7 +26,8 @@ class ExperimentsController < ApplicationController
|
|||
@experiment.last_modified_by = current_user
|
||||
@experiment.project = @project
|
||||
if @experiment.save
|
||||
flash[:success] = t('experiments.create.success_flash', experiment: @experiment.name)
|
||||
flash[:success] = t('experiments.create.success_flash',
|
||||
experiment: @experiment.name)
|
||||
# have to change to experiments path
|
||||
redirect_to root_path
|
||||
else
|
||||
|
@ -43,7 +44,8 @@ class ExperimentsController < ApplicationController
|
|||
@experiment.update_attributes(experiment_params)
|
||||
@experiment.last_modified_by = current_user
|
||||
if @experiment.save
|
||||
flash[:success] = t('experiments.update.success_flash', experiment: @experiment.name)
|
||||
flash[:success] = t('experiments.update.success_flash',
|
||||
experiment: @experiment.name)
|
||||
# have to change to experiments path
|
||||
redirect_to root_path
|
||||
else
|
||||
|
@ -57,7 +59,8 @@ class ExperimentsController < ApplicationController
|
|||
@experiment.archived_by = current_user
|
||||
@experiment.archived_on = DateTime.now
|
||||
if @experiment.save
|
||||
flash[:success] = t('experiments.archive.success_flash', experiment: @experiment.name)
|
||||
flash[:success] = t('experiments.archive.success_flash',
|
||||
experiment: @experiment.name)
|
||||
# have to change to experiments path
|
||||
redirect_to root_path
|
||||
else
|
||||
|
@ -67,7 +70,8 @@ class ExperimentsController < ApplicationController
|
|||
end
|
||||
|
||||
def samples
|
||||
@samples_index_link = samples_index_experiment_path(@experiment, format: :json)
|
||||
@samples_index_link = samples_index_experiment_path(@experiment,
|
||||
format: :json)
|
||||
@organization = @experiment.project.organization
|
||||
end
|
||||
|
||||
|
@ -76,9 +80,12 @@ class ExperimentsController < ApplicationController
|
|||
|
||||
respond_to do |format|
|
||||
format.html
|
||||
format.json {
|
||||
render json: ::SampleDatatable.new(view_context, @organization, @experiment, nil)
|
||||
}
|
||||
format.json do
|
||||
render json: ::SampleDatatable.new(view_context,
|
||||
@organization,
|
||||
@experiment,
|
||||
nil)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -104,15 +104,22 @@ Rails.application.routes.draw do
|
|||
resources :experiments, only: :show do
|
||||
member do
|
||||
get 'canvas' # Overview/structure for single experiment
|
||||
get 'canvas/edit', to: 'canvas#edit' # AJAX-loaded canvas edit mode (from canvas)
|
||||
# AJAX-loaded canvas edit mode (from canvas)
|
||||
get 'canvas/edit', to: 'canvas#edit'
|
||||
get 'canvas/full_zoom', to: 'canvas#full_zoom' # AJAX-loaded canvas zoom
|
||||
get 'canvas/medium_zoom', to: 'canvas#medium_zoom' # AJAX-loaded canvas zoom
|
||||
# AJAX-loaded canvas zoom
|
||||
get 'canvas/medium_zoom', to: 'canvas#medium_zoom'
|
||||
get 'canvas/small_zoom', to: 'canvas#small_zoom' # AJAX-loaded canvas zoom
|
||||
post 'canvas', to: 'canvas#update' # Save updated canvas action
|
||||
get 'module_archive' # Module archive for single experiment
|
||||
get 'samples' # Samples for single project
|
||||
post 'samples_index' # Renders sample datatable for single project (ajax action)
|
||||
post :delete_samples, constraints: CommitParamRouting.new(MyModulesController::DELETE_SAMPLES), action: :delete_samples
|
||||
# Renders sample datatable for single project (ajax action)
|
||||
post 'samples_index'
|
||||
post :delete_samples,
|
||||
constraints: CommitParamRouting.new(
|
||||
MyModulesController::DELETE_SAMPLES
|
||||
),
|
||||
action: :delete_samples
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue