mirror of
https://github.com/diaspora/diaspora.git
synced 2026-04-29 03:01:03 -04:00
photos on the profile edit page now are only your photos, for now. also, no more remove friend button on your profile page
This commit is contained in:
@@ -16,8 +16,9 @@ class UsersController < ApplicationController
|
||||
|
||||
def edit
|
||||
@user = User.first(:id => params[:id])
|
||||
@person = @user.person
|
||||
@profile = @user.profile
|
||||
@photos = Photo.paginate :page => params[:page], :order => 'created_at DESC'
|
||||
@photos = Photo.where(:person_id => @person.id).paginate :page => params[:page], :order => 'created_at DESC'
|
||||
end
|
||||
|
||||
def update
|
||||
@@ -30,7 +31,4 @@ class UsersController < ApplicationController
|
||||
render :action => 'edit'
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
@@ -5,7 +5,8 @@
|
||||
|
||||
%h1
|
||||
= @person.real_name
|
||||
- unless @person.id == current_user.id
|
||||
- unless @person.id == current_user.person.id
|
||||
|
||||
.right
|
||||
= link_to 'remove friend', @person, :confirm => 'Are you sure?', :method => :delete, :class => "button"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user