Description:
fix bugs when user creation error
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r812:e2597379728c - - 1 file changed: 1 inserted, 1 deleted
| @@ -48,49 +48,49 | |||||
|
|
48 | @user.save |
|
48 | @user.save |
|
|
49 | redirect_to action: 'index', page: params[:page] |
|
49 | redirect_to action: 'index', page: params[:page] |
|
|
50 | end |
|
50 | end |
|
|
51 |
|
51 | ||
|
|
52 | def create_from_list |
|
52 | def create_from_list |
|
|
53 | lines = params[:user_list] |
|
53 | lines = params[:user_list] |
|
|
54 |
|
54 | ||
|
|
55 |
|
55 | ||
|
|
56 | res = User.create_from_list(lines) |
|
56 | res = User.create_from_list(lines) |
|
|
57 | error_logins = res[:error_logins] |
|
57 | error_logins = res[:error_logins] |
|
|
58 | error_msg = res[:first_error] |
|
58 | error_msg = res[:first_error] |
|
|
59 | ok_user = res[:created_users] |
|
59 | ok_user = res[:created_users] |
|
|
60 |
|
60 | ||
|
|
61 |
|
61 | ||
|
|
62 | #add to group |
|
62 | #add to group |
|
|
63 | if params[:add_to_group] |
|
63 | if params[:add_to_group] |
|
|
64 | group = Group.find_by(id: params[:group_id])&.add_users_skip_existing(ok_user) |
|
64 | group = Group.find_by(id: params[:group_id])&.add_users_skip_existing(ok_user) |
|
|
65 | end |
|
65 | end |
|
|
66 |
|
66 | ||
|
|
67 | # show flash |
|
67 | # show flash |
|
|
68 | if ok_user.count > 0 |
|
68 | if ok_user.count > 0 |
|
|
69 | flash[:success] = "#{ok_user.count} user(s) was created or updated successfully" |
|
69 | flash[:success] = "#{ok_user.count} user(s) was created or updated successfully" |
|
|
70 | end |
|
70 | end |
|
|
71 | if error_logins.size > 0 |
|
71 | if error_logins.size > 0 |
|
|
72 |
- flash[:error] = "Following user(s) failed to be created: " + error_ |
|
72 | + flash[:error] = "Following user(s) failed to be created: " + error_logins.join(', ') + ". The error of the first failed one are: " + error_msg; |
|
|
73 | end |
|
73 | end |
|
|
74 | redirect_to :action => 'index' |
|
74 | redirect_to :action => 'index' |
|
|
75 | end |
|
75 | end |
|
|
76 |
|
76 | ||
|
|
77 | def edit |
|
77 | def edit |
|
|
78 | @user = User.find(params[:id]) |
|
78 | @user = User.find(params[:id]) |
|
|
79 | end |
|
79 | end |
|
|
80 |
|
80 | ||
|
|
81 | def update |
|
81 | def update |
|
|
82 | @user = User.find(params[:id]) |
|
82 | @user = User.find(params[:id]) |
|
|
83 | if @user.update_attributes(user_params) |
|
83 | if @user.update_attributes(user_params) |
|
|
84 | flash[:notice] = 'User was successfully updated.' |
|
84 | flash[:notice] = 'User was successfully updated.' |
|
|
85 | redirect_to :action => 'show', :id => @user |
|
85 | redirect_to :action => 'show', :id => @user |
|
|
86 | else |
|
86 | else |
|
|
87 | render :action => 'edit' |
|
87 | render :action => 'edit' |
|
|
88 | end |
|
88 | end |
|
|
89 | end |
|
89 | end |
|
|
90 |
|
90 | ||
|
|
91 | def destroy |
|
91 | def destroy |
|
|
92 | User.find(params[:id]).destroy |
|
92 | User.find(params[:id]).destroy |
|
|
93 | redirect_to :action => 'index' |
|
93 | redirect_to :action => 'index' |
|
|
94 | end |
|
94 | end |
|
|
95 |
|
95 | ||
|
|
96 | def user_stat |
|
96 | def user_stat |
You need to be logged in to leave comments.
Login now