aboutsummaryrefslogtreecommitdiffstats
path: root/django_skaschool/settings.py
diff options
context:
space:
mode:
authorWeitian LI <liweitianux@gmail.com>2014-04-27 01:58:27 +0800
committerWeitian LI <liweitianux@gmail.com>2014-04-27 01:58:27 +0800
commitc4d4764da9eb15322ab4207b5efd5f3dac36d75f (patch)
treed9f41e9f107d4ad5594f1e1d707063761486671b /django_skaschool/settings.py
parente166ea9dd833f5d22f8a32d36fd4ed539c902410 (diff)
downloaddjango-skaschool-c4d4764da9eb15322ab4207b5efd5f3dac36d75f.tar.bz2
* updated ALLOWED_CONTENT_TYPES
* implemented ContentTypeRestrictedFileField based on FileField
Diffstat (limited to 'django_skaschool/settings.py')
-rw-r--r--django_skaschool/settings.py44
1 files changed, 31 insertions, 13 deletions
diff --git a/django_skaschool/settings.py b/django_skaschool/settings.py
index 0a8326d..f64e098 100644
--- a/django_skaschool/settings.py
+++ b/django_skaschool/settings.py
@@ -175,25 +175,43 @@ RECAPTCHA_PRIVATE_KEY = '6Lf8dvISAAAAAH75mmLlVWOp6JB9Gx6WARR_6HXb'
#################################################
## allowed content types to be uploaded by user
ALLOWED_CONTENT_TYPES = [
- 'application/octet-stream', # arbitrary binary data: doc, ppt, etc.
- 'application/pdf', # pdf
- 'application/postscript', # postscript
- 'application/zip', # zip
- 'application/gzip', # gzip
+ 'application/gzip', # gzip
+ 'application/msword', # doc
+ 'application/pdf', # pdf
+ 'application/postscript', # postscript
+ 'application/rar', # rar
+ 'application/vnd.oasis.opendocument.spreadsheet', # ods
+ 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', # xlsx
+ 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', # docx
+ 'application/wps-office.doc', # wps doc/rtf
+ 'application/wps-office.dps', # wps dps
+ 'application/wps-office.et', # wps et
+ 'application/wps-office.ppt', # wps ppt
+ 'application/wps-office.pptx', # wps pptx
+ 'application/wps-office.wps', # wps wps
+ 'application/wps-office.xls', # wps xls
+ 'application/zip', # zip
'application/x-7z-compressed', # 7z
+ 'application/x-bzip2', # bz2
'application/x-dvi', # dvi
'application/x-latex', # latex
'application/x-rar-compressed', # rar
'application/x-tar', # tar
- 'image/gif', # gif
- 'image/jpeg', # jpg
- 'image/png', # png
- 'text/html', # html
- 'text/plain', # txt
- 'text/rtf', # rtf
- 'text/xml', # xml
- 'text/x-markdown', # markdown
+ 'image/bmp', # bmp
+ 'image/gif', # gif
+ 'image/jpeg', # jpg
+ 'image/png', # png
+ 'image/tiff', # tif
+ 'text/csv', # csv
+ 'text/html', # html
+ 'text/plain', # txt
+ 'text/rtf', # rtf
+ 'text/xml', # xml
+ 'text/x-markdown', # markdown
+ 'text/x-tex', # latex
]
+## allowed filesize of uploaded files
+ALLOWED_MAX_UPLOAD_SIZE = 10485760 # 10 MB
# vim: set ts=4 sw=4 tw=0 fenc=utf-8 ft=python: