SONAR-4392 Display Filter name if filter is selected

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/issues_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/issues_controller.rb
index 95bb0d1b177d79adc36e96c7af9fc8dd326b888a..20612978038a7f99a0c188fb77f7d018dd880fbb 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/issues_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/issues_controller.rb
@@ -49,6 +49,7 @@ class IssuesController < ApplicationController
     @unchanged = true
 
     @criteria_params = criteria_params
+    @filter = find_filter(params[:id].to_i)
     issue_filter_result = Internal.issues.execute(params[:id].to_i, @criteria_params)
     @issue_query = issue_filter_result.query
     @issues_result = issue_filter_result.result

diff --git a/sonar-server/src/test/java/org/sonar/server/issue/IssueFilterServiceTest.java b/sonar-server/src/test/java/org/sonar/server/issue/IssueFilterServiceTest.java
index d7690d7278bebf9a0e385338db4676ad041a6181..0dd94324cbbd56a155a8cb208befaf75b848cddb 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/issue/IssueFilterServiceTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/issue/IssueFilterServiceTest.java
@@ -231,6 +231,7 @@ public class IssueFilterServiceTest {
 
     DefaultIssueFilter result = service.update(new DefaultIssueFilter().setId(1L).setName("My New Filter"), userSession);
     assertThat(result.name()).isEqualTo("My New Filter");
+    assertThat(result.shared()).isFalse();
 
     verify(issueFilterDao).update(any(IssueFilterDto.class));
   }