From 0b1c690ecf71722c1016c89ff4b22c1d22ab73db Mon Sep 17 00:00:00 2001
From: rulingcom <orbit@rulingcom.com>
Date: Tue, 5 Aug 2025 18:15:07 +0800
Subject: [PATCH] fix for import

---
 app/controllers/admin/universal_tables_controller.rb | 4 +---
 app/views/admin/universal_tables/_column.html.erb    | 8 ++++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admin/universal_tables_controller.rb b/app/controllers/admin/universal_tables_controller.rb
index 9521643..ce30572 100755
--- a/app/controllers/admin/universal_tables_controller.rb
+++ b/app/controllers/admin/universal_tables_controller.rb
@@ -145,7 +145,6 @@ end
 	end
 
 	def import_data_from_excel
-		site_in_use_locales = @site_in_use_locales.sort
 		workbook = RubyXL::Parser.parse(params["import_data"].tempfile)
 		response = {}
 		current_locale = I18n.locale
@@ -162,8 +161,7 @@ end
 		uploaded_io = params[:import_data]
 		safe_filename = uploaded_io.original_filename.gsub(/[^0-9A-Za-z.\-_]/, '_')
 		table_id = params[:universal_table_id]
-		site_locales = @site_in_use_locales.join(":") # e.g., "en,zh"
-
+		site_locales = Site.first.in_use_locales.join(":") # e.g., "en,zh"
 		unless uploaded_io
 			render json: { success: false, msg: "No file uploaded." } and return
 		end
diff --git a/app/views/admin/universal_tables/_column.html.erb b/app/views/admin/universal_tables/_column.html.erb
index 2de8b95..b7fa299 100755
--- a/app/views/admin/universal_tables/_column.html.erb
+++ b/app/views/admin/universal_tables/_column.html.erb
@@ -81,6 +81,7 @@
           <%= f.check_box :is_searchable %> Searchable
         </label>
       </span>
+      <% if defined?(i) %>
       <% if column.type == "file" || column.type == "editor" %>
         <span class="link_to_show2">
           <label class="checkbox inline attributes-checkbox ">
@@ -88,6 +89,13 @@
           </label>
         </span>
       <% end %>
+      <% else %>
+        <span class="link_to_show2 hide">
+          <label class="checkbox inline attributes-checkbox ">
+            <%= f.check_box :is_searchable %> Searchable
+          </label>
+        </span>
+      <% end %>
       <% select_values = UTable::DATE_FORMATS.collect{|ft| [ft.upcase,ft]} %>
        <label class="checkbox date_format inline attributes-checkbox <%= column.type == "date" || column.type == "period"  ? "" : "hide" %>">
         Date Format <%= f.select :date_format, select_values%>