PR#2020: move needed functions - koji

Tomas Kopecek • 4 years ago

c089fab

www/kojiweb/taskinfo.chtml

file modified

-33

		`@@ -3,39 +3,6 @@`
		`#from six.moves.urllib.parse import quote`
		`#import datetime`

		`- #def printValue($key, $value, $sep=', ')`
		`- #if $key in ('brootid', 'buildroot_id')`
		`- <a href="buildrootinfo?buildrootID=$value">$value</a>`
		`- #elif $isinstance($value, list)`
		`- $sep.join([$str($val) for $val in $value])`
		`- #elif $isinstance($value, dict)`
		`- $sep.join(['%s=%s' % (($n == '' and "''" or $n), $v) for $n, $v in $value.items()])`
		`- #else`
		`- $value`
		`- #end if`
		`- #end def`
		`-`
		`- #def printProperties($props)`
		`- #echo ', '.join([$v is not None and '%s=%s' % ($n, $v) or $str($n) for $n, $v in $props.items()])`
		`- #end def`
		`-`
		`- #def printMap($vals, $prefix='')`
		`- #for $key, $value in $vals.items()`
		`- #if $key == 'properties'`
		`- ${prefix}properties = $printProperties($value)<br/>`
		`- #elif $key != '__starstar'`
		`- $prefix$key = $printValue($key, $value)<br/>`
		`- #end if`
		`- #end for`
		`- #end def`
		`-`
		`- #def printOpts($opts)`
		`- #if $opts`
		`- <strong>Options:</strong><br/>`
		`- $printMap($opts, '  ')`
		`- #end if`
		`- #end def`
		`-`
		`#def printChildren($taskID, $childMap)`
		`#set $iter = 0`
		`#set $children = $childMap[$str($taskID)]`

www/kojiweb/taskinfo_params.chtml

file modified

+33

		`@@ -1,6 +1,39 @@`
		`#import koji`
		`#from kojiweb import util`

		`+ #def printValue($key, $value, $sep=', ')`
		`+ #if $key in ('brootid', 'buildroot_id')`
		`+ <a href="buildrootinfo?buildrootID=$value">$value</a>`
		`+ #elif $isinstance($value, list)`
		`+ $sep.join([$str($val) for $val in $value])`
		`+ #elif $isinstance($value, dict)`
		`+ $sep.join(['%s=%s' % (($n == '' and "''" or $n), $v) for $n, $v in $value.items()])`
		`+ #else`
		`+ $value`
		`+ #end if`
		`+ #end def`
		`+`
		`+ #def printProperties($props)`
		`+ #echo ', '.join([$v is not None and '%s=%s' % ($n, $v) or $str($n) for $n, $v in $props.items()])`
		`+ #end def`
		`+`
		`+ #def printMap($vals, $prefix='')`
		`+ #for $key, $value in $vals.items()`
		`+ #if $key == 'properties'`
		`+ ${prefix}properties = $printProperties($value)<br/>`
		`+ #elif $key != '__starstar'`
		`+ $prefix$key = $printValue($key, $value)<br/>`
		`+ #end if`
		`+ #end for`
		`+ #end def`
		`+`
		`+ #def printOpts($opts)`
		`+ #if $opts`
		`+ <strong>Options:</strong><br/>`
		`+ $printMap($opts, '  ')`
		`+ #end if`
		`+ #end def`
		`+`
		`#if $task.method == 'buildSRPMFromSCM'`
		`<strong>SCM URL:</strong> $params[0]<br/>`
		`#if $len($params) > 1`