From 62c2a8144f31772c37b91d123cea567b74fccb96 Mon Sep 17 00:00:00 2001 From: rulingcom Date: Thu, 19 Jun 2025 20:12:54 +0800 Subject: [PATCH] some updates --- app/controllers/admin/universal_tables_controller.rb | 6 +++++- .../admin/universal_tables/export_structure.xlsx.axlsx | 8 ++++++++ app/views/utable_export/export.xlsx.axlsx | 6 +++--- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin/universal_tables_controller.rb b/app/controllers/admin/universal_tables_controller.rb index f268946..8f3e42e 100644 --- a/app/controllers/admin/universal_tables_controller.rb +++ b/app/controllers/admin/universal_tables_controller.rb @@ -194,6 +194,10 @@ 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 @@ -363,7 +367,7 @@ end if is_uuid?(tag) === false tt = TableTag.new tt.u_table_id = entry.u_table.id - tt.title = tag.downcase + tt.title = tag.downcase.strip tt.save entry.table_tags << tt else diff --git a/app/views/admin/universal_tables/export_structure.xlsx.axlsx b/app/views/admin/universal_tables/export_structure.xlsx.axlsx index 55fa3e3..4ad9559 100644 --- a/app/views/admin/universal_tables/export_structure.xlsx.axlsx +++ b/app/views/admin/universal_tables/export_structure.xlsx.axlsx @@ -50,6 +50,14 @@ wb.add_worksheet(name: "Structure") do |sheet| end end + row << t("universal_table.hashtags") + row1 << "table_tags" + row2 << "table_tags" + + row << t("universal_table.related_entries") + row1 << "related_entries" + row2 << "related_entries" + sheet.add_row row, :style => heading sheet.add_row row1 sheet.add_row row2, :style => type diff --git a/app/views/utable_export/export.xlsx.axlsx b/app/views/utable_export/export.xlsx.axlsx index 05d9fa1..2d17a46 100644 --- a/app/views/utable_export/export.xlsx.axlsx +++ b/app/views/utable_export/export.xlsx.axlsx @@ -54,11 +54,11 @@ wb.add_worksheet(name: "Structure") do |sheet| row << t("universal_table.hashtags") row1 << "table_tags" - row2 << "string, hashtags separated by commas (,)" + row2 << "table_tags" row << t("universal_table.related_entries") row1 << "related_entries" - row2 << "UID, uid separated by commas (,)" + row2 << "related_entries" sheet.add_row row, :style => heading sheet.add_row row1 @@ -118,7 +118,7 @@ wb.add_worksheet(name: "Structure") do |sheet| row << file_links.join("\r\n") end end - row << entry.table_tags.pluck("title").map { |t| "##{t}" }.join(", ") + row << entry.table_tags.pluck("title").map { |t| "#{t}" }.join(", ") row << entry.get_related_entries_uid sheet.add_row row, style: wrap end