keep period when go to a different dashboard

1 files changed, 19 insertions, 3 deletions

diff --git a/server/sonar-web/src/main/js/components/common/handlebars-extensions.js b/server/sonar-web/src/main/js/components/common/handlebars-extensions.js
index 46d0a78b18a..bf4e49be9f2 100644
--- a/server/sonar-web/src/main/js/components/common/handlebars-extensions.js
+++ b/server/sonar-web/src/main/js/components/common/handlebars-extensions.js
@@ -35,8 +35,24 @@
   });
 
   Handlebars.registerHelper('componentDashboardPermalink', function (componentKey, dashboardKey) {
-    return baseUrl + '/dashboard/index?id=' + encodeURIComponent(componentKey) +
-        '&did=' + encodeURIComponent(dashboardKey);
+    var params = [
+      { key: 'id', value: componentKey },
+      { key: 'did', value: dashboardKey }
+    ];
+
+    var matchPeriod = window.location.search.match(/period=(\d+)/);
+    if (matchPeriod) {
+       // If we have a match for period, check that it is not project-specific
+      var period = parseInt(matchPeriod[1], 10);
+      if (period <= 3) {
+        params.push({ key: 'period', value: period });
+      }
+    }
+
+    var query = params.map(function (p) {
+      return p.key + '=' + encodeURIComponent(p.value);
+    }).join('&');
+    return baseUrl + '/dashboard/index?' + query;
   });
 
   Handlebars.registerHelper('componentBrowsePermalink', function (componentKey) {
@@ -471,7 +487,7 @@
         changed = true;
     if (currentLine && prevLine && currentLine.scm && prevLine.scm) {
       changed = (currentLine.scm.author !== prevLine.scm.author) ||
-      (currentLine.scm.date !== prevLine.scm.date) || (!prevLine.show);
+          (currentLine.scm.date !== prevLine.scm.date) || (!prevLine.show);
     }
     return changed ? options.fn(this) : options.inverse(this);
   });