fnp
/
audio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
confirm on remove_to_archive
[audio.git]
/
apps
/
archive
/
settings.py
diff --git
a/apps/archive/settings.py
b/apps/archive/settings.py
index
9c05b70
..
476f6c7
100755
(executable)
--- a/
apps/archive/settings.py
+++ b/
apps/archive/settings.py
@@
-17,6
+17,9
@@
except AttributeError:
FILES_PATH = os.path.abspath(os.path.join(settings.MEDIA_ROOT,
"archive/files"))
FILES_PATH = os.path.abspath(os.path.join(settings.MEDIA_ROOT,
"archive/files"))
+if FILES_PATH.startswith(settings.MEDIA_ROOT):
+ FILES_SAVE_PATH = FILES_PATH[len(settings.MEDIA_ROOT):].lstrip('/')
+
# here the app keeps the unmanaged (archive) files
try:
# here the app keeps the unmanaged (archive) files
try:
@@
-52,6
+55,11
@@
try:
except AttributeError:
UPLOAD_USER = 'username'
except AttributeError:
UPLOAD_USER = 'username'
+try:
+ UPLOAD_PASSWORD = settings.ARCHIVE_UPLOAD_PASSWORD
+except AttributeError:
+ UPLOAD_PASSWORD = None
+
try:
UPLOAD_PATH = settings.ARCHIVE_UPLOAD_PATH
except AttributeError:
try:
UPLOAD_PATH = settings.ARCHIVE_UPLOAD_PATH
except AttributeError: