X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=quotes%2Fmodels.py;h=0d7fe333001e4ee77f58216f1ed102cc9c903343;hb=8f47dcb74ef6de59596a2fffd420c2acac8dcd19;hp=7539152451509845f8e984c31bbd16c2dd4ddb69;hpb=5c563ff1701456a2ca7108a301e4e48457475daa;p=djsite.git

diff --git a/quotes/models.py b/quotes/models.py
index 7539152..0d7fe33 100644
--- a/quotes/models.py
+++ b/quotes/models.py
@@ -1,17 +1,50 @@
 from django.db import models
-from localmodels import HTMLField, TagField
+from django.urls import reverse
+
+from localmodels import HTMLField
 
 # Create your models here.
-class Author(models.Model):
-    name = models.CharField(max_length=100,
-                            help_text="Name of the author")
+class BaseTag(models.Model):
+    tag = models.CharField(max_length=100, unique=True)
+
+    def __unicode__(self):
+        return self.tag
+
+    class Meta(object):
+        abstract = True
+
+class AuthorTag(BaseTag): pass
+class WorkTag(BaseTag): pass
+class QuoteTag(BaseTag):
+    def get_absolute_url(self):
+        return reverse('quotes:tags', args=[str(self.id)])
+
+class CommonData(models.Model):
+    creation_date = models.DateTimeField(auto_now_add=True)
+    last_modification = models.DateTimeField(auto_now=True)
+
     notes = HTMLField(blank=True, help_text= \
-                      "Notes about the author; may be left blank. Will \
-                      not be HTML-escaped.",)
+                      "Notes about the entry; may be left blank. Displayed \
+                      on the public pages")
     pvt_notes = HTMLField(blank=True, help_text= \
-                          "Notes about the author; not displayed on \
-                          the public interface",)
-    tags = TagField()
+                          "Notes about the entry; not displayed on \
+                          the public interface")
+
+    nb_display = models.BigIntegerField(default=0)
+    def incr_display(self):
+        self.nb_display = models.F('nb_display') + 1
+        self.save()
+
+    class Meta(object):
+        abstract = True
+
+class Author(CommonData):
+    name = models.CharField(max_length=100,
+                            help_text="Name of the author",
+                            unique=True)
+
+    tags = models.ManyToManyField(AuthorTag, blank=True,
+                                  help_text='Not implemented yet')
 
     birth_date = models.DateField(blank=True, null=True,
                                   help_text="Date of birth")
@@ -19,9 +52,12 @@ class Author(models.Model):
                                   help_text="Date of death (leave blank \
                                   if still alive!)")
 
-    def __str__(self):
+    def __unicode__(self):
         return self.name
 
+    def get_absolute_url(self):
+        return reverse('quotes:author', args=[str(self.id)])
+
 # class DatePrecision(models.CharField):
 #     DAY = "D"
 #     MONTH = "M"
@@ -41,36 +77,30 @@ class Author(models.Model):
 #         models.CharField(max_length=1, choices=self.PRECISION_CHOICES,
 #                          default=self.DAY, **kwargs)
 
-class Work(models.Model):
+class Work(CommonData):
     name = models.CharField(max_length=100,
                             help_text="Name of the context for the quote \
-                            (title of the work or speech it appears in)")
+                            (title of the work or speech it appears in)",
+                            unique=True)
     author = models.ForeignKey(Author)
     date = models.DateField(blank=True, null=True,
                             help_text="Date of the quote")
-    tags = TagField()
-
-    notes = HTMLField(blank=True, help_text= \
-                      "Notes about the work; may be left blank. Will \
-                      not be HTML-escaped. XXX: offer a WYSIWYG editor")
-    pvt_notes = HTMLField(blank=True, help_text= \
-                          "Notes about the work; not displayed on \
-                          the public interface")
+    tags = models.ManyToManyField(WorkTag, blank=True,
+                                  help_text='Not implemented yet')
 
-    def __str__(self):
+    def __unicode__(self):
         return "%s: %s (%s)" % (self.author.name, self.name, self.date)
 
-class Quote(models.Model):
+    def get_absolute_url(self):
+        return reverse('quotes:work', args=[str(self.id)])
+
+class Quote(CommonData):
     text = HTMLField()
-    tags = TagField()
+    tags = models.ManyToManyField(QuoteTag, blank=True)
     work = models.ForeignKey(Work)
 
-    notes = HTMLField(blank=True, help_text= \
-                      "Notes about the quote; may be left blank. Will \
-                      not be HTML-escaped. XXX: offer a WYSIWYG editor")
-    pvt_notes = HTMLField(blank=True, help_text= \
-                          "Notes about the quote; not displayed on \
-                          the public interface")
-
-    def __str__(self):
+    def __unicode__(self):
         return self.work.author.name + ": " + self.text
+
+    def get_absolute_url(self):
+        return reverse('quotes:onequote', args=[str(self.id)])