Página Inicial Explorar Ajuda
Registrar Entrar
Tamron
/
tamrondb
Observar 2
Favorito 0
Fork 0

Ver Código Fonte
TabularInline

Kimi.Huang 7 anos atrás
pai
78f6fc25c6
commit
d0b939f7ff
2 arquivos alterados com 52 adições e 31 exclusões
Mostrar estatísticas do Diff
  1. 20 6
      tamron/admin.py
  2. 32 25
      tamron/models.py

+ 20 - 6
tamron/admin.py
Ver Arquivo 

@@ -27,16 +27,30 @@ class TamronRegisterInfoAdmin(admin.ModelAdmin):
27 27 
     list_filter = ('fid', )
28 28
29 29
30 
+class TamronProductInfoInline(admin.TabularInline):
31 
+    model = TamronProductInfo
32 
+
33 
+
30 34 
 class TamronUserInfoAdmin(admin.ModelAdmin):
31 
-    list_display = ('user', 'sex', 'zhiwei', 'tel', 'email', 'pinpai', 'xinghao', 'gzleixing', 'gxtedian', 'ctime', 'created_at')
35 
+    list_display = ('user', 'sex', 'zhiwei', 'tel', 'email', 'xinghao', 'gzleixing', 'gxtedian', 'created_at')
32 36 
     list_filter = ('sex', 'zhiwei', 'pinpai', 'xinghao')
37 
+    fieldsets = (
38 
+        (None, {
39 
+            'fields': ('user', 'sex', 'zhiwei', 'tel', 'email', 'pinpai', 'xinghao', 'gzleixing', 'gxtedian', 'time', 'shifou', 'chanpin', 'gmtime')
40 
+        }),
41 
+        ('腾龙', {
42 
+            'fields': ('cpxinghao', 'cpkakou', 'xuliehao', 'product_info')
43 
+        }),
44 
+    )
45 
+    readonly_fields = ('product_info', )
33 46 
     search_fields = ('user', 'tel', 'email', 'id')
47 
+    # inlines = (TamronProductInfoInline, )
34 48
35 49
36 
-class TamronProductInfoAdmin(admin.ModelAdmin):
37 
-    list_display = ('msg_id', 'user_name', 'xuliehao', 'xinghao', 'kakou', 'gtime', 'ctime')
38 
-    list_filter = ('xinghao', 'kakou')
39 
-    search_fields = ('msg_id', 'kakou')
50 
+# class TamronProductInfoAdmin(admin.ModelAdmin):
51 
+#    list_display = ('msg_id', 'user_name', 'xuliehao', 'xinghao', 'kakou', 'gtime', 'ctime')
52 
+#    list_filter = ('xinghao', 'kakou')
53 
+#    search_fields = ('msg_id', 'kakou')
40 54
41 55
42 56 
 class TamronActivityInfoAdmin(admin.ModelAdmin):
 
@@ -76,7 +90,7 @@ admin.site.register(TamronSliderInfo, TamronSliderInfoAdmin)
76 90 
 admin.site.register(TamronNavEnInfo, TamronNavEnInfoAdmin)
77 91 
 admin.site.register(TamronRegisterInfo, TamronRegisterInfoAdmin)
78 92 
 admin.site.register(TamronUserInfo, TamronUserInfoAdmin)
79 
-admin.site.register(TamronProductInfo, TamronProductInfoAdmin)
93 
+# admin.site.register(TamronProductInfo, TamronProductInfoAdmin)
80 94 
 admin.site.register(TamronActivityInfo, TamronActivityInfoAdmin)
81 95 
 admin.site.register(TamronClassInfo, TamronClassInfoAdmin)
82 96 
 admin.site.register(TamronServiceInfo, TamronServiceInfoAdmin)

+ 32 - 25
tamron/models.py
Ver Arquivo 

@@ -85,6 +85,31 @@ class TamronRegisterInfo(models.Model):
85 85 
         return unicode(self.pk)
86 86
87 87
88 
+class TamronProductInfo(models.Model):
89 
+    msg_id = models.IntegerField(_(u'msg_id'), help_text=u'会员唯一标识')
90 
+
91 
+    xuliehao = models.CharField(_(u'xuliehao'), max_length=32, blank=True, null=True, help_text=u'相机序列号')
92 
+    xinghao = models.CharField(_(u'xinghao'), max_length=32, blank=True, null=True, help_text=u'会员相机品牌')
93 
+    kakou = models.CharField(_(u'kakou'), max_length=32, blank=True, null=True, help_text=u'会员相机品牌')
94 
+    gtime = models.CharField(_(u'gtime'), max_length=10, blank=True, null=True, help_text=u'相机购买日期')
95 
+
96 
+    ctime = models.IntegerField(_(u'ctime'), default=0, help_text=u'创建时间')
97 
+
98 
+    # def user_name(self):
99 
+    #    if self.msg_id == 0:
100 
+    #        return ""
101 
+    #    user = TamronUserInfo.objects.filter(id=self.msg_id)[0]
102 
+    #    return user.user
103 
+
104 
+    class Meta:
105 
+        verbose_name = _(u'产品注册信息')
106 
+        verbose_name_plural = _(u'产品注册信息')
107 
+        db_table = 'shidu_msg_chanpin'
108 
+
109 
+    def __unicode__(self):
110 
+        return unicode(self.pk)
111 
+
112 
+
88 113 
 class TamronUserInfo(models.Model):
89 114 
     title = models.CharField(_(u'title'), max_length=255, blank=True, null=True, help_text=u'???')
90 115 
     name = models.CharField(_(u'name'), max_length=255, blank=True, null=True, help_text=u'???')
 
@@ -120,6 +145,13 @@ class TamronUserInfo(models.Model):
120 145
121 146 
     ctime = models.IntegerField(_(u'ctime'), default=0, help_text=u'创建时间')
122 147
148 
+    def product_info(self):
149 
+        product_infos = TamronProductInfo.objects.filter(msg_id=self.id)
150 
+        res = ''
151 
+        for product_info in product_infos:
152 
+            res += product_info.xinghao + '\n'
153 
+        return res
154 
+
123 155 
     def created_at(self):
124 156 
         return time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(self.ctime))
125 157 
 
@@ -132,31 +164,6 @@ class TamronUserInfo(models.Model):
132 164 
         return unicode(self.pk)
133 165
134 166
135 
-class TamronProductInfo(models.Model):
136 
-    msg_id = models.IntegerField(_(u'msg_id'), help_text=u'会员唯一标识')
137 
-
138 
-    xuliehao = models.CharField(_(u'xuliehao'), max_length=32, blank=True, null=True, help_text=u'相机序列号')
139 
-    xinghao = models.CharField(_(u'xinghao'), max_length=32, blank=True, null=True, help_text=u'会员相机品牌')
140 
-    kakou = models.CharField(_(u'kakou'), max_length=32, blank=True, null=True, help_text=u'会员相机品牌')
141 
-    gtime = models.CharField(_(u'gtime'), max_length=10, blank=True, null=True, help_text=u'相机购买日期')
142 
-
143 
-    ctime = models.IntegerField(_(u'ctime'), default=0, help_text=u'创建时间')
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 
-
151 
-    class Meta:
152 
-        verbose_name = _(u'产品注册信息')
153 
-        verbose_name_plural = _(u'产品注册信息')
154 
-        db_table = 'shidu_msg_chanpin'
155 
-
156 
-    def __unicode__(self):
157 
-        return unicode(self.pk)
158 
-
159 
-
160 167 
 class TamronActivityInfo(models.Model):
161 168 
     pic = models.FileField(_(u'pic'), upload_to=upload_path, blank=True, null=True, help_text=u'活动图片')
162 169 
     title = models.CharField(_(u'title'), max_length=255, blank=True, null=True, help_text=u'活动标题')