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
c61e9de8
Commit
c61e9de8
authored
Feb 28, 2020
by
Gladys Forte
Browse files
Options
Browse Files
Download
Plain Diff
try
parents
59c572d4
e6f80cce
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
64 additions
and
15 deletions
+64
-15
app/applicationlayer/cms/allowed_company/views.py
app/applicationlayer/cms/allowed_company/views.py
+1
-1
app/applicationlayer/cms/template/header/serializers.py
app/applicationlayer/cms/template/header/serializers.py
+11
-4
app/applicationlayer/cms/template/header/views.py
app/applicationlayer/cms/template/header/views.py
+9
-8
app/applicationlayer/management/account/serializer.py
app/applicationlayer/management/account/serializer.py
+1
-1
app/businesslayer/changerequest/change_request_template.py
app/businesslayer/changerequest/change_request_template.py
+22
-0
app/entities/migrations/0002_allowedcompany_view_all_change_request_template.py
...s/0002_allowedcompany_view_all_change_request_template.py
+18
-0
app/entities/models.py
app/entities/models.py
+1
-0
config/settings/base.py
config/settings/base.py
+1
-1
No files found.
app/applicationlayer/cms/allowed_company/views.py
View file @
c61e9de8
...
@@ -39,7 +39,7 @@ class AllowedCompanyViewSet(viewsets.ModelViewSet):
...
@@ -39,7 +39,7 @@ class AllowedCompanyViewSet(viewsets.ModelViewSet):
if
page
is
not
None
:
if
page
is
not
None
:
serializer
=
self
.
get_serializer
(
page
,
many
=
True
)
serializer
=
self
.
get_serializer
(
page
,
many
=
True
)
message
=
status_message_response
(
message
=
status_message_response
(
200
,
200
,
'success'
,
'success'
,
...
...
app/applicationlayer/cms/template/header/serializers.py
View file @
c61e9de8
...
@@ -22,6 +22,7 @@ class ChangeRequestTemplatesSerializer(
...
@@ -22,6 +22,7 @@ class ChangeRequestTemplatesSerializer(
def
to_representation
(
self
,
instance
):
def
to_representation
(
self
,
instance
):
ret
=
super
()
.
to_representation
(
instance
)
ret
=
super
()
.
to_representation
(
instance
)
try
:
try
:
# to edit
requested_to_user_object
=
{
requested_to_user_object
=
{
"id"
:
instance
.
requested_to_user
.
id
,
"id"
:
instance
.
requested_to_user
.
id
,
"name"
:
instance
.
requested_to_user
.
name
,
"name"
:
instance
.
requested_to_user
.
name
,
...
@@ -87,7 +88,10 @@ class ChangeRequestTemplatesSerializerList(
...
@@ -87,7 +88,10 @@ class ChangeRequestTemplatesSerializerList(
def
to_representation
(
self
,
instance
):
def
to_representation
(
self
,
instance
):
ret
=
super
()
.
to_representation
(
instance
)
ret
=
super
()
.
to_representation
(
instance
)
try
:
try
:
current_user
=
self
.
context
[
'request'
]
.
user
.
code
ret
[
'company'
]
=
instance
.
requested_to_company
.
name
ret
[
'company'
]
=
instance
.
requested_to_company
.
name
ret
[
'department'
]
=
instance
.
requested_to_department
.
name
ret
[
'department'
]
=
instance
.
requested_to_department
.
name
ret
[
'point_of_contact'
]
=
instance
.
requested_to_user
.
name
ret
[
'point_of_contact'
]
=
instance
.
requested_to_user
.
name
...
@@ -96,18 +100,21 @@ class ChangeRequestTemplatesSerializerList(
...
@@ -96,18 +100,21 @@ class ChangeRequestTemplatesSerializerList(
template_no
=
instance
.
template_no
template_no
=
instance
.
template_no
)
)
can_delete
=
''
can_delete
=
''
owned_template
=
''
if
instance
.
created_by_user
.
code
==
current_user
:
owned_template
=
True
else
:
owned_template
=
False
if
child
.
count
()
>
0
:
if
child
.
count
()
>
0
:
can_delete
=
False
can_delete
=
False
else
:
else
:
can_delete
=
True
can_delete
=
True
ret
[
'can_delete'
]
=
can_delete
ret
[
'can_delete'
]
=
can_delete
ret
[
'owned_template'
]
=
owned_template
return
ret
return
ret
except
Exception
as
e
:
except
Exception
as
e
:
...
...
app/applicationlayer/cms/template/header/views.py
View file @
c61e9de8
...
@@ -21,7 +21,8 @@ from app.applicationlayer.cms.utils_cr import (
...
@@ -21,7 +21,8 @@ from app.applicationlayer.cms.utils_cr import (
)
)
from
app.businesslayer.changerequest.change_request_template
import
(
from
app.businesslayer.changerequest.change_request_template
import
(
tmp_add_edit_delete
tmp_add_edit_delete
,
list_by_dept_privilege
)
)
from
app.applicationlayer.cms.template.approver.serializers
import
ChangeRequestTemplateApproversSerializer
from
app.applicationlayer.cms.template.approver.serializers
import
ChangeRequestTemplateApproversSerializer
from
app.applicationlayer.cms.template.stakeholder.serializers
import
ChangeRequestTemplateStakeHoldersSerializer
from
app.applicationlayer.cms.template.stakeholder.serializers
import
ChangeRequestTemplateStakeHoldersSerializer
...
@@ -38,8 +39,7 @@ from django_filters.rest_framework import DjangoFilterBackend
...
@@ -38,8 +39,7 @@ from django_filters.rest_framework import DjangoFilterBackend
class
ChangeRequestTemplatesViewset
(
viewsets
.
ModelViewSet
):
class
ChangeRequestTemplatesViewset
(
viewsets
.
ModelViewSet
):
# hello world
# queryset = models.ChangeRequestTemplateHeader.objects.all()
# queryset = models.ChangeRequestTemplateHeader.objects.all()
queryset
=
models
.
ChangeRequestTemplateHeader
.
objects
.
select_related
(
queryset
=
models
.
ChangeRequestTemplateHeader
.
objects
.
select_related
(
'created_by_user'
,
'created_by_department'
'created_by_user'
,
'created_by_department'
...
@@ -68,12 +68,13 @@ class ChangeRequestTemplatesViewset(viewsets.ModelViewSet):
...
@@ -68,12 +68,13 @@ class ChangeRequestTemplatesViewset(viewsets.ModelViewSet):
)
)
def
list
(
self
,
request
,
*
args
,
**
kwargs
):
def
list
(
self
,
request
,
*
args
,
**
kwargs
):
queryset
=
self
.
filter_queryset
(
self
.
get_queryset
())
queryset
=
queryset
.
filter
(
created_by_user
=
request
.
user
.
code
,
is_active
=
True
)
self
.
serializer_class
=
ChangeRequestTemplatesSerializerList
self
.
serializer_class
=
ChangeRequestTemplatesSerializerList
id_number
=
self
.
request
.
user
.
code
self
.
queryset
=
list_by_dept_privilege
(
id_number
)
queryset
=
self
.
filter_queryset
(
self
.
queryset
)
page
=
self
.
paginate_queryset
(
queryset
)
page
=
self
.
paginate_queryset
(
queryset
)
if
page
is
not
None
:
if
page
is
not
None
:
...
@@ -82,7 +83,7 @@ class ChangeRequestTemplatesViewset(viewsets.ModelViewSet):
...
@@ -82,7 +83,7 @@ class ChangeRequestTemplatesViewset(viewsets.ModelViewSet):
message
=
status_message_response
(
message
=
status_message_response
(
200
,
200
,
'success'
,
'success'
,
'List of
Templates
found'
,
'List of
Change Request Template
found'
,
serializer
.
data
serializer
.
data
)
)
...
...
app/applicationlayer/management/account/serializer.py
View file @
c61e9de8
...
@@ -26,7 +26,7 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
...
@@ -26,7 +26,7 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
company
=
serializers
.
SerializerMethodField
()
company
=
serializers
.
SerializerMethodField
()
create_form
=
serializers
.
SerializerMethodField
()
create_form
=
serializers
.
SerializerMethodField
()
create_template
=
serializers
.
SerializerMethodField
()
create_template
=
serializers
.
SerializerMethodField
()
class
Meta
:
class
Meta
:
model
=
User
model
=
User
fields
=
(
fields
=
(
...
...
app/businesslayer/changerequest/change_request_template.py
View file @
c61e9de8
...
@@ -218,3 +218,25 @@ def validation_vendor_unique_level(approvers):
...
@@ -218,3 +218,25 @@ def validation_vendor_unique_level(approvers):
if
not
approver
[
'delegation'
]
==
'DELEGATION-20191119-0000002'
:
if
not
approver
[
'delegation'
]
==
'DELEGATION-20191119-0000002'
:
validate
=
approver
[
'level'
]
validate
=
approver
[
'level'
]
return
validate
return
validate
def
list_by_dept_privilege
(
user_id_number
):
try
:
priviledgeCrs
=
models
.
AllowedCompany
.
objects
.
filter
(
Q
(
id_number
=
user_id_number
)
&
Q
(
view_all_change_request_template
=
True
)
)
.
values
(
'group_pivots'
)
return_queryset
=
models
.
ChangeRequestTemplateHeader
.
objects
.
filter
(
Q
(
is_active
=
True
)
&
(
Q
(
created_by_user
=
user_id_number
)
|
Q
(
created_by_department__in
=
priviledgeCrs
))
)
return
return_queryset
except
Exception
as
e
:
return_queryset
=
None
return
return_queryset
app/entities/migrations/0002_allowedcompany_view_all_change_request_template.py
0 → 100644
View file @
c61e9de8
# Generated by Django 2.2 on 2020-02-27 13:51
from
django.db
import
migrations
,
models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'entities'
,
'0001_initial'
),
]
operations
=
[
migrations
.
AddField
(
model_name
=
'allowedcompany'
,
name
=
'view_all_change_request_template'
,
field
=
models
.
BooleanField
(
default
=
True
),
),
]
app/entities/models.py
View file @
c61e9de8
...
@@ -1102,6 +1102,7 @@ class AllowedCompany(models.Model):
...
@@ -1102,6 +1102,7 @@ class AllowedCompany(models.Model):
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
=
False
)
approve_cr
=
models
.
BooleanField
(
default
=
False
)
view_all_change_request_template
=
models
.
BooleanField
(
default
=
True
)
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
)
...
...
config/settings/base.py
View file @
c61e9de8
...
@@ -26,7 +26,7 @@ BASE_DIR = os.path.dirname(
...
@@ -26,7 +26,7 @@ BASE_DIR = os.path.dirname(
SECRET_KEY
=
'w!dkk7gc*dk#4!6ow3s1wc32
%
_yp$=osgybm=n0vw6k1j^sqo&'
SECRET_KEY
=
'w!dkk7gc*dk#4!6ow3s1wc32
%
_yp$=osgybm=n0vw6k1j^sqo&'
# SECURITY WARNING: don't run with debug turned on in production!
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG
=
Fals
e
DEBUG
=
Tru
e
ALLOWED_HOSTS
=
[
'*'
]
ALLOWED_HOSTS
=
[
'*'
]
CORS_ORIGIN_ALLOW_ALL
=
True
CORS_ORIGIN_ALLOW_ALL
=
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