Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1102003: The URL and status whiteboard fields display ARRAY(...) instead of real data

Browse Source 
r=dkl a=glob


git-svn-id: svn://10.0.0.236/trunk@265682 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzrmirror%bugzilla.org 2014-11-24 09:48:07 +00:00
parent ac0cebe17e
commit 04fe9ad0a0
5 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/.bzrrev
View File

@ -1 +1 @@
9215 9216

2
mozilla/webtools/bugzilla/.gitrev
View File

@ -1 +1 @@
8155a9389a4ab33f694fac5e08c6992ab89deac8 0eb69045b7a52fb4f8616be3ce16a98a83d35831

2
mozilla/webtools/bugzilla/t/008filter.t
View File

@ -212,7 +212,7 @@ sub directive_ok {
return 1 if $directive =~ /FILTER\ (html|csv|js|base64|css_class_quote|ics| return 1 if $directive =~ /FILTER\ (html|csv|js|base64|css_class_quote|ics|
quoteUrls|time|uri|xml|lower|html_light| quoteUrls|time|uri|xml|lower|html_light|
obsolete|inactive|closed|unitconvert| obsolete|inactive|closed|unitconvert|
txt|html_linebreak|markdown|none)\b/x; txt|html_linebreak|markdown|none|null)\b/x;
return 0; return 0;
} }

15
mozilla/webtools/bugzilla/template/en/default/bug/edit.html.tmpl
View File

@ -205,7 +205,7 @@
accesskey = "s" accesskey = "s"
tag_name = 'span' tag_name = 'span'
%] %]
[% PROCESS input inputname => "short_desc" size => "80" [% INCLUDE input inputname => "short_desc" size => "80"
maxlength => 255 spellcheck => "true" no_td => 1 %] maxlength => 255 spellcheck => "true" no_td => 1 %]
</div> </div>
</div> </div>
@ -500,7 +500,7 @@
(<a href="#" id="bz_url_edit_action">edit</a>)</span> (<a href="#" id="bz_url_edit_action">edit</a>)</span>
[% END %] [% END %]
<span id="bz_url_input_area"> <span id="bz_url_input_area">
[% url_output = PROCESS input no_td=1 inputname => "bug_file_loc" size => "40" colspan => 2 %] [% url_output = INCLUDE input no_td=1 inputname => "bug_file_loc" size => "40" colspan => 2 %]
[% IF NOT bug.check_can_change_field("bug_file_loc", 0, 1) [% IF NOT bug.check_can_change_field("bug_file_loc", 0, 1)
AND is_safe_url(bug.bug_file_loc) %] AND is_safe_url(bug.bug_file_loc) %]
<a href="[% bug.bug_file_loc FILTER html %]">[% url_output FILTER none %]</a> <a href="[% bug.bug_file_loc FILTER html %]">[% url_output FILTER none %]</a>
@ -527,7 +527,7 @@
editable = 1 editable = 1
accesskey = "w" accesskey = "w"
%] %]
[% PROCESS input inputname => "status_whiteboard" size => "40" colspan => 2 %] [% INCLUDE input inputname => "status_whiteboard" size => "40" colspan => 2 %]
</tr> </tr>
[% END %] [% END %]
@ -1214,7 +1214,7 @@
[% IF no_td != 1 %] [% IF no_td != 1 %]
<td[% " colspan=\"$colspan\"" IF colspan %]> <td[% " colspan=\"$colspan\"" IF colspan %]>
[% END %] [% END %]
[% val = value ? value : bug.$inputname %] [% val = bug.$inputname %]
[% IF bug.check_can_change_field(inputname, 0, 1) %] [% IF bug.check_can_change_field(inputname, 0, 1) %]
<input id="[% inputname %]" name="[% inputname %]" class="text_input" <input id="[% inputname %]" name="[% inputname %]" class="text_input"
value="[% val FILTER html %]"[% " size=\"$size\"" IF size %] value="[% val FILTER html %]"[% " size=\"$size\"" IF size %]
@ -1232,13 +1232,8 @@
[% IF no_td != 1 %] [% IF no_td != 1 %]
</td> </td>
[% END %] [% END %]
[% no_td = 0 %]
[% maxlength = 0 %]
[% colspan = 0 %]
[% size = 0 %]
[% value = undef %]
[% spellcheck = undef %]
[% END %] [% END %]
[% BLOCK commit_button %] [% BLOCK commit_button %]
[% IF user.id %] [% IF user.id %]
<div class="knob-buttons"> <div class="knob-buttons">

2
mozilla/webtools/bugzilla/template/en/default/global/header.html.tmpl
View File

@ -82,7 +82,7 @@
"js/jquery/ui/jquery-ui-structure-min.css", "js/jquery/ui/jquery-ui-structure-min.css",
"js/jquery/ui/jquery-ui-theme-min.css", "js/jquery/ui/jquery-ui-theme-min.css",
] %] ] %]
[% undef = style_urls.import(jquery_css, jq_css_urls) %] [% style_urls.import(jquery_css, jq_css_urls) FILTER null %]
[%# Add jQuery cookie support %] [%# Add jQuery cookie support %]
[% jquery.push("cookie") %] [% jquery.push("cookie") %]