diff options
| author | Stas Vilchik <vilchiks@gmail.com> | 2014-06-26 12:47:23 +0600 |
|---|---|---|
| committer | Stas Vilchik <vilchiks@gmail.com> | 2014-06-26 12:47:23 +0600 |
| commit | e004f2500aee5db88b55f07c4a0136d68ac07b1a (patch) | |
| tree | 1139d7b6f68de966c415fed42c2d5bddf0a98d4e /sonar-server/src | |
| parent | 69d0672f0e57563c042656644c26f33150028728 (diff) | |
| download | sonarqube-e004f2500aee5db88b55f07c4a0136d68ac07b1a.tar.gz sonarqube-e004f2500aee5db88b55f07c4a0136d68ac07b1a.zip | |
SONAR-5209 Show project name in the duplications popup
Diffstat (limited to 'sonar-server/src')
| -rw-r--r-- | sonar-server/src/main/coffee/component-viewer/duplication-popup.coffee | 1 | ||||
| -rw-r--r-- | sonar-server/src/main/hbs/component-viewer/duplicationPopup.hbs | 15 |
2 files changed, 11 insertions, 5 deletions
diff --git a/sonar-server/src/main/coffee/component-viewer/duplication-popup.coffee b/sonar-server/src/main/coffee/component-viewer/duplication-popup.coffee index ebd2b77d07f..eff49a31c8c 100644 --- a/sonar-server/src/main/coffee/component-viewer/duplication-popup.coffee +++ b/sonar-server/src/main/coffee/component-viewer/duplication-popup.coffee @@ -46,4 +46,5 @@ define [ duplications = _.map groupedBlocks, (blocks, fileRef) -> blocks: blocks file: files[fileRef] + component: @options.main.component.toJSON() duplications: duplications diff --git a/sonar-server/src/main/hbs/component-viewer/duplicationPopup.hbs b/sonar-server/src/main/hbs/component-viewer/duplicationPopup.hbs index 0098740c9ec..fcc21de99c5 100644 --- a/sonar-server/src/main/hbs/component-viewer/duplicationPopup.hbs +++ b/sonar-server/src/main/hbs/component-viewer/duplicationPopup.hbs @@ -1,11 +1,16 @@ <div class="component-viewer-popup-container"> <div class="component-viewer-popup-title">{{t 'component_viewer.transition.duplication'}}</div> - {{#each duplications}} <div class="component-viewer-popup-section"> - <a class="link-action" data-key="{{file.key}}" title="{{file.name}}"> - {{file.name}} - </a> + {{#eq file.projectName ../component.projectName}} + <a class="link-action" data-key="{{file.key}}" title="{{file.name}}"> + {{file.name}} + </a> + {{else}} + <a class="link-action" data-key="{{file.key}}" title="{{file.projectName}}:{{file.name}}"> + {{file.projectName}}:{{file.name}} + </a> + {{/eq}} <div class="component-viewer-popup-duplications"> Lines: {{#joinEach blocks ','}} @@ -18,4 +23,4 @@ {{/each}} </div> -<div class="component-viewer-popup-arrow"></div>
\ No newline at end of file +<div class="component-viewer-popup-arrow"></div> |