Editor fix

[redakcja.git] / apps / dvcs / models.py

diff --git a/apps/dvcs/models.py b/apps/dvcs/models.py
index d7816fa..eba2c38 100644 (file)
--- a/apps/dvcs/models.py
+++ b/apps/dvcs/models.py
@@ -7,7 +7,7 @@ from django.core.files.storage import FileSystemStorage
 from django.db import models, transaction
 from django.db.models.base import ModelBase
 from django.utils.translation import ugettext_lazy as _
 from django.db import models, transaction
 from django.db.models.base import ModelBase
 from django.utils.translation import ugettext_lazy as _

-from mercurial import mdiff, simplemerge
+from mercurial import simplemerge

 
 from django.conf import settings
 from dvcs.signals import post_commit, post_publishable
 
 from django.conf import settings
 from dvcs.signals import post_commit, post_publishable


@@ -45,7 +45,7 @@ class Tag(models.Model):
     def listener_changed(sender, instance, **kwargs):
         sender._object_cache = {}
 
     def listener_changed(sender, instance, **kwargs):
         sender._object_cache = {}
 

-    def next(self):
+    def get_next(self):

         """
             Returns the next tag - stage to work on.
             Returns None for the last stage.
         """
             Returns the next tag - stage to work on.
             Returns None for the last stage.


@@ -176,6 +176,10 @@ def create_tag_model(model):
     class Meta(Tag.Meta):
         app_label = model._meta.app_label
 
     class Meta(Tag.Meta):
         app_label = model._meta.app_label
 

+    if hasattr(model, 'TagMeta'):
+        for attr, value in model.TagMeta.__dict__.items():
+            setattr(Meta, attr, value)
+

     attrs = {
         '__module__': model.__module__,
         'Meta': Meta,
     attrs = {
         '__module__': model.__module__,
         'Meta': Meta,


@@ -280,7 +284,7 @@ class Document(models.Model):
         tags = kwargs.get('tags', [])
         if tags:
             # set stage to next tag after the commited one
         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()
+            self.stage = max(tags, key=lambda t: t.ordering).get_next()

 
         change = self.change_set.create(author=author,
                     author_name=author_name,
 
         change = self.change_set.create(author=author,
                     author_name=author_name,