Changeset 682 for trunk/cgi-bin

Timestamp:

01/20/15 16:57:05 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Convert working hack for comparing container list layout into a
configuration switch, and pick a default.

Location:

trunk/cgi-bin

Files:

• IPDB.pm (modified) (1 diff)
• MyIPDB.pm (modified) (1 diff)
• main.cgi (modified) (3 diffs)

trunk/cgi-bin/IPDB.pm

@@ -104 +104 @@
 # (eg, NetAddr::IP->bits - NetAddr::IP->masklen)
 our $maxrevlist = 5;  # /27
+
+# UI layout for subblocks/containers
+our $sublistlayout = 1;
 
 ##

trunk/cgi-bin/MyIPDB.pm

@@ -78 +78 @@
 #$IPDB::maxrevlist = 8;  # v4 /24
 
+## UI layout for showing subblocks
+# 1 lists all containers in a group, then all end-use allocations (including pools) in a group
+# 2 lists all entries in a container in CIDR order, and puts a secondary summary line under a container entry
+# Both show free blocks in a group at the bottom as previously
+# $IPDB::sublistlayout = 1;
+
 ## connectDB_My()
 # Wrapper for IPDB::connectDB

trunk/cgi-bin/main.cgi

@@ -87 +87 @@
   $webvar{action} = "index";    #shuts up the warnings.
 }
+
+# collect variations in layout by way of $IPDB::sublistlayout
+$webvar{action} = 'showsubs' if $webvar{action} =~ /^showsubs/;
 
 my $page;
@@ -244 +247 @@
 # Display blocks immediately within a given parent
 sub showSubs {
+  # Which layout?
+  if ($IPDB::sublistlayout == 2) {
+
+    # 2-part layout;  mixed containers and end-use allocations and free blocks.
+    # Containers have a second line for the subblock metadata.
+    # We need to load an alternate template for this case.
+    $page = HTML::Template->new(filename => "showsubs2.tmpl", loop_context_vars => 1, global_vars => 1);
+
+    $page->param(maydel => ($IPDBacl{$authuser} =~ /d/));
+
+    my $sublist = listSubs($ip_dbh, parent => $webvar{parent});
+    $page->param(sublist => $sublist);
+
+  } else {
+
+    # Default 3-part layout;  containers, end-use allocations, and free blocks
+
+    my $contlist = listContainers($ip_dbh, parent => $webvar{parent});
+    $page->param(contlist => $contlist);
+
+    my $alloclist = listAllocations($ip_dbh, parent => $webvar{parent});
+    $page->param(alloclist => $alloclist);
+
+    # only show "delete" button if we have no container or usage allocations
+    $page->param(maydel => ($IPDBacl{$authuser} =~ /d/) && !(@$contlist || @$alloclist));
+
+  }
+
+  # Common elements
   my $pinfo = getBlockData($ip_dbh, $webvar{parent});
 
@@ -249 +281 @@
   $page->param(block => $pinfo->{block});
   $page->param(mayadd => ($IPDBacl{$authuser} =~ /a/));
-  $page->param(maydel => ($IPDBacl{$authuser} =~ /d/));
-
-  my $sublist = listSubs($ip_dbh, parent => $webvar{parent});
-  $page->param(sublist => $sublist);
 
   my $flist = listFree($ip_dbh, parent => $webvar{parent});