diff --git a/hub/kojihub.py b/hub/kojihub.py index 396e9864..84c1c9e9 100644 --- a/hub/kojihub.py +++ b/hub/kojihub.py @@ -7825,6 +7825,9 @@ class RootExports(object): if typeInfo: clauses.append('win_builds.platform = %(platform)s') platform = typeInfo['platform'] + elif type == 'image': + joins.append('image_builds ON build.id = image_builds.build_id') + fields.append(('image_builds.build_id', 'build_id')) else: raise koji.GenericError, 'unsupported build type: %s' % type diff --git a/www/kojiweb/builds.chtml b/www/kojiweb/builds.chtml index 5806028b..f221ffa2 100644 --- a/www/kojiweb/builds.chtml +++ b/www/kojiweb/builds.chtml @@ -57,6 +57,7 @@ #if $winEnabled #end if + #end if diff --git a/www/kojiweb/index.py b/www/kojiweb/index.py index ee7b15c2..1865b4dd 100644 --- a/www/kojiweb/index.py +++ b/www/kojiweb/index.py @@ -426,11 +426,13 @@ _TASKS = ['build', 'tagNotification', 'dependantTask', 'livecd', - 'appliance'] + 'createLiveCD', + 'appliance', + 'createAppliance'] # Tasks that can exist without a parent _TOPLEVEL_TASKS = ['build', 'buildNotification', 'chainbuild', 'maven', 'wrapperRPM', 'winbuild', 'newRepo', 'tagBuild', 'tagNotification', 'waitrepo', 'livecd', 'appliance'] # Tasks that can have children -_PARENT_TASKS = ['build', 'chainbuild', 'maven', 'winbuild', 'newRepo', 'wrapperRPM'] +_PARENT_TASKS = ['build', 'chainbuild', 'maven', 'winbuild', 'newRepo', 'wrapperRPM', 'livecd', 'appliance'] def tasks(environ, owner=None, state='active', view='tree', method='all', hostID=None, channelID=None, start=None, order='-id'): values = _initValues(environ, 'Tasks', 'tasks') @@ -1238,7 +1240,7 @@ def builds(environ, userID=None, tagID=None, packageID=None, state=None, order=' values['prefix'] = prefix values['order'] = order - if type in ('maven', 'win'): + if type in ('maven', 'win', 'image'): pass elif type == 'all': type = None