Changeset 651


Ignore:
Timestamp:
Dec 17, 2014, 5:41:22 PM (7 years ago)
Author:
Kris Deugau
Message:

/trunk

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

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/cgi-bin/main.cgi

    r638 r651  
    881881
    882882  $page->param(block => $blockinfo->{block});
     883  $page->param(bdisp => $q->escapeHTML($disp_alloctypes{$blockinfo->{type}}));
    883884  $page->param(delparent_id => $blockinfo->{parent_id});# if $webvar{rdepth};
    884   $page->param(delparent => $pinfo->{block});
     885  if ($pinfo) {
     886    $page->param(delparent => $pinfo->{block});
     887    $page->param(pdisp => $q->escapeHTML($disp_alloctypes{$pinfo->{type}}));
     888  }
    885889  $page->param(returnpool => ($webvar{basetype} eq 'i') );
    886890  if ($code =~ /^WARN(POOL|MERGE)/) {
  • trunk/templates/finaldelete.tmpl

    r638 r651  
    44<input type="button" value="Back" onclick="history.go(-1)">
    55<TMPL_ELSE>
    6 <div class="heading">Success!  <TMPL_VAR NAME=block> deallocated.</div>
     6<div class="heading">Success!  <TMPL_VAR NAME=block><TMPL_IF bdisp> (<TMPL_VAR bdisp>)</TMPL_IF>
     7deallocated.</div>
    78<TMPL_IF genwarn><br><div><TMPL_VAR NAME=genwarn></div></TMPL_IF>
    89<TMPL_IF parent_id><br><div>
     
    2122<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>
    2223<TMPL_ELSE>
    23 <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>
     24<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>
    2425</TMPL_IF>
    2526</TMPL_IF>
Note: See TracChangeset for help on using the changeset viewer.