SONAR-5209 Show project name in the duplications popup

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 ebd2b77d07f08712dbf2484b3150e7b1ba617006..eff49a31c8c2fc651380da247cb7cbc589b2ff8d 100644 (file)
--- 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 0098740c9ec05c79de912e8578882fb7e9bd801d..fcc21de99c5300667fa6851aee4ca5bbae6e2a2f 100644 (file)
--- 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>