]> source.dussan.org Git - sonarqube.git/commitdiff
SONAR-5968 apply feedback 160/head
authorStas Vilchik <vilchiks@gmail.com>
Fri, 20 Mar 2015 14:21:07 +0000 (15:21 +0100)
committerStas Vilchik <vilchiks@gmail.com>
Fri, 20 Mar 2015 14:21:07 +0000 (15:21 +0100)
server/sonar-web/src/main/coffee/issues/workspace-list-item-view.coffee
server/sonar-web/src/main/hbs/issues/issues-issue-filter-form.hbs
server/sonar-web/src/main/js/common/handlebars-extensions.js

index 8c52c44898fb282f5cec2a63cc95d7c09a601ec2..50cd234bac6e8b15a6ac92e1db22e9a554e4bb06 100644 (file)
@@ -30,6 +30,7 @@ define [
   $ = jQuery
 
   SHOULD_NULL =
+    any: ['issues']
     resolutions: ['resolved']
     resolved: ['resolutions']
     assignees: ['assigned']
@@ -71,6 +72,7 @@ define [
       @popup.on 'select', (property, value) =>
         obj = {}
         obj[property] = '' + value
+        SHOULD_NULL.any.forEach (p) -> obj[p] = null
         if SHOULD_NULL[property]?
           SHOULD_NULL[property].forEach (p) -> obj[p] = null
         @options.app.state.updateFilter obj
index f8f6f1d41fa2cfb5f337b42264f8ce216827294f..0151574969872af4eb90a8b52a3c701d57d9b8ac 100644 (file)
     </a>
   {{/if}}
 
-  <a href="#" class="issue-action-option" data-property="rules" data-value="{{rule}}">
-    {{limitString ruleName}}
-  </a>
-
   {{#if assignee}}
     <a href="#" class="issue-action-option" data-property="assignees" data-value="{{assignee}}">
       {{t 'assigned_to'}} {{assigneeName}}
     </a>
   {{/if}}
 
-  {{#notEmpty tags}}
-    <hr>
-    {{#each tags}}
-      <a href="#" class="issue-action-option" data-property="tags" data-value="{{this}}">
-        <i class="icon-tags icon-half-transparent"></i>&nbsp;{{this}}
-      </a>
-    {{/each}}
-  {{/notEmpty}}
+  <hr>
+
+  <a href="#" class="issue-action-option" data-property="rules" data-value="{{rule}}">
+    {{limitString ruleName}}
+  </a>
+
+  {{#each tags}}
+    <a href="#" class="issue-action-option" data-property="tags" data-value="{{this}}">
+      <i class="icon-tags icon-half-transparent"></i>&nbsp;{{this}}
+    </a>
+  {{/each}}
 
   <hr>
 
index fd82874005ad0c6c6497fcc174be76c4d4e123ad..a77e318c13e27be133728cee4a5bdaa3593eeb33 100644 (file)
   });
 
   Handlebars.registerHelper('limitString', function (str) {
-    return str.substr(0, 30) + '...';
+    var LIMIT = 30;
+    return str.length > LIMIT ? str.substr(0, LIMIT) + '...' : str;
   });
 
 })();