Merge branch '33461-display-user-id' into 'master'
Display own user id in account settings pages Closes #33461 See merge request !12141
This commit is contained in:
commit
ff97afdd58
|
@ -42,10 +42,17 @@
|
|||
- if current_user.ldap_user?
|
||||
Some options are unavailable for LDAP accounts
|
||||
.col-lg-9
|
||||
.form-group
|
||||
= f.label :name, class: "label-light"
|
||||
= f.text_field :name, class: "form-control", required: true
|
||||
%span.help-block Enter your name, so people you know can recognize you.
|
||||
.row
|
||||
.form-group.col-md-9
|
||||
= f.label :name, class: "label-light"
|
||||
= f.text_field :name, class: "form-control", required: true
|
||||
%span.help-block Enter your name, so people you know can recognize you.
|
||||
|
||||
.form-group.col-md-3
|
||||
= f.label :id, class: 'label-light' do
|
||||
User ID
|
||||
= f.text_field :id, class: 'form-control', readonly: true
|
||||
|
||||
|
||||
.form-group
|
||||
= f.label :email, class: "label-light"
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Display own user id in account settings page
|
||||
merge_request: 12141
|
||||
author: Riccardo Padovani
|
|
@ -0,0 +1,19 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe 'profiles/show' do
|
||||
let(:user) { create(:user) }
|
||||
|
||||
before do
|
||||
assign(:user, user)
|
||||
allow(controller).to receive(:current_user).and_return(user)
|
||||
end
|
||||
|
||||
context 'when the profile page is opened' do
|
||||
it 'displays the correct elements' do
|
||||
render
|
||||
|
||||
expect(rendered).to have_field('user_name', user.name)
|
||||
expect(rendered).to have_field('user_id', user.id)
|
||||
end
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue