Commit ba12f69c authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Fix when checking generated table rows

parent ce3607db

gitlabFilter/grid_table_filter.rb

+41 −34
Original line number Diff line number Diff line
@@ -491,12 +491,19 @@ module Banzai 
              sum += cell.colspan



              if row_index > 0 && cell.colspan == 0

                sum += 1 if forward_rowspan[cell_index] > 0



                if forward_rowspan[cell_index] > 0

                  sum += 1 

                forward_rowspan[cell_index] -= 1

              end



              forward_rowspan[cell_index] = cell.rowspan - 1 if forward_rowspan[cell_index] == 0 && cell.rowspan > 1

            end

              if forward_rowspan[cell_index] == 0 && cell.rowspan > 1

                forward_rowspan[cell_index] = cell.rowspan - 1

                colspan = 1

                while cell.colspan > colspan

                  forward_rowspan[cell_index + colspan] = cell.rowspan - 1

					        colspan += 1

                end

              end 

            end



            raise "Grid table not converted properly" unless sum == number_of_columns
@@ -513,7 +520,7 @@ module Banzai 
          logger = Logger.new($stdout)

          logger.error("Grid table could not be generated: #{e.message}")



          "HTML TABLE COULD NOT BE GENERATED FROM MARKDOWN GRID TABLE. CHECK LOGS"

          "\n\nHTML TABLE COULD NOT BE GENERATED FROM MARKDOWN GRID TABLE. CHECK LOG FILE\n\n#{e.message}\n\nCommit ID: ce3607dbcafafe03531c1c50b3f749cc2318656c\n\n"

        else

          html = "<table>\n"

          has_header = false