mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-02-06 06:56:54 +08:00
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:
commit
087ee08976
2 changed files with 11 additions and 3 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue