# HG changeset patch # User BenoƮt Allard # Date 1413379467 -7200 # Node ID 1feed9a3156e855432edc48a5e8b56d47446b1db # Parent e5c047d392ca91c17c54f3b9f57115db4bda4679 Style update diff -r e5c047d392ca -r 1feed9a3156e farol/templates/producttree/view.j2 --- a/farol/templates/producttree/view.j2 Wed Oct 15 15:23:15 2014 +0200 +++ b/farol/templates/producttree/view.j2 Wed Oct 15 15:24:27 2014 +0200 @@ -100,8 +100,11 @@ {% call panel() %}
{{ edit_button(url_for('.edit_group', groupid=group._groupid)) }} - {{ delete_button(url_for('.del_group', groupid=group._groupid)) }} + {%if cvrf.isGroupOrphan(group._groupid) %} + {{ delete_button(url_for('.del_group', groupid=group._groupid)) }} + {% endif %}
+ {% if group._description %}

{{ group._description }}

{% endif %} - {% if group._description %}

{{ group._description }}

{% endif %} {% endcall %} {% endfor %}
{{ add_button(url_for('.add_group')) }}
diff -r e5c047d392ca -r 1feed9a3156e farol/templates/producttree/view_product.j2 --- a/farol/templates/producttree/view_product.j2 Wed Oct 15 15:23:15 2014 +0200 +++ b/farol/templates/producttree/view_product.j2 Wed Oct 15 15:24:27 2014 +0200 @@ -81,16 +81,14 @@ vulnerability.isMentioningGroupId(groups | map(attribute="_groupid") | list)) %}
  • {{ vulnerability.getTitle() }} - {% set elements = vulnerability.mentionsProdId(product._productid) | list %} - {% for group in groups %} - {{ elements.extend(vulnerability.mentionsGroupId(group._groupid) | list) or '' }} - {% endfor %} - {% set comma = joiner(', ') %} - ( - {%- for grouper, list in elements | groupby('NAME') %}{{ comma() -}} - {{ grouper }}{% if list | length > 1 %}(x{{ list | length }}){% endif %} - {%- endfor -%} - ) + {%- set elements = vulnerability.mentionsProdId(product._productid) | list %} + {%- for group in groups %} + {{- elements.extend(vulnerability.mentionsGroupId(group._groupid) | list) or '' }} + {%- endfor %} + {%- set comma = joiner(', ') %} + ({% for grouper, list in elements | groupby('NAME') %}{{ comma() -}} + {{ grouper }}{% if list | length > 1 %} (x{{ list | length }}){% endif %} + {%- endfor %})
  • {% else %}
  • None