scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-05 14:41:53 +08:00
Code Issues Projects Releases Packages Wiki Activity

new experiment redirection

Browse source
This commit is contained in:
Mojca Lorber 2017-04-20 17:55:28 +02:00
parent c57589781c
commit cf00ecd62e
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/assets/javascripts/experiments/dropdown_actions.js
View file

@ -17,7 +17,7 @@
});
validateMoveModal(id);
clearModal($(id));
validateExperimentForm($(id));
validateExperimentForm(id);
})
.on("ajax:error", function() {
animateSpinner(null, false);
@ -74,30 +74,35 @@
});
}
}
// Reload after successfully updated experiment
function validateExperimentForm(element){
if ( element ) {
var form = element.find("form");
if ( $(element) ) {
var form = $(element).find("form");
form
.on('ajax:success' , function(){
.on('ajax:success' , function(e, data){
animateSpinner(form, true);
location.reload();
if ( element.match(/#new-experiment-modal/) ) {
window.location.replace(data.path);
} else {
location.reload();
}
})
.on('ajax:error', function(e, error){
var msg = JSON.parse(error.responseText);
if ( 'name' in msg ) {
renderFormError(e,
element.find("#experiment-name"),
$(element).find("#experiment-name"),
msg.name.toString(),
true);
} else if ( 'description' in msg ) {
renderFormError(e,
element.find("#experiment-description"),
$(element).find("#experiment-description"),
msg.description.toString(),
true);
} else {
renderFormError(e,
element.find("#experiment-name"),
$(element).find("#experiment-name"),
error.statusText,
true);
}

2
app/controllers/experiments_controller.rb
View file

@ -62,7 +62,7 @@ class ExperimentsController < ApplicationController
experiment: @experiment.name)
respond_to do |format|
format.json do
render json: {}, status: :ok
render json: { path: canvas_experiment_url(@experiment) }, status: :ok
end
end
else