Changeset 766 for trunk

Timestamp:

08/24/15 18:10:42 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Fixes for "Allocation complete" screen:

• Refine and tune order and source of information for breadcrumbs correctness on guided allocation of a static IP
• Remove a little stale code lingering from "rdepth"
• Tweak template parameters and CSS/layout for error reporting

Location:

trunk

Files:

• cgi-bin/main.cgi (modified) (5 diffs)
• templates/confirm.tmpl (modified) (3 diffs)
• templates/insert.tmpl (modified) (2 diffs)

trunk/cgi-bin/main.cgi

@@ -680 +680 @@
   }
 
-  # split up some linked data for static IPs via guided allocation.  needed for breadcrumbs lite.
-  ($webvar{alloc_from},$webvar{rdepth}) = split /,/, $webvar{alloc_from} if $webvar{alloc_from} =~ /,/;
-
   # $code is "success" vs "failure", $msg contains OK for a
   # successful netblock allocation, the IP allocated for static
@@ -714 +711 @@
         );
 
+  my $pinfo = getBlockData($ip_dbh, $webvar{parent});
+
+  # clean up a minor mess with guided allocation of static IPs
+  if ($webvar{alloctype} =~ /^.i$/) {
+    $insert_args{alloc_from} = $pinfo->{block};
+  }
+
   my ($code,$msg) = allocateBlock($ip_dbh, %insert_args, iprev => \%iprev);
 
   if ($code eq 'OK') {
+    # breadcrumbs lite!  provide at least a link to the parent of the block we just allocated.
+    $page->param(parentid => $webvar{parent});
+    $page->param(parentblock => $pinfo->{block});
+
     if ($webvar{alloctype} =~ /^.i$/) {
       $msg =~ s|/32||;
       $page->param(staticip => $msg);
       $page->param(custid => $webvar{custid});
-      $page->param(parent => $webvar{parent}, pool => $webvar{alloc_from});
       $page->param(billinguser => $webvar{billinguser});
       mailNotify($ip_dbh, "a$webvar{alloctype}", "ADDED: $disp_alloctypes{$webvar{alloctype}} allocation",
@@ -732 +739 @@
       $page->param(custid => $webvar{custid});
 
-      # breadcrumbs lite!  provide at least a link to the parent of the block we just allocated.
-      my $binfo = getBlockData($ip_dbh, $webvar{parent});
-      $page->param(parentid => $webvar{parent});
-      $page->param(parentblock => $binfo->{block});
-
       # Full breadcrumbs
       my $crumbs = getBreadCrumbs($ip_dbh, $webvar{parent});
@@ -757 +759 @@
     syslog "err", "Allocation of '$webvar{fullcidr}' to '$webvar{custid}' as ".
         "'$webvar{alloctype}' by $authuser failed: '$msg'";
-    $page->param(err => "Allocation of $webvar{fullcidr} as '$disp_alloctypes{$webvar{alloctype}}'".
-        " failed:<br>\n$msg\n");
+    $page->param(err => "Allocation of $webvar{fullcidr} as '$disp_alloctypes{$webvar{alloctype}}' failed:");
+    $page->param(errmsg => $msg);
   }
 
@@ -1429 +1431 @@
   $page->param(block => $blockinfo->{block});
   $page->param(bdisp => $q->escapeHTML($disp_alloctypes{$blockinfo->{type}}));
-  $page->param(delparent_id => $blockinfo->{parent_id});# if $webvar{rdepth};
+  $page->param(delparent_id => $blockinfo->{parent_id});
   if ($pinfo) {
     $page->param(delparent => $pinfo->{block});

trunk/templates/confirm.tmpl

@@ -26 +26 @@
 <TMPL_IF staticip>
 <td>
-<select name="alloc_from">
-<TMPL_LOOP name=poollist>       <option value="<TMPL_VAR NAME=poolblock>,<TMPL_VAR NAME=poolrdepth>"><TMPL_VAR NAME=poolblock> [<TMPL_VAR NAME=poolfree>] free IP(s) in <TMPL_VAR NAME=poolcit></option>
+<select name="parent">
+<TMPL_LOOP name=poollist>       <option value="<TMPL_VAR NAME=poolid>"><TMPL_VAR NAME=poolblock> [<TMPL_VAR NAME=poolfree>] free IP(s) in <TMPL_VAR NAME=poolcit></option>
 </TMPL_LOOP></select>
 </td>
@@ -61 +61 @@
 </div>
 </TMPL_IF>
-
 </td>
 </tr>
@@ -120 +119 @@
 <tr>
 <td class="center" colspan="2">
-<TMPL_UNLESS poollist><input type="hidden" name="alloc_from" value="<TMPL_VAR NAME=alloc_from>"></TMPL_UNLESS>
+<TMPL_UNLESS poollist>
+<input type="hidden" name="alloc_from" value="<TMPL_VAR NAME=alloc_from>">
 <input type="hidden" name="parent" value="<TMPL_VAR NAME=parent>">
+</TMPL_UNLESS>
 <input type="hidden" name="fbid" value="<TMPL_VAR NAME=fbid>">
 <TMPL_IF resvblock><input type="hidden" name="reserve" value="<TMPL_VAR NAME=reserve>"></TMPL_IF>

trunk/templates/insert.tmpl

@@ -1 +1 @@
 <TMPL_IF err>
 <div class="err">
-<p><TMPL_VAR NAME=err></p>
+<div class="heading"><TMPL_VAR NAME=err></div>
+<p><TMPL_VAR NAME=errmsg></p>
 <input type="button" value="Back" onclick="history.go(-1)">
 </div>
@@ -12 +13 @@
 </TMPL_IF>
 </div>
-<div class="center">IPs in <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=listpool&amp;pool=<TMPL_VAR 
-NAME=parent>"><TMPL_VAR NAME=pool></a></div>
+<div class="center">IPs in <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=listpool&amp;pool=<TMPL_VAR NAME=parentid>"><TMPL_VAR NAME=parentblock></a></div>
 <TMPL_ELSE>
 <div class="center">