app/controllers/profiles_controller.rb in social_stream-base-0.20.0 vs app/controllers/profiles_controller.rb in social_stream-base-0.20.1

- old
+ new

@@ -1,9 +1,41 @@ -class ProfilesController < InheritedResources::Base - belongs_to_subjects(:singleton => true) +class ProfilesController < ApplicationController + before_filter :authenticate_user!, :except => [ :show ] - load_and_authorize_resource :profile, - :through => SocialStream.subjects, - :singleton => true - - respond_to :html, :xml, :js + respond_to :html, :js + + def show + subject_profile + end + + def edit + current_profile + end + + def update + current_profile.update_attributes params[:profile] + + respond_to do |format| + format.html{ redirect_to [profile_subject, :profile] } + format.js + end + end + + private + + def subject_profile + @profile ||= + profile_subject!.profile + end + + def current_profile + @profile ||= find_current_profile + end + + def find_current_profile + unless profile_subject!.represented_by?(current_subject) + raise CanCan::AccessDenied + end + + current_subject.profile + end end