Commit 9bfe763a authored by Gladys Forte's avatar Gladys Forte

Merge branch 'RMSv2' of http://42.61.118.105:7990/scm/rms/api-main-service into core-dev-gladys

parents d0036ae0 57a2ae68
...@@ -119,6 +119,10 @@ class rms: ...@@ -119,6 +119,10 @@ class rms:
is_excel_code_exist = self.queryset.filter( is_excel_code_exist = self.queryset.filter(
excel_code=payload['excel_code'] excel_code=payload['excel_code']
) )
if request.method.lower() == 'put':
is_excel_code_exist = is_excel_code_exist.exclude(
code=self.kwargs['code']
)
if is_excel_code_exist: if is_excel_code_exist:
return error_message( return error_message(
'400', "This excel code is already exists", '400', "This excel code is already exists",
...@@ -133,7 +137,11 @@ class rms: ...@@ -133,7 +137,11 @@ class rms:
@wraps(function) @wraps(function)
def wrapper(self, request, *args, **kwargs): def wrapper(self, request, *args, **kwargs):
payload = request.data payload = request.data
username = self.queryset.filter(username=payload['username']) username = self.queryset.filter(
username=payload['username']
)
if request.method.lower() == 'put':
username = username.exclude(code=self.kwargs['code'])
if username.count() >= 1: if username.count() >= 1:
return error_message( return error_message(
'400', '400',
......
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