use linkable images in dropdowns instead of current page's image

app/controllers/application_controller.rb

@@ -96,6 +96,7 @@ class ApplicationController < ActionController::Base
     linkable_classes += %w(Document Timeline)
 
     @linkables_cache = {}
+    @linkables_raw   = {}
     linkable_classes.each do |class_name|
       # class_name = "Character"
 
@@ -109,6 +110,10 @@ class ApplicationController < ActionController::Base
           .reject { |content| content.class.name == class_name && content.id == @content.id }
       end
 
+      @linkables_raw[class_name] = @linkables_cache[class_name]
+        .sort_by { |p| p.name.downcase }
+        .compact
+
       @linkables_cache[class_name] = @linkables_cache[class_name]
         .sort_by { |p| p.name.downcase }
         .map { |c| [c.name, c.id] }

app/models/users/user.rb

@@ -155,7 +155,7 @@ class User < ApplicationRecord
       universe_id IN (#{(my_universe_ids + contributable_universe_ids + [-1]).uniq.join(',')})
         OR
       (universe_id IS NULL AND user_id = #{self.id.to_i})
-    """).where(archived_at: nil)
+    """)
   end
 
   def linkable_timelines

app/views/content/form/field_types/_migration_link.html.erb

@@ -29,12 +29,12 @@
               field[:value]
             )
           %>
-          <% @linkables_cache.fetch(page_type.name, []).sort_by { |name, id| name.downcase }.each do |name, id| %>
-            <option value="<%= page_type %>-<%= id %>" 
-              data-icon="<%= asset_path page.random_image_including_private(format: :thumb) %>"
-              <%= 'selected' if field[:value].include?("#{page_type}-#{id}") %>
+          <% @linkables_raw.fetch(page_type.name, []).each do |linkable| %>
+            <option value="<%= page_type %>-<%= linkable.id %>"
+              data-icon="<%= asset_path linkable.random_image_including_private(format: :thumb) %>"
+              <%= 'selected' if field[:value].include?("#{page_type}-#{linkable.id}") %>
             >
-              <%= name %>
+              <%= linkable.name %>
             </option>
           <% end %>
         </optgroup>