SONAR-7397 The "Change Password" form must be available in the UI only for local...

diff --git a/server/sonar-web/src/main/js/apps/account/components/Security.js b/server/sonar-web/src/main/js/apps/account/components/Security.js
index 52f0a1a9e74cfa1770a59fe462d139ce5cfcd351..ec220d082c571bf8257b7ce463f415395464527f 100644 (file)
--- a/server/sonar-web/src/main/js/apps/account/components/Security.js
+++ b/server/sonar-web/src/main/js/apps/account/components/Security.js
@@ -22,7 +22,7 @@ import React from 'react';
 import Password from './Password';
 import Tokens from './Tokens';
 
-export default function Security ({ user, canChangePassword }) {
+export default function Security ({ user }) {
   return (
       <div className="page page-limited">
         <div className="columns">
@@ -30,7 +30,7 @@ export default function Security ({ user, canChangePassword }) {
             <Tokens user={user}/>
           </div>
 
-          {canChangePassword && (
+          {user.local && (
               <div className="column-half">
                 <Password user={user}/>
               </div>

diff --git a/server/sonar-web/src/main/js/apps/account/containers/SecurityContainer.js b/server/sonar-web/src/main/js/apps/account/containers/SecurityContainer.js
index 72bf0c1e4fa0538f46dd16ce9189fd589e2163c2..8a800b71fb42e3154602be7ad24fe80dad0c2796 100644 (file)
--- a/server/sonar-web/src/main/js/apps/account/containers/SecurityContainer.js
+++ b/server/sonar-web/src/main/js/apps/account/containers/SecurityContainer.js
@@ -22,10 +22,7 @@ import { connect } from 'react-redux';
 import Security from './../components/Security';
 
 function mapStateToProps (state) {
-  return {
-    user: state.user,
-    canChangePassword: window.sonarqube.user.canChangePassword
-  };
+  return { user: state.user };
 }
 
 export default connect(mapStateToProps)(Security);

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/account/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/account/index.html.erb
index edab056abc59e78a2773b029db26b57800db07ac..c81109e64f95b88ad329604776c7ca689f01388d 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/account/index.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/account/index.html.erb
@@ -1,7 +1,6 @@
 <% content_for :extra_script do %>
   <script>
     window.sonarqube.user = {
-      canChangePassword: <%= User.editable_password? ? 'true' : 'false' -%>,
       favorites: [
         <% current_user.favourites.each_with_index do |f, index| %>
         {