Merge lp:~nataliabidart/ubuntu-webcatalog/law-and-order into lp:ubuntu-webcatalog

[Natalia Bidart]

- Fixed failing tests due to database ordering issues.
- Fixed all the new PEP-8 issues raised by the new version of the pep8 checker.

[Michael Nelson (michael.nelson)]

Thanks Natalia!

With the application media ordering, it might be safer (for the future) to set the default ordering on the ApplicationMedia class, rather than on that one call-site (_get_media()).

Anyway, +1 either way (once the conflict is gone).

review: Approve

[Michael Nelson (michael.nelson)]

Actually, I just noticed you've switch various view orderings to use the settings.DEFAULT_SORT_FIELD - why is that?

Wouldn't in make more sense to set the Application classes default sort ordering to whatever that setting is, and leave the various views with their customised sort order? I'm probably missing some info that would clear this up, but just want to be sure.

-Michael

review: Needs Information

[Michael Nelson (michael.nelson)]

OK, I think I've got it - the bug here is that the various Application views use inconsistent sorting. In which case, I reckon:

s/default_sort_field/application_views_sort_by/

(as default_sort_field could be for any model, and 'default' confused me with the django default model ordering, but if you don't think that's an issue, fine to leave it as is.).

review: Approve

[Natalia Bidart (nataliabidart)]

Noodles,

I'm sorry you had to try to understand this mess... the problem was that I worked on 2 different things using the same branch (since the former was a per-requisite of the latter), and when I pushed the second branch, I forgot to set explicitly the (new) location.

So, long story short, I've cleaned up this branch, and will be pushing then ASAP.

[lp:~nataliabidart/ubuntu-webcatalog/law-and-order]

132. By Łukasz Czyżykowski on 2012-06-06

[r=michael.nelson],[bug=1006442] Cope with doubled applications in the database.

133. By Natalia Bidart on 2012-06-06

- Fixed tests failures caused by DB ordering issues (LP: #1009587).

Unmerged revisions

=== modified file 'src/webcatalog/models/applications.py'
--- src/webcatalog/models/applications.py	2012-06-06 13:06:11 +0000
+++ src/webcatalog/models/applications.py	2012-06-06 16:29:23 +0000
@@ -115,7 +115,7 @@
         return u"{0} ({1})".format(self.name, self.package_name)
 
     def _get_media(self, media_type):
-        if not hasattr(self, '_media_cache'):
+        if getattr(self, '_media_cache', None) is None:
             self._media_cache = {}
 
         if not media_type in self._media_cache:
@@ -210,6 +210,7 @@
     class Meta:
         app_label = 'webcatalog'
         unique_together = (('application', 'url'),)
+        ordering = ('url',)
 
 
 class Department(models.Model):