From c1a5e89d57d406bec2e47fb7bf9a253b705f25c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B1=E5=8D=9A=E4=BA=9E?= Date: Tue, 30 Mar 2021 15:45:22 +0800 Subject: [PATCH] fix error --- app/controllers/admin/galleries_controller.rb | 4 ++-- app/helpers/admin/galleries_helper.rb | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/controllers/admin/galleries_controller.rb b/app/controllers/admin/galleries_controller.rb index 8ae2d8f..56f2021 100644 --- a/app/controllers/admin/galleries_controller.rb +++ b/app/controllers/admin/galleries_controller.rb @@ -381,8 +381,8 @@ class Admin::GalleriesController < OrbitAdminController if sheet.count <= 203 sheet.each_with_index do |row, i| next if i < 3 - v = row.cells.first.value - next if v == "" || v.nil? + v = row.cells.first.value rescue nil + next if v.blank? import_this_image(row, album) end redirect_to admin_gallery_path(album.id) diff --git a/app/helpers/admin/galleries_helper.rb b/app/helpers/admin/galleries_helper.rb index 14fc6fd..fcb17a7 100644 --- a/app/helpers/admin/galleries_helper.rb +++ b/app/helpers/admin/galleries_helper.rb @@ -3,15 +3,14 @@ module Admin::GalleriesHelper value = {} image = AlbumImage.new row.cells.each_with_index do |cell,index| - next if cell.nil? - val = cell.value - next if val.nil? || val == "" + val = cell.value rescue nil + next if val.blank? case index when 0 image.remote_file_url = val when 1 value["zh_tw"] = val - value["en"] = row.cells[index + 1].value rescue "" + value["en"] = (row.cells[index + 1].value rescue "") image.description_translations = value end end