From d7f9c0642618698e79b72336cdcfbc6f12e0242a Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Fri, 13 Dec 2013 15:45:55 +0600 Subject: [PATCH] SQ 4.1 bugfixes --- .../src/main/resources/org/sonar/l10n/core.properties | 3 ++- .../src/main/webapp/WEB-INF/app/helpers/measures_helper.rb | 2 +- .../webapp/WEB-INF/app/views/manual_measures/index.html.erb | 5 ++--- .../webapp/WEB-INF/app/views/manual_rules/index.html.erb | 5 ++--- .../main/webapp/WEB-INF/app/views/measures/_sidebar.html.erb | 2 +- .../main/webapp/WEB-INF/app/views/measures/search.html.erb | 2 +- .../src/main/webapp/WEB-INF/app/views/metrics/index.html.erb | 3 +-- .../javascripts/navigator/filters/ajax-select-filters.js | 2 +- .../webapp/javascripts/navigator/filters/select-filters.js | 1 - 9 files changed, 11 insertions(+), 14 deletions(-) diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties index 114ccb7a9a5..a51ab5af2ae 100644 --- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties +++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties @@ -463,7 +463,7 @@ measure_filter.criteria.what=What? Projects, files... measure_filter.criteria.components=Components measure_filter.criteria.age=Age measure_filter.criteria.date=Date -measure_filter.criteria.only_favourites=Favourites only +measure_filter.criteria.only_favorites=Favorites only measure_filter.criteria.key=Key measure_filter.criteria.name=Name measure_filter.criteria.key_contains=Key contains @@ -1408,6 +1408,7 @@ manual_measures.to_define_new_manual_metric_il_require=You can define new manual #------------------------------------------------------------------------------ manual_rules.should_provide_real_description=Rule created on the fly. A description should be provided. +manual_rules.add_manual_rule=Add Manual Rule #------------------------------------------------------------------------------ diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/measures_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/measures_helper.rb index 2a638f58b8a..a5805422df5 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/measures_helper.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/measures_helper.rb @@ -108,7 +108,7 @@ module MeasuresHelper more_criteria_options << [message('measure_filter.criteria.metric'), 'metric'] more_criteria_options << [message('measure_filter.criteria.age'), 'age'] unless filter.criteria('ageMinDays') || filter.criteria('ageMaxDays') more_criteria_options << [message('measure_filter.criteria.date'), 'date'] unless filter.criteria('fromDate') || filter.criteria('toDate') - more_criteria_options << [message('measure_filter.criteria.only_favourites'), 'fav'] unless filter.criteria('onFavourites') + more_criteria_options << [message('measure_filter.criteria.only_favorites'), 'fav'] unless filter.criteria('onFavourites') more_criteria_options << [message('measure_filter.criteria.key'), 'key'] unless filter.criteria('keySearch') more_criteria_options << [message('measure_filter.criteria.language'), 'lang'] unless filter.criteria('languages') more_criteria_options << [message('measure_filter.criteria.name'), 'name'] unless filter.criteria('nameSearch') diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb index 2e3a5ce3d3b..feffa27f53c 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb @@ -64,9 +64,8 @@ <%= l(measure.updated_at) -%> - <%= message('edit') - -%> -   + <%= message('edit') -%>  + <%= link_to_action message('delete'), "#{ApplicationController.root_context}/manual_measures/delete/#{ @resource.id}?metric=#{measure.metric.key}", :class => 'link-action link-red', :id => "delete_#{measure.metric.key}", diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb index 7183c220507..9a593636f55 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb @@ -2,7 +2,7 @@ <% if profiles_administrator? %> <% end %> @@ -34,8 +34,7 @@ <%= h rule.description -%> - Edit -   + Edit  <%= link_to_action message('delete'), "#{ApplicationController.root_context}/manual_rules/delete/#{rule.id}", :class => 'link-action link-red', :id => "delete_#{rule.key.parameterize}", diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_sidebar.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_sidebar.html.erb index ce64f69521d..00ee26a1d9b 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_sidebar.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_sidebar.html.erb @@ -140,7 +140,7 @@
  • class="marginbottom5"> - <%= message 'measure_filter.criteria.only_favourites' %>: + <%= message 'measure_filter.criteria.only_favorites' %>: <%= check_box_tag 'onFavourites', 'true', @filter.criteria['onFavourites']=='true', :id => 'check-fav' -%>
    • diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb index fcff2700de4..0e0ff43d050 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb @@ -73,7 +73,7 @@ 'alert': '<%= escape_javascript message('measure_filter.criteria.alert') -%>', 'componentsOf': '<%= escape_javascript message('measure_filter.criteria.components_of') -%>', 'date': '<%= escape_javascript message('measure_filter.criteria.date') -%>', - 'favoritesOnly': '<%= escape_javascript message('measure_filter.criteria.only_favourites') -%>', + 'favoritesOnly': '<%= escape_javascript message('measure_filter.criteria.only_favorites') -%>', 'keyContains': '<%= escape_javascript message('measure_filter.criteria.key_contains') -%>', 'language': '<%= escape_javascript message('measure_filter.criteria.language') -%>', 'metric': '<%= escape_javascript message('measure_filter.criteria.metric') -%>', diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb index f355d2f9793..26b48502c5a 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb @@ -42,8 +42,7 @@ <%= metric.value_type_name -%> <% if is_admin? %> - Edit -   + Edit  <%= link_to_action message('delete'), "#{ApplicationController.root_context}/metrics/delete_from_web/#{metric.id}", :class => 'link-action link-red', :id => "delete_#{h(metric.short_name)}", diff --git a/sonar-server/src/main/webapp/javascripts/navigator/filters/ajax-select-filters.js b/sonar-server/src/main/webapp/javascripts/navigator/filters/ajax-select-filters.js index dff04ba4b28..c1673f4018c 100644 --- a/sonar-server/src/main/webapp/javascripts/navigator/filters/ajax-select-filters.js +++ b/sonar-server/src/main/webapp/javascripts/navigator/filters/ajax-select-filters.js @@ -164,7 +164,7 @@ window.SS = typeof window.SS === 'object' ? window.SS : {}; keydown: function(e) { - if (_([37, 38, 39, 40, 32, 13]).indexOf(e.keyCode) !== -1) { + if (_([37, 38, 39, 40, 13]).indexOf(e.keyCode) !== -1) { e.preventDefault(); } }, diff --git a/sonar-server/src/main/webapp/javascripts/navigator/filters/select-filters.js b/sonar-server/src/main/webapp/javascripts/navigator/filters/select-filters.js index f133b4bbd24..0c5126ffe58 100644 --- a/sonar-server/src/main/webapp/javascripts/navigator/filters/select-filters.js +++ b/sonar-server/src/main/webapp/javascripts/navigator/filters/select-filters.js @@ -113,7 +113,6 @@ window.SS = typeof window.SS === 'object' ? window.SS : {}; e.preventDefault(); this.selectNextChoice(); break; - case 32: case 13: e.preventDefault(); this.selectCurrent(); -- 2.39.5