Merge lp:~blake-rouse/maas/fix-1391421 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Show names of the resources that have blank titles.

[Newell Jensen (newell-jensen)]

review: Approve

=== modified file 'src/maasserver/views/images.py'
--- src/maasserver/views/images.py	2014-11-04 17:42:15 +0000
+++ src/maasserver/views/images.py	2014-11-12 15:15:31 +0000
@@ -242,7 +242,7 @@
                 else:
                     return title
         else:
-            if 'title' in resource.extra:
+            if 'title' in resource.extra and len(resource.extra['title']) > 0:
                 return resource.extra['title']
             else:
                 return resource.name

=== modified file 'src/maasserver/views/tests/test_images.py'
--- src/maasserver/views/tests/test_images.py	2014-11-04 17:42:15 +0000
+++ src/maasserver/views/tests/test_images.py	2014-11-12 15:15:31 +0000
@@ -534,6 +534,18 @@
             'table#uploaded-resources')[0].text_content()
         self.assertThat(table_content, ContainsAll(names))
 
+    def test_shows_uploaded_resources_name_if_title_blank(self):
+        self.client_log_in()
+        name = factory.make_name('name')
+        resource = self.make_uploaded_resource(name)
+        resource.extra['title'] = ''
+        resource.save()
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        name_col = doc.cssselect(
+            'table#uploaded-resources > tbody > tr > td')[1].text_content()
+        self.assertEqual(name, name_col.strip())
+
     def test_shows_delete_button_for_uploaded_resource(self):
         self.client_log_in(as_admin=True)
         self.make_uploaded_resource()