From 9304a911ea509738d69c500387685297ac4d8246 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Sat, 10 Jan 2015 23:31:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89ta?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jumpserver/settings.py              |  1 +
 jumpserver/templatetags/__init__.py |  1 +
 jumpserver/templatetags/mytags.py   | 17 +++++++++++++++++
 juser/views.py                      |  2 +-
 templates/juser/user_add.html       |  3 ++-
 5 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 jumpserver/templatetags/__init__.py
 create mode 100644 jumpserver/templatetags/mytags.py

diff --git a/jumpserver/settings.py b/jumpserver/settings.py
index 67e9bc776..5b991157f 100644
--- a/jumpserver/settings.py
+++ b/jumpserver/settings.py
@@ -46,6 +46,7 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'jumpserver',
     'juser',
     'jasset',
     'jpermission',
diff --git a/jumpserver/templatetags/__init__.py b/jumpserver/templatetags/__init__.py
new file mode 100644
index 000000000..bfd53d39f
--- /dev/null
+++ b/jumpserver/templatetags/__init__.py
@@ -0,0 +1 @@
+__author__ = 'Hudie'
diff --git a/jumpserver/templatetags/mytags.py b/jumpserver/templatetags/mytags.py
new file mode 100644
index 000000000..3ef015a5c
--- /dev/null
+++ b/jumpserver/templatetags/mytags.py
@@ -0,0 +1,17 @@
+import time
+from django import template
+
+register = template.Library()
+
+
+@register.filter(name='stamp2str')
+def stamp2str(value):
+    try:
+        return time.strftime('%Y/%m/%d %H:%M:%S', time.localtime(value))
+    except AttributeError:
+        return '0000/00/00 00:00:00'
+
+
+@register.filter(name='int2str')
+def int2str(value):
+    return str(value)
diff --git a/juser/views.py b/juser/views.py
index 6f5c4803a..814a38ca4 100644
--- a/juser/views.py
+++ b/juser/views.py
@@ -126,7 +126,7 @@ def user_add(request):
         else:
             time_now = time.time()
             db_add_user(username=username, password=password, name=name, email=email,
-                        groups=groups, role=role, ssh_pwd=ssh_pwd, ssh_key_pwd1=ssh_key_pwd1,
+                        groups=groups, role=role_post, ssh_pwd=ssh_pwd, ssh_key_pwd1=ssh_key_pwd1,
                         is_active=is_active, date_joined=time_now)
             msg = u'添加用户成功'
     return render_to_response('juser/user_add.html',
diff --git a/templates/juser/user_add.html b/templates/juser/user_add.html
index ac7730da9..4f1cc5531 100644
--- a/templates/juser/user_add.html
+++ b/templates/juser/user_add.html
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load mytags %}
 
 {% block content %}
     {% include 'nav_cat_bar.html' %}
@@ -73,7 +74,7 @@
                                 <div class="col-sm-8">
                                     <select id="groups" name="groups" class="form-control m-b" multiple>
                                         {% for group in all_group %}
-                                            {% if group.id in groups_str %}
+                                            {% if group.id|int2str in groups_str %}
                                                 <option value="{{ group.id }}" selected>{{ group.name }}</option>
                                             {% else %}
                                                 {% if forloop.first %}