Skip to content

Commit

Permalink
Merge pull request #666 from WHOIGit/mario_dev_1.7.0
Browse files Browse the repository at this point in the history
replace deprecated ajax check across all views
  • Loading branch information
ethanandrews authored Jul 16, 2024
2 parents 4904881 + 9298ca1 commit 38bcd71
Show file tree
Hide file tree
Showing 17 changed files with 403 additions and 88 deletions.
4 changes: 2 additions & 2 deletions common/util/mixins.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
class AjaxFormMixin(object):
def form_invalid(self, form):
response = super(AjaxFormMixin, self).form_invalid(form)
if self.request.is_ajax():
if self.request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest':
data = form.errors
return JsonResponse(data, status=400)
else:
return response

def form_valid(self, form):
response = super(AjaxFormMixin, self).form_valid(form)
if self.request.is_ajax():
if self.request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest':
print(form.cleaned_data)
data = {
'message': "Successfully submitted form data.",
Expand Down
28 changes: 14 additions & 14 deletions roundabout/assemblies/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ def form_valid(self, form, documentation_form):

response = HttpResponseRedirect(self.get_success_url())

if self.request.is_ajax():
if self.request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest':
print(form.cleaned_data)
data = {
'message': "Successfully submitted form data.",
Expand All @@ -227,7 +227,7 @@ def form_valid(self, form, documentation_form):
return response

def form_invalid(self, form, documentation_form):
if self.request.is_ajax():
if self.request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest':
if not form.is_valid():
# show form errors before formset errors
return JsonResponse(form.errors, status=400)
Expand Down Expand Up @@ -284,7 +284,7 @@ def form_valid(self, form, documentation_form, **kwargs):

response = HttpResponseRedirect(self.get_success_url())

if self.request.is_ajax():
if self.request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest':
print(form.cleaned_data)
data = {
'message': "Successfully submitted form data.",
Expand All @@ -311,7 +311,7 @@ def form_valid(self, form):

response = HttpResponseRedirect(self.get_success_url())

if self.request.is_ajax():
if self.request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest':
print(form.cleaned_data)
data = {
'message': "Successfully submitted form data.",
Expand Down Expand Up @@ -469,7 +469,7 @@ def form_valid(self, form, documentation_form):

response = HttpResponseRedirect(self.get_success_url())

if self.request.is_ajax():
if self.request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest':
print(form.cleaned_data)
data = {
'message': "Successfully submitted form data.",
Expand All @@ -482,7 +482,7 @@ def form_valid(self, form, documentation_form):
return response

def form_invalid(self, form, documentation_form):
if self.request.is_ajax():
if self.request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest':
if not form.is_valid():
# show form errors before formset errors
return JsonResponse(form.errors, status=400)
Expand Down Expand Up @@ -529,7 +529,7 @@ def form_valid(self, form, documentation_form):
documentation_form.save()
response = HttpResponseRedirect(self.get_success_url())

if self.request.is_ajax():
if self.request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest':
print(form.cleaned_data)
data = {
'message': "Successfully submitted form data.",
Expand All @@ -542,7 +542,7 @@ def form_valid(self, form, documentation_form):
return response

def form_invalid(self, form, documentation_form):
if self.request.is_ajax():
if self.request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest':
if not form.is_valid():
# show form errors before formset errors
return JsonResponse(form.errors, status=400)
Expand Down Expand Up @@ -667,7 +667,7 @@ def form_valid(self, form):

response = HttpResponseRedirect(self.get_success_url())

if self.request.is_ajax():
if self.request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest':
print(form.cleaned_data)
data = {
'message': "Successfully submitted form data.",
Expand Down Expand Up @@ -745,7 +745,7 @@ def form_valid(self, form):

response = HttpResponseRedirect(self.get_success_url())

if self.request.is_ajax():
if self.request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest':
data = {
'message': "Successfully submitted form data.",
'object_id': self.object.id,
Expand Down Expand Up @@ -931,7 +931,7 @@ def form_valid(self, form, event_referencedesignator_form):
handle_reviewers(form.instance.user_draft, form.instance.user_approver, form.cleaned_data['user_draft'])
_create_action_history(self.object, Action.ADD, self.request.user)
response = HttpResponseRedirect(self.get_success_url())
if self.request.is_ajax():
if self.request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest':
data = {
'message': "Successfully submitted form data.",
'object_id': self.object.id,
Expand All @@ -943,7 +943,7 @@ def form_valid(self, form, event_referencedesignator_form):
return response

def form_invalid(self, form, event_referencedesignator_form):
if self.request.is_ajax():
if self.request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest':
if form.errors:
data = form.errors
return JsonResponse(
Expand Down Expand Up @@ -1021,7 +1021,7 @@ def form_valid(self, form, event_referencedesignator_form):
for assm in self.object.reference_designator.assembly_parts.all():
_create_action_history(assm.assemblypart_referencedesignatorevents.first(), Action.UPDATE, self.request.user)
response = HttpResponseRedirect(self.get_success_url())
if self.request.is_ajax():
if self.request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest':
data = {
'message': "Successfully submitted form data.",
'object_id': self.object.id,
Expand All @@ -1033,7 +1033,7 @@ def form_valid(self, form, event_referencedesignator_form):
return response

def form_invalid(self, form, event_referencedesignator_form):
if self.request.is_ajax():
if self.request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest':
if form.errors:
data = form.errors
return JsonResponse(
Expand Down
14 changes: 7 additions & 7 deletions roundabout/builds/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ def form_valid(self, form, formset):

response = HttpResponseRedirect(self.get_success_url())

if self.request.is_ajax():
if self.request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest':
print(form.cleaned_data)
data = {
'message': "Successfully submitted form data.",
Expand All @@ -306,7 +306,7 @@ def form_valid(self, form, formset):
return response

def form_invalid(self, form, formset):
if self.request.is_ajax():
if self.request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest':
if not form.is_valid():
# show form errors before formset errors
return JsonResponse(form.errors, status=400)
Expand Down Expand Up @@ -365,7 +365,7 @@ def form_valid(self, form, formset):

response = HttpResponseRedirect(self.get_success_url())

if self.request.is_ajax():
if self.request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest':
print(form.cleaned_data)
data = {
'message': "Successfully submitted form data.",
Expand All @@ -378,7 +378,7 @@ def form_valid(self, form, formset):
return response

def form_invalid(self, form, formset):
if self.request.is_ajax():
if self.request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest':
if not form.is_valid():
# show form errors before formset errors
return JsonResponse(form.errors, status=400)
Expand Down Expand Up @@ -442,7 +442,7 @@ def form_valid(self, form):

response = HttpResponseRedirect(self.get_success_url())

if self.request.is_ajax():
if self.request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest':
print(form.cleaned_data)
data = {
'message': "Successfully submitted form data.",
Expand Down Expand Up @@ -490,7 +490,7 @@ def form_valid(self, form):

response = HttpResponseRedirect(self.get_success_url())

if self.request.is_ajax():
if self.request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest':
print(form.cleaned_data)
data = {
'message': "Successfully submitted form data.",
Expand Down Expand Up @@ -594,7 +594,7 @@ def form_valid(self, form, **kwargs):

response = HttpResponseRedirect(self.get_success_url())

if self.request.is_ajax():
if self.request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest':
print(form.cleaned_data)
data = {
'message': "Successfully submitted form data.",
Expand Down
6 changes: 3 additions & 3 deletions roundabout/builds/views_deployments.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def form_valid(self, form):

response = HttpResponseRedirect(self.get_success_url())

if self.request.is_ajax():
if self.request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest':
print(form.cleaned_data)
data = {
"message": "Successfully submitted form data.",
Expand Down Expand Up @@ -311,7 +311,7 @@ def form_valid(self, form):

inventory_deployment.save()

if self.request.is_ajax():
if self.request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest':
data = {
"message": "Successfully submitted form data.",
"object_id": self.object.build.id,
Expand Down Expand Up @@ -489,7 +489,7 @@ def form_valid(self, form):

response = HttpResponseRedirect(self.get_success_url())

if self.request.is_ajax():
if self.request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest':
print(form.cleaned_data)
data = {
"message": "Successfully submitted form data.",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
# Generated by Django 4.2.13 on 2024-07-15 19:45

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
('inventory', '0081_auto_20221121_2151'),
('parts', '0020_part_bulk_upload_event'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('assemblies', '0016_auto_20221121_2151'),
('calibrations', '0033_merge_20210610_1729'),
]

operations = [
migrations.AlterField(
model_name='calibrationevent',
name='assembly_part',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='assemblypart_%(class)ss', to='assemblies.assemblypart'),
),
migrations.AlterField(
model_name='calibrationevent',
name='deployment',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='deployment_%(class)ss', to='inventory.deployment'),
),
migrations.AlterField(
model_name='calibrationevent',
name='inventory',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='inventory_%(class)ss', to='inventory.inventory'),
),
migrations.AlterField(
model_name='calibrationevent',
name='part',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='part_%(class)ss', to='parts.part'),
),
migrations.AlterField(
model_name='calibrationevent',
name='user_approver',
field=models.ManyToManyField(related_name='approver_%(class)ss', to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='calibrationevent',
name='user_draft',
field=models.ManyToManyField(blank=True, related_name='reviewer_%(class)ss', to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='coefficientnameevent',
name='assembly_part',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='assemblypart_%(class)ss', to='assemblies.assemblypart'),
),
migrations.AlterField(
model_name='coefficientnameevent',
name='deployment',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='deployment_%(class)ss', to='inventory.deployment'),
),
migrations.AlterField(
model_name='coefficientnameevent',
name='inventory',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='inventory_%(class)ss', to='inventory.inventory'),
),
migrations.AlterField(
model_name='coefficientnameevent',
name='part',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='part_%(class)ss', to='parts.part'),
),
migrations.AlterField(
model_name='coefficientnameevent',
name='user_approver',
field=models.ManyToManyField(related_name='approver_%(class)ss', to=settings.AUTH_USER_MODEL),
),
migrations.AlterField(
model_name='coefficientnameevent',
name='user_draft',
field=models.ManyToManyField(blank=True, related_name='reviewer_%(class)ss', to=settings.AUTH_USER_MODEL),
),
]
Loading

0 comments on commit 38bcd71

Please sign in to comment.