From c0605b8401d94159e45b81cd24232555d4d52af8 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Lievremont Date: Wed, 18 Jun 2014 21:57:51 +0200 Subject: [PATCH] SONAR-5135 Remove "bulk change severity" feature --- ...ing-rules-bulk-change-dropdown-view.coffee | 1 - .../coding-rules-bulk-change-view.coffee | 30 ++----------------- .../coding-rules-bulk-change-dropdown.hbs | 10 ------- .../coding-rules/coding-rules-bulk-change.hbs | 17 ----------- 4 files changed, 3 insertions(+), 55 deletions(-) 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 50ca633e694..27552173ff9 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 @@ -53,4 +53,3 @@ define [ language: @options.app.languageFilter.view.renderValue() allowActivateOnProfile: qualityProfile and (activationValues.length == 0 or activationValues[0] == 'false') allowDeactivateOnProfile: qualityProfile and (activationValues.length == 0 or activationValues[0] == 'true') - allowChangeSeverity: qualityProfile and activationValues.length > 0 and activationValues[0] == 'true' diff --git a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-bulk-change-view.coffee b/sonar-server/src/main/coffee/coding-rules/views/coding-rules-bulk-change-view.coffee index 8b26d3f0afa..de092804e93 100644 --- a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-bulk-change-view.coffee +++ b/sonar-server/src/main/coffee/coding-rules/views/coding-rules-bulk-change-view.coffee @@ -41,17 +41,6 @@ define [ width: '250px' minimumResultsForSearch: 1 - format = (state) -> - return state.text unless state.id - " #{state.text}" - @$('#coding-rules-bulk-change-severity').select2 - width: '250px' - minimumResultsForSearch: 999 - formatResult: format - formatSelection: format - escapeMarkup: (m) -> m - - show: (action, param = null) -> @action = action @profile = param @@ -69,20 +58,9 @@ define [ prepareQuery: -> - query = @options.app.getQuery() - - if @action == 'activate' || @action == 'deactivate' - _.extend query, - wsAction: @action - profile_key: @$('#coding-rules-bulk-change-profile').val() or @profile - - if @action == 'change-severity' - _.extend query, - wsAction: 'activate' - profile_key: @profile - activation_severity: @$('#coding-rules-bulk-change-severity').val() - - query + _.extend @options.app.getQuery(), + wsAction: @action + profile_key: @$('#coding-rules-bulk-change-profile').val() or @profile bulkChange: (query) -> @@ -140,5 +118,3 @@ define [ qualityProfileName: @options.app.qualityProfileFilter.view.renderValue() availableQualityProfiles: @getAvailableQualityProfiles() - - severities: ['BLOCKER', 'CRITICAL', 'MAJOR', 'MINOR', 'INFO'] 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 9d17125884c..3fcb25ba37a 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 @@ -23,13 +23,3 @@ {{tp 'coding_rules.deactivate_in'}} {{qualityProfileName}} {{/if}} - - - -{{! severity }} - -{{#if allowChangeSeverity}} - - {{t 'coding_rules.change_severity_in'}} {{qualityProfileName}} - -{{/if}} diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-bulk-change.hbs b/sonar-server/src/main/hbs/coding-rules/coding-rules-bulk-change.hbs index 6abb8c38db0..c463314cd4d 100644 --- a/sonar-server/src/main/hbs/coding-rules/coding-rules-bulk-change.hbs +++ b/sonar-server/src/main/hbs/coding-rules/coding-rules-bulk-change.hbs @@ -6,9 +6,6 @@ {{#eq action 'deactivate'}}

{{t 'coding_rules.deactivate_in_quality_profile'}} ({{paging.total}} {{t 'coding_rules._rules'}})

{{/eq}} - {{#eq action 'change-severity'}} -

{{t 'coding_rules.change_severity'}} ({{paging.total}} {{t 'coding_rules._rules'}})

- {{/eq}} - - - {{#eq action 'change-severity'}} - {{#if qualityProfile}} - - {{/if}} - {{/eq}}