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

Merge pull request #164 from okriuchykhin/ok_SCI-400

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,6 +16,7 @@
keyboard: false, keyboard: false,
}); });
validateMoveModal(id); validateMoveModal(id);
clearModal($(id));
}) })
.on("ajax:error", function() { .on("ajax:error", function() {
animateSpinner(null, false); 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: // Initialize dropdown actions on experiment:
// - edit // - edit
// - clone // - clone

6
app/models/experiment.rb
View file

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