From 718b62be7fee08a3d82da3ab348d3466440b6d1e Mon Sep 17 00:00:00 2001
From: rulingcom <orbit@rulingcom.com>
Date: Thu, 19 Jun 2025 21:49:27 +0800
Subject: [PATCH] added import

---
 .../admin/universal_tables_controller.rb      | 19 ++++++++++++-------
 .../universal_tables/_entry_form.html.erb     |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/controllers/admin/universal_tables_controller.rb b/app/controllers/admin/universal_tables_controller.rb
index 8f3e42e..1c15cb0 100644
--- a/app/controllers/admin/universal_tables_controller.rb
+++ b/app/controllers/admin/universal_tables_controller.rb
@@ -194,18 +194,21 @@ end
 			        				val = val.to_s + "/01/01"
 			        			end
 			        			ce.period_to = val
-									when "hashtags"
-										create_get_table_tags(te)
-									when "related_entries"
-										debugger
 			        		end
 			        		ce.table_column_id = tc.id
 			        		ce.save
 			      			te.column_entries << ce
+								else
+									if index == (columns.count - 2)
+										create_get_table_tags(te, val.split("\;"))
+									end
+									if index == (columns.count - 1)
+										te.related_entries = TableEntry.where(:uid.in => val.to_s.split("\;")).pluck(:id).join(",")
+									end
 			        	end
 			        end
 			      	te.save
-					te.fix_have_data
+						te.fix_have_data
 			    end
 			    response["success"] = true
 			    response["count"] = table.table_entries.count
@@ -359,8 +362,10 @@ end
 		params.require(:table_entry).permit!
 	end
 
-	def create_get_table_tags(entry)
-    new_tags = params["table_tags"].split(",")
+	def create_get_table_tags(entry,new_tags=nil)
+		if new_tags.nil?
+    	new_tags = params["table_tags"].split(",")
+		end
     tags = []
     entry.table_tags = []
     new_tags.each do |tag|
diff --git a/app/views/admin/universal_tables/_entry_form.html.erb b/app/views/admin/universal_tables/_entry_form.html.erb
index dd0fcc2..7e06baa 100644
--- a/app/views/admin/universal_tables/_entry_form.html.erb
+++ b/app/views/admin/universal_tables/_entry_form.html.erb
@@ -63,7 +63,7 @@
 $("#universal_table_tags").select2({
     tags: true,
     multiple: true,
-    data : <%= raw(TableTag.all.map { |tag| { text: tag.title.html_safe, id: tag.id.to_s } }.to_json) %>,
+    data : <%= raw(TableTag.where(:u_table_id => @table.id).map { |tag| { text: tag.title.html_safe, id: tag.id.to_s } }.to_json) %>,
     createSearchChoice: function(term, data) {
       if (!data.length)
         return { id: term, text: "#" + term.trim().toLowerCase() };