stripe: Use context managers for error handling in cgi

[hcoop/portal.git] / list.mlt

diff --git a/list.mlt b/list.mlt
index 498fe7a..5cd5ce5 100644 (file)
--- a/list.mlt
+++ b/list.mlt
@@ -22,7 +22,7 @@ elseif $"cmd" = "open" then
 <br><hr><br>
 <table class="blanks">
 <tr> <td>By:</td> <td><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
-<tr> <td>Time:</td> <td><% #stamp req %></td> </tr>
+<tr> <td>Time:</td> <td><% #stamp req %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
 <tr> <td>List name:</td> <td><% #data req %></td> </tr>
 <tr> <td>Reason:</td> <td colspan="2"><% Web.html (#msg req) %></td> </tr>
 </table>
@@ -44,7 +44,7 @@ elseif $"cmd" = "list" then
 <br><hr><br>
 <table class="blanks">
 <tr> <td>By:</td> <td colspan="2"><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
-<tr> <td>Time:</td> <td colspan="2"><% #stamp req %></td> </tr>
+<tr> <td>Time:</td> <td colspan="2"><% #stamp req %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
 <tr> <td>List name:</td> <td><% #data req %></td> </tr>
 <tr> <td>Reason:</td> <td colspan="2"><% Web.html (#msg req) %></td> </tr>
 </table>
@@ -68,7 +68,7 @@ elseif $"mod" <> "" then
 <input type="hidden" name="save" value="<% id %>">
 <table class="blanks">
 <tr> <td>Requestor:</td> <td><a href="user?id=<% #usr req %>"><% #name user %></a></td> </tr>
-<tr> <td>Time:</td> <td><% #stamp req %></td> </tr>
+<tr> <td>Time:</td> <td><% #stamp req %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
 <tr> <td>Status:</td> <td><select name="status">
        <option value="0"<% if #status req = MailingList.NEW then %> selected<% end %>>New</option>
        <option value="1"<% if #status req = MailingList.INSTALLED then %> selected<% end %>>Installed</option>
@@ -87,10 +87,8 @@ elseif $"mod" <> "" then
        val oldStatus = #status req;
        val newStatus = MailingList.statusFromInt (Web.stoi ($"status"));
        MailingList.modify {req with data = $"dom", msg = $"msg", status = newStatus};
-       if oldStatus <> newStatus then
-               if not (MailingList.notifyMod (oldStatus, newStatus, Init.getUserName(), id)) then
-                       %><h3>Error sending e-mail notification</h3><%
-               end
+       if not (MailingList.notifyMod (oldStatus, newStatus, Init.getUserName(), id)) then
+               %><h3>Error sending e-mail notification</h3><%
        end
        %><h3>Request modified</h3>
        Back to: <a href="list?cmd=open">open requests</a>, <a href="list?cmd=list">all requests</a>
@@ -120,7 +118,7 @@ elseif $"mod" <> "" then
 
 <form action="list" method="post">
 <table class="blanks">
-<tr> <td>List name:</td> <td><input name="req"></td> </tr>
+<tr> <td>List name:</td> <td><input name="req" required="required"></td> </tr>
 <tr> <td>Reason:</td> <td><textarea name="msg" rows="5" cols="80" wrap="soft"></textarea></td> </tr>
 <tr> <td><input type="submit" value="Request"></td> </tr>
 </table>