Commit cf129d6f34c098f5e1b248bd52bb5db72aecfd13
Merge branch '6-6-3-patch' into '6-6-stable'
6.6.3 Patch Fixes 500 error when try to edit own user via admin area
Showing
5 changed files
with
24 additions
and
2 deletions
Show diff stats
app/controllers/admin/users_controller.rb
... | ... | @@ -68,7 +68,9 @@ class Admin::UsersController < Admin::ApplicationController |
68 | 68 | params[:user].delete(:password_confirmation) |
69 | 69 | end |
70 | 70 | |
71 | - user.admin = (admin && admin.to_i > 0) | |
71 | + if admin.present? | |
72 | + user.admin = !admin.to_i.zero? | |
73 | + end | |
72 | 74 | |
73 | 75 | respond_to do |format| |
74 | 76 | if user.update_attributes(params[:user], as: :admin) | ... | ... |
app/controllers/users_controller.rb
app/views/users/show.html.haml
features/admin/users.feature
... | ... | @@ -14,3 +14,9 @@ Feature: Admin Users |
14 | 14 | And Click save |
15 | 15 | Then See username error message |
16 | 16 | And Not changed form action url |
17 | + | |
18 | + Scenario: Edit my user attributes | |
19 | + Given I visit admin users page | |
20 | + And click edit on my user | |
21 | + When I submit modified user | |
22 | + Then I see user attributes changed | ... | ... |
features/steps/admin/admin_users.rb
... | ... | @@ -31,4 +31,17 @@ class AdminUsers < Spinach::FeatureSteps |
31 | 31 | And 'Not changed form action url' do |
32 | 32 | page.should have_selector %(form[action="/admin/users/#{@user.username}"]) |
33 | 33 | end |
34 | + | |
35 | + step 'I submit modified user' do | |
36 | + check :user_can_create_group | |
37 | + click_button 'Save' | |
38 | + end | |
39 | + | |
40 | + step 'I see user attributes changed' do | |
41 | + page.should have_content 'Can create groups: Yes' | |
42 | + end | |
43 | + | |
44 | + step 'click edit on my user' do | |
45 | + find("#edit_user_#{current_user.id}").click | |
46 | + end | |
34 | 47 | end | ... | ... |