From d48997464d4fc105ee27c751a3302178ffd1fcd9 Mon Sep 17 00:00:00 2001
From: aignatov-bio <aignatov@biosistemika.com>
Date: Thu, 23 Apr 2020 09:04:04 +0200
Subject: [PATCH] Fix markup

---
 app/assets/javascripts/my_modules/repositories.js      |  3 +--
 app/controllers/my_module_repositories_controller.rb   |  4 ++--
 .../repository_rows/my_module_unassigning_service.rb   | 10 +++++-----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/my_modules/repositories.js b/app/assets/javascripts/my_modules/repositories.js
index cbce49e46..f6b9b9993 100644
--- a/app/assets/javascripts/my_modules/repositories.js
+++ b/app/assets/javascripts/my_modules/repositories.js
@@ -1,8 +1,7 @@
-/* eslint-disable no-param-reassign */
+/* eslint-disable no-param-reassign, no-use-before-define */
 /* global DataTableHelpers PerfectScrollbar FilePreviewModal animateSpinner HelperModule */
 
 
-
 var MyModuleRepositories = (function() {
   const FULL_VIEW_MODAL = $('#myModuleRepositoryFullViewModal');
   const UPDATE_REPOSITORY_MODAL = $('#updateRepositoryRecordModal');
diff --git a/app/controllers/my_module_repositories_controller.rb b/app/controllers/my_module_repositories_controller.rb
index a35a5d0ac..364ca217b 100644
--- a/app/controllers/my_module_repositories_controller.rb
+++ b/app/controllers/my_module_repositories_controller.rb
@@ -49,7 +49,7 @@ class MyModuleRepositoriesController < ApplicationController
 
     if (params[:rows_to_assign].nil? || assign_service.succeed?) &&
        (params[:rows_to_unassign].nil? || unassign_service.succeed?)
-      flash = update_flash_message(assign_service, unassign_service)
+      flash = update_flash_message
       status = :ok
     else
       flash = t('my_modules.repository.flash.update_error')
@@ -133,7 +133,7 @@ class MyModuleRepositoriesController < ApplicationController
                       can_assign_repository_rows_to_module?(@my_module)
   end
 
-  def update_flash_message(assign_service, unassign_service)
+  def update_flash_message
     assigned_count = params[:rows_to_assign]&.count
     unassigned_count = params[:rows_to_unassign]&.count
 
diff --git a/app/services/repository_rows/my_module_unassigning_service.rb b/app/services/repository_rows/my_module_unassigning_service.rb
index 251312f8a..2181d623d 100644
--- a/app/services/repository_rows/my_module_unassigning_service.rb
+++ b/app/services/repository_rows/my_module_unassigning_service.rb
@@ -18,7 +18,7 @@ module RepositoryRows
     def call
       return self unless valid?
 
-      #ActiveRecord::Base.transaction do
+      ActiveRecord::Base.transaction do
         if params[:downstream] == 'true'
           @my_module.downstream_modules.each do |downstream_module|
             unassign_repository_rows_from_my_module(downstream_module)
@@ -26,10 +26,10 @@ module RepositoryRows
         else
           unassign_repository_rows_from_my_module(@my_module)
         end
-      #rescue StandardError => e
-      #  @errors[e.record.class.name.underscore] = e.record.errors.full_messages
-      #  raise ActiveRecord::Rollback
-      #end
+      rescue StandardError => e
+        @errors[e.record.class.name.underscore] = e.record.errors.full_messages
+        raise ActiveRecord::Rollback
+      end
 
       self
     end