Changeset 651 for trunk

Timestamp:

12/17/14 17:41:22 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Tweak delete result page to include block type in case of confusing
allocation structures

Location:

trunk

Files:

• cgi-bin/main.cgi (modified) (1 diff)
• templates/finaldelete.tmpl (modified) (2 diffs)

trunk/cgi-bin/main.cgi

@@ -881 +881 @@
 
   $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 => $pinfo->{block});
+  if ($pinfo) {
+    $page->param(delparent => $pinfo->{block});
+    $page->param(pdisp => $q->escapeHTML($disp_alloctypes{$pinfo->{type}}));
+  }
   $page->param(returnpool => ($webvar{basetype} eq 'i') );
   if ($code =~ /^WARN(POOL|MERGE)/) {

trunk/templates/finaldelete.tmpl

@@ -4 +4 @@
 <input type="button" value="Back" onclick="history.go(-1)">
 <TMPL_ELSE>
-<div class="heading">Success!  <TMPL_VAR NAME=block> deallocated.</div>
+<div class="heading">Success!  <TMPL_VAR NAME=block><TMPL_IF bdisp> (<TMPL_VAR bdisp>)</TMPL_IF>
+deallocated.</div>
 <TMPL_IF genwarn><br><div><TMPL_VAR NAME=genwarn></div></TMPL_IF>
 <TMPL_IF parent_id><br><div>
@@ -21 +22 @@
 <div>Return to <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=listpool&amp;pool=<TMPL_VAR NAME=delparent_id>"><TMPL_VAR NAME=delparent></a></div>
 <TMPL_ELSE>
-<div>Return to <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showsubs&amp;parent=<TMPL_VAR NAME=delparent_id>"><TMPL_VAR NAME=delparent></a></div>
+<div>Return to <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showsubs&amp;parent=<TMPL_VAR NAME=delparent_id>"><TMPL_VAR NAME=delparent><TMPL_IF pdisp> (<TMPL_VAR NAME=pdisp>)</TMPL_IF></a></div>
 </TMPL_IF>
 </TMPL_IF>