From 65415b8c359af196a97ebe58e3918fe0566ebf79 Mon Sep 17 00:00:00 2001
From: Andrew Brown <drusepth@gmail.com>
Date: Sun, 16 May 2021 01:44:39 -0700
Subject: [PATCH] use linkable pages instead of current_user pages in link
 fields

---
 app/controllers/application_controller.rb                 | 2 +-
 .../content/form/field_types/_migration_link.html.erb     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 6c78898c..f79c6517 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -110,7 +110,7 @@ class ApplicationController < ActionController::Base
       end
 
       @linkables_cache[class_name] = @linkables_cache[class_name]
-        .sort_by(&:name)
+        .sort_by { |p| p.name.downcase }
         .map { |c| [c.name, c.id] }
         .compact
     end
diff --git a/app/views/content/form/field_types/_migration_link.html.erb b/app/views/content/form/field_types/_migration_link.html.erb
index 63708cab..5e3004b8 100644
--- a/app/views/content/form/field_types/_migration_link.html.erb
+++ b/app/views/content/form/field_types/_migration_link.html.erb
@@ -29,12 +29,12 @@
               field[:value]
             )
           %>
-          <% @current_user_content.fetch(page_type.name, []).sort_by { |p| p.name.downcase }.each do |page| %>
-            <option value="<%= page_type %>-<%= page.id %>" 
+          <% @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.page_type}-#{page.id}") %>
+              <%= 'selected' if field[:value].include?("#{page_type}-#{id}") %>
             >
-              <%= page.name %>
+              <%= name %>
             </option>
           <% end %>
         </optgroup>