diff --git a/app/models/curation_post_section.rb b/app/models/curation_post_section.rb index 1b655f3..5bd6017 100644 --- a/app/models/curation_post_section.rb +++ b/app/models/curation_post_section.rb @@ -17,7 +17,7 @@ class CurationPostSection def get_table_entries_for_frontend module_app = ModuleApp.find_by_key("universal_table") tids = self.table_entries.split(',') - table_entries = TableEntry.find(tids) + table_entries = TableEntry.find(tids) rescue [] table_entries.map do |entry| rows = [] entry.column_entries.each do |ce| @@ -33,6 +33,10 @@ class CurationPostSection "text" => text } if text != "" end + rows << { + "title" => I18n.t("universal_table.hashtags"), + "text" => entry.tags_for_frontend + } { "uid" => entry.uid, "type" => self.section_type, @@ -43,7 +47,7 @@ class CurationPostSection def get_table_entries tids = self.table_entries.split(',') - TableEntry.find(tids) + TableEntry.find(tids) rescue [] end def get_frontend_object diff --git a/app/views/admin/curations/_form_section_post.html.erb b/app/views/admin/curations/_form_section_post.html.erb index 310fc06..9a896bd 100755 --- a/app/views/admin/curations/_form_section_post.html.erb +++ b/app/views/admin/curations/_form_section_post.html.erb @@ -60,7 +60,7 @@ <%= t("curation.tables") %> <%= f.select :universal_table, UTable.all.map { |table| [table.title, table.uid] }, { include_blank: t("curation.please_select") }, - class: 'form-control' %> + class: 'form-control universal_table' %> <% if !form_section_post.new_record? && form_section_post.section_type == "universal_table" %> <% @@ -69,6 +69,7 @@ <%= t("curation.table_entries") %> <%= f.text_field :table_entries, :class => "select2", data: { value: tbData } %> + <%#= f.select :universal_table, [], {}, class: 'form-control select2', multiple: true, data: { value: tbData } %> <% else %>