X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/985ca3a21df2340caa545f27e5f01fd1eb87c9c8..a7a2b1c6daaa2266645abc5ee4fac91ce10a4c39:/apps/dvcs/models.py

diff --git a/apps/dvcs/models.py b/apps/dvcs/models.py
index 7ac7cbef..f81f2cab 100644
--- a/apps/dvcs/models.py
+++ b/apps/dvcs/models.py
@@ -6,6 +6,51 @@ from django.utils.translation import ugettext_lazy as _
 from mercurial import mdiff, simplemerge
 import pickle
 
+
+class Tag(models.Model):
+    """
+        a tag (e.g. document stage) which can be applied to a change
+    """
+
+    name = models.CharField(_('name'), max_length=64)
+    slug = models.SlugField(_('slug'), unique=True, max_length=64, 
+            null=True, blank=True)
+    ordering = models.IntegerField(_('ordering'))
+
+    _object_cache = {}
+
+    class Meta:
+        ordering = ['ordering']
+
+    def __unicode__(self):
+        return self.name
+
+    @classmethod
+    def get(cls, slug):
+        if slug in cls._object_cache:
+            return cls._object_cache[slug]
+        else:
+            obj = cls.objects.get(slug=slug)
+            cls._object_cache[slug] = obj
+            return obj
+
+    @staticmethod
+    def listener_changed(sender, instance, **kwargs):
+        sender._object_cache = {}
+
+    def next(self):
+        """
+            Returns the next tag - stage to work on.
+            Returns None for the last stage.
+        """
+        try:
+            return Tag.objects.filter(ordering__gt=self.ordering)[0]
+        except IndexError:
+            return None
+
+models.signals.pre_save.connect(Tag.listener_changed, sender=Tag)
+
+
 class Change(models.Model):
     """
         Single document change related to previous change. The "parent"
@@ -31,6 +76,9 @@ class Change(models.Model):
     description = models.TextField(blank=True, default='')
     created_at = models.DateTimeField(editable=False, db_index=True, 
                         default=datetime.now)
+    publishable = models.BooleanField(default=False)
+
+    tags = models.ManyToManyField(Tag)
 
     class Meta:
         ordering = ('created_at',)
@@ -78,18 +126,26 @@ class Change(models.Model):
             text = change.apply_to(text)
         return text
 
-    def make_child(self, patch, description, author=None, author_desc=None):
-        return self.children.create(patch=patch,
+    def make_child(self, patch, description, author=None,
+            author_desc=None, tags=None):
+        ch = self.children.create(patch=patch,
                         tree=self.tree, author=author,
                         author_desc=author_desc,
                         description=description)
+        if tags is not None:
+            ch.tags = tags
+        return ch
 
     def make_merge_child(self, patch, description, author=None, 
-            author_desc=None):
-        return self.merge_children.create(patch=patch,
+            author_desc=None, tags=None):
+        ch = self.merge_children.create(patch=patch,
                         tree=self.tree, author=author,
                         author_desc=author_desc,
-                        description=description)
+                        description=description,
+                        tags=tags)
+        if tags is not None:
+            ch.tags = tags
+        return ch
 
     def apply_to(self, text):
         return mdiff.patch(text, pickle.loads(self.patch.encode('ascii')))
@@ -122,10 +178,15 @@ class Document(models.Model):
     """
         File in repository.        
     """
-    creator = models.ForeignKey(User, null=True, blank=True)
+    creator = models.ForeignKey(User, null=True, blank=True, editable=False,
+                related_name="created_documents")
     head = models.ForeignKey(Change,
                     null=True, blank=True, default=None,
-                    help_text=_("This document's current head."))
+                    help_text=_("This document's current head."),
+                    editable=False)
+
+    user = models.ForeignKey(User, null=True, blank=True)
+    stage = models.ForeignKey(Tag, null=True, blank=True)
 
     def __unicode__(self):
         return u"{0}, HEAD: {1}".format(self.id, self.head_id)
@@ -165,19 +226,25 @@ class Document(models.Model):
 
         author = kwargs.get('author', None)
         author_desc = kwargs.get('author_desc', None)
+        tags = kwargs.get('tags', [])
+        if tags:
+            # set stage to next tag after the commited one
+            self.stage = max(tags, key=lambda t: t.ordering).next()
 
         old_head = self.head
         if parent != old_head:
             change = parent.make_merge_child(patch, author=author, 
                     author_desc=author_desc,
-                    description=kwargs.get('description', ''))
+                    description=kwargs.get('description', ''),
+                    tags=tags)
             # not Fast-Forward - perform a merge
             self.head = old_head.merge_with(change, author=author,
                     author_desc=author_desc)
         else:
             self.head = parent.make_child(patch, author=author, 
                     author_desc=author_desc, 
-                    description=kwargs.get('description', ''))
+                    description=kwargs.get('description', ''),
+                    tags=tags)
 
         self.save()
         return self.head
@@ -191,11 +258,18 @@ class Document(models.Model):
         return rev if rev is not None else -1
 
     def at_revision(self, rev):
-        if rev:
+        if rev is not None:
             return self.change_set.get(revision=rev)
         else:
             return self.head
 
+    def publishable(self):
+        changes = self.change_set.filter(publishable=True).order_by('-created_at')[:1]
+        if changes.count():
+            return changes[0]
+        else:
+            return None
+
     @staticmethod
     def listener_initial_commit(sender, instance, created, **kwargs):
         # run for Document and its subclasses