Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in
Toggle navigation
R
red-ci-cd
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
red-group-test
red-ci-cd
Commits
0b21e0fe
Commit
0b21e0fe
authored
Jan 16, 2020
by
John Red Medrano
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #664 in RMS/api-main-service from red-develop to product-dev
* commit '
91e4be99
': fixing
parents
162a6405
91e4be99
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
10 deletions
+4
-10
config/settings/dev.py
config/settings/dev.py
+1
-1
config/urls.py
config/urls.py
+3
-9
No files found.
config/settings/dev.py
View file @
0b21e0fe
from
.base
import
*
import
configparser
DEBUG
=
Fals
e
DEBUG
=
Tru
e
ALLOWED_HOSTS
=
[
'*'
]
# CORS_ORIGIN_ALLOW_ALL = True
...
...
config/urls.py
View file @
0b21e0fe
...
...
@@ -20,7 +20,6 @@ from app.applicationlayer.management.notification import views as notifview
from
django.views.static
import
serve
from
django.conf
import
settings
from
django.conf.urls.static
import
static
import
django.views.static
urlpatterns
=
[
...
...
@@ -33,17 +32,12 @@ urlpatterns = [
url
(
r'^chat/$'
,
notifview
.
index
,
name
=
'index'
),
url
(
r'^chat/(?P<room_name>[^/]+)/$'
,
notifview
.
room
,
name
=
'room'
),
#
re_path(r'^media/(?P<path>.*)$', serve,{'document_root': settings.MEDIA_ROOT}),
#
re_path(r'^static/(?P<path>.*)$', serve,{'document_root': settings.STATIC_ROOT}),
re_path
(
r'^media/(?P<path>.*)$'
,
serve
,{
'document_root'
:
settings
.
MEDIA_ROOT
}),
re_path
(
r'^static/(?P<path>.*)$'
,
serve
,{
'document_root'
:
settings
.
STATIC_ROOT
}),
path
(
'api/v1/asset-management/'
,
include
(
'app.applicationlayer.ams.urls_ams'
)),
]
if
settings
.
DEBUG
:
urlpatterns
+=
static
(
settings
.
MEDIA_URL
,
document_root
=
settings
.
MEDIA_ROOT
)
urlpatterns
+=
static
(
settings
.
STATIC_URL
,
document_root
=
settings
.
STATIC_ROOT
)
else
:
urlpatterns
+=
[
url
(
r'^static/(?P<path>.*)$'
,
django
.
views
.
static
.
serve
,
{
'document_root'
:
settings
.
STATIC_ROOT
,
'show_indexes'
:
settings
.
DEBUG
}),
url
(
r'^media/(?P<path>.*)$'
,
django
.
views
.
static
.
serve
,
{
'document_root'
:
settings
.
MEDIA_ROOT
,
'show_indexes'
:
settings
.
DEBUG
})
]
urlpatterns
+=
static
(
settings
.
STATIC_URL
,
document_root
=
settings
.
STATIC_ROOT
)
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment