648a10e6d3
Conflicts: app/controllers/requests_controller.rb app/controllers/tags_controller.rb app/helpers/aspects_helper.rb app/views/notifications/index.html.haml config/routes.rb public/javascripts/aspect-edit.js public/javascripts/contact-list.js spec/integration/receiving_spec.rb spec/models/user/connecting_spec.rb spec/models/user/posting_spec.rb
40 lines
1.1 KiB
Ruby
40 lines
1.1 KiB
Ruby
# Copyright (c) 2010, Diaspora Inc. This file is
|
|
# licensed under the Affero General Public License version 3 or later. See
|
|
# the COPYRIGHT file.
|
|
|
|
class ContactsController < ApplicationController
|
|
helper :aspects
|
|
before_filter :authenticate_user!
|
|
|
|
def new
|
|
@person = Person.find(params[:person_id])
|
|
@aspects_with_person = []
|
|
@aspects_without_person = current_user.aspects
|
|
@contact = Contact.new
|
|
render :layout => false
|
|
end
|
|
|
|
def edit
|
|
@contact = current_user.contacts.unscoped.find(params[:id])
|
|
@person = @contact.person
|
|
|
|
@all_aspects ||= current_user.aspects
|
|
@aspects_with_person = @contact.aspects || []
|
|
|
|
@aspects_without_person = @all_aspects - @aspects_with_person
|
|
|
|
render :layout => false
|
|
end
|
|
|
|
def destroy
|
|
contact = current_user.contacts.find(params[:id])
|
|
|
|
if current_user.disconnect(contact)
|
|
flash[:notice] = I18n.t('contacts.destroy.success', :name => contact.person.name)
|
|
else
|
|
flash[:error] = I18n.t('contacts.destroy.failure', :name => contact.person.name)
|
|
end
|
|
redirect_to contact.person
|
|
end
|
|
|
|
end
|