summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStas Vilchik <vilchiks@gmail.com>2014-06-30 12:17:33 +0600
committerStas Vilchik <vilchiks@gmail.com>2014-06-30 12:17:54 +0600
commit0047b0489f6e87d951c0d2836499f48e3a2ea04a (patch)
tree54f0bc5f0adebd072fe51bc849bb08d8a353b3c7
parent38ed812f5aae9f1d54ceee0d7e1d339897245145 (diff)
downloadsonarqube-0047b0489f6e87d951c0d2836499f48e3a2ea04a.tar.gz
sonarqube-0047b0489f6e87d951c0d2836499f48e3a2ea04a.zip
SONAR-5209 Duplications inside deleted resources
-rw-r--r--sonar-core/src/main/resources/org/sonar/l10n/core.properties1
-rw-r--r--sonar-server/src/main/hbs/component-viewer/duplicationPopup.hbs2
-rw-r--r--sonar-server/src/main/hbs/component-viewer/source.hbs4
3 files changed, 5 insertions, 2 deletions
diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index 302023e7cec..0e99bdfbadc 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -1343,6 +1343,7 @@ issues_viewer.issue_filter.unplanned=Unplanned
duplications.no_duplicated_block=No duplicated blocks.
duplications.dups_found_on_deleted_resource=This file contains duplicated blocks with some deleted resources. This project should be reanalyzed to remove these obsolete duplicated blocks.
+duplications.block_was_duplicated_by_a_deleted_resource=This block was duplicated by a resource that has been deleted.
duplications.old_format_should_reanalyze=This file contains duplications but a new analysis must be done in order to be able to display them.
duplications.blocks=Blocks
duplications.number_of_lines=Nb Lines
diff --git a/sonar-server/src/main/hbs/component-viewer/duplicationPopup.hbs b/sonar-server/src/main/hbs/component-viewer/duplicationPopup.hbs
index fcc21de99c5..5ca853ca564 100644
--- a/sonar-server/src/main/hbs/component-viewer/duplicationPopup.hbs
+++ b/sonar-server/src/main/hbs/component-viewer/duplicationPopup.hbs
@@ -20,6 +20,8 @@
{{/joinEach}}
</div>
</div>
+ {{else}}
+ {{t 'duplications.block_was_duplicated_by_a_deleted_resource'}}
{{/each}}
</div>
diff --git a/sonar-server/src/main/hbs/component-viewer/source.hbs b/sonar-server/src/main/hbs/component-viewer/source.hbs
index 7105d7739cb..1e7a2b40766 100644
--- a/sonar-server/src/main/hbs/component-viewer/source.hbs
+++ b/sonar-server/src/main/hbs/component-viewer/source.hbs
@@ -1,11 +1,11 @@
{{#if state.sourceSecurity}}
-<p>{{t 'code_viewer.no_source_code_displayed_due_to_security'}}</p>
+ <p>{{t 'code_viewer.no_source_code_displayed_due_to_security'}}</p>
{{else}}
{{#if state.duplicationsInDeletedFiles}}
- <p>{{t 'duplications.dups_found_on_deleted_resource'}}</p>
+ <p class="marginbottom10">{{t 'duplications.dups_found_on_deleted_resource'}}</p>
{{/if}}
<table class="code">