mirrors/notebook
3
0
Fork 0
mirror of https://github.com/indentlabs/notebook.git synced 2025-10-26 11:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

use linkable pages instead of current_user pages in link fields

Browse Source
This commit is contained in:
Andrew Brown 2021-05-16 01:44:39 -07:00
parent 2bfcb3d2b1
commit 65415b8c35
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

@ -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

8
app/views/content/form/field_types/_migration_link.html.erb
View File

@ -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>