Fix regression caused by using compiled templates in icon rules. The first template was used for all the composed icon rules.

This commit is contained in:
Charles Haley 2014-07-09 22:32:19 +02:00
parent 99128676cb
commit 4c3892dbd3

View File

@ -92,9 +92,10 @@ class ColumnIcon(object): # {{{
if self.mi is None:
self.mi = db.new_api.get_proxy_metadata(id_)
icons = []
for kind, fmt in fmts:
for dex, (kind, fmt) in enumerate(fmts):
rule_icons = self.formatter.safe_format(fmt, self.mi, '', self.mi,
column_name=cache_index, template_cache=template_cache)
column_name=cache_index+str(dex),
template_cache=template_cache)
if not rule_icons:
continue
icon_list = [ic.strip() for ic in rule_icons.split(':')]