Changeset 438 for trunk

Timestamp:

07/20/10 12:05:09 (14 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix up add-notice process to allow adding new-city and new-node failures.
(Re-) closes #21.

File:

• trunk/cgi-bin/admin.cgi (modified) (3 diffs)

trunk/cgi-bin/admin.cgi

@@ -548 +548 @@
 <td>Recipients</td><td colspan=3><textarea name=reciplist cols=50 rows=5></textarea></td></tr>
 <tr><td>Action</td><td>
-        <input type=radio name=msgaction value=a>Add &nbsp;
-        <input type=radio name=msgaction value=u>Update &nbsp;
-        <input type=radio name=msgaction value=d>Delete
-        <input type=radio name=msgaction value=s:>Special: <input name=special>(requires code changes)
+        <table><tr>
+                <td><input type=radio name=msgaction value=a>Add &nbsp;
+                <input type=radio name=msgaction value=u>Update &nbsp;
+                <input type=radio name=msgaction value=d>Delete &nbsp;
+                <input type=radio name=msgaction value=n>New listitem</td>
+        </tr><tr>
+                <td>
+                <input type=radio name=msgaction value=s:>Special: <input name=special>(requires code changes)
+        </td></tr></table>
 </td>
 <td>Failure?</td><td><input type=checkbox name=onfail></td></tr>
-<tr><td>Allocation type:</td><td colspan=3>
+<tr><td>Event/Allocation type:</td><td colspan=3>
         <table>
         <tr>
                 <td><input type=radio name=alloctype value=a>All allocations</td>
                 <td><input type=radio name=alloctype value=.i>All static IPs</td>
+                <td><input type=radio name=alloctype value=ci>New city</td>
+                <td><input type=radio name=alloctype value=no>New node</td>
         </tr>
         <tr>
@@ -587 +594 @@
   if ($webvar{msgaction} && $webvar{alloctype} && $webvar{reciplist}) {
     $webvar{reciplist} =~ s/[\r\n]+/,/g;
+    $webvar{msgaction} = "f:$webvar{msgaction}" if $webvar{onfail};
     print "Adding notice to $webvar{reciplist} for ".dispNoticeCode($webvar{msgaction}.$webvar{alloctype}).":\n";
     $sth = $ip_dbh->prepare("INSERT INTO notify (action, reciplist) VALUES (?,?)");
 ##fixme:  automagically merge reciplists iff action already exists
-    $webvar{msgaction} = "f:$webvar{msgaction}" if $webvar{onfail};
     $sth->execute($webvar{msgaction}.$webvar{alloctype}, $webvar{reciplist});
     if ($sth->err) {
@@ -816 +823 @@
 # this should give an idea of the structure tho
     if ($target eq 'a') { $action_out .= "all"; }
-    elsif ($target =~ /^\.i$/) {
+    elsif ($target eq '.i') {
       $action_out .= "all static IPs";
     }