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

app/controllers/dev_utilities_controller.rb

@@ -37,8 +37,6 @@ def warzombie
 
   def zombiefriendaccept
     render :nothing => true
-    set_profile_photo
-
     Request.all.each{|r| 
       current_user.accept_and_respond(r.id, current_user.groups.first.id)
     }
@@ -58,13 +56,25 @@ def warzombie
   end
 
   def set_profile_photo
+
+    render :nothing => true
     album = current_user.post(:album, :name => "Profile Photos")
     
     backer_number = YAML.load_file(Rails.root.join('config','backer_number.yml'))[:seed_number].to_i
     username = backer_info[backer_number]['username'].gsub(/ /,'').downcase
-    photo = current_user.post(:photo, :album_id => album.id,
-                      :user_file => "public/images/users/#{username}.jpg") 
     
-    current_user.update_profile(:image_url => photo.url)
+      @fixture_name = File.dirname(__FILE__) + "/../../public/images/user/#{username}.jpg"
+  
+      photo = Photo.new(:person => current_user.person, :album => album)
+      photo.image.store! File.open(@fixture_name)
+      photo.save
+      photo.reload
+  
+      current_user.raw_visible_posts << photo
+      current_user.save
+  
+  
+     current_user.update_profile(:image_url => photo.url(:thumb_medium))
+     current_user.save
   end
 end

app/controllers/people_controller.rb

@@ -14,6 +14,7 @@ class PeopleController < ApplicationController
   def show
     @person = current_user.visible_person_by_id(params[:id])
     @profile = @person.profile
+    @person_groups = current_user.groups_with_person(@person)
 
     @posts = Post.where(:person_id => @person.id, :_id.in => current_user.visible_post_ids).paginate :page => params[:page], :order => 'created_at DESC'
 

app/models/user.rb

@@ -8,7 +8,7 @@ class User
          
   key :friend_ids, Array
   key :pending_request_ids, Array
-  key :visible_post_ids, Array
+  key :_post_ids, Array
 
   one :person, :class_name => 'Person', :foreign_key => :owner_id
 
@@ -219,7 +219,7 @@ class User
   end
 
   def groups_with_person person
-    id = ensure_bson person.id
+    id = ensure_bson person.object_id
     groups.select {|group| group.person_ids.include? id}
   end
 

app/views/groups/index.html.haml

@@ -6,7 +6,7 @@
 
 %ul#stream
   - for post in @posts
-    = render type_partial(post), :post => post
+    = render type_partial(post), :post => post unless post.class == Album
 #pagination
   = will_paginate @posts
 

app/views/people/show.html.haml

@@ -6,7 +6,6 @@
     %h1
       = @person.real_name
       - unless @person.id == current_user.person.id
-
         .right
           = link_to 'remove friend', @person, :confirm => 'Are you sure?', :method => :delete, :class => "button"
     
@@ -16,6 +15,8 @@
           %i= "last seen: #{how_long_ago(@posts.first)}"
       %li
         %i= "friends since: #{how_long_ago(@person)}"
+      %li
+        ="groups: #{@person_groups}"
       %li
         url:
         = @person.url
@@ -31,7 +32,7 @@
       %h3= "stream - #{@post_count} item(s)" 
       %ul#stream
         - for post in @posts
-          = render type_partial(post), :post => post
+          = render type_partial(post), :post => post unless post.class == Album
         = will_paginate @posts
     - else
       %h3 no posts to display!

app/views/photos/_photo.haml

@@ -8,7 +8,10 @@
       = link_to post.album.name, object_path(post.album)
 
     %br
-  = link_to (image_tag post.url(:thumb_large)), object_path(post)
+    
+  = render "albums/album", :post => post.album
+   
+  = link_to (image_tag post.url(:thumb_medium)), object_path(post)
     
   %div.time
     = link_to(how_long_ago(post), photo_path(post))

config/routes.rb

@@ -12,6 +12,7 @@ Diaspora::Application.routes.draw do
   match 'zombiefriends',      :to => "dev_utilities#zombiefriends"
   match 'zombiefriendaccept', :to => "dev_utilities#zombiefriendaccept"
   match 'set_backer_number', :to => "dev_utilities#set_backer_number"
+  match 'set_profile_photo', :to => "dev_utilities#set_profile_photo"
 
   #routes for devise, not really sure you will need to mess with this in the future, lets put default,
   #non mutable stuff in anohter file

db/seeds/backer.rb

@@ -20,7 +20,7 @@ def create
                      :person => Person.new(
                        :email => "#{username}@#{username}.joindiaspora.com",
                        :profile => Profile.new( :first_name => backer_info[backer_number]['given_name'], :last_name => backer_info[backer_number]['family_name'],
-                                               :image_url => "http://#{username}.joindiaspora.com/images/users/#{username}.jpg"),
+                                               :image_url => "http://#{username}.joindiaspora.com/images/user/#{username}.jpg"),
                        :url=> "http://#{username}.joindiaspora.com/")
                     )
   user.person.save

public/stylesheets/sass/application.sass

@@ -185,6 +185,7 @@ h1
       :weight 200
     :color #999
 
+
 h3
   :position relativex
   :font