fix background tasks page on a project level

diff --git a/server/sonar-web/src/main/js/apps/background-tasks/main.js b/server/sonar-web/src/main/js/apps/background-tasks/main.js
index f37705548da322ba7cd6c13e10bfed94948b2197..9743b91f0ea1cc4e2cf8c3b3c99f33992c595232 100644 (file)
--- a/server/sonar-web/src/main/js/apps/background-tasks/main.js
+++ b/server/sonar-web/src/main/js/apps/background-tasks/main.js
@@ -201,9 +201,10 @@ export default React.createClass({
               onDateChange={this.onDateChange}
               onSearch={this.onSearch}/>
 
-          <Tasks tasks={[].concat(this.state.queue, this.state.activity)}
-                 onTaskCanceled={this.onTaskCanceled}
-                 onFilter={this.handleFilter}/>
+          <Tasks {...this.props}
+              tasks={[].concat(this.state.queue, this.state.activity)}
+              onTaskCanceled={this.onTaskCanceled}
+              onFilter={this.handleFilter}/>
 
           <ListFooter count={this.state.queue.length + this.state.activity.length}
                       total={this.state.queue.length + this.state.activityTotal}

diff --git a/server/sonar-web/src/main/js/apps/background-tasks/search.js b/server/sonar-web/src/main/js/apps/background-tasks/search.js
index 6a6d96a79165e8e75fdec0a9d39ee87e29f9bc3c..92f9cc5d1a8281704c3de8cd7f1eaed89d4b2645 100644 (file)
--- a/server/sonar-web/src/main/js/apps/background-tasks/search.js
+++ b/server/sonar-web/src/main/js/apps/background-tasks/search.js
@@ -94,7 +94,7 @@ export default React.createClass({
   },
 
   renderSearchBox() {
-    if (this.props.options.componentId) {
+    if (this.props.options.component) {
       // do not render search form on the project-level page
       return null;
     }

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 1b71cf473b1dd930f2dbd7c0334d0e950b04c12a..ffd4af2782dce917a5b0c2651a68eb09c56371d3 100644 (file)
--- a/server/sonar-web/src/main/js/apps/background-tasks/tasks.js
+++ b/server/sonar-web/src/main/js/apps/background-tasks/tasks.js
@@ -93,6 +93,9 @@ export default React.createClass({
   },
 
   renderFilter(task) {
+    if (this.props.options.component) {
+      return null;
+    }
     return <td className="thin nowrap">
       <a onClick={this.handleFilter.bind(this, task)} className="icon-filter icon-half-transparent spacer-left" href="#"
          title={`Show only "${task.componentName}" tasks`} data-toggle="tooltip"/>