Handle None protocol in security group rule table

Default Quantum security groups come in with a protocol of None via
nova. Horizon chokes when it tries to uppercase what it expects to be
a unicode string.

Replace None with 'Any' when displaying the value.

Fixes bug 1156922.

Change-Id: I94a534e829ecdbe75f785eb8fc750260aacd6dfc
This commit is contained in:
Kieran Spear
2013-03-19 11:14:30 +11:00
parent dc913a4242
commit aeab8c712a

View File

@@ -101,10 +101,16 @@ def get_source(rule):
return None
def filter_protocol(protocol):
if protocol is None:
return _('Any')
return unicode.upper(protocol)
class RulesTable(tables.DataTable):
protocol = tables.Column("ip_protocol",
verbose_name=_("IP Protocol"),
filters=(unicode.upper,))
filters=(filter_protocol,))
from_port = tables.Column("from_port", verbose_name=_("From Port"))
to_port = tables.Column("to_port", verbose_name=_("To Port"))
source = tables.Column(get_source, verbose_name=_("Source"))