diff options
| -rw-r--r-- | Bugzilla/Install/DB.pm | 2 | ||||
| -rw-r--r-- | Bugzilla/WebService/Server/XMLRPC.pm | 5 | ||||
| -rw-r--r-- | skins/standard/global.css | 1 | ||||
| -rw-r--r-- | template/en/default/bug/create/create.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/bug/field-events.js.tmpl | 12 | ||||
| -rw-r--r-- | template/en/default/bug/field.html.tmpl | 3 | ||||
| -rw-r--r-- | template/en/default/list/list.html.tmpl | 2 |
7 files changed, 21 insertions, 6 deletions
diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm index 7dc203933..14425ab40 100644 --- a/Bugzilla/Install/DB.pm +++ b/Bugzilla/Install/DB.pm @@ -3605,7 +3605,7 @@ sub _populate_bug_see_also_class { if ($dbh->bz_column_info('bug_see_also', 'class')) { # The length was incorrectly set to 64 instead of 255. $dbh->bz_alter_column('bug_see_also', 'class', - {TYPE => 'varchar(255)', NOTNULL => 1}); + {TYPE => 'varchar(255)', NOTNULL => 1, DEFAULT => "''"}); return; } diff --git a/Bugzilla/WebService/Server/XMLRPC.pm b/Bugzilla/WebService/Server/XMLRPC.pm index 822709d85..025fb8f19 100644 --- a/Bugzilla/WebService/Server/XMLRPC.pm +++ b/Bugzilla/WebService/Server/XMLRPC.pm @@ -93,7 +93,10 @@ sub deserialize { my $self = shift; # Only allow certain content types to protect against CSRF attacks - if (!grep($_ eq $ENV{'CONTENT_TYPE'}, XMLRPC_CONTENT_TYPE_WHITELIST)) { + my $content_type = lc($ENV{'CONTENT_TYPE'}); + # Remove charset, etc, if provided + $content_type =~ s/^([^;]+);.*/$1/; + if (!grep($_ eq $content_type, XMLRPC_CONTENT_TYPE_WHITELIST)) { ThrowUserError('xmlrpc_illegal_content_type', { content_type => $ENV{'CONTENT_TYPE'} }); } diff --git a/skins/standard/global.css b/skins/standard/global.css index 537477296..49842554e 100644 --- a/skins/standard/global.css +++ b/skins/standard/global.css @@ -502,6 +502,7 @@ th.required:before, span.required_star { } input.required, select.required, span.required_explanation { background-color: #fff7cd; + color: #000; } .calendar_button { diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl index d6911770a..32f39a3c5 100644 --- a/template/en/default/bug/create/create.html.tmpl +++ b/template/en/default/bug/create/create.html.tmpl @@ -277,7 +277,7 @@ TUI_hide_default('attachment_text_field'); <script type="text/javascript"> <!-- [%+ INCLUDE "bug/field-events.js.tmpl" - field = bug_fields.component %] + field = bug_fields.component, product = product %] //--> </script> </td> diff --git a/template/en/default/bug/field-events.js.tmpl b/template/en/default/bug/field-events.js.tmpl index 94dd298f5..13ec18d38 100644 --- a/template/en/default/bug/field-events.js.tmpl +++ b/template/en/default/bug/field-events.js.tmpl @@ -19,6 +19,8 @@ [%# INTERFACE: # field: a Bugzilla::Field object + # product: (optional) a Bugzilla::Product object. When specified, + # components are restricted to this product. #%] [% FOREACH controlled_field = field.controls_visibility_of %] @@ -29,7 +31,15 @@ [%- END %] ]); [% END %] -[% FOREACH legal_value = field.legal_values %] + +[% legal_values = [] %] +[% IF field.name == "component" AND product %] + [% legal_values = product.components %] +[% ELSE %] + [% legal_values = field.legal_values %] +[% END %] + +[% FOREACH legal_value = legal_values %] [% FOREACH controlled_field = legal_value.controlled_values.keys %] [% SET cont_ids = [] %] [% FOREACH val = legal_value.controlled_values.$controlled_field %] diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl index 29cf82a62..a7e318c4d 100644 --- a/template/en/default/bug/field.html.tmpl +++ b/template/en/default/bug/field.html.tmpl @@ -173,7 +173,8 @@ <script type="text/javascript"> <!-- initHidingOptionsForIE('[% field.name FILTER js %]'); - [%+ INCLUDE "bug/field-events.js.tmpl" field = field %] + [%+ INCLUDE "bug/field-events.js.tmpl" + field = field, product = bug.product_obj %] //--> </script> diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl index 97e6c0077..ccf3427dd 100644 --- a/template/en/default/list/list.html.tmpl +++ b/template/en/default/list/list.html.tmpl @@ -203,7 +203,7 @@ <td valign="middle" class="bz_query_links"> <a href="buglist.cgi? - [% urlquerypart FILTER html %]&ctype=csv&human=1">CSV</a> | + [% urlquerypart FILTER html %]&ctype=csv&human=1">CSV</a> | <a href="buglist.cgi? [% urlquerypart FILTER html %]&title= [%- title FILTER uri %]&ctype=atom">Feed</a> | |