Merge pull request #193 in RMS/api-main-service from red-develop to RMSv2

* commit '40e2b58d':
  fixing
  fixing

app/applicationlayer/cms/template/header/serializers.py

@@ -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'] = settings.MEDIA_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

@@ -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}),
 
 ]
 
 if settings.DEBUG:
     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