Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-27 04:18:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

start fixing deprecation warnings

Browse source
This commit is contained in:
Reinier Balt 2013-05-11 23:13:32 +02:00
parent 0bc9b0397a
commit ebff4cfc0c
9 changed files with 74 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/users_controller.rb
View file

@ -11,14 +11,14 @@ class UsersController < ApplicationController
respond_to do |format|
format.html do
@page_title = "TRACKS::Manage Users"
@users = User.paginate :page => params[:page], :order => 'login ASC'
@users = User.order('login ASC').paginate :page => params[:page]
@total_users = User.count
# When we call users/signup from the admin page we store the URL so that
# we get returned here when signup is successful
store_location
end
format.xml do
@users = User.order('login').all
@users = User.order('login')
render :xml => @users.to_xml(:except => [ :password ])
end
end
@ -138,7 +138,7 @@ class UsersController < ApplicationController
def destroy
@deleted_user = User.find(params[:id])
@saved = @deleted_user.destroy
@total_users = User.all.size
@total_users = User.size
respond_to do |format|
format.html do