scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-27 02:04:33 +08:00
Code Issues Projects Releases Packages Wiki Activity

Code style fixes

Browse source
This commit is contained in:
Luka Murn 2016-07-29 10:41:08 +02:00
parent affc429496
commit 4ea86d6aa1
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/controllers/experiments_controller.rb
View file

@ -10,13 +10,13 @@ class ExperimentsController < ApplicationController
def new
@experiment = Experiment.new
respond_to do |format|
format.json {
render json:{
html: render_to_string( {
partial: "new_modal.html.erb"
})
format.json do
render json: {
html: render_to_string(
partial: 'new_modal.html.erb'
)
}
}
end
end
end

7
app/controllers/projects_controller.rb
View file

@ -11,7 +11,8 @@ class ProjectsController < ApplicationController
:samples_index]
before_action :check_view_notifications_permissions, only: [ :notifications ]
before_action :check_edit_permissions, only: [ :edit ]
before_action :check_experiment_archive_permissions, only: [:experiment_archive]
before_action :check_experiment_archive_permissions,
only: [:experiment_archive]
filter_by_archived = false
@ -306,9 +307,7 @@ class ProjectsController < ApplicationController
end
def check_experiment_archive_permissions
unless can_view_project_archive(@project)
render_403
end
render_403 unless can_view_project_archive(@project)
end
def choose_layout