Skip to content

R
red-ci-cd
Commit ebb20da6 authored by John Red Medrano's avatar John Red Medrano
Browse files
Options

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

* commit '215e0f84':
  alter all foreign key to protect
  removed manual search on list of form
parents 186a4171 215e0f84
Hide whitespace changes
Inline Side-by-side
Showing with 196 additions and 32 deletions
app/applicationlayer/cms/form/header/views.py
View file @ ebb20da6
......@@ -75,12 +75,11 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
filterset_class = HeaderFilterSet
ordering_fields = '__all__'
search_fields = (
"form_code", "requested_to_template_id", "requested_by_user__name",
"form_code", "status", "requested_to_template_id", "requested_by_user__name",
"requested_by_user__code", "requested_by_department__name",
"requested_to_company__name", "requested_to_department__name",
"requested_to_user__name", "requested_to_template_name",
"requested_to_objective", "requested_to_priority", "description",
"status",
"requested_to_objective", "requested_to_priority", "description"
)
def list(self, request, *args, **kwargs):
......@@ -101,13 +100,13 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
request.query_params.get('form_type'),
)
if self.request.query_params.get('search'):
search_key = self.request.query_params.get('search')
# if self.request.query_params.get('search'):
# search_key = self.request.query_params.get('search')
self.queryset = self.queryset.filter(
Q(requested_to_template_name__icontains=search_key.lower()) |
Q(requested_to_template_id__icontains=search_key.lower())
)
# self.queryset = self.queryset.filter(
# Q(requested_to_template_name__icontains=search_key.lower()) |
# Q(requested_to_template_id__icontains=search_key.lower())
# )
self.queryset = self.queryset.order_by('-created')
......
app/entities/migrations/0005_auto_20190929_1603.py 0 → 100644
View file @ ebb20da6
# Generated by Django 2.2 on 2019-09-29 16:03
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('entities', '0004_auto_20190928_1656'),
]
operations = [
migrations.AlterField(
model_name='changerequestformapprovers',
name='form_code',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='frm_approvers', to='entities.ChangeRequestFormHeader', to_field='form_code'),
),
migrations.AlterField(
model_name='changerequestformapprovers',
name='tmp_approver',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='entities.ChangeRequestTemplateApprovers', to_field='code'),
),
migrations.AlterField(
model_name='changerequestformapprovers',
name='user',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL, to_field='code'),
),
migrations.AlterField(
model_name='changerequestformattachments',
name='form_code',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='frm_attachments', to='entities.ChangeRequestFormHeader', to_field='form_code'),
),
migrations.AlterField(
model_name='changerequestformattachments',
name='tmp_attach',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='template_attachments', to='entities.ChangeRequestTemplateAttachments', to_field='code'),
),
migrations.AlterField(
model_name='changerequestformattachments',
name='uploaded_by',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL, to_field='code'),
),
migrations.AlterField(
model_name='changerequestformdetails',
name='form_code',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='frm_details', to='entities.ChangeRequestFormHeader', to_field='form_code'),
),
migrations.AlterField(
model_name='changerequestformdetails',
name='tmp_detail',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='entities.ChangeRequestTemplateDetails', to_field='code'),
),
migrations.AlterField(
model_name='changerequestformheader',
name='requested_by_department',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='requested_by_department', to='entities.Department', to_field='code'),
),
migrations.AlterField(
model_name='changerequestformheader',
name='requested_by_user',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='requested_by_user', to=settings.AUTH_USER_MODEL, to_field='code'),
),
migrations.AlterField(
model_name='changerequestformheader',
name='requested_to_company',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='entities.Company', to_field='code'),
),
migrations.AlterField(
model_name='changerequestformheader',
name='requested_to_department',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='entities.Department', to_field='code'),
),
migrations.AlterField(
model_name='changerequestformheader',
name='requested_to_user',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL, to_field='code'),
),
migrations.AlterField(
model_name='changerequestformheader',
name='template_no',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='entities.ChangeRequestTemplateHeader', to_field='template_no'),
),
migrations.AlterField(
model_name='changerequestformstakeholders',
name='form_code',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='frm_stakes', to='entities.ChangeRequestFormHeader', to_field='form_code'),
),
migrations.AlterField(
model_name='changerequestformstakeholders',
name='tmp_stake',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='entities.ChangeRequestTemplateStakeHolders', to_field='code'),
),
migrations.AlterField(
model_name='changerequestformstakeholders',
name='user',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL, to_field='code'),
),
migrations.AlterField(
model_name='changerequesttemplateapprovers',
name='template_no',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='tmp_approvers', to='entities.ChangeRequestTemplateHeader', to_field='template_no'),
),
migrations.AlterField(
model_name='changerequesttemplateapprovers',
name='user',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL, to_field='code'),
),
migrations.AlterField(
model_name='changerequesttemplateattachments',
name='template_no',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='tmp_attachments', to='entities.ChangeRequestTemplateHeader', to_field='template_no'),
),
migrations.AlterField(
model_name='changerequesttemplateattachments',
name='uploaded_by',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL, to_field='code'),
),
migrations.AlterField(
model_name='changerequesttemplatedetails',
name='template_no',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='tmp_details', to='entities.ChangeRequestTemplateHeader', to_field='template_no'),
),
migrations.AlterField(
model_name='changerequesttemplateheader',
name='created_by_department',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='created_by_department', to='entities.Department', to_field='code'),
),
migrations.AlterField(
model_name='changerequesttemplateheader',
name='created_by_user',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='created_by_user', to=settings.AUTH_USER_MODEL, to_field='code'),
),
migrations.AlterField(
model_name='changerequesttemplateheader',
name='requested_to_company',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='entities.Company', to_field='code'),
),
migrations.AlterField(
model_name='changerequesttemplateheader',
name='requested_to_department',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='entities.Department', to_field='code'),
),
migrations.AlterField(
model_name='changerequesttemplateheader',
name='requested_to_user',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL, to_field='code'),
),
migrations.AlterField(
model_name='changerequesttemplatestakeholders',
name='template_no',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='tmp_stakes', to='entities.ChangeRequestTemplateHeader', to_field='template_no'),
),
migrations.AlterField(
model_name='changerequesttemplatestakeholders',
name='user',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL, to_field='code'),
),
migrations.AlterField(
model_name='entitylog',
name='entity',
field=models.CharField(choices=[('USER', 'USER'), ('APPLICATION', 'APPLICATION'), ('COMPANY', 'COMPANY'), ('DEPARTMENT', 'DEPARTMENT'), ('MODULE', 'MODULE'), ('ChangeRequestTemplateHeader', 'ChangeRequestTemplateHeader'), ('ChangeRequestTemplateApprovers', 'ChangeRequestTemplateApprovers'), ('ChangeRequestTemplateStakeHolders', 'ChangeRequestTemplateStakeHolders'), ('ChangeRequestTemplateAttachments', 'ChangeRequestTemplateAttachments'), ('ChangeRequestTemplateDetails', 'ChangeRequestTemplateDetails'), ('ChangeRequestFormHeader', 'ChangeRequestFormHeader'), ('ChangeRequestFormApprovers', 'ChangeRequestFormApprovers'), ('ChangeRequestFormStakeHolders', 'ChangeRequestFormStakeHolders'), ('ChangeRequestFormAttachments', 'ChangeRequestFormAttachments'), ('ChangeRequestFormDetails', 'ChangeRequestFormDetails')], default='Add', max_length=50),
),
]
app/entities/models.py
View file @ ebb20da6
......@@ -366,17 +366,17 @@ class BaseHeader(models.Model):
requested_to_company = models.ForeignKey(
Company,
on_delete=models.DO_NOTHING,
on_delete=models.PROTECT,
to_field='code')
requested_to_department = models.ForeignKey(
Department,
on_delete=models.DO_NOTHING,
on_delete=models.PROTECT,
to_field='code')
requested_to_user = models.ForeignKey(
User,
on_delete=models.DO_NOTHING,
on_delete=models.PROTECT,
to_field='code')
requested_to_template_name = models.CharField(max_length=255)
......@@ -406,7 +406,7 @@ class BaseApprover(models.Model):
User,
blank=True,
null=True,
on_delete=models.DO_NOTHING,
on_delete=models.PROTECT,
to_field='code')
delegation = models.CharField(max_length=50, blank=True, null=True)
......@@ -423,7 +423,7 @@ class BaseStakeholder(models.Model):
User,
blank=True,
null=True,
on_delete=models.DO_NOTHING,
on_delete=models.PROTECT,
to_field='code')
delegation = models.CharField(
max_length=255,
......@@ -461,7 +461,7 @@ class BaseAttachment(models.Model):
null=True)
uploaded_by = models.ForeignKey(
User,
on_delete=models.DO_NOTHING,
on_delete=models.PROTECT,
to_field='code')
created = models.DateTimeField(
blank=True,
......@@ -513,13 +513,13 @@ class ChangeRequestTemplateHeader(BaseHeader):
created_by_user = models.ForeignKey(
User,
on_delete=models.DO_NOTHING,
on_delete=models.PROTECT,
to_field='code',
related_name='created_by_user')
created_by_department = models.ForeignKey(
Department,
on_delete=models.DO_NOTHING,
on_delete=models.PROTECT,
to_field='code',
related_name='created_by_department')
......@@ -548,7 +548,7 @@ class ChangeRequestTemplateApprovers(BaseApprover):
max_length=255) # primary key
template_no = models.ForeignKey(
ChangeRequestTemplateHeader,
on_delete=models.DO_NOTHING,
on_delete=models.PROTECT,
to_field='template_no',
related_name='tmp_approvers')
......@@ -574,7 +574,7 @@ class ChangeRequestTemplateStakeHolders(BaseStakeholder):
max_length=255) # primary key
template_no = models.ForeignKey(
ChangeRequestTemplateHeader,
on_delete=models.DO_NOTHING,
on_delete=models.PROTECT,
to_field='template_no',
related_name='tmp_stakes')
......@@ -607,7 +607,7 @@ class ChangeRequestTemplateAttachments(BaseAttachment):
)
template_no = models.ForeignKey(
ChangeRequestTemplateHeader,
on_delete=models.DO_NOTHING,
on_delete=models.PROTECT,
to_field='template_no',
related_name='tmp_attachments')
......@@ -633,7 +633,7 @@ class ChangeRequestTemplateDetails(BaseDetails):
unique=True)
template_no = models.ForeignKey(
ChangeRequestTemplateHeader,
on_delete=models.DO_NOTHING,
on_delete=models.PROTECT,
to_field='template_no',
related_name='tmp_details')
......@@ -664,7 +664,7 @@ class ChangeRequestFormHeader(BaseHeader):
unique=True)
requested_by_user = models.ForeignKey(
User,
on_delete=models.DO_NOTHING,
on_delete=models.PROTECT,
to_field='code',
related_name='requested_by_user')
cancel_date = models.DateTimeField(
......@@ -672,12 +672,12 @@ class ChangeRequestFormHeader(BaseHeader):
blank=True)
requested_by_department = models.ForeignKey(
Department,
on_delete=models.DO_NOTHING,
on_delete=models.PROTECT,
to_field='code',
related_name='requested_by_department')
template_no = models.ForeignKey(
ChangeRequestTemplateHeader,
on_delete=models.DO_NOTHING,
on_delete=models.PROTECT,
to_field='template_no')
status = models.CharField(max_length=50)
......@@ -725,7 +725,7 @@ class ChangeRequestFormApprovers(BaseApprover):
max_length=255) # primary key
form_code = models.ForeignKey(
ChangeRequestFormHeader,
on_delete=models.DO_NOTHING,
on_delete=models.PROTECT,
to_field='form_code',
related_name='frm_approvers')
remarks = models.CharField(
......@@ -746,7 +746,7 @@ class ChangeRequestFormApprovers(BaseApprover):
ChangeRequestTemplateApprovers,
null=True,
blank=True,
on_delete=models.DO_NOTHING,
on_delete=models.PROTECT,
to_field='code')
class Meta:
......@@ -771,14 +771,14 @@ class ChangeRequestFormDetails(BaseDetails):
max_length=255) # primary key
form_code = models.ForeignKey(
ChangeRequestFormHeader,
on_delete=models.DO_NOTHING,
on_delete=models.PROTECT,
to_field='form_code',
related_name='frm_details')
tmp_detail = models.ForeignKey(
ChangeRequestTemplateDetails,
null=True,
blank=True,
on_delete=models.DO_NOTHING,
on_delete=models.PROTECT,
to_field='code')
class Meta:
......@@ -803,7 +803,7 @@ class ChangeRequestFormStakeHolders(BaseStakeholder):
max_length=255) # primary key
form_code = models.ForeignKey(
ChangeRequestFormHeader,
on_delete=models.DO_NOTHING,
on_delete=models.PROTECT,
to_field='form_code',
related_name='frm_stakes')
date_added = models.DateTimeField(
......@@ -813,7 +813,7 @@ class ChangeRequestFormStakeHolders(BaseStakeholder):
ChangeRequestTemplateStakeHolders,
null=True,
blank=True,
on_delete=models.DO_NOTHING,
on_delete=models.PROTECT,
to_field='code')
class Meta:
......@@ -838,7 +838,7 @@ class ChangeRequestFormAttachments(BaseAttachment):
max_length=255) # primary key
form_code = models.ForeignKey(
ChangeRequestFormHeader,
on_delete=models.DO_NOTHING,
on_delete=models.PROTECT,
to_field='form_code',
related_name='frm_attachments')
file_upload = models.ForeignKey(
......@@ -853,7 +853,7 @@ class ChangeRequestFormAttachments(BaseAttachment):
null=True,
blank=True,
related_name="template_attachments",
on_delete=models.DO_NOTHING,
on_delete=models.PROTECT,
to_field='code')
class Meta:
......
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