SONAR-4833 Fix regression on Rule.search API

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/rules_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/rules_controller.rb
index 1313d8421bef67d9a0b673dd7365214895841822..9fff27988098b7c4f7a11bcfa916ac470c2c51b8 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/rules_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/rules_controller.rb
@@ -42,7 +42,7 @@ class Api::RulesController < Api::RestController
         rest_render([])
       else
         options[:profile]=profile
-        rules = Rule.search(options)
+        rules = Rule.search(java_facade, options)
         rest_render(rules, profile)
       end
     else

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/rules_configuration_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/rules_configuration_controller.rb
index 7dc2567b4d319b5fd6cb36bee62cc95e652801b1..812af356883d8d18cb6997d98b17a08e63963a91 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/rules_configuration_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/rules_configuration_controller.rb
@@ -48,18 +48,18 @@ class RulesConfigurationController < ApplicationController
                       [message('rules.status.ready'), Rule::STATUS_READY]]
     @select_sort_by = [[message('rules_configuration.rule_name'), Rule::SORT_BY_RULE_NAME], [message('rules_configuration.creation_date'), Rule::SORT_BY_CREATION_DATE]]
 
-    @rules = Rule.search({
+    @rules = Rule.search(java_facade, {
         :profile => @profile, :activation => @activation, :priorities => @priorities, :inheritance => @inheritance, :status => @status,
         :repositories => @repositories, :searchtext => @searchtext, :include_parameters_and_notes => true, :language => @profile.language, :sort_by => @sort_by})
 
     unless @searchtext.blank?
       if @activation==STATUS_ACTIVE
-        @hidden_inactives = Rule.search({
+        @hidden_inactives = Rule.search(java_facade, {
             :profile => @profile, :activation => STATUS_INACTIVE, :priorities => @priorities, :status => @status,
             :repositories => @repositories, :language => @profile.language, :searchtext => @searchtext, :include_parameters_and_notes => false}).size
 
       elsif @activation==STATUS_INACTIVE
-        @hidden_actives = Rule.search({
+        @hidden_actives = Rule.search(java_facade, {
             :profile => @profile, :activation => STATUS_ACTIVE, :priorities => @priorities, :status => @status,
             :repositories => @repositories, :language => @profile.language, :searchtext => @searchtext, :include_parameters_and_notes => false}).size
       end
@@ -166,6 +166,7 @@ class RulesConfigurationController < ApplicationController
     require_parameters :id, :rule_id
     profile = Profile.find(params[:id].to_i)
     template=Rule.find(params[:rule_id])
+    # TODO Call Internal.rule.create(...) ?
     rule=Rule.create(params[:rule].merge(
                          {
                              :priority => Sonar::RulePriority.id(params[:rule][:priority]),

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/rule.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/rule.rb
index 5f33425cc905d51218eff195ba1c601861e72ec4..ca364eb9fe9b914796af276078f8769afd175ac5 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/rule.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/rule.rb
@@ -278,8 +278,9 @@ class Rule < ActiveRecord::Base
   end
 
 
+  # 'unused' parameter used to be available to inject java_facade, kept for compatibility w/ plugins (e.g sqale)
   # options :language => nil, :repositories => [], :searchtext => '', :profile => nil, :priorities => [], :activation => '', :status => [], :sort_by => nil
-  def self.search(options={})
+  def self.search(unused, options={})
     conditions = []
     values = {}