chiu
/
universal_table
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small sorting fix for import

This commit is contained in:
Harry Bomrah 2015-12-18 15:33:43 +08:00
parent 99006e2507
commit 2fedf64387
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/admin/universal_tables_controller.rb
View File

@ -64,14 +64,14 @@ class Admin::UniversalTablesController < OrbitAdminController
case tc.type case tc.type
when "text" when "text"
v = {} v = {}
@site_in_use_locales.each_with_index do |locale,x| @site_in_use_locales.sort.each_with_index do |locale,x|
v[locale.to_s] = row.cells[index + x].value rescue nil v[locale.to_s] = row.cells[index + x].value rescue nil
skip = skip + 1 skip = skip + 1
end end
ce.text_translations = v ce.text_translations = v
when "editor" when "editor"
v = {} v = {}
@site_in_use_locales.each_with_index do |locale,x| @site_in_use_locales.sort.each_with_index do |locale,x|
v[locale.to_s] = row.cells[index + x].value rescue nil v[locale.to_s] = row.cells[index + x].value rescue nil
skip = skip + 1 skip = skip + 1
end end

4
app/views/admin/universal_tables/export_structure.xlsx.axlsx
View File

@ -13,13 +13,13 @@ wb.add_worksheet(name: "Structure") do |sheet|
@table.table_columns.asc(:order).each do |column| @table.table_columns.asc(:order).each do |column|
case column.type case column.type
when "text" when "text"
@site_in_use_locales.each do |locale| @site_in_use_locales.sort.each do |locale|
row << column.title + " - " + t(locale.to_s) row << column.title + " - " + t(locale.to_s)
row1 << column.key row1 << column.key
row2 << column.type + "-#{locale}" row2 << column.type + "-#{locale}"
end end
when "editor" when "editor"
@site_in_use_locales.each do |locale| @site_in_use_locales.sort.each do |locale|
row << column.title + " - " + t(locale.to_s) row << column.title + " - " + t(locale.to_s)
row1 << column.key row1 << column.key
row2 << column.type + "-#{locale}" row2 << column.type + "-#{locale}"