Merge branch 'kb_development_2' into kb_development
This commit is contained in:
commit
43574f9a1e
2 changed files with 6 additions and 0 deletions
|
@ -107,6 +107,8 @@ const sharedCallbacks = {
|
|||
return channelName === streamChannelName && params.tag === streamIdentifier;
|
||||
} else if (channelName === 'list') {
|
||||
return channelName === streamChannelName && params.list === streamIdentifier;
|
||||
} else if (channelName === 'antenna') {
|
||||
return channelName === streamChannelName && params.antenna === streamIdentifier;
|
||||
}
|
||||
|
||||
return false;
|
||||
|
|
|
@ -16,4 +16,8 @@ class REST::ListSerializer < ActiveModel::Serializer
|
|||
end
|
||||
|
||||
has_many :antennas, serializer: AntennaSerializer
|
||||
|
||||
def antennas
|
||||
object.antennas.where(insert_feeds: true)
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue