Fixed syntax error.
This commit is contained in:
parent
480abed922
commit
84e98e4b2c
1 changed files with 8 additions and 8 deletions
|
@ -6,14 +6,14 @@ class UsersController < ApplicationController
|
||||||
@users = User.all
|
@users = User.all
|
||||||
@users_all = []
|
@users_all = []
|
||||||
@users.each {|user|
|
@users.each {|user|
|
||||||
@users_all.push user_data_full( user.id )
|
@users_all.push User.user_data_full( user.id )
|
||||||
}
|
}
|
||||||
render :json => @users_all
|
render :json => @users_all
|
||||||
end
|
end
|
||||||
|
|
||||||
# GET /users/1
|
# GET /users/1
|
||||||
def show
|
def show
|
||||||
@user = user_data_full( params[:id] )
|
@user = User.user_data_full( params[:id] )
|
||||||
render :json => @user
|
render :json => @user
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -84,7 +84,7 @@ class UsersController < ApplicationController
|
||||||
@user.organization_ids = params[:organization_ids]
|
@user.organization_ids = params[:organization_ids]
|
||||||
end
|
end
|
||||||
|
|
||||||
@user = user_data_full( params[:id] )
|
@user = User.user_data_full( params[:id] )
|
||||||
render :json => @user, :status => :ok
|
render :json => @user, :status => :ok
|
||||||
else
|
else
|
||||||
render :json => @user.errors, :status => :unprocessable_entity
|
render :json => @user.errors, :status => :unprocessable_entity
|
||||||
|
|
Loading…
Reference in a new issue