首页 探索 帮助
注册 登录
Tamron
/
tamrondb
关注 2
点赞 0
派生 0

浏览代码
Update tamron models.py/admin.py

Kimi.Huang 7 年之前
父节点
b67c9c1746
当前提交
6362a952f2
共有 2 个文件被更改，包括 36 次插入 和 22 次删除
显示文件统计
  1. 11 10
      tamron/admin.py
  2. 25 12
      tamron/models.py

+ 11 - 10
tamron/admin.py
查看文件 

@@ -1,12 +1,11 @@
1 1 
 # -*- coding: utf-8 -*-
2 
-
3 2 
 from djadmin import ExportExcelModelAdmin, ReadonlyModelAdmin
4 3 
 from django.contrib import admin
5 4 
 from TimeConvert import TimeConvert as tc
6 5
7 
-from tamron.models import (TamronActivityInfo, TamronClassInfo, TamronNavEnInfo, TamronNavInfo,
8 
-                           TamronPhotographicWorkInfo, TamronProductInfo, TamronRegisterInfo, TamronServiceInfo,
9 
-                           TamronSliderInfo, TamronStoreInfo, TamronUserInfo)
6 
+from tamron.models import (TamronActivityInfo, TamronClassInfo, TamronNavEnInfo, TamronPhotographicWorkInfo,
7 
+                           TamronProductInfo, TamronRegisterInfo, TamronServiceInfo, TamronSliderInfo, TamronStoreInfo,
8 
+                           TamronUserInfo)
10 9
11 10
12 11 
 class TamronSliderInfoAdmin(admin.ModelAdmin):
 
@@ -14,9 +13,9 @@ class TamronSliderInfoAdmin(admin.ModelAdmin):
14 13 
     list_filter = ('fid', )
15 14
16 15
17 
-class TamronNavInfoAdmin(admin.ModelAdmin):
18 
-    list_display = ('lanmu', 'pic', 'url', 'px')
19 
-    list_filter = ('lanmu', )
16 
+# class TamronNavInfoAdmin(admin.ModelAdmin):
17 
+#     list_display = ('lanmu', 'pic', 'url', 'px')
18 
+#     list_filter = ('lanmu', )
20 19
21 20
22 21 
 class TamronNavEnInfoAdmin(admin.ModelAdmin):
 
@@ -29,13 +28,15 @@ class TamronRegisterInfoAdmin(admin.ModelAdmin):
29 28
30 29
31 30 
 class TamronUserInfoAdmin(admin.ModelAdmin):
32 
-    list_display = ('user', 'sex', 'zhiwei', 'tel', 'email', 'pinpai', 'xinghao', 'gzleixing', 'gxtedian', 'ctime')
31 
+    list_display = ('user', 'sex', 'zhiwei', 'tel', 'email', 'pinpai', 'xinghao', 'gzleixing', 'gxtedian', 'ctime', 'created_at')
33 32 
     list_filter = ('sex', 'zhiwei', 'pinpai', 'xinghao')
33 
+    search_fields = ('user', 'tel', 'email', 'id')
34 34
35 35
36 36 
 class TamronProductInfoAdmin(admin.ModelAdmin):
37 
-    list_display = ('msg_id', 'xuliehao', 'xinghao', 'kakou', 'gtime', 'ctime')
37 
+    list_display = ('msg_id', 'user_name', 'xuliehao', 'xinghao', 'kakou', 'gtime', 'ctime')
38 38 
     list_filter = ('xinghao', 'kakou')
39 
+    search_fields = ('msg_id', 'kakou')
39 40
40 41
41 42 
 class TamronActivityInfoAdmin(admin.ModelAdmin):
 
@@ -71,7 +72,7 @@ class TamronPhotographicWorkInfoAdmin(admin.ModelAdmin):
71 72
72 73
73 74 
 admin.site.register(TamronSliderInfo, TamronSliderInfoAdmin)
74 
-admin.site.register(TamronNavInfo, TamronNavInfoAdmin)
75 
+# admin.site.register(TamronNavInfo, TamronNavInfoAdmin)
75 76 
 admin.site.register(TamronNavEnInfo, TamronNavEnInfoAdmin)
76 77 
 admin.site.register(TamronRegisterInfo, TamronRegisterInfoAdmin)
77 78 
 admin.site.register(TamronUserInfo, TamronUserInfoAdmin)

+ 25 - 12
tamron/models.py
查看文件 

@@ -1,5 +1,7 @@
1 1 
 # -*- coding: utf-8 -*-
2 2
3 
+import time
4 
+
3 5 
 from django.db import models
4 6 
 from django.utils.translation import ugettext_lazy as _
5 7 
 from models_ext import upload_path
 
@@ -28,19 +30,19 @@ class TamronSliderInfo(models.Model):
28 30 
         return unicode(self.pk)
29 31
30 32
31 
-class TamronNavInfo(models.Model):
32 
-    lanmu = models.IntegerField(_(u'lanmu'), default=0, help_text=u'???')
33 
-    pic = models.FileField(_(u'pic'), upload_to=upload_path, blank=True, null=True, help_text=u'作品图片')
34 
-    url = models.CharField(_(u'url'), max_length=255, blank=True, null=True, help_text=u'作品链接')
35 
-    px = models.IntegerField(_(u'px'), default=1, help_text=u'排序（降序）')
33 
+# class TamronNavInfo(models.Model):
34 
+#     lanmu = models.CharField(_(u'lanmu'), default=0, help_text=u'标题')
35 
+#     pic = models.FileField(_(u'pic'), upload_to=upload_path, blank=True, null=True, help_text=u'作品图片')
36 
+#     url = models.CharField(_(u'url'), max_length=255, blank=True, null=True, help_text=u'作品链接')
37 
+#     px = models.IntegerField(_(u'px'), default=1, help_text=u'排序（降序）')
36 38
37 
-    class Meta:
38 
-        verbose_name = _(u'会员作品信息')
39 
-        verbose_name_plural = _(u'会员作品信息')
40 
-        db_table = 'shidu_nav'
39 
+#     class Meta:
40 
+#         verbose_name = _(u'会员作品信息')
41 
+#         verbose_name_plural = _(u'会员作品信息')
42 
+#         db_table = 'shidu_nav'
41 43
42 
-    def __unicode__(self):
43 
-        return unicode(self.pk)
44 
+#     def __unicode__(self):
45 
+#         return unicode(self.pk)
44 46
45 47
46 48 
 class TamronNavEnInfo(models.Model):
 
@@ -118,6 +120,9 @@ class TamronUserInfo(models.Model):
118 120
119 121 
     ctime = models.IntegerField(_(u'ctime'), default=0, help_text=u'创建时间')
120 122
123 
+    def created_at(self):
124 
+        return time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(self.ctime))
125 
+
121 126 
     class Meta:
122 127 
         verbose_name = _(u'会员注册信息')
123 128 
         verbose_name_plural = _(u'会员注册信息')
 
@@ -128,7 +133,7 @@ class TamronUserInfo(models.Model):
128 133
129 134
130 135 
 class TamronProductInfo(models.Model):
131 
-    msg_id = models.IntegerField(_(u'msg_id'), default=0, help_text=u'会员唯一标识')
136 
+    msg_id = models.IntegerField(_(u'msg_id'), help_text=u'会员唯一标识')
132 137
133 138 
     xuliehao = models.CharField(_(u'xuliehao'), max_length=32, blank=True, null=True, help_text=u'相机序列号')
134 139 
     xinghao = models.CharField(_(u'xinghao'), max_length=32, blank=True, null=True, help_text=u'会员相机品牌')
 
@@ -137,6 +142,12 @@ class TamronProductInfo(models.Model):
137 142
138 143 
     ctime = models.IntegerField(_(u'ctime'), default=0, help_text=u'创建时间')
139 144
145 
+    def user_name(self):
146 
+        if self.msg_id == 0:
147 
+            return ""
148 
+        user = TamronUserInfo.objects.filter(id=self.msg_id)[0]
149 
+        return user.user
150 
+
140 151 
     class Meta:
141 152 
         verbose_name = _(u'产品注册信息')
142 153 
         verbose_name_plural = _(u'产品注册信息')
 
@@ -245,6 +256,8 @@ class TamronPhotographicWorkInfo(models.Model):
245 256
246 257 
     ctime = models.IntegerField(_(u'ctime'), default=0, help_text=u'创建时间')
247 258
259 
+    gtime = models.IntegerField
260 
+
248 261 
     class Meta:
249 262 
         verbose_name = _(u'摄影作品信息')
250 263 
         verbose_name_plural = _(u'摄影作品信息')