Revision 67fd80f5

b/snf-cyclades-app/synnefo/helpdesk/templatetags/helpdesk_tags.py
9 9
    address
10 10
    """
11 11
    try:
12
        return vm.nics.filter(network__name="public")[0].ipv4
12
        return vm.nics.filter(network__public=True)[0].ipv4
13 13
    except IndexError:
14 14
        return "No public ip"
15 15

  
16 16

  
17
STATE_CSS_MAP = {
17
VM_STATE_CSS_MAP = {
18 18
        'BUILD': 'warning',
19 19
        'ERROR': 'important',
20 20
        'STOPPED': 'notice',
......
26 26
    """
27 27
    Return a span badge styled based on the vm current status
28 28
    """
29
    state_cls = STATE_CSS_MAP[vm.operstate]
29
    state_cls = VM_STATE_CSS_MAP[vm.operstate]
30 30
    badge_cls = "badge badge-%s" % state_cls
31 31

  
32 32
    deleted_badge = ""
33 33
    if vm.deleted:
34 34
        deleted_badge = '<span class="badge badge-important">Deleted</span>'
35
    return '<span class="%s">%s</span>%s' % (badge_cls,
36
            vm.operstate, deleted_badge)
35
    return '%s\n<span class="%s">%s</span>' % (deleted_badge, badge_cls,
36
            vm.operstate)
37 37

  
38 38
vm_status_badge.is_safe = True
39

  
40
@register.filter(name="network_deleted_badge")
41
def network_deleted_badge(network):
42
    """
43
    Return a span badge styled based on the vm current status
44
    """
45
    deleted_badge = ""
46
    if network.state == "DELETED":
47
        deleted_badge = '<span class="badge badge-important">Deleted</span>'
48
    return deleted_badge
49

  
50
network_deleted_badge.is_safe = True

Also available in: Unified diff