Changeset 576 for trunk

Timestamp:

12/21/12 17:49:08 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Work in progress, see #5:
Update templates and calling code for allocation update to pass
around rdepth as needed, and to set some breadcrumbs-lite to
make it easier to get back where you were

Location:

trunk

Files:

• cgi-bin/IPDB.pm (modified) (1 diff)
• cgi-bin/main.cgi (modified) (4 diffs)
• templates/edit.tmpl (modified) (2 diffs)
• templates/update.tmpl (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -1059 +1059 @@
   return ('FAIL', 'No fields to update') if !@fieldlist;
 
-  push @vallist, $args{block};
+  push @vallist, $args{block}, $args{rdepth}, $args{vrf};
   my $sql = "UPDATE $updtable SET ";
   $sql .= join " = ?, ", @fieldlist;
-  $sql .= " = ? WHERE $keyfield = ?";
+  $sql .= " = ? WHERE $keyfield = ? AND rdepth = ? AND vrf = ?";
 
   eval {

trunk/cgi-bin/main.cgi

@@ -621 +621 @@
 
   # snag block info from db
-  my $blockinfo = getBlockData($ip_dbh, $webvar{block});
+  my $blockinfo = getBlockData($ip_dbh, $webvar{block}, $webvar{rdepth});
 
   # Clean up extra whitespace on alloc type.  Mainly a legacy-data cleanup.
@@ -627 +627 @@
 
   $page->param(block => $webvar{block});
+  $page->param(rdepth   => $blockinfo->{rdepth});
 
   $page->param(custid   => $blockinfo->{custid});
@@ -715 +716 @@
         type            => $webvar{alloctype},
         swip            => $webvar{swip},
+        rdepth          => $webvar{rdepth},
         );
 
@@ -745 +747 @@
 
   # Link back to browse-routed or list-pool page on "Update complete" page.
-  my $cblock;
+  my $cblock = getBlockData($ip_dbh, $webvar{block}, $webvar{rdepth});
   if (my $pooltype = ($webvar{alloctype} =~ /^(.)i$/) ) {
     $page->param(backpool => 1);
-    $cblock = ipParent($ip_dbh, $webvar{block});
+    $page->param(backblock => $cblock->{pool});
   } else {
-    $cblock = blockParent($ip_dbh, $webvar{block});
-  }
-  $page->param(backblock => $cblock->{cidr});
+    $page->param(backblock => $cblock->{parent});
+  }
+  $page->param(backdepth => ($webvar{rdepth}));
 
   # Do some HTML fiddling here instead of using ESCAPE=HTML in the template,

trunk/templates/edit.tmpl

@@ -12 +12 @@
 <input type="hidden" name="action" value="update">
 <input type="hidden" name="block" value="<TMPL_VAR NAME=block>">
+<input type="hidden" name="rdepth" value="<TMPL_VAR NAME=rdepth>">
 </TMPL_IF>
 
@@ -163 +164 @@
 <input type="hidden" name="action" value="delete">
 <input type="hidden" name="block" value="<TMPL_VAR NAME=block>">
-<input type="hidden" name="alloctype" value="<TMPL_VAR NAME=type>">
+<input type="hidden" name="rdepth" value="<TMPL_VAR NAME=rdepth>">
 <input type=submit value=" Delete this block ">
 </div>

trunk/templates/update.tmpl

@@ -65 +65 @@
 <br>
 <div class="backlink">
-<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=<TMPL_IF backpool>listpool&amp;pool=<TMPL_ELSE>showrouted&amp;block=</TMPL_IF><TMPL_VAR NAME=backblock>">Back to <TMPL_VAR NAME=backblock></a>
+<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=<TMPL_IF backpool>listpool&amp;pool=<TMPL_ELSE>showsubs&amp;block=</TMPL_IF><TMPL_VAR NAME=backblock>&amp;rdepth=<TMPL_VAR NAME=backdepth>">Back to <TMPL_VAR NAME=backblock></a>
 </div>
 </TMPL_IF>