more model fixups

ckan · Apr 26, 2012 · 0aad92d · 0aad92d
1 parent 5ffe44b
commit 0aad92d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/ckan/model/package.py b/ckan/model/package.py
@@ -213,12 +213,12 @@ def get_tags(self, vocab=None):
         """
         import ckan.model as model
         query = meta.Session.query(model.Tag)
-        query = query.join(model.PackageTagRevision)
-        query = query.filter(model.PackageTagRevision.tag_id == model.Tag.id)
-        query = query.filter(model.PackageTagRevision.package_id == self.id)
+        query = query.join(PackageTagRevision)
+        query = query.filter(PackageTagRevision.tag_id == model.Tag.id)
+        query = query.filter(PackageTagRevision.package_id == self.id)
         query = query.filter(and_(
-            model.PackageTagRevision.state == 'active',
-            model.PackageTagRevision.current == True))
+            PackageTagRevision.state == 'active',
+            PackageTagRevision.current == True))
         if vocab:
             query = query.filter(model.Tag.vocabulary_id == vocab.id)
         else:

diff --git a/ckan/model/tag.py b/ckan/model/tag.py
@@ -14,7 +14,7 @@
 import ckan.lib.dictization
 
 __all__ = ['tag_table', 'package_tag_table', 'Tag', 'PackageTag',
-           'PackageTagRevision', 'package_tag_revision_table',
+           'package_tag_revision_table',
            'MAX_TAG_LENGTH', 'MIN_TAG_LENGTH']
 
 MAX_TAG_LENGTH = 100
@@ -161,10 +161,10 @@ def all(cls, vocab_id_or_name=None):
             query = meta.Session.query(Tag).filter(Tag.vocabulary_id==vocab.id)
         else:
             query = meta.Session.query(Tag).filter(Tag.vocabulary_id == None)
-            query = query.distinct().join(PackageTagRevision)
+            query = query.distinct().join(_package.PackageTagRevision)
             query = query.filter(and_(
-                PackageTagRevision.state == 'active',
-                PackageTagRevision.current == True))
+                _package.PackageTagRevision.state == 'active',
+                _package.PackageTagRevision.current == True))
         return query
 
     @property
@@ -175,11 +175,11 @@ def packages(self):
 
         """
         q = meta.Session.query(_package.Package)
-        q = q.join(PackageTagRevision)
-        q = q.filter(PackageTagRevision.tag_id == self.id)
+        q = q.join(_package.PackageTagRevision)
+        q = q.filter(_package.PackageTagRevision.tag_id == self.id)
         q = q.filter(and_(
-            PackageTagRevision.state == 'active',
-            PackageTagRevision.current == True))
+            _package.PackageTagRevision.state == 'active',
+            _package.PackageTagRevision.current == True))
         q = q.order_by(_package.Package.name)
         packages = q.all()
         return packages