diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index da279997f..11e049ab4 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -216,29 +216,6 @@ class RepositoriesController < ApplicationController } end - def export_modal - if current_user.has_available_exports? - render json: { - html: render_to_string( - partial: 'export_repositories_modal', - locals: { team_name: current_team.name, - counter: params[:counter].to_i, - export_limit: TeamZipExport.exports_limit, - num_of_requests_left: current_user.exports_left - 1 }, - formats: :html - ) - } - else - render json: { - html: render_to_string( - partial: 'export_limit_exceeded_modal', - locals: { requests_limit: TeamZipExport.exports_limit }, - formats: :html - ) - } - end - end - def copy @tmp_repository = Repository.new( team: current_team, @@ -375,8 +352,7 @@ class RepositoriesController < ApplicationController def export_repositories repositories = Repository.viewable_by_user(current_user, current_team).where(id: params[:repository_ids]) - if repositories.present? && current_user.has_available_exports? - current_user.increase_daily_exports_counter! + if repositories.present? RepositoriesExportJob .perform_later(params[:file_type], repositories.pluck(:id), user_id: current_user.id, team_id: current_team.id) update_user_export_file_type if current_user.settings[:repository_export_file_type] != params[:file_type] diff --git a/app/javascript/vue/repositories/modals/export.vue b/app/javascript/vue/repositories/modals/export.vue index 7d3d4d972..61504798a 100644 --- a/app/javascript/vue/repositories/modals/export.vue +++ b/app/javascript/vue/repositories/modals/export.vue @@ -14,9 +14,6 @@ count: rows.length})">

{{ this.i18n.t('repositories.index.modal_export.description_alert') }}

{{ this.i18n.t('repositories.index.modal_export.description_p2') }}

-

diff --git a/app/serializers/repository_serializer.rb b/app/serializers/repository_serializer.rb index dd3022aba..e5be13e06 100644 --- a/app/serializers/repository_serializer.rb +++ b/app/serializers/repository_serializer.rb @@ -16,8 +16,6 @@ class RepositorySerializer < ActiveModel::Serializer def export_actions { path: export_repositories_team_path(object.team), - export_limit: TeamZipExport.exports_limit, - num_of_requests_left: current_user.exports_left - 1, export_file_type: current_user.settings[:repository_export_file_type] || 'xlsx' } end diff --git a/app/services/toolbars/repositories_service.rb b/app/services/toolbars/repositories_service.rb index 3989ac1dc..0171e30de 100644 --- a/app/services/toolbars/repositories_service.rb +++ b/app/services/toolbars/repositories_service.rb @@ -60,8 +60,6 @@ module Toolbars label: I18n.t('libraries.index.buttons.export'), icon: 'sn-icon sn-icon-export', path: export_repositories_team_path(@current_team), - export_limit: TeamZipExport.exports_limit, - num_of_requests_left: @current_user.exports_left - 1, export_file_type: current_user.settings[:repository_export_file_type] || 'xlsx', type: :emit } diff --git a/app/views/repositories/_export_repositories_modal.html.erb b/app/views/repositories/_export_repositories_modal.html.erb deleted file mode 100644 index 5d6a5a63e..000000000 --- a/app/views/repositories/_export_repositories_modal.html.erb +++ /dev/null @@ -1,37 +0,0 @@ - diff --git a/config/routes.rb b/config/routes.rb index 685c508fb..49db07eb4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -194,7 +194,6 @@ Rails.application.routes.draw do get 'create_modal', to: 'repositories#create_modal', defaults: { format: 'json' } get 'actions_toolbar' - get 'export_modal' end member do get :export_empty_repository