diff --git a/VERSION b/VERSION index ae7255b73..bf50e910e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.2.2 +1.37.0 diff --git a/app/controllers/my_module_shareable_links_controller.rb b/app/controllers/my_module_shareable_links_controller.rb index d49a6be5d..594d6cf8b 100644 --- a/app/controllers/my_module_shareable_links_controller.rb +++ b/app/controllers/my_module_shareable_links_controller.rb @@ -62,7 +62,7 @@ class MyModuleShareableLinksController < ApplicationController @draw = params[:draw].to_i per_page = params[:length].to_i < 1 ? Constants::REPOSITORY_DEFAULT_PAGE_SIZE : params[:length].to_i page = (params[:start].to_i / per_page) + 1 - datatable_service = RepositoryDatatableService.new(@repository, params, nil, @my_module, preload_cells: false) + datatable_service = RepositoryDatatableService.new(@repository, params, nil, @my_module, preload_cells: false, disable_reminders: true) @datatable_params = { view_mode: params[:view_mode], diff --git a/app/controllers/team_shared_objects_controller.rb b/app/controllers/team_shared_objects_controller.rb index 41e712d0c..3276b5721 100644 --- a/app/controllers/team_shared_objects_controller.rb +++ b/app/controllers/team_shared_objects_controller.rb @@ -57,7 +57,7 @@ class TeamSharedObjectsController < ApplicationController end def shareable_teams - teams = current_user.teams.order(:name) - [@model.team] + teams = (Team.order(:name).all - [@model.team]).filter { |t| can_read_team?(t) || @model.private_shared_with?(t) } render json: teams, each_serializer: ShareableTeamSerializer, model: @model end diff --git a/app/javascript/vue/shared/share_modal.vue b/app/javascript/vue/shared/share_modal.vue index 39e2d3a3d..ee9c9873b 100644 --- a/app/javascript/vue/shared/share_modal.vue +++ b/app/javascript/vue/shared/share_modal.vue @@ -37,14 +37,14 @@