diff options
| author | Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com> | 2013-10-02 16:25:00 +0200 |
|---|---|---|
| committer | Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com> | 2013-10-02 16:54:39 +0200 |
| commit | 322eae37aad3f6553f84e3499421f6709ee7c440 (patch) | |
| tree | 561a8381dcdf8e6c8f8418afd5fda550c52dbcb4 /sonar-server | |
| parent | c476c8d215d24c443d7c35f56706a5184b35a8c5 (diff) | |
| download | sonarqube-322eae37aad3f6553f84e3499421f6709ee7c440.tar.gz sonarqube-322eae37aad3f6553f84e3499421f6709ee7c440.zip | |
SONAR-3871 Open empty dashboard instead of settings
Diffstat (limited to 'sonar-server')
4 files changed, 6 insertions, 6 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/dashboard_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/dashboard_controller.rb index 92819c4ce0b..1f2e08343f1 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/dashboard_controller.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/dashboard_controller.rb @@ -29,7 +29,7 @@ class DashboardController < ApplicationController if !@resource || @resource.display_dashboard? load_dashboard() load_authorized_widget_definitions() - elsif @snapshot + else # display the layout of the parent without the sidebar, usually the directory, but display the file viewers @hide_sidebar = true @file = @resource @@ -201,7 +201,7 @@ class DashboardController < ApplicationController end def project_not_analyzed - redirect_to :controller => :project, :action => :settings, :id => @resource + render :action => 'empty' end def load_authorized_widget_definitions diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/empty.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/empty.html.erb new file mode 100644 index 00000000000..93ed458d0f6 --- /dev/null +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/empty.html.erb @@ -0,0 +1,3 @@ +<% if @resource and !@snapshot %> +<p class="info marginbottom10"><%= message('provisioning.no_analysis') -%></p> +<% end %> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/provisioning/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/provisioning/index.html.erb index 19b7c0a76af..881dbaa1207 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/provisioning/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/provisioning/index.html.erb @@ -26,7 +26,7 @@ <tr id="entry-<%= h resource.key -%>" class="<%= cycle 'even', 'odd' -%>"> <td> - <%= link_to h(resource.key), {:controller => :project, :action => :settings, :id => resource.id}, + <%= link_to h(resource.key), {:controller => :project, :id => resource.id}, :id => "view-#{u resource.key}" %> </td> <td><%= resource.name %></td> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_settings.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_settings.html.erb index 5809c89db54..323ea8e0e05 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_settings.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_settings.html.erb @@ -1,8 +1,5 @@ <div id="plugins"> <h1 class="marginbottom10"><%= message(@resource ? 'project_settings.page' : 'settings.page') -%></h1> - <% if @resource and !@snapshot %> - <p class="info marginbottom10"><%= message('provisioning.no_analysis') -%></p> - <% end %> <table width="100%"> <tr> |