touched up AspectMembership resource
This commit is contained in:
parent
c5801ffb37
commit
090c412690
2 changed files with 4 additions and 15 deletions
|
|
@ -3,20 +3,10 @@
|
|||
# the COPYRIGHT file.
|
||||
#
|
||||
|
||||
class AspectMembershipsController < ApplicationController
|
||||
class AspectMembershipsController < ApplicationController
|
||||
before_filter :authenticate_user!
|
||||
|
||||
def new
|
||||
render :nothing => true
|
||||
end
|
||||
|
||||
def index
|
||||
raise
|
||||
end
|
||||
|
||||
|
||||
|
||||
def destroy
|
||||
def destroy
|
||||
#note :id is garbage
|
||||
|
||||
@person_id = params[:person_id]
|
||||
|
|
@ -58,7 +48,6 @@ class AspectMembershipsController < ApplicationController
|
|||
@aspect = current_user.aspects.where(:id => params[:aspect_id]).first
|
||||
@contact = current_user.contact_for(@person)
|
||||
|
||||
|
||||
current_user.add_contact_to_aspect(@contact, @aspect)
|
||||
|
||||
flash.now[:notice] = I18n.t 'aspects.add_to_aspect.success'
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ Diaspora::Application.routes.draw do
|
|||
resources :posts, :only => [:show], :path => '/p/'
|
||||
|
||||
resources :contacts
|
||||
resources :aspect_memberships
|
||||
resources :aspect_memberships, :only => [:destroy, :create]
|
||||
|
||||
resources :people, :except => [:edit, :update] do
|
||||
resources :status_messages
|
||||
|
|
@ -41,7 +41,7 @@ Diaspora::Application.routes.draw do
|
|||
devise_for :users, :controllers => {:registrations => "registrations",
|
||||
:password => "devise/passwords",
|
||||
:invitations => "invitations"} do
|
||||
|
||||
|
||||
get 'invitations/resend/:id' => 'invitations#resend', :as => 'invitation_resend'
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue