Merge pull request #164 from okriuchykhin/ok_SCI-400

Fixes issue with new experiment modal and with move of experiments [fixes SCI-400]
This commit is contained in:
okriuchykhin 2016-09-22 17:01:58 +02:00 committed by GitHub
commit 087ee08976
2 changed files with 11 additions and 3 deletions

View file

@ -16,6 +16,7 @@
keyboard: false,
});
validateMoveModal(id);
clearModal($(id));
})
.on("ajax:error", function() {
animateSpinner(null, false);
@ -26,6 +27,13 @@
});
}
function clearModal(id) {
//Completely remove modal when it gets closed
$(id).on('hidden.bs.modal', function() {
$(id).remove();
});
}
// Initialize dropdown actions on experiment:
// - edit
// - clone

View file

@ -375,9 +375,9 @@ class Experiment < ActiveRecord::Base
project.tags << new_tags
m.tags << new_tags
end
save
touch(:workflowimg_updated_at)
result = save
touch(:workflowimg_updated_at) if result
result
end
# Get projects where user is either owner or user in the same organization