- add a task count to the userinfo page
- allow a few more pages to take usernames in addition to user IDs
This commit is contained in:
parent
87576b0dc1
commit
6ea2571114
3 changed files with 13 additions and 10 deletions
|
|
@ -680,14 +680,16 @@ def packages(req, tagID=None, userID=None, order='package_name', start=None, pre
|
|||
server = _getServer(req)
|
||||
tag = None
|
||||
if tagID != None:
|
||||
tagID = int(tagID)
|
||||
tag = server.getTag(tagID)
|
||||
if tagID.isdigit():
|
||||
tagID = int(tagID)
|
||||
tag = server.getTag(tagID, strict=True)
|
||||
values['tagID'] = tagID
|
||||
values['tag'] = tag
|
||||
user = None
|
||||
if userID != None:
|
||||
userID = int(userID)
|
||||
user = server.getUser(userID)
|
||||
if userID.isdigit():
|
||||
userID = int(userID)
|
||||
user = server.getUser(userID, strict=True)
|
||||
values['userID'] = userID
|
||||
values['user'] = user
|
||||
values['order'] = order
|
||||
|
|
@ -1150,7 +1152,8 @@ def userinfo(req, userID, packageOrder='package_name', packageStart=None, buildO
|
|||
|
||||
values['user'] = user
|
||||
values['userID'] = userID
|
||||
|
||||
values['taskCount'] = server.listTasks(opts={'owner': user['id'], 'parent': None}, queryOpts={'countOnly': True})
|
||||
|
||||
packages = kojiweb.util.paginateResults(server, values, 'listPackages', kw={'userID': user['id'], 'with_dups': True},
|
||||
start=packageStart, dataName='packages', prefix='package', order=packageOrder, pageSize=10)
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<th>ID</th><td>$user.id</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Tasks</th><td><a href="tasks?owner=$user.id">view</a></td>
|
||||
<th>Tasks</th><td><a href="tasks?owner=$user.name&state=all">$taskCount</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th id="packagelist">Packages</th>
|
||||
|
|
|
|||
|
|
@ -55,10 +55,10 @@
|
|||
#for $user in $users
|
||||
<tr class="$util.rowToggle($self)">
|
||||
<td>$user.id</td>
|
||||
<td><a href="userinfo?userID=$user.id">$user.name</a></td>
|
||||
<td><a href="packages?userID=$user.id">view</a></td>
|
||||
<td><a href="builds?userID=$user.id">view</a></td>
|
||||
<td><a href="tasks?owner=$user.id">view</a></td>
|
||||
<td><a href="userinfo?userID=$user.name">$user.name</a></td>
|
||||
<td><a href="packages?userID=$user.name">view</a></td>
|
||||
<td><a href="builds?userID=$user.name">view</a></td>
|
||||
<td><a href="tasks?owner=$user.name">view</a></td>
|
||||
</tr>
|
||||
#end for
|
||||
#else
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue