Merge pull request #394 from ivplus/sort

Sort uploads and deltas by the date created
pod4lib · Nov 2, 2021 · 7628439 · 7628439
2 parents 953be9b + 52ee03f
commit 7628439
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/app/views/streams/_normalized_dump.html.erb b/app/views/streams/_normalized_dump.html.erb
@@ -19,7 +19,7 @@
         <%= render partial: 'streams/dump_attachment', locals: { type: 'Full', attachment: normalized_dump.marc21.attachment, stream: normalized_dump.stream } %>
         <%= render partial: 'streams/dump_attachment', locals: { type: 'Full', attachment: normalized_dump.marcxml.attachment, stream: normalized_dump.stream } %>
 
-        <% normalized_dump.deltas.each do |delta| %>
+        <% normalized_dump.deltas.sort_by(&:created_at).each do |delta| %>
           <%= render partial: 'streams/dump_attachment', locals: { type: 'Delta', attachment: delta.marc21.attachment, stream: normalized_dump.stream } %>
           <%= render partial: 'streams/dump_attachment', locals: { type: 'Delta', attachment: delta.marcxml.attachment, stream: normalized_dump.stream } %>
           <%= render partial: 'streams/dump_attachment', locals: { type: 'Deletes', attachment: delta.deletes.attachment, stream: normalized_dump.stream } %>

diff --git a/app/views/streams/_stream_uploads.html.erb b/app/views/streams/_stream_uploads.html.erb
@@ -12,7 +12,7 @@
         <% end %>
       </td>
     </tr>
-    <% stream.uploads.active.each do |upload| %>
+    <% stream.uploads.active.sort_by(&:created_at).each do |upload| %>
       <%= render 'uploads/file_rows', upload: upload %>
     <% end %>
   </tbody>

diff --git a/app/views/streams/normalized_dump.xml.builder b/app/views/streams/normalized_dump.xml.builder
@@ -36,7 +36,7 @@ xml.urlset(
 
     # deltas
 
-    @normalized_dump.deltas.each do |delta|
+    @normalized_dump.deltas.sort_by(&:created_at).each do |delta|
       file = if params[:flavor] == 'marc21'
                delta.marc21.attachment
              else

diff --git a/app/views/streams/show.xml.builder b/app/views/streams/show.xml.builder
@@ -13,7 +13,7 @@ xml.urlset(
     xml.loc(removed_since_previous_stream_organization_stream_url(@organization, @stream))
   end
 
-  @stream.files.each do |file|
+  @stream.files.sort_by(&:created_at).each do |file|
     xml.url do
       xml.tag!(
         'rs:md',