scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2575 from okriuchykhin/ok_SCI_4637

Browse source 
Fix selection of the default snapshot on tasks [SCI-4637]
This commit is contained in:
Alex Kriuchykhin 2020-05-18 14:25:26 +02:00 committed by GitHub
parent 1f24adddf9 8b968f6f67
commit e9a05d2e3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/my_modules/repositories.js
View file

@ -392,7 +392,7 @@ var MyModuleRepositories = (function() {
animateSpinner(null, true);
if (FULL_VIEW_MODAL.find('.table').data('type') === 'live') {
data = { repository_snapshot_id: -1 };
data = { repository_id: FULL_VIEW_MODAL.find('.table').data('id') };
} else {
data = { repository_snapshot_id: FULL_VIEW_MODAL.find('.table').data('id') };
}

8
app/controllers/my_module_repository_snapshots_controller.rb
View file

@ -83,13 +83,15 @@ class MyModuleRepositorySnapshotsController < ApplicationController
end
def select
if params[:repository_snapshot_id].to_i == -1
@my_module.repository_snapshots.where(original_repository: @repository).update(selected: nil)
if params[:repository_id]
@my_module.repository_snapshots.where(parent_id: params[:repository_id]).update(selected: nil)
else
repository_snapshot = @my_module.repository_snapshots.find_by(id: params[:repository_snapshot_id])
return render_404 unless repository_snapshot
@my_module.repository_snapshots.where(original_repository: @repository).update(selected: nil)
@my_module.repository_snapshots
.where(original_repository: repository_snapshot.original_repository)
.update(selected: nil)
repository_snapshot.update!(selected: true)
end