mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-03-04 19:53:19 +08:00
Merge pull request #7648 from rekonder/aj_SCI_10792
Remove export limit for repository export [SCI-10792]
This commit is contained in:
commit
1c573cfd62
6 changed files with 1 additions and 70 deletions
|
@ -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,
|
||||
|
@ -378,8 +355,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]
|
||||
|
|
|
@ -14,9 +14,6 @@
|
|||
count: rows.length})"></p>
|
||||
<p class="bg-sn-super-light-blue p-3 mb-6"> {{ this.i18n.t('repositories.index.modal_export.description_alert') }} </p>
|
||||
<p class="mb-6"> {{ this.i18n.t('repositories.index.modal_export.description_p2') }} </p>
|
||||
<p v-html="this.i18n.t('repositories.index.modal_export.description_p3_html', {
|
||||
remaining_export_requests: exportAction.num_of_requests_left,
|
||||
requests_limit: exportAction.export_limit})"></p>
|
||||
<div class="sci-radio-container mt-3">
|
||||
<input type="radio" class="sci-radio" name="file_type" value="xlsx" v-model="selectedOption">
|
||||
<span class="sci-radio-label"></span>
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -1,37 +0,0 @@
|
|||
<div class="modal"
|
||||
id="export-repositories-modal"
|
||||
class="export-repositories-modal"
|
||||
tabindex="-1"
|
||||
role="dialog"
|
||||
aria-labelledby="export-repositories-modal-label">
|
||||
<div class="modal-dialog" role="document">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" data-e2e="e2e-BT-exportMD-close" class="close" data-dismiss="modal" aria-label="Close"><i class="sn-icon sn-icon-close"></i></button>
|
||||
<h4 class="modal-title"><%= t('repositories.index.modal_export.title') %></h4>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<p class="description-p1">
|
||||
<%= t('repositories.index.modal_export.description_p1_html', team_name: team_name, count: counter) %>
|
||||
</p>
|
||||
<p class="bg-sn-super-light-blue p-3"><%= t('repositories.index.modal_export.description_alert') %></p>
|
||||
<p class="mt-3"><%= t('repositories.index.modal_export.description_p2') %></p>
|
||||
<p>
|
||||
<%= t('repositories.index.modal_export.description_p3_html',
|
||||
remaining_export_requests: num_of_requests_left,
|
||||
requests_limit: export_limit) %>
|
||||
</p>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button id="export-repositories-modal-cancel" data-e2e="e2e-BT-exportMD-cancel" type="button" class="btn btn-secondary" data-dismiss="modal"><%=t "general.cancel" %></button>
|
||||
<button id="export-repositories-modal-submit"
|
||||
type="button"
|
||||
class="btn btn-primary"
|
||||
data-export-url="<%= export_repositories_team_path(current_team) %>"
|
||||
data-e2e="e2e-BT-exportMD-export">
|
||||
<%=t "repositories.index.modal_export.export" %>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue