nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
danielvincent 2010-08-24 11:12:04 -07:00
commit 85c268b5eb
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/groups_controller.rb
View file

@ -30,10 +30,8 @@ class GroupsController < ApplicationController
end end
def show def show
@person_ids = @group.person_ids
@group = Group.first(:id => params[:id]) @group = Group.first(:id => params[:id])
@friends = @group.people
@posts = current_user.visible_posts( :by_members_of => @group ).paginate :order => 'created_at DESC' @posts = current_user.visible_posts( :by_members_of => @group ).paginate :order => 'created_at DESC'
end end

6
app/views/shared/_group_nav.haml
View file

@ -14,9 +14,9 @@
%li.new_group= link_to("NEW GROUP", "#add_group_pane", :id => "add_group_button") %li.new_group= link_to("NEW GROUP", "#add_group_pane", :id => "add_group_button")
.yo{ :style => "display:none;"} .yo{ :style => "display:none;"}
#add_group_pane #add_group_pane
= render "groups/new_group" = render "groups/new_group"
- if @group - if @group
#friend_pictures #friend_pictures