Changeset 605 for branches/stable/cgi-bin

Timestamp:

10/09/13 15:36:14 (11 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Brown-paper-bag fixup commit:

• add another type to the set which can use nodes
• template and code changes to let admin allocations includ VRF info
• fix subtle bug in getTypeList() that returned the Routing type when it shouldn't
• compare and display VRF info on searches
• minor HTML formatting tweaks for clarity

Bump version to 2.8.1

Location:

branches/stable

Files:

• . (modified) (1 prop)
• cgi-bin/IPDB.pm (modified) (1 diff)
• cgi-bin/admin.cgi (modified) (1 diff)
• cgi-bin/main.cgi (modified) (1 diff)
• cgi-bin/search.cgi (modified) (5 diffs)

branches/stable/cgi-bin/IPDB.pm

@@ -514 +514 @@
     # and contained (_r) types, dynamic-allocation ranges (_e), static IP pools (_d and _p),
     # and the "miscellaneous" cn, in, and en types.
-    $tlist = $dbh->selectall_arrayref("SELECT type,listname FROM alloctypes WHERE listorder <= 500 ".
+    $tlist = $dbh->selectall_arrayref("SELECT type,listname FROM alloctypes WHERE listorder < 500 ".
         "AND type NOT LIKE '_i' ORDER BY listorder", { Slice => {} });
   } elsif ($tgroup eq 'p') {

branches/stable/cgi-bin/admin.cgi

@@ -203 +203 @@
   my ($retcode,$msg) = allocateBlock($ip_dbh, $webvar{cidr}, $webvar{alloc_from},
         $webvar{custid}, $webvar{alloctype}, $webvar{city}, $webvar{desc}, $webvar{notes},
-        $webvar{circid});
+        $webvar{circid}, undef, undef, $webvar{vrf});
   if ($retcode eq 'OK') {
     syslog "notice", "$authuser allocated '$webvar{cidr}' to '$webvar{custid}' as ".

branches/stable/cgi-bin/main.cgi

@@ -679 +679 @@
   $page->param(havenodeid => $nodeid);
 
-  if ($blockinfo->{type} eq 'fr' || $blockinfo->{type} eq 'bi') {
+  if ($blockinfo->{type} eq 'fr' || $blockinfo->{type} eq 'bi' || $blockinfo->{type} eq 'ai') {
     $page->param(typesupportsnodes => 1);
     $page->param(nodename => $nodename);

branches/stable/cgi-bin/search.cgi

@@ -148 +148 @@
   # Columns actually returned.  Slightly better than hardcoding it
   # in each (sub)select
-  my $cols = "cidr,custid,type,city,description";
+  my $cols = "cidr,custid,type,city,description,vrf";
 
   # hack fix for undefined variables
@@ -350 +350 @@
 #    which probably shouldn't be for reasons of sanity.
 
-  my $cols = "cidr,custid,type,city,description";
+  my $cols = "cidr,custid,type,city,description,vrf";
 
   if ($category eq 'all') {
@@ -368 +368 @@
     # Query for a customer ID.  Note that we can't restrict to "numeric-only"
     # as we have non-numeric custIDs in the legacy data.  :/
-    $sql = "select $cols from searchme where custid ilike '%$query%' or description ilike '%$query%'";
+    $sql = "select $cols from searchme where custid ilike '%$query%'".
+        " or description ilike '%$query%' or vrf ilike '%$query%'";
     my $count = countRows($sql);
     $sql .= " order by cidr limit $RESULTS_PER_PAGE offset $offset";
@@ -465 +466 @@
   my $count = 0;
   my @sresults;
-  while (my ($block, $custid, $type, $city, $desc) = $sth->fetchrow_array) {
+  while (my ($block, $custid, $type, $city, $desc, $vrf) = $sth->fetchrow_array) {
     my %row = (
         rowclass => $count++ % 2,
@@ -474 +475 @@
         disptype => $disp_alloctypes{$type},
         city => $city,
-        desc => $desc
+        desc => $desc,
+        vrf => $vrf,
         );
     push @sresults, \%row;