Changeset 654


Ignore:
Timestamp:
Dec 18, 2014, 1:57:09 PM (7 years ago)
Author:
Kris Deugau
Message:

/trunk

Polish return-a-(legacy-)block-to-an-IP-pool return warning and links
for clarity

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/cgi-bin/main.cgi

    r651 r654  
    890890  if ($code =~ /^WARN(POOL|MERGE)/) {
    891891    my ($pid,$pcidr) = split /,/, $msg;
     892    my $real_pinfo = getBlockData($ip_dbh, $pid, 'b');
    892893    $page->param(parent_id => $pid);
    893894    $page->param(parent => $pcidr);
     895    $page->param(real_disp => $q->escapeHTML($disp_alloctypes{$real_pinfo->{type}}));
    894896    $page->param(mergeip => $code eq 'WARNPOOL');
    895897  }
  • trunk/templates/finaldelete.tmpl

    r651 r654  
    99<TMPL_IF parent_id><br><div>
    1010Warning: 
    11 <TMPL_IF mergeip>IPs in <TMPL_VAR NAME=block> were released as available static IPs in <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=listpool&amp;pool=<TMPL_VAR NAME=parent_id>"><TMPL_VAR NAME=parent></a>,<br>
     11<TMPL_IF mergeip>IPs in <TMPL_VAR NAME=block> were released as available static IPs in
     12<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=listpool&amp;pool=<TMPL_VAR NAME=parent_id>"><TMPL_VAR NAME=parent> (<TMPL_VAR NAME=real_disp>)</a>,<br>
    1213not released for general netblock assignment under
    13 <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showsubs&amp;parent=<TMPL_VAR NAME=delparent_id>"><TMPL_VAR NAME=delparent></a>.
     14<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showsubs&amp;parent=<TMPL_VAR NAME=delparent_id>"><TMPL_VAR NAME=delparent> (<TMPL_VAR NAME=pdisp>)</a>.
    1415<TMPL_ELSE>
    1516<TMPL_VAR NAME=block> was released as free and merged with blocks under <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showsubs&amp;parent=<TMPL_VAR NAME=parent_id>"><TMPL_VAR NAME=parent></a>,
Note: See TracChangeset for help on using the changeset viewer.