From 20c69e8576403dcfde42856a8f35d20795224109 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Wed, 26 Mar 2014 12:31:34 +0600 Subject: [PATCH] SONAR-5007 Bulk Change: remove "all" option --- sonar-server/src/main/coffee/coding-rules/app.coffee | 3 ++- .../src/main/coffee/coding-rules/mockjax.coffee | 2 ++ .../coding-rules-bulk-change-dropdown-view.coffee | 4 +++- .../coding-rules-bulk-change-dropdown.hbs | 12 ++++++++++++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/sonar-server/src/main/coffee/coding-rules/app.coffee b/sonar-server/src/main/coffee/coding-rules/app.coffee index b5029b0f577..8333601cb48 100644 --- a/sonar-server/src/main/coffee/coding-rules/app.coffee +++ b/sonar-server/src/main/coffee/coding-rules/app.coffee @@ -200,11 +200,12 @@ requirejs [ property: 'name' type: StringFilterView - @filters.add new BaseFilters.Filter + @languageFilter = new BaseFilters.Filter name: t 'coding_rules.filters.language' property: 'languages' type: ChoiceFilters.ChoiceFilterView choices: @languages + @filters.add @languageFilter @filters.add new BaseFilters.Filter name: t 'coding_rules.filters.severity' diff --git a/sonar-server/src/main/coffee/coding-rules/mockjax.coffee b/sonar-server/src/main/coffee/coding-rules/mockjax.coffee index 2e9450904b2..5d7ba39871d 100644 --- a/sonar-server/src/main/coffee/coding-rules/mockjax.coffee +++ b/sonar-server/src/main/coffee/coding-rules/mockjax.coffee @@ -111,6 +111,7 @@ define ['jquery.mockjax'], -> 'coding_rules.activate': 'Activate' 'coding_rules.activate_in': 'Activate In' 'coding_rules.activate_in_quality_profile': 'Activate In Quality Profile' + 'coding_rules.activate_in_all_quality_profiles': 'Activate In All Profiles' 'coding_rules.add_note': 'Add Note' 'coding_rules.available_since': 'Available Since' 'coding_rules.bulk_change': 'Bulk Change' @@ -121,6 +122,7 @@ define ['jquery.mockjax'], -> 'coding_rules.deactivate_in': 'Deactivate In' 'coding_rules.deactivate': 'Deactivate' 'coding_rules.deactivate_in_quality_profile': 'Deactivate In Quality Profile' + 'coding_rules.deactivate_in_all_quality_profiles': 'Deactivate In All Profiles' 'coding_rules.found': 'Found' 'coding_rules._inherits': 'inherits' 'coding_rules.key': 'Key:' diff --git a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-bulk-change-dropdown-view.coffee b/sonar-server/src/main/coffee/coding-rules/views/coding-rules-bulk-change-dropdown-view.coffee index 881b70c6293..2fbb568d2e5 100644 --- a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-bulk-change-dropdown-view.coffee +++ b/sonar-server/src/main/coffee/coding-rules/views/coding-rules-bulk-change-dropdown-view.coffee @@ -47,5 +47,7 @@ define [ serializeData: -> + languages = @options.app.languageFilter.get('value') qualityProfile: @options.app.getQualityProfile() - qualityProfileName: @options.app.qualityProfileFilter.view.renderValue() \ No newline at end of file + qualityProfileName: @options.app.qualityProfileFilter.view.renderValue() + singleLanguage: _.isArray(languages) && languages.length == 1 \ No newline at end of file diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-bulk-change-dropdown.hbs b/sonar-server/src/main/hbs/coding-rules/coding-rules-bulk-change-dropdown.hbs index 7a6c1c98050..6018c48d8f4 100644 --- a/sonar-server/src/main/hbs/coding-rules/coding-rules-bulk-change-dropdown.hbs +++ b/sonar-server/src/main/hbs/coding-rules/coding-rules-bulk-change-dropdown.hbs @@ -2,12 +2,24 @@ {{t 'coding_rules.activate_in'}} +{{#if singleLanguage}} + + {{t 'coding_rules.activate_in_all_quality_profiles'}} + +{{/if}} + {{t 'coding_rules.deactivate_in'}} {{#if qualityProfile}}{{qualityProfileName}}{{/if}} +{{#if singleLanguage}} + + {{t 'coding_rules.deactivate_in_all_quality_profiles'}} + +{{/if}} + {{#if qualityProfile}} {{t 'coding_rules.change_severity_in'}} {{qualityProfileName}} -- 2.39.5