From: Grégoire Aubert <gregoire.aubert@sonarsource.com>
Date: Tue, 15 Aug 2017 15:12:04 +0000 (+0200)
Subject: SONAR-9474 Don't hide the avatar column anymore in users adminitration
X-Git-Tag: 6.6-RC1~584
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=92a5bd4f512a7d9db533d04b051b92c3a3bec6c7;p=sonarqube.git

SONAR-9474 Don't hide the avatar column anymore in users adminitration
---

diff --git a/server/sonar-web/src/main/js/apps/users/templates/users-list.hbs b/server/sonar-web/src/main/js/apps/users/templates/users-list.hbs
index 15b3fe3ce14..e619880b584 100644
--- a/server/sonar-web/src/main/js/apps/users/templates/users-list.hbs
+++ b/server/sonar-web/src/main/js/apps/users/templates/users-list.hbs
@@ -1,9 +1,7 @@
 <table class="data zebra">
   <thead>
     <tr>
-      {{#ifShowAvatars}}
-        <th>&nbsp;</th>
-      {{/ifShowAvatars}}
+      <th>&nbsp;</th>
       <th class="nowrap">&nbsp;</th>
       <th class="nowrap">SCM Accounts</th>
       {{#unless customOrganizations}}
diff --git a/server/sonar-web/src/main/js/helpers/handlebars/ifShowAvatars.js b/server/sonar-web/src/main/js/helpers/handlebars/ifShowAvatars.js
deleted file mode 100644
index 03afa92c69c..00000000000
--- a/server/sonar-web/src/main/js/helpers/handlebars/ifShowAvatars.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2017 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-function enableGravatar() {
-  const getStore = require('../../app/utils/getStore').default;
-  const { getSettingValue } = require('../../store/rootReducer');
-
-  const store = getStore();
-  return (getSettingValue(store.getState(), 'sonar.lf.enableGravatar') || {}).value === 'true';
-}
-
-module.exports = function(options) {
-  return enableGravatar() ? options.fn(this) : options.inverse(this);
-};