Changeset 765 for trunk

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:

• trunk/cgi-bin/main.cgi (modified) (4 diffs)

trunk/cgi-bin/main.cgi

@@ -1096 +1096 @@
   $webvar{privdata} =~ s/\n/<br>\n/;
 
-  $page->param(cidr => $binfo->{block});
+  if ($webvar{expandme}) {
+    # this is fugly but still faster than hitting the DB again with getBlockData()
+    my $tmp = new NetAddr::IP $binfo->{block};
+    my $fb = new NetAddr::IP $binfo->{reserve};
+    my @newblock = $tmp->compact($fb);
+    $page->param(cidr => $newblock[0]);
+  } else {
+    $page->param(cidr => $binfo->{block});
+  }
   $page->param(rdns => $webvar{rdns});
   $page->param(city => $webvar{city});
@@ -1246 +1254 @@
   $page->param(vis_clearall => $merge_display{clearall});
 
-  # Tree navigation
-  my $crumbs = getBreadCrumbs($ip_dbh, $binfo->{parent_id});
-  my @rcrumbs = reverse (@$crumbs);
-  $utilbar->param(breadcrumb => \@rcrumbs);
 } # prepMerge()
 
@@ -1356 +1360 @@
   $blockdata = getBlockData($ip_dbh, $webvar{block}, $webvar{basetype});
 
+  # Tree navigation
+  my $crumbs = getBreadCrumbs($ip_dbh, $blockdata->{parent_id});
+  my @rcrumbs = reverse (@$crumbs);
+  $utilbar->param(breadcrumb => \@rcrumbs);
+
   if ($blockdata->{parent_id} == 0) {   # $webvar{alloctype} eq 'mm'
     $blockdata->{city} = "N/A";
@@ -1410 +1419 @@
   my $blockinfo = getBlockData($ip_dbh, $webvar{block}, $webvar{basetype});
   my $pinfo = getBlockData($ip_dbh, $blockinfo->{parent_id}, 'b');
+
+  # Tree navigation
+  my $crumbs = getBreadCrumbs($ip_dbh, $blockinfo->{parent_id});
+  my @rcrumbs = reverse (@$crumbs);
+  $utilbar->param(breadcrumb => \@rcrumbs);
 
   my ($code,$msg) = deleteBlock($ip_dbh, $webvar{block}, $webvar{basetype}, $webvar{delforward}, $authuser);