honor order of term taxonomy relationships and v0.7

jcarbaugh · Jul 12, 2013 · 0bca2a5 · 0bca2a5
1 parent b30b05d
commit 0bca2a5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog for django-wordpress
 
+## 0.7
+
+* honor order of term taxonomy relationships
+
 ## 0.6
 
 * remove wp_options.blog_id field as it no longer exists in WP 3.5.x

diff --git a/wordpress/__init__.py b/wordpress/__init__.py
@@ -1 +1 @@
-__version__ = "0.6"
+__version__ = "0.7"
diff --git a/wordpress/models.py b/wordpress/models.py
@@ -243,7 +243,7 @@ def from_path(self, path):
 class TermTaxonomyRelationship(WordPressModel):
 
     object_id = models.IntegerField()
-    term_taxonomy = models.ForeignKey('Taxonomy', db_column='term_taxonomy_id')
+    term_taxonomy = models.ForeignKey('Taxonomy', related_name='relationships', db_column='term_taxonomy_id')
     order = models.IntegerField(db_column='term_order')
 
     class Meta:
@@ -338,8 +338,9 @@ def tags(self):
         return self.tag_cache
 
     def _get_terms(self, taxonomy):
-        tr_pks = TermTaxonomyRelationship.objects.filter(object_id=self.id).values_list('term_taxonomy__pk', flat=True)
-        return Term.objects.filter(taxonomies__name=taxonomy, taxonomies__pk__in=tr_pks)
+        qs = Term.objects.filter(taxonomies__name=taxonomy,
+                                 taxonomies__relationships__object_id=self.id)
+        return qs.order_by('taxonomies__relationships__order', 'name')
 
 
 class PostMeta(WordPressModel):