fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'edumed' of https://github.com/fnp/redakcja into edumed
[redakcja.git]
/
apps
/
wiki
/
views.py
diff --git
a/apps/wiki/views.py
b/apps/wiki/views.py
index
0356d50
..
4b825e5
100644
(file)
--- a/
apps/wiki/views.py
+++ b/
apps/wiki/views.py
@@
-202,12
+202,12
@@
def gallery(request, directory):
try:
base_url = ''.join((
smart_unicode(settings.MEDIA_URL),
try:
base_url = ''.join((
smart_unicode(settings.MEDIA_URL),
- smart_unicode(settings.
FILEBROWSER_DIRECTORY
),
+ smart_unicode(settings.
IMAGE_DIR
),
smart_unicode(directory)))
base_dir = os.path.join(
smart_unicode(settings.MEDIA_ROOT),
smart_unicode(directory)))
base_dir = os.path.join(
smart_unicode(settings.MEDIA_ROOT),
- smart_unicode(settings.
FILEBROWSER_DIRECTORY
),
+ smart_unicode(settings.
IMAGE_DIR
),
smart_unicode(directory))
def map_to_url(filename):
smart_unicode(directory))
def map_to_url(filename):