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
40e2b58d
Commit
40e2b58d
authored
Sep 27, 2019
by
John Red Medrano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixing
parent
b61e2437
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
11 deletions
+12
-11
app/applicationlayer/cms/template/header/serializers.py
app/applicationlayer/cms/template/header/serializers.py
+7
-6
config/urls.py
config/urls.py
+5
-5
No files found.
app/applicationlayer/cms/template/header/serializers.py
View file @
40e2b58d
...
...
@@ -12,14 +12,15 @@ from app.applicationlayer.cms.utils_cr import (get_account_details,
from
app.applicationlayer.cms.template.approver.serializers
import
ChangeRequestTemplateApproversSerializer
from
app.applicationlayer.cms.template.stakeholder.serializers
import
ChangeRequestTemplateStakeHoldersSerializer
from
django.conf
import
settings
class
ChangeRequestTemplateAttachmentsSerializer
(
serializers
.
ModelSerializer
):
# file_upload = serializers.HyperlinkedRelatedField(queryset=models.MasterAttachment.objects.all(), view_name='MasterAttachment.id')
def
to_representation
(
self
,
instance
):
#
try:
try
:
ret
=
super
()
.
to_representation
(
instance
)
user_object
=
{
"id"
:
instance
.
uploaded_by
.
id
,
...
...
@@ -30,11 +31,11 @@ class ChangeRequestTemplateAttachmentsSerializer(
"contact_no"
:
instance
.
uploaded_by
.
contact_no
}
ret
[
'uploaded_by'
]
=
user_object
ret
[
'file_upload'
]
=
instance
.
file_upload
.
url
.
url
ret
[
'file_upload'
]
=
self
.
context
[
'request'
]
.
build_absolute_uri
(
instance
.
file_upload
.
url
.
url
)
return
ret
except
Exception
as
e
:
ret
[
'uploaded_by'
]
=
"none"
return
ret
# except Exception as e:
# ret['uploaded_by'] = "none"
# return ret
class
Meta
:
model
=
models
.
ChangeRequestTemplateAttachments
...
...
config/urls.py
View file @
40e2b58d
...
...
@@ -35,10 +35,10 @@ urlpatterns = [
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'^static/(?P<path>.*)$'
,
serve
,{
'document_root'
:
settings
.
STATIC_ROOT
}),
]
+
static
(
settings
.
MEDIA_URL
,
document_root
=
settings
.
MEDIA_ROOT
)
]
# if settings.DEBUG:
# urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
# urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
\ No newline at end of file
if
settings
.
DEBUG
:
urlpatterns
+=
static
(
settings
.
MEDIA_URL
,
document_root
=
settings
.
MEDIA_ROOT
)
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