fedora-updates-system/updatessystem/templates master.kid, 1.6, 1.7 push.kid, 1.3, 1.4 pushconsole.kid, 1.2, 1.3 show.kid, 1.5, 1.6

Mon Jan 8 06:07:14 UTC 2007

Author: lmacken

Update of /cvs/fedora/fedora-updates-system/updatessystem/templates
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23477/updatessystem/templates

Modified Files:
	master.kid push.kid pushconsole.kid show.kid 
Log Message:
- Add support for unpushing updates easily
- Add push, unpush, unpushed mails
- Don't allow deletion of pushed updates
- A bunch of other tweaks and such



Index: master.kid
===================================================================
RCS file: /cvs/fedora/fedora-updates-system/updatessystem/templates/master.kid,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7

--- master.kid	6 Jan 2007 08:03:27 -0000	1.6
+++ master.kid	8 Jan 2007 06:07:07 -0000	1.7
@@ -43,6 +43,7 @@
             <div py:if="'admin' in tg.identity.groups">
                 <ul id="fedora-side-nav">
                     <li><a href="/admin/push">Push updates</a></li>
+                    <li><a href="/admin/push/unpush">Unpush updates</a></li>
                     <li><a href="/admin/catwalk">CatWalk</a></li>
                 </ul>
             </div>


Index: push.kid
===================================================================
RCS file: /cvs/fedora/fedora-updates-system/updatessystem/templates/push.kid,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- push.kid	6 Jan 2007 08:03:27 -0000	1.3
+++ push.kid	8 Jan 2007 06:07:07 -0000	1.4
@@ -19,7 +19,8 @@
             </td>
         </tr>
     </table>
-    <input type="submit" name="push" value="Push" />
+    <input type="hidden" name="callback" value="${callback}" />
+    <input type="submit" name="push" value="${label}" />
 </form>
 
 </body>


Index: pushconsole.kid
===================================================================
RCS file: /cvs/fedora/fedora-updates-system/updatessystem/templates/pushconsole.kid,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pushconsole.kid	6 Jan 2007 08:03:27 -0000	1.2
+++ pushconsole.kid	8 Jan 2007 06:07:07 -0000	1.3
@@ -11,7 +11,7 @@
 <body>
     <blockquote>
         <h2>Push Console</h2>
-        <textarea id="push_console" rows="30" cols="100"></textarea>
+        <textarea id="push_console" rows="30" cols="100" wrap="hard"></textarea>
     </blockquote>
 
     <script lang="javascript">
@@ -27,7 +27,8 @@
         var req = new XMLHttpRequest();
         req.multipart = true;
         req.onload = handler;
-        req.open("GET", "/admin/push/push_updates", true);
+        //req.open("GET", "/admin/push/push_updates", true);
+        req.open("GET", "${callback}", true);
         req.send(null);
         //logDebug("send req" + req);
    </script>


Index: show.kid
===================================================================
RCS file: /cvs/fedora/fedora-updates-system/updatessystem/templates/show.kid,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- show.kid	6 Jan 2007 08:03:27 -0000	1.5
+++ show.kid	8 Jan 2007 06:07:07 -0000	1.6
@@ -38,20 +38,19 @@
             <tr>
                 <td><div class="show">${update.nvr}</div></td>
                 <td align="right">
-                        [ <a href="/submit/${update.nvr}">Push</a> | <a href="/edit/${update.nvr}">Edit</a> | <a href="/delete/${update.nvr}">Delete</a> ]
+                    [ <a href="/push/${update.nvr}">Request Push</a> <span py:if="update.pushed"> or <a href="/unpush/${update.nvr}">Unpush</a></span> | <a href="/edit/${update.nvr}">Edit</a><span py:if="not update.pushed"> | <a href="/delete/${update.nvr}">Delete</a></span> ]
                 </td>
             </tr>
         </table>
     </center>
     <table class="show">
-        <tr py:for="field in (['Package', update.nvr], 
+        <tr py:for="field in (['Release', update.release.long_name],
                               ['Update ID', update.update_id],
-                              ['Release', update.release.long_name],
-                              ['Testing', update.testing],
+                              ['Status', update.testing and 'Testing' or 'Final'],
                               ['Type', update.type],
                               ['Bugs', (bugs) and XML(bugs) or ''],
-                              ['CVEs', (bugs) and XML(cves) or ''],
-                              ['Embargo', update.embargo],
+                              ['CVEs', (cves) and XML(cves) or ''],
+                              ['Embargo', update.type == 'security' and update.embargo or ''],
                               ['Pushed', update.pushed],
                               ['Needs Push', update.needs_push],
                               ['Date Pushed', update.date_pushed],


