From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 12 Sep 2012 18:00:50 +0000 (+0100)
Subject: wip, don't do radiobuttons after all
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=nj-awaymsg.git;a=commitdiff_plain;h=fa7b7b64f8c5f5f1a409b12c9a8d483096dc110a

wip, don't do radiobuttons after all
---

diff --git a/mason/edit b/mason/edit
index c8ee036..9fc7a22 100755
--- a/mason/edit
+++ b/mason/edit
@@ -37,7 +37,13 @@ if ($ARGS{'create'}) {
     $tx = $sth->fetchrow_hashref();#
 }
 
-my $usedq = $dbh->prepare("SELECT * FROM addresses ORDER BY emailaddr");
+my $usedq = $dbh->prepare(<<END);
+    SELECT *
+     FROM        config
+       LEFT JOIN addresses USING (emailaddr)
+       LEFT JOIN texts     USING (textid)
+     ORDER BY emailaddr
+END
 $usedq->execute();
 
 if (!$tx) { die "no such text $textid"; }
@@ -49,14 +55,20 @@ if (!$tx) { die "no such text $textid"; }
 <tr><td colspan=2><textarea name="text" cols="79" rows="15"><%
   $tx->{'text'} |h %></textarea></td></tr>
 </&>
-</table><br><table>
+</table><table>
 % while (my $row = $usedq->fetchrow_hashref()) {
 <tr><td>Use for <% $row->{'emailaddr'} |h %></td>
 <td><input type="checkbox"
-%     if ($usedq->
-></td></tr>
+%     if ($row->{'textid'} eq $textid) {
+ checked></td><td>(currently using this message)
+%     } elsif (defined $row->{'textid'}) {
+ ></td><td>(currently using another message "<% $row->{'desc'} |h %>")
+%     } else {
+ >
+%     }
+</td></tr>
 % }
-<p>
+</table><p>
 <input type="hidden" name="textid" value="<% $tx->{'textid'} %>">
 <input type="submit" name="save" value="Save">
 <input type="submit" name="cancel" value="Cancel edit">