From 5df33a6fd0dd8b87b1e8527b3c9b112fba7b734a Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Fri, 17 Sep 2010 10:50:18 -0700
Subject: [PATCH] Take out users/show, use current_user in update
---
app/controllers/users_controller.rb | 7 -------
config/routes.rb | 2 +-
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index dc25b47bee..72666bc307 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -7,13 +7,6 @@ class UsersController < ApplicationController
before_filter :authenticate_user!, :except => [:new, :create]
respond_to :html
- respond_to :json, :only => :show
-
- def show
- @user = User.find_by_id params[:id]
- @user_profile = @user.person.profile
- respond_with @user
- end
def edit
@user = current_user
diff --git a/config/routes.rb b/config/routes.rb
index 12dd20ba78..188c4b137a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -6,7 +6,7 @@
Diaspora::Application.routes.draw do
resources :people, :only => [:index, :show, :destroy]
- resources :users, :except => [:create, :new]
+ resources :users, :except => [:create, :new, :show]
resources :status_messages, :only => [:create, :destroy, :show]
resources :comments, :except => [:index]
resources :requests, :except => [:edit, :update]
--
GitLab