diff options
| author | Jenkins CI <ci@sonarsource.com> | 2014-10-23 08:01:27 +0200 |
|---|---|---|
| committer | Jenkins CI <ci@sonarsource.com> | 2014-10-23 08:01:27 +0200 |
| commit | a1ccfcc938316f435e9307025dc8a42852c77e45 (patch) | |
| tree | af03dddffe336f7d515f537ee2fd192e67ad5631 /server/sonar-web | |
| parent | f83f105bd3c60bdb275a0b8f8782193aa5554a39 (diff) | |
| parent | e0547b893e9d38be63711e65198b5189a047b0af (diff) | |
| download | sonarqube-a1ccfcc938316f435e9307025dc8a42852c77e45.tar.gz sonarqube-a1ccfcc938316f435e9307025dc8a42852c77e45.zip | |
Automatic merge from branch-4.5
* origin/branch-4.5:
Fix tooltip of "More Criteria" filter
Fix tooltip of query filter
SONAR-5762 Fix redirection on component viewer when opened in Eclipse browser
Diffstat (limited to 'server/sonar-web')
3 files changed, 12 insertions, 1 deletions
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/filters/query-filter-view.coffee b/server/sonar-web/src/main/coffee/coding-rules/views/filters/query-filter-view.coffee index 8da995491c2..ee8e70d044b 100644 --- a/server/sonar-web/src/main/coffee/coding-rules/views/filters/query-filter-view.coffee +++ b/server/sonar-web/src/main/coffee/coding-rules/views/filters/query-filter-view.coffee @@ -74,3 +74,8 @@ define [ isDefaultValue: -> true + + + renderBase: -> + super + @$el.prop('title', ''); diff --git a/server/sonar-web/src/main/js/navigator/filters/more-criteria-filters.js b/server/sonar-web/src/main/js/navigator/filters/more-criteria-filters.js index 8a376d5f751..5cc3b76803b 100644 --- a/server/sonar-web/src/main/js/navigator/filters/more-criteria-filters.js +++ b/server/sonar-web/src/main/js/navigator/filters/more-criteria-filters.js @@ -78,6 +78,12 @@ define([ renderInput: function() {}, + renderBase: function() { + ChoiceFilters.ChoiceFilterView.prototype.renderBase.call(this); + this.$el.prop('title', ''); + }, + + isDefaultValue: function() { return false; } diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb index 5f595b8daac..d4db714a6af 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb @@ -38,7 +38,7 @@ class ResourceController < ApplicationController anchor = "component=#{component_key}" anchor += "&tab=#{params[:tab]}" if params[:tab] - redirect_to :controller => 'component', :action => 'index', :anchor => anchor + redirect_to url_for(:controller => 'component', :action => 'index') + '#' + anchor end # deprecated stuff for drilldown |