extras-buildsys/www failed.psp, 1.3, 1.4 index.psp, 1.6, 1.7 indiv.psp, 1.6, 1.7 job.psp, 1.7, 1.8 success.psp, 1.3, 1.4
Daniel Williams (dcbw)
fedora-extras-commits at redhat.com
Sat Aug 6 16:25:07 UTC 2005
Author: dcbw
Update of /cvs/fedora/extras-buildsys/www
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31482/www
Modified Files:
failed.psp index.psp indiv.psp job.psp success.psp
Log Message:
Consolidate email despamming into a single function, other misc cleanups of joblinks
Index: failed.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/failed.psp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- failed.psp 4 Aug 2005 21:12:47 -0000 1.3
+++ failed.psp 6 Aug 2005 16:25:05 -0000 1.4
@@ -65,17 +65,14 @@
import os
source = os.path.basename(source)
# endif
-
- joblink = job_link(job['uid'])
- despam_user = job['username'].replace('@', ' ')
%>
<tr>
- <td class="job<%=top%><%=col_mod%>"><a href="job.psp<%=joblink%>"><%=job['uid']%></a></td>
+ <td class="job<%=top%><%=col_mod%>"><a href="job.psp<%=job_link(job['uid'])%>"><%=job['uid']%></a></td>
<td class="job<%=top%><%=col_mod%>"><%=job['package']%></td>
<td class="job<%=top%><%=col_mod%>"><%=source%></td>
<td class="job<%=top%><%=col_mod%>"><font class="status-<%=job['status']%>"><%=job['status']%></font></td>
<td class="job<%=top%><%=col_mod%>"><%=job['target']%></td>
- <td class="job<%=top%><%=col_mod%>"><%=despam_user%></td>
+ <td class="job<%=top%><%=col_mod%>"><%=despam_user(job['username'])%></td>
<tr>
<%
i = i + 1
Index: index.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/index.psp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- index.psp 4 Aug 2005 20:27:12 -0000 1.6
+++ index.psp 6 Aug 2005 16:25:05 -0000 1.7
@@ -62,17 +62,14 @@
import os
source = os.path.basename(source)
# endif
-
- joblink = job_link(job['uid'])
- username = job['username'].replace('@', ' ')
%>
<tr>
- <td class="job<%=top%><%=col_mod%>"><a href="job.psp<%=joblink%>"><%=job['uid']%></a></td>
+ <td class="job<%=top%><%=col_mod%>"><a href="job.psp<%=job_link(job['uid'])%>"><%=job['uid']%></a></td>
<td class="job<%=top%><%=col_mod%>"><%=job['package']%></td>
<td class="job<%=top%><%=col_mod%>"><%=source%></td>
<td class="job<%=top%><%=col_mod%>"><font class="status-<%=job['status']%>"><%=job['status']%></font></td>
<td class="job<%=top%><%=col_mod%>"><%=job['target']%></td>
- <td class="job<%=top%><%=col_mod%>"><%=username%></td>
+ <td class="job<%=top%><%=col_mod%>"><%=despam_user(job['username'])%></td>
<tr>
<%
i = i + 1
Index: indiv.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/indiv.psp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- indiv.psp 4 Aug 2005 21:12:47 -0000 1.6
+++ indiv.psp 6 Aug 2005 16:25:05 -0000 1.7
@@ -151,11 +151,9 @@
import os
source = os.path.basename(source)
# endif
-
- joblink = job_link(job['uid'])
%>
<tr>
- <td class="job<%=top%><%=col_mod%>"><a href="job.psp<%=joblink%>"><%=job['uid']%></a></td>
+ <td class="job<%=top%><%=col_mod%>"><a href="job.psp<%=job_link(job['uid'])%>"><%=job['uid']%></a></td>
<td class="job<%=top%><%=col_mod%>"><%=job['package']%></td>
<td class="job<%=top%><%=col_mod%>"><%=source%></td>
<td class="job<%=top%><%=col_mod%>"><font class="status-<%=job['status']%>"><%=job['status']%></font>/<font class="result-<%=job['result']%>"><%=job['result']%></font></td>
Index: job.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/job.psp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- job.psp 5 Aug 2005 16:42:22 -0000 1.7
+++ job.psp 6 Aug 2005 16:25:05 -0000 1.8
@@ -49,7 +49,7 @@
<table cellspacing="0" cellpadding="0" width="100%">
<tr><td colspan="2" class="jobdetail-title"><font class="jobdetail-title"><%=str(job['uid'])%>: <%=title%> (<%=job['status']%>)</td></tr>
<tr><td class="jobdetail-tag"><font class="jobdetail-tag">Target:</font></td><td class="jobdetail-text"><%=str(job['target'])%></td></tr>
- <tr><td class="jobdetail-tag"><font class="jobdetail-tag">Submitter:</font></td><td class="jobdetail-text"><%=str(job['username'])%></td></tr>
+ <tr><td class="jobdetail-tag"><font class="jobdetail-tag">Submitter:</font></td><td class="jobdetail-text"><%=despam_user(job['username'])%></td></tr>
<tr><td class="jobdetail-tag"><font class="jobdetail-tag">Source:</font></td><td class="jobdetail-text"><%=str(job['source'])%></td></tr>
<tr><td class="jobdetail-tag"><font class="jobdetail-tag">Started:</font></td><td class="jobdetail-text"><%=str(time.ctime(job['starttime']))%></td></tr>
<%
Index: success.psp
===================================================================
RCS file: /cvs/fedora/extras-buildsys/www/success.psp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- success.psp 4 Aug 2005 21:12:47 -0000 1.3
+++ success.psp 6 Aug 2005 16:25:05 -0000 1.4
@@ -63,17 +63,14 @@
import os
source = os.path.basename(source)
# endif
-
- joblink = job_link(job['uid'])
- despam_user = job['username'].replace('@', ' ')
%>
<tr>
- <td class="job<%=top%><%=col_mod%>"><a href="job.psp<%=joblink%>"><%=job['uid']%></a></td>
+ <td class="job<%=top%><%=col_mod%>"><a href="job.psp<%=job_link(job['uid'])%>"><%=job['uid']%></a></td>
<td class="job<%=top%><%=col_mod%>"><%=job['package']%></td>
<td class="job<%=top%><%=col_mod%>"><%=source%></td>
<td class="job<%=top%><%=col_mod%>"><font class="status-<%=job['status']%>"><%=job['status']%></font></td>
<td class="job<%=top%><%=col_mod%>"><%=job['target']%></td>
- <td class="job<%=top%><%=col_mod%>"><%=despam_user%></td>
+ <td class="job<%=top%><%=col_mod%>"><%=despam_user(job['username'])%></td>
<tr>
<%
i = i + 1
More information about the scm-commits
mailing list