Merge branch 'master' of github.com:concerto/concerto

concerto · Jul 15, 2012 · 4eccbf0 · 4eccbf0
2 parents f88f8ad + d136184
commit 4eccbf0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/controllers/feeds_controller.rb b/app/controllers/feeds_controller.rb
@@ -14,7 +14,7 @@ def index
   end
 
   def moderate
-    @feeds_with_pending = Feed.all
+    @feeds_with_pending = Feed.where(:group_id => current_user.groups)
     @feeds_with_pending.reject!{|f| not f.pending_contents.count > 0}
     auth!(:action => :edit)