fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update to new flickr metadata format
[redakcja.git]
/
apps
/
catalogue
/
models
/
chunk.py
diff --git
a/apps/catalogue/models/chunk.py
b/apps/catalogue/models/chunk.py
index
171ba53
..
fc3a9ea
100755
(executable)
--- a/
apps/catalogue/models/chunk.py
+++ b/
apps/catalogue/models/chunk.py
@@
-49,7
+49,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,7
+59,6
@@
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
# =========================
@@
-71,7
+70,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,
+ new_chunk = self.book.chunk_set.create(
+ number=self.number+1,
slug=new_slug[:50], title=title[:255], **kwargs)
except IntegrityError:
pass
slug=new_slug[:50], title=title[:255], **kwargs)
except IntegrityError:
pass
@@
-84,7
+84,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
# =============
@@
-92,7
+91,7
@@
class Chunk(dvcs_models.Document):
change = self.publishable()
if not change:
return False
change = self.publishable()
if not change:
return False
- return change.publish_log.exists()
+ return
not
change.publish_log.exists()
def is_changed(self):
if self.head is None:
def is_changed(self):
if self.head is None: