@@ -12,14 +12,14 @@ module Admin end def show(id) - @user = User.get(id) + @user = User.find(:login => k) raise NotFound unless @user @title = "Administration : user #{@user.login}" display @user end def destroy(id) - @user = User.get(id) + @user = User.find(:login => k) raise NotFound unless @user if @user.destroy redirect resource(:admin, :users) @@ -30,7 +30,7 @@ module Admin def update_all(user_admin) user_admin.each do |k, v| - f = User.get(k) + f = User.find(:login => k) f.global_admin = (v == "1".to_s) f.save end app/controllers/admin/users.rb @@ -13,7 +13,7 @@ class Users < Application display @user end - def edit(id) + def edit only_provides :html @user = session.user @title = "edit my profile" @@ -30,8 +30,8 @@ class Users < Application end end - def update(id, user) - @user = User.get(id) + def update(login, user) + @user = User.first(:login => login) raise NotFound unless @user if @user.update_attributes(user) redirect resource(:projects) @@ -40,8 +40,8 @@ class Users < Application end end - def destroy(id) - @user = User.get(id) + def destroy(login) + @user = User.first(:login => login) raise NotFound unless @user if @user.destroy redirect resource(:users) @@ -53,7 +53,7 @@ class Users < Application private def only_own_account - @user = User.get(params[:id]) + @user = User.first(:login => params[:login]) unless @user == session.user raise Unauthenticated end app/controllers/users.rb @@ -15,7 +15,7 @@ %li= link_to('Login', url(:login)) %li= link_to('Register', url(:new_user)) - else - %li= link_to('My profile', url(:edit_user, session.user)) + %li= link_to('My profile', resource(session.user, :edit)) %li= link_to 'Logout', url(:logout) - if global_admin? %li= link_to 'Administration', url(:admin_root) app/views/layout/application.html.haml @@ -41,7 +41,10 @@ Merb::Router.prepare do end end - resources :users + identify User => :login do + resources :users, :key => :login + end + resources :projects do member :overview, :method => :get resources :milestones config/router.rb @@ -21,7 +21,7 @@ begin class Merb::Authentication def fetch_user(session_user_id) - Merb::Authentication.user_class.get(session_user_id) + Merb::Authentication.user_class.find(session_user_id) end def store_user(user) merb/merb-auth/setup.rb 88719ad76f20d54b8a8864360cf4f74dc34b46a2 Cyril Mougel cyril.mougel@gmail.com http://github.com/shingara/oupsnow/commit/24928917d13d69878c0870caa655ef0a379620be 24928917d13d69878c0870caa655ef0a379620be 2009-08-15T06:32:51-07:00 2009-08-15T06:32:51-07:00 fix users controller df44d233378bd24eea84093c9681a00a1a7bfb26 Cyril Mougel cyril.mougel@gmail.com