Commit 57a2ae68 authored by John Red Medrano's avatar John Red Medrano

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

* commit '151496b8':
  {dev bugfix} remove exclude
  {dev bugfix} code refactor for commit 0ae94a54
  {dev bugfix} bugfix on update of user and application
parents c0703d79 151496b8
...@@ -116,6 +116,10 @@ class rms: ...@@ -116,6 +116,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",
...@@ -130,7 +134,11 @@ class rms: ...@@ -130,7 +134,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