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

Merge pull request #1035 from indentlabs/fix-content-classifying

Browse Source 
Fix content scoping regressions
This commit is contained in:
Andrew Brown 2021-10-03 01:51:02 -07:00 committed by GitHub
commit b1b41e6db0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/application_controller.rb
View File

@ -180,15 +180,24 @@ class ApplicationController < ActionController::Base
# so all we need to grab is additional pages in contributable universes
@linkables_raw[page_type] = @current_user_content[page_type]
if !@universe_scope && @contributable_universe_ids.any?
# Add contributor content
if @contributable_universe_ids.any?
existing_page_ids = @linkables_raw[page_type].map(&:id)
pages_to_add = if page_type == Universe.name
page_type.constantize.where(id: @contributable_universe_ids)
.where.not(id: existing_page_ids)
.where.not(user_id: current_user.id)
else
page_type.constantize.where(universe_id: @contributable_universe_ids)
.where.not(id: existing_page_ids)
.where.not(user_id: current_user.id)
end
# If we're scoped to a universe, also scope contributor content pulled to that
# universe. If we're not, leave it as all contributor content.
if @universe_scope && pages_to_add.klass.respond_to?(:universe)
pages_to_add = pages_to_add.where(universe: @universe_scope)
end
filtered_fields = ContentPage.polymorphic_content_fields.map(&:to_s)