Description:
confusing merge
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r483:7cf62e1e74ba - - 1 file changed: 0 inserted, 1 deleted
| @@ -1,101 +1,100 | |||||
|
|
1 | require 'csv' |
|
1 | require 'csv' |
|
|
2 |
|
2 | ||
|
|
3 | class UserAdminController < ApplicationController |
|
3 | class UserAdminController < ApplicationController |
|
|
4 |
|
4 | ||
|
|
5 | - |
|
||
|
|
6 | include MailHelperMethods |
|
5 | include MailHelperMethods |
|
|
7 |
|
6 | ||
|
|
8 | before_filter :admin_authorization |
|
7 | before_filter :admin_authorization |
|
|
9 |
|
8 | ||
|
|
10 | # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html) |
|
9 | # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html) |
|
|
11 | verify :method => :post, :only => [ :destroy, |
|
10 | verify :method => :post, :only => [ :destroy, |
|
|
12 | :create, :create_from_list, |
|
11 | :create, :create_from_list, |
|
|
13 | :update, |
|
12 | :update, |
|
|
14 | :manage_contest, |
|
13 | :manage_contest, |
|
|
15 | :bulk_mail |
|
14 | :bulk_mail |
|
|
16 | ], |
|
15 | ], |
|
|
17 | :redirect_to => { :action => :list } |
|
16 | :redirect_to => { :action => :list } |
|
|
18 |
|
17 | ||
|
|
19 | def index |
|
18 | def index |
|
|
20 | list |
|
19 | list |
|
|
21 | render :action => 'list' |
|
20 | render :action => 'list' |
|
|
22 | end |
|
21 | end |
|
|
23 |
|
22 | ||
|
|
24 | def list |
|
23 | def list |
|
|
25 | @user_count = User.count |
|
24 | @user_count = User.count |
|
|
26 | if params[:page] == 'all' |
|
25 | if params[:page] == 'all' |
|
|
27 | @users = User.all |
|
26 | @users = User.all |
|
|
28 | @paginated = false |
|
27 | @paginated = false |
|
|
29 | else |
|
28 | else |
|
|
30 | @users = User.paginate :page => params[:page] |
|
29 | @users = User.paginate :page => params[:page] |
|
|
31 | @paginated = true |
|
30 | @paginated = true |
|
|
32 | end |
|
31 | end |
|
|
33 | @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at'] |
|
32 | @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at'] |
|
|
34 | @contests = Contest.enabled |
|
33 | @contests = Contest.enabled |
|
|
35 | end |
|
34 | end |
|
|
36 |
|
35 | ||
|
|
37 | def active |
|
36 | def active |
|
|
38 | sessions = ActiveRecord::SessionStore::Session.find(:all, :conditions => ["updated_at >= ?", 60.minutes.ago]) |
|
37 | sessions = ActiveRecord::SessionStore::Session.find(:all, :conditions => ["updated_at >= ?", 60.minutes.ago]) |
|
|
39 | @users = [] |
|
38 | @users = [] |
|
|
40 | sessions.each do |session| |
|
39 | sessions.each do |session| |
|
|
41 | if session.data[:user_id] |
|
40 | if session.data[:user_id] |
|
|
42 | @users << User.find(session.data[:user_id]) |
|
41 | @users << User.find(session.data[:user_id]) |
|
|
43 | end |
|
42 | end |
|
|
44 | end |
|
43 | end |
|
|
45 | end |
|
44 | end |
|
|
46 |
|
45 | ||
|
|
47 | def show |
|
46 | def show |
|
|
48 | @user = User.find(params[:id]) |
|
47 | @user = User.find(params[:id]) |
|
|
49 | end |
|
48 | end |
|
|
50 |
|
49 | ||
|
|
51 | def new |
|
50 | def new |
|
|
52 | @user = User.new |
|
51 | @user = User.new |
|
|
53 | end |
|
52 | end |
|
|
54 |
|
53 | ||
|
|
55 | def create |
|
54 | def create |
|
|
56 | @user = User.new(params[:user]) |
|
55 | @user = User.new(params[:user]) |
|
|
57 | @user.activated = true |
|
56 | @user.activated = true |
|
|
58 | if @user.save |
|
57 | if @user.save |
|
|
59 | flash[:notice] = 'User was successfully created.' |
|
58 | flash[:notice] = 'User was successfully created.' |
|
|
60 | redirect_to :action => 'list' |
|
59 | redirect_to :action => 'list' |
|
|
61 | else |
|
60 | else |
|
|
62 | render :action => 'new' |
|
61 | render :action => 'new' |
|
|
63 | end |
|
62 | end |
|
|
64 | end |
|
63 | end |
|
|
65 |
|
64 | ||
|
|
66 | def create_from_list |
|
65 | def create_from_list |
|
|
67 | lines = params[:user_list] |
|
66 | lines = params[:user_list] |
|
|
68 |
|
67 | ||
|
|
69 | note = [] |
|
68 | note = [] |
|
|
70 |
|
69 | ||
|
|
71 | lines.split("\n").each do |line| |
|
70 | lines.split("\n").each do |line| |
|
|
72 | items = line.chomp.split(',') |
|
71 | items = line.chomp.split(',') |
|
|
73 | if items.length>=2 |
|
72 | if items.length>=2 |
|
|
74 | login = items[0] |
|
73 | login = items[0] |
|
|
75 | full_name = items[1] |
|
74 | full_name = items[1] |
|
|
76 |
|
75 | ||
|
|
77 | added_random_password = false |
|
76 | added_random_password = false |
|
|
78 | if items.length>=3 |
|
77 | if items.length>=3 |
|
|
79 | password = items[2].chomp(" ") |
|
78 | password = items[2].chomp(" ") |
|
|
80 | user_alias = (items.length>=4) ? items[3] : login |
|
79 | user_alias = (items.length>=4) ? items[3] : login |
|
|
81 | else |
|
80 | else |
|
|
82 | password = random_password |
|
81 | password = random_password |
|
|
83 | user_alias = (items.length>=4) ? items[3] : login |
|
82 | user_alias = (items.length>=4) ? items[3] : login |
|
|
84 | added_random_password = true |
|
83 | added_random_password = true |
|
|
85 | end |
|
84 | end |
|
|
86 |
|
85 | ||
|
|
87 | user = User.find_by_login(login) |
|
86 | user = User.find_by_login(login) |
|
|
88 | if (user) |
|
87 | if (user) |
|
|
89 | user.full_name = full_name |
|
88 | user.full_name = full_name |
|
|
90 | user.password = password |
|
89 | user.password = password |
|
|
91 | else |
|
90 | else |
|
|
92 | user = User.new({:login => login, |
|
91 | user = User.new({:login => login, |
|
|
93 | :full_name => full_name, |
|
92 | :full_name => full_name, |
|
|
94 | :password => password, |
|
93 | :password => password, |
|
|
95 | :password_confirmation => password, |
|
94 | :password_confirmation => password, |
|
|
96 | :alias => user_alias}) |
|
95 | :alias => user_alias}) |
|
|
97 | end |
|
96 | end |
|
|
98 | user.activated = true |
|
97 | user.activated = true |
|
|
99 | user.save |
|
98 | user.save |
|
|
100 |
|
99 | ||
|
|
101 | if added_random_password |
|
100 | if added_random_password |
You need to be logged in to leave comments.
Login now