fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
editor update
[redakcja.git]
/
apps
/
catalogue
/
models
/
chunk.py
diff --git
a/apps/catalogue/models/chunk.py
b/apps/catalogue/models/chunk.py
index
d373e04
..
df6370d
100755
(executable)
--- a/
apps/catalogue/models/chunk.py
+++ b/
apps/catalogue/models/chunk.py
@@
-20,9
+20,9
@@
class Chunk(dvcs_models.Document):
book = models.ForeignKey('Book', editable=False, verbose_name=_('book'))
number = models.IntegerField(_('number'))
book = models.ForeignKey('Book', editable=False, verbose_name=_('book'))
number = models.IntegerField(_('number'))
- slug = models.SlugField(_('slug'))
title = models.CharField(_('title'), max_length=255, blank=True)
title = models.CharField(_('title'), max_length=255, blank=True)
- gallery_start = models.IntegerField(_('gallery start'), null=True, blank=True)
+ slug = models.SlugField(_('slug'))
+ gallery_start = models.IntegerField(_('gallery start'), null=True, blank=True, default=1)
# cache
_short_html = models.TextField(null=True, blank=True, editable=False)
# cache
_short_html = models.TextField(null=True, blank=True, editable=False)
@@
-41,6
+41,10
@@
class Chunk(dvcs_models.Document):
verbose_name_plural = _('chunks')
permissions = [('can_pubmark', 'Can mark for publishing')]
verbose_name_plural = _('chunks')
permissions = [('can_pubmark', 'Can mark for publishing')]
+ class TagMeta:
+ verbose_name = u'etap pracy'
+ verbose_name_plural = u'etapy pracy'
+
# Representing
# ============
# Representing
# ============
@@
-49,7
+53,7
@@
class Chunk(dvcs_models.Document):
@models.permalink
def get_absolute_url(self):
@models.permalink
def get_absolute_url(self):
- return
("wiki_editor", [self.book.slug, self.slug])
+ return
"wiki_editor", [self.book.slug, self.slug]
def pretty_name(self, book_length=None):
title = self.book.title
def pretty_name(self, book_length=None):
title = self.book.title
@@
-59,11
+63,10
@@
class Chunk(dvcs_models.Document):
title += " (%d/%d)" % (self.number, book_length)
return title
title += " (%d/%d)" % (self.number, book_length)
return title
-
# Creating and manipulation
# =========================
# Creating and manipulation
# =========================
- def split(self, slug, title='',
adjust_slug=False,
**kwargs):
+ def split(self, slug, title='', **kwargs):
""" Create an empty chunk after this one """
self.book.chunk_set.filter(number__gt=self.number).update(
number=models.F('number')+1)
""" Create an empty chunk after this one """
self.book.chunk_set.filter(number__gt=self.number).update(
number=models.F('number')+1)
@@
-71,8
+74,8
@@
class Chunk(dvcs_models.Document):
while not new_chunk:
new_slug = self.book.make_chunk_slug(slug)
try:
while not new_chunk:
new_slug = self.book.make_chunk_slug(slug)
try:
- new_chunk = self.book.chunk_set.create(
number=self.number+1,
- slug=new_slug[:50], title=title[:255], **kwargs)
+ new_chunk = self.book.chunk_set.create(
+
number=self.number+1,
slug=new_slug[:50], title=title[:255], **kwargs)
except IntegrityError:
pass
return new_chunk
except IntegrityError:
pass
return new_chunk
@@
-84,7
+87,6
@@
class Chunk(dvcs_models.Document):
else:
return cls.objects.get(book__slug=book_slug, slug=chunk_slug)
else:
return cls.objects.get(book__slug=book_slug, slug=chunk_slug)
-
# State & cache
# =============
# State & cache
# =============