added import
This commit is contained in:
parent
62c2a8144f
commit
718b62be7f
|
@ -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|
|
||||
|
|
|
@ -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() };
|
||||
|
|
Loading…
Reference in New Issue