From f431e438d377384ad0101db4d25d7d9037cfdfe5 Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: Nov 18 2019 08:16:00 +0000 Subject: Show build link(s) on buildContainer task page Fixes: https://pagure.io/koji/issue/1529 --- diff --git a/www/kojiweb/index.py b/www/kojiweb/index.py index e5ec5d8..c0d01b9 100644 --- a/www/kojiweb/index.py +++ b/www/kojiweb/index.py @@ -666,15 +666,20 @@ def taskinfo(environ, taskID): elif task['method'] == 'restartVerify': values['rtask'] = server.getTaskInfo(params[0], request=True) + values['taskBuilds'] = [] if task['state'] in (koji.TASK_STATES['CLOSED'], koji.TASK_STATES['FAILED']): try: result = server.getTaskResult(task['id']) - values['result'] = result - values['excClass'] = None except: excClass, exc = sys.exc_info()[:2] values['result'] = exc values['excClass'] = excClass + if not values.get('result'): + values['result'] = result + values['excClass'] = None + if task['method'] == 'buildContainer' and 'koji_builds' in result: + values['taskBuilds'] = [ + server.getBuild(int(buildID)) for buildID in result['koji_builds']] else: values['result'] = None values['excClass'] = None diff --git a/www/kojiweb/taskinfo.chtml b/www/kojiweb/taskinfo.chtml index 2363742..90a6ab0 100644 --- a/www/kojiweb/taskinfo.chtml +++ b/www/kojiweb/taskinfo.chtml @@ -314,6 +314,13 @@ $value Build$koji.buildLabel($taskBuild) #end if + #if $taskBuilds + #for $build in $taskBuilds + + Build$koji.buildLabel($build) + + #end for + #end if Created$util.formatTimeLong($task.create_time)