app/views/profiles/_my_account.html.erb app/views/profiles/edit.html.erb @@ -2,5 +2,5 @@ ================================================================================ * Created initial base_app project * Added restful_authentication with activation - * Added profiles, partially, the are not yet editable + * Added profiles * Created default layout \ No newline at end of file CHANGELOG @@ -1,26 +1,37 @@ class ProfilesController < ApplicationController - before_filter :find_user - - # TODO: (base_app) enable inline editing of the profile for the owner + before_filter :find_profile + before_filter :check_owner_access, :only => [:edit, :update] def show - @profile = @user.nil? ? nil : @user.profile + # render show.html.erb end def edit - redirect_to profile_url(params[:id]) if logged_in? && current_user != @user + # render edit.html.erb end - def update - redirect_to profile_url(params[:id]) if logged_in? && current_user != @user - # TODO: (base_app) Write profile update code + def update + unless @profile.nil? + @profile.update_attributes(params[:profile]) + flash[:notice] = "Your profile has been succesfully updated." + redirect_to profile_url(@profile.user) + else + render :edit + end end protected - def find_user - @user = User.find(params[:id]) - rescue - @user = nil + def find_profile + begin + @user = User.find(params[:id]) + rescue + @user = nil + end + @profile = @user.nil? ? nil : @user.profile end + + def check_owner_access + redirect_to profile_url(params[:id]) if logged_in? && current_user != @user + end end app/controllers/profiles_controller.rb @@ -9,27 +9,7 @@ Profile for <%= @user.login %> <% end -%> - <% if current_user == @user %> - <% content_for :sidebar do -%> - <h2>My account</h2> - - <ul> - <li><%= link_to "Update my profile", edit_profile_url(current_user) %></li> - </ul> - - <ul> - <% # TODO: (base_app) Implement 'change email' feature %> - <li><%= link_to "Change my email address", "#" %></li> - <% # TODO: (base_app) Implement 'change password' feature %> - <li><%= link_to "Change my password", "#" %></li> - </ul> - - <ul> - <% # TODO: (base_app) Implement 'delete my account' feature %> - <li><%= link_to "Delete my account", "#" %></li> - </ul> - <% end -%> - <% end %> + <%= render :partial => 'profiles/my_account' if current_user == @user %> <% @profile.public_attributes.each do |column| -%> <p> app/views/profiles/show.html.erb 34071fee1bfc5295f07caf31f366b95c321a412d Ariejan de Vroom ariejan@ariejan.net http://github.com/ariejan/baseapp/commit/aa9cb08caa1d3d80ccd9eee4e24bd3e01ca5342a aa9cb08caa1d3d80ccd9eee4e24bd3e01ca5342a 2008-02-24T14:30:30-08:00 2008-02-24T14:30:30-08:00 Added editing of profiles 16dd9cc543325167474e8590476bda42f2704e7d Ariejan de Vroom ariejan@ariejan.net