Reject project custom field values not visible for the user (#31954, #31925).

Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@18401 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 17 insertions, 0 deletions

diff --git a/app/models/project.rb b/app/models/project.rb
index 1e925751a..b04cec68c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -787,6 +787,18 @@ class Project < ActiveRecord::Base
       end
     end
 
+    # Reject custom fields values not visible by the user
+    if attrs['custom_field_values'].present?
+      editable_custom_field_ids = editable_custom_field_values(user).map {|v| v.custom_field_id.to_s}
+      attrs['custom_field_values'].reject! {|k, v| !editable_custom_field_ids.include?(k.to_s)}
+    end
+
+    # Reject custom fields not visible by the user
+    if attrs['custom_fields'].present?
+      editable_custom_field_ids = editable_custom_field_values(user).map {|v| v.custom_field_id.to_s}
+      attrs['custom_fields'].reject! {|c| !editable_custom_field_ids.include?(c['id'].to_s)}
+    end
+
     super(attrs, user)
   end
 
@@ -864,6 +876,11 @@ class Project < ActiveRecord::Base
     end
   end
 
+  # Returns the custom_field_values that can be edited by the given user
+  def editable_custom_field_values(user=nil)
+    visible_custom_field_values(user)
+  end
+
   def visible_custom_field_values(user = nil)
     user ||= User.current
     custom_field_values.select do |value|