From 3fc06759b070622cd13c3dba4ea9b4dcbb18db18 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Thu, 15 Oct 2015 13:51:08 +0200 Subject: [PATCH] SONAR-6834 update background task status indicators to mix with quality gate statuses --- server/sonar-web/src/main/js/apps/background-tasks/tasks.js | 6 +++--- .../src/main/js/apps/nav/component/component-nav-meta.jsx | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/server/sonar-web/src/main/js/apps/background-tasks/tasks.js b/server/sonar-web/src/main/js/apps/background-tasks/tasks.js index 8d3753e7d13..c469637204d 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/tasks.js +++ b/server/sonar-web/src/main/js/apps/background-tasks/tasks.js @@ -26,13 +26,13 @@ export default React.createClass({ inner = ; break; case STATUSES.SUCCESS: - inner = ; + inner = {window.t('background_task.status.SUCCESS')}; break; case STATUSES.FAILED: - inner = ; + inner = {window.t('background_task.status.FAILED')}; break; case STATUSES.CANCELED: - inner = ; + inner = {window.t('background_task.status.CANCELED')}; break; default: inner = ''; diff --git a/server/sonar-web/src/main/js/apps/nav/component/component-nav-meta.jsx b/server/sonar-web/src/main/js/apps/nav/component/component-nav-meta.jsx index 45061352e56..77cceaabc66 100644 --- a/server/sonar-web/src/main/js/apps/nav/component/component-nav-meta.jsx +++ b/server/sonar-web/src/main/js/apps/nav/component/component-nav-meta.jsx @@ -4,8 +4,7 @@ import PendingIcon from '../../../components/shared/pending-icon'; export default React.createClass({ render() { let metaList = [], - // FIXME check right permission - canSeeBackgroundTasks = this.props.conf.showSettings, + canSeeBackgroundTasks = this.props.conf.showBackgroundTasks, backgroundTasksUrl = `${baseUrl}/project/background_tasks?id=${encodeURIComponent(this.props.component.key)}`; if (this.props.isInProgress) { @@ -32,7 +31,7 @@ export default React.createClass({ window.t('component_navigation.status.failed'); metaList.push(
  • - {window.t('background_task.status.FAILED')} + {window.t('background_task.status.FAILED')}
  • ); } -- 2.39.5