glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

use Topic.relatives scope to get all relatives

Browse source
This commit is contained in:
Devin Howard 2016-09-05 11:52:35 +08:00
parent 7de89cfa0f
commit e761e1693c
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/topics_controller.rb
View file

@ -24,10 +24,8 @@ class TopicsController < ApplicationController
respond_to do |format| respond_to do |format|
format.html do format.html do
@alltopics = [@topic].concat(policy_scope(Topic.relatives1(@topic.id, current_user)).to_a).concat(policy_scope(Topic.relatives2(@topic.id, current_user)).to_a) @alltopics = [@topic].concat(policy_scope(Topic.relatives(@topic.id, current_user)).to_a)
@allsynapses = policy_scope(Synapse.for_topic(@topic.id)).to_a @allsynapses = policy_scope(Synapse.for_topic(@topic.id)).to_a
puts @alltopics.length
puts @allsynapses.length
@allcreators = @alltopics.map(&:user).uniq @allcreators = @alltopics.map(&:user).uniq
@allcreators += @allsynapses.map(&:user).uniq @allcreators += @allsynapses.map(&:user).uniq

6
app/models/topic.rb
View file

@ -42,6 +42,12 @@ class Topic < ActiveRecord::Base
topics1 + topics2 topics1 + topics2
end end
scope :relatives, ->(topic_id = nil, user = nil) {
synapses = Pundit.policy_scope(user, Synapse.where(node1_id: topic_id)).pluck(:node2_id)
synapses += Pundit.policy_scope(user, Synapse.where(node2_id: topic_id)).pluck(:node1_id)
where(id: synapses.uniq)
}
scope :relatives1, ->(topic_id = nil, user = nil) { scope :relatives1, ->(topic_id = nil, user = nil) {
visible = %w(public commons) visible = %w(public commons)
permission = 'synapses.permission IN (?)' permission = 'synapses.permission IN (?)'