X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/e7927df2744d46e176c7114bf63f1bd8f5746168..ec5b493bff5efa683aadf5f78aa891eff3550156:/apps/dvcs/models.py diff --git a/apps/dvcs/models.py b/apps/dvcs/models.py index 2526028f..ec647946 100644 --- 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 string_concat, 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 @@ -43,7 +43,7 @@ class Tag(models.Model): 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. @@ -166,8 +166,6 @@ class Change(models.Model): post_publishable.send(sender=self, publishable=publishable) - - def create_tag_model(model): name = model.__name__ + 'Tag' @@ -286,7 +284,7 @@ class Document(models.Model): 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,