[PATCH conductor] BZ 782879 fixes images count in images table in deployable detail page

Petr Blaho pblaho at redhat.com
Thu Feb 2 15:56:06 UTC 2012


On Tuesday, January 31, 2012 03:09:34 PM jtomasek at redhat.com wrote:
> From: Jiri Tomasek <jtomasek at redhat.com>
> 
> ---
>  src/app/models/deployable.rb   |    2 +-
>  src/app/util/deployable_xml.rb |    4 ++++
>  2 files changed, 5 insertions(+), 1 deletions(-)
> 
> diff --git a/src/app/models/deployable.rb b/src/app/models/deployable.rb
> index a90232e..c9df4c5 100644
> --- a/src/app/models/deployable.rb
> +++ b/src/app/models/deployable.rb
> @@ -121,7 +121,7 @@ class Deployable < ActiveRecord::Base
>      deployable_xml.assemblies.each do |assembly|
>        assembly_hash ||= {:name => assembly.name}
>        assembly_hash[:image_uuid] = assembly.image_id
> -      assembly_hash[:images_count] = assembly.image.count
> +      assembly_hash[:images_count] = assembly.images_count
>        if assembly.hwp
>          hwp_name = assembly.hwp
>          hwp = HardwareProfile.find_by_name(hwp_name)
> diff --git a/src/app/util/deployable_xml.rb b/src/app/util/deployable_xml.rb
> index 9ece7b5..3032b5e 100644
> --- a/src/app/util/deployable_xml.rb
> +++ b/src/app/util/deployable_xml.rb
> @@ -108,6 +108,10 @@ class AssemblyXML
>      @image ||= @root.at("image")
>    end
>  
> +  def images_count
> +    @root.xpath('./image').count
> +  end
> +
>    def image_id
>      @image_id ||= image['id']
>    end
> 

Works for me, ACK.

-- 

With regards
Petr Blaho



More information about the aeolus-devel mailing list