From e9308f50e3afe4cb10405e88f1eb4114bbad344d Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Mon, 11 Apr 2016 15:42:05 +0200 Subject: [PATCH] SONAR-7238 do not display identity provider details when it is "sonarqube" --- .../js/apps/account/components/UserCard.js | 2 +- .../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 }) {

{user.name}

{user.login} - {!user.local && ( + {!user.local && user.externalProvider !== 'sonarqube' && ( 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}} -
- {{#if identityProvider}} -
- - {{externalIdentity}} -
- {{else}} - {{externalProvider}}: {{externalIdentity}} - {{/if}} -
+ {{#notEq externalProvider 'sonarqube'}} +
+ {{#if identityProvider}} +
+ + {{externalIdentity}} +
+ {{else}} + {{externalProvider}}: {{externalIdentity}} + {{/if}} +
+ {{/notEq}} {{/unless}} -- 2.39.5