From 2f5b7ad654c45940d73daff6b270b22e1750db5c Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 5 Sep 2016 22:57:43 +0800
Subject: [PATCH] Modify asset model

---
 apps/assets/models.py                          | 2 +-
 apps/users/templates/users/usergroup_add.html  | 3 ++-
 apps/users/templates/users/usergroup_list.html | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

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 %}
     <link href="{% static "css/plugins/select2/select2.min.css" %}" rel="stylesheet">
@@ -12,7 +13,7 @@
             <div class="col-sm-12">
                 <div class="ibox float-e-margins">
                     <div class="ibox-title">
-                        <h5>填写用户组信息</h5>
+                        <h5>{% trans 'Create user group' %}</h5>
                         <div class="ibox-tools">
                             <a class="collapse-link">
                                 <i class="fa fa-chevron-up"></i>
diff --git a/apps/users/templates/users/usergroup_list.html b/apps/users/templates/users/usergroup_list.html
index 012c04a50..2e5522b3c 100644
--- a/apps/users/templates/users/usergroup_list.html
+++ b/apps/users/templates/users/usergroup_list.html
@@ -1,4 +1,5 @@
 {% extends '_list_base.html' %}
+{% load i18n %}
 {% load common_tags %}
 {% block content_left_head %}
      <a href="{% url 'users:usergroup-add' %}" class="btn btn-sm btn-primary "> 添加用户组 </a>