SONAR-5718 Add filters manage link. Update the link on the management page

diff --git a/server/sonar-web/src/main/hbs/issues/issues-filters.hbs b/server/sonar-web/src/main/hbs/issues/issues-filters.hbs
index 066b9dfc7975e26d43c1b38d2663a815c04a6a95..b9e3266e3ca2755e52f2d4999b08180c28ebd155 100644 (file)
--- a/server/sonar-web/src/main/hbs/issues/issues-filters.hbs
+++ b/server/sonar-web/src/main/hbs/issues/issues-filters.hbs
@@ -3,6 +3,7 @@
     <a class="issues-filters-button issues-filters-filter js-issues-filter" data-id="{{id}}">{{name}}</a>
     <br>
   {{/each}}
+  <a class="issues-filters-manage" href="{{link '/issues/manage'}}"><i class="icon-settings"></i> {{t 'manage'}}</a>
 </div>
 
 <div class="issues-filters-header">

diff --git a/server/sonar-web/src/main/js/common/handlebars-extensions.js b/server/sonar-web/src/main/js/common/handlebars-extensions.js
index e927143b7c18b75383197eeedf07529bc1147511..be2b40962d8623e00dfb3fe2692a79354c69e997 100644 (file)
--- a/server/sonar-web/src/main/js/common/handlebars-extensions.js
+++ b/server/sonar-web/src/main/js/common/handlebars-extensions.js
@@ -26,6 +26,10 @@ define(['handlebars'], function (Handlebars) {
     console.log.apply(console, args);
   });
 
+  Handlebars.registerHelper('link', function(url) {
+    return baseUrl + url;
+  });
+
   Handlebars.registerHelper('capitalize', function(string) {
     return string.charAt(0).toUpperCase() + string.slice(1).toLowerCase();
   });

diff --git a/server/sonar-web/src/main/less/issues.less b/server/sonar-web/src/main/less/issues.less
index bbb0fb80b0b170fb859f7cbeb5c6a57589135ac6..b6e6470387081c239c960c8d5d8ff78415e78990 100644 (file)
--- a/server/sonar-web/src/main/less/issues.less
+++ b/server/sonar-web/src/main/less/issues.less
@@ -194,6 +194,12 @@
   float: right;
 }
 
+.issues-filters-manage {
+  display: inline-block;
+  margin-top: 4px;
+  border-bottom: none;
+}
+
 .issues-workspace {
   padding-left: @sideWidth;
 }

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/manage.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/manage.html.erb
index 619b9f780681573a59e4a1ff4ebef5b6d6d4dece..91b926997cbceb4cc1af7abf4dc36cd91ec75830 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/manage.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/manage.html.erb
@@ -59,7 +59,7 @@
               <%= issue_filter_star(filter, @favourite_filter_ids.include?(filter.id)) -%>
             </td>
             <td>
-              <a href="<%= ApplicationController.root_context -%>/issues/search#id=<%= h filter.id -%>|<%= h filter.data -%>"><%= h filter.name -%></a>
+              <a href="<%= ApplicationController.root_context -%>/issues/search#id=<%= h filter.id -%>"><%= h filter.name -%></a>
               <% if filter.description %>
                 <div class="note"><%= h filter.description -%></div>
               <% end %>