Merge pull request #2121 from LessonPlanet/disable-name-edit-for-sso
Adding name to the list of uneditable items in preferences UI
This commit is contained in:
commit
f4c2fef407
|
@ -25,7 +25,11 @@
|
|||
<div class="control-group">
|
||||
<label class="control-label">{{i18n user.name.title}}</label>
|
||||
<div class="controls">
|
||||
{{textField value=newNameInput classNames="input-xxlarge"}}
|
||||
{{#if can_edit_name}}
|
||||
{{textField value=newNameInput classNames="input-xxlarge"}}
|
||||
{{else}}
|
||||
<span class='static'>{{name}}</span>
|
||||
{{/if}}
|
||||
</div>
|
||||
<div class='instructions'>
|
||||
{{i18n user.name.instructions}}
|
||||
|
|
|
@ -12,6 +12,7 @@ class UserSerializer < BasicUserSerializer
|
|||
:can_edit,
|
||||
:can_edit_username,
|
||||
:can_edit_email,
|
||||
:can_edit_name,
|
||||
:stats,
|
||||
:can_send_private_message_to_user,
|
||||
:bio_excerpt,
|
||||
|
@ -93,6 +94,10 @@ class UserSerializer < BasicUserSerializer
|
|||
scope.can_edit_email?(object)
|
||||
end
|
||||
|
||||
def can_edit_name
|
||||
scope.can_edit_name?(object)
|
||||
end
|
||||
|
||||
def stats
|
||||
UserAction.stats(object.id, scope)
|
||||
end
|
||||
|
|
|
@ -19,6 +19,13 @@ module UserGuardian
|
|||
can_edit?(user)
|
||||
end
|
||||
|
||||
def can_edit_name?(user)
|
||||
return false if not(SiteSetting.enable_names?)
|
||||
return false if (SiteSetting.sso_overrides_name? && SiteSetting.enable_sso?)
|
||||
return true if is_staff?
|
||||
can_edit?(user)
|
||||
end
|
||||
|
||||
def can_block_user?(user)
|
||||
user && is_staff? && not(user.staff?)
|
||||
end
|
||||
|
|
|
@ -1487,5 +1487,116 @@ describe Guardian do
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe 'can_edit_name?' do
|
||||
it 'is false without a logged in user' do
|
||||
Guardian.new(nil).can_edit_name?(build(:user, created_at: 1.minute.ago)).should be_false
|
||||
end
|
||||
|
||||
it "is false for regular users to edit another user's name" do
|
||||
Guardian.new(build(:user)).can_edit_name?(build(:user, created_at: 1.minute.ago)).should be_false
|
||||
end
|
||||
|
||||
context 'for a new user' do
|
||||
let(:target_user) { build(:user, created_at: 1.minute.ago) }
|
||||
|
||||
it 'is true for the user to change their own name' do
|
||||
Guardian.new(target_user).can_edit_name?(target_user).should be_true
|
||||
end
|
||||
|
||||
it 'is true for moderators' do
|
||||
Guardian.new(moderator).can_edit_name?(user).should be_true
|
||||
end
|
||||
|
||||
it 'is true for admins' do
|
||||
Guardian.new(admin).can_edit_name?(user).should be_true
|
||||
end
|
||||
end
|
||||
|
||||
context 'when name is disabled in preferences' do
|
||||
before do
|
||||
SiteSetting.stubs(:enable_names).returns(false)
|
||||
end
|
||||
|
||||
it 'is false for the user to change their own name' do
|
||||
Guardian.new(user).can_edit_name?(user).should be_false
|
||||
end
|
||||
|
||||
it 'is false for moderators' do
|
||||
Guardian.new(moderator).can_edit_name?(user).should be_false
|
||||
end
|
||||
|
||||
it 'is false for admins' do
|
||||
Guardian.new(admin).can_edit_name?(user).should be_false
|
||||
end
|
||||
end
|
||||
|
||||
context 'when name is enabled in preferences' do
|
||||
before do
|
||||
SiteSetting.stubs(:enable_names).returns(true)
|
||||
end
|
||||
|
||||
context 'when SSO is disabled' do
|
||||
before do
|
||||
SiteSetting.stubs(:enable_sso).returns(false)
|
||||
SiteSetting.stubs(:sso_overrides_name).returns(false)
|
||||
end
|
||||
|
||||
it 'is true for admins' do
|
||||
Guardian.new(admin).can_edit_name?(admin).should be_true
|
||||
end
|
||||
|
||||
it 'is true for moderators' do
|
||||
Guardian.new(moderator).can_edit_name?(moderator).should be_true
|
||||
end
|
||||
|
||||
it 'is true for users' do
|
||||
Guardian.new(user).can_edit_name?(user).should be_true
|
||||
end
|
||||
end
|
||||
|
||||
context 'when SSO is enabled' do
|
||||
before do
|
||||
SiteSetting.stubs(:enable_sso).returns(true)
|
||||
end
|
||||
|
||||
context 'when SSO name override is active' do
|
||||
before do
|
||||
SiteSetting.stubs(:sso_overrides_name).returns(true)
|
||||
end
|
||||
|
||||
it 'is false for admins' do
|
||||
Guardian.new(admin).can_edit_name?(admin).should be_false
|
||||
end
|
||||
|
||||
it 'is false for moderators' do
|
||||
Guardian.new(moderator).can_edit_name?(moderator).should be_false
|
||||
end
|
||||
|
||||
it 'is false for users' do
|
||||
Guardian.new(user).can_edit_name?(user).should be_false
|
||||
end
|
||||
end
|
||||
|
||||
context 'when SSO name override is not active' do
|
||||
before do
|
||||
SiteSetting.stubs(:sso_overrides_name).returns(false)
|
||||
end
|
||||
|
||||
it 'is true for admins' do
|
||||
Guardian.new(admin).can_edit_name?(admin).should be_true
|
||||
end
|
||||
|
||||
it 'is true for moderators' do
|
||||
Guardian.new(moderator).can_edit_name?(moderator).should be_true
|
||||
end
|
||||
|
||||
it 'is true for users' do
|
||||
Guardian.new(user).can_edit_name?(user).should be_true
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue