diff options
| author | Stas Vilchik <vilchiks@gmail.com> | 2017-01-24 15:41:45 +0100 |
|---|---|---|
| committer | Stas Vilchik <vilchiks@gmail.com> | 2017-01-24 15:42:05 +0100 |
| commit | 71a58477df8c7110ed53e1dcc8d83e3233493032 (patch) | |
| tree | e60e32682a314e463368d9ae62a7763f7942dd71 /server | |
| parent | dd51ac2553e1613e7ea3cd5e8c41cce2803f488c (diff) | |
| download | sonarqube-71a58477df8c7110ed53e1dcc8d83e3233493032.tar.gz sonarqube-71a58477df8c7110ed53e1dcc8d83e3233493032.zip | |
SONAR-8679 Quality Profiles page never finishes loading when there is no plugins
Diffstat (limited to 'server')
| -rw-r--r-- | server/sonar-web/src/main/js/app/components/App.js | 7 | ||||
| -rw-r--r-- | server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesList.js | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/server/sonar-web/src/main/js/app/components/App.js b/server/sonar-web/src/main/js/app/components/App.js index cb89c3098b5..cc0913a1cf1 100644 --- a/server/sonar-web/src/main/js/app/components/App.js +++ b/server/sonar-web/src/main/js/app/components/App.js @@ -51,11 +51,10 @@ class App extends React.Component { this.props.fetchCurrentUser() .then(() => Promise.all([ this.props.fetchAppState(), - this.props.fetchOrganizations() + this.props.fetchOrganizations(), + this.props.fetchLanguages() ])) - .then(this.finishLoading) - .then(this.props.fetchLanguages) - .catch(this.finishLoading); + .then(this.finishLoading, this.finishLoading); } componentWillUnmount () { diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesList.js b/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesList.js index 3e3e1765133..dc09c72e148 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesList.js +++ b/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesList.js @@ -97,7 +97,7 @@ export default class ProfilesList extends React.Component { currentFilter={language}/> {Object.keys(profilesToShow).length === 0 && ( - <div className="alert alert-warning"> + <div className="alert alert-warning spacer-top"> {translate('no_results')} </div> )} |