fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Zlacz takie same przyciski podczas naprawiania.
[redakcja.git]
/
apps
/
explorer
/
models.py
diff --git
a/apps/explorer/models.py
b/apps/explorer/models.py
index
e47c26f
..
f292283
100644
(file)
--- a/
apps/explorer/models.py
+++ b/
apps/explorer/models.py
@@
-48,9
+48,7
@@
def get_image_folders():
def get_images_from_folder(folder):
def get_images_from_folder(folder):
- return sorted(settings.MEDIA_URL + settings.IMAGE_DIR +
'/' + folder + '/' + fn for fn
+ return sorted(settings.MEDIA_URL + settings.IMAGE_DIR +
u'/' + folder + u'/' + fn.decode('utf-8') for fn
in os.listdir(os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR, folder))
in os.listdir(os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR, folder))
- if not fn.startswith('.'))
+ if not fn.
decode('utf-8').
startswith('.'))
-def user_branch(user):
- return 'personal_'+user.username