Changeset 735 for trunk/cgi-bin

Timestamp:

05/27/15 17:56:44 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

A little more surrounding cleanup:

• Tweak merge confirmation template to show the scope or not on different criteria for clarity.
• Remove call to retrieve free blocks for listing on the confirmation page.

See #8

File:

• trunk/cgi-bin/main.cgi (modified) (2 diffs)

trunk/cgi-bin/main.cgi

@@ -1255 +1255 @@
   $page->param(oldtype => $disp_alloctypes{$binfo->{type}});
   $page->param(ismaster => $binfo->{type} eq 'mm');
-  $page->param(iscontainer => $webvar{alloctype} eq 'rm' || $webvar{alloctype} =~ /.c/);
   $page->param(ispool => $webvar{alloctype} =~ /.[dp]/);
   $page->param(isleaf => $webvar{alloctype} =~ /.[enr]/);
@@ -1268 +1267 @@
   my $malloc_list = listForMerge($ip_dbh, $binfo->{parent_id}, $newblock, 'a');
   $page->param(mergealloc => $malloc_list);
-  my $fb_list = listForMerge($ip_dbh, $binfo->{parent_id}, $newblock, 'f');
-  $page->param(mergefree => $fb_list);
 
   $page->param(vis_scope => $merge_display{$webvar{scope}});