bug 191087 - process_bug.cgi: "Mid-air collision!" title when not allowed to change...

r=gerv, a=justdave

diff --git a/process_bug.cgi b/process_bug.cgi
index 80b318a746d8b0e704af485f80d42a516ee27c25..6505d6fcf26a2d5e6831caa180f0da2b7f9070e3 100755 (executable)
--- a/process_bug.cgi
+++ b/process_bug.cgi
@@ -1108,7 +1108,7 @@ foreach my $id (@idlist) {
             if (!CheckCanChangeField($col, $id, $oldvalues[$i], $::FORM{$col})) {
                 # More fun hacking... don't display component_id
                 if ($col eq 'component_id') {
-                    $vars->{'oldvalue'} = get_component_name($product_id, $oldhash{'component_id'});
+                    $vars->{'oldvalue'} = get_component_name($oldhash{'component_id'});
                     $vars->{'newvalue'} = $::FORM{'component'};
                     $vars->{'field'} = 'component';
                 }

diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 33ebb9472e3771a452ccd1506785a31936f689d2..dfb8af9fabc5a8a8b90921899204bf1ffc655fe5 100644 (file)
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -213,6 +213,7 @@
     0 and 1.
          
   [% ELSIF error == "illegal_change" %]
+    [% title = "Not allowed" %]
     You tried to change the <strong>[% field %]</strong> field 
     from <em>[% oldvalue FILTER html %]</em> to 
     <em>[% newvalue FILTER html %]</em>,