From 9434284e4f12b4b576762dabbd2b0a308e28bc61 Mon Sep 17 00:00:00 2001
From: Zog
Date: Wed, 9 May 2018 08:41:23 +0200
Subject: Refs #6960; Update imports to use nesw implementation

---
 app/helpers/table_builder_helper.rb | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'app/helpers')

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))
-- 
cgit v1.2.3