Mercurial > hg > soundsoftware-site
comparison app/helpers/users_helper.rb @ 41:7f0e922c8982 luisf
merged with new version from trunk
author | luisf |
---|---|
date | Fri, 19 Nov 2010 14:45:28 +0000 |
parents | 94944d00e43c |
children | af80e5618e9b |
comparison
equal
deleted
inserted
replaced
35:67e8aef29de9 | 41:7f0e922c8982 |
---|---|
32 end | 32 end |
33 options | 33 options |
34 end | 34 end |
35 | 35 |
36 def change_status_link(user) | 36 def change_status_link(user) |
37 url = {:controller => 'users', :action => 'edit', :id => user, :page => params[:page], :status => params[:status], :tab => nil} | 37 url = {:controller => 'users', :action => 'update', :id => user, :page => params[:page], :status => params[:status], :tab => nil} |
38 | 38 |
39 if user.locked? | 39 if user.locked? |
40 link_to l(:button_unlock), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :post, :class => 'icon icon-unlock' | 40 link_to l(:button_unlock), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :put, :class => 'icon icon-unlock' |
41 elsif user.registered? | 41 elsif user.registered? |
42 link_to l(:button_activate), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :post, :class => 'icon icon-unlock' | 42 link_to l(:button_activate), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :put, :class => 'icon icon-unlock' |
43 elsif user != User.current | 43 elsif user != User.current |
44 link_to l(:button_lock), url.merge(:user => {:status => User::STATUS_LOCKED}), :method => :post, :class => 'icon icon-lock' | 44 link_to l(:button_lock), url.merge(:user => {:status => User::STATUS_LOCKED}), :method => :put, :class => 'icon icon-lock' |
45 end | 45 end |
46 end | 46 end |
47 | 47 |
48 def user_settings_tabs | 48 def user_settings_tabs |
49 tabs = [{:name => 'general', :partial => 'users/general', :label => :label_general}, | 49 tabs = [{:name => 'general', :partial => 'users/general', :label => :label_general}, |