modify list and sort

apps/static/css/style.css

@@ -4600,3 +4600,4 @@ body.skin-3 {
   border-width: 1px
 }
 
+

apps/users/migrations/0009_auto_20160818_1444.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-08-18 06:44
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0008_auto_20160817_2303'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='groups',
+            field=models.ManyToManyField(help_text='* required', to='users.UserGroup', verbose_name='\u7528\u6237\u7ec4'),
+        ),
+    ]

apps/users/templates/users/user_detail.html

@@ -111,8 +111,8 @@
                                             <td><b>{{ user.last_login|date:"Y-m-j H:i:s" }}</b></td>
                                         </tr>
                                         <tr>
-                                            <td>描述:</td>
-                                            <td><b>{{ user.comment }}</b></td>
+                                            <td class="no-borders">描述:</td>
+                                            <td class="no-borders"><b>{{ user.comment }}</b></td>
                                         </tr>
                                         </tbody>
                                     </table>
@@ -208,8 +208,10 @@
 
                                         {% for group in user.groups.all %}
                                         <tr>
-                                            <td width="40%"><b>{{ group.name }}</b></td>
-                                            <td></td>
+                                            <td width="40%"><b style="font-size: medium">{{ group.name }}</b></td>
+                                            <td>
+                                                <button class="btn btn-danger btn-sm" type="button" style="float: right;"><i class="fa fa-minus"></i></button>
+                                            </td>
                                         </tr>
                                         {% endfor %}
                                         </tbody>

apps/users/templates/users/user_list.html

@@ -42,12 +42,12 @@
                                 <th class="text-center">
                                     <input type="checkbox" id="check_all" onclick="checkAll('check_all', 'checked')">
                                 </th>
-                                <th class="text-center">姓名</th>
-                                <th class="text-center">用户名</th>
+                                <th class="text-center"><a href="{% url 'users:user-list' %}?sort=name">姓名</a></th>
+                                <th class="text-center"><a href="{% url 'users:user-list' %}?sort=username">用户名</a></th>
                                 <th class="text-center">角色</th>
                                 <th class="text-center">用户组</th>
                                 <th class="text-center">资产数量</th>
-                                <th class="text-center">有效</th>
+                                <th class="text-center"><a href="{% url 'users:user-list' %}?sort=date_expired">有效</a></th>
                                 <th class="text-center"></th>
                             </tr>
                         </thead>
@@ -66,7 +66,13 @@
                                 <td class="text-center">{{ user.role.name }}</td>
                                 <td class="text-center" title="{% for user_group in user.group.all %} {{ user_group.name }} {% endfor %}"> {{ user.groups.all|join_queryset_attr:"name" }} </td>
                                 <th class="text-center">{{ user.name }}</th>
-                                <td class="text-center">{{ user.date_expired|is_expired|yesno:"过期, 有效, 分不清楚" }}</td>
+                                <td class="text-center">
+                                    {% if user.date_expired|is_expired %}
+                                        <i class="fa fa-times text-danger"></i>
+                                    {% else %}
+                                        <i class="fa fa-check text-navy"></i>
+                                    {% endif %}
+                                </td>
                                 <td class="text-center">
                                     <a href="{% url 'users:user-edit' pk=user.id %}?id={{ user.id }}" class="btn btn-xs btn-info">编辑</a>
                                     <a href="{% url 'users:user-delete' pk=user.id %}?id={{ user.id }}" class="btn btn-xs btn-danger del {% if user.username == 'admin' %} disabled {% endif %}">删除</a>

apps/users/tests.py

-from django.test import TestCase
+import forgery_py
+
+from django.test import TestCase, Client
+from django.test.utils import setup_test_environment
+from .models import User, UserGroup
+
+
+setup_test_environment()
+client = Client()
+
+
+def create_usergroup(name):
+    pass
+
+
+def get_random_usergroup():
+    pass
+
+def create_user(username, name, email, groups):
+    pass
+
+
+
+class UserListViewTests(TestCase):
 
-# Create your tests here.

apps/users/views.py

@@ -12,7 +12,7 @@ from .forms import UserAddForm, UserUpdateForm
 
 class UserListView(ListView):
     model = User
-    paginate_by = 10
+    paginate_by = 20
     context_object_name = 'user_list'
     template_name = 'users/user_list.html'
     ordering = '-date_joined'
@@ -20,9 +20,13 @@ class UserListView(ListView):
     def get_queryset(self):
         self.queryset = super(UserListView, self).get_queryset()
         self.keyword = keyword = self.request.GET.get('keyword', '')
+        self.sort = sort = self.request.GET.get('sort')
         if keyword:
             self.queryset = self.queryset.filter(Q(username__icontains=keyword) |
                                                  Q(name__icontains=keyword))
+
+        if sort:
+            self.queryset = self.queryset.order_by(sort)
         return self.queryset
 
     def get_context_data(self, **kwargs):