From c606b1522b56e240a99e4b4f31bee3c4f37edd76 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Lievremont Date: Fri, 31 Jan 2014 10:27:40 +0100 Subject: [PATCH] SONAR-4935 Add marker tag for project dashboards, to protect navigation from recent list and search --- .../src/main/webapp/WEB-INF/app/views/dashboard/index.html.erb | 3 +++ sonar-server/src/main/webapp/javascripts/application.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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 554737b88ac..47a9cb7d7b6 100644 --- 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 @@
+ <% if @resource -%> + + <% end -%> <%= render :partial => 'header', :locals => {:back => false} %>
<% diff --git a/sonar-server/src/main/webapp/javascripts/application.js b/sonar-server/src/main/webapp/javascripts/application.js index f784c82a5b7..9943ee25222 100644 --- 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] + "&"); } -- 2.39.5