From b0f5591e3d4cb08834ad7c50a253e0da57aab3db Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Fri, 12 Oct 2012 16:50:01 +0200 Subject: [PATCH] Fix profile names with single quote --- .../src/main/webapp/WEB-INF/app/models/profile.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/profile.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/profile.rb index c4197f87fb6..ca469daa5e0 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/models/profile.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/models/profile.rb @@ -24,9 +24,6 @@ class Profile < ActiveRecord::Base has_many :active_rules, :class_name => 'ActiveRule', :foreign_key => 'profile_id', :dependent => :destroy, :include => ['rule'] has_many :active_rules_with_params, :class_name => 'ActiveRule', :foreign_key => 'profile_id', :include => ['active_rule_parameters', 'active_rule_note'] has_many :changes, :class_name => 'ActiveRuleChange', :dependent => :destroy - has_many :children, :class_name => 'Profile', :finder_sql => %q( - select c.* from rules_profiles c where c.parent_name='#{name}' and c.language='#{language}' - ) validates_uniqueness_of :name, :scope => :language, :case_sensitive => false, :message => Api::Utils.message('quality_profiles.already_exists') validates_presence_of :name, :message => Api::Utils.message('quality_profiles.please_type_profile_name') @@ -121,6 +118,13 @@ class Profile < ActiveRecord::Base end end + def children + @children ||= + begin + Profile.find(:all, :conditions => ['parent_name=? and language=?', name, language]) + end + end + def count_active_rules active_rules.select { |ar| ar.rule.enabled }.size end -- 2.39.5