Merge lp:~jakedahn/django-nova/imagefixes into lp:django-nova

[Jake Dahn]

When trying to load image detail url (/project/foo/images/ami-foo/detail) this error occurs:

'Image' object has no attribute 'displayName'

__

The error was caused by forms.UpdateImageForm being passed into the render block, removing this fixes the bug. The detail view is for looking at more details of an image image, there is no need for the form.

Also changed the templates so if displayName is not set it will display the image id in its place.

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Devin Carlen (devcamcar)]

Code looks fine. Two points of order nits:

1) please add a better description of the change. only referencing the bug # is insufficient.

2) in the future, please use the lp bug # as the branch name, a la lpXXXXXX

review: Needs Fixing

[Devin Carlen (devcamcar)]

Actually now that I look at this again, something seems to not add up.

If the ami didn't have a "displayName" property, you wouldn't get the error you described in the bug. When django has an error in a {{ }} tag, it just renders an empty string. This is a django "feature".

So I suspect the error is coming from somewhere else? Did you have a good repro case for this?

review: Needs Information

[Jake Dahn (jakedahn)]

> Code looks fine. Two points of order nits:
>
> 1) please add a better description of the change. only referencing the bug #
> is insufficient.
>
> 2) in the future, please use the lp bug # as the branch name, a la lpXXXXXX

1. Updated description.
2. Right-o, still adapting to launchpad.

[Jake Dahn (jakedahn)]

> Actually now that I look at this again, something seems to not add up.
>
> If the ami didn't have a "displayName" property, you wouldn't get the error
> you described in the bug. When django has an error in a {{ }} tag, it just
> renders an empty string. This is a django "feature".
>
> So I suspect the error is coming from somewhere else? Did you have a good
> repro case for this?

As stated in the updated branch description the error was caused by forms.UpdateImageForm being passed into the render block. Removing said form fixed the error.

The placement of displayName inside of the templates was showing up blank when it was empty, which is inconsistent with the rest of the fields (for example description says 'none' when it is blank). The name field shouldn't say 'none' because a user may mistake that for the image name. So in place it now says the ami ID.

review: Needs Resubmitting

[Jake Dahn (jakedahn)]

review: Approve

[Devin Carlen (devcamcar)]

approve

review: Approve

=== modified file 'src/django_nova/templates/django_nova/images/_list.html'
--- src/django_nova/templates/django_nova/images/_list.html	2011-01-12 20:02:06 +0000
+++ src/django_nova/templates/django_nova/images/_list.html	2011-02-27 11:46:31 +0000
@@ -34,7 +34,7 @@
                 </div>
                 <div class="image_detail_item">
                   <span class="label">Name: </span>
-                  <span class="data">{{ ami.displayName }}</span>
+                  <span class="data">{% if ami.displayName %}{{ ami.displayName }}{%else%}{{ ami.id }}{% endif %}</span>
                 </div>
                 <div class="image_detail_item">
                   <span class="label">Type: </span>
 
=== modified file 'src/django_nova/templates/django_nova/images/detail_list.html'
--- src/django_nova/templates/django_nova/images/detail_list.html	2011-01-16 21:28:02 +0000
+++ src/django_nova/templates/django_nova/images/detail_list.html	2011-02-27 11:46:31 +0000
@@ -52,7 +52,7 @@
                 </div>
                 <div class="image_detail_item">
                   <span class="label">Name: </span>
-                  <span class="data">{{ ami.displayName }}</span>
+                  <span class="data">{% if ami.displayName %}{{ ami.displayName }}{%else%}{{ ami.id }}{% endif %}</span>
                 </div>
                 <div class="image_detail_item">
                   <span class="label">Type: </span>
 
=== modified file 'src/django_nova/views/images.py'
--- src/django_nova/views/images.py	2011-01-31 20:08:02 +0000
+++ src/django_nova/views/images.py	2011-02-27 11:46:31 +0000
@@ -120,7 +120,6 @@
         raise http.Http404()
     return render_to_response('django_nova/images/index.html', {
         'form': forms.LaunchInstanceForm(project),
-        'update_form': forms.UpdateImageForm(ami),
         'region': project.region,
         'project': project,
         'images': images,