fixes #1097
This commit is contained in:
@@ -15,10 +15,15 @@ class UsersController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def index
|
def index
|
||||||
@users = User.search(params[:search]).order("users.id desc").paginate(params[:page], :search_count => params[:search])
|
if params[:name].present?
|
||||||
respond_with(@users) do |format|
|
@user = User.find_by_name(params[:name])
|
||||||
format.xml do
|
redirect_to user_path(@user)
|
||||||
render :xml => @users.to_xml(:root => "users")
|
else
|
||||||
|
@users = User.search(params[:search]).order("users.id desc").paginate(params[:page], :search_count => params[:search])
|
||||||
|
respond_with(@users) do |format|
|
||||||
|
format.xml do
|
||||||
|
render :xml => @users.to_xml(:root => "users")
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user