The following commit has been merged in the master branch:
commit c3f639c468d0f7884d71edd724aa5c2aab22aefc
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Fri Oct 3 09:29:38 2008 +0200
html/show.tmpl: Fix corner case in dependency display
Implicit variable definition is evil and wrong (yet again).
Closes: #475066, #484635
diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl
index ef049a5..b469855 100644
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@ -241,26 +241,26 @@
[%- END %]
<ul class="ul[% id %]">
- [% FOREACH terms %]
- [% '<li>' UNLESS is_old_pkgs %]
- [% FOREACH alternatives %]
+ [% FOREACH t IN terms %]
+ [% '<li>' UNLESS t.is_old_pkgs %]
+ [% FOREACH a IN t.alternatives %]
[% '<dl>' IF loop.first %]
<dt>[% IF loop.first %]<span class="nonvisual">[% id %]:</span>[% ELSE
%][% g('or ') %][% END %]
- [% IF suite %]<a href="[% make_url(name,'','suite',suite,'source','')
%]">[% name %]</a>[% ELSE %][% name %][% END %]
- [% ' (' _ version _ ')' IF version %]
- [% ' [' _ arch_str _ ']' IF arch_str %]</dt>
- [%- IF !is_old_pkgs -%]
- [% PROCESS desc_i18n_dd no_end_tag=1 trans_desc=trans_desc desc=desc
-%]
- [%- IF providers.pkgs.size > 0 -%]
- [% IF providers.also;
+ [% IF a.suite %]<a href="[%
make_url(a.name,'','suite',a.suite,'source','') %]">[% a.name %]</a>[% ELSE
%][% a.name %][% END %]
+ [% ' (' _ a.version _ ')' IF a.version %]
+ [% ' [' _ a.arch_str _ ']' IF a.arch_str %]</dt>
+ [%- IF !t.is_old_pkgs -%]
+ [% PROCESS desc_i18n_dd no_end_tag=1 trans_desc=a.trans_desc
desc=a.desc -%]
+ [%- IF a.providers.pkgs.size > 0 -%]
+ [% IF a.providers.also;
'<br>' _ g('also a virtual package provided by');
ELSE;
g('virtual package provided by');
END; %]
- [% js_id = name %]
- <span id="js_[% js_id %]" class="p_js_elem"></span> <span
id="html_[% js_id %]">[% FOREACH provider IN providers.pkgs.sort %]<a href="[%
make_url(provider,'','suite',suite,'source','') %]">[% provider %]</a>[% ', '
UNLESS loop.last %][% END %]</span>
- [% IF providers.pkgs.size > 10 %]
- <script type="text/javascript">init_toggle_elem("[% js_id %]","[%
g('show %u providing packages', providers.pkgs.size) %]", "[% g('hide %u
providing packages', providers.pkgs.size) %]")</script>
+ [% js_id = a.name %]
+ <span id="js_[% js_id %]" class="p_js_elem"></span> <span
id="html_[% js_id %]">[% FOREACH provider IN a.providers.pkgs.sort %]<a
href="[% make_url(provider,'','suite',a.suite,'source','') %]">[% provider
%]</a>[% ', ' UNLESS loop.last %][% END %]</span>
+ [% IF a.providers.pkgs.size > 10 %]
+ <script type="text/javascript">init_toggle_elem("[% js_id %]","[%
g('show %u providing packages', a.providers.pkgs.size) %]", "[% g('hide %u
providing packages', a.providers.pkgs.size) %]")</script>
[% END %]
[% END %]
</dd>
--
APT Archive Web-Frontend (Alioth repository)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
