show text results in correct order

Author: nadvornik

Diff for: lib/OpenQA/WebAPI/Controller/Test.pm

@@ -207,31 +207,21 @@ sub read_test_modules {
     for my $module (OpenQA::Schema::Result::JobModules::job_modules($job)) {
         my $name = $module->name();
         # add link to $testresultdir/$name*.png via png CGI
-        my @imglist;
-        my @wavlist;
-        my @textlist;
+        my @details;
+
         my $num = 1;
-        for my $img (@{$module->details}) {
-            $img->{num} = $num++;
-            if ($img->{screenshot}) {
-                push(@imglist, $img);
-            }
-            elsif ($img->{audio}) {
-                push(@wavlist, $img);
-            }
-            elsif ($img->{text}) {
-                push(@textlist, $img);
-            }
+
+        for my $step (@{$module->details}) {
+            $step->{num} = $num++;
+            push(@details, $step);
         }
 
         push(
             @modlist,
             {
                 name         => $module->name,
                 result       => $module->result,
-                screenshots  => \@imglist,
-                wavs         => \@wavlist,
-                texts        => \@textlist,
+                details      => \@details,
                 soft_failure => $module->soft_failure,
                 milestone    => $module->milestone,
                 important    => $module->important,

Diff for: templates/test/result.html.ep

@@ -144,21 +144,19 @@
                                         </td>
                                         <td class="links">
 
-                                            % for my $screenshot (@{$module->{screenshots}}) {
-                                                %= step_thumbnail($screenshot, 60, $testid, $module->{name}, $screenshot->{num})
-                                            % }
-
-                                            % for my $wav (@{$module->{wavs}}) {
-                                                %= link_to url_for('step', moduleid => $module->{name}, stepid => $wav->{num}) => title => $wav->{name} => begin
-                                                    <img src="/images/audio.png" width="28" height="26" alt="<%= $wav->{name} %>" class="<%= "resborder_\L$wav->{result}" %>"/>
-                                                % end
+                                            % for my $step (@{$module->{details}}) {
+                                                % if($step->{screenshot}) {
+                                                    %= step_thumbnail($step, 60, $testid, $module->{name}, $step->{num})
+                                                % } elsif ($step->{audio}) {
+                                                    %= link_to url_for('step', moduleid => $module->{name}, stepid => $step->{num}) => title => $step->{name} => begin
+                                                        <img src="/images/audio.png" width="28" height="26" alt="<%= $step->{name} %>" class="<%= "resborder_\L$step->{result}" %>"/>
+                                                    % end
+                                                % } elsif ($step->{text}) {
+                                                    %= link_to url_for('step', moduleid => $module->{name}, stepid => $step->{num}) => title => $step->{title} => begin
+                                                        <span class="<%= "resborder_\L$step->{result}" %>" ><%= $step->{title} || 'Text' %></span>
+                                                    % end
+                                                % }
                                             % }
-
-                                            <% for my $text (@{$module->{texts}}) { %>
-                                                %= link_to url_for('step', moduleid => $module->{name}, stepid => $text->{num}) => title => $text->{title} => begin
-                                                    <span class="<%= "resborder_\L$text->{result}" %>" ><%= $text->{title} || 'Text' %></span>
-                                                % end
-                                            <% } %>
                                         </td>
                                     </tr>
                                 <% } %>