Skip to content

R
red-ci-cd
Commit 6631e1ee authored by Gladys Forte's avatar Gladys Forte
Browse files
Options

Merge pull request #626 in RMS/api-main-service from gladys-dev2 to product-dev 

* commit '638362be':
  list cms_settings
parents f209a36e 638362be
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
app/applicationlayer/cms/cms_settings/views.py
View file @ 6631e1ee
......@@ -36,8 +36,6 @@ class CMSSettingsViewSet(viewsets.ModelViewSet):
queryset = self.filter_queryset(
self.get_queryset().filter(active_user=logged_user)
)
queryset = self.filter_queryset(self.get_queryset())
page = self.paginate_queryset(queryset)
if page is not None:
......@@ -94,7 +92,7 @@ class CMSSettingsViewSet(viewsets.ModelViewSet):
'message': str(e),
}
return Response(message, status=status.HTTP_400_BAD_REQUEST)
except Exception as e:
message = {
'code': 500,
......
app/helper/email_service/templates/RMS-ONBEHALF.html
View file @ 6631e1ee
<!DOCTYPE html>
<html>
<head>
<title>RMS: </title>
<title>RMS: ASSIGNED ON BEHALF</title>
</head>
<body style="font-family: arial;">
......
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