Include aliases in attribute lists

ManageIQ · Jan 30, 2025 · 38d375b · 38d375b
1 parent b11cbf9
commit 38d375b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/app/controllers/api/base_controller/normalizer.rb b/app/controllers/api/base_controller/normalizer.rb
@@ -126,9 +126,9 @@ def normalize_select_attributes(obj, opts)
         if opts[:render_attributes].present?
           opts[:render_attributes]
         elsif obj.respond_to?(:attributes) && obj.class.respond_to?(:virtual_attribute_names)
-          obj.attributes.keys - obj.class.virtual_attribute_names
+          (obj.attributes.keys | obj.class.try(:attribute_aliases)&.keys) - obj.class.virtual_attribute_names
         elsif obj.respond_to?(:attributes)
-          obj.attributes.keys
+          (obj.attributes.keys | obj.class.try(:attribute_aliases)&.keys)
         else
           obj.keys
         end

diff --git a/app/controllers/api/pictures_controller.rb b/app/controllers/api/pictures_controller.rb
@@ -21,7 +21,7 @@ def attribute_selection
       if !@req.attributes.empty? || @additional_attributes
         @req.attributes | Array(@additional_attributes) | ID_ATTRS
       else
-        Picture.attribute_names - %w(content)
+        Picture.attribute_names | Picture.try(:attribute_aliases)&.keys - %w(content)
       end
     end
   end

diff --git a/lib/services/api/options_serializer.rb b/lib/services/api/options_serializer.rb
@@ -22,21 +22,24 @@ def serialize
 
     def attributes
       return [] unless klass
-      options_attribute_list(klass.attribute_names - klass.virtual_attribute_names)
+      options_attribute_list((klass.attribute_names | model.try(:attribute_aliases)&.keys) - klass.virtual_attribute_names)
     end
 
     def virtual_attributes
       return [] unless klass
+
       options_attribute_list(klass.virtual_attribute_names)
     end
 
     def relationships
       return [] unless klass
+
       (klass.reflections.keys | klass.virtual_reflections.keys.collect(&:to_s)).sort
     end
 
     def subcollections
       return [] unless klass
+
       Array(config[config.name_for_klass(klass)].subcollections).sort
     end