vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

data.oci_model: fix imports

Browse source
This commit is contained in:
Jimmy Zelinskie 2017-03-23 00:21:21 -04:00
parent 069208f2f1
commit e872c310d0
5 changed files with 45 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

8
data/oci_model/package.py
View file

@ -1,8 +1,10 @@
from cnr.models.package_base import get_media_type, manifest_media_type
from peewee import prefetch
from data import model, oci_model
from data import model
from data.database import Repository, Namespace, Tag, ManifestListManifest
from data.oci_model import tag as tag_model
def list_packages_query(namespace=None, media_type=None, search_query=None, username=None):
@ -32,9 +34,9 @@ def list_packages_query(namespace=None, media_type=None, search_query=None, user
.order_by(Tag.lifetime_start))
if media_type:
tag_query = oci_model.tag.filter_tags_by_media_type(tag_query, media_type)
tag_query = tag_model.filter_tags_by_media_type(tag_query, media_type)
tag_query = oci_model.tag.tag_alive_oci(tag_query)
tag_query = tag_model.tag_alive_oci(tag_query)
query = prefetch(repo_query, tag_query)
return query