Revert commits that should have been done on branch-4.5

This reverts commit dc74893622e4965a5d9ad0c6f9a9b0b43f2140ed.

6 files changed, 6 insertions, 20 deletions

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/false_positive_issues.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/false_positive_issues.html.erb
index 6793e0a2e06..f5f6a80b018 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/false_positive_issues.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/issues/false_positive_issues.html.erb
@@ -3,13 +3,13 @@
 
      search_options = {}
      search_options['componentRoots'] = @project.key
-     #search_options['resolved'] = 'true'
+     search_options['resolved'] = 'true'
      search_options['resolutions'] = 'FALSE-POSITIVE'
      title = message('widget.false_positive_reviews.name')
 %>
 
   <%= render :partial => 'project/widgets/issues/issues_list_widget',
-             :locals => {:search_options => search_options, :title => title,
+             :locals => {:search_options => search_options, :title => title, 
                          :widget_id => widget.id.to_s, :widget_properties => widget_properties} %>
 
 <% end %>
diff --git a/server/sonar-web/src/main/coffee/coding-rules/app.coffee b/server/sonar-web/src/main/coffee/coding-rules/app.coffee
index 14ab0d938c5..aab13d216d4 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/app.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules/app.coffee
@@ -509,7 +509,7 @@ requirejs [
         repo = _.findWhere(App.repositories, key: value)
         other_repo_with_same_name = _.find(App.repositories, (repos) -> repos.name == repo.name && repos.key != repo.key)
         if other_repo_with_same_name
-          App.languages[repo.language] + ' ' + repo.name
+          repo.name + ' - ' + App.languages[repo.language]
         else
           repo.name
 
diff --git a/server/sonar-web/src/main/hbs/coding-rules/coding-rules-quality-profile-activation.hbs b/server/sonar-web/src/main/hbs/coding-rules/coding-rules-quality-profile-activation.hbs
index 9e48279434d..560972b992b 100644
--- a/server/sonar-web/src/main/hbs/coding-rules/coding-rules-quality-profile-activation.hbs
+++ b/server/sonar-web/src/main/hbs/coding-rules/coding-rules-quality-profile-activation.hbs
@@ -45,7 +45,7 @@
             {{else}}
               {{#eq type 'BOOLEAN'}}
               <select name="{{key}}" value="{{value}}">
-                <option value="{{defaultValue}}">{{t 'default'}} ({{t defaultValue}})</option>
+                <option value="{{defaultValue}}">{{t 'default'}}</option>
                 <option value="true"{{#eq value 'true'}} selected="selected"{{/eq}}>{{t 'true'}}</option>
                 <option value="false"{{#eq value 'false'}} selected="selected"{{/eq}}>{{t 'false'}}</option>
               </select>
diff --git a/server/sonar-web/src/main/js/issues/extra.js b/server/sonar-web/src/main/js/issues/extra.js
index 260fd8ae25d..6f7700c336b 100644
--- a/server/sonar-web/src/main/js/issues/extra.js
+++ b/server/sonar-web/src/main/js/issues/extra.js
@@ -621,14 +621,12 @@ define(
           var idObj = _.findWhere(params, { key: 'id' });
           if (idObj) {
             var that = this,
-              f = this.app.favoriteFilter;
+                f = this.app.favoriteFilter;
             this.app.canSave = false;
             f.set('id', idObj.value);
             f.fetch({
               success: function () {
-                var parsedFilter = that.parseQuery(f.get('query'))
-                params = _.extend({}, params);
-                params = _.extent(params, parsedFilter)
+                params = _.extend({}, that.parseQuery(f.get('query')), params);
                 that.loadResults(params);
               }
             });
diff --git a/server/sonar-web/src/main/js/tests/e2e/tests/coding-rules-spec.js b/server/sonar-web/src/main/js/tests/e2e/tests/coding-rules-spec.js
index b6cabf1d88a..4b4349c7a23 100644
--- a/server/sonar-web/src/main/js/tests/e2e/tests/coding-rules-spec.js
+++ b/server/sonar-web/src/main/js/tests/e2e/tests/coding-rules-spec.js
@@ -60,15 +60,6 @@ casper.test.begin(testName('Readonly Tests'), function suite(test) {
     });
 
 
-    casper.waitForSelector('div.navigator-facets-list-item:nth-child(2)', function checkFacets() {
-      test.assertSelectorHasText('div.navigator-facets-list-item:nth-child(2) a:nth-child(1)', 'Java SonarQube');
-      test.assertSelectorHasText('div.navigator-facets-list-item:nth-child(2) a:nth-child(2)', 'Java Common SonarQube');
-      test.assertSelectorHasText('div.navigator-facets-list-item:nth-child(2) a:nth-child(3)', 'CoffeeScript SonarQube');
-      test.assertSelectorHasText('div.navigator-facets-list-item:nth-child(2) a:nth-child(4)', 'CoffeeScript Common SonarQube');
-      test.assertSelectorHasText('div.navigator-facets-list-item:nth-child(2) a:nth-child(5)', 'Xoo SonarQube');
-    });
-
-
     casper.waitForSelector('li.active', function checkResultsList() {
       test.assertElementCount('ol.navigator-results-list li', 10);
       test.assertElementCount('li.active', 1);
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 be210cffe4e..d3989111e74 100644
--- 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
@@ -992,9 +992,6 @@ module ApplicationHelper
   def url_for_issues(params)
     url = ApplicationController.root_context + '/issues/search#'
     params.each do |key, value|
-      if key == 'filter'
-        key = 'id'
-      end
       url += key.to_s + '=' + value.to_s + '|'
     end
     url