diff --git a/app/assets/javascripts/repositories/stock.js b/app/assets/javascripts/repositories/stock.js index 2ad82c8d5..89c70803e 100644 --- a/app/assets/javascripts/repositories/stock.js +++ b/app/assets/javascripts/repositories/stock.js @@ -78,9 +78,11 @@ var RepositoryStockValues = (function() { $manageModal.find('form').on('ajax:success', function(_, data) { $manageModal.modal('hide'); - $('.dataTable').find( + let $cell = $('.dataTable').find( `tr:nth-child(${rowIndex}) td:nth-child(${colIndex + 1})` - ).html( + ); + $cell.parent().data('manage-stock-url', data.manageStockUrl); + $cell.html( $.fn.dataTable.render.RepositoryStockValue(data) ); }); diff --git a/app/controllers/repository_stock_values_controller.rb b/app/controllers/repository_stock_values_controller.rb index 1659cdd7d..68e3881ad 100644 --- a/app/controllers/repository_stock_values_controller.rb +++ b/app/controllers/repository_stock_values_controller.rb @@ -49,7 +49,8 @@ class RepositoryStockValuesController < ApplicationController render json: { stock_managable: true, - stock_status: @repository_stock_value.status + stock_status: @repository_stock_value.status, + manageStockUrl: edit_repository_stock_repository_repository_row_url(@repository, @repository_row) }.merge(display_cell_value(@repository_stock_value.repository_cell, current_team, @repository)) end diff --git a/app/helpers/repository_datatable_helper.rb b/app/helpers/repository_datatable_helper.rb index 72c78d677..7626df8da 100644 --- a/app/helpers/repository_datatable_helper.rb +++ b/app/helpers/repository_datatable_helper.rb @@ -275,6 +275,9 @@ module RepositoryDatatableHelper # don't load reminders for archived repositories return [] if repository_rows.blank? || repository.archived? + # don't load reminders for snapshots + return [] if repository.is_a?(RepositorySnapshot) + repository_rows.active.with_active_reminders(current_user).to_a.pluck(:id).uniq end