diff options
| author | Zog | 2018-05-09 08:41:23 +0200 |
|---|---|---|
| committer | Zog | 2018-05-09 08:41:23 +0200 |
| commit | 9434284e4f12b4b576762dabbd2b0a308e28bc61 (patch) | |
| tree | 227e341a2dd8d33c992f52ceb7c6be99e687db93 /app/helpers | |
| parent | 430550b965035be3d78abad790e6c44fdc69087f (diff) | |
| download | chouette-core-9434284e4f12b4b576762dabbd2b0a308e28bc61.tar.bz2 | |
Refs #6960; Update imports to use nesw implementation
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/table_builder_helper.rb | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/app/helpers/table_builder_helper.rb b/app/helpers/table_builder_helper.rb index 8c73cb33c..0b24a9c05 100644 --- a/app/helpers/table_builder_helper.rb +++ b/app/helpers/table_builder_helper.rb @@ -153,7 +153,17 @@ module TableBuilderHelper i = columns.index(column) if overhead[i].blank? - if (i > 0) && overhead[i - 1][:width] && (overhead[i - 1][:width] > 1) + prev = nil + if i > 0 + (i-1..0).each do |j| + o = overhead[j] + if (j + o[:width].to_i) >= i + prev = o + break + end + end + end + if prev clsArrayH = overhead[i - 1][:cls].split hcont << content_tag(:th, build_column_header( @@ -234,7 +244,17 @@ module TableBuilderHelper i = columns.index(column) if overhead[i].blank? - if (i > 0) && overhead[i - 1][:width] && (overhead[i - 1][:width] > 1) + prev = nil + if i > 0 + (i-1..0).each do |j| + o = overhead[j] + if (j + o[:width].to_i) >= i + prev = o + break + end + end + end + if prev clsArrayAlt = overhead[i - 1][:cls].split bcont << content_tag(:td, link, title: 'Voir', class: td_cls(clsArrayAlt, extra_class)) |