paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 05:23:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add settings.DEVELOPMENT as a complement of settings.DEPLOYED.

Browse Source 
(imported from commit 0437140d9fee7eec7b28abe583cfe8cde3e07c21)
This commit is contained in:
David Roe
2015-08-20 23:55:12 -07:00
committed by Tim Abbott
parent 24f6743288
commit 8778c4726a
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zproject/urls.py
View File

@@ -94,7 +94,7 @@ urlpatterns = patterns('',
# These are used for enterprise development. On a real enterprise instance,
# these files would be served by nginx.
if not settings.DEPLOYED and settings.LOCAL_UPLOADS_DIR is not None:
if settings.DEVELOPMENT and settings.LOCAL_UPLOADS_DIR is not None:
urlpatterns += patterns('',
url(r'^user_avatars/(?P<path>.*)$', 'django.views.static.serve',
{'document_root': os.path.join(settings.LOCAL_UPLOADS_DIR, "avatars")}),
@@ -287,7 +287,7 @@ urlpatterns += patterns('',
)
if not settings.DEPLOYED:
if settings.DEVELOPMENT:
use_prod_static = getattr(settings, 'PIPELINE', False)
static_root = os.path.join(settings.DEPLOY_ROOT,
'prod-static/serve' if use_prod_static else 'static')