diff --git a/app/controllers/admin/universal_tables_controller.rb b/app/controllers/admin/universal_tables_controller.rb index 86cfa92..f268946 100644 --- a/app/controllers/admin/universal_tables_controller.rb +++ b/app/controllers/admin/universal_tables_controller.rb @@ -132,7 +132,6 @@ end Thread.new do system("rake universal_table_tasks:prepare_download[#{table.id},#{url}] >> #{Rails.root}/log/rake.log &") end - render :json => {"success" => true, "title" => title}.to_json end diff --git a/app/models/table_entry.rb b/app/models/table_entry.rb index f478c80..314a3ba 100644 --- a/app/models/table_entry.rb +++ b/app/models/table_entry.rb @@ -40,6 +40,11 @@ class TableEntry TableEntry.find(tids) end + def get_related_entries_uid + tids = self.related_entries.split(',') + TableEntry.where(:id.in => tids).pluck(:uid).join(", ") + end + def get_have_data searchable_field_ids = TableColumn.filter_searchable.where(u_table_id: self.u_table_id).pluck(:id) searchable_column_entries = self.column_entries.where(:table_column_id.in=> searchable_field_ids).to_a diff --git a/app/views/utable_export/export.xlsx.axlsx b/app/views/utable_export/export.xlsx.axlsx index da73807..05d9fa1 100644 --- a/app/views/utable_export/export.xlsx.axlsx +++ b/app/views/utable_export/export.xlsx.axlsx @@ -52,6 +52,14 @@ wb.add_worksheet(name: "Structure") do |sheet| end end + row << t("universal_table.hashtags") + row1 << "table_tags" + row2 << "string, hashtags separated by commas (,)" + + row << t("universal_table.related_entries") + row1 << "related_entries" + row2 << "UID, uid separated by commas (,)" + sheet.add_row row, :style => heading sheet.add_row row1 sheet.add_row row2, :style => type @@ -110,7 +118,10 @@ 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.get_related_entries_uid sheet.add_row row, style: wrap end + end \ No newline at end of file