scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-09 13:28:53 +08:00
Code Issues Projects Releases Packages Wiki Activity

fixing hound warnings

Browse source
This commit is contained in:
zmagod 2016-08-02 09:13:30 +02:00
parent 9581e2751f
commit f184ee3f2d
2 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/controllers/experiments_controller.rb
View file

@ -1,8 +1,8 @@
class ExperimentsController < ApplicationController class ExperimentsController < ApplicationController
include PermissionHelper include PermissionHelper
before_action :set_experiment, except: [:new, :create] before_action :set_experiment, except: [:new, :create]
before_action :set_project, only: [:new, :create, :samples_index, :samples ] before_action :set_project, only: [:new, :create, :samples_index, :samples]
# before_action :check_view_permissions, only: [:canvas] before_action :check_view_permissions, only: [:canvas]
# except parameter could be used but it is not working. # except parameter could be used but it is not working.
layout :choose_layout layout :choose_layout
@ -26,7 +26,8 @@ class ExperimentsController < ApplicationController
@experiment.last_modified_by = current_user @experiment.last_modified_by = current_user
@experiment.project = @project @experiment.project = @project
if @experiment.save 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 # have to change to experiments path
redirect_to root_path redirect_to root_path
else else
@ -43,7 +44,8 @@ class ExperimentsController < ApplicationController
@experiment.update_attributes(experiment_params) @experiment.update_attributes(experiment_params)
@experiment.last_modified_by = current_user @experiment.last_modified_by = current_user
if @experiment.save 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 # have to change to experiments path
redirect_to root_path redirect_to root_path
else else
@ -57,7 +59,8 @@ class ExperimentsController < ApplicationController
@experiment.archived_by = current_user @experiment.archived_by = current_user
@experiment.archived_on = DateTime.now @experiment.archived_on = DateTime.now
if @experiment.save 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 # have to change to experiments path
redirect_to root_path redirect_to root_path
else else
@ -67,7 +70,8 @@ class ExperimentsController < ApplicationController
end end
def samples 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 @organization = @experiment.project.organization
end end
@ -76,9 +80,12 @@ class ExperimentsController < ApplicationController
respond_to do |format| respond_to do |format|
format.html format.html
format.json { format.json do
render json: ::SampleDatatable.new(view_context, @organization, @experiment, nil) render json: ::SampleDatatable.new(view_context,
} @organization,
@experiment,
nil)
end
end end
end end

15
config/routes.rb
View file

@ -104,15 +104,22 @@ Rails.application.routes.draw do
resources :experiments, only: :show do resources :experiments, only: :show do
member do member do
get 'canvas' # Overview/structure for single experiment 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/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 get 'canvas/small_zoom', to: 'canvas#small_zoom' # AJAX-loaded canvas zoom
post 'canvas', to: 'canvas#update' # Save updated canvas action post 'canvas', to: 'canvas#update' # Save updated canvas action
get 'module_archive' # Module archive for single experiment get 'module_archive' # Module archive for single experiment
get 'samples' # Samples for single project get 'samples' # Samples for single project
post 'samples_index' # Renders sample datatable for single project (ajax action) # Renders sample datatable for single project (ajax action)
post :delete_samples, constraints: CommitParamRouting.new(MyModulesController::DELETE_SAMPLES), action: :delete_samples post 'samples_index'
post :delete_samples,
constraints: CommitParamRouting.new(
MyModulesController::DELETE_SAMPLES
),
action: :delete_samples
end end
end end