Take out users/show, use current_user in update
This commit is contained in:
parent
be26794e4a
commit
5df33a6fd0
2 changed files with 1 additions and 8 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
Loading…
Reference in a new issue