aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-web/src/main/js/components/issue
diff options
context:
space:
mode:
authorStas Vilchik <vilchiks@gmail.com>2015-08-12 11:23:22 +0200
committerStas Vilchik <vilchiks@gmail.com>2015-08-13 10:49:41 +0200
commit91e29d47a06b3f5c7dd48bd19447a639b3b7de4c (patch)
treef548f32a3987b51986df32ef1dfb126cc8279574 /server/sonar-web/src/main/js/components/issue
parentaaa5554c0a8e5478ad94739933784bdb59d60270 (diff)
downloadsonarqube-91e29d47a06b3f5c7dd48bd19447a639b3b7de4c.tar.gz
sonarqube-91e29d47a06b3f5c7dd48bd19447a639b3b7de4c.zip
SONAR-6765 SONAR-6766 show multiple issue locations and execution flows
Diffstat (limited to 'server/sonar-web/src/main/js/components/issue')
-rw-r--r--server/sonar-web/src/main/js/components/issue/issue-view.js7
-rw-r--r--server/sonar-web/src/main/js/components/issue/templates/issue.hbs13
2 files changed, 17 insertions, 3 deletions
diff --git a/server/sonar-web/src/main/js/components/issue/issue-view.js b/server/sonar-web/src/main/js/components/issue/issue-view.js
index 14e83e689e4..aad34a2d04c 100644
--- a/server/sonar-web/src/main/js/components/issue/issue-view.js
+++ b/server/sonar-web/src/main/js/components/issue/issue-view.js
@@ -37,7 +37,8 @@ define([
'click .js-issue-plan': 'plan',
'click .js-issue-show-changelog': 'showChangeLog',
'click .js-issue-rule': 'showRule',
- 'click .js-issue-edit-tags': 'editTags'
+ 'click .js-issue-edit-tags': 'editTags',
+ 'click .js-issue-locations': 'showLocations'
};
},
@@ -217,6 +218,10 @@ define([
this.popup.render();
},
+ showLocations: function () {
+ this.model.trigger('locations', this.model);
+ },
+
serializeData: function () {
var issueKey = encodeURIComponent(this.model.get('key'));
return _.extend(Marionette.ItemView.prototype.serializeData.apply(this, arguments), {
diff --git a/server/sonar-web/src/main/js/components/issue/templates/issue.hbs b/server/sonar-web/src/main/js/components/issue/templates/issue.hbs
index 930e5ca5693..06e878f7b8f 100644
--- a/server/sonar-web/src/main/js/components/issue/templates/issue.hbs
+++ b/server/sonar-web/src/main/js/components/issue/templates/issue.hbs
@@ -4,7 +4,8 @@
<tr>
<td>
<div class="issue-message">
- {{message}}&nbsp;<button class="button-link js-issue-rule issue-rule icon-ellipsis-h"></button>
+ {{message}}&nbsp;
+ <button class="button-link js-issue-rule issue-rule icon-ellipsis-h"></button>
</div>
</td>
@@ -22,6 +23,14 @@
</li>
{{/if}}
+ {{#notEmpty secondaryLocations}}
+ <li class="issue-meta issue-meta-locations">
+ <button class="button-link issue-action js-issue-locations">
+ <i class="icon-issue-flow"></i>
+ </button>
+ </li>
+ {{/notEmpty}}
+
<li class="issue-meta">
<a class="js-issue-permalink icon-link" href="{{permalink}}" target="_blank"></a>
</li>
@@ -143,7 +152,7 @@
{{#if updatable}}
<button class="js-issue-comment-edit button-link icon-edit icon-half-transparent"></button>
<button class="js-issue-comment-delete button-link icon-delete icon-half-transparent"
- data-confirm-msg="{{t 'issue.comment.delete_confirm_message'}}"></button>
+ data-confirm-msg="{{t 'issue.comment.delete_confirm_message'}}"></button>
{{/if}}
</div>
</div>