Changeset 596 for branches

Timestamp:

05/15/13 18:03:32 (12 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Hand-backport static IP assign-by-browse. As with assign-routed-by-browse
in r595, this could not be merged from /trunk directly due to intermingled
changes for the new database structure and will cause merge conflicts
later.

Location:

branches/stable

Files:

• cgi-bin/main.cgi (modified) (2 diffs)
• templates/listpool.tmpl (modified) (1 diff)

branches/stable/cgi-bin/main.cgi

@@ -323 +323 @@
     if ($webvar{fbtype} eq 'i') {
       my $ipinfo = getBlockData($ip_dbh, $webvar{block}, 'i');
-      my $pinfo = getBlockData($ip_dbh, $webvar{parent});
+##fixme:  a reversion!  kill it!
+my ($iptype,$pool) = $ip_dbh->selectrow_array("SELECT type,pool FROM poolips WHERE ip = ?", undef, ($block));
       $page->param(
         fbip => 1,
@@ -329 +330 @@
         fbdisptype => $list_alloctypes{$ipinfo->{type}},
         type => $ipinfo->{type},
-        allocfrom => $pinfo->{block},
+        allocfrom => $pool,
         );
     } elsif ($webvar{fbtype} eq 'n') {

branches/stable/templates/listpool.tmpl

@@ -29 +29 @@
 <TMPL_LOOP name=poolips>
 <tr class="row<TMPL_IF __odd__>0<TMPL_ELSE>1</TMPL_IF>">
-<td><a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=edit&amp;block=<TMPL_VAR NAME=ip>"><TMPL_VAR NAME=ip></a></td>
+<td>
+
+<TMPL_UNLESS delme>
+<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=assign&amp;block=<TMPL_VAR NAME=ip>&amp;fbtype=i"><TMPL_VAR NAME=ip></a>
+<TMPL_ELSE>
+<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=edit&amp;block=<TMPL_VAR NAME=ip>"><TMPL_VAR NAME=ip></a>
+</TMPL_UNLESS>
+
+</td>
 <td><TMPL_VAR NAME=custid></td>
 <td><TMPL_VAR NAME=available></td>