From: Julien HENRY <julien.henry@sonarsource.com>
Date: Tue, 3 Sep 2013 07:57:45 +0000 (+0200)
Subject: SONAR-4602 Fix regression in settings update
X-Git-Tag: 3.7.1~5^2~15^2~35
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=efb848c102fe1528aea54c3b77219fa72efc1663;p=sonarqube.git

SONAR-4602 Fix regression in settings update
---

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/property.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/property.rb
index c8d0ab21442..b6faefc36f4 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/property.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/property.rb
@@ -176,7 +176,7 @@ class Property < ActiveRecord::Base
   private
 
   def self.setGlobalProperty(key, value, resource_id, user_id)
-    Api::Utils.java_facade.updateProperty(key, value, resource_id.to_i, user_id.to_i)
+    Api::Utils.java_facade.updateProperty(key, value, resource_id && resource_id.to_i, user_id && user_id.to_i)
   end
 
   def self.all(key, resource_id=nil, user_id=nil)