]> source.dussan.org Git - sonarqube.git/commitdiff
SONAR-6834 update background task status indicators to mix with quality gate statuses
authorStas Vilchik <vilchiks@gmail.com>
Thu, 15 Oct 2015 11:51:08 +0000 (13:51 +0200)
committerStas Vilchik <vilchiks@gmail.com>
Thu, 15 Oct 2015 11:51:08 +0000 (13:51 +0200)
server/sonar-web/src/main/js/apps/background-tasks/tasks.js
server/sonar-web/src/main/js/apps/nav/component/component-nav-meta.jsx

index 8d3753e7d136d887f468df38c1a9cc4bbab6059e..c469637204de056eb639141fa21665cee414defe 100644 (file)
@@ -26,13 +26,13 @@ export default React.createClass({
         inner = <i className="spinner"/>;
         break;
       case STATUSES.SUCCESS:
-        inner = <i className="icon-test-status-ok"/>;
+        inner = <span className="badge badge-success">{window.t('background_task.status.SUCCESS')}</span>;
         break;
       case STATUSES.FAILED:
-        inner = <i className="icon-test-status-error"/>;
+        inner = <span className="badge badge-danger">{window.t('background_task.status.FAILED')}</span>;
         break;
       case STATUSES.CANCELED:
-        inner = <i className="icon-test-status-skipped"/>;
+        inner = <span className="badge badge-muted">{window.t('background_task.status.CANCELED')}</span>;
         break;
       default:
         inner = '';
index 45061352e56518796f491cf30ab87160c7ad1082..77cceaabc6667cdf2ab5b1a074f02369195e063c 100644 (file)
@@ -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(
           <li key="isFailed" data-toggle="tooltip" title={tooltip}>
-            <i className="icon-test-status-error"/> <span className="text-danger">{window.t('background_task.status.FAILED')}</span>
+            <span className="badge badge-danger">{window.t('background_task.status.FAILED')}</span>
           </li>
       );
     }