Changeset 760 for trunk

Timestamp:

07/28/15 18:05:35 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

• Bump extension and refinement of rDNS-is-available flags up into main.cgi.
• Add a missing breadcrumb call on the merge setup page
• Add a couple of ##fixme's for distant edge cases

File:

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

trunk/cgi-bin/main.cgi

@@ -86 +86 @@
 print $header->output;
 
+##fixme:  whine and complain when the user is not present in the ACL hash above
 
 #main()
@@ -110 +111 @@
   # Retrieve the list of DNS locations if we've got a place to grab them from
   if ($IPDB::rpc_url) {
-
     my %rpcargs = (
         rpcuser => $authuser,
@@ -618 +618 @@
 ## end node hack
 
+  # flag DNS info if we can't publish the entry remotely
+  my $pinfo = getBlockData($ip_dbh, $webvar{parent});
+  $page->param(dnslocal => 1) unless ($pinfo->{revpartial} || $pinfo->{revavail});
+
   # reserve for expansion
   $page->param(reserve => $webvar{reserve});
@@ -891 +895 @@
   $blockinfo->{type} =~ s/\s//;
 
-  if ($blockinfo->{revzone}) {
-    $page->param(revzone => $blockinfo->{revzone});
+##fixme:  The case of "allocation larger than a /24" (or any similar case
+# where the allocation is larger than the zone(s) in DNS) doesn't work well.
+# Best solution may just be to add a warning that the entry shown may not be
+# correct/complete.
+  if ($blockinfo->{revavail} || $blockinfo->{revpartial}) {
+    $page->param(showrev => ($blockinfo->{revavail} || $blockinfo->{revpartial}) );
     my $cached;
     # Get rDNS info;  duplicates a bit of getBlockData but also does the RPC call if possible
     ($blockinfo->{rdns},$cached) = getBlockRDNS($ip_dbh, id => $webvar{id}, type => $blockinfo->{type}, user => $authuser);
+    $page->param(rdns     => $blockinfo->{rdns});
     # visual flag that we're working IPDB-local, not off more authoritative data in dnsadmin
     $page->param(cached   => $cached);
@@ -917 +926 @@
   my ($lastmod,undef) = split /\s+/, $blockinfo->{lastmod};
   $page->param(lastmod  => $lastmod);
-#  $page->param(lastmod  => $blockinfo->{lastmod});
 
   $page->param(block    => $blockinfo->{block});
@@ -960 +968 @@
 ## end node hack
 
-  $page->param(rdns     => $blockinfo->{rdns});
   $page->param(vrf      => $blockinfo->{vrf});
   $page->param(vlan     => $blockinfo->{vlan});
@@ -1220 +1227 @@
 sub prepMerge {
   my $binfo = getBlockData($ip_dbh, $webvar{block});
+
+  # Tree navigation
+  my $crumbs = getBreadCrumbs($ip_dbh, $binfo->{parent_id});
+  my @rcrumbs = reverse (@$crumbs);
+  $utilbar->param(breadcrumb => \@rcrumbs);
+
   $page->param(block => $webvar{block});
   $page->param(ispool => $binfo->{type} =~ /.[dp]/);