Changeset 765 for trunk/cgi-bin


Ignore:
Timestamp:
07/30/15 17:11:59 (9 years ago)
Author:
Kris Deugau
Message:

/trunk

  • Do a bit more work and display the correct new netblock when an update grabs the "reserved" freeblock and expands the assignment
  • Remove a duplicate breadcrumb-fill on the merge preparation page
  • Add breadcrumb-fill calls in "delete assignment" confirmation and action pages
File:
1 edited

Legend:

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

    r760 r765  
    10961096  $webvar{privdata} =~ s/\n/<br>\n/;
    10971097
    1098   $page->param(cidr => $binfo->{block});
     1098  if ($webvar{expandme}) {
     1099    # this is fugly but still faster than hitting the DB again with getBlockData()
     1100    my $tmp = new NetAddr::IP $binfo->{block};
     1101    my $fb = new NetAddr::IP $binfo->{reserve};
     1102    my @newblock = $tmp->compact($fb);
     1103    $page->param(cidr => $newblock[0]);
     1104  } else {
     1105    $page->param(cidr => $binfo->{block});
     1106  }
    10991107  $page->param(rdns => $webvar{rdns});
    11001108  $page->param(city => $webvar{city});
     
    12461254  $page->param(vis_clearall => $merge_display{clearall});
    12471255
    1248   # Tree navigation
    1249   my $crumbs = getBreadCrumbs($ip_dbh, $binfo->{parent_id});
    1250   my @rcrumbs = reverse (@$crumbs);
    1251   $utilbar->param(breadcrumb => \@rcrumbs);
    12521256} # prepMerge()
    12531257
     
    13561360  $blockdata = getBlockData($ip_dbh, $webvar{block}, $webvar{basetype});
    13571361
     1362  # Tree navigation
     1363  my $crumbs = getBreadCrumbs($ip_dbh, $blockdata->{parent_id});
     1364  my @rcrumbs = reverse (@$crumbs);
     1365  $utilbar->param(breadcrumb => \@rcrumbs);
     1366
    13581367  if ($blockdata->{parent_id} == 0) {   # $webvar{alloctype} eq 'mm'
    13591368    $blockdata->{city} = "N/A";
     
    14101419  my $blockinfo = getBlockData($ip_dbh, $webvar{block}, $webvar{basetype});
    14111420  my $pinfo = getBlockData($ip_dbh, $blockinfo->{parent_id}, 'b');
     1421
     1422  # Tree navigation
     1423  my $crumbs = getBreadCrumbs($ip_dbh, $blockinfo->{parent_id});
     1424  my @rcrumbs = reverse (@$crumbs);
     1425  $utilbar->param(breadcrumb => \@rcrumbs);
    14121426
    14131427  my ($code,$msg) = deleteBlock($ip_dbh, $webvar{block}, $webvar{basetype}, $webvar{delforward}, $authuser);
Note: See TracChangeset for help on using the changeset viewer.