Skip to content

R
red-ci-cd
Commit f16d05bb authored by John Red Medrano's avatar John Red Medrano
Browse files
Options

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

* commit '00ac699b':
  fix the value of application on id, add checking on creating user
  modify variable password to {password} on rms-newuser.html, fix the bug on OUA current user
parents f1d07b02 00ac699b
Show whitespace changes
Inline Side-by-side
Showing with 18 additions and 36 deletions
app/applicationlayer/management/account/serializer.py
View file @ f16d05bb
......@@ -15,7 +15,7 @@ class UserSerializer(serializers.ModelSerializer):
ret['department'] = model_to_dict(instance.department)
ret['company'] = model_to_dict(instance.department.company)
# print(instance.application.all())
application = [data['id'] for data in instance.application.values('id')]
application = [data['id'] for data in instance.application.values()]
ret['application'] = application
return ret
......
app/applicationlayer/management/account/views.py
View file @ f16d05bb
......@@ -30,6 +30,7 @@ class UserViewSet(viewsets.ModelViewSet):
queryset = User.objects.all()
serializer_class = serializer.UserSerializer
pagination_class = CustomPagination
# lookup_field = 'code'
filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
filterset_class = UserFilterSet
ordering_fields = '__all__'
......@@ -110,6 +111,13 @@ class UserViewSet(viewsets.ModelViewSet):
)
@decorators.rms.user_list
def retrieve(self, request, *args, **kwargs):
instance = self.get_object()
serializer = self.get_serializer(instance)
return Response(serializer.data)
@rms.user_create
@error_safe
@transaction.atomic
......
app/applicationlayer/management/user/serializers.py
View file @ f16d05bb
......@@ -98,9 +98,9 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
mod = data.modules.all().values()
remove = []
elif user.user_type == 'OUA':
remove.remove("Company Management")
remove.remove("Department Management")
remove.remove("User Management")
pass
elif user.user_type == 'CUA':
remove.remove("Department Management")
remove.remove("User Management")
......
app/helper/decorators.py
View file @ f16d05bb
......@@ -77,7 +77,6 @@ class rms:
rms.access_error
)
elif rms.user_type(self) == rms.enums_department:
print(request.data)
if request.data['department'] != rms.user(self).department.id:
raise ParseError(
rms.department_error
......@@ -109,9 +108,13 @@ class rms:
def department_crate(function):
@wraps(function)
def wrapper(self, request, *args, **kwargs):
if rms.user_type(self) == rms.enums_super:
pass
elif rms.user_type(self) != rms.enums_super or rms.user_type(self) != rms.enums_company:
# if rms.user_type(self) == rms.enums_super:
# pass
# elif rms.user_type(self) != rms.enums_super or rms.user_type(self) != rms.enums_company:
# raise ParseError(
# rms.access_error
# )
if rms.user_type(self) != rms.enums_super:
raise ParseError(
rms.access_error
)
......@@ -193,7 +196,6 @@ class rms:
self.queryset = self.queryset.filter(
department__company=id
)
print(self.queryset.query)
elif rms.user_type(self) == rms.enums_super:
pass
else:
......
app/helper/email_service/templates/RMS-NEWUSER.html
View file @ f16d05bb
<<<<<<< HEAD
<!DOCTYPE html>
<html>
<head>
......@@ -28,31 +27,4 @@
<img src="https://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/>
</body>
=======
<!DOCTYPE html>
<html>
<head>
<title>RMS: New User Created</title>
</head>
<body style="font-family: arial;">
<h3>Resource Management System &#40;RMS&#41;</h3>
<h3 style="color:#888888;">New User Created</h3><br>
<p>Dear {name},</p><br>
<p>You have been created as a new user of RMS. Please see your default login details below.</p><br>
<b>Username</b><br>{username}<br><br>
<b>Password</b><br>password123<br><br>
<p>You may change your password through the <u><a href="http://staging.rms.oneberrysystem.com/cms/profile/" style="text-decoration:underline;color:#007bff;" target="_blank">my profile</a></u> section of RMS any time.</p><br>
<p>Sincerely,</p>
<p>RMS Team</p><br><br>
<p>Powered by</p>
<img src="https://s18.directupload.net/images/190807/jaewp4nx.png" width="120px"/>
</body>
>>>>>>> 319ca52a542ff76918cbe79ef0d144f8156c3abb
</html>
\ 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