Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in
Toggle navigation
R
red-ci-cd
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
red-group-test
red-ci-cd
Commits
6b3e5442
Commit
6b3e5442
authored
Nov 21, 2019
by
Gladys Forte
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
edit all delegation except vendor, requestor
parent
54165229
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
63 deletions
+10
-63
app/applicationlayer/cms/form/header/serializers.py
app/applicationlayer/cms/form/header/serializers.py
+1
-1
app/applicationlayer/cms/form/header/table_filters.py
app/applicationlayer/cms/form/header/table_filters.py
+5
-4
app/applicationlayer/download/accounts/views.py
app/applicationlayer/download/accounts/views.py
+1
-1
app/applicationlayer/management/application/views.py
app/applicationlayer/management/application/views.py
+1
-1
app/applicationlayer/management/delegation/views.py
app/applicationlayer/management/delegation/views.py
+2
-56
No files found.
app/applicationlayer/cms/form/header/serializers.py
View file @
6b3e5442
...
@@ -93,7 +93,7 @@ class ChangeRequestFormHeaderSerializer(
...
@@ -93,7 +93,7 @@ class ChangeRequestFormHeaderSerializer(
ret
[
'requested_to_company'
]
=
"None"
ret
[
'requested_to_company'
]
=
"None"
ret
[
'requested_to_department'
]
=
"None"
ret
[
'requested_to_department'
]
=
"None"
ret
[
'requested_to_user'
]
=
"None"
ret
[
'requested_to_user'
]
=
"None"
ret
[
'requested_by_user'
]
=
"None"
ret
[
'requested_by_user'
]
=
"None"
ret
[
'requested_by_department'
]
=
"None"
ret
[
'requested_by_department'
]
=
"None"
ret
[
'template_object'
]
=
"None"
ret
[
'template_object'
]
=
"None"
...
...
app/applicationlayer/cms/form/header/table_filters.py
View file @
6b3e5442
...
@@ -5,13 +5,14 @@ from app.entities.models import ChangeRequestFormHeader
...
@@ -5,13 +5,14 @@ from app.entities.models import ChangeRequestFormHeader
class
HeaderFilterSet
(
filters
.
FilterSet
):
class
HeaderFilterSet
(
filters
.
FilterSet
):
# action_required = filters.CharFilter(method='action_required_bar')
# action_required = filters.CharFilter(method='action_required_bar')
class
Meta
:
model
=
ChangeRequestFormHeader
fields
=
'__all__'
# def action_required_bar(self, queryset, name, value):
# def action_required_bar(self, queryset, name, value):
# return queryset.filter(
# return queryset.filter(
# Q(title__icontains=value) |
# Q(title__icontains=value) |
# Q(name__icontains=value) |
# Q(name__icontains=value) |
# Q(description__icontains=value)
# Q(description__icontains=value)
# )
# )
class
Meta
:
model
=
ChangeRequestFormHeader
fields
=
'__all__'
app/applicationlayer/download/accounts/views.py
View file @
6b3e5442
...
@@ -20,7 +20,7 @@ class UserDownloadRequest(XLSXFileMixin, ReadOnlyModelViewSet):
...
@@ -20,7 +20,7 @@ class UserDownloadRequest(XLSXFileMixin, ReadOnlyModelViewSet):
renderer_classes
=
(
XLSXRenderer
,)
renderer_classes
=
(
XLSXRenderer
,)
filename
=
'User List.xlsx'
filename
=
'User List.xlsx'
permission_classes
=
(
AllowAny
,)
permission_classes
=
(
AllowAny
,)
def
list
(
self
,
request
,
*
args
,
**
kwargs
):
def
list
(
self
,
request
,
*
args
,
**
kwargs
):
# id_number = request.user.code
# id_number = request.user.code
...
...
app/applicationlayer/management/application/views.py
View file @
6b3e5442
...
@@ -24,7 +24,7 @@ class ApplicationViewSet(viewsets.ModelViewSet):
...
@@ -24,7 +24,7 @@ class ApplicationViewSet(viewsets.ModelViewSet):
filterset_class
=
ApplicationFilterSet
filterset_class
=
ApplicationFilterSet
ordering_fields
=
'__all__'
ordering_fields
=
'__all__'
search_fields
=
(
'name'
,
'code'
)
search_fields
=
(
'name'
,
'code'
)
@
decorators
.
rms
.
application_crate
@
decorators
.
rms
.
application_crate
@
transaction
.
atomic
@
transaction
.
atomic
...
...
app/applicationlayer/management/delegation/views.py
View file @
6b3e5442
...
@@ -64,9 +64,6 @@ class DelegationViewSet(viewsets.ModelViewSet):
...
@@ -64,9 +64,6 @@ class DelegationViewSet(viewsets.ModelViewSet):
@
transaction
.
atomic
@
transaction
.
atomic
def
destroy
(
self
,
request
,
*
args
,
**
kwargs
):
def
destroy
(
self
,
request
,
*
args
,
**
kwargs
):
# instance = self.get_object()
# new_instance = model_to_dict(instance)
message
=
{
message
=
{
'code'
:
400
,
'code'
:
400
,
'status'
:
'failed'
,
'status'
:
'failed'
,
...
@@ -74,52 +71,6 @@ class DelegationViewSet(viewsets.ModelViewSet):
...
@@ -74,52 +71,6 @@ class DelegationViewSet(viewsets.ModelViewSet):
}
}
return
Response
(
message
,
status
=
status
.
HTTP_400_BAD_REQUEST
)
return
Response
(
message
,
status
=
status
.
HTTP_400_BAD_REQUEST
)
# exist_in_dept = instance.departments.all()
# restrictions
# if not exist_in_dept.count() > 0:
# print(exist_in_dept)
# if not (new_instance['name'].lower() == 'head of department' or
# new_instance['name'].lower() == 'sd/od' or
# new_instance['name'].lower() == 'change control board' or
# new_instance['name'].lower() == 'approver' or
# new_instance['name'].lower() == 'vendor/implementor' or
# new_instance['name'].lower() == 'requestor'):
# self.perform_destroy(instance)
# log_save(
# enums.LogEnum.DELETED.value,
# enums.LogEntitiesEnum.DELEGATION.value,
# new_instance['id'],
# new_instance,
# ''
# )
# message = {
# 'code': 200,
# 'status': 'success',
# 'message': 'Delegation Successfully deleted'
# }
# return Response(message, status=status.HTTP_200_OK)
# else:
# message = {
# 'code': 400,
# 'status': 'failed',
# 'message': 'Default delegation cannot delete'
# }
# return Response(message, status=status.HTTP_400_BAD_REQUEST)
# else:
# message = {
# 'code': 400,
# 'status': 'failed',
# 'message': 'Cannot delete this delegation due to existing record in department'
# }
# return Response(message, status=status.HTTP_400_BAD_REQUEST)
@
transaction
.
atomic
@
transaction
.
atomic
def
update
(
self
,
request
,
*
args
,
**
kwargs
):
def
update
(
self
,
request
,
*
args
,
**
kwargs
):
...
@@ -133,14 +84,9 @@ class DelegationViewSet(viewsets.ModelViewSet):
...
@@ -133,14 +84,9 @@ class DelegationViewSet(viewsets.ModelViewSet):
old_instance
=
model_to_dict
(
instance
)
old_instance
=
model_to_dict
(
instance
)
# restrictions
if
not
(
old_instance
[
'name'
]
.
lower
()
==
'vendor/implementor'
or
if
not
(
old_instance
[
'name'
]
.
lower
()
==
'head of department'
or
old_instance
[
'name'
]
.
lower
()
==
'sd/od'
or
old_instance
[
'name'
]
.
lower
()
==
'change control board'
or
old_instance
[
'name'
]
.
lower
()
==
'approver'
or
old_instance
[
'name'
]
.
lower
()
==
'vendor/implementor'
or
old_instance
[
'name'
]
.
lower
()
==
'requestor'
):
old_instance
[
'name'
]
.
lower
()
==
'requestor'
):
self
.
perform_update
(
serializer
)
self
.
perform_update
(
serializer
)
new_instance
=
serializer
.
data
new_instance
=
serializer
.
data
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment