SONAR-5540 "http" should not be in the url

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 775a114120ada779051a0085500c0c2bbbc1124b..729770093977dc084ab0acb26d75a0167af4c83f 100644 (file)
--- 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
@@ -311,37 +311,46 @@ 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]
-        query = request.query_parameters.merge({:id => resource.id})
+        root = "#{ApplicationController.root_context}/dashboard/index?"
+        path = ''
+        query = request.query_parameters
+        query[:id] = resource.id
         query[:period] = period_index if period_index
         query[:tab] = options[:tab] if options[:tab]
         query[:rule] = options[:rule] if options[:rule]
-        url = URI::HTTP.build(:path => "#{ApplicationController.root_context}/dashboard/index", :query => query.to_query)
-        "<a class='#{options[:class]}' title='#{options[:title]}' href='#{url}'>#{h(name || resource.name)}</a>"
+        query.each do |key, value|
+          path += '&' unless path.empty?
+          path += "#{u key}=#{u value}"
+        end
+        "<a class='#{options[:class]}' title='#{options[:title]}' href='#{root + path}'>#{name || resource.name}</a>"
       else
         # stay on the same page (for example components)
-        query = request.query_parameters.merge({:id => resource.id})
+        root = "#{ApplicationController.root_context}/#{u params[:controller]}/#{u params[:action]}?"
+        path = ''
+        query = request.query_parameters
+        query[:id] = resource.id
         query[:period] = period_index if period_index
         query[:tab] = options[:tab] if options[:tab]
         query[:rule] = options[:rule] if options[:rule]
-        url = URI::HTTP.build(:path => "#{ApplicationController.root_context}/#{u params[:controller]}/#{u params[:action]}", :query => query.to_query)
-        "<a class='#{options[:class]}' title='#{options[:title]}' href='#{url}'>#{h(name || resource.name)}</a>"
+        query.each do |key, value|
+          path += '&' unless path.empty?
+          path += "#{u key}=#{u value}"
+        end
+        "<a class='#{options[:class]}' title='#{options[:title]}' href='#{root + path}'>#{name || resource.name}</a>"
       end
     else
-      query = {:id => resource.id}
-      query[:period] = period_index if period_index
-      query[:tab] = options[:tab] if options[:tab]
-      query[:rule] = options[:rule] if options[:rule]
-      query[:metric] = options[:metric] if options[:metric]
-      url = URI::HTTP.build(:path => "#{ApplicationController.root_context}/dashboard/index", :query => query.to_query)
+      url = "#{ApplicationController.root_context}/dashboard/index?id=#{u resource.key}"
+      url += "&period=#{u period_index}" if period_index
+      url += "&tab=#{u options[:tab]}" if options[:tab]
+      url += "&rule=#{u options[:rule]}" if options[:rule]
+      url += "&metric=#{u options[:metric]}" if options[:metric]
       url += '#L' + options[:line].to_s if options[:line]
       "<a class='#{options[:class]}' title='#{options[:title]}' " +
           "onclick='window.open(this.href,\"resource-#{resource.key.parameterize}\",\"\");return false;' " +
-          "href='#{url}'>#{h(name || resource.name)}</a>"
+          "href='#{url}'>#{name || resource.name}</a>"
     end
-
   end
 
 

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb
index 3d7974dc9ea177f04f7710c20747728ad961157f..7b8d6f680e86709611f9ac8aef4a0f74c49f7e95 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb
@@ -80,9 +80,15 @@
             <%= qualifier_icon(resource) -%>
             &nbsp;
             <%=
-                query = request.query_parameters.merge({:id => resource.key})
-                url = URI::HTTP.build(:path => "#{ApplicationController.root_context}/#{u resource_link[:controller]}/#{u resource_link[:action]}", :query => query.to_query)
-                "<a href='#{url}'>#{h(resource.name)}</a>"
+                root = "#{ApplicationController.root_context}/#{u resource_link[:controller]}/#{u resource_link[:action]}?"
+                path = ''
+                query = request.query_parameters
+                query[:id] = resource.key
+                query.each do |key, value|
+                  path += '&' unless path.empty?
+                  path += "#{u key}=#{u value}"
+                end
+                "<a href='#{root + path}'>#{h(resource.name)}</a>"
             -%>
           </li>
         <%