SONAR-4935 Add marker tag for project dashboards, to protect navigation from recent...

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/index.html.erb
index 554737b88acbe88e07e1c5c011d2ed26376849f8..47a9cb7d7b6cd83dc67a2593c7a73e02ec33c3d1 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/index.html.erb
@@ -1,4 +1,7 @@
 <div id="dashboard">
+  <% if @resource -%>
+  <span class="hidden" id="is-project-dashboard">&nbsp;</span>
+  <% end -%>
   <%= render :partial => 'header', :locals => {:back => false} %>
   <div style="width: 100%;display: block; float: none">
     <%

diff --git a/sonar-server/src/main/webapp/javascripts/application.js b/sonar-server/src/main/webapp/javascripts/application.js
index f784c82a5b7c211e0615be9390feda4e72b34b23..9943ee25222e5b0d5adfb9db25c358b98dd455e5 100644 (file)
--- a/sonar-server/src/main/webapp/javascripts/application.js
+++ b/sonar-server/src/main/webapp/javascripts/application.js
@@ -26,7 +26,7 @@ function dashboardParameters() {
   var parameters = "";
 
   var matchDashboard = queryString.match(/did=\d+/);
-  if (matchDashboard) {
+  if (matchDashboard && $j('#is-project-dashboard').length === 1) {
     parameters += (matchDashboard[0] + "&");
   }