From 9e2bec53a6353268a14a13df05f5f0328e5dbc95 Mon Sep 17 00:00:00 2001
From: liyijie <liyijie825@gmail.com>
Date: Wed, 14 Apr 2021 15:41:32 +0800
Subject: [PATCH] import_headers fix with import_headers_result
---
lib/tallty_import_export/import.rb | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/tallty_import_export/import.rb b/lib/tallty_import_export/import.rb
index 708169d..19c8f9f 100644
--- a/lib/tallty_import_export/import.rb
+++ b/lib/tallty_import_export/import.rb
@@ -97,7 +97,11 @@ module TalltyImportExport
end
def import_headers_result
- klass.try(:headers) || klass.try(:import_headers) || klass.try(:model_headers) || (raise ArgumentError.new('missing import_headers_result'))
+ @headers || import_headers
+ end
+
+ def import_headers
+ @headers || klass.try(:import_headers) || klass.try(:model_headers) || (raise ArgumentError.new('missing import_headers'))
end
# 只保留 key, name, json, 合并到 import_header
--
libgit2 0.27.1