scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-04 14:44:26 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1351 from jbargu/jg_add_zero_limit_to_export

Browse source 
Fix zero limit config on export all
This commit is contained in:
Jure Grabnar 2018-10-28 13:38:21 +01:00 committed by GitHub
commit 0977f5251d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/teams_controller.rb
View file

@ -229,8 +229,8 @@ class TeamsController < ApplicationController
if export_projects_params[:project_ids] if export_projects_params[:project_ids]
# Check if user has enough requests for the day # Check if user has enough requests for the day
limit = (ENV['EXPORT_ALL_LIMIT_24_HOURS'] || 3).to_i limit = (ENV['EXPORT_ALL_LIMIT_24_HOURS'] || 3).to_i
if limit.zero? \ if !limit.zero? \
|| current_user.export_vars['num_of_export_all_last_24_hours'] >= limit && current_user.export_vars['num_of_export_all_last_24_hours'] >= limit
render json: { render json: {
html: render_to_string( html: render_to_string(
partial: 'projects/export/error.html.erb', partial: 'projects/export/error.html.erb',