diff --git a/apps/assets/models.py b/apps/assets/models.py index 1b336c33e..c9720601f 100644 --- a/apps/assets/models.py +++ b/apps/assets/models.py @@ -128,7 +128,7 @@ class Asset(models.Model): comment = models.CharField(max_length=128, null=True, blank=True, verbose_name=_('Comment')) def __unicode__(self): - return self.ip + return '%(ip)s:%(port)d' % {'ip': self.ip, 'port': self.port} def initial(self): pass diff --git a/apps/users/templates/users/usergroup_add.html b/apps/users/templates/users/usergroup_add.html index d2e50da49..0b11c9679 100644 --- a/apps/users/templates/users/usergroup_add.html +++ b/apps/users/templates/users/usergroup_add.html @@ -1,5 +1,6 @@ {% extends 'base.html' %} {% load static %} +{% load i18n %} {% load bootstrap %} {% block custom_head_css_js %} @@ -12,7 +13,7 @@