aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sonar-core/src/main/resources/org/sonar/l10n/core.properties1
-rw-r--r--sonar-server/src/main/coffee/component-viewer/main.coffee14
-rw-r--r--sonar-server/src/main/less/ui.less7
3 files changed, 18 insertions, 4 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 35a26c262a7..731f6756e42 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -2660,6 +2660,7 @@ component_viewer.get_permalink=Get Permalink
component_viewer.covered_lines=Covered Lines
component_viewer.issues_limit_reached=For usability reasons, only the {0} first issues will be fully displayed. Remaining issues will simply be underlined.
component_viewer.issues_limit_reached_tooltip={0}\n\nRefine your filter to be able to see the details of this issue.
+component_viewer.cannot_show=We're sorry, but something went wrong. Please try back in a few minutes and contact support if the problem persists.
component_viewer.workspace=Workspace
component_viewer.workspace.tooltip=Keeps track of history of navigation
diff --git a/sonar-server/src/main/coffee/component-viewer/main.coffee b/sonar-server/src/main/coffee/component-viewer/main.coffee
index 6a7ea195a0c..775aa7b08bb 100644
--- a/sonar-server/src/main/coffee/component-viewer/main.coffee
+++ b/sonar-server/src/main/coffee/component-viewer/main.coffee
@@ -246,10 +246,16 @@ define [
if @settings.get('scm') then @showSCM() else @hideSCM()
@trigger 'loaded'
.fail =>
- @state.set 'removed', true
- @state.set 'hasSource', false
- @render()
- @trigger 'loaded'
+ if component.status == 404
+ @state.set 'removed', true
+ @state.set 'hasSource', false
+ @render()
+ @trigger 'loaded'
+ else @cannotOpen()
+
+
+ cannotOpen: ->
+ @$el.html "<div class='message-error'>#{t 'component_viewer.cannot_show'}</div>"
toggleWorkspace: (store = false) ->
diff --git a/sonar-server/src/main/less/ui.less b/sonar-server/src/main/less/ui.less
index c687af8f6ee..b4e98b5bd54 100644
--- a/sonar-server/src/main/less/ui.less
+++ b/sonar-server/src/main/less/ui.less
@@ -285,3 +285,10 @@ input[type=button] {
padding: 5px 8px;
border: 2px solid @orange;
}
+
+.message-error {
+ display: block;
+ padding: 5px 8px;
+ background-color: @red;
+ color: #fff;
+}