SONAR-6331 fix display of the overview page of provisioned projects

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/dashboard_controller.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/dashboard_controller.rb
index 338d95ed2ac23fbc13e6a44e9baf2940898085b7..7e5101285b0c24bb7b2ac994e6fb0a6fff5a6386 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/dashboard_controller.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/dashboard_controller.rb
@@ -216,7 +216,7 @@ class DashboardController < ApplicationController
   end
 
   def redirect_if_overview
-    if @resource && !params[:did] && !params[:name]
+    if @resource && @snapshot && !params[:did] && !params[:name]
       redirect_to :controller => 'overview', :action => 'index', :id => @resource.key
     end
   end

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/overview/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/overview/index.html.erb
index 4627c31d9115e5853beaedb808e00d1ba555baa5..48eb422c5d91430586be38017b778f3fb6e2106b 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/overview/index.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/overview/index.html.erb
@@ -1,34 +1,40 @@
-<div class="overview"></div>
+<% if @snapshot %>
+  <div class="overview"></div>
 
-<%
-   period1Name = short_period_label(@snapshot, 1)
-   period2Name = short_period_label(@snapshot, 2)
-   period3Name = short_period_label(@snapshot, 3)
+  <%
+     period1Name = short_period_label(@snapshot, 1)
+     period2Name = short_period_label(@snapshot, 2)
+     period3Name = short_period_label(@snapshot, 3)
 
-   period1Date = @snapshot.period_datetime(1)
-   period2Date = @snapshot.period_datetime(2)
-   period3Date = @snapshot.period_datetime(3)
-%>
+     period1Date = @snapshot.period_datetime(1)
+     period2Date = @snapshot.period_datetime(2)
+     period3Date = @snapshot.period_datetime(3)
+  %>
 
-<script>
-  window.overviewConf = {
-    <% if period1Date %>
-    period1Name: '<%= period1Name -%>',
-    period1Date: '<%= period1Date.strftime('%FT%T%z') -%>',
-    <% end %>
+  <script>
+    window.overviewConf = {
+      <% if period1Date %>
+      period1Name: '<%= period1Name -%>',
+      period1Date: '<%= period1Date.strftime('%FT%T%z') -%>',
+      <% end %>
 
-    <% if period2Date %>
-    period2Name: '<%= period2Name -%>',
-    period2Date: '<%= period2Date.strftime('%FT%T%z') -%>',
-    <% end %>
+      <% if period2Date %>
+      period2Name: '<%= period2Name -%>',
+      period2Date: '<%= period2Date.strftime('%FT%T%z') -%>',
+      <% end %>
 
-    <% if period3Date %>
-    period3Name: '<%= period3Name -%>',
-    period3Date: '<%= period3Date.strftime('%FT%T%z') -%>',
-    <% end %>
+      <% if period3Date %>
+      period3Name: '<%= period3Name -%>',
+      period3Date: '<%= period3Date.strftime('%FT%T%z') -%>',
+      <% end %>
 
-    componentKey: '<%= @resource.key -%>',
-    componentUuid: '<%= @resource.uuid -%>'
-  };
-  require(['overview/app']);
-</script>
+      componentKey: '<%= @resource.key -%>',
+      componentUuid: '<%= @resource.uuid -%>'
+    };
+    require(['overview/app']);
+  </script>
+<% else %>
+  <div class="page">
+    <p class="alert alert-warning"><%= message('provisioning.no_analysis') -%></p>
+  </div>
+<% end %>