From 090c412690e7b8b193dec49b5c41cfe6e6fc67c1 Mon Sep 17 00:00:00 2001
From: danielvincent <danielgrippi@gmail.com>
Date: Fri, 25 Feb 2011 15:19:48 -0800
Subject: [PATCH] touched up AspectMembership resource
---
app/controllers/aspect_memberships_controller.rb | 15 ++-------------
config/routes.rb | 4 ++--
2 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/app/controllers/aspect_memberships_controller.rb b/app/controllers/aspect_memberships_controller.rb
index c7be3a84f7..9d5c26a1c3 100644
--- a/app/controllers/aspect_memberships_controller.rb
+++ b/app/controllers/aspect_memberships_controller.rb
@@ -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'
diff --git a/config/routes.rb b/config/routes.rb
index 88e17c18ec..508e9a5a62 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -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
--
GitLab