Merge pull request #160 from ZmagoD/zd_SCI_464

Fixes restore experiment error [fixes SCI-464]
This commit is contained in:
Zmago Devetak 2016-09-21 19:24:33 +02:00 committed by GitHub
commit 5fedcb4be2

View file

@ -76,16 +76,24 @@ class ExperimentsController < ApplicationController
@experiment.touch(:workflowimg_updated_at)
flash[:success] = t('experiments.update.success_flash',
experiment: @experiment.name)
respond_to do |format|
format.json do
render json: {}, status: :ok
end
format.html do
redirect_to project_path(@experiment.project)
end
end
else
flash[:alert] = t('experiments.update.error_flash')
respond_to do |format|
format.json do
render json: @experiment.errors, status: :unprocessable_entity
end
format.html do
redirect_to :back
end
end
end
end