From 140aeacda083613f395e900609d8f2bfd6a492b7 Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Wed, 7 May 2025 12:40:40 -0400 Subject: [PATCH] port new templates to jinja --- www/kojiweb/index.py | 4 +- www/kojiweb/reporequest.chtml | 41 ------- www/kojiweb/reporequests.chtml | 129 --------------------- www/kojiweb/templates/reporequest.html.j2 | 38 ++++++ www/kojiweb/templates/reporequests.html.j2 | 126 ++++++++++++++++++++ 5 files changed, 166 insertions(+), 172 deletions(-) delete mode 100644 www/kojiweb/reporequest.chtml delete mode 100644 www/kojiweb/reporequests.chtml create mode 100644 www/kojiweb/templates/reporequest.html.j2 create mode 100644 www/kojiweb/templates/reporequests.html.j2 diff --git a/www/kojiweb/index.py b/www/kojiweb/index.py index 4a865928..fa2c6d51 100644 --- a/www/kojiweb/index.py +++ b/www/kojiweb/index.py @@ -2728,7 +2728,7 @@ def reporequest(environ, reqID): # invalid, but technically not blocked in db values['min_event'] = None values['req'] = req - return _genHTML(environ, 'reporequest.chtml') + return _genHTML(environ, 'reporequest.html.j2') def reporequests(environ, active="true", tag=None, start=None, order=None): @@ -2764,7 +2764,7 @@ def reporequests(environ, active="true", tag=None, start=None, order=None): args=(clauses, '**'), start=start, dataName='reqs', prefix='req', order=order, optsarg='opts') - return _genHTML(environ, 'reporequests.chtml') + return _genHTML(environ, 'reporequests.html.j2') def activesession(environ, start=None, order=None): diff --git a/www/kojiweb/reporequest.chtml b/www/kojiweb/reporequest.chtml deleted file mode 100644 index e67fe652..00000000 --- a/www/kojiweb/reporequest.chtml +++ /dev/null @@ -1,41 +0,0 @@ -#import json -#import koji -#from kojiweb import util - -#include "includes/header.chtml" - -

Information for repo request $req_id

- -#if not $req -Repo request $req_id not found. -#else - - - - - - #if $req.at_event - - #elif $req.min_event - - #else - - #end if - #if $req.opts - - #end if - #if $req.repo_id - - #end if - #if $req.task_id - - - #end if - - - -
ID$req.id
Active$req.active
Priority$req.priority
Tag$req.tag_name
At specific event$at_event.id ($util.formatTimeLong($at_event.ts))
Minimum event$min_event.id ($util.formatTimeLong($min_event.ts))
Invalid eventUnable to determine event for request
Options$json.dumps($req.opts, indent=4)
Fulfilled by repo$req.repo_id
Task ID$req.task_id ($util.taskState($req.task_state))
Tries$req.tries
Owner$req.owner_name
Created$util.formatTimeLong($req.create_ts)
Updated$util.formatTimeLong($req.update_ts)
-#end if - - -#include "includes/footer.chtml" diff --git a/www/kojiweb/reporequests.chtml b/www/kojiweb/reporequests.chtml deleted file mode 100644 index 7f852816..00000000 --- a/www/kojiweb/reporequests.chtml +++ /dev/null @@ -1,129 +0,0 @@ -#encoding UTF-8 - -#from kojiweb import util -#from kojiweb.util import passthrough as P - -#include "includes/header.chtml" - - -#set $Pvars = ('active', 'tag', 'order') - -

$desc

- - - - - - - - - - - - - - - #if $len($reqs) > 0 - #for $req in $reqs - - - - - #if $req.task_id - - #else - - #end if - #if $req.repo_id - - #else - - #end if - - - #end for - #else - - - - #end if - - - -
-
- - - - -
- Active: - - - - Tag: - - -
-
-
- #if $len($reqPages) > 1 -
- Page: - -
- #end if - #if $reqStart > 0 - <<< - #end if - #if $totalReqs != 0 - Requests #echo $reqStart + 1 # through #echo $reqStart + $reqCount # of $totalReqs - #end if - #if $reqStart + $reqCount < $totalReqs - >>> - #end if -
ID $util.sortImage($self, 'id')Priority $util.sortImage($self, 'priority')Tag $util.sortImage($self, 'tag_name')TaskRepoStatus
$req.id$req.priority - $req.tag_name - #if not $tag - - #end if - $req.task_id...$req.repo_id... - ## simulate a more helpful status - #if $req.active - $util.imageTag('waiting') - #elif $req.repo_id - $util.imageTag('yes') - #else - $util.imageTag('no') - #end if -
No repo requests
- #if $len($reqPages) > 1 -
- Page: - -
- #end if - #if $reqStart > 0 - <<< - #end if - #if $totalReqs != 0 - Reqs #echo $reqStart + 1 # through #echo $reqStart + $reqCount # of $totalReqs - #end if - #if $reqStart + $reqCount < $totalReqs - >>> - #end if -
- -#include "includes/footer.chtml" diff --git a/www/kojiweb/templates/reporequest.html.j2 b/www/kojiweb/templates/reporequest.html.j2 new file mode 100644 index 00000000..dc90c089 --- /dev/null +++ b/www/kojiweb/templates/reporequest.html.j2 @@ -0,0 +1,38 @@ + +#include "header.html.j2" + +

Information for repo request {{ req_id }}

+ +#if not req +Repo request {{ req_id }} not found. +#else + + + + + + #if req.at_event + + #elif req.min_event + + #else + + #endif + #if req.opts + + #endif + #if req.repo_id + + #endif + #if req.task_id + + + #endif + + + +
ID{{ req.id }}
Active{{ req.active }}
Priority{{ req.priority }}
Tag{{ req.tag_name }}
At specific event{{ at_event.id }} ({{ util.formatTimeLong(at_event.ts) }})
Minimum event{{ min_event.id }} ({{ util.formatTimeLong(min_event.ts) }})
Invalid eventUnable to determine event for request
Options{{ json.dumps(req.opts, indent=4) }}
Fulfilled by repo{{ req.repo_id }}
Task ID{{ req.task_id }} ({{ util.taskState(req.task_state) }})
Tries{{ req.tries }}
Owner{{ req.owner_name }}
Created{{ util.formatTimeLong(req.create_ts) }}
Updated{{ util.formatTimeLong(req.update_ts) }}
+#endif + + +#include "footer.html.j2" diff --git a/www/kojiweb/templates/reporequests.html.j2 b/www/kojiweb/templates/reporequests.html.j2 new file mode 100644 index 00000000..a06c6913 --- /dev/null +++ b/www/kojiweb/templates/reporequests.html.j2 @@ -0,0 +1,126 @@ +#include "header.html.j2" + +# from "macros.html.j2" import rowToggle + +#set Pvars = ('active', 'tag', 'order') +#set P = util.passthrough + +

{{ desc }}

+ + + + + + + + + + + + + + + #if (reqs |length) > 0 + #for req in reqs + + + + + #if req.task_id + + #else + + #endif + #if req.repo_id + + #else + + #endif + + + #endfor + #else + + + + #endif + + + +
+
+ + + + +
+ Active: + + + + Tag: + + +
+
+
+ #if (reqPages |length) > 1 +
+ Page: + +
+ #endif + #if reqStart > 0 + <<< + #endif + #if totalReqs != 0 + Requests {{ reqStart + 1 }} through {{ reqStart + reqCount }} of {{ totalReqs }} + #endif + #if reqStart + reqCount < totalReqs + >>> + #endif +
ID {{ util.sortImage('id') }}Priority {{ util.sortImage('priority') }}Tag {{ util.sortImage('tag_name') }}TaskRepoStatus
{{ req.id }}{{ req.priority }} + {{ req.tag_name }} + #if not tag + + #endif + {{ req.task_id }}...{{ req.repo_id }}... + ## simulate a more helpful status + #if req.active + {{ util.imageTag('waiting') }} + #elif req.repo_id + {{ util.imageTag('yes') }} + #else + {{ util.imageTag('no') }} + #endif +
No repo requests
+ #if (reqPages |length) > 1 +
+ Page: + +
+ #endif + #if reqStart > 0 + <<< + #endif + #if totalReqs != 0 + Reqs {{ reqStart + 1 }} through {{ reqStart + reqCount }} of {{ totalReqs }} + #endif + #if reqStart + reqCount < totalReqs + >>> + #endif +
+ +#include "footer.html.j2"