diff options
| author | Stas Vilchik <vilchiks@gmail.com> | 2016-04-11 15:42:05 +0200 |
|---|---|---|
| committer | Stas Vilchik <vilchiks@gmail.com> | 2016-04-11 15:42:05 +0200 |
| commit | e9308f50e3afe4cb10405e88f1eb4114bbad344d (patch) | |
| tree | 0d20eea51f6d86fe18d1b5622fd96ec5a3c45c81 /server/sonar-web | |
| parent | 987f90851956c5ef1e30599f06a0cb9257f5b464 (diff) | |
| download | sonarqube-e9308f50e3afe4cb10405e88f1eb4114bbad344d.tar.gz sonarqube-e9308f50e3afe4cb10405e88f1eb4114bbad344d.zip | |
SONAR-7238 do not display identity provider details when it is "sonarqube"
Diffstat (limited to 'server/sonar-web')
| -rw-r--r-- | server/sonar-web/src/main/js/apps/account/components/UserCard.js | 2 | ||||
| -rw-r--r-- | server/sonar-web/src/main/js/apps/users/templates/users-list-item.hbs | 22 |
2 files changed, 13 insertions, 11 deletions
diff --git a/server/sonar-web/src/main/js/apps/account/components/UserCard.js b/server/sonar-web/src/main/js/apps/account/components/UserCard.js index b680781a718..82f9b939b28 100644 --- a/server/sonar-web/src/main/js/apps/account/components/UserCard.js +++ b/server/sonar-web/src/main/js/apps/account/components/UserCard.js @@ -36,7 +36,7 @@ export default function UserCard ({ user }) { <h1 id="name" className="display-inline-block">{user.name}</h1> </IndexLink> <span id="login" className="note big-spacer-left">{user.login}</span> - {!user.local && ( + {!user.local && user.externalProvider !== 'sonarqube' && ( <span id="identity-provider" className="big-spacer-left"> <UserExternalIdentity user={user}/> </span> diff --git a/server/sonar-web/src/main/js/apps/users/templates/users-list-item.hbs b/server/sonar-web/src/main/js/apps/users/templates/users-list-item.hbs index d59d649d1c8..f9c238d69c9 100644 --- a/server/sonar-web/src/main/js/apps/users/templates/users-list-item.hbs +++ b/server/sonar-web/src/main/js/apps/users/templates/users-list-item.hbs @@ -15,16 +15,18 @@ {{/if}} {{#unless local}} - <div class="js-user-identity-provider little-spacer-top"> - {{#if identityProvider}} - <div class="identity-provider" style="background-color: {{identityProvider.backgroundColor}}"> - <img src="{{link identityProvider.iconPath}}" width="14" height="14"/> - {{externalIdentity}} - </div> - {{else}} - {{externalProvider}}: {{externalIdentity}} - {{/if}} - </div> + {{#notEq externalProvider 'sonarqube'}} + <div class="js-user-identity-provider little-spacer-top"> + {{#if identityProvider}} + <div class="identity-provider" style="background-color: {{identityProvider.backgroundColor}}"> + <img src="{{link identityProvider.iconPath}}" width="14" height="14"/> + {{externalIdentity}} + </div> + {{else}} + {{externalProvider}}: {{externalIdentity}} + {{/if}} + </div> + {{/notEq}} {{/unless}} </td> |