diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index e8e973ad7..aa0e618ef 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -30,10 +30,8 @@ class GroupsController < ApplicationController end def show - @person_ids = @group.person_ids - @group = Group.first(:id => params[:id]) - + @friends = @group.people @posts = current_user.visible_posts( :by_members_of => @group ).paginate :order => 'created_at DESC' end diff --git a/app/views/shared/_group_nav.haml b/app/views/shared/_group_nav.haml index df2f04966..d0c90b125 100644 --- a/app/views/shared/_group_nav.haml +++ b/app/views/shared/_group_nav.haml @@ -14,9 +14,9 @@ %li.new_group= link_to("NEW GROUP", "#add_group_pane", :id => "add_group_button") - .yo{ :style => "display:none;"} - #add_group_pane - = render "groups/new_group" + .yo{ :style => "display:none;"} + #add_group_pane + = render "groups/new_group" - if @group #friend_pictures