particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

attempt to fix web display

Browse source
This commit is contained in:
Mike McLean 2015-09-29 11:31:48 -04:00
parent c212a9b29a
commit b63e8e1eae
2 changed files with 51 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

41
www/kojiweb/buildrootinfo_cg.chtml Normal file
View file

@ -0,0 +1,41 @@
#import koji
#from kojiweb import util
#include "includes/header.chtml"
<h4>Information for external buildroot <a href="buildrootinfo?buildrootID=$buildroot.id">$buildroot.cg_name:$buildroot.id</a></h4>
<table>
<tr>
<th>ID</th><td>$buildroot.id</td>
</tr>
<tr>
<th>Host OS</th><td>$buildroot.host_os</td>
</tr>
<tr>
<th>Host Arch</th><td>$buildroot.host_arch</td>
</tr>
<tr>
<th>Content Generator</th><td>$buildroot.cg_name ($buildroot.cg_version)</td>
</tr>
<tr>
<th>Container Type</th><td>$buildroot.container_type</td>
</tr>
<tr>
<th>Container Arch</th><td>$buildroot.container_arch</td>
</tr>
<tr>
<th colspan="2"><a href="rpmlist?buildrootID=$buildroot.id&amp;type=component" title="RPMs that are installed into this buildroot when building packages">Component RPMs</a></th>
</tr>
<tr>
<th colspan="2"><a href="rpmlist?buildrootID=$buildroot.id&amp;type=built" title="RPMs that have been built in this buildroot">Built RPMs</a></th>
</tr>
<tr>
<th colspan="2"><a href="archivelist?buildrootID=$buildroot.id&type=component" title="Archives that are installed into this buildroot when building packages">Component Archives</a></th>
</tr>
<tr>
<th colspan="2"><a href="archivelist?buildrootID=$buildroot.id&type=built" title="Archives that have been built in this buildroot">Built Archives</a></th>
</tr>
</table>
#include "includes/footer.chtml"

15
www/kojiweb/index.py
View file

@ -1623,17 +1623,22 @@ def buildrootinfo(environ, buildrootID, builtStart=None, builtOrder=None, compon
buildrootID = int(buildrootID) buildrootID = int(buildrootID)
buildroot = server.getBuildroot(buildrootID) buildroot = server.getBuildroot(buildrootID)
values['title'] = '%(tag_name)s-%(id)i-%(repo_id)i' % buildroot + ' | Buildroot Info'
if buildroot == None: if buildroot == None:
raise koji.GenericError, 'unknown buildroot ID: %i' % buildrootID raise koji.GenericError, 'unknown buildroot ID: %i' % buildrootID
task = server.getTaskInfo(buildroot['task_id'], request=True) elif buildroot['br_type'] == koji.BR_TYPES['STANDARD']:
template = 'buildrootinfo.chtml'
values['title'] = '%(tag_name)s-%(id)i-%(repo_id)i | Buildroot Info' % buildroot
values['task'] = server.getTaskInfo(buildroot['task_id'], request=True)
else:
template = 'buildrootinfo_cg.chtml'
values['title'] = '%(cg_name)s:%(id)i | Buildroot Info' % buildroot
# TODO - fetch tools and extras info
values['buildroot'] = buildroot values['buildroot'] = buildroot
values['task'] = task
return _genHTML(environ, 'buildrootinfo.chtml') return _genHTML(environ, template)
def rpmlist(environ, type, buildrootID=None, imageID=None, start=None, order='nvr'): def rpmlist(environ, type, buildrootID=None, imageID=None, start=None, order='nvr'):
""" """