Changeset 815 for trunk/cgi-bin/IPDB.pm

Timestamp:

03/09/16 17:25:26 (8 years ago)

Author:

Kris Deugau

Message:

/trunk

Pass VRF in to add master page, and include it in the database checks. See #54.
Add missing breadcrumb links on add master entry and confirmation pages.

File:

• trunk/cgi-bin/IPDB.pm (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -703 +703 @@
   eval {
     # First check - does the master exist?  Ignore VRFs until we can see a sane UI
-    my ($mcontained) = $dbh->selectrow_array("SELECT cidr FROM allocations WHERE cidr >>= ? AND type = 'mm'",
-        undef, ($cidr) );
+    my ($mcontained) = $dbh->selectrow_array("SELECT cidr FROM allocations WHERE cidr >>= ? AND type = 'mm' AND vrf = ?",
+        undef, ($cidr, $args{vrf}) );
     die "Master block $mcontained already exists and entirely contains $cidr\n"
         if $mcontained;
 
     # Second check - does the new master contain an existing one or ones?
-    my ($mexist) = $dbh->selectrow_array("SELECT cidr FROM allocations WHERE cidr <<= ? AND type = 'mm'",
-        undef, ($cidr) );
+    my ($mexist) = $dbh->selectrow_array("SELECT cidr FROM allocations WHERE cidr <<= ? AND type = 'mm' AND vrf = ?",
+        undef, ($cidr, $args{vrf}) );
 
     if (!$mexist) {