From 8b968f6f679f50a358dde9064ff91db89bb6a56b Mon Sep 17 00:00:00 2001
From: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com>
Date: Mon, 18 May 2020 11:06:42 +0200
Subject: [PATCH] Fix selection of the default snapshot on tasks [SCI-4637]

---
 app/assets/javascripts/my_modules/repositories.js         | 4 ++--
 .../my_module_repository_snapshots_controller.rb          | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/my_modules/repositories.js b/app/assets/javascripts/my_modules/repositories.js
index d3d1b9a93..12d25b10a 100644
--- a/app/assets/javascripts/my_modules/repositories.js
+++ b/app/assets/javascripts/my_modules/repositories.js
@@ -378,7 +378,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') };
       }
@@ -567,7 +567,7 @@ var MyModuleRepositories = (function() {
         HelperModule.flashAlertMsg(data.flash, 'success');
         SELECTED_ROWS = {};
         $(FULL_VIEW_TABLE.table().container()).find('.dataTable')
-          .attr('data-assigned-items-count', data.rows_count)
+          .attr('data-assigned-items-count', data.rows_count);
         FULL_VIEW_TABLE.ajax.reload(null, false);
         reloadRepositoriesList();
         renderFullViewAssignButtons();
diff --git a/app/controllers/my_module_repository_snapshots_controller.rb b/app/controllers/my_module_repository_snapshots_controller.rb
index 30d1939dc..b1332235a 100644
--- a/app/controllers/my_module_repository_snapshots_controller.rb
+++ b/app/controllers/my_module_repository_snapshots_controller.rb
@@ -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