From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Thu, 28 Aug 2014 12:19:06 +0000 (+0200)
Subject: Restore period option from link_to_resource because it's used on project
X-Git-Tag: 4.5-RC1~52
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=819ad25a12f354fbdb4d21d31419097187b0baeb;p=sonarqube.git

Restore period option from link_to_resource because it's used on project
---

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/application_helper.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
index 9830f89dd3b..5624de3a9ce 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
@@ -309,6 +309,8 @@ module ApplicationHelper
   #
   #
   def link_to_resource(resource, name=nil, options={})
+    period_index=options[:period]
+    period_index=nil if period_index && period_index<=0
     if resource.display_dashboard?
       if options[:dashboard]
         root = "#{ApplicationController.root_context}/dashboard/index?"
@@ -320,6 +322,7 @@ module ApplicationHelper
       query = request.query_parameters
       query[:id] = resource.id
       query[:metric] = options[:metric] if options[:metric]
+      query[:period] = period_index if period_index
       query.each do |key, value|
         path += '&' unless path.empty?
         path += "#{u key}=#{u value}"
@@ -327,6 +330,7 @@ module ApplicationHelper
       "<a class='#{options[:class]}' title='#{options[:title]}' href='#{root + path}'>#{name || resource.name}</a>"
     else
       url = "#{ApplicationController.root_context}/dashboard/index?id=#{u resource.key}"
+      url += "&period=#{u period_index}" if period_index
       url += "&metric=#{u options[:metric]}" if options[:metric]
       "<a class='#{options[:class]}' title='#{options[:title]}' " +
           "onclick='window.open(this.href,\"resource-#{resource.key.parameterize}\",\"\");return false;' " +