[subversion:3] rowid magic field

[esimorre@kenai.com]

Repository: subversion
Revision:   3
Author:     esimorre
Date:       2008-10-02 08:41:17 UTC

Log Message:
-----------
rowid magic field

Modified Paths:
--------------
    tracdb_ext/admin.pytracdb_ext/models.py

Diffs:
-----
Index: tracdb_ext/admin.py
===================================================================
--- tracdb_ext/admin.py (revision 2)
+++ tracdb_ext/admin.py (revision 3)
@@ -12,10 +12,9 @@
     list_filter = ('username', 'action')
 admin.site.register(Permission, PermissionAdmin)
 
-'''
 class TicketChangeAdmin(admin.ModelAdmin):
     #date_hierarchy = 'time'
-    list_display=('ticket','author', 'field', 'oldvalue', 'newvalue')
+    list_display=('time', 'ticket','author', 'field', 'oldvalue',
'newvalue')
     list_filter = ('ticket', 'author', 'field')
 admin.site.register(TicketChange, TicketChangeAdmin)
 
@@ -24,4 +23,34 @@
     list_display=('ticket','name', 'value',)
     list_filter = ('ticket', 'name',)
 admin.site.register(TicketCustom, TicketCustomAdmin)
-'''
\ No newline at end of file
+
+class AttachmentAdmin(admin.ModelAdmin):
+    list_display=('id', 'type', 'author', 'filename')
+    list_filter = ('type', 'author',)
+admin.site.register(Attachment, AttachmentAdmin)
+
+class AuthCookieAdmin(admin.ModelAdmin):
+    list_display=('name', 'cookie', 'ipnr', 'time')
+    list_filter = ('name',)
+admin.site.register(AuthCookie, AuthCookieAdmin)
+
+class SessionAdmin(admin.ModelAdmin):
+    list_display=('sid', 'authenticated', 'last_visit',)
+    list_filter = ('authenticated',)
+admin.site.register(Session, SessionAdmin)
+
+class SessionAttributeAdmin(admin.ModelAdmin):
+    list_display=('sid', 'authenticated', 'name', 'value')
+    list_filter = ('authenticated', 'name')
+admin.site.register(SessionAttribute, SessionAttributeAdmin)
+
+class NodeChangeAdmin(admin.ModelAdmin):
+    list_display=('rev', 'path', 'node_type', 'change_type',
'base_path', 'base_rev')
+    list_filter = ('path', 'node_type', 'change_type')
+admin.site.register(NodeChange, NodeChangeAdmin)
+
+
+class WikiAdmin(admin.ModelAdmin):
+    list_display=('name', 'version', 'author', 'comment')
+    list_filter = ('version', 'author', 'readonly', 'name')
+admin.site.register(Wiki, WikiAdmin)
Index: tracdb_ext/models.py
===================================================================
--- tracdb_ext/models.py        (revision 2)
+++ tracdb_ext/models.py        (revision 3)
@@ -1,10 +1,12 @@
 from django.db import models
+from django_trac.tracdb.models import Ticket
 from django_trac.tracdb import fields
 # declared primary keys are not real primary keys
 
 class Enum(models.Model):
+    rowid = models.IntegerField(primary_key=True, editable=False)
     type = fields.ShortTextField(blank=True)
-    name = fields.ShortTextField(blank=True, primary_key=True)
+    name = fields.ShortTextField(blank=True)
     value = fields.ShortTextField(blank=True)
     
     def __unicode__(self):
@@ -16,7 +18,8 @@
 
 
 class Permission(models.Model):
-    username = fields.ShortTextField(blank=True, primary_key=True)
+    rowid = models.IntegerField(primary_key=True, editable=False)
+    username = fields.ShortTextField(blank=True)
     action = fields.ShortTextField(blank=True)
     
     def __unicode__(self):
@@ -26,9 +29,10 @@
         unique_together = ('username', 'action')
 
 class TicketChange(models.Model):
+    rowid = models.IntegerField(primary_key=True, editable=False)
     #ticket = models.IntegerField(null=True, blank=True)
     ticket = models.ForeignKey(Ticket, db_column='ticket',
related_name='changes')
-    time = models.IntegerField(null=True, blank=True,
primary_key=True)
+    time = models.IntegerField(null=True, blank=True)
     author = fields.ShortTextField(blank=True)
     field = fields.ShortTextField(blank=True)
     oldvalue = fields.ShortTextField(blank=True)
@@ -38,45 +42,50 @@
         unique_together = ('ticket','time','field')
 
 class TicketCustom(models.Model):
+    rowid = models.IntegerField(primary_key=True, editable=False)
     #ticket = models.IntegerField(null=True, blank=True)
     ticket = models.ForeignKey(Ticket, db_column='ticket',
related_name='customs')
-    name = fields.ShortTextField(blank=True, primary_key=True)
+    name = fields.ShortTextField(blank=True)
     value = fields.ShortTextField(blank=True)
     class Meta:
         db_table = u'ticket_custom'
         unique_together = ('ticket','name')
 
 class Attachment(models.Model):
+    rowid = models.IntegerField(primary_key=True, editable=False)
     type = fields.ShortTextField(blank=True)
     id = fields.ShortTextField(blank=True)
     filename = fields.ShortTextField(blank=True)
     size = models.IntegerField(null=True, blank=True)
-    time = models.IntegerField(null=True, blank=True,
primary_key=True)
+    time = models.IntegerField(null=True, blank=True)
     description = models.TextField(blank=True)
     author = fields.ShortTextField(blank=True)
-    ipnr = fields.ShortTextField(blank=True)
+    ipnr = models.IPAddressField(blank=True)
     class Meta:
         db_table = u'attachment'
         unique_together = ('type','id','filename')
 
 class AuthCookie(models.Model):
+    rowid = models.IntegerField(primary_key=True, editable=False)
     cookie = fields.ShortTextField(blank=True)
     name = fields.ShortTextField(blank=True)
-    ipnr = fields.ShortTextField(blank=True)
-    time = models.IntegerField(null=True, blank=True,
primary_key=True)
+    ipnr = models.IPAddressField(blank=True)
+    time = models.IntegerField(null=True, blank=True)
     class Meta:
         db_table = u'auth_cookie'
         unique_together = ('cookie','ipnr','name')
 
 class Session(models.Model):
-    sid = fields.ShortTextField(blank=True, primary_key=True)
+    rowid = models.IntegerField(primary_key=True, editable=False)
+    sid = fields.ShortTextField(blank=True)
     authenticated = models.BooleanField(null=True, blank=True)
     last_visit = models.IntegerField(null=True, blank=True)
     class Meta:
         db_table = u'session'
 
 class SessionAttribute(models.Model):
-    sid = fields.ShortTextField(blank=True, primary_key=True)
+    rowid = models.IntegerField(primary_key=True, editable=False)
+    sid = fields.ShortTextField(blank=True)
     authenticated = models.BooleanField(null=True, blank=True)
     name = fields.ShortTextField(blank=True)
     value = fields.ShortTextField(blank=True)
@@ -86,7 +95,8 @@
 
 
 class NodeChange(models.Model):
-    rev = fields.ShortTextField(blank=True, primary_key=True)
+    rowid = models.IntegerField(primary_key=True, editable=False)
+    rev = fields.ShortTextField(blank=True)
     path = fields.ShortTextField(blank=True)
     node_type = fields.ShortTextField(blank=True)
     change_type = fields.ShortTextField(blank=True)
@@ -97,11 +107,12 @@
         unique_together = ('rev','path','change_type')
 
 class Wiki(models.Model):
+    rowid = models.IntegerField(primary_key=True, editable=False)
     name = fields.ShortTextField(blank=True)
     version = models.IntegerField(null=True, blank=True)
-    time = models.IntegerField(null=True, blank=True,
primary_key=True)
+    time = models.IntegerField(null=True, blank=True)
     author = fields.ShortTextField(blank=True)
-    ipnr = fields.ShortTextField(blank=True)
+    ipnr = models.IPAddressField(blank=True)
     text = models.TextField(blank=True)
     comment = fields.ShortTextField(blank=True)
     readonly = models.BooleanField(null=True, blank=True)