Changeset 733 for trunk/cgi-bin/main.cgi

Timestamp:

05/25/15 18:25:20 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Cleanup while rechecking merge-to-container in UI:

• Move descriptive strings for merge scopes into a hash in IPDB.pm, so we don't have to update them everywhere every time they might change... now that most of the changes are done, of course.
• Refiddle listForMerge's freeblock branch to show only direct children, or all free blocks depending on another optional argument.
• Render previous point pointless due to dropping freeblocks from the return list of merged blocks anyway, because Confusion.
• Force scope as well as type when merging a master block. Merging any other type in a way that happens to intersect a master remains undefined.
• Make sure to capture the blocks merged/deleted for return.
• Fix up some variable names for consistency.
• Fix stupid typo missed in r732.

See #8.

File:

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

trunk/cgi-bin/main.cgi

@@ -1221 +1221 @@
   $page->param(typelist => getTypeList($ip_dbh, 'n', $binfo->{type}));  # down the rabbit hole we go...
 
+  # Strings for scope;  do this way so we don't have to edit them many places
+  $page->param(vis_keepall => $merge_display{keepall});
+  $page->param(vis_mergepeer => $merge_display{mergepeer});
+  $page->param(vis_clearpeer => $merge_display{clearpeer});
+  $page->param(vis_clearall => $merge_display{clearall});
+
   # Tree navigation
   my $crumbs = getBreadCrumbs($ip_dbh, $binfo->{parent_id});
@@ -1265 +1271 @@
   $page->param(mergefree => $fb_list);
 
-##fixme:  push this up the stack somewhere so the labels can be fed to the relevant templates when/as needed
-  # scope
-  my %merge_friendly = (
-        keepall   => "Keep mergeable allocations as suballocations of new block",
-        mergepeer => "Keep suballocations of mergeable allocations",
-        clearpeer => "Keep only suballocations of $binfo->{block}",
-        clearall  => "Clear all suballocations"
-    );
-  $page->param(vis_scope => $merge_friendly{$webvar{scope}});
+  $page->param(vis_scope => $merge_display{$webvar{scope}});
   $page->param(scope => $webvar{scope});
 } # confMerge()