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
3d56bd1d
Commit
3d56bd1d
authored
Nov 08, 2019
by
Gladys Forte
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
default approver
parent
45774de8
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
105 additions
and
1 deletion
+105
-1
app/applicationlayer/cms/master/template/default_approver/serializer.py
...nlayer/cms/master/template/default_approver/serializer.py
+20
-0
app/applicationlayer/cms/master/template/default_approver/table_filter.py
...ayer/cms/master/template/default_approver/table_filter.py
+11
-0
app/applicationlayer/cms/master/template/default_approver/views.py
...cationlayer/cms/master/template/default_approver/views.py
+55
-0
app/entities/migrations/0034_auto_20191108_1924.py
app/entities/migrations/0034_auto_20191108_1924.py
+18
-0
app/entities/models.py
app/entities/models.py
+1
-1
No files found.
app/applicationlayer/cms/master/template/default_approver/serializer.py
0 → 100644
View file @
3d56bd1d
from
rest_framework
import
serializers
from
app.entities.models
import
User
from
app.applicationlayer.utils
import
model_to_dict
class
DefaultApproverSerializer
(
serializers
.
ModelSerializer
):
def
to_representation
(
self
,
instance
):
ret
=
super
()
.
to_representation
(
instance
)
ret
[
'department'
]
=
model_to_dict
(
instance
.
department
)
ret
[
'company'
]
=
model_to_dict
(
instance
.
department
.
company
)
return
ret
class
Meta
:
model
=
User
fields
=
'__all__'
read_only_fields
=
(
'created'
,
'createdby'
,
'modified'
,
'modifiedby'
,
'code'
,
)
\ No newline at end of file
app/applicationlayer/cms/master/template/default_approver/table_filter.py
0 → 100644
View file @
3d56bd1d
from
django_filters
import
rest_framework
as
filters
from
django.db.models
import
Count
from
app.entities.models
import
User
from
django.db.models
import
Q
class
DefaultApproverFilterSet
(
filters
.
FilterSet
):
class
Meta
:
model
=
User
fields
=
'__all__'
app/applicationlayer/cms/master/template/default_approver/views.py
0 → 100644
View file @
3d56bd1d
# from rest_framework import viewsets, status
# from rest_framework.response import Response
# from app.applicationlayer.utils import model_to_dict
# from rest_framework.filters import SearchFilter, OrderingFilter
# from django_filters import rest_framework as filters
# from app.entities.models import Department, AllowedCompany
# from app.applicationlayer.utils import (
# CustomPagination, status_message_response
# )
# from django_filters.rest_framework import DjangoFilterBackend
# from app.applicationlayer.master.department import serializer
# from app.applicationlayer.cms.master.template.department.table_filters import (
# ChangeRequestDepartmentFilterSet
# )
# from app.helper.decorators import rms
# from django.db.models import Q
# from rest_framework.exceptions import ParseError
# class DefaultApproverViewSet(viewsets.ModelViewSet):
# queryset = Department.objects.all()
# serializer_class = serializer.AdminDepartmentSerializer
# pagination_class = CustomPagination
# lookup_field = 'code'
# filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
# filterset_class = ChangeRequestDepartmentFilterSet
# ordering_fields = '__all__'
# search_fields = ('name', 'company__name', 'code')
# # @rms.department_list
# def list(self, request, *args, **kwargs):
# company = self.request.query_params['company_code']
# queryset = self.filter_queryset(self.get_queryset())
# allowed = AllowedCompany.objects.filter(
# Q(id_number=self.request.user.code) &
# Q(company_pivot=company) &
# Q(create_change_request_template=True)
# ).values('group_pivots')
# queryset = queryset.filter(code__in=allowed)
# page = self.paginate_queryset(queryset)
# if page is not None:
# serializer = self.get_serializer(page, many=True)
# message = status_message_response(
# 200,
# 'success',
# 'list of Department found',
# serializer.data
# )
# return self.get_paginated_response(message)
# serializer = self.get_serializer(queryset, many=True)
# return Response(serializer.data)
app/entities/migrations/0034_auto_20191108_1924.py
0 → 100644
View file @
3d56bd1d
# Generated by Django 2.2 on 2019-11-08 19:24
from
django.db
import
migrations
,
models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'entities'
,
'0033_merge_20191108_1725'
),
]
operations
=
[
migrations
.
AlterField
(
model_name
=
'allowedcompany'
,
name
=
'approve_cr'
,
field
=
models
.
BooleanField
(
default
=
False
),
),
]
app/entities/models.py
View file @
3d56bd1d
...
@@ -1062,7 +1062,7 @@ class AllowedCompany(models.Model):
...
@@ -1062,7 +1062,7 @@ class AllowedCompany(models.Model):
create_change_request
=
models
.
BooleanField
(
default
=
True
)
create_change_request
=
models
.
BooleanField
(
default
=
True
)
create_change_request_template
=
models
.
BooleanField
(
default
=
True
)
create_change_request_template
=
models
.
BooleanField
(
default
=
True
)
view_all_change_request
=
models
.
BooleanField
(
default
=
True
)
view_all_change_request
=
models
.
BooleanField
(
default
=
True
)
approve_cr
=
models
.
BooleanField
(
default
=
Tru
e
)
approve_cr
=
models
.
BooleanField
(
default
=
Fals
e
)
created_at
=
models
.
DateTimeField
(
auto_now_add
=
True
)
created_at
=
models
.
DateTimeField
(
auto_now_add
=
True
)
deleted_at
=
models
.
DateTimeField
(
null
=
True
,
blank
=
True
)
deleted_at
=
models
.
DateTimeField
(
null
=
True
,
blank
=
True
)
...
...
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