diff options
| author | Stas Vilchik <vilchiks@gmail.com> | 2014-10-31 17:16:47 +0100 |
|---|---|---|
| committer | Stas Vilchik <vilchiks@gmail.com> | 2014-10-31 17:16:47 +0100 |
| commit | 19a6905ce6c877f1497b2ce47b7aeb478591b036 (patch) | |
| tree | 110ad51aa04dbf32bd020d4009d26c0af464b54f | |
| parent | b41b58cf42a8b90351b6a788558a3720e33c01c7 (diff) | |
| download | sonarqube-19a6905ce6c877f1497b2ce47b7aeb478591b036.tar.gz sonarqube-19a6905ce6c877f1497b2ce47b7aeb478591b036.zip | |
SONAR-5718 Add filters manage link. Update the link on the management page
4 files changed, 12 insertions, 1 deletions
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 066b9dfc797..b9e3266e3ca 100644 --- 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 e927143b7c1..be2b40962d8 100644 --- 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 bbb0fb80b0b..b6e64703870 100644 --- 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 619b9f78068..91b926997cb 100644 --- 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 %> |