Commit 2b25c599 authored by John Red Medrano's avatar John Red Medrano

Merge pull request #659 in RMS/api-main-service from red-develop to product-dev

* commit '02aa4b16':
  trial #1 to fix issue on serving of media files
parents 6e86c6d3 02aa4b16
...@@ -128,8 +128,13 @@ USE_TZ = False ...@@ -128,8 +128,13 @@ USE_TZ = False
# Static files (CSS, JavaScript, Images) # Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/2.2/howto/static-files/ # https://docs.djangoproject.com/en/2.2/howto/static-files/
if DEBUG:
STATIC_ROOT = os.path.join(BASE_DIR, '/static')
else:
STATIC_ROOT = os.path.join(BASE_DIR, 'static')
STATIC_URL = '/static/' STATIC_URL = '/static/'
STATIC_ROOT = os.path.join(BASE_DIR, "static") # STATIC_ROOT = os.path.join(BASE_DIR, "static")
MEDIA_ROOT = os.path.join(BASE_DIR, 'media') MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
MEDIA_URL = '/media/' MEDIA_URL = '/media/'
......
...@@ -20,6 +20,7 @@ from app.applicationlayer.management.notification import views as notifview ...@@ -20,6 +20,7 @@ from app.applicationlayer.management.notification import views as notifview
from django.views.static import serve from django.views.static import serve
from django.conf import settings from django.conf import settings
from django.conf.urls.static import static from django.conf.urls.static import static
import django.views.static as try_static
urlpatterns = [ urlpatterns = [
...@@ -40,4 +41,6 @@ urlpatterns = [ ...@@ -40,4 +41,6 @@ urlpatterns = [
if settings.DEBUG: if settings.DEBUG:
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
\ No newline at end of file else:
urlpatterns += [url(r'^static/(?P<path>.*)$', django.views.static.serve, {'document_root': try_static.STATIC_ROOT, 'show_indexes': try_static.DEBUG})]
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment