]> source.dussan.org Git - sonarqube.git/commitdiff
SONAR-6243 apply feedback
authorStas Vilchik <vilchiks@gmail.com>
Fri, 20 Mar 2015 10:11:21 +0000 (11:11 +0100)
committerStas Vilchik <vilchiks@gmail.com>
Fri, 20 Mar 2015 10:39:18 +0000 (11:39 +0100)
plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/issue_filter.html.erb
server/sonar-web/src/main/hbs/issues/facets/issues-assignee-facet.hbs

index 8115a0681dc80afead32535fee7fc98a6144fa7b..6e5203df6c15ed185adb696d9873f3f9d4ef9216 100644 (file)
 
     <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 %>
index 466506c98549ba1148b46a901d86257b17e79445..9654cf06f1ef204adb587f7dcaf4571c33039f02 100644 (file)
@@ -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 }}