make sure forms are always available (bug 588513)

apps/bandwagon/tests/test_views.py

@@ -355,7 +355,7 @@ def test_admin(self, f):
                       args=['admin', 'pornstar'])
         r = self.client.get(url, follow=True)
         doc = pq(r.content)
-        eq_(doc('form h3').text(), 'Admin Settings')
+        assert 'Admin Settings' in doc('form h3').text()
 
         r = self.client.post(url, dict(application=1, type=0), follow=True)
         eq_(r.status_code, 200)
@@ -371,7 +371,7 @@ def test_delete_link(self):
 
         r = self.client.get(url)
         doc = pq(r.content)
-        eq_(len(doc('#collection-delete-link')), 1)
+        eq_(len(doc('#collection-delete-link')), 3)
 
         self.login_regular()
         r = self.client.get(url)

apps/bandwagon/views.py

@@ -324,6 +324,8 @@ def edit(request, collection, username, slug):
         initial = dict(type=collection.type,
                        application=collection.application_id)
         admin_form = forms.AdminForm(initial=initial)
+    else:
+        admin_form = None
 
     data = dict(collection=collection,
                 form=form,
@@ -357,7 +359,8 @@ def edit_addons(request, collection, username, slug):
         addons.append(ca.addon)
 
     data = dict(collection=collection, username=username, slug=slug,
-                addons=addons, comments=comments)
+                addons=addons, comments=comments,
+                form=forms.CollectionForm(instance=collection))
     return jingo.render(request, 'bandwagon/edit.html', data)
 
 
@@ -390,6 +393,7 @@ def edit_contributors(request, collection, username, slug):
                     reverse('collections.edit_contributors',
                             args=[username, slug]))
 
+    data['form'] = forms.CollectionForm(instance=collection)
     return jingo.render(request, 'bandwagon/edit.html', data)