...@@ -68,7 +68,9 @@ class Admin::UsersController < Admin::ApplicationController ...@@ -68,7 +68,9 @@ class Admin::UsersController < Admin::ApplicationController
params[:user].delete(:password_confirmation) params[:user].delete(:password_confirmation)
end end
user.admin = (admin && admin.to_i > 0) if admin.present?
user.admin = !admin.to_i.zero?
end
respond_to do |format| respond_to do |format|
if user.update_attributes(params[:user], as: :admin) if user.update_attributes(params[:user], as: :admin)
... ...
......
...@@ -11,6 +11,7 @@ class UsersController < ApplicationController ...@@ -11,6 +11,7 @@ class UsersController < ApplicationController
end end
@events = @user.recent_events.where(project_id: @projects.map(&:id)).limit(20) @events = @user.recent_events.where(project_id: @projects.map(&:id)).limit(20)
@title = @user.name @title = @user.name
@groups = @projects.map(&:group).compact.uniq
end end
def determine_layout def determine_layout
... ...
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
%small member since #{@user.created_at.stamp("Nov 12, 2031")} %small member since #{@user.created_at.stamp("Nov 12, 2031")}
.clearfix .clearfix
%h4 Groups: %h4 Groups:
= render 'groups', groups: @user.groups = render 'groups', groups: @groups
%hr %hr
%h4 User Activity: %h4 User Activity:
= render @events = render @events
... ...
......
...@@ -14,3 +14,9 @@ Feature: Admin Users ...@@ -14,3 +14,9 @@ Feature: Admin Users
And Click save And Click save
Then See username error message Then See username error message
And Not changed form action url And Not changed form action url
Scenario: Edit my user attributes
Given I visit admin users page
And click edit on my user
When I submit modified user
Then I see user attributes changed
...@@ -31,4 +31,17 @@ class AdminUsers < Spinach::FeatureSteps ...@@ -31,4 +31,17 @@ class AdminUsers < Spinach::FeatureSteps
And 'Not changed form action url' do And 'Not changed form action url' do
page.should have_selector %(form[action="/admin/users/#{@user.username}"]) page.should have_selector %(form[action="/admin/users/#{@user.username}"])
end end
step 'I submit modified user' do
check :user_can_create_group
click_button 'Save'
end
step 'I see user attributes changed' do
page.should have_content 'Can create groups: Yes'
end
step 'click edit on my user' do
find("#edit_user_#{current_user.id}").click
end
end end