diff options
| author |   Simon Green <sgreen@redhat.com> | 2014-10-01 21:00:23 +1000 |
|---|---|---|
| committer | Simon Green <sgreen@redhat.com> | 2014-10-01 21:00:23 +1000 |
| commit | 47e1b21e45f5338638cac4967d68d41342242a30 (patch) | |
| tree | caa383a23c4435013a4a89301a3026e3f26659bc | |
| parent | Fix bustage due to bug 1061247 (diff) | |
| download | bugzilla-47e1b21e45f5338638cac4967d68d41342242a30.tar.gz bugzilla-47e1b21e45f5338638cac4967d68d41342242a30.tar.bz2 bugzilla-47e1b21e45f5338638cac4967d68d41342242a30.zip | |
Bug 1069760 - Cannot use 'component' in a template
r=gerv, a=justdave
| -rw-r--r-- | template/en/default/admin/products/edit.html.tmpl | 8 | ||||
| -rw-r--r-- | template/en/default/admin/users/responsibilities.html.tmpl | 14 | ||||
| -rw-r--r-- | template/en/default/config.rdf.tmpl | 14 |
3 files changed, 18 insertions, 18 deletions
diff --git a/template/en/default/admin/products/edit.html.tmpl b/template/en/default/admin/products/edit.html.tmpl index c38530125..a4fcd188f 100644 --- a/template/en/default/admin/products/edit.html.tmpl +++ b/template/en/default/admin/products/edit.html.tmpl @@ -42,12 +42,12 @@ </th> <td> [% IF product.components.size -%] - [% FOREACH component = product.components %] + [% FOREACH comp = product.components %] <a href="editcomponents.cgi?action=edit&product= [%- product.name FILTER uri %]&component= - [%- component.name FILTER uri %]">[% component.name FILTER html %]</a>: - [% IF component.description %] - [% component.description FILTER html_light %] + [%- comp.name FILTER uri %]">[% comp.name FILTER html %]</a>: + [% IF comp.description %] + [% comp.description FILTER html_light %] [% ELSE %] <font color="red">description missing</font> [% END %] diff --git a/template/en/default/admin/users/responsibilities.html.tmpl b/template/en/default/admin/users/responsibilities.html.tmpl index 9e6e48c6a..67ea7d294 100644 --- a/template/en/default/admin/users/responsibilities.html.tmpl +++ b/template/en/default/admin/users/responsibilities.html.tmpl @@ -23,26 +23,26 @@ <th>Default QA Contact</th> <th>Default CC</th> </tr> - [% FOREACH component = item.components %] + [% FOREACH comp = item.components %] <tr> <td> - [% IF user.in_group("editcomponents", component.product_id) %] + [% IF user.in_group("editcomponents", comp.product_id) %] <a href="editcomponents.cgi?action=edit&product= [% item.product.name FILTER uri %]&component= - [% component.name FILTER uri %]"> + [% comp.name FILTER uri %]"> [% END %] - [% component.name FILTER html %] - [% IF user.in_group("editcomponents", component.product_id) %] + [% comp.name FILTER html %] + [% IF user.in_group("editcomponents", comp.product_id) %] </a> [% END %] </td> [% FOREACH responsibility = ['default_assignee', 'default_qa_contact'] %] <td class="center"> - [% component.$responsibility.id == otheruser.id ? "X" : " " %] + [% comp.$responsibility.id == otheruser.id ? "X" : " " %] </td> [% END %] <td class="center"> - [% component.initial_cc.contains(otheruser) ? "X" : " " %] + [% comp.initial_cc.contains(otheruser) ? "X" : " " %] </td> </tr> [% END %] diff --git a/template/en/default/config.rdf.tmpl b/template/en/default/config.rdf.tmpl index b14d0d056..0d183cf56 100644 --- a/template/en/default/config.rdf.tmpl +++ b/template/en/default/config.rdf.tmpl @@ -139,8 +139,8 @@ [% END %] <bz:components> <Seq> - [% FOREACH component = product.components %] - <li resource="[% escaped_urlbase %]component.cgi?name=[% component.name FILTER uri + [% FOREACH comp = product.components %] + <li resource="[% escaped_urlbase %]component.cgi?name=[% comp.name FILTER uri %]&product=[% product.name FILTER uri %]"/> [% END %] </Seq> @@ -176,16 +176,16 @@ <bz:components> <Seq> [% FOREACH product = products %] - [% FOREACH component = product.components %] + [% FOREACH comp = product.components %] <li> - <bz:component rdf:about="[% escaped_urlbase %]component.cgi?name=[% component.name FILTER uri + <bz:component rdf:about="[% escaped_urlbase %]component.cgi?name=[% comp.name FILTER uri %]&product=[% product.name FILTER uri %]"> - <bz:name>[% component.name FILTER html %]</bz:name> - <bz:is_active>[% component.is_active FILTER html %]</bz:is_active> + <bz:name>[% comp.name FILTER html %]</bz:name> + <bz:is_active>[% comp.is_active FILTER html %]</bz:is_active> [% IF show_flags %] <bz:flag_types> <Seq> - [% flag_types = component.flag_types.bug.merge(component.flag_types.attachment) %] + [% flag_types = comp.flag_types.bug.merge(comp.flag_types.attachment) %] [% FOREACH flag_type = flag_types %] [% NEXT UNLESS flag_type.is_active %] [% all_visible_flag_types.${flag_type.id} = flag_type %] |