Changeset 596


Ignore:
Timestamp:
May 15, 2013, 6:03:32 PM (8 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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/cgi-bin/main.cgi

    r595 r596  
    323323    if ($webvar{fbtype} eq 'i') {
    324324      my $ipinfo = getBlockData($ip_dbh, $webvar{block}, 'i');
    325       my $pinfo = getBlockData($ip_dbh, $webvar{parent});
     325##fixme:  a reversion!  kill it!
     326my ($iptype,$pool) = $ip_dbh->selectrow_array("SELECT type,pool FROM poolips WHERE ip = ?", undef, ($block));
    326327      $page->param(
    327328        fbip => 1,
     
    329330        fbdisptype => $list_alloctypes{$ipinfo->{type}},
    330331        type => $ipinfo->{type},
    331         allocfrom => $pinfo->{block},
     332        allocfrom => $pool,
    332333        );
    333334    } elsif ($webvar{fbtype} eq 'n') {
  • branches/stable/templates/listpool.tmpl

    r594 r596  
    2929<TMPL_LOOP name=poolips>
    3030<tr class="row<TMPL_IF __odd__>0<TMPL_ELSE>1</TMPL_IF>">
    31 <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>
     31<td>
     32
     33<TMPL_UNLESS delme>
     34<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>
     35<TMPL_ELSE>
     36<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=edit&amp;block=<TMPL_VAR NAME=ip>"><TMPL_VAR NAME=ip></a>
     37</TMPL_UNLESS>
     38
     39</td>
    3240<td><TMPL_VAR NAME=custid></td>
    3341<td><TMPL_VAR NAME=available></td>
Note: See TracChangeset for help on using the changeset viewer.