restrict to fields on screen

mfrederickson · Feb 7, 2020 · a1b15bc · a1b15bc
1 parent 385c589
commit a1b15bc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -40,3 +40,6 @@ bower.json
 
 # Ignore Byebug command history file.
 .byebug_history
+
+*.gem
+
diff --git a/app/views/concerto_screencontent/screens/_content.html.erb b/app/views/concerto_screencontent/screens/_content.html.erb
@@ -1,6 +1,6 @@
 <!-- Begin Contents -->
 <%
-@contents = @screen.subscriptions.map { |s| s.contents }.flatten.collect! {|c| c.parent || c}.uniq
+@contents = @screen.subscriptions.where(field_id: @screen.fields.map(&:id)).map { |s| s.contents }.flatten.collect! {|c| c.parent || c}.uniq
 @contents = Kaminari.paginate_array(@contents).page(params[:page])
 
 unless @contents.empty?

diff --git a/concerto_screencontent-0.1.1.gem b/concerto_screencontent-0.1.1.gem
diff --git a/lib/concerto_screencontent/version.rb b/lib/concerto_screencontent/version.rb
@@ -1,3 +1,3 @@
 module ConcertoScreencontent
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end
Original file line number	Diff line number	Diff line change
Expand Up		@@ -40,3 +40,6 @@ bower.json

		# Ignore Byebug command history file.
		.byebug_history

		*.gem