diff options
| author | Stas Vilchik <vilchiks@gmail.com> | 2015-03-20 15:21:07 +0100 |
|---|---|---|
| committer | Stas Vilchik <vilchiks@gmail.com> | 2015-03-20 15:21:07 +0100 |
| commit | 42931ed57d0d1e0f2e0e35ad591ecfd75bbb94c1 (patch) | |
| tree | 6bb13854cfcccd83cc911ecff48100eea6191b76 /server | |
| parent | eae4136f9dfdf20c64705d8639e6b3e39831c146 (diff) | |
| download | sonarqube-42931ed57d0d1e0f2e0e35ad591ecfd75bbb94c1.tar.gz sonarqube-42931ed57d0d1e0f2e0e35ad591ecfd75bbb94c1.zip | |
SONAR-5968 apply feedback
Diffstat (limited to 'server')
3 files changed, 15 insertions, 13 deletions
diff --git a/server/sonar-web/src/main/coffee/issues/workspace-list-item-view.coffee b/server/sonar-web/src/main/coffee/issues/workspace-list-item-view.coffee index 8c52c44898f..50cd234bac6 100644 --- a/server/sonar-web/src/main/coffee/issues/workspace-list-item-view.coffee +++ b/server/sonar-web/src/main/coffee/issues/workspace-list-item-view.coffee @@ -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 diff --git a/server/sonar-web/src/main/hbs/issues/issues-issue-filter-form.hbs b/server/sonar-web/src/main/hbs/issues/issues-issue-filter-form.hbs index f8f6f1d41fa..01515749698 100644 --- a/server/sonar-web/src/main/hbs/issues/issues-issue-filter-form.hbs +++ b/server/sonar-web/src/main/hbs/issues/issues-issue-filter-form.hbs @@ -19,10 +19,6 @@ </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}} @@ -43,14 +39,17 @@ </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> {{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> {{this}} + </a> + {{/each}} <hr> 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 fd82874005a..a77e318c13e 100644 --- a/server/sonar-web/src/main/js/common/handlebars-extensions.js +++ b/server/sonar-web/src/main/js/common/handlebars-extensions.js @@ -492,7 +492,8 @@ }); Handlebars.registerHelper('limitString', function (str) { - return str.substr(0, 30) + '...'; + var LIMIT = 30; + return str.length > LIMIT ? str.substr(0, LIMIT) + '...' : str; }); })(); |