diff options
| author | Stas Vilchik <vilchiks@gmail.com> | 2015-03-20 11:11:21 +0100 |
|---|---|---|
| committer | Stas Vilchik <vilchiks@gmail.com> | 2015-03-20 11:39:18 +0100 |
| commit | 27a74b7027f06676d632ac7db3a9bae332042a3c (patch) | |
| tree | 15e175ea979d35a8059583a97c96bfda6ba4847e | |
| parent | cbc7731b65c448bef785addcbf5e40a2991cdfc6 (diff) | |
| download | sonarqube-27a74b7027f06676d632ac7db3a9bae332042a3c.tar.gz sonarqube-27a74b7027f06676d632ac7db3a9bae332042a3c.zip | |
SONAR-6243 apply feedback
| -rw-r--r-- | plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/issue_filter.html.erb | 24 | ||||
| -rw-r--r-- | server/sonar-web/src/main/hbs/issues/facets/issues-assignee-facet.hbs | 3 |
2 files changed, 18 insertions, 9 deletions
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/issue_filter.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/issue_filter.html.erb index 8115a0681dc..6e5203df6c1 100644 --- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/issue_filter.html.erb +++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/issue_filter.html.erb @@ -14,15 +14,25 @@ <div id="<%= container_id -%>"></div> <script> - require(['widgets/issue-filter'], function (IssueFilter) { - window.requestMessages().done(function () { - new IssueFilter({ - el: '#<%= container_id -%>', - query: '<%= filter.data -%>', - distributionAxis: '<%= distribution_axis -%>' + (function () { + var query = '<%= filter.data -%>'; + // do not show widget if the filter contains "my" criterion, + // and a user is not authenticated + if (query && query.indexOf('__me__') !== -1 && !window.SS.user) { + jQuery('#<%= container_id -%>').closest('.block').addClass('hidden'); + return; + } + + require(['widgets/issue-filter'], function (IssueFilter) { + window.requestMessages().done(function () { + new IssueFilter({ + el: '#<%= container_id -%>', + query: query, + distributionAxis: '<%= distribution_axis -%>' + }); }); }); - }); + })(); </script> <% else %> diff --git a/server/sonar-web/src/main/hbs/issues/facets/issues-assignee-facet.hbs b/server/sonar-web/src/main/hbs/issues/facets/issues-assignee-facet.hbs index 466506c9854..9654cf06f1e 100644 --- a/server/sonar-web/src/main/hbs/issues/facets/issues-assignee-facet.hbs +++ b/server/sonar-web/src/main/hbs/issues/facets/issues-assignee-facet.hbs @@ -6,10 +6,9 @@ <span class="facet-name">{{t 'me'}}</span> <span class="facet-stat">{{myIssues}}</span> </a> + <hr> {{/notNull}} - <hr> - {{#each values}} {{#eq val ''}} {{! unassigned }} |