scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-09 21:36:44 +08:00
Code Issues Projects Releases Packages Wiki Activity

Change any? to empty? [SCI-1665]

Browse source
This commit is contained in:
Oleksii Kriuchykhin 2017-10-17 15:23:54 +02:00
parent c8d2ae70fa
commit cd0aba1896
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/repositories_controller.rb
View file

@ -201,7 +201,7 @@ class RepositoriesController < ApplicationController
else else
@import_data = parsed_file.data @import_data = parsed_file.data
unless @import_data.header.any? && @import_data.columns.any? if @import_data.header.empty? || @import_data.columns.empty?
return repository_response(t('teams.parse_sheet.errors.empty_file')) return repository_response(t('teams.parse_sheet.errors.empty_file'))
end end

2
app/controllers/teams_controller.rb
View file

@ -20,7 +20,7 @@ class TeamsController < ApplicationController
sheet = SpreadsheetParser.open_spreadsheet(params[:file]) sheet = SpreadsheetParser.open_spreadsheet(params[:file])
@header, @columns = SpreadsheetParser.first_two_rows(sheet) @header, @columns = SpreadsheetParser.first_two_rows(sheet)
unless @header.any? && @columns.any? if @header.empty? || @columns.empty?
return parse_sheet_error(t('teams.parse_sheet.errors.empty_file')) return parse_sheet_error(t('teams.parse_sheet.errors.empty_file'))
end end