[webui] Show the actual value in the validation error and not the object

openSUSE · Sep 2, 2015 · 06570ce · 06570ce
1 parent e3ec17c
commit 06570ce
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/api/app/models/attrib.rb b/src/api/app/models/attrib.rb
@@ -116,11 +116,11 @@ def update_with_associations(values = [], issues = [])
 
   def validate_value_count
     if self.attrib_type && self.attrib_type.allowed_values.any?
-      self.values.each do |value|
-        allowed_values = self.attrib_type.allowed_values
-        if allowed_values.none? { |allowed| allowed.value == value.value }
-          self.errors[:values] << "Value '#{value}' is not allowed. Please use one of: " +
-                                    "#{allowed_values.map(&:value).join(', ')}"
+      self.values.map(&:value).each do |value|
+        allowed_values = self.attrib_type.allowed_values.map(&:value)
+        unless allowed_values.include?(value)
+          self.errors[:values] <<
+            "Value '#{value}' is not allowed. Please use one of: #{allowed_values.join(', ')}"
         end
       end
     end