X-Git-Url: http://git.hcoop.net/hcoop/portal.git/blobdiff_plain/5da9f4a91ea8e648812be0ca1afaeace2ba0423c..0b4db14f7226c2e419320aa1a5140056038ba0c3:/apt.mlt

diff --git a/apt.mlt b/apt.mlt
index 519040b..df5e26e 100644
--- a/apt.mlt
+++ b/apt.mlt
@@ -2,6 +2,10 @@
 
 val admin = Group.inGroupName "server";
 
+val nodeNum = case $"node" of
+		  "" => 2
+		| node => Web.stoi node;
+
 if $"new" <> "" then
 	val pkgs = String.tokens Char.isSpace ($"new");
 
@@ -9,7 +13,7 @@ if $"new" <> "" then
 	ref infos = [];
 
 	foreach pkg in pkgs do
-		switch AptQuery.query pkg of
+		switch AptQuery.query {node = nodeNum, pkg = pkg} of
 		  NONE =>
 			ok := false;
 			%><b>Error</b>: Unknown package "<% Web.html pkg %>."<br><%
@@ -23,17 +27,18 @@ if $"new" <> "" then
 		end
 	end;
 
-	if ok then %>
+	if ok then
+		val debian = Init.nodeDebian nodeNum %>
 Are you sure these are the packages you wanted?<br><br>
 <table>
 <%		foreach info in infos do %>
-	<tr> <td align="right"><a href="http://packages.debian.org/testing/<% #section info %>/<% #name info %>"><% #name info %></a></td>
+	<tr> <td align="right"><a href="http://packages.debian.org/<% debian %>/<% #section info %>/<% #name info %>"><% #name info %></a></td>
 		<td><% Web.html (#descr info) %></td> </tr>
 <% end %>
 	</table><br>
 	<br>
 	<b>Reason:</b> <blockquote><% Web.htmlNl ($"msg") %></blockquote><br>
-	<a href="apt?req=<% foreach info in infos do %><% #name info %>+<% end %>&msg=<% Web.urlEncode ($"msg") %>">Yes, I want to request these packages.</a>
+	<a href="apt?node=<% nodeNum %>&req=<% foreach info in infos do %><% #name info %>+<% end %>&msg=<% Web.urlEncode ($"msg") %>">Yes, I want to request these packages.</a>
 
 <%	end
 
@@ -43,7 +48,7 @@ elseif $"req" <> "" then
 	ref ok = true;
 
 	foreach pkg in pkgs do
-		switch AptQuery.query pkg of
+		switch AptQuery.query {node = nodeNum, pkg = pkg} of
 		  NONE =>
 			ok := false;
 			%><b>Error</b>: Unknown package "<% Web.html pkg %>."<br><%
@@ -56,26 +61,28 @@ elseif $"req" <> "" then
 	end;
 
 	if ok then
-		val id = Apt.add (Init.getUserId(), $"req", $"msg");
+		val id = Apt.add {usr = Init.getUserId(), node = nodeNum, data = $"req", msg = $"msg"};
 		if not (Apt.notifyNew id) then
-			%><h3><b>Error sending e-mail notification</b></h3><%
+			%><h3>Error sending e-mail notification</h3><%
 		end
-		%><h3><b>Request added</b></h3><%
+		%><h3>Request added</h3><%
 	end
 
 elseif $"cmd" = "open" then
-	%><h3><b>Open requests</b></h3>
+	%><h3>Open requests</h3>
 	<a href="apt?cmd=list">List all requests</a><%
 
 	foreach (name, req) in Apt.listOpen () do %>
 <br><hr><br>
-<table>
-<tr> <td align="right"><b>By</b>:</td> <td colspan="2"><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
-<tr> <td align="right"><b>Time</b>:</td> <td colspan="2"><% #stamp req %></td> </tr>
-<tr> <td align="right"><b>Packages</b>:</td><%
+<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 %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
+<tr> <td>Node:</td> <td colspan="2"><% Web.html (Init.nodeName (#node req)) %></td> </tr>
+<tr> <td>Packages:</td><%
 	ref first = true;
 
 	val pkgs = String.tokens Char.isSpace (#data req);
+	val debian = Init.nodeDebian (#node req);
 
 	foreach pkg in pkgs do
 		if first then
@@ -83,16 +90,16 @@ elseif $"cmd" = "open" then
 		else
 			%></tr><tr> <td></td><%
 		end;
-		switch AptQuery.query pkg of
+		switch AptQuery.query {node = #node req, pkg = pkg} of
 		  NONE =>
 			%><td></td> <td><b>Error</b>: Unknown package "<% Web.html pkg %>."</td><%
 		| SOME info =>
-			%><td align="right"><a href="http://packages.debian.org/testing/<% #section info %>/<% #name info %>"><% #name info %></a></td>
+			%><td align="right"><a href="http://packages.debian.org/<% debian %>/<% #section info %>/<% #name info %>"><% #name info %></a></td>
 			<td><% Web.html (#descr info) %></td><%
 		end
 	end %>
 </tr>
-<tr> <td align="right" valign="top"><b>Reason</b>:</td> <td colspan="2"><% Web.html (#msg req) %></td> </tr>
+<tr> <td>Reason:</td> <td colspan="2"><% Web.html (#msg req) %></td> </tr>
 </table>
 
 <% if admin then %>
@@ -105,17 +112,19 @@ elseif $"cmd" = "open" then
 <%	end
 
 elseif $"cmd" = "list" then
-	%><h3><b>All requests</b></h3><%
+	%><h3>All requests</h3><%
 
 	foreach (name, req) in Apt.list () do %>
 <br><hr><br>
-<table>
-<tr> <td align="right"><b>By</b>:</td> <td colspan="2"><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
-<tr> <td align="right"><b>Time</b>:</td> <td colspan="2"><% #stamp req %></td> </tr>
-<tr> <td align="right"><b>Packages</b>:</td><%
+<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 %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
+<tr> <td>Node:</td> <td colspan="2"><% Web.html (Init.nodeName (#node req)) %></td> </tr>
+<tr> <td>Packages:</td><%
 	ref first = true;
 
 	val pkgs = String.tokens Char.isSpace (#data req);
+	val debian = Init.nodeDebian (#node req);
 
 	foreach pkg in pkgs do
 		if first then
@@ -123,16 +132,16 @@ elseif $"cmd" = "list" then
 		else
 			%></tr><tr> <td></td><%
 		end;
-		switch AptQuery.query pkg of
+		switch AptQuery.query {node = #node req, pkg = pkg} of
 		  NONE =>
 			%><td></td> <td><b>Error</b>: Unknown package "<% Web.html pkg %>."</td><%
 		| SOME info =>
-			%><td align="right"><a href="http://packages.debian.org/testing/<% #section info %>/<% #name info %>"><% #name info %></a></td>
+			%><td align="right"><a href="http://packages.debian.org/<% debian %>/<% #section info %>/<% #name info %>"><% #name info %></a></td>
 			<td><% Web.html (#descr info) %></td><%
 		end
 	end %>
 </tr>
-<tr> <td align="right" valign="top"><b>Reason</b>:</td> <td colspan="2"><% Web.html (#msg req) %></td> </tr>
+<tr> <td>Reason:</td> <td colspan="2"><% Web.html (#msg req) %></td> </tr>
 </table>
 
 <% if admin then %>
@@ -148,20 +157,25 @@ elseif $"mod" <> "" then
 	val id = Web.stoi ($"mod");
 	val req = Apt.lookup id;
 	val user = Init.lookupUser (#usr req) %>
-<h3><b>Handle request</b></h3>
+<h3>Handle request</h3>
 
-<form action="apt">
+<form action="apt" method="post">
 <input type="hidden" name="save" value="<% id %>">
-<table>
-<tr> <td align="right"><b>Requestor</b>:</td> <td><a href="user?id=<% #usr req %>"><% #name user %></a></td> </tr>
-<tr> <td align="right"><b>Time</b>:</td> <td><% #stamp req %></td> </tr>
-<tr> <td align="right"><b>Status</b>:</td> <td><select name="status">
+<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 %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
+<tr> <td>Node:</td> <td><select name="node">
+<% foreach node in Init.listNodes () do %>
+	<option value="<% #id node %>"<% if #id node = #node req then %> selected<% end %>><% Web.html (#name node) %> (<% Web.html (#descr node) %>; Debian <% Web.html (#debian node) %>)</option>
+<% end %>
+</select>
+<tr> <td>Status:</td> <td><select name="status">
 	<option value="0"<% if #status req = Apt.NEW then %> selected<% end %>>New</option>
 	<option value="1"<% if #status req = Apt.INSTALLED then %> selected<% end %>>Installed</option>
 	<option value="2"<% if #status req = Apt.REJECTED then %> selected<% end %>>Rejected</option>
 </select></td> </tr>
-<tr> <td align="right" valign="top"><b>Packages</b>:</td> <td><textarea name="pkgs" rows="5" cols="40" wrap="soft"><% Web.html (#data req) %></textarea></td> </tr>
-<tr> <td align="right" valign="top"><b>Message</b>:</td> <td><textarea name="msg" rows="10" cols="80" wrap="soft"><% Web.html (#msg req) %></textarea></td> </tr>
+<tr> <td>Packages:</td> <td><textarea name="pkgs" rows="5" cols="40" wrap="soft"><% Web.html (#data req) %></textarea></td> </tr>
+<tr> <td>Message:</td> <td><textarea name="msg" rows="10" cols="80" wrap="soft"><% Web.html (#msg req) %></textarea></td> </tr>
 <tr> <td><input type="submit" value="Save"></td> </tr>
 </table>
 </form>
@@ -169,16 +183,15 @@ elseif $"mod" <> "" then
 <% elseif $"save" <> "" then
 	Group.requireGroupName "server";
 	val id = Web.stoi ($"save");
+	val node = Web.stoi ($"node");
 	val req = Apt.lookup id;
 	val oldStatus = #status req;
 	val newStatus = Apt.statusFromInt (Web.stoi ($"status"));
-	Apt.modify {req with data = $"pkgs", msg = $"msg", status = newStatus};
-	if oldStatus <> newStatus then
-		if not (Apt.notifyMod (oldStatus, newStatus, Init.getUserName(), id)) then
-			%><h3><b>Error sending e-mail notification</b></h3><%
-		end
+	Apt.modify {req with node = node, data = $"pkgs", msg = $"msg", status = newStatus};
+	if not (Apt.notifyMod {old = oldStatus, new = newStatus, changer = Init.getUserName(), req = id}) then
+		%><h3>Error sending e-mail notification</h3><%
 	end
-	%><h3><b>Request modified</b></h3>
+	%><h3>Request modified</h3>
 	Back to: <a href="apt?cmd=open">open requests</a>, <a href="apt?cmd=list">all requests</a>
 
 <% elseif $"del" <> "" then
@@ -186,26 +199,31 @@ elseif $"mod" <> "" then
 	val id = Web.stoi ($"del");
 	val req = Apt.lookup id;
 	val user = Init.lookupUser (#usr req)
-	%><h3><b>Are you sure you want to delete request by <% #name user %> for <tt><% #data req %></tt>?</b></h3>
+	%><h3>Are you sure you want to delete request by <% #name user %> for <tt><% #data req %></tt>?</h3>
 	<a href="apt?del2=<% id %>">Yes, I'm sure!</a>
 
 <% elseif $"del2" <> "" then
 	Group.requireGroupName "server";
 	val id = Web.stoi ($"del2");
 	Apt.delete id
-	%><h3><b>Request deleted</b><h3>
+	%><h3>Request deleted</b><h3>
 	Back to: <a href="apt?cmd=open">open requests</a>, <a href="apt?cmd=list">all requests</a>
 
 <% else %>
 
-<h3><b>Request new installations</b></h3>
+<h3>Request new installations</h3>
 
 List the package names you'd like, separated by any whitespace characters.
 
-<form action="apt">
-<table>
-<tr> <td align="right" valign="top"><b>Packages</b>:</td> <td><textarea name="new" rows="10" cols="40" wrap="soft"></textarea></td> </tr>
-<tr> <td align="right" valign="top"><b>Reason</b>:</td> <td><textarea name="msg" rows="5" cols="80" wrap="soft"></textarea></td> </tr>
+<form action="apt" method="post">
+<table class="blanks">
+<tr> <td>Machine:</td> <td><select name="node">
+<% foreach node in Init.listNodes () do %>
+	<option value="<% #id node %>"<% if #id node = nodeNum then %> selected<% end %>><% Web.html (#name node) %> (<% Web.html (#descr node) %>; Debian <% Web.html (#debian node) %>)</option>
+<% end %>
+</select></td></tr>
+<tr> <td>Packages:</td> <td><textarea name="new" rows="10" cols="40" wrap="soft"></textarea></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>
 </form>