app/controllers/notes_controller.rb in artfully_ose-1.1.0 vs app/controllers/notes_controller.rb in artfully_ose-1.2.0.alpha.1

- old
+ new

@@ -16,24 +16,23 @@ end def destroy if Note.exists? params[:id] Note.destroy(params[:id]) + flash[:notice] = "Your note has been deleted." else flash[:notice] = "We couldn't find that note to delete." end redirect_to person_url(@person) end def edit @note = Note.find(params[:id]) - @person = Person.find(params[:person_id]) render :layout => false end def update - @person = Person.find params[:person_id] @note = Note.find params[:id] if @note.update_attributes(params[:note]) flash[:notice] = "Note updated successfully!" redirect_to person_url(@person) @@ -44,10 +43,11 @@ end private def find_person - @person = Person.find(params[:person_id]) + id = params[:person_id] || params[:individual_id] || params[:company_id] + @person = Person.find(id) authorize! :edit, @person end end