fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix for multiple agreements
[wolnelektury.git]
/
src
/
catalogue
/
models
/
bookmedia.py
diff --git
a/src/catalogue/models/bookmedia.py
b/src/catalogue/models/bookmedia.py
index
6b65080
..
377dbc4
100644
(file)
--- a/
src/catalogue/models/bookmedia.py
+++ b/
src/catalogue/models/bookmedia.py
@@
-8,14
+8,14
@@
from collections import namedtuple
from django.db import models
from django.utils.translation import ugettext_lazy as _
import jsonfield
from django.db import models
from django.utils.translation import ugettext_lazy as _
import jsonfield
-from
fnpdjango.utils.text.slughifi import slughifi
+from
slugify import slugify
from mutagen import MutagenError
from catalogue.fields import OverwriteStorage
def _file_upload_to(i, _n):
from mutagen import MutagenError
from catalogue.fields import OverwriteStorage
def _file_upload_to(i, _n):
- return 'book/%(ext)s/%(name)s.%(ext)s' % {'ext': i.ext(), 'name': slug
hifi
(i.name)}
+ return 'book/%(ext)s/%(name)s.%(ext)s' % {'ext': i.ext(), 'name': slug
ify
(i.name)}
class BookMedia(models.Model):
class BookMedia(models.Model):
@@
-66,7
+66,7
@@
class BookMedia(models.Model):
old = None
else:
# if name changed, change the file name, too
old = None
else:
# if name changed, change the file name, too
- if slug
hifi(self.name) != slughifi
(old.name):
+ if slug
ify(self.name) != slugify
(old.name):
self.file.save(None, ExistingFile(self.file.path), save=False)
super(BookMedia, self).save(*args, **kwargs)
self.file.save(None, ExistingFile(self.file.path), save=False)
super(BookMedia, self).save(*args, **kwargs)