From 60c62618754ce8820dbbcec267560aa6198bab30 Mon Sep 17 00:00:00 2001
From: newpanjing <newpanjing@163.com>
Date: Wed, 21 Aug 2019 17:33:09 +0800
Subject: [PATCH] fix

---
 db.sqlite3                | Bin 208896 -> 208896 bytes
 demo/admin.py             |  25 ++++++++++++++++++++++---
 simpleui_demo/settings.py |   6 +++++-
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/db.sqlite3 b/db.sqlite3
index f75dca4540fc8f29878420db9cd496f00a5a84fa..b90fdab599273a41fe0af9cbcde0e7143dfa7adb 100644
GIT binary patch
delta 570
zcmZp8z|-)6XM!{%*F+g-My`zsOY-FedD9tqd-(c!ukmf+_uyCN{mnm#Pl10sUl!j@
z-t^6K1+KhaD$Kr&rAC=W#+D@(nOUV(C6=YxM#ZM4xml@68AWE9g#~4KVjx8ZMrlQ9
z`Nbxc<rSGmIfkiKWyM97CY5ECCfUa3*@gw8n>W_7D~VX>8W}1Wm|2+`Ss5AY8JL?`
zm{>NSnZNzad`61^W<lPM)7d{T%CqnZ@P6E^sBoNjy8b^#E)z>#0~3TULnBKQGgC1+
zW=BRN14E#kg|30Af`N&ZiGh`&xt@`Qfti`HXgg5ncKv@$R~4nW8P+lIx^O?^>fmH!
zU%|JC<pi4-a~2a1!@9|i0zT8T6qsFNo1(>7eOp`|33=Av#V;!|%PBi5D=5d`CDbqq
z$d0V?%k*=PH1Q1&E%yuYH1Z7zH1;!!tn|$dt@00X%kiDOFzZ&miEox`rhi^gWlDIM
zCB)&_{M8gK3U&yg0QEBptnznp1zHqX=~v~H?N{ZN>6_)28JXp2;O`!2;G6506_w?d
n8<`bY8Rg<>!s?rqUhX$pKJ%8kv2T_qnoF<+;r1+L=4m_t{i>{}

delta 211
zcmV;^04)E2;0%D^43HZE0FfL+0RXXJq;Db*4Y2?Yj}6uiv=2xRBMtixk`5pbw+?C!
z*$uG{MGtKb{<9$<iw(1}eFq{GH!UzZATTmIG&edkI4&?VH#jpjgUp||%%1@`Py-JR
zFP8`K0Uxs=APEkKFa80yFa846AsPt-Y5)yH3+4)l2?htK4x$9e21)~J0muMqlR*$n
zmuesbM6<47cmf9oCIO;Ng-w?&CIcNHb8>AtSyWPNPHj?XPHjaoPHj~+O=?AYS$bzO
NPFGDdw`wB;mJENWKo|f3

diff --git a/demo/admin.py b/demo/admin.py
index df6d11a..4e77bc7 100644
--- a/demo/admin.py
+++ b/demo/admin.py
@@ -1,9 +1,12 @@
 import datetime
 
 from django.contrib import admin
+from django.db import transaction
 from django.urls import reverse
 
 from .models import *
+from import_export import resources
+from import_export.admin import ImportExportModelAdmin, ImportExportActionModelAdmin
 
 
 # Register your models here.
@@ -21,6 +24,7 @@ class DepartmentAdmin(admin.ModelAdmin):
     actions_on_top = True
 
 
+
 class ImageInline(admin.TabularInline):
     model = Image
 
@@ -68,14 +72,19 @@ class AgeListFilter(admin.SimpleListFilter):
             return queryset.filter(birthday__gte=day)
 
 
+class ProxyResource(resources.ModelResource):
+    class Meta:
+        model = Employe
+
 @admin.register(Employe)
-class EmployeAdmin(admin.ModelAdmin):
+class EmployeAdmin(ImportExportActionModelAdmin):
+    resource_class = ProxyResource
     list_display = ('id', 'name', 'gender', 'phone', 'birthday', 'department', 'enable', 'create_time')
     # search_fields = ('name', 'enable', 'idCard', 'department')
     search_fields = ('name', 'department__name')
     list_per_page = 20
     raw_id_fields = ('department', 'title')
-    list_filter = ('department', AgeListFilter)
+    list_filter = ('department', AgeListFilter, 'create_time')
     # list_filter = (AgeListFilter, 'department', 'create_time', 'birthday', 'time', 'enable', 'gender')
 
     list_display_links = ('name',)
@@ -83,8 +92,18 @@ class EmployeAdmin(admin.ModelAdmin):
     list_editable = ('department', 'phone', 'birthday', 'enable', 'gender')
 
     date_hierarchy = 'create_time'
+
+    fieldsets = [(None, {'fields': ['name', 'gender','phone']}),
+                 (u'其他信息', {
+                     'classes': ('123',),
+                     'fields': ['birthday', 'department', 'enable']})]
+
+
+    @transaction.atomic
+    def test(self, request, queryset):
+        pass
     # 增加自定义按钮
-    actions = ['make_copy', 'custom_button']
+    actions = [test, 'make_copy', 'custom_button']
 
     def custom_button(self, request, queryset):
         pass
diff --git a/simpleui_demo/settings.py b/simpleui_demo/settings.py
index b0d5073..18285e2 100644
--- a/simpleui_demo/settings.py
+++ b/simpleui_demo/settings.py
@@ -185,6 +185,10 @@ SIMPLEUI_CONFIG = {
             'name': '内网穿透',
             'url': 'https://www.wezoz.com',
             'icon': 'fab fa-github'
+        }, {
+            'name': '内网穿透',
+            'url': 'https://www.wezoz.com',
+            'icon': 'fab fa-github'
         }, {
             'name': '登录页嵌套测试',
             'url': '/login'
@@ -204,4 +208,4 @@ SIMPLEUI_ICON = {
 # 指定simpleui 是否以脱机模式加载静态资源，为True的时候将默认从本地读取所有资源，即使没有联网一样可以。适合内网项目
 # 不填该项或者为False的时候，默认从第三方的cdn获取
 
-# SIMPLEUI_STATIC_OFFLINE = True
+SIMPLEUI_STATIC_OFFLINE = False
-- 
GitLab