Merge lp:~michael.nelson/ubuntu-webcatalog/fix-import-crash into lp:ubuntu-webcatalog

[Michael Nelson]

Don't save an application without a distroseries during import.

When the initial error appeared:

https://bugs.launchpad.net/ubuntu-webcatalog/+bug/985901

the fix was to ensure the app was saved so that when the ApplicationForm.save() method tried to add the related screenshots, it didn't error. But the app cannot be saved without a distroseries either.

This branch updates the ApplicationForm so that it includes the distroseries in its cleaned data, then during save, it saves the app *with* the distroseries before trying to add any related screenshots (and removes the option of commit=False)

`fab test`

I'll test this on the vps once it's landed.

=== modified file 'src/webcatalog/forms.py'
--- src/webcatalog/forms.py	2012-03-26 20:48:43 +0000
+++ src/webcatalog/forms.py	2012-04-20 06:45:22 +0000
@@ -62,7 +62,7 @@
 
     class Meta:
         model = Application
-        exclude = ('distroseries', 'for_purchase', 'archive_id', 'price')
+        exclude = ('for_purchase', 'archive_id', 'price')
 
     @classmethod
     def get_form_from_desktop_data(cls, str_data, distroseries):
@@ -78,6 +78,7 @@
                 package_name=data['package_name'], distroseries=distroseries)
         except Application.DoesNotExist:
             instance = None
+        data['distroseries'] = distroseries.id
         return cls(data=data, instance=instance)
 
     def clean(self):
@@ -95,8 +96,10 @@
 
         return cleaned_data
 
-    def save(self, commit=True):
-        app = super(ApplicationForm, self).save(commit)
+    def save(self):
+        # We don't provide a commit=False option as we have
+        # to commit to be able to add the screenshots.
+        app = super(ApplicationForm, self).save()
         screenshot_url = self.cleaned_data['screenshot_url']
         if screenshot_url:
             if screenshot_url not in app.screenshots:
 
=== modified file 'src/webcatalog/management/commands/import_app_install_data.py'
--- src/webcatalog/management/commands/import_app_install_data.py	2012-04-19 21:20:32 +0000
+++ src/webcatalog/management/commands/import_app_install_data.py	2012-04-20 06:45:22 +0000
@@ -190,8 +190,6 @@
 
         if form.is_valid():
             app = form.save()
-            app.distroseries = distroseries
-            app.save()
             app.update_departments()
             self.add_icon_to_app(app, icon_dir)
             if self.verbosity > 1:
 
=== modified file 'src/webcatalog/tests/test_forms.py'
--- src/webcatalog/tests/test_forms.py	2012-03-26 20:48:43 +0000
+++ src/webcatalog/tests/test_forms.py	2012-04-20 06:45:22 +0000
@@ -160,8 +160,10 @@
         # - It adds a significant delay to tests unless carefully mocked
         # - It doesn't provide a real benefit as 99% of the time the field
         #   is populated by a script that doesn't have typo issues.
+        distroseries = self.factory.make_distroseries()
         form = ApplicationForm(dict(screenshot_url='http://foo.com:42/broken',
-            section='required', name='required', package_name='required'))
+            section='required', name='required', package_name='required',
+            distroseries=distroseries.id))
         self.assertTrue(form.is_valid())