Changeset 717

Timestamp:

05/06/15 17:28:38 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Begin committing "merge/extend blocks". See #8.

This commit adds the first merge page to the UI.

Location:

trunk

Files:

• cgi-bin/main.cgi (modified) (2 diffs)
• templates/merge.tmpl (added)

trunk/cgi-bin/main.cgi

@@ -177 +177 @@
 elsif($webvar{action} eq 'dosplit') {
   doSplit();
+}
+elsif($webvar{action} eq 'merge') {
+  prepMerge();
 }
 elsif($webvar{action} eq 'delete') {
@@ -1205 +1208 @@
 
 
+# Set up for merge
+sub prepMerge {
+  my $binfo = getBlockData($ip_dbh, $webvar{block});
+  $page->param(block => $webvar{block});
+  $page->param(ispool => $binfo->{type} =~ /.[dp]/);
+  $page->param(ismaster => $binfo->{type} eq 'mm');
+  $page->param(oldblock => $binfo->{block});
+  $page->param(oldtype => $disp_alloctypes{$binfo->{type}});
+  $page->param(typelist => getTypeList($ip_dbh, 'n', $binfo->{type}));  # down the rabbit hole we go...
+
+  # Tree navigation
+  my $crumbs = getBreadCrumbs($ip_dbh, $binfo->{parent_id});
+  my @rcrumbs = reverse (@$crumbs);
+  $utilbar->param(breadcrumb => \@rcrumbs);
+} # prepMerge()
+
+
 # Delete an allocation.
 sub remove {